Filippo Giunchedi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/390260 )

Change subject: prometheus: have multi-instance redis-exporter running, stop 
default one
......................................................................


prometheus: have multi-instance redis-exporter running, stop default one

Bug: T148637
Change-Id: I4d56cbe9ee834cea3200dc88a0b80c36cbf16369
---
M modules/prometheus/manifests/redis_exporter.pp
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  jenkins-bot: Verified
  Filippo Giunchedi: Looks good to me, approved



diff --git a/modules/prometheus/manifests/redis_exporter.pp 
b/modules/prometheus/manifests/redis_exporter.pp
index 8a71e1a..1c8c691 100644
--- a/modules/prometheus/manifests/redis_exporter.pp
+++ b/modules/prometheus/manifests/redis_exporter.pp
@@ -30,9 +30,9 @@
     $service_name = "prometheus-redis-exporter@${instance}"
     $listen_address = "${host}:${port}"
 
-    # We're going with multiple prometheus-redis-exporter, mask the default 
single-instance one.
+    # We're going with multiple prometheus-redis-exporter, mask and stop the 
default single-instance one.
     exec { "mask_default_redis_exporter_${instance}":
-        command => '/bin/systemctl mask prometheus-redis-exporter.service',
+        command => '/bin/systemctl mask prometheus-redis-exporter.service ; 
/bin/systemctl stop prometheus-redis-exporter.service',
         creates => '/etc/systemd/system/prometheus-redis-exporter.service',
     }
 
@@ -47,7 +47,7 @@
     }
 
     systemd::unit { $service_name:
-        ensure  => present,
+        ensure  => running,
         content => systemd_template('prometheus-redis-exporter@'),
         restart => true,
         require => Package['prometheus-redis-exporter'],

-- 
To view, visit https://gerrit.wikimedia.org/r/390260
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4d56cbe9ee834cea3200dc88a0b80c36cbf16369
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to