diff options
| author | Micah Anderson <micah@riseup.net> | 2013-01-23 11:44:05 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-01-23 11:44:05 -0500 |
| commit | 08c3aa9aaf2cc90cfdee2c8191d83f9cede4bf39 (patch) | |
| tree | c29ec1e86efd6eaa84520b37613d847855cedfe2 /manifests/service/mysql.pp | |
| parent | 3a1ebac1ed5c34df90bd174f0f269f2f7ac62974 (diff) | |
| parent | 8fd89115cc15295e20234578b45fdecc8bcf1c70 (diff) | |
Merge remote-tracking branch 'shared/master'
Conflicts:
README
manifests/irc_bot.pp
manifests/irc_bot/base.pp
templates/irc_bot/nsa.cfg.erb
Diffstat (limited to 'manifests/service/mysql.pp')
| -rw-r--r-- | manifests/service/mysql.pp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/manifests/service/mysql.pp b/manifests/service/mysql.pp index 94881d8..9559b17 100644 --- a/manifests/service/mysql.pp +++ b/manifests/service/mysql.pp @@ -1,11 +1,10 @@ # Checks a mysql instance via tcp or socket - define nagios::service::mysql( $ensure = present, $check_host = 'absent', $check_port = '3306', $check_username = 'nagios', - $check_password = trocla("mysql_nagios_${::fqdn}",'plain','length: 32'), + $check_password, $check_database = 'information_schema', $check_warning = undef, $check_critical = undef, @@ -54,6 +53,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}!${check_health_mode}!${check_database}${real_check_name}${real_check_warning}${real_check_critical}", + check_command => "check_mysql_health!${real_check_host}!${check_port}!${check_username}!'${check_password}'!${check_health_mode}!${check_database}${real_check_name}${real_check_warning}${real_check_critical}", } } |