From 60ebd42e903db7f5c1f8bb2f1d447e4d952a7265 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Fri, 10 Feb 2012 14:42:16 +0100
Subject: use trocla for that password

---
 manifests/service/mysql.pp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'manifests/service')

diff --git a/manifests/service/mysql.pp b/manifests/service/mysql.pp
index d501f06..95f0970 100644
--- a/manifests/service/mysql.pp
+++ b/manifests/service/mysql.pp
@@ -1,11 +1,11 @@
-# Checks a mysql instance via tcp or socket                                                                                                               
+# 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 = $nagios_mysql_password,
+  $check_password = trocla("mysql_nagios_${::fqdn}",'plain','length: 32'),
   $check_database = 'information_schema',
   $check_warning = undef,
   $check_critical = undef,
@@ -20,7 +20,7 @@ define nagios::service::mysql(
   if ($check_host == 'absent') {
     fail("Please specify a hostname, ip address or socket to check a mysql instance.")
   }
-  
+
   case $check_mode {
     'tcp': {
       if ($check_host == 'localhost') {
@@ -39,7 +39,7 @@ define nagios::service::mysql(
       }
     }
   }
-  
+
   nagios::service { "mysql_health_${name}":
     ensure        => $ensure,
     check_command => "check_mysql_health!${check_host}!${check_port}!${check_username}!${check_password}!${name}!${check_database}",
-- 
cgit v1.2.3


From b0a5c09d81d0eb5151c32c6d8d14753c8529ede5 Mon Sep 17 00:00:00 2001
From: Erik Froese <erik.froese@gmail.com>
Date: Wed, 25 Apr 2012 09:57:39 -0400
Subject: Add the port arg to check_http_url_regex. Default 80.

---
 manifests/service/http.pp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'manifests/service')

diff --git a/manifests/service/http.pp b/manifests/service/http.pp
index 8fd5059..ef63abb 100644
--- a/manifests/service/http.pp
+++ b/manifests/service/http.pp
@@ -6,6 +6,7 @@
 define nagios::service::http(
     $ensure = present,
     $check_domain = 'absent',
+    $port = '80',
     $check_url = '/',
     $check_code = 'OK',
     $use = 'generic-service',
@@ -27,7 +28,7 @@ define nagios::service::http(
                     nagios::service{"httprd_${name}":
                         ensure => $ensure,
                         use => $use,
-                        check_command => "check_http_url_regex!${real_check_domain}!${check_url}!'301'",
+                        check_command => "check_http_url_regex!${real_check_domain}!${port}!${check_url}!'301'",
                     }
                 }
             }
@@ -38,7 +39,7 @@ define nagios::service::http(
             nagios::service{"http_${name}_${check_code}":
                 ensure => $ensure,
                 use => $use,
-                check_command => "check_http_url_regex!${real_check_domain}!${check_url}!'${check_code}'",
+                check_command => "check_http_url_regex!${real_check_domain}!${port}!${check_url}!'${check_code}'",
             }
         }
     }
-- 
cgit v1.2.3


From 0fe7552f256f0b1508cc5d3cab952eb93bee6811 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Tue, 5 Jun 2012 19:34:51 -0300
Subject: new style for 2.7

---
 manifests/service/ntp.pp  |  8 ++++----
 manifests/service/ping.pp | 16 ++++++----------
 2 files changed, 10 insertions(+), 14 deletions(-)

(limited to 'manifests/service')

diff --git a/manifests/service/ntp.pp b/manifests/service/ntp.pp
index eca255a..b3cde2a 100644
--- a/manifests/service/ntp.pp
+++ b/manifests/service/ntp.pp
@@ -1,9 +1,9 @@
 # manifests/service/ntp.pp
 
 class nagios::service::ntp {
-    nagios::service{ "check_ntp":
-        check_command => "check_ntp_time",
-        host_name => $fqdn,
-    }
+  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 c705c68..80f2114 100644
--- a/manifests/service/ping.pp
+++ b/manifests/service/ping.pp
@@ -1,13 +1,9 @@
 define nagios::service::ping(
-    $ensure = present
+    $ensure = present,
+    $ping_rate = hiera('nagios_ping_rate','!100.0,20%!500.0,60%')
 ){
-    $real_nagios_ping_rate = $nagios_ping_rate ? {
-        '' => '!100.0,20%!500.0,60%',
-        default => $nagios_ping_rate
-    }
-
-    nagios::service{ "check_ping":
-        ensure => $ensure,
-        check_command => "check_ping${real_nagios_ping_rate}",
-    }
+  nagios::service{ "check_ping":
+    ensure => $ensure,
+    check_command => "check_ping${ping_rate}",
+  }
 }
-- 
cgit v1.2.3


From 41fe95b36253826b8f801ee1669acdb28c70076c Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Thu, 14 Jun 2012 10:36:25 -0300
Subject: take hiera out of the params

---
 manifests/service/ping.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'manifests/service')

diff --git a/manifests/service/ping.pp b/manifests/service/ping.pp
index 80f2114..f1c8d87 100644
--- a/manifests/service/ping.pp
+++ b/manifests/service/ping.pp
@@ -1,6 +1,6 @@
 define nagios::service::ping(
     $ensure = present,
-    $ping_rate = hiera('nagios_ping_rate','!100.0,20%!500.0,60%')
+    $ping_rate = '!100.0,20%!500.0,60%'
 ){
   nagios::service{ "check_ping":
     ensure => $ensure,
-- 
cgit v1.2.3