Muehlenhoff has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/366829 )
Change subject: profile::otrs: Include role::prometheus::apache_exporter
......................................................................
profile::otrs: Include role::prometheus::apache_exporter
Include role::prometheus::apache_exporter instead of adding the ferm
rules manually.
Change-Id: I8de06c052bcf3283f7fd7b15ff106b9cd0a2a12d
---
M modules/profile/manifests/otrs.pp
1 file changed, 1 insertion(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/29/366829/1
diff --git a/modules/profile/manifests/otrs.pp
b/modules/profile/manifests/otrs.pp
index 21b206f..46ef903 100644
--- a/modules/profile/manifests/otrs.pp
+++ b/modules/profile/manifests/otrs.pp
@@ -14,6 +14,7 @@
include ::base::firewall
include network::constants
+ include ::role::prometheus::apache_exporter
class { '::otrs':
otrs_database_host => $otrs_database_host,
@@ -63,17 +64,6 @@
nrpe::monitor_service{ 'freshclam':
description => 'freshclam running',
nrpe_command => '/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u
clamav -C freshclam'
- }
-
- 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,
}
# can conflict with ferm module
--
To view, visit https://gerrit.wikimedia.org/r/366829
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8de06c052bcf3283f7fd7b15ff106b9cd0a2a12d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
