From 4ab9195df1b71173e0e54159523cf0d167a1abb7 Mon Sep 17 00:00:00 2001 From: mh Date: Wed, 20 Oct 2010 21:15:10 +0200 Subject: rename check_ssh port cmd, add ssh_port_host cmd --- manifests/defaults/commands.pp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'manifests/defaults/commands.pp') diff --git a/manifests/defaults/commands.pp b/manifests/defaults/commands.pp index 25ab1bc..bd67198 100644 --- a/manifests/defaults/commands.pp +++ b/manifests/defaults/commands.pp @@ -49,8 +49,10 @@ class nagios::defaults::commands { command_line => '$USER1$/check_disk -w $ARG1$ -c $ARG2$ -e'; check_ssh: command_line => '$USER1$/check_ssh $HOSTADDRESS$'; - ssh_port: + check_ssh_port: command_line => '$USER1$/check_ssh -p $ARG1$ $HOSTADDRESS$'; + check_ssh_port_host: + command_line => '$USER1$/check_ssh -p $ARG1$ $ARG2$'; check_http: command_line => '$USER1$/check_http -H $HOSTADDRESS$ -I $HOSTADDRESS$'; check_https: -- cgit v1.2.3 From a6fc95172382e10b3341e6f973b7d7f4159cf67b Mon Sep 17 00:00:00 2001 From: mh Date: Wed, 20 Oct 2010 23:16:40 +0200 Subject: add check_git command --- manifests/defaults/commands.pp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'manifests/defaults/commands.pp') diff --git a/manifests/defaults/commands.pp b/manifests/defaults/commands.pp index bd67198..9375858 100644 --- a/manifests/defaults/commands.pp +++ b/manifests/defaults/commands.pp @@ -79,6 +79,8 @@ class nagios::defaults::commands { command_line => '$USER1$/check_tcp -H $ARG1$ -p $ARG2$'; check_jabber: command_line => '$USER1$/check_jabber -H $ARG1$'; + check_git: + command_line => '$USER1$/check_tcp -H $ARG1$ -p 9418'; } } } -- cgit v1.2.3 From 6227899364bc721b9c728151a69c46386d96cf44 Mon Sep 17 00:00:00 2001 From: mh Date: Thu, 21 Oct 2010 02:24:09 +0200 Subject: add check_dns2 check_dns had some problems with down nameservers. This one properly checks the right nameserver. --- manifests/defaults/commands.pp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'manifests/defaults/commands.pp') diff --git a/manifests/defaults/commands.pp b/manifests/defaults/commands.pp index 9375858..06e45e9 100644 --- a/manifests/defaults/commands.pp +++ b/manifests/defaults/commands.pp @@ -98,6 +98,10 @@ class nagios::defaults::commands { # from mysql module check_mysql_health: command_line => '$USER1$/check_mysql_health --hostname $ARG1$ --port $ARG2$ --username $ARG3$ --password $ARG4$ --mode $ARG5$ --database $ARG6$'; + + # better check_dns + check_dns2: + command_line => '$USER1$/check_dns2 -c $ARG1 A $ARG2'; } # notification commands -- cgit v1.2.3 From e0c7a26923547adeee09429c1b419f18f4577dac Mon Sep 17 00:00:00 2001 From: mh Date: Thu, 21 Oct 2010 03:33:54 +0200 Subject: fix typo in commands --- manifests/defaults/commands.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests/defaults/commands.pp') diff --git a/manifests/defaults/commands.pp b/manifests/defaults/commands.pp index 06e45e9..e061e79 100644 --- a/manifests/defaults/commands.pp +++ b/manifests/defaults/commands.pp @@ -101,7 +101,7 @@ class nagios::defaults::commands { # better check_dns check_dns2: - command_line => '$USER1$/check_dns2 -c $ARG1 A $ARG2'; + command_line => '$USER1$/check_dns2 -c $ARG1$ A $ARG2$'; } # notification commands -- cgit v1.2.3 From 9dfbd0d0e01f4d64b693779658bbd9c1faad7d08 Mon Sep 17 00:00:00 2001 From: mh Date: Sat, 23 Oct 2010 00:53:18 +0200 Subject: add some more http(s) tests --- manifests/defaults/commands.pp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'manifests/defaults/commands.pp') diff --git a/manifests/defaults/commands.pp b/manifests/defaults/commands.pp index e061e79..655da48 100644 --- a/manifests/defaults/commands.pp +++ b/manifests/defaults/commands.pp @@ -17,6 +17,14 @@ class nagios::defaults::commands { command_line => '$USER1$/check_http --ssl -H $ARG1$ -u $ARG2$'; check_https_url_regex: command_line => '$USER1$/check_http --ssl -H $ARG1$ -u $ARG2$ -e $ARG3$'; + check_http_port_url_content: + command_line => '$USER1$/check_http -H $ARG1$ -p $ARG2$ -u $ARG3$ -s $ARG4$'; + check_https_port_url_content: + command_line => '$USER1$/check_http --ssl -H $ARG1$ -p $ARG2$ -u $ARG3$ -s $ARG4$'; + check_http_url_content: + command_line => '$USER1$/check_http -H $ARG1$ -u $ARG2$ -s $ARG3$'; + check_https_url_content: + command_line => '$USER1$/check_http --ssl -H $ARG1$ -u $ARG2$ -s $ARG3$'; check_mysql_db: command_line => '$USER1$/check_mysql -H $ARG1$ -P $ARG2$ -u $ARG3$ -p $ARG4$ -d $ARG5$'; check_ntp_time: -- cgit v1.2.3 From 36522dfeac8f5b2405282b9d01cd6e83d50d3de6 Mon Sep 17 00:00:00 2001 From: mh Date: Sat, 23 Oct 2010 01:09:41 +0200 Subject: define commands at the right place --- manifests/defaults/commands.pp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'manifests/defaults/commands.pp') diff --git a/manifests/defaults/commands.pp b/manifests/defaults/commands.pp index 655da48..e0b97d1 100644 --- a/manifests/defaults/commands.pp +++ b/manifests/defaults/commands.pp @@ -17,14 +17,6 @@ class nagios::defaults::commands { command_line => '$USER1$/check_http --ssl -H $ARG1$ -u $ARG2$'; check_https_url_regex: command_line => '$USER1$/check_http --ssl -H $ARG1$ -u $ARG2$ -e $ARG3$'; - check_http_port_url_content: - command_line => '$USER1$/check_http -H $ARG1$ -p $ARG2$ -u $ARG3$ -s $ARG4$'; - check_https_port_url_content: - command_line => '$USER1$/check_http --ssl -H $ARG1$ -p $ARG2$ -u $ARG3$ -s $ARG4$'; - check_http_url_content: - command_line => '$USER1$/check_http -H $ARG1$ -u $ARG2$ -s $ARG3$'; - check_https_url_content: - command_line => '$USER1$/check_http --ssl -H $ARG1$ -u $ARG2$ -s $ARG3$'; check_mysql_db: command_line => '$USER1$/check_mysql -H $ARG1$ -P $ARG2$ -u $ARG3$ -p $ARG4$ -d $ARG5$'; check_ntp_time: @@ -99,6 +91,16 @@ class nagios::defaults::commands { # from apache module http_port: command_line => '$USER1$/check_http -p $ARG1$ -H $HOSTADDRESS$ -I $HOSTADDRESS$'; + + check_http_port_url_content: + command_line => '$USER1$/check_http -H $ARG1$ -p $ARG2$ -u $ARG3$ -s $ARG4$'; + check_https_port_url_content: + command_line => '$USER1$/check_http --ssl -H $ARG1$ -p $ARG2$ -u $ARG3$ -s $ARG4$'; + check_http_url_content: + command_line => '$USER1$/check_http -H $ARG1$ -u $ARG2$ -s $ARG3$'; + check_https_url_content: + command_line => '$USER1$/check_http --ssl -H $ARG1$ -u $ARG2$ -s $ARG3$'; + # from bind module check_dig2: command_line => '$USER1$/check_dig -H $HOSTADDRESS$ -l $ARG1$ --record_type=$ARG2$'; -- cgit v1.2.3 From 0c101a6577dcb5c7f07d33e200ac0d04ac6dceef Mon Sep 17 00:00:00 2001 From: mh Date: Sun, 12 Dec 2010 16:24:47 +0100 Subject: include the commands at the right place --- manifests/defaults/commands.pp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'manifests/defaults/commands.pp') diff --git a/manifests/defaults/commands.pp b/manifests/defaults/commands.pp index e0b97d1..27cb641 100644 --- a/manifests/defaults/commands.pp +++ b/manifests/defaults/commands.pp @@ -1,7 +1,8 @@ class nagios::defaults::commands { - # common service commands + include nagios::command::smtp, + # common service commands case $operatingsystem { debian,ubuntu: { nagios_command { -- cgit v1.2.3 From 7800742705a44ff6d32bbb0415ea0b1f954a8fcd Mon Sep 17 00:00:00 2001 From: mh Date: Sun, 12 Dec 2010 16:38:46 +0100 Subject: fix typo --- manifests/defaults/commands.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests/defaults/commands.pp') diff --git a/manifests/defaults/commands.pp b/manifests/defaults/commands.pp index 27cb641..c5147b4 100644 --- a/manifests/defaults/commands.pp +++ b/manifests/defaults/commands.pp @@ -1,6 +1,6 @@ class nagios::defaults::commands { - include nagios::command::smtp, + include nagios::command::smtp # common service commands case $operatingsystem { -- cgit v1.2.3 From 1c4de48baf4ffcf5f39894a101a3c59479959b47 Mon Sep 17 00:00:00 2001 From: mh Date: Sun, 12 Dec 2010 17:41:28 +0100 Subject: add imap and pop3 commands --- manifests/defaults/commands.pp | 1 + 1 file changed, 1 insertion(+) (limited to 'manifests/defaults/commands.pp') diff --git a/manifests/defaults/commands.pp b/manifests/defaults/commands.pp index c5147b4..933f3b9 100644 --- a/manifests/defaults/commands.pp +++ b/manifests/defaults/commands.pp @@ -1,6 +1,7 @@ class nagios::defaults::commands { include nagios::command::smtp + include nagios::command::imap_pop3 # common service commands case $operatingsystem { -- cgit v1.2.3 From 1c4844d696b7ab50b8e1337d6d294e75b73189b2 Mon Sep 17 00:00:00 2001 From: mh Date: Mon, 7 Feb 2011 01:31:50 +0100 Subject: fix mail cmd on centos --- manifests/defaults/commands.pp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'manifests/defaults/commands.pp') diff --git a/manifests/defaults/commands.pp b/manifests/defaults/commands.pp index 933f3b9..3c6bc9c 100644 --- a/manifests/defaults/commands.pp +++ b/manifests/defaults/commands.pp @@ -118,12 +118,16 @@ class nagios::defaults::commands { # notification commands + $mail_cmd_location = $operatingsystem ? { + centos => '/bin/mail', + default => '/usr/bin/mail' + } + nagios_command { 'notify-host-by-email': - command_line => '/usr/bin/printf "%b" "***** Nagios *****\n\nNotification Type: $NOTIFICATIONTYPE$\nHost: $HOSTNAME$\nState: $HOSTSTATE$\nAddress: $HOSTADDRESS$\nInfo: $HOSTOUTPUT$\n\nDate/Time: $LONGDATETIME$\n" | /usr/bin/mail -s "** $NOTIFICATIONTYPE$ Host Alert: $HOSTNAME$ is $HOSTSTATE$ **" $CONTACTEMAIL$'; + command_line => "/usr/bin/printf \"%b\" \"***** Nagios *****\n\nNotification Type: $NOTIFICATIONTYPE$\nHost: $HOSTNAME$\nState: $HOSTSTATE$\nAddress: $HOSTADDRESS$\nInfo: $HOSTOUTPUT$\n\nDate/Time: $LONGDATETIME$\n\" | ${mail_cmd_location} -s \"** $NOTIFICATIONTYPE$ Host Alert: $HOSTNAME$ is $HOSTSTATE$ **\" $CONTACTEMAIL$"; 'notify-service-by-email': - command_line => '/usr/bin/printf "%b" "***** Nagios *****\n\nNotification Type: $NOTIFICATIONTYPE$\n\nService: $SERVICEDESC$\nHost: $HOSTALIAS$\nAddress: $HOSTADDRESS$\nState: $SERVICESTATE$\n\nDate/Time: $LONGDATETIME$\n\nAdditional Info:\n\n$SERVICEOUTPUT$" | /usr/bin/mail -s "** $NOTIFICATIONTYPE$ Service Alert: $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$ **" $CONTACTEMAIL$' - + command_line => "/usr/bin/printf \"%b\" \"***** Nagios *****\n\nNotification Type: $NOTIFICATIONTYPE$\n\nService: $SERVICEDESC$\nHost: $HOSTALIAS$\nAddress: $HOSTADDRESS$\nState: $SERVICESTATE$\n\nDate/Time: $LONGDATETIME$\n\nAdditional Info:\n\n$SERVICEOUTPUT$\" | ${mail_cmd_location} -s \"** $NOTIFICATIONTYPE$ Service Alert: $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$ **\" $CONTACTEMAIL$"; } } -- cgit v1.2.3 From 21a7b14d884501e6bc649ff5bf9f17941a80a3dd Mon Sep 17 00:00:00 2001 From: mh Date: Mon, 7 Feb 2011 01:47:09 +0100 Subject: escape new line as we have now double brackets --- manifests/defaults/commands.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'manifests/defaults/commands.pp') diff --git a/manifests/defaults/commands.pp b/manifests/defaults/commands.pp index 3c6bc9c..e74368d 100644 --- a/manifests/defaults/commands.pp +++ b/manifests/defaults/commands.pp @@ -125,9 +125,9 @@ class nagios::defaults::commands { nagios_command { 'notify-host-by-email': - command_line => "/usr/bin/printf \"%b\" \"***** Nagios *****\n\nNotification Type: $NOTIFICATIONTYPE$\nHost: $HOSTNAME$\nState: $HOSTSTATE$\nAddress: $HOSTADDRESS$\nInfo: $HOSTOUTPUT$\n\nDate/Time: $LONGDATETIME$\n\" | ${mail_cmd_location} -s \"** $NOTIFICATIONTYPE$ Host Alert: $HOSTNAME$ is $HOSTSTATE$ **\" $CONTACTEMAIL$"; + command_line => "/usr/bin/printf \"%b\" \"***** Nagios *****\\n\\nNotification Type: $NOTIFICATIONTYPE$\\nHost: $HOSTNAME$\\nState: $HOSTSTATE$\\nAddress: $HOSTADDRESS$\\nInfo: $HOSTOUTPUT$\\n\\nDate/Time: $LONGDATETIME$\\n\" | ${mail_cmd_location} -s \"** $NOTIFICATIONTYPE$ Host Alert: $HOSTNAME$ is $HOSTSTATE$ **\" $CONTACTEMAIL$"; 'notify-service-by-email': - command_line => "/usr/bin/printf \"%b\" \"***** Nagios *****\n\nNotification Type: $NOTIFICATIONTYPE$\n\nService: $SERVICEDESC$\nHost: $HOSTALIAS$\nAddress: $HOSTADDRESS$\nState: $SERVICESTATE$\n\nDate/Time: $LONGDATETIME$\n\nAdditional Info:\n\n$SERVICEOUTPUT$\" | ${mail_cmd_location} -s \"** $NOTIFICATIONTYPE$ Service Alert: $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$ **\" $CONTACTEMAIL$"; + command_line => "/usr/bin/printf \"%b\" \"***** Nagios *****\\n\\nNotification Type: $NOTIFICATIONTYPE$\\n\\nService: $SERVICEDESC$\\nHost: $HOSTALIAS$\\nAddress: $HOSTADDRESS$\\nState: $SERVICESTATE$\\n\\nDate/Time: $LONGDATETIME$\\n\\nAdditional Info:\\n\\n$SERVICEOUTPUT$\" | ${mail_cmd_location} -s \"** $NOTIFICATIONTYPE$ Service Alert: $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$ **\" $CONTACTEMAIL$"; } } -- cgit v1.2.3 From 1d9eeaba5f14172a685e3c1c34c0f7b4fd45ce34 Mon Sep 17 00:00:00 2001 From: mh Date: Mon, 7 Feb 2011 02:04:17 +0100 Subject: we need also to escape the $ --- manifests/defaults/commands.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'manifests/defaults/commands.pp') diff --git a/manifests/defaults/commands.pp b/manifests/defaults/commands.pp index e74368d..f542d7b 100644 --- a/manifests/defaults/commands.pp +++ b/manifests/defaults/commands.pp @@ -125,9 +125,9 @@ class nagios::defaults::commands { nagios_command { 'notify-host-by-email': - command_line => "/usr/bin/printf \"%b\" \"***** Nagios *****\\n\\nNotification Type: $NOTIFICATIONTYPE$\\nHost: $HOSTNAME$\\nState: $HOSTSTATE$\\nAddress: $HOSTADDRESS$\\nInfo: $HOSTOUTPUT$\\n\\nDate/Time: $LONGDATETIME$\\n\" | ${mail_cmd_location} -s \"** $NOTIFICATIONTYPE$ Host Alert: $HOSTNAME$ is $HOSTSTATE$ **\" $CONTACTEMAIL$"; + command_line => "/usr/bin/printf \"%b\" \"***** Nagios *****\\n\\nNotification Type: \$NOTIFICATIONTYPE\$\\nHost: \\$HOSTNAME\\$\\nState: \$HOSTSTATE\$\\nAddress: \$HOSTADDRESS\$\\nInfo: \$HOSTOUTPUT\$\\n\\nDate/Time: \$LONGDATETIME\$\\n\" | ${mail_cmd_location} -s \"** \$NOTIFICATIONTYPE\$ Host Alert: \$HOSTNAME\$ is \$HOSTSTATE\$ **\" \$CONTACTEMAIL\$"; 'notify-service-by-email': - command_line => "/usr/bin/printf \"%b\" \"***** Nagios *****\\n\\nNotification Type: $NOTIFICATIONTYPE$\\n\\nService: $SERVICEDESC$\\nHost: $HOSTALIAS$\\nAddress: $HOSTADDRESS$\\nState: $SERVICESTATE$\\n\\nDate/Time: $LONGDATETIME$\\n\\nAdditional Info:\\n\\n$SERVICEOUTPUT$\" | ${mail_cmd_location} -s \"** $NOTIFICATIONTYPE$ Service Alert: $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$ **\" $CONTACTEMAIL$"; + command_line => "/usr/bin/printf \"%b\" \"***** Nagios *****\\n\\nNotification Type: \$NOTIFICATIONTYPE\$\\n\\nService: \$SERVICEDESC\$\\nHost: \$HOSTALIAS\$\\nAddress: \$HOSTADDRESS\$\\nState: \$SERVICESTATE\$\\n\\nDate/Time: \$LONGDATETIME\$\\n\\nAdditional Info:\\n\\n\$SERVICEOUTPUT\$\" | ${mail_cmd_location} -s \"** \$NOTIFICATIONTYPE\$ Service Alert: \$HOSTALIAS\$/\$SERVICEDESC\$ is \$SERVICESTATE\$ **\" \$CONTACTEMAIL\$"; } } -- cgit v1.2.3 From f2df62c9d17d481a3d616a4f2de9496638fadc0a Mon Sep 17 00:00:00 2001 From: mh Date: Sun, 6 Mar 2011 18:12:14 +0100 Subject: add dnsbl check command --- manifests/defaults/commands.pp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'manifests/defaults/commands.pp') diff --git a/manifests/defaults/commands.pp b/manifests/defaults/commands.pp index f542d7b..17d1408 100644 --- a/manifests/defaults/commands.pp +++ b/manifests/defaults/commands.pp @@ -114,6 +114,10 @@ class nagios::defaults::commands { # better check_dns check_dns2: command_line => '$USER1$/check_dns2 -c $ARG1$ A $ARG2$'; + + # dnsbl checking + check_dnsbl: + command_line => '$USER1$/check_dnsbl -H $ARG1$'; } # notification commands -- cgit v1.2.3