cleanups + more mge ups

git-svn-id: http://www.observium.org/svn/observer/trunk@1094 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2010-06-03 09:42:24 +00:00
parent 564e9fdc07
commit 94cfe9d618
5 changed files with 9 additions and 48 deletions

View File

@@ -37,7 +37,7 @@ Papouch TME
===========
Set your thermometer name (Option 1->0 in the telnet CLI) to the sensor name
you want displayed in Observer.
you want displayed in Observer. (Also, the TME only speaks SNMP v1)
Supermicro monitoring
=====================

BIN
html/images/os/mgeups.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

@@ -8,10 +8,6 @@ while ($device = mysql_fetch_array($device_query))
echo('<div style="clear: both;">');
if (is_file($config['install_dir'] . "/html/pages/device/graphs/os-$os.inc.php")) {
include($config['install_dir'] . "/html/pages/device/graphs/os-$os.inc.php");
}
if ($os_groups[$device['os']]) { $os_group = $os_groups[$device['os']]; }
if (is_file($config['install_dir'] . "/html/pages/device/graphs/os-".$device['os'].".inc.php")) {
@@ -24,48 +20,6 @@ while ($device = mysql_fetch_array($device_query))
echo("No graph definitions found for OS " . $device['os'] . "!");
}
/**
if ($memgraph) {
echo("<img src=\"$memgraph\"> <img src=\"$memgraphm\">");
}
if ($storagegraph) {
echo("$storagegraph");
}
if ($loadgraph) {
echo("<img src=\"$loadgraph\"> <img src=\"$loadgraphm\">");
}
if ($tempgraph) {
echo("<img src=\"$tempgraph\"> <img src=\"$tempgraphm\">");
}
if ($mailsgraph) {
echo("<img src=\"$mailsgraph\"> <img src=\"$mailsgraphm\">");
}
if ($mailerrorgraph) {
echo("<img src=\"$mailerrorgraph\"> <img src=\"$mailerrorgraphm\">");
}
if ($couriergraph) {
echo("<img src=\"$couriergraph\"> <img src=\"$couriergraphm\">");
}
if ($ahitsgraph) {
echo("<img src=\"$ahitsgraph\"> <img src=\"$ahitsgraphm\">");
}
if ($abitsgraph) {
echo("<img src=\"$abitsgraph\"> <img src=\"$abitsgraphm\">");
}
if ($usersgraph) {
echo("<img src=\"$usersgraph\"> <img src=\"$usersgraphm\">");
}
if ($procsgraph) {
echo("<img src=\"$procsgraph\"> <img src=\"$procsgraphm\">");
}
if ($uptimegraph) {
echo("<img src=\"$uptimegraph\"> <img src=\"$uptimegraphm\">");
}
**/
echo("</div>");
}

View File

@@ -0,0 +1,4 @@
<?php
$graph_title = "Device Uptime";
$graph_type = "device_uptime"; include ("includes/print-device-graph.php"); break;
?>

View File

@@ -33,7 +33,9 @@ $os_groups['iosxr'] = "ios";
$os_groups['ios'] = "ios";
$os_groups['asa'] = "ios";
$os_groups['printers'] = "dell-laser";
$os_groups['mgeups'] = "ups";
$os_groups['dell-laser'] = "printer";
##
$os_text['linux'] = "Linux";
@@ -62,6 +64,7 @@ $os_text['speedtouch'] = "Thomson Speedtouch";
$os_text['dell-laser'] = "Dell Laser Printer";
$os_text['adva'] = "Adva";
$os_text['allied'] = "AlliedWare";
$os_text['mgeups'] = "MGE UPS";
if(!$config['graph_colours']['greens']) {
$config['graph_colours']['greens'] = array('B6D14B','91B13C','6D912D','48721E','24520F','003300');