Muehlenhoff has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/366827 )
Change subject: profile::piwik::webserver: Include
role::prometheus::apache_exporter
......................................................................
profile::piwik::webserver: Include role::prometheus::apache_exporter
Include role::prometheus::apache_exporter instead of adding the ferm
rules manually.
Change-Id: I2d685d5ee77b5f7e8c324461d6963eefaa681391
---
M modules/profile/manifests/piwik/webserver.pp
1 file changed, 2 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/27/366827/1
diff --git a/modules/profile/manifests/piwik/webserver.pp
b/modules/profile/manifests/piwik/webserver.pp
index 86700ff..332635e 100644
--- a/modules/profile/manifests/piwik/webserver.pp
+++ b/modules/profile/manifests/piwik/webserver.pp
@@ -57,19 +57,10 @@
notify => Class['::apache'],
}
- 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,
- }
+ include ::role::prometheus::apache_exporter
ferm::service { 'piwik_http':
proto => 'tcp',
port => '80',
}
-}
\ No newline at end of file
+}
--
To view, visit https://gerrit.wikimedia.org/r/366827
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2d685d5ee77b5f7e8c324461d6963eefaa681391
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <mmuhlenh...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
