From 8d8fb1b53c148bfb52df7886895b917e34df048d Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Mon, 9 Aug 2010 23:25:29 +0000
Subject: [PATCH] smarter catos version/hardware fetcher. put software release
 year into $features

git-svn-id: http://www.observium.org/svn/observer/trunk@1653 61d68cd4-352d-0410-923a-c4978735b2b8
---
 includes/polling/os/catos.inc.php | 11 ++++++-----
 poller.php                        |  6 ++++++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/includes/polling/os/catos.inc.php b/includes/polling/os/catos.inc.php
index 151e78f2f..e419fe21d 100755
--- a/includes/polling/os/catos.inc.php
+++ b/includes/polling/os/catos.inc.php
@@ -1,5 +1,7 @@
 <?php
 
+echo("Cisco Catalyst OS\n");
+
 #Cisco Systems, Inc. WS-C2948 Cisco Catalyst Operating System Software, Version 4.5(9) Copyright (c) 1995-2000 by Cisco Systems, Inc.
 #Cisco Systems WS-C5509 Cisco Catalyst Operating System Software, Version 5.5(19) Copyright (c) 1995-2003 by Cisco Systems
 #Cisco Systems WS-C5500 Cisco Catalyst Operating System Software, Version 5.5(18) Copyright (c) 1995-2002 by Cisco Systems
@@ -14,11 +16,10 @@
      $hardware = $ciscomodel;
    }
 
-   $sysDescr = str_replace("IOS (tm)", "IOS (tm),", $sysDescr);
-   list(,$features,$version) = explode(",", $sysDescr);
-   $version = str_replace("Copyright", "", $version);
-   list(,$version,) = explode(" ", trim($version));
-   list(,$features) = explode("(", $features);
+   $sysDescr = str_replace(", Inc.", "", $sysDescr); ## Make the two formats the same
+   $sysDescr = str_replace("\n", " ", $sysDescr);
+
+   list(,,$hardware,,,,,,,$version,,,$features) = explode(" ", $sysDescr);
    list(,$features) = explode("-", $features);
 
 
diff --git a/poller.php b/poller.php
index f7a3798e1..8419015c2 100755
--- a/poller.php
+++ b/poller.php
@@ -154,6 +154,12 @@ while ($device = mysql_fetch_assoc($device_query))
       }
       rrdtool_update($uptimerrd, "N:$uptime");
 
+      $graphs['uptime'] = TRUE;
+
+      echo("Uptime: ".formatUptime($uptime)."\n");
+
+      print_r($graphs);
+
       $poll_update .= $poll_separator . "`uptime` = '$uptime'";
       $poll_separator = ", ";
     }