From: Julien Cristau Date: Fri, 11 Aug 2017 23:12:03 +0000 (-0400) Subject: Revert nrpe dsa2_shutdown command to its state before dsa-is-shutdown-scheduled X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=971573de556cd68ce1ada54f7a07c366c69ed953;p=mirror%2Fdsa-puppet.git Revert nrpe dsa2_shutdown command to its state before dsa-is-shutdown-scheduled Let's try if that restores some sanity to mini-nag. --- diff --git a/modules/nagios/templates/inc-debian.org.erb b/modules/nagios/templates/inc-debian.org.erb index 821786689..817366e71 100644 --- a/modules/nagios/templates/inc-debian.org.erb +++ b/modules/nagios/templates/inc-debian.org.erb @@ -22,7 +22,7 @@ out # if a system is running shutdown. We do not use check_nrpe's # exit code as that does not reliably tell us if the check could # not connect to the nrpe server or if the remote check returned not-null. -command[dsa2_shutdown]=if /usr/local/bin/dsa-is-shutdown-scheduled; then echo 'system-in-shutdown'; else echo 'no shutdown running' ; fi +command[dsa2_shutdown]=if /usr/lib/nagios/plugins/check_procs -w 1: -u root -C shutdown > /dev/null || /usr/lib/nagios/plugins/check_procs -w 1: -u root -a /lib/systemd/systemd-shutdownd > /dev/null || ( busctl get-property org.freedesktop.login1 /org/freedesktop/login1 org.freedesktop.login1.Manager ScheduledShutdown 2> /dev/null | awk '$3 > 0 { t=$3; } END { exit (t == 0)}' ); then echo 'system-in-shutdown'; else echo 'no shutdown running' ; fi command[restart-ekey]=sudo /usr/sbin/service ekeyd-egd-linux restart command[restart-samhain]=sudo /usr/sbin/service samhain restart command[restart-ekey]=sudo /usr/sbin/service ekeyd-egd-linux restart