[MediaWiki-commits] [Gerrit] operations/puppet[production]: prometheus: temporary rsync server for metrics migration

2017-02-27 Thread Dzahn (Code Review) 
Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/330348 )

Change subject: prometheus: temporary rsync server for metrics migration
..


prometheus: temporary rsync server for metrics migration

Serve Prometheus metrics over rsync while migrating to baremetal
hardware.

Bug: T148408
Change-Id: Ifb727adc42012a5f32a99053c1d71831531105eb
---
M modules/role/manifests/prometheus/global.pp
M modules/role/manifests/prometheus/ops.pp
2 files changed, 28 insertions(+), 0 deletions(-)

Approvals:
  Dzahn: Verified; Looks good to me, approved



diff --git a/modules/role/manifests/prometheus/global.pp 
b/modules/role/manifests/prometheus/global.pp
index 4637eca..e126a43 100644
--- a/modules/role/manifests/prometheus/global.pp
+++ b/modules/role/manifests/prometheus/global.pp
@@ -61,4 +61,15 @@
 port   => '80',
 srange => '$DOMAIN_NETWORKS',
 }
+
+# Move Prometheus metrics to new HW - T148408
+include rsync::server
+
+$prometheus_nodes = hiera('prometheus_nodes')
+rsync::server::module { 'prometheus-global':
+path=> '/srv/prometheus/global/metrics',
+uid => 'prometheus',
+gid => 'prometheus',
+hosts_allow => $prometheus_nodes,
+}
 }
diff --git a/modules/role/manifests/prometheus/ops.pp 
b/modules/role/manifests/prometheus/ops.pp
index bd269c3..3b9b27d 100644
--- a/modules/role/manifests/prometheus/ops.pp
+++ b/modules/role/manifests/prometheus/ops.pp
@@ -350,4 +350,21 @@
 targets_path => $targets_path,
 cache_name   => 'upload',
 }
+
+# Move Prometheus metrics to new HW - T148408
+include rsync::server
+
+$prometheus_nodes = hiera('prometheus_nodes')
+rsync::server::module { 'prometheus-ops':
+path=> '/srv/prometheus/ops/metrics',
+uid => 'prometheus',
+gid => 'prometheus',
+hosts_allow => $prometheus_nodes,
+}
+
+ferm::service { 'rsync-prometheus':
+proto  => 'tcp',
+port   => '873',
+srange => "@resolve((${prometheus_nodes}))",
+}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifb727adc42012a5f32a99053c1d71831531105eb
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 
Gerrit-Reviewer: Dzahn 
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: temporary rsync server for metrics migration

2017-01-03 Thread Filippo Giunchedi (Code Review) 
Filippo Giunchedi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/330348 )

Change subject: prometheus: temporary rsync server for metrics migration
..

prometheus: temporary rsync server for metrics migration

Serve Prometheus metrics over rsync while migrating to baremetal
hardware.

Bug: T148408
Change-Id: Ifb727adc42012a5f32a99053c1d71831531105eb
---
M modules/role/manifests/prometheus/global.pp
M modules/role/manifests/prometheus/ops.pp
2 files changed, 28 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/48/330348/1

diff --git a/modules/role/manifests/prometheus/global.pp 
b/modules/role/manifests/prometheus/global.pp
index 49c73ea..328642f 100644
--- a/modules/role/manifests/prometheus/global.pp
+++ b/modules/role/manifests/prometheus/global.pp
@@ -59,4 +59,15 @@
 port   => '80',
 srange => '$DOMAIN_NETWORKS',
 }
+
+# Move Prometheus metrics to new HW - T148408
+include rsync::server
+
+$prometheus_nodes = hiera('prometheus_nodes')
+rsync::server::module { 'prometheus-global':
+path=> '/srv/prometheus/global/metrics'
+uid => 'prometheus',
+gid => 'prometheus',
+hosts_allow => $prometheus_nodes,
+}
 }
diff --git a/modules/role/manifests/prometheus/ops.pp 
b/modules/role/manifests/prometheus/ops.pp
index 1282e96..1452913 100644
--- a/modules/role/manifests/prometheus/ops.pp
+++ b/modules/role/manifests/prometheus/ops.pp
@@ -310,4 +310,21 @@
 targets_path => $targets_path,
 cache_name   => 'upload',
 }
+
+# Move Prometheus metrics to new HW - T148408
+include rsync::server
+
+$prometheus_nodes = hiera('prometheus_nodes')
+rsync::server::module { 'prometheus-ops':
+path=> '/srv/prometheus/ops/metrics'
+uid => 'prometheus',
+gid => 'prometheus',
+hosts_allow => $prometheus_nodes,
+}
+
+ferm::service { 'rsync-prometheus':
+proto  => 'tcp',
+port   => '873',
+srange => "@resolve((${prometheus_nodes}))",
+}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifb727adc42012a5f32a99053c1d71831531105eb
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