[MediaWiki-commits] [Gerrit] operations/puppet[production]: prometheus: fetch storage_retention for ops from hiera

2016-12-05 Thread Filippo Giunchedi (Code Review) 
Filippo Giunchedi has submitted this change and it was merged.

Change subject: prometheus: fetch storage_retention for ops from hiera
..


prometheus: fetch storage_retention for ops from hiera

Change-Id: I76b3d9ee7a0da8028074c952fe93fbfd1b842647
---
M modules/role/manifests/prometheus/ops.pp
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Filippo Giunchedi: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/role/manifests/prometheus/ops.pp 
b/modules/role/manifests/prometheus/ops.pp
index 746d022..1bf55da 100644
--- a/modules/role/manifests/prometheus/ops.pp
+++ b/modules/role/manifests/prometheus/ops.pp
@@ -5,6 +5,7 @@
 
 $targets_path = '/srv/prometheus/ops/targets'
 $rules_path = '/srv/prometheus/ops/rules'
+$storage_retention = hiera('prometheus::server::storage_retention', 
'4320h0m0s')
 
 $config_extra = {
 # All metrics will get an additional 'site' label when queried by
@@ -113,6 +114,7 @@
 prometheus::server { 'ops':
 storage_encoding => '2',
 listen_address   => '127.0.0.1:9900',
+storage_retention=> $storage_retention,
 scrape_configs_extra => array_concat($mysql_jobs, $varnish_jobs, 
$memcached_jobs),
 global_config_extra  => $config_extra,
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/325434
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I76b3d9ee7a0da8028074c952fe93fbfd1b842647
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: prometheus: fetch storage_retention for ops from hiera

2016-12-05 Thread Filippo Giunchedi (Code Review) 
Filippo Giunchedi has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325434

Change subject: prometheus: fetch storage_retention for ops from hiera
..

prometheus: fetch storage_retention for ops from hiera

Change-Id: I76b3d9ee7a0da8028074c952fe93fbfd1b842647
---
M modules/role/manifests/prometheus/ops.pp
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/34/325434/1

diff --git a/modules/role/manifests/prometheus/ops.pp 
b/modules/role/manifests/prometheus/ops.pp
index 746d022..1bf55da 100644
--- a/modules/role/manifests/prometheus/ops.pp
+++ b/modules/role/manifests/prometheus/ops.pp
@@ -5,6 +5,7 @@
 
 $targets_path = '/srv/prometheus/ops/targets'
 $rules_path = '/srv/prometheus/ops/rules'
+$storage_retention = hiera('prometheus::server::storage_retention', 
'4320h0m0s')
 
 $config_extra = {
 # All metrics will get an additional 'site' label when queried by
@@ -113,6 +114,7 @@
 prometheus::server { 'ops':
 storage_encoding => '2',
 listen_address   => '127.0.0.1:9900',
+storage_retention=> $storage_retention,
 scrape_configs_extra => array_concat($mysql_jobs, $varnish_jobs, 
$memcached_jobs),
 global_config_extra  => $config_extra,
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/325434
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I76b3d9ee7a0da8028074c952fe93fbfd1b842647
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits