old jerea is gone, new jerea lives

[mirror/dsa-nagios.git] / config / static / checkcommands.cfg

diff --git a/config/static/checkcommands.cfg b/config/static/checkcommands.cfg
index 9811089..052798f 100644 (file)
--- a/config/static/checkcommands.cfg
+++ b/config/static/checkcommands.cfg
@@ -1,16 +1,15 @@
-# if you read this in /etc/nagios-plugins/config/local-dsa-checkcommands.cfg
-# please note: this file is maintained in bzr and overwritten in the
-# make install target
-#
-# edit the copy in bzr instead, see /etc/nagios3/README-DSA
-#
+#############################################################################
+## THIS FILE IS COPIED TO THE FINAL LOCATION USING PUPPET
+## ITS AUTHORITATIVE HOME IS THE DSA-NAGIOS CONFIGURATION GIT
+#############################################################################
+
 define command {
        command_name    dsa_check_nrpe
        command_line    /usr/lib/nagios/plugins/check_nrpe --no-ssl -H $HOSTADDRESS$ -t 50 -c $ARG1$
 }
 define command {
        command_name    dsa_check_nrpe_host
-       command_line    /usr/lib/nagios/plugins/check_nrpe --no-ssl -H $ARG1$ -c $ARG2$
+       command_line    /usr/lib/nagios/plugins/check_nrpe --no-ssl -H $ARG1$ -t 50 -c $ARG2$
 }
 define command{
        command_name    dsa_check_cert
@@ -48,6 +47,18 @@ define command{
        command_name    dsa_check_mirrorsync
        command_line    /usr/lib/nagios/plugins/dsa-check-mirrorsync --host "$ARG1$" --path "$ARG2$"
 }
+define command{
+       command_name    dsa_check_mirrorsync_skew
+       command_line    /usr/lib/nagios/plugins/dsa-check-mirrorsync --host "$ARG1$" --path "$ARG2$" --allow-skew "$ARG3$"
+}
+define command{
+       command_name    dsa_check_staticsync
+       command_line    /usr/lib/nagios/plugins/dsa-check-mirrorsync --host "$ARG1$" --path .serial --unix --ssl
+}
+define command{
+       command_name    dsa_check_staticsync_nossl
+       command_line    /usr/lib/nagios/plugins/dsa-check-mirrorsync --host "$ARG1$" --path .serial --unix
+}
 define command{
        command_name    dsa_check_soas
        command_line    /usr/lib/nagios/plugins/dsa-check-soas "$ARG1$"
@@ -58,5 +69,21 @@ define command{
 }
 define command{
        command_name    dsa_check_always_ok
-       command_line    /bin/true
+       command_line    /bin/echo "Dummy check - always says OK"
+}
+define command{
+       command_name    dsa_check_ntp
+       command_line    /usr/lib/nagios/plugins/check_ntp_time -H '$HOSTADDRESS$'
+}
+define command{
+       command_name    dsa_check_port_closed
+       command_line    /usr/lib/nagios/plugins/dsa-check-port-closed -H '$HOSTADDRESS$' -p $ARG1$
+}
+define command{
+       command_name    dsa_check_https_want_auth
+       command_line    /usr/lib/nagios/plugins/check_http --ssl -H '$HOSTADDRESS$' -I '$HOSTADDRESS$' -e 'HTTP/1.1 401'
+}
+define command{
+       command_name    dsa_check_https_any_status
+       command_line    /usr/lib/nagios/plugins/check_http --ssl -H '$HOSTADDRESS$' -I '$HOSTADDRESS$' -e 'HTTP/1.1 '
 }