From e39ac789a87e4737cfe024f07b89d2c9829e22d9 Mon Sep 17 00:00:00 2001
From: Tom Laermans <tom@localhost>
Date: Mon, 7 May 2012 21:56:38 +0000
Subject: [PATCH] make nginx script work via agent, patch by LinuxUser

git-svn-id: http://www.observium.org/svn/observer/trunk@3148 61d68cd4-352d-0410-923a-c4978735b2b8
---
 includes/polling/applications/nginx.inc.php | 21 ++++++++++++++-------
 includes/polling/unix-agent.inc.php         |  1 +
 scripts/agent-local/nginx                   |  1 +
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/includes/polling/applications/nginx.inc.php b/includes/polling/applications/nginx.inc.php
index 3341171ac..b8fafc729 100644
--- a/includes/polling/applications/nginx.inc.php
+++ b/includes/polling/applications/nginx.inc.php
@@ -1,24 +1,31 @@
 <?php
 
-#Polls nginx statistics from script via SNMP
+if (!empty($agent_data['app']['nginx']))
+{
+  $nginx = $agent_data['app']['nginx'];
+} else {
+  # Polls nginx statistics from script via SNMP
+  $nginx_cmd  = $config['snmpget'] ." -m NET-SNMP-EXTEND-MIB -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'];
+  $nginx_cmd .= " nsExtendOutputFull.5.110.103.105.110.120";
+
+  $nginx  = shell_exec($nginx_cmd);
+}
 
 $nginx_rrd  = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-nginx-".$app['app_id'].".rrd";
-$nginx_cmd  = $config['snmpget'] ." -m NET-SNMP-EXTEND-MIB -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'];
-$nginx_cmd .= " nsExtendOutputFull.5.110.103.105.110.120";
-
-$nginx  = shell_exec($nginx_cmd);
 
 echo(" nginx statistics\n");
 
 list($active, $reading, $writing, $waiting, $req) = explode("\n", $nginx);
-if (!is_file($nginx_rrd)) {
-    rrdtool_create ($nginx_rrd, "--step 300 \
+if (!is_file($nginx_rrd))
+{
+  rrdtool_create ($nginx_rrd, "--step 300 \
         DS:Requests:DERIVE:600:0:125000000000 \
         DS:Active:GAUGE:600:0:125000000000 \
         DS:Reading:GAUGE:600:0:125000000000 \
         DS:Writing:GAUGE:600:0:125000000000 \
         DS:Waiting:GAUGE:600:0:125000000000 ".$config['rrd_rra']);
 }
+
 print "active: $active reading: $reading writing: $writing waiting: $waiting Requests: $req";
 rrdtool_update($nginx_rrd, "N:$req:$active:$reading:$writing:$waiting");
 
diff --git a/includes/polling/unix-agent.inc.php b/includes/polling/unix-agent.inc.php
index 406a55566..14e07affb 100755
--- a/includes/polling/unix-agent.inc.php
+++ b/includes/polling/unix-agent.inc.php
@@ -42,6 +42,7 @@ if($device['os_group'] == "unix")
 
       if ($section == "apache") { $sa = "app"; $sb = "apache"; }
       if ($section == "mysql")  { $sa = "app"; $sb = "mysql"; }
+      if ($section == "nginx")  { $sa = "app"; $sb = "nginx"; }
 #      if ($section == "drbd")   { $sa = "app"; $sb = "drbd"; }
 
       if (!empty($sa) && !empty($sb))
diff --git a/scripts/agent-local/nginx b/scripts/agent-local/nginx
index 11a19cf3c..9b27c1d0a 100755
--- a/scripts/agent-local/nginx
+++ b/scripts/agent-local/nginx
@@ -28,6 +28,7 @@ dataorder = [
 	"Requests"
 	]
 
+print "<<<nginx>>>\n";
 
 for param in dataorder:
     if param == "Active":