ArielGlenn has uploaded a new change for review. https://gerrit.wikimedia.org/r/126209
Change subject: timeout submit_check_result, see rt #5311 ...................................................................... timeout submit_check_result, see rt #5311 Change-Id: I68d1d56e43ace3d446b69d78b12de7311afbf626 --- M files/snmp/snmptt.conf M files/snmp/snmptt.conf.icinga 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/09/126209/1 diff --git a/files/snmp/snmptt.conf b/files/snmp/snmptt.conf index 2e0f908..5355efe 100644 --- a/files/snmp/snmptt.conf +++ b/files/snmp/snmptt.conf @@ -1,7 +1,7 @@ # wikimedia puppet exec event EVENT enterpriseSpecific .1.3.6.1.4.1.33298.0.1004 "Status Events" Normal FORMAT Exec of puppet event from $r. -EXEC /usr/local/nagios/libexec/eventhandlers/submit_check_result $r "Puppet freshness" 0 "puppet ran at `date`" +EXEC /usr/bin/timeout -s 9 30s /usr/local/nagios/libexec/eventhandlers/submit_check_result $r "Puppet freshness" 0 "puppet ran at `date`" SDESC snmp trap that's sent whenever puppet runs on a wikimedia host. EDESC diff --git a/files/snmp/snmptt.conf.icinga b/files/snmp/snmptt.conf.icinga index a32ed89..61762ad 100644 --- a/files/snmp/snmptt.conf.icinga +++ b/files/snmp/snmptt.conf.icinga @@ -1,7 +1,7 @@ # wikimedia puppet exec event EVENT enterpriseSpecific .1.3.6.1.4.1.33298.0.1004 "Status Events" Normal FORMAT Exec of puppet event from $r. -EXEC /usr/lib/nagios/plugins/eventhandlers/submit_check_result $r "Puppet freshness" 0 "puppet ran at `date`" +EXEC /usr/bin/timeout -s 9 30s /usr/lib/nagios/plugins/eventhandlers/submit_check_result $r "Puppet freshness" 0 "puppet ran at `date`" SDESC snmp trap that's sent whenever puppet runs on a wikimedia host. EDESC -- To view, visit https://gerrit.wikimedia.org/r/126209 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I68d1d56e43ace3d446b69d78b12de7311afbf626 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: ArielGlenn <ar...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
