diff --git a/INSTALL b/INSTALL index 2950c7d15..b34eadc04 100644 --- a/INSTALL +++ b/INSTALL @@ -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 ===================== diff --git a/html/images/os/mgeups.png b/html/images/os/mgeups.png new file mode 100644 index 000000000..eb456434f Binary files /dev/null and b/html/images/os/mgeups.png differ diff --git a/html/pages/device/graphs.inc.php b/html/pages/device/graphs.inc.php index d3065f17e..985c7352c 100644 --- a/html/pages/device/graphs.inc.php +++ b/html/pages/device/graphs.inc.php @@ -8,10 +8,6 @@ while ($device = mysql_fetch_array($device_query)) echo('
'); - 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(" "); - } - if ($storagegraph) { - echo("$storagegraph"); - } - if ($loadgraph) { - echo(" "); - } - if ($tempgraph) { - echo(" "); - } - if ($mailsgraph) { - echo(" "); - } - if ($mailerrorgraph) { - echo(" "); - } - if ($couriergraph) { - echo(" "); - } - if ($ahitsgraph) { - echo(" "); - } - if ($abitsgraph) { - echo(" "); - } - if ($usersgraph) { - echo(" "); - } - if ($procsgraph) { - echo(" "); - } - if ($uptimegraph) { - echo(" "); - } - -**/ - echo("
"); } diff --git a/html/pages/device/graphs/os-mgeups.inc.php b/html/pages/device/graphs/os-mgeups.inc.php new file mode 100644 index 000000000..c07e7943b --- /dev/null +++ b/html/pages/device/graphs/os-mgeups.inc.php @@ -0,0 +1,4 @@ + diff --git a/includes/static-config.php b/includes/static-config.php index 67fe906a5..dfd104139 100644 --- a/includes/static-config.php +++ b/includes/static-config.php @@ -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');