From 217e119ca2254c825c224f4a816476eeeb467e3e Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Thu, 11 Feb 2010 04:35:16 +0000
Subject: [PATCH] make services work again. uses nagios plugins.

git-svn-id: http://www.observium.org/svn/observer/trunk@812 61d68cd4-352d-0410-923a-c4978735b2b8
---
 includes/defaults.inc.php          | 2 ++
 includes/services/dns/check.inc    | 2 +-
 includes/services/ftp/check.inc    | 2 +-
 includes/services/http/check.inc   | 2 +-
 includes/services/imap/check.inc   | 2 +-
 includes/services/mysql/check.inc  | 4 +---
 includes/services/pop/check.inc    | 2 +-
 includes/services/simap/check.inc  | 2 +-
 includes/services/smtp/check.inc   | 2 +-
 includes/services/spop/check.inc   | 2 +-
 includes/services/ssh/check.inc    | 2 +-
 includes/services/telnet/check.inc | 5 ++---
 12 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index 245ce3c6d..25a6273e1 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -10,6 +10,8 @@ $config['snmpwalk']     = "/usr/bin/snmpwalk";
 $config['snmpget']      = "/usr/bin/snmpget";
 $config['snmpbulkwalk'] = "/usr/bin/snmpbulkwalk";
 
+$config['nagios_plugins'] = "/usr/lib/nagios/plugins";
+
 ### Local Specifics
 
 $config['title_image']  = "images/observer-logo.gif";
diff --git a/includes/services/dns/check.inc b/includes/services/dns/check.inc
index 5758f7050..14bc151e0 100644
--- a/includes/services/dns/check.inc
+++ b/includes/services/dns/check.inc
@@ -1,6 +1,6 @@
 <?php
 
-$check = `scripts/services/check_dns -H $service[param] -s $service[hostname]`;
+$check = shell_exec($config['nagios_plugins'] . "/check_dns -H ".$service['param']." -s ".$service['hostname']);
 
 list($check, $time) = split("\|", $check);
 
diff --git a/includes/services/ftp/check.inc b/includes/services/ftp/check.inc
index e3cbaf754..b5ce241f4 100644
--- a/includes/services/ftp/check.inc
+++ b/includes/services/ftp/check.inc
@@ -1,6 +1,6 @@
 <?php
 
-$check = `scripts/services/check_ftp -H $service[hostname]`;
+$check = shell_exec($config['nagios_plugins'] . "/check_ftp -H ".$service['hostname']);
 
 list($check, $time) = split("\|", $check);
 
diff --git a/includes/services/http/check.inc b/includes/services/http/check.inc
index 0905f57c9..d191b7124 100644
--- a/includes/services/http/check.inc
+++ b/includes/services/http/check.inc
@@ -1,6 +1,6 @@
 <?php
 
-$check = `scripts/services/check_http -H $service[hostname] $service[service_param]`;
+$check = shell_exec($config['nagios_plugins'] . "/check_http -H ".$service['hostname']." ".$service['service_param']);
 
 list($check, $time) = split("\|", $check);
 
diff --git a/includes/services/imap/check.inc b/includes/services/imap/check.inc
index eae069e63..36dad2ef9 100644
--- a/includes/services/imap/check.inc
+++ b/includes/services/imap/check.inc
@@ -1,6 +1,6 @@
 <?php
 
-$check = `scripts/services/check_imap -H $service[hostname]`;
+$check = shell_exec($config['nagios_plugins'] . "/check_imap -H ".$service['hostname']);
 
 list($check, $time) = split("\|", $check);
 
diff --git a/includes/services/mysql/check.inc b/includes/services/mysql/check.inc
index b6782c53f..4b4df4506 100644
--- a/includes/services/mysql/check.inc
+++ b/includes/services/mysql/check.inc
@@ -1,8 +1,6 @@
 <?php
 
-$check = `scripts/services/check_mysql -H $service[hostname] $service[service_param]`;
-
-echo($check);
+$check = shell_exec($config['nagios_plugins'] . "/check_mysql -H ".$service['hostname']." ".$service['service_param']);
 
 list($check, $time) = split("\|", $check);
 
diff --git a/includes/services/pop/check.inc b/includes/services/pop/check.inc
index 81f26b467..d88fde414 100644
--- a/includes/services/pop/check.inc
+++ b/includes/services/pop/check.inc
@@ -1,6 +1,6 @@
 <?php
 
-$check = `scripts/services/check_pop -H $service[hostname]`;
+$check = shell_exec($config['nagios_plugins'] . "/check_pop -H ".$service['hostname']);
 
 list($check, $time) = split("\|", $check);
 
diff --git a/includes/services/simap/check.inc b/includes/services/simap/check.inc
index e809b2bf8..f942b31f3 100644
--- a/includes/services/simap/check.inc
+++ b/includes/services/simap/check.inc
@@ -1,6 +1,6 @@
 <?php
 
-$check = `scripts/services/check_simap -H $service[hostname]`;
+$check = shell_exec($config['nagios_plugins'] . "/check_simap -H ".$service['hostname']);
 
 list($check, $time) = split("\|", $check);
 
diff --git a/includes/services/smtp/check.inc b/includes/services/smtp/check.inc
index e57f5f332..385f6cf5e 100644
--- a/includes/services/smtp/check.inc
+++ b/includes/services/smtp/check.inc
@@ -1,6 +1,6 @@
 <?php
 
-$check = `scripts/services/check_smtp -H $service[hostname]`;
+$check = shell_exec($config['nagios_plugins'] . "/check_smtp -H ".$service['hostname']);
 
 list($check, $time) = split("\|", $check);
 
diff --git a/includes/services/spop/check.inc b/includes/services/spop/check.inc
index c46a65c31..d1888c902 100644
--- a/includes/services/spop/check.inc
+++ b/includes/services/spop/check.inc
@@ -1,6 +1,6 @@
 <?php
 
-$check = `scripts/services/check_spop -H $service[hostname]`;
+$check = shell_exec($config['nagios_plugins'] . "/check_spop -H ".$service['hostname']);
 
 list($check, $time) = split("\|", $check);
 
diff --git a/includes/services/ssh/check.inc b/includes/services/ssh/check.inc
index b12e3fd88..348720357 100644
--- a/includes/services/ssh/check.inc
+++ b/includes/services/ssh/check.inc
@@ -1,6 +1,6 @@
 <?php
 
-$check = `scripts/services/check_ssh -H $service[hostname]`;
+$check = shell_exec($config['nagios_plugins'] . "/check_ssh -H ".$service['hostname']);
 
 list($check, $time) = split("\|", $check);
 
diff --git a/includes/services/telnet/check.inc b/includes/services/telnet/check.inc
index 70e7e59e1..e4a38754c 100644
--- a/includes/services/telnet/check.inc
+++ b/includes/services/telnet/check.inc
@@ -1,9 +1,8 @@
 <?php
 
-if($service[service_port]) { $port = $service[service_port]; } else { $port = '23'; }
+if($service['service_port']) { $port = $service['service_port']; } else { $port = '23'; }
 
-
-$check = `scripts/services/check_tcp -H $service[hostname] -p $port`;
+$check = shell_exec($config['nagios_plugins'] . "/check_dns -H ".$service['hostname']." -p ".$port);
 
 list($check, $time) = split("\|", $check);