From 387c6be30a51b8bdd5fa829ee35af0fa88c4c0ca Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Thu, 20 Mar 2008 11:53:19 +0000
Subject: [PATCH] Juniper Netscreen Additions

git-svn-id: http://www.observium.org/svn/observer/trunk@174 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/graph.php                      |   9 ++++
 html/images/os/junos.png            | Bin 0 -> 2140 bytes
 html/images/os/screenos.png         | Bin 0 -> 1941 bytes
 html/pages/device/dev-graphs.inc    |  13 ++++++
 includes/graphing.php               |   2 +
 includes/polling/interfaces.inc.php |  66 +++++++++++++++-------------
 poll-device.php                     |   1 +
 7 files changed, 60 insertions(+), 31 deletions(-)
 create mode 100644 html/images/os/junos.png
 create mode 100644 html/images/os/screenos.png

diff --git a/html/graph.php b/html/graph.php
index 8bf8718ff7..2672c9dd1c 100644
--- a/html/graph.php
+++ b/html/graph.php
@@ -45,6 +45,15 @@
 
   switch ($type) {
 
+  case 'netscreen_sessions':
+    $graph = graph_netscreen_sessions ($hostname . "/netscreen-sessions.rrd", $graphfile, $from, $to, $width, $height, $title, $vertical);
+    break;
+  case 'netscreen_cpu':
+    $graph = graph_netscreen_cpu ($hostname . "/netscreen-cpu.rrd", $graphfile, $from, $to, $width, $height, $title, $vertical);
+    break;
+  case 'netscreen_memory':
+    $graph = graph_netscreen_memory ($hostname . "/netscreen-memory.rrd", $graphfile, $from, $to, $width, $height, $title, $vertical);
+    break;
   case 'multi_bits':
     $graph = graph_multi_bits ($_GET['interfaces'], $graphfile, $from, $to, $width, $height);
     break;
diff --git a/html/images/os/junos.png b/html/images/os/junos.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1b9e60cc30c57e493e87c7258f1dc1226f20474
GIT binary patch
literal 2140
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
S-gRsM0000<MNUMnLSTZ$WAoAg

literal 0
HcmV?d00001

diff --git a/html/images/os/screenos.png b/html/images/os/screenos.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b19be5b9db31739d78704b618813d2673d6e663
GIT binary patch
literal 1941
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
b--3StuC5&1Nn=Oy00000NkvXXu0mjfRpyCU

literal 0
HcmV?d00001

diff --git a/html/pages/device/dev-graphs.inc b/html/pages/device/dev-graphs.inc
index 335776db41..f02c1b38c9 100644
--- a/html/pages/device/dev-graphs.inc
+++ b/html/pages/device/dev-graphs.inc
@@ -8,6 +8,19 @@ while($device = mysql_fetch_array($device_query)) {
    echo("<div style='clear: both;'>");
 
    switch ($device['os']) {
+   case "ScreenOS":
+
+      echo("<div class=graphhead>Processor Utilisation</div>");
+      $graph_type = "netscreen_cpu";            include ("includes/print-device-graph.php");
+
+      echo("<div class=graphhead>Memory Usage</div>");
+      $graph_type = "netscreen_memory";        	include ("includes/print-device-graph.php");
+
+      echo("<div class=graphhead>Firewall Sessions</div>");
+      $graph_type = "netscreen_sessions";       include ("includes/print-device-graph.php");
+
+      break;
+
    case "ProCurve":
       echo("<div class=graphhead>Processor Utilisation</div>");
       $graph_type = "cpu";              include ("includes/print-device-graph.php");
diff --git a/includes/graphing.php b/includes/graphing.php
index 04de03b070..91410755be 100644
--- a/includes/graphing.php
+++ b/includes/graphing.php
@@ -1,5 +1,7 @@
 <?php
 
+include("graphing/screenos.php");
+
 function graph_multi_bits ($interfaces, $graph, $from, $to, $width, $height) {
   global $config, $rrdtool, $installdir, $mono_font;
   $imgfile = "graphs/" . "$graph";
diff --git a/includes/polling/interfaces.inc.php b/includes/polling/interfaces.inc.php
index 564c1f7bbb..63155e40dc 100644
--- a/includes/polling/interfaces.inc.php
+++ b/includes/polling/interfaces.inc.php
@@ -12,33 +12,33 @@ while ($interface = mysql_fetch_array($interface_query)) {
 
  if($device['status'] == '1') {
 
-  unset($update);
-  unset($update_query);
-  unset($seperator);
+   unset($update);
+   unset($update_query);
+   unset($seperator);
 
-  echo("Looking at " . $interface['ifDescr'] . " on " . $device['hostname'] . "\n");
+   echo("Looking at " . $interface['ifDescr'] . " on " . $device['hostname'] . "\n");
 
-  $snmp_cmd  = "snmpget -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'];
-  $snmp_cmd .= " ifAdminStatus." . $interface['ifIndex'] . " ifOperStatus." . $interface['ifIndex'] . " ifAlias." . $interface['ifIndex'];
+   $snmp_cmd  = "snmpget -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'];
+   $snmp_cmd .= " ifAdminStatus." . $interface['ifIndex'] . " ifOperStatus." . $interface['ifIndex'] . " ifAlias." . $interface['ifIndex'];
 
-  $snmp_output = trim(`$snmp_cmd`);
-  $snmp_output = str_replace("No Such Object available on this agent at this OID", "", $snmp_output);
-  $snmp_output = str_replace("No Such Instance currently exists at this OID", "", $snmp_output);
-  $snmp_output = str_replace("\"", "", $snmp_output);
+   $snmp_output = trim(`$snmp_cmd`);
+   $snmp_output = str_replace("No Such Object available on this agent at this OID", "", $snmp_output);
+   $snmp_output = str_replace("No Such Instance currently exists at this OID", "", $snmp_output);
+   $snmp_output = str_replace("\"", "", $snmp_output);
 
-  list($ifAdminStatus, $ifOperStatus, $ifAlias) = explode("\n", $snmp_output);
+   list($ifAdminStatus, $ifOperStatus, $ifAlias) = explode("\n", $snmp_output);
 
-  if ($ifAlias == " ") { $ifAlias = str_replace(" ", "", $ifAlias); }
-  $ifAlias = trim(str_replace("\"", "", $ifAlias));
-  $ifAlias = trim($ifAlias);
+   if ($ifAlias == " ") { $ifAlias = str_replace(" ", "", $ifAlias); }
+   $ifAlias = trim(str_replace("\"", "", $ifAlias));
+   $ifAlias = trim($ifAlias);
 
-  $old_rrdfile = "rrd/" . $device['hostname'] . "." . $interface['ifIndex'] . ".rrd";
-  $rrdfile = $host_rrd . "/" . $interface['ifIndex'] . ".rrd";
+   $old_rrdfile = "rrd/" . $device['hostname'] . "." . $interface['ifIndex'] . ".rrd";
+   $rrdfile = $host_rrd . "/" . $interface['ifIndex'] . ".rrd"; 
 
-  if(is_file($old_rrdfile) && !is_file($rrdfile)) { rename($old_rrdfile, $rrdfile); echo("Moving $old_rrdfile to $rrdfile");  }
+   if(is_file($old_rrdfile) && !is_file($rrdfile)) { rename($old_rrdfile, $rrdfile); echo("Moving $old_rrdfile to $rrdfile");  }
 
-  if(!is_file($rrdfile)) {
-    $woo = `rrdtool create $rrdfile \
+   if(!is_file($rrdfile)) {
+     $woo = `rrdtool create $rrdfile \
       DS:INOCTETS:COUNTER:600:U:100000000000 \
       DS:OUTOCTETS:COUNTER:600:U:10000000000 \
       DS:INERRORS:COUNTER:600:U:10000000000 \
@@ -55,36 +55,40 @@ while ($interface = mysql_fetch_array($interface_query)) {
       RRA:MAX:0.5:6:700 \
       RRA:MAX:0.5:24:775 \
       RRA:MAX:0.5:288:797`;
-  }
+   }
 
-  if ( $interface['ifAlias'] != $ifAlias ) {
+
+   if( file_exists("includes/polling/interface-" . $device['os'] . ".php") ) { include("includes/polling/interface-" . $device['os'] . ".php"); }
+
+
+   if ( $interface['ifAlias'] != $ifAlias ) {
      $update .= $seperator . "`ifAlias` = '$ifAlias'";
      $seperator = ", ";
      mysql_query("INSERT INTO eventlog (`host`, `interface`, `datetime`, `message`) VALUES ('" . $interface['device_id'] . "', '" . $interface['interface_id'] . "', NOW(), 'Desc  -> $ifAlias')");
-  }
-  if ( $interface['ifOperStatus'] != $ifOperStatus && $ifOperStatus != "" ) {
+   }
+   if ( $interface['ifOperStatus'] != $ifOperStatus && $ifOperStatus != "" ) {
      $update .= $seperator . "`ifOperStatus` = '$ifOperStatus'";
      $seperator = ", ";
      mysql_query("INSERT INTO eventlog (`host`, `interface`, `datetime`, `message`) VALUES ('" . $interface['device_id'] . "', '" . $interface['interface_id'] . "', NOW(), 'Interface went $ifOperStatus')");
-  }
-  if ( $interface['ifAdminStatus'] != $ifAdminStatus && $ifAdminStatus != "" ) {
+   }
+   if ( $interface['ifAdminStatus'] != $ifAdminStatus && $ifAdminStatus != "" ) {
      $update .= $seperator . "`ifAdminStatus` = '$ifAdminStatus'";
      $seperator = ", ";
      if($ifAdminStatus == "up") { $admin = "enabled"; } else { $admin = "disabled"; }
      mysql_query("INSERT INTO eventlog (`host`, `interface`, `datetime`, `message`) VALUES ('" . $interface['device_id'] . "', '" . $interface['interface_id'] . "', NOW(), 'Interface $admin')");
-  }
+   }
 
-  if ($update) {
+   if ($update) {
      $update_query  = "UPDATE `interfaces` SET ";
      $update_query .= $update;
      $update_query .= " WHERE `interface_id` = '" . $interface['interface_id'] . "'";
      echo("Updating : " . $device['hostname'] . " $ifDescr\nSQL :$update_query\n\n");
      $update_result = mysql_query($update_query);
-  } else {
+   } else {
 #     echo("Not Updating : " . $device['hostname'] ." $ifDescr ( " . $interface['ifDescr'] . " )\n\n");
-  }
+   }
 
-  if($ifOperStatus == "up") {
+   if($ifOperStatus == "up") {
 
     $snmp_data_cmd  = "snmpget -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'];
     $snmp_data_cmd  = "snmpget -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'];
@@ -111,7 +115,7 @@ while ($interface = mysql_fetch_array($interface_query)) {
   }
  }
 
- $rates = interface_rates ($interface);
+  $rates = interface_rates ($interface);
   mysql_query("UPDATE `interfaces` SET in_rate = '" . $rates['in'] . "', out_rate = '" . $rates['out'] . "' WHERE interface_id= '" . $interface['interface_id'] . "'");
 
 }
diff --git a/poll-device.php b/poll-device.php
index 7ff6479e11..a2df20fe6f 100755
--- a/poll-device.php
+++ b/poll-device.php
@@ -191,6 +191,7 @@ while ($device = mysql_fetch_array($device_query)) {
   include("includes/polling/temperatures.inc.php");
   include("includes/polling/device-netstats.inc.php");
   echo("Polling interfaces\n");
+
   $where = "WHERE device_id = '" . $device['device_id'] . "'";
   include("includes/polling/interfaces.inc.php");