diff options
| author | mh <mh@immerda.ch> | 2013-01-02 17:51:29 +0100 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2013-01-02 17:51:29 +0100 |
| commit | 2b2268702938453bcece9ebe6070c03929910f8a (patch) | |
| tree | f7ddfdfaf2430b19dcb7f89b3c16ccf4321976de /manifests/defaults | |
| parent | df358dcf15d26ba59b59f686ceee4b07b3aed7dd (diff) | |
| parent | a2a80093d42b7e9eec9d2af3c66138f7ceaf9ed6 (diff) | |
Merge remote-tracking branch 'riseup/master' into HEAD
Conflicts:
manifests/apache.pp
manifests/base.pp
manifests/defaults/templates.pp
manifests/defaults/vars.pp
manifests/init.pp
manifests/irc_bot.pp
manifests/nsca/client.pp
manifests/nsca/server.pp
manifests/service.pp
manifests/service/mysql.pp
templates/irc_bot/nsa.cfg.erb
Diffstat (limited to 'manifests/defaults')
| -rw-r--r-- | manifests/defaults/commands.pp | 6 | ||||
| -rw-r--r-- | manifests/defaults/templates.pp | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/manifests/defaults/commands.pp b/manifests/defaults/commands.pp index 195c8e3..bb19638 100644 --- a/manifests/defaults/commands.pp +++ b/manifests/defaults/commands.pp @@ -29,6 +29,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'; } } default: { @@ -109,7 +111,7 @@ 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$'; + command_line => '$USER1$/check_mysql_health --hostname $ARG1$ --port $ARG2$ --username $ARG3$ --password $ARG4$ --mode $ARG5$ --database $ARG6$ $ARG7$ $ARG8$'; # better check_dns check_dns2: @@ -129,7 +131,7 @@ 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\$"; } diff --git a/manifests/defaults/templates.pp b/manifests/defaults/templates.pp index 0e73c97..9711dd4 100644 --- a/manifests/defaults/templates.pp +++ b/manifests/defaults/templates.pp @@ -11,5 +11,4 @@ class nagios::defaults::templates { notify => Service['nagios'], mode => 0644, owner => root, group => root; } - } |