From bca839dc02c6d8476b117962cc16d83d22cf1f96 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Sun, 8 Apr 2007 21:26:06 +0000
Subject: [PATCH] Modifying polling setup

git-svn-id: http://www.observium.org/svn/observer/trunk@73 61d68cd4-352d-0410-923a-c4978735b2b8
---
 includes/polling/device-netstats.inc.php | 65 ++++++++++--------------
 includes/polling/device-procurve.inc.php |  4 +-
 includes/polling/device-snom.inc.php     | 13 ++++-
 3 files changed, 40 insertions(+), 42 deletions(-)

diff --git a/includes/polling/device-netstats.inc.php b/includes/polling/device-netstats.inc.php
index a20630f3e..c71e15a11 100755
--- a/includes/polling/device-netstats.inc.php
+++ b/includes/polling/device-netstats.inc.php
@@ -1,49 +1,36 @@
 <?php
 
-echo("Polling device network statistics...\n");
+if($device[os] != "Snom") {
 
-$oids = array ('ipForwDatagrams','ipInDelivers','ipInReceives','ipOutRequests','ipInDiscards','ipOutDiscards','ipOutNoRoutes',
-               'icmpInMsgs','icmpOutMsgs','icmpInErrors','icmpOutErrors','icmpInEchos','icmpOutEchos','icmpInEchoReps',
-               'icmpOutEchoReps','snmpInTotalReqVars','snmpInTotalSetVars','snmpInTraps','snmpOutTraps','snmpInPkts',
-               'snmpOutPkts','snmpOutGetResponses','snmpOutSetRequests','tcpActiveOpens','tcpPassiveOpens','tcpAttemptFails',
-               'tcpEstabResets','tcpInSegs','tcpOutSegs','tcpRetransSegs','udpInDatagrams','udpOutDatagrams','udpInErrors',
-               'udpNoPorts');
+  echo("Polling device network statistics...\n");
+  unset($snmpstring, $rrdupdate, $snmpdata, $snmpdata_cmd, $rrd_create);
 
-$rrdfile = "rrd/" . $device['hostname'] . "-netinfo.rrd";
+  $oids = array ('ipForwDatagrams','ipInDelivers','ipInReceives','ipOutRequests','ipInDiscards','ipOutDiscards','ipOutNoRoutes',
+                 'icmpInMsgs','icmpOutMsgs','icmpInErrors','icmpOutErrors','icmpInEchos','icmpOutEchos','icmpInEchoReps',
+                 'icmpOutEchoReps','snmpInTotalReqVars','snmpInTotalSetVars','snmpInTraps','snmpOutTraps','snmpInPkts',
+                 'snmpOutPkts','snmpOutGetResponses','snmpOutSetRequests','tcpActiveOpens','tcpPassiveOpens','tcpAttemptFails',
+                 'tcpEstabResets','tcpInSegs','tcpOutSegs','tcpRetransSegs','udpInDatagrams','udpOutDatagrams','udpInErrors',
+                 'udpNoPorts');
 
-$rrd_create = "rrdtool create $rrdfile ";
-$rrd_create .= "RRA:AVERAGE:0.5:1:600 RRA:AVERAGE:0.5:6:700 RRA:AVERAGE:0.5:24:775 RRA:AVERAGE:0.5:288:797 RRA:MAX:0.5:1:600 \
-                RRA:MAX:0.5:6:700 RRA:MAX:0.5:24:775 RRA:MAX:0.5:288:797";
+  $rrdfile = "rrd/" . $device['hostname'] . "-netinfo.rrd";
+  $rrd_create = "rrdtool create $rrdfile ";
+  $rrd_create .= "RRA:AVERAGE:0.5:1:600 RRA:AVERAGE:0.5:6:700 RRA:AVERAGE:0.5:24:775 RRA:AVERAGE:0.5:288:797 RRA:MAX:0.5:1:600 \
+                  RRA:MAX:0.5:6:700 RRA:MAX:0.5:24:775 RRA:MAX:0.5:288:797";
 
-unset($snmpstring, $rrdupdate, $snmpdata, $snmpdata_cmd, $rrd_create);
+  foreach($oids as $oid){
+    $rrd_create .= " DS:$oid:COUNTER:600:U:100000000000";
+    $snmpstring .= " $oid.0"; 
+  }
 
-foreach($oids as $oid){
-  $rrd_create .= " DS:$oid:COUNTER:600:U:100000000000";
-  $snmpstring .= " $oid.0";
+  if(!file_exists($rrdfile)) { `$rrd_create`; }
+  $snmpdata_cmd = "snmpget -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'] . " $snmpstring";
+  $snmpdata     = trim(`$snmpdata_cmd`);
+  $rrdupdate = "N";
+  foreach(explode("\n", $snmpdata) as $data) {
+    if(strstr($data, "No") || strstr($data, "d") || strstr($data, "s")) { $data = ""; }
+    $rrdupdate .= ":$data";
+  }
+  rrd_update($rrdfile, $rrdupdate);
 }
 
-echo("$snmpstring");
-
-if(!file_exists($rrdfile)) { `$rrd_create`; }
-
-$snmpdata_cmd = "snmpget -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'] . " $snmpstring";
-$snmpdata     = trim(`$snmpdata_cmd`);
-
-#echo($snmpdata_cmd . "\n");
-
-#echo($snmpdata . "\n");
-
-$rrdupdate = "N";
-
-foreach(explode("\n", $snmpdata) as $data) {
-  if(strstr($data, "No") || strstr($data, "d") || strstr($data, "s")) { $data = ""; }
-  $rrdupdate .= ":$data";
-}
-
-echo("$rrdupdate\n");
-
-rrd_update($rrdfile, $rrdupdate);
-
-rrd_error();
-
 ?>
diff --git a/includes/polling/device-procurve.inc.php b/includes/polling/device-procurve.inc.php
index e6d8f71ff..b7c785bb5 100755
--- a/includes/polling/device-procurve.inc.php
+++ b/includes/polling/device-procurve.inc.php
@@ -3,12 +3,12 @@
 $cpurrd   = "rrd/" . $device['hostname'] . "-cpu.rrd";
 $memrrd   = "rrd/" . $device['hostname'] . "-mem.rrd";
 
-$cpu_cmd = "snmpget -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'] . " 1.3.6.1.4.1.11.2.14.11.5.1.9.6.1.0`;
+$cpu_cmd = "snmpget -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'] . " 1.3.6.1.4.1.11.2.14.11.5.1.9.6.1.0";
 $cpu     = `$cpu_cmd`;
 
 
 $mem_cmd  = "snmpget -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'];
-$mem_cmd .= " 1.3.6.1.4.1.11.2.14.11.5.1.1.2.2.1.1.5.1 1.3.6.1.4.1.11.2.14.11.5.1.1.2.2.1.1.6.1 1.3.6.1.4.1.11.2.14.11.5.1.1.2.2.1.1.7.1`;
+$mem_cmd .= " 1.3.6.1.4.1.11.2.14.11.5.1.1.2.2.1.1.5.1 1.3.6.1.4.1.11.2.14.11.5.1.1.2.2.1.1.6.1 1.3.6.1.4.1.11.2.14.11.5.1.1.2.2.1.1.7.1";
 $mem      = `$mem_cmd`;
 
 list ($memtotal, $memfree, $memused) = explode("\n", $mem);
diff --git a/includes/polling/device-snom.inc.php b/includes/polling/device-snom.inc.php
index c3731103d..346e4948b 100755
--- a/includes/polling/device-snom.inc.php
+++ b/includes/polling/device-snom.inc.php
@@ -1,9 +1,20 @@
 <?
 
+   echo("Polling SNOM device...\n");
+
+   // Get SNOM specific version string from silly SNOM location. Silly SNOM!
+
+   $cmd      = "snmpget -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'] . " 1.3.6.1.2.1.7526.2.4";
+   $sysDescr = `$cmd`;
+   $sysDescr = str_replace("-", " ", $sysDescr);
+   $sysDescr = str_replace("\"", "", $sysDescr);
+   list($hardware, $features, $version) = explode(" ", $sysDescr);
+
+   // Get data for calls and network from SNOM specific SNMP OIDs.
 
    $cmda = "snmpget -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'] . " 1.3.6.1.2.1.7526.2.1.1 1.3.6.1.2.1.7526.2.1.2 1.3.6.1.2.1.7526.2.2.1 1.3.6.1.2.1.7526.2.2.2";
    $cmdb = "snmpget -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'] . " 1.3.6.1.2.1.7526.2.5 1.3.6.1.2.1.7526.2.6";
-
+   echo($cmda);
    $snmpdata = `$cmda`;
    $snmpdatab = `$cmdb`;