[MediaWiki-commits] [Gerrit] operations/puppet[production]: Use custom profile for PDNS exporter on labservices1001

2017-12-21 Thread Filippo Giunchedi (Code Review) 
Filippo Giunchedi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/399582 )

Change subject: Use custom profile for PDNS exporter on labservices1001
..


Use custom profile for PDNS exporter on labservices1001

Change-Id: Ia96c300212be7dc139ff309a7334b67d361eaaf9
---
A modules/profile/manifests/prometheus/pdns_rec_exporter_wmcs.pp
M modules/role/manifests/wmcs/openstack/main/services_primary.pp
2 files changed, 15 insertions(+), 1 deletion(-)

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



diff --git a/modules/profile/manifests/prometheus/pdns_rec_exporter_wmcs.pp 
b/modules/profile/manifests/prometheus/pdns_rec_exporter_wmcs.pp
new file mode 100644
index 000..3d9c779
--- /dev/null
+++ b/modules/profile/manifests/prometheus/pdns_rec_exporter_wmcs.pp
@@ -0,0 +1,14 @@
+class profile::prometheus::pdns_rec_exporter_wmcs (
+) {
+require_package('prometheus-pdns-rec-exporter')
+
+service { 'prometheus-pdns-rec-exporter':
+ensure  => running,
+}
+
+ferm::service { 'prometheus-pdns-rec-exporter':
+proto  => 'tcp',
+port   => '9199',
+srange => '@resolve(labmon1001.eqiad.wmnet)', # Should be properly 
defined via Hiera for WMCS
+}
+}
diff --git a/modules/role/manifests/wmcs/openstack/main/services_primary.pp 
b/modules/role/manifests/wmcs/openstack/main/services_primary.pp
index 754ce0b..eb4b1ec 100644
--- a/modules/role/manifests/wmcs/openstack/main/services_primary.pp
+++ b/modules/role/manifests/wmcs/openstack/main/services_primary.pp
@@ -7,5 +7,5 @@
 include ::profile::openstack::main::designate::service
 include ::profile::openstack::main::pdns::dns_floating_ip_updater
 include ::profile::prometheus::pdns_exporter
-include ::profile::prometheus::pdns_rec_exporter
+include ::profile::prometheus::pdns_rec_exporter_wmcs
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia96c300212be7dc139ff309a7334b67d361eaaf9
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Giuseppe Lavagetto 
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]: Use custom profile for PDNS exporter on labservices1001

2017-12-21 Thread Muehlenhoff (Code Review) 
Muehlenhoff has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/399582 )

Change subject: Use custom profile for PDNS exporter on labservices1001
..

Use custom profile for PDNS exporter on labservices1001

Change-Id: Ia96c300212be7dc139ff309a7334b67d361eaaf9
---
A modules/profile/manifests/prometheus/pdns_rec_exporter_wmcs.pp
M modules/role/manifests/wmcs/openstack/main/services_primary.pp
2 files changed, 15 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/82/399582/1

diff --git a/modules/profile/manifests/prometheus/pdns_rec_exporter_wmcs.pp 
b/modules/profile/manifests/prometheus/pdns_rec_exporter_wmcs.pp
new file mode 100644
index 000..3d9c779
--- /dev/null
+++ b/modules/profile/manifests/prometheus/pdns_rec_exporter_wmcs.pp
@@ -0,0 +1,14 @@
+class profile::prometheus::pdns_rec_exporter_wmcs (
+) {
+require_package('prometheus-pdns-rec-exporter')
+
+service { 'prometheus-pdns-rec-exporter':
+ensure  => running,
+}
+
+ferm::service { 'prometheus-pdns-rec-exporter':
+proto  => 'tcp',
+port   => '9199',
+srange => '@resolve(labmon1001.eqiad.wmnet)', # Should be properly 
defined via Hiera for WMCS
+}
+}
diff --git a/modules/role/manifests/wmcs/openstack/main/services_primary.pp 
b/modules/role/manifests/wmcs/openstack/main/services_primary.pp
index 754ce0b..eb4b1ec 100644
--- a/modules/role/manifests/wmcs/openstack/main/services_primary.pp
+++ b/modules/role/manifests/wmcs/openstack/main/services_primary.pp
@@ -7,5 +7,5 @@
 include ::profile::openstack::main::designate::service
 include ::profile::openstack::main::pdns::dns_floating_ip_updater
 include ::profile::prometheus::pdns_exporter
-include ::profile::prometheus::pdns_rec_exporter
+include ::profile::prometheus::pdns_rec_exporter_wmcs
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia96c300212be7dc139ff309a7334b67d361eaaf9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 

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