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
This commit is contained in:
Adam Amstrong
2010-08-09 23:25:29 +00:00
parent a2636b4668
commit 8d8fb1b53c
2 changed files with 12 additions and 5 deletions

View File

@@ -1,5 +1,7 @@
<?php <?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, 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-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 #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; $hardware = $ciscomodel;
} }
$sysDescr = str_replace("IOS (tm)", "IOS (tm),", $sysDescr); $sysDescr = str_replace(", Inc.", "", $sysDescr); ## Make the two formats the same
list(,$features,$version) = explode(",", $sysDescr); $sysDescr = str_replace("\n", " ", $sysDescr);
$version = str_replace("Copyright", "", $version);
list(,$version,) = explode(" ", trim($version)); list(,,$hardware,,,,,,,$version,,,$features) = explode(" ", $sysDescr);
list(,$features) = explode("(", $features);
list(,$features) = explode("-", $features); list(,$features) = explode("-", $features);

View File

@@ -154,6 +154,12 @@ while ($device = mysql_fetch_assoc($device_query))
} }
rrdtool_update($uptimerrd, "N:$uptime"); rrdtool_update($uptimerrd, "N:$uptime");
$graphs['uptime'] = TRUE;
echo("Uptime: ".formatUptime($uptime)."\n");
print_r($graphs);
$poll_update .= $poll_separator . "`uptime` = '$uptime'"; $poll_update .= $poll_separator . "`uptime` = '$uptime'";
$poll_separator = ", "; $poll_separator = ", ";
} }