[MediaWiki-commits] [Gerrit] fix jenkins and zuul process monitoring (turn into NRPE checks) - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: fix jenkins and zuul process monitoring (turn into NRPE checks)
......................................................................


fix jenkins and zuul process monitoring (turn into NRPE checks)

Change-Id: Icbbb61efacec290fe85a2b45dd220147816c24f2
---
M manifests/misc/contint.pp
M manifests/zuul.pp
2 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/manifests/misc/contint.pp b/manifests/misc/contint.pp
index 751152c..c9b3e29 100644
--- a/manifests/misc/contint.pp
+++ b/manifests/misc/contint.pp
@@ -151,7 +151,7 @@
                }
 
                # nagios monitoring
-               monitor_service { "jenkins": description => 
"jenkins_service_running", check_command => 
"check_procs_generic!1!3!1!20!jenkins" }
+               monitor_service { 'jenkins': description => 
'jenkins_service_running', check_command => 'nrpe_check_jenkins' }
 
                file {
                        "/var/lib/jenkins":
diff --git a/manifests/zuul.pp b/manifests/zuul.pp
index c81a098..bebfb53 100644
--- a/manifests/zuul.pp
+++ b/manifests/zuul.pp
@@ -31,8 +31,8 @@
                                push_change_refs => $push_change_refs,
                        }
 
-                       # nagios monitoring
-                       monitor_service { "zuul": description => 
"zuul_service_running", check_command => 
"check_procs_generic!1!3!1!20!zuul-server" }
+                       # nagios/icinga monitoring
+                       monitor_service { 'zuul': description => 
'zuul_service_running', check_command => 'nrpe_check_zuul' }
 
                        # Deploy Wikimedia Zuul configuration files.
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icbbb61efacec290fe85a2b45dd220147816c24f2
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits