From 6ec1a7278b66826b2e64589ab5336243b27cffdb Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Fri, 11 Dec 2009 14:24:55 -0500
Subject: add mysql commands and service

---
 manifests/service/mysql.pp | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 manifests/service/mysql.pp

(limited to 'manifests/service/mysql.pp')

diff --git a/manifests/service/mysql.pp b/manifests/service/mysql.pp
new file mode 100644
index 0000000..d09f335
--- /dev/null
+++ b/manifests/service/mysql.pp
@@ -0,0 +1,35 @@
+define nagios::service::mysql(
+    $ensure = present,
+    $check_hostname = 'localhost',
+    $check_socket = 'absent',
+    $check_username = 'nagios',
+    $check_password = '',
+    $check_database = '',
+    $check_mode = 'absent'
+){
+
+    $real_check_mode = $check_mode ? {
+        'absent' => 'tcp',
+        default => 'socket',
+    }
+
+    case $real_check_mode {
+        # Check MySQL using TCP
+        'tcp': {
+            nagios::service { 'mysql_tcp':
+                ensure => $ensure,
+                check_command => "check_mysql_tcp!${check_hostname}!${check_username}!${check_password}!${check_database}",
+            }
+        }
+        # Check MySQL using local socket
+        'socket': {
+            nagios::service { 'mysql_socket':
+                ensure => $ensure,
+                check_command => $check_socket ? {
+                    'absent' => "check_mysql!${check_username}!${check_password}!${check_database}",
+                    default => "check_mysql_socket!${check_socket}!${check_username}!${check_password}!${check_database}",
+                },
+            }
+        }
+    }
+}
-- 
cgit v1.2.3


From 83963cef28ca42055d5becbf0b697ee1f4bd5d4a Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Tue, 22 Dec 2009 11:00:09 -0500
Subject: adjust mysql commands & service

---
 manifests/service/mysql.pp | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

(limited to 'manifests/service/mysql.pp')

diff --git a/manifests/service/mysql.pp b/manifests/service/mysql.pp
index d09f335..9d99d09 100644
--- a/manifests/service/mysql.pp
+++ b/manifests/service/mysql.pp
@@ -4,30 +4,24 @@ define nagios::service::mysql(
     $check_socket = 'absent',
     $check_username = 'nagios',
     $check_password = '',
-    $check_database = '',
-    $check_mode = 'absent'
+    $check_mode = 'tcp'
 ){
 
-    $real_check_mode = $check_mode ? {
-        'absent' => 'tcp',
-        default => 'socket',
-    }
-
-    case $real_check_mode {
+    case $check_mode {
         # Check MySQL using TCP
         'tcp': {
             nagios::service { 'mysql_tcp':
                 ensure => $ensure,
-                check_command => "check_mysql_tcp!${check_hostname}!${check_username}!${check_password}!${check_database}",
+                check_command => "check_mysql_tcp!${check_hostname}!${check_username}!${check_password}",
             }
         }
         # Check MySQL using local socket
-        'socket': {
+        default: {
             nagios::service { 'mysql_socket':
                 ensure => $ensure,
                 check_command => $check_socket ? {
                     'absent' => "check_mysql!${check_username}!${check_password}!${check_database}",
-                    default => "check_mysql_socket!${check_socket}!${check_username}!${check_password}!${check_database}",
+                    default => "check_mysql_socket!${check_socket}!${check_username}!${check_password}",
                 },
             }
         }
-- 
cgit v1.2.3


From 9c5e3367a6106fbf46aa53014cf5bfa026195d71 Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Mon, 28 Dec 2009 15:10:13 -0500
Subject: add port and database options to mysql service, use 'hostname' plugin
 parameter to specify socket

---
 manifests/service/mysql.pp | 45 ++++++++++++++++++++++++++++++++-------------
 1 file changed, 32 insertions(+), 13 deletions(-)

(limited to 'manifests/service/mysql.pp')

diff --git a/manifests/service/mysql.pp b/manifests/service/mysql.pp
index 9d99d09..ca2ae15 100644
--- a/manifests/service/mysql.pp
+++ b/manifests/service/mysql.pp
@@ -1,29 +1,48 @@
+# Checks a mysql instance via tcp or socket
+
 define nagios::service::mysql(
     $ensure = present,
-    $check_hostname = 'localhost',
-    $check_socket = 'absent',
+    $check_hostname = 'absent',
+    $check_port = '3306',
     $check_username = 'nagios',
     $check_password = '',
+    $check_database = 'absent',
     $check_mode = 'tcp'
 ){
+    if ($check_hostname == 'absent') {
+        fail("Please specify a hostname, ip address or socket to check a mysql instance.")
+    }
 
     case $check_mode {
-        # Check MySQL using TCP
         'tcp': {
-            nagios::service { 'mysql_tcp':
-                ensure => $ensure,
-                check_command => "check_mysql_tcp!${check_hostname}!${check_username}!${check_password}",
+            if ($check_hostname == 'localhost') {
+               $real_check_hostname = '127.0.0.1'
+            }
+            else {
+              $real_check_hostname = $check_hostname
             }
         }
-        # Check MySQL using local socket
         default: {
-            nagios::service { 'mysql_socket':
-                ensure => $ensure,
-                check_command => $check_socket ? {
-                    'absent' => "check_mysql!${check_username}!${check_password}!${check_database}",
-                    default => "check_mysql_socket!${check_socket}!${check_username}!${check_password}",
-                },
+            if ($check_hostname == '127.0.0.1') {
+                $real_check_hostname = 'localhost'
             }
+             else {
+              $real_check_hostname = $check_hostname
+            }
+        }
+    }
+
+    if ($check_database == 'absent') {
+        nagios::service { 'mysql':
+            ensure        => $ensure,
+            check_command => "check_mysql!${real_check_hostname}!${check_port}!${check_username}!${check_password}",
         }
     }
+    else {
+        nagios::service { "mysql_${check_database}":
+            ensure        => $ensure,
+            check_command => "check_mysql_db!${real_check_hostname}!${check_port}!${check_username}!${check_password}!${check_database}",
+        }
+    }
+
 }
-- 
cgit v1.2.3