Elukey has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/366830 )
Change subject: role::prometheus::apache_exporter: move to profiles
......................................................................
role::prometheus::apache_exporter: move to profiles
Change-Id: I92c9ae7b6abf4f5c1e2af187158b3302d1d93059
---
A modules/profile/manifests/prometheus/apache_exporter.pp
M modules/role/manifests/prometheus/apache_exporter.pp
2 files changed, 14 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/30/366830/1
diff --git a/modules/profile/manifests/prometheus/apache_exporter.pp
b/modules/profile/manifests/prometheus/apache_exporter.pp
new file mode 100644
index 0000000..dd372ef
--- /dev/null
+++ b/modules/profile/manifests/prometheus/apache_exporter.pp
@@ -0,0 +1,13 @@
+class profile::prometheus::apache_exporter (
+ $prometheus_nodes = hiera('prometheus_nodes'),
+) {
+ prometheus::apache_exporter { 'default': }
+ $prometheus_ferm_nodes = join($prometheus_nodes, ' ')
+ $ferm_srange = "(@resolve((${prometheus_ferm_nodes}))
@resolve((${prometheus_ferm_nodes}), AAAA))"
+
+ ferm::service { 'prometheus-apache_exporter':
+ proto => 'tcp',
+ port => '9117',
+ srange => $ferm_srange,
+ }
+}
\ No newline at end of file
diff --git a/modules/role/manifests/prometheus/apache_exporter.pp
b/modules/role/manifests/prometheus/apache_exporter.pp
index 3e8dffb..ffbdcf3 100644
--- a/modules/role/manifests/prometheus/apache_exporter.pp
+++ b/modules/role/manifests/prometheus/apache_exporter.pp
@@ -1,14 +1,4 @@
class role::prometheus::apache_exporter {
- prometheus::apache_exporter { 'default': }
-
- $prometheus_nodes = hiera('prometheus_nodes')
- $prometheus_ferm_nodes = join($prometheus_nodes, ' ')
- $ferm_srange = "(@resolve((${prometheus_ferm_nodes}))
@resolve((${prometheus_ferm_nodes}), AAAA))"
-
- ferm::service { 'prometheus-apache_exporter':
- proto => 'tcp',
- port => '9117',
- srange => $ferm_srange,
- }
+ include ::profile::prometheus::apache_exporter
}
--
To view, visit https://gerrit.wikimedia.org/r/366830
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I92c9ae7b6abf4f5c1e2af187158b3302d1d93059
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
