Muehlenhoff has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/398480 )
Change subject: Fix srange for prometheus-rabbitmq-exporter ...................................................................... Fix srange for prometheus-rabbitmq-exporter WMCS prometheus servers don't use ipv6. Also add the missing require_package to install the exporter package. Change-Id: I5722cc36f0b8b153daf1e1670b6f9c1c94e9f15d --- M modules/profile/manifests/prometheus/rabbitmq_exporter.pp 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Muehlenhoff: Looks good to me, approved Rush: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/modules/profile/manifests/prometheus/rabbitmq_exporter.pp b/modules/profile/manifests/prometheus/rabbitmq_exporter.pp index 0699644..9a59582 100644 --- a/modules/profile/manifests/prometheus/rabbitmq_exporter.pp +++ b/modules/profile/manifests/prometheus/rabbitmq_exporter.pp @@ -13,15 +13,16 @@ content => template('profile/prometheus/rabbitmq-exporter.conf.erb'), } + require_package('prometheus-rabbitmq-exporter') + service { 'prometheus-rabbitmq-exporter': ensure => running, require => File['/etc/prometheus/rabbitmq-exporter.yaml'], } - $ferm_srange = "(@resolve((${prometheus_nodes})) @resolve((${prometheus_nodes}), AAAA))" ferm::service { 'prometheus-rabbitmq-exporter': proto => 'tcp', port => '9195', - srange => $ferm_srange, + srange => "@resolve((${prometheus_nodes}))", } } -- To view, visit https://gerrit.wikimedia.org/r/398480 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5722cc36f0b8b153daf1e1670b6f9c1c94e9f15d Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Muehlenhoff <mmuhlenh...@wikimedia.org> Gerrit-Reviewer: Muehlenhoff <mmuhlenh...@wikimedia.org> Gerrit-Reviewer: Rush <r...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits