From 660d47fe2ff2391af47cabac47c3e5845bf95c4b Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Mon, 23 Aug 2010 17:17:03 +0000
Subject: [PATCH] add sanos detection (it is just nxos, so we treat it as if
 it's IOS for discovery purposes)

git-svn-id: http://www.observium.org/svn/observer/trunk@1693 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/includes/graphs/bill/bits.inc.php |  2 --
 includes/discovery/os/sanos.inc.php    |  9 +++++++++
 includes/functions.php                 |  2 +-
 includes/static-config.php             | 12 ++++++++++++
 4 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100755 includes/discovery/os/sanos.inc.php

diff --git a/html/includes/graphs/bill/bits.inc.php b/html/includes/graphs/bill/bits.inc.php
index 9d900db88..200adde33 100644
--- a/html/includes/graphs/bill/bits.inc.php
+++ b/html/includes/graphs/bill/bits.inc.php
@@ -23,6 +23,4 @@ $rra_out = "OUTOCTETS";
 
 include ("includes/graphs/generic_multi_bits_separated.inc.php");
 
-
-
 ?>
diff --git a/includes/discovery/os/sanos.inc.php b/includes/discovery/os/sanos.inc.php
new file mode 100755
index 000000000..b85be44b7
--- /dev/null
+++ b/includes/discovery/os/sanos.inc.php
@@ -0,0 +1,9 @@
+<?php
+
+if(!$os) {
+
+  if(strstr($sysDescr, "SAN-OS")) { $os = "sanos"; }
+
+}
+
+?>
diff --git a/includes/functions.php b/includes/functions.php
index 3db4124c4..96edcf7c6 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -335,7 +335,7 @@ function formatUptime($diff, $format="long")
 function isSNMPable($hostname, $community, $snmpver, $port) 
 {
      global $config;
-     $pos = shell_exec($config['snmpget'] ." -m SNMPv2-MIB -$snmpver -c $community -t 1 $hostname:$port sysDescr.0");
+     $pos = shell_exec($config['snmpget'] ." -m SNMPv2-MIB -$snmpver -c $community -t 1 $hostname:$port sysObjectID.0");
      if ($pos == '') {
        return false;
      } else {
diff --git a/includes/static-config.php b/includes/static-config.php
index 89a6ee0fe..18e86a398 100644
--- a/includes/static-config.php
+++ b/includes/static-config.php
@@ -150,6 +150,18 @@ $config['os'][$os]['over'][1]['text']   = "CPU Usage";
 $config['os'][$os]['over'][2]['graph']  = "device_mempools";
 $config['os'][$os]['over'][2]['text']   = "Memory Usage";
 
+$os = "sanos";
+$config['os'][$os]['group']             = "ios";
+$config['os'][$os]['text']              = "Cisco SAN-OS";
+$config['os'][$os]['type']              = "network";
+$config['os'][$os]['icon']              = "cisco";
+$config['os'][$os]['over'][0]['graph']  = "device_bits";
+$config['os'][$os]['over'][0]['text']   = "Device Traffic";
+$config['os'][$os]['over'][1]['graph']  = "device_processors";
+$config['os'][$os]['over'][1]['text']   = "CPU Usage";
+$config['os'][$os]['over'][2]['graph']  = "device_mempools";
+$config['os'][$os]['over'][2]['text']   = "Memory Usage";
+
 $os = "catos";
 $config['os'][$os]['group']		= "ios";
 $config['os'][$os]['text']		= "Cisco CatOS";