From 94cfe9d618c8ff445e06740f92a1bdababfd3813 Mon Sep 17 00:00:00 2001
From: Tom Laermans <tom@localhost>
Date: Thu, 3 Jun 2010 09:42:24 +0000
Subject: [PATCH] cleanups + more mge ups

git-svn-id: http://www.observium.org/svn/observer/trunk@1094 61d68cd4-352d-0410-923a-c4978735b2b8
---
 INSTALL                                    |   2 +-
 html/images/os/mgeups.png                  | Bin 0 -> 1185 bytes
 html/pages/device/graphs.inc.php           |  46 ---------------------
 html/pages/device/graphs/os-mgeups.inc.php |   4 ++
 includes/static-config.php                 |   5 ++-
 5 files changed, 9 insertions(+), 48 deletions(-)
 create mode 100644 html/images/os/mgeups.png
 create mode 100644 html/pages/device/graphs/os-mgeups.inc.php

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 0000000000000000000000000000000000000000..eb456434f625b979b6f8ac9d38e716310ac26b03
GIT binary patch
literal 1185
zcmV;S1YY}zP)<h;3K|Lk000e1NJLTq001BW001Be0ssI2{21+{00001b5ch_0Itp)
z=>Px#32;bRa{vGf6951U69E94oEQKA00(qQO+^RV1_KEw5!$$VZ~y=VGf6~2R7l6|
zR^LxsRUH4Gd+zNopsmu<^#=_QSlS1ip#qY~kMLuWg$JfFVYp0^C2CCcNt0!fMVZ-O
zpd(opADDv{1s~vnEhe}SGFED0tPS!*GeOeD&bG90d++VJ=lDQZ+QkPKA-?c^`=0yx
zem~#u=brC52QkLrD2;<7wqt^0g8y#(Goe{FTj(M|cp6a%5QH3o99%|s?x2eo1&18~
z)L(zgjtBTxd-%qe3S-rkmF&$gSu_d&V6*e*-xPc=9(+wC$*r&G!-t^LvAsPsFra_A
z2@v7{fD1n0uME@M6S*S%0q)9WE)prKZ25<5e?K<pH6Oe$486tMtnesW)XndkaP1ne
z5}~nCbLx~({#=1XS}iF*LGRzEDurZ%{`eCzT2Z;BsQeE<g09o}>PYUVo$mPu1#NcR
z+sn1J0?&g+lOv#n00Zdj1xcpC5CAa7P=6mhj^zXC?jE<chAv$~0EH(PD$H)sBciA`
zZmRS5nAIx0_bxK%pLD<&*iUfoD)sso^h_`RLOo8USUR1LXOuDkPF8X&87ceyJusVv
zmgWNjN*N%o(uHcO*z*?Paltl~Wt_>No-PuYgvoFCp$iaCFh$A7Vq+O<ZX&mDQAq*-
z#wh*dQy9HobPn%{Aj@dz0{70_{2Q;KyhH%NWQC=7ah02Nv|+acxhu&ZTinUoqIvo3
zDm`~zx%@HT-i99k1%Jj^cW2QK)@UFjsh^M1?k;!~g$AF{`U-FeF~*b!%P1D(`_8EG
z1OV_RlRWt~S5qxCHx;HJKS#*u4J1nd0F^F$ZUCRG%gac2QtHG6`elu2wU9`#?r!1r
zvj}tOnJ*kk2A%fb!;1(AA%qZ}PM1t3H5!e<U;qG76bT_1<C2mRLRA1ri<uIwHW7~l
zfX!yx2N;dUe4brV1b|Y#9uUIA!^4Y<i}84zQW_42$HvA?CQ~RBGMmk2vl#&Ve!r@!
zI-PEMdO9PD=~U{wyLWvJ4O3H78yg!Ahr{pp+wJ!C_4S2?g<vq~cDuiwo;H@1Su7TW
z5XTr>Sy`E#o!#Evjz*)|Y}RVEMk0}LIJ{quqA2t8^Lo8L6bf-1hcS*sBAc6=Hk%D&
zoJysZmX;Jnkt8V)2+YjP$g;e%vl9#kDWw2_M@B|WCX*<NKA+F!a<#U$8jZ$uI$c{^
zTTxN5Phd8iy<Ts1b+y;)<#`?<<nef1E|=5kv|6o#AXqGxy1F`#$J5f%Qd3hy2yr+Z
zPNx$g1dK7pm?(<ui7ARw=!&AKs%qZNX0wtcu>w;RMNyQ(mBMgz)Xx?k09IF5$H&LZ
z%E}HaX)>AY?Ck95=-@bx2Y^^CHa9nCu~-fzyC4W#TU&0oyS=?V*MY;~7#tidEiFAP
zxzg!$eSJMb=wQ%PRXud|F~(0%^6|6fe<AoAKWQ9xnxplO00000NkvXXu0mjfw>BIr

literal 0
HcmV?d00001

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('<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>");
 }
 
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 @@
+<?php
+      $graph_title = "Device Uptime";
+      $graph_type = "device_uptime";         include ("includes/print-device-graph.php"); break;
+?>
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');