From 2585058963949f7c024a74c93a597aac18ccab9f Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Thu, 8 Apr 2010 18:26:24 +0000
Subject: [PATCH] AlliedTelesyn Support

git-svn-id: http://www.observium.org/svn/observer/trunk@1056 61d68cd4-352d-0410-923a-c4978735b2b8
---
 discovery.php                              |  10 ++++++++++
 html/images/os/allied.png                  | Bin 0 -> 3665 bytes
 html/pages/device/graphs/os-allied.inc.php |   6 ++++++
 html/pages/vrfs.php                        |   4 ++--
 includes/osdiscovery/discover-allied.php   |  10 ++++++++++
 includes/polling/device-allied.inc.php     |  15 +++++++++++++++
 includes/static-config.php                 |   2 +-
 poll-device.php                            |   3 ++-
 8 files changed, 46 insertions(+), 4 deletions(-)
 create mode 100644 html/images/os/allied.png
 create mode 100644 html/pages/device/graphs/os-allied.inc.php
 create mode 100755 includes/osdiscovery/discover-allied.php
 create mode 100644 includes/polling/device-allied.inc.php

diff --git a/discovery.php b/discovery.php
index 725a78634..57fb345de 100755
--- a/discovery.php
+++ b/discovery.php
@@ -148,6 +148,16 @@ while ($device = mysql_fetch_array($device_query))
   { 
     if ($device['type'] == "unknown") { $device['type'] = 'network'; }
   }
+  
+  if($device['os'] == "allied") 
+  { 
+    if ($device['type'] == "unknown") { $device['type'] = 'network'; }
+  }
+  
+  if($device['os'] == "allied") 
+  { 
+    if ($device['type'] == "unknown") { $device['type'] = 'network'; }
+  }
 
   $update_query  = "UPDATE `devices` SET ";
   $update_query .= " `last_discovered` = NOW(), `type` = '" . $device['type'] . "'";
diff --git a/html/images/os/allied.png b/html/images/os/allied.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef13501d3689bfd0f5f8551fa626cb97ffd1e03e
GIT binary patch
literal 3665
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

literal 0
HcmV?d00001

diff --git a/html/pages/device/graphs/os-allied.inc.php b/html/pages/device/graphs/os-allied.inc.php
new file mode 100644
index 000000000..6628668a8
--- /dev/null
+++ b/html/pages/device/graphs/os-allied.inc.php
@@ -0,0 +1,6 @@
+<?php
+#include("cpu.inc.php");
+#include("temperatures.inc.php");
+include("netstats.inc.php");
+include("uptime.inc.php");
+?>
diff --git a/html/pages/vrfs.php b/html/pages/vrfs.php
index 0d719a8cd..9ef685200 100644
--- a/html/pages/vrfs.php
+++ b/html/pages/vrfs.php
@@ -5,7 +5,7 @@ print_optionbar_start();
 echo("
 <a href='".$config['base_url']. "/vrfs/'>Basic</a> | Graphs :
 <a href='".$config['base_url']. "/vrfs/bits/'>Bits</a> |
-<a href='".$config['base_url']. "/vrfs/pkts/'>Packets</a> |
+<a href='".$config['base_url']. "/vrfs/upkts/'>Packets</a> |
 <a href='".$config['base_url']. "/vrfs/nupkts/'>NU Packets</a> |
 <a href='".$config['base_url']. "/vrfs/errors/'>Errors</a>
 ");
@@ -46,7 +46,7 @@ print_optionbar_end();
            $port['from'] = $day;
            $port['to'] = $now;
            $port['bg'] = "#".$bg;
-           $port['graph_type'] = $_GET['opta'];
+           $port['graph_type'] = "port_".$_GET['opta'];
            echo("<div style='display: block; padding: 3px; margin: 3px; min-width: 135px; max-width:135px; min-height:75px; max-height:75px;
              text-align: center; float: left; background-color: ".$list_colour_b_b.";'>
              <div style='font-weight: bold;'>".makeshortif($port['ifDescr'])."</div>");
diff --git a/includes/osdiscovery/discover-allied.php b/includes/osdiscovery/discover-allied.php
new file mode 100755
index 000000000..6421e9206
--- /dev/null
+++ b/includes/osdiscovery/discover-allied.php
@@ -0,0 +1,10 @@
+<?php
+
+if(!$os) {
+
+  $sysObjectId = shell_exec($config['snmpget'] . " -Ovqn -".$device['snmpver']." -c ". $device['community'] ." ". $device['hostname'].":".$device['port'] ." sysObjectID.0");
+  if(strstr($sysObjectId, ".1.3.6.1.4.1.207")) { $os = "allied"; }
+
+}
+
+?>
diff --git a/includes/polling/device-allied.inc.php b/includes/polling/device-allied.inc.php
new file mode 100644
index 000000000..ead635ab5
--- /dev/null
+++ b/includes/polling/device-allied.inc.php
@@ -0,0 +1,15 @@
+<?php
+
+echo("Doing Allied Telesyn AlliedWare ");
+
+$serial = "";
+list(,$hardware,) = explode(" ", $hardware);
+$hardware = $sysDescr;
+
+$features = "";
+
+echo("$hardware - $version - $features - $serial\n");
+
+include("hr-mib.inc.php");
+
+?>
diff --git a/includes/static-config.php b/includes/static-config.php
index d66ab3d29..a57327344 100644
--- a/includes/static-config.php
+++ b/includes/static-config.php
@@ -28,7 +28,6 @@ $os_groups['solaris']   = "unix";
 $os_groups['adva']	= "unix";
 $os_groups['opensolaris'] = "unix";
 
-
 $os_groups['iosxe']     = "ios";
 $os_groups['iosxr']     = "ios";
 $os_groups['ios']	= "ios";
@@ -62,6 +61,7 @@ $os_text['procurve']     = "HP ProCurve";
 $os_text['speedtouch']   = "Thomson Speedtouch";
 $os_text['dell-laser']   = "Dell Laser Printer";
 $os_text['adva']	 = "Adva";
+$os_text['allied']	 = "AlliedWare";
 
 if(!$config['graph_colours']['greens']) {
   $config['graph_colours']['greens']  = array('B6D14B','91B13C','6D912D','48721E','24520F','003300');
diff --git a/poll-device.php b/poll-device.php
index 2a167c733..4397f5c11 100755
--- a/poll-device.php
+++ b/poll-device.php
@@ -222,8 +222,9 @@ while ($device = mysql_fetch_array($device_query)) {
     $poll_update_query  = "UPDATE `devices` SET ";
     $poll_update_query .= $poll_update;
     $poll_update_query .= " WHERE `device_id` = '" . $device['device_id'] . "'";
-    echo("Updating " . $device['hostname'] . " - $poll_update_query \n");
+    if($debug) {echo("Updating " . $device['hostname'] . " - $poll_update_query \n");}
     $poll_update_result = mysql_query($poll_update_query);
+    if(mysql_affected_rows() == "1") { echo("UPDATED!"); } else { echo("NOT UPDATED!"); }
   } else {
     echo("No Changes to " . $device['hostname'] . "\n");
   }