Filippo Giunchedi has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/399439 )
Change subject: WIP allow labmon1001 to contact pdns exporters
......................................................................
WIP allow labmon1001 to contact pdns exporters
Change-Id: Ifad13cccf4351a6954c500632cda032e467d0ed1
---
A hieradata/common/profile/openstack/main/pdns/auth/service.yaml
A hieradata/common/profile/openstack/main/pdns/recursor/primary.yaml
M modules/profile/manifests/prometheus/pdns_exporter.pp
M modules/profile/manifests/prometheus/pdns_rec_exporter.pp
4 files changed, 12 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/39/399439/1
diff --git a/hieradata/common/profile/openstack/main/pdns/auth/service.yaml
b/hieradata/common/profile/openstack/main/pdns/auth/service.yaml
new file mode 100644
index 0000000..aabeac6
--- /dev/null
+++ b/hieradata/common/profile/openstack/main/pdns/auth/service.yaml
@@ -0,0 +1,2 @@
+prometheus_nodes_extra:
+ - labmon1001.eqiad.wmnet
diff --git a/hieradata/common/profile/openstack/main/pdns/recursor/primary.yaml
b/hieradata/common/profile/openstack/main/pdns/recursor/primary.yaml
new file mode 100644
index 0000000..aabeac6
--- /dev/null
+++ b/hieradata/common/profile/openstack/main/pdns/recursor/primary.yaml
@@ -0,0 +1,2 @@
+prometheus_nodes_extra:
+ - labmon1001.eqiad.wmnet
diff --git a/modules/profile/manifests/prometheus/pdns_exporter.pp
b/modules/profile/manifests/prometheus/pdns_exporter.pp
index 292d06e..5525365 100644
--- a/modules/profile/manifests/prometheus/pdns_exporter.pp
+++ b/modules/profile/manifests/prometheus/pdns_exporter.pp
@@ -1,5 +1,10 @@
class profile::prometheus::pdns_exporter (
+ $prometheus_nodes = hiera('prometheus_nodes'),
+ $prometheus_nodes_extra = hiera('prometheus_nodes_extra', []),
) {
+ $prometheus_ferm_nodes = join($prometheus_nodes + $prometheus_nodes_extra,
' ')
+ $ferm_srange = "(@resolve((${prometheus_ferm_nodes}))
@resolve((${prometheus_ferm_nodes}), AAAA))"
+
require_package('prometheus-pdns-exporter')
service { 'prometheus-pdns-exporter':
@@ -9,6 +14,6 @@
ferm::service { 'prometheus-pdns-exporter':
proto => 'tcp',
port => '9192',
- srange => '@resolve(labmon1001.eqiad.wmnet)', # Should be properly
defined via Hiera for WMCS
+ srange => $ferm_srange,
}
}
diff --git a/modules/profile/manifests/prometheus/pdns_rec_exporter.pp
b/modules/profile/manifests/prometheus/pdns_rec_exporter.pp
index 0902ab2..582393a 100644
--- a/modules/profile/manifests/prometheus/pdns_rec_exporter.pp
+++ b/modules/profile/manifests/prometheus/pdns_rec_exporter.pp
@@ -1,7 +1,8 @@
class profile::prometheus::pdns_rec_exporter (
$prometheus_nodes = hiera('prometheus_nodes'),
+ $prometheus_nodes_extra = hiera('prometheus_nodes_extra', []),
) {
- $prometheus_ferm_nodes = join($prometheus_nodes, ' ')
+ $prometheus_ferm_nodes = join($prometheus_nodes + $prometheus_nodes_extra,
' ')
$ferm_srange = "(@resolve((${prometheus_ferm_nodes}))
@resolve((${prometheus_ferm_nodes}), AAAA))"
require_package('prometheus-pdns-rec-exporter')
--
To view, visit https://gerrit.wikimedia.org/r/399439
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifad13cccf4351a6954c500632cda032e467d0ed1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
