From c0b8070ff0e4dd9db471ce48246d6f3eee7436c7 Mon Sep 17 00:00:00 2001 From: Adam Amstrong Date: Tue, 8 May 2012 10:50:24 +0000 Subject: [PATCH] update nginx application poller to use snmp_get git-svn-id: http://www.observium.org/svn/observer/trunk@3149 61d68cd4-352d-0410-923a-c4978735b2b8 --- includes/polling/applications/nginx.inc.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/includes/polling/applications/nginx.inc.php b/includes/polling/applications/nginx.inc.php index b8fafc729c..b95ae0795c 100644 --- a/includes/polling/applications/nginx.inc.php +++ b/includes/polling/applications/nginx.inc.php @@ -5,10 +5,7 @@ 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 = snmp_get($device, "nsExtendOutputFull.5.110.103.105.110.120", "-Ovq", "NET-SNMP-EXTEND-MIB"); } $nginx_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-nginx-".$app['app_id'].".rrd"; @@ -29,4 +26,13 @@ if (!is_file($nginx_rrd)) print "active: $active reading: $reading writing: $writing waiting: $waiting Requests: $req"; rrdtool_update($nginx_rrd, "N:$req:$active:$reading:$writing:$waiting"); +/// Unset the variables we set here + +unset($nginx); +unset($nginx_rrd); +unset($active); +unset($reading); +unset($writing); +unset($req); + ?>