Dzahn has submitted this change and it was merged. Change subject: adjust NRPE commands for jenkins to use regex and check for exactly 1 process ......................................................................
adjust NRPE commands for jenkins to use regex and check for exactly 1 process Change-Id: Id1cee0a097a75b7d53eb2b67f0a6f1e5555dbbf0 --- M templates/icinga/nrpe_local.cfg.erb M templates/nagios/nrpe_local.cfg.erb 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/templates/icinga/nrpe_local.cfg.erb b/templates/icinga/nrpe_local.cfg.erb index 59a2229..d26bcfe 100644 --- a/templates/icinga/nrpe_local.cfg.erb +++ b/templates/icinga/nrpe_local.cfg.erb @@ -10,8 +10,8 @@ # process checks, we can't make this generic because we don't pass args via nrpe (security) command[check_ircecho]=/usr/lib/nagios/plugins/check_procs -w 1:4 -c 1:20 -a ircecho -command[check_jenkins]=/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1:20 -a jenkins -command[check_zuul]=/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1:20 -a zuul-server +command[check_jenkins]=/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 --ereg-argument-array '^/usr/bin/java -jar /usr/share/jenkins/jenkins.war' +command[check_zuul]=/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -a zuul-server command[check_mailman]=/usr/lib/nagios/plugins/check_procs -w 1:25 -c 1:35 -a mailman command[check_spamd]=/usr/lib/nagios/plugins/check_procs -w 1:20 -c 1:40 -a spamd command[check_poolcounterd]=/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:3 -C poolcounterd diff --git a/templates/nagios/nrpe_local.cfg.erb b/templates/nagios/nrpe_local.cfg.erb index 91b143d..11bb499 100644 --- a/templates/nagios/nrpe_local.cfg.erb +++ b/templates/nagios/nrpe_local.cfg.erb @@ -10,8 +10,8 @@ # process checks, we can't make this generic because we don't pass args via nrpe (security) command[check_ircecho]=/usr/lib/nagios/plugins/check_procs -w 1:4 -c 1:20 -a ircecho -command[check_jenkins]=/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1:20 -a jenkins -command[check_zuul]=/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1:20 -a zuul-server +command[check_jenkins]=/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 --ereg-argument-array '^/usr/bin/java -jar /usr/share/jenkins/jenkins.war' +command[check_zuul]=/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -a zuul-server command[check_mailman]=/usr/lib/nagios/plugins/check_procs -w 1:25 -c 1:35 -a mailman command[check_spamd]=/usr/lib/nagios/plugins/check_procs -w 1:20 -c 1:40 -a spamd command[check_poolcounterd]=/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:3 -C poolcounterd -- To view, visit https://gerrit.wikimedia.org/r/51070 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id1cee0a097a75b7d53eb2b67f0a6f1e5555dbbf0 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
