From 5af4c1e7f5b598e14cde902bc75cb67608d44f99 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Wed, 6 Jun 2007 16:43:08 +0000
Subject: [PATCH] Temperature monitoring system updates and additions

git-svn-id: http://www.observium.org/svn/observer/trunk@102 61d68cd4-352d-0410-923a-c4978735b2b8
---
 discover-cisco-temp.php   | 35 -----------------------------------
 discover-temperatures.php | 32 ++++++++++++++++++++++++++++++++
 html/pages/device.php     | 35 ++++++++++++++++++++++-------------
 includes/graphing.php     |  3 ++-
 4 files changed, 56 insertions(+), 49 deletions(-)
 delete mode 100755 discover-cisco-temp.php

diff --git a/discover-cisco-temp.php b/discover-cisco-temp.php
deleted file mode 100755
index 5a6c27b5c..000000000
--- a/discover-cisco-temp.php
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/php
-<?
-include("config.php");
-include("includes/functions.php");
-
-$device_query = mysql_query("SELECT * FROM `devices` WHERE `os` = 'IOS' AND `status` = '1'");
-while ($device = mysql_fetch_array($device_query)) {
-  $id = $device['device_id'];
-  $hostname = $device['hostname'];
-  $community = $device['community'];
-  echo("Detecting IOS temperature sensors for $hostname\n");
-  $oids = `snmpwalk -v2c -Osqn -c $community $hostname .1.3.6.1.4.1.9.9.13.1.3.1.2 | sed s/.1.3.6.1.4.1.9.9.13.1.3.1.2.//g`;
-  $oids = trim($oids);
-  foreach(explode("\n", $oids) as $data) {
-   $data = trim($data);
-   list($oid) = explode(" ", $data);
-   $temp_oid  = ".1.3.6.1.4.1.9.9.13.1.3.1.3.$oid";
-   $descr_oid = ".1.3.6.1.4.1.9.9.13.1.3.1.2.$oid";
-   $descr = `snmpget -O qv -v2c -c $community $hostname $descr_oid`;
-   $temp = `snmpget -O qv -v2c -c $community $hostname $temp_oid`;
-   if(!strstr($descr, "No") && !strstr($temp, "No") && $descr != "" ) {
-    $descr = `snmpget -O qv -v2c -c $community $hostname $descr_oid`;
-    $descr = str_replace("\"", "", $descr);
-    $descr = str_replace("temperature", "", $descr);
-    $descr = str_replace("temp", "", $descr);
-    $descr = trim($descr);
-    if(mysql_result(mysql_query("SELECT count(temp_id) FROM `temperature` WHERE temp_oid = '.1.3.6.1.4.1.9.9.13.1.3.1.3.$oid' AND temp_host = '$id'"),0) == '0') {
-      $query = "INSERT INTO temperature (`temp_host`, `temp_oid`, `temp_descr`) values ('$id', '$temp_oid', '$descr')";
-      echo("$query -> $descr : $temp\n");
-      mysql_query($query);
-    }
-   }
-  }
-}
-?>
diff --git a/discover-temperatures.php b/discover-temperatures.php
index 39f4d157f..e2ef3fe8b 100755
--- a/discover-temperatures.php
+++ b/discover-temperatures.php
@@ -59,6 +59,38 @@ while ($device = mysql_fetch_array($device_query)) {
   }
 }
 
+$device_query = mysql_query("SELECT * FROM `devices` WHERE `os` = 'IOS' AND `status` = '1'");
+while ($device = mysql_fetch_array($device_query)) {
+  $id = $device['device_id'];
+  $hostname = $device['hostname'];
+  $community = $device['community'];
+  echo("Detecting IOS temperature sensors for $hostname\n");
+  $oids = `snmpwalk -v2c -Osqn -c $community $hostname .1.3.6.1.4.1.9.9.13.1.3.1.2 | sed s/.1.3.6.1.4.1.9.9.13.1.3.1.2.//g`;
+  $oids = trim($oids);
+  foreach(explode("\n", $oids) as $data) {
+   $data = trim($data);
+   list($oid) = explode(" ", $data);
+   $temp_oid  = ".1.3.6.1.4.1.9.9.13.1.3.1.3.$oid";
+   $descr_oid = ".1.3.6.1.4.1.9.9.13.1.3.1.2.$oid";
+   $descr = `snmpget -O qv -v2c -c $community $hostname $descr_oid`;
+   $temp = `snmpget -O qv -v2c -c $community $hostname $temp_oid`;
+   if(!strstr($descr, "No") && !strstr($temp, "No") && $descr != "" ) {
+    $descr = `snmpget -O qv -v2c -c $community $hostname $descr_oid`;
+    $descr = str_replace("\"", "", $descr);
+    $descr = str_replace("temperature", "", $descr);
+    $descr = str_replace("temp", "", $descr);
+    $descr = trim($descr);
+    if(mysql_result(mysql_query("SELECT count(temp_id) FROM `temperature` WHERE temp_oid = '.1.3.6.1.4.1.9.9.13.1.3.1.3.$oid' AND temp_host = '$id'"),0) == '0') {
+      $query = "INSERT INTO temperature (`temp_host`, `temp_oid`, `temp_descr`) values ('$id', '$temp_oid', '$descr')";
+      echo("$query -> $descr : $temp\n");
+      mysql_query($query);
+    }
+    $temp_exists[] = "$id $temp_oid";
+   }
+  }
+}
+
+
 $sql = "SELECT * FROM temperature";
 $query = mysql_query($sql);
 
diff --git a/html/pages/device.php b/html/pages/device.php
index 557624327..0fdf4e069 100644
--- a/html/pages/device.php
+++ b/html/pages/device.php
@@ -6,8 +6,7 @@ if(!$_GET['section']) {
   $_GET['section'] = "dev-overview"; 
 }
 $section = $_GET['section'];
-$sectionx = str_replace("-", "", $section);
-$select[$sectionx] = "selected";
+$select[$section] = "selected";
 
 
 $device_query = mysql_query("SELECT * FROM `devices` WHERE `device_id` = '" . $_GET['id'] . "'");
@@ -20,7 +19,7 @@ echo("<div class=mainpane>");
 
 echo("
 <ul id='maintab' class='shadetabs'>
-<li class=$select[devoverview]>
+<li class=" . $select['dev-overview'] . ">
   <a href='?page=device&id=" . $device['device_id'] . "&section=dev-overview' >
     <img src='images/16/server_lightning.png' align=absmiddle border=0> Overview
   </a>
@@ -28,7 +27,7 @@ echo("
 
 if(@mysql_result(mysql_query("select count(vlan_id) from vlans WHERE device_id = '" . $device['device_id'] . "'"), 0) > '0') {
   echo("
-<li class=$select[devvlans]>
+<li class=" . $select['dev-vlans'] . ">
   <a href='?page=device&id=" . $device['device_id'] . "&section=dev-vlans' >
     <img src='images/16/vlans.png' align=absmiddle border=0> VLANs
   </a>
@@ -37,44 +36,54 @@ if(@mysql_result(mysql_query("select count(vlan_id) from vlans WHERE device_id =
 
 if(@mysql_result(mysql_query("select count(interface_id) from interfaces WHERE device_id = '" . $device['device_id'] . "'"), 0) > '0') {
   echo("
-<li class=$select[devifs]>
+<li class=" . $select['dev-ifs'] . ">
   <a href='?page=device&id=" . $device['device_id'] . "&section=dev-ifs' >
     <img src='images/16/server_link.png' align=absmiddle border=0> Port Details
   </a>
 </li>
-<li class=$select[devifgraphs]>
+<li class=" . $select['dev-ifgraphs'] . ">
   <a href='?page=device&id=" . $device['device_id'] . "&section=dev-ifgraphs'>
     <img src='images/16/chart_curve_link.png' align=absmiddle border=0> Port Graphs
   </a>
 </li>");
 }
 
-echo("<li class=$select[devgraphs]>
+echo("<li class=" . $select['dev-graphs'] . ">
   <a href='?page=device&id=" . $device['device_id'] . "&section=dev-graphs'>
     <img src='images/16/server_chart.png' align=absmiddle border=0> Host Graphs
   </a>
 </li>
 ");
 
+if(mysql_result(mysql_query("select count(temp_id) from temperature WHERE temp_host = '" . $device['device_id'] . "'"), 0) > '0') {
+  echo("
+<li class=" . $select['dev-temp'] . ">
+  <a href='?page=device&id=" . $device['device_id'] . "&section=dev-temp'>
+    <img src='images/16/weather_sun.png' align=absmiddle border=0> Temps
+  </a>
+</li>
+");
+}
+
 if(mysql_result(mysql_query("select count(service_id) from services WHERE service_host = '" . $device['device_id'] . "'"), 0) > '0') {
   echo("
-<li class=$select[devsrv]>
+<li class=" . $select['dev-srv'] . ">
   <a href='?page=device&id=" . $device['device_id'] . "&section=dev-srv'>
-    <img src='images/16/server_cog.png' align=absmiddle border=0> Service Details
+    <img src='images/16/server_cog.png' align=absmiddle border=0> Services
   </a>
 </li>
 ");
 }
 
 echo("
-<li class=$select[devevents]>
+<li class=" . $select['dev-events'] . ">
   <a href='?page=device&id=" . $device['device_id'] . "&section=dev-events'>
     <img src='images/16/report_magnify.png' align=absmiddle border=0> Eventlog
   </a>
 </li>");
 
 echo("
-<li class=$select[devsyslog]>
+<li class=" . $select['dev-syslog'] . ">
   <a href='?page=device&id=" . $device['device_id'] . "&section=dev-syslog'>
     <img src='images/16/printer.png' align=absmiddle border=0> Syslog
   </a>
@@ -83,9 +92,9 @@ echo("
 
 if($_SESSION[userlevel] > "5") {
   echo("
-<li class=$select[devedit]>
+<li class=" . $select['dev-edit'] . ">
   <a href='?page=device&id=" . $device['device_id'] . "&section=dev-edit'>
-    <img src='images/16/server_edit.png' align=absmiddle border=0> Edit Device
+    <img src='images/16/server_edit.png' align=absmiddle border=0> Settings
   </a>
 </li>
 ");
diff --git a/includes/graphing.php b/includes/graphing.php
index c57e9eddd..7fe7e7ff5 100644
--- a/includes/graphing.php
+++ b/includes/graphing.php
@@ -28,7 +28,8 @@ function temp_graph ($temp, $graph, $from, $to, $width, $height, $title, $vertic
 
 
     $optsa[] = "DEF:temp" . $temperature[temp_id] . "=$temprrd:temp:AVERAGE";
-    $optsa[] = "LINE1:temp" . $temperature[temp_id] . "#" . $colour . ":" . $temperature[temp_descr_fixed];
+    $optsa[] = "AREA:temp" . $temperature[temp_id] . "#ffcccc:" . $temperature[temp_descr_fixed];
+    $optsa[] = "LINE1.5:temp" . $temperature[temp_id] . "#" . $colour . ":" . $temperature[temp_descr_fixed];
     $optsa[] = "GPRINT:temp" . $temperature[temp_id] . ":LAST:%3.0lf°C";
     $optsa[] = "GPRINT:temp" . $temperature[temp_id] . ":MAX:%3.0lf°C\l";
     $iter++;