diff options
| author | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2009-12-28 14:12:24 -0500 |
|---|---|---|
| committer | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2009-12-28 14:12:24 -0500 |
| commit | d96b70dc892bcf6e76bd6be96e9c15325f784a15 (patch) | |
| tree | c9148b7439616adde55683dfebf06b2e9161f0d3 /manifests | |
| parent | 83963cef28ca42055d5becbf0b697ee1f4bd5d4a (diff) | |
remove $hostname from service names: these are added internally to nagios_service type, but should not appear for service descriptions in nagios
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/service/http.pp | 6 | ||||
| -rw-r--r-- | manifests/service/ntp.pp | 2 | ||||
| -rw-r--r-- | manifests/service/ping.pp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/manifests/service/http.pp b/manifests/service/http.pp index 5c6cda1..5fd9890 100644 --- a/manifests/service/http.pp +++ b/manifests/service/http.pp @@ -16,13 +16,13 @@ define nagios::service::http( } case $ssl_mode { 'force',true,'only': { - nagios::service{"https_${name}_${check_code}_${hostname}": + nagios::service{"https_${name}_${check_code}": ensure => $ensure, check_command => "check_https_url_regex!${real_check_domain}!${check_url}!'${check_code}'", } case $ssl_mode { 'force': { - nagios::service{"httprd_${name}_${hostname}": + nagios::service{"httprd_${name}": ensure => $ensure, check_command => "check_http_url_regex!${real_check_domain}!${check_url}!'301'", } @@ -32,7 +32,7 @@ define nagios::service::http( } case $ssl_mode { false,true: { - nagios::service{"http_${name}_${check_code}_${hostname}": + nagios::service{"http_${name}_${check_code}": ensure => $ensure, check_command => "check_http_url_regex!${real_check_domain}!${check_url}!'${check_code}'", } diff --git a/manifests/service/ntp.pp b/manifests/service/ntp.pp index c07177d..eca255a 100644 --- a/manifests/service/ntp.pp +++ b/manifests/service/ntp.pp @@ -1,7 +1,7 @@ # manifests/service/ntp.pp class nagios::service::ntp { - nagios::service{ "check_ntp_${hostname}": + nagios::service{ "check_ntp": check_command => "check_ntp_time", host_name => $fqdn, } diff --git a/manifests/service/ping.pp b/manifests/service/ping.pp index 63a5400..c705c68 100644 --- a/manifests/service/ping.pp +++ b/manifests/service/ping.pp @@ -6,7 +6,7 @@ define nagios::service::ping( default => $nagios_ping_rate } - nagios::service{ "check_ping_${hostname}": + nagios::service{ "check_ping": ensure => $ensure, check_command => "check_ping${real_nagios_ping_rate}", } |