From 6c74be1b9365826063d8298acd73f8c5717531ff Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Sat, 25 Dec 2010 18:51:18 -0500 Subject: it might be that having ! when there are no arguments will cause nagios to be unhappy, so lets only put them in when we have arguments to pass --- manifests/service/mysql.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/service/mysql.pp b/manifests/service/mysql.pp index ab4d8db..7ebdd85 100644 --- a/manifests/service/mysql.pp +++ b/manifests/service/mysql.pp @@ -22,11 +22,11 @@ define nagios::service::mysql( } if $check_warning != undef { - $real_check_warning = "--warning $check_warning" + $real_check_warning = "!--warning $check_warning" } if $check_critical != undef { - $real_check_critical = "--critical $check_critical" + $real_check_critical = "!--critical $check_critical" } case $check_mode { @@ -50,6 +50,6 @@ define nagios::service::mysql( nagios::service { "mysql_health_${name}": ensure => $ensure, - check_command => "check_mysql_health!${real_check_host}!${check_port}!${check_username}!${check_password}!${name}!${check_database}!${real_check_warning}!${real_check_critical}", + check_command => "check_mysql_health!${real_check_host}!${check_port}!${check_username}!${check_password}!${name}!${check_database}${real_check_warning}${real_check_critical}", } } -- cgit v1.2.3