From d51c4fb34ba3cc9df45186b5eb556d45d298b05c Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Sat, 25 Dec 2010 18:26:22 -0500
Subject: fix the --warning --critical by appending it as optional ending
 arguments in the command specifier

---
 manifests/defaults/commands.pp | 2 +-
 manifests/service/mysql.pp     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/defaults/commands.pp b/manifests/defaults/commands.pp
index 25ab1bc..20e0d7b 100644
--- a/manifests/defaults/commands.pp
+++ b/manifests/defaults/commands.pp
@@ -93,7 +93,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$';
     }
 
     # notification commands
diff --git a/manifests/service/mysql.pp b/manifests/service/mysql.pp
index 96b63c6..ab4d8db 100644
--- a/manifests/service/mysql.pp
+++ b/manifests/service/mysql.pp
@@ -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}!${real_check_warning}${real_check_critical}${name}!${check_database}",
+    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