From d96b70dc892bcf6e76bd6be96e9c15325f784a15 Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Mon, 28 Dec 2009 14:12:24 -0500
Subject: remove $hostname from service names: these are added internally to
 nagios_service type, but should not appear for service descriptions in nagios

---
 manifests/service/http.pp | 6 +++---
 manifests/service/ntp.pp  | 2 +-
 manifests/service/ping.pp | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'manifests')

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}",
     }
-- 
cgit v1.2.3