From 45aa3f390200a1b8c4d4b637eb65f17d018d866f Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Sat, 12 Jun 2010 17:24:35 +0000
Subject: [PATCH] add hardware & version detection for Thompson Speedtouch
 (snmp v1) clean up temperature graph (lighter range) make amp/volt/hz pages
 prettier (6px cell padding please)

git-svn-id: http://www.observium.org/svn/observer/trunk@1155 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/images/icons/memory.png               | Bin 1547 -> 1532 bytes
 html/includes/graphs/temperature.inc.php   |   2 +-
 html/pages/health/current.inc.php          |   2 +-
 html/pages/health/frequencies.inc.php      |   2 +-
 html/pages/health/voltages.inc.php         |   2 +-
 includes/polling/device-speedtouch.inc.php |  24 +++++++++++++++++++++
 6 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 includes/polling/device-speedtouch.inc.php

diff --git a/html/images/icons/memory.png b/html/images/icons/memory.png
index 5e28db7863a2959a9dcba6f318297706c9a3ea36..492d82ec6f67d25dac5dee881c81747870cf5c60 100644
GIT binary patch
delta 499
zcmV<P0Sx|&4Ezg_B#|)~e;g_o9WEFiFBu;#93U|nAu}B`G&DXwJ}5vSEkz|RPbV-;
zCNWYcG*u@zT`oFOGdx{2J7F?BXE8xtH$q-LL}NWfY&t-2G(&PUNN_$#aX&>xMMp<R
zNJvORQ$SBtPf1=vR$Ek8Tvb_LR!eI|O>;y~dPH4fTwP>cTyIxVe{x7yeNbR?TzYzV
ze0+RXg-UCYQ)r1}ZINSinrnNNbE2+pfPjF4f`WsCgN22KhlhuTh=_}ei;azqkB^Ux
zpNf!<j*p^>l&6xCsF0bhlbErNuCA`Lv$MCix4*x?$it1o%fG_H!otGD#KgqJ%fQFc
z$H~*i$<xUI00000vsMA{0h3?>4+P{aVM((}0~Y}b5dZ)S5dnW>Uy+k*1lWJENkl<Z
zC{ta}*A9X}5Cu@|y?2DMi(OP~DA*MX*8l&Ob(Wwp-kZ$B$z-#`5FUQQ6UM!lelp+~
zkm9(J3#D;JGAxg<eQAf1b8|XsWe0_R@}hRY)70e&_$V~i2zl!gp=P1bPTbWl_$$|$
z3<2Yf;ZqqG?K@qW*KG!bAFD?xcni0M0#O61^kb<YoiPK%PXsp00zywTE4Tm%!bmhL
p@Pr_=&a7DhC=l*@EL}kO%NsUgLDf4VNZ|kg002ovPDHLkV1f;H&-MTS

delta 512
zcmV+b0{{K|3yTbpBnkm@Qb$4nuFf3kks%v@791299~K!O7#ScJ8zLATBpWI!Dkd-^
zD>W!EJS;FiEj2YYJUl!;K0ZG`KQlouHA65tLpDD~K08Y{KTkV9O*}$QK0;JIKtMo4
zPeDmbNk&scNKr*eT17})LrY&pPFqV&UP(@0N>EZyQBzP;R#I46S6EwEQesY3V^LOr
zXi-~ZSzT>fUvpYuXkKl5YjkvTc6N4pdU||(e0_a=e}8{)fM#=oZ+nY(eu;a6f`WpB
zgNBBNh=_=aiHVAeijJ0zk(rN`o|KlJm7k=EoTQnYr<kg$s<5!Iw6wImyu84^r@+9#
zz`()6!otGF!NkYH$<4{i&dJNq%K!kgLjm>ylTZN(1YhtH$g@2I7Xb<q000XT0n*)m
z{F7b;*nhK0L_t(2Q(e#34#F@D1<<m0!v?b{n?l)z0%h;L{{L5kQx$}`SMtMAWGfuy
z$xnF7xwpzs1|E(m5da7T(>TK!fk#-r_Pc_0bv*2g76#44ZPEgJ^(=S6#h|u8h#Th!
zB?E&->^^COGkY1y;MH~vpK2#>+MLyK*{p&8F-h%#BYB;v5YnK62O;HSGpd2~i74a*
zg3y=riZ((h!dlWR@{}UfPl8^NFrc3AXW0XUzq|qeP(R}xyBq-k0000<MNUMnLSTZk
C{@6PJ

diff --git a/html/includes/graphs/temperature.inc.php b/html/includes/graphs/temperature.inc.php
index 9353495736..fec3b9c3b3 100644
--- a/html/includes/graphs/temperature.inc.php
+++ b/html/includes/graphs/temperature.inc.php
@@ -22,7 +22,7 @@ include("common.inc.php");
   $rrd_options .= " DEF:temp_min=$rrd_filename:temp:MIN";
   $rrd_options .= " CDEF:tempwarm=temp_max,".$temperature['temp_limit'].",GT,temp,UNKN,IF";
   $rrd_options .= " CDEF:tempcold=temp_min,20,LT,temp,UNKN,IF";
-  $rrd_options .= " AREA:temp_max#a5a5a5";
+  $rrd_options .= " AREA:temp_max#c5c5c5";
   $rrd_options .= " AREA:temp_min#ffffffff";
 
 
diff --git a/html/pages/health/current.inc.php b/html/pages/health/current.inc.php
index 3c8c209090..1405a6fcad 100644
--- a/html/pages/health/current.inc.php
+++ b/html/pages/health/current.inc.php
@@ -8,7 +8,7 @@ if($_SESSION['userlevel'] >= '5') {
 
 $query = mysql_query($sql);
 
-echo('<table cellspacing="0" cellpadding="2" width="100%">');
+echo('<table cellspacing="0" cellpadding="6" width="100%">');
 
 echo('<tr class=tablehead>
         <th width="280">Device</th>
diff --git a/html/pages/health/frequencies.inc.php b/html/pages/health/frequencies.inc.php
index 9c61a0e76d..0bc8b02e53 100644
--- a/html/pages/health/frequencies.inc.php
+++ b/html/pages/health/frequencies.inc.php
@@ -8,7 +8,7 @@ if($_SESSION['userlevel'] >= '5') {
 
 $query = mysql_query($sql);
 
-echo('<table cellspacing="0" cellpadding="2" width="100%">');
+echo('<table cellspacing="0" cellpadding="6" width="100%">');
 
 echo('<tr class=tablehead>
         <th width="280">Device</th>
diff --git a/html/pages/health/voltages.inc.php b/html/pages/health/voltages.inc.php
index 365e096e2b..710340cf6f 100644
--- a/html/pages/health/voltages.inc.php
+++ b/html/pages/health/voltages.inc.php
@@ -8,7 +8,7 @@ if($_SESSION['userlevel'] >= '5') {
 
 $query = mysql_query($sql);
 
-echo('<table cellspacing="0" cellpadding="2" width="100%">');
+echo('<table cellspacing="0" cellpadding="6" width="100%">');
 
 echo('<tr class=tablehead>
         <th width="280">Device</th>
diff --git a/includes/polling/device-speedtouch.inc.php b/includes/polling/device-speedtouch.inc.php
new file mode 100644
index 0000000000..1bf6388cb8
--- /dev/null
+++ b/includes/polling/device-speedtouch.inc.php
@@ -0,0 +1,24 @@
+<?php
+
+echo("Doing Thompson Speedtouch ");
+
+$serial = "";
+#list(,$hardware,) = explode(" ", $hardware);
+$hardware = $sysDescr;
+
+$features = "";
+
+### Filthy hack to get software version. may not work on anything but 585v7 :)
+
+$loop = shell_exec($config['snmpget'] . ' -Ovq -v1 -c '.$device['community'].' '.$device['hostname'].' ifDescr.101');
+if($loop) { 
+  preg_match('@([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)@i',
+    $loop, $matches);
+    $version = $matches[1];
+ }
+
+echo("$hardware - $version - $features - $serial\n");
+
+#include("hr-mib.inc.php");
+
+?>