From dc04b5189b70286ff987de55f416a1d232c16d20 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Thu, 25 Feb 2010 01:52:32 +0000
Subject: [PATCH] syslog fix + device_fanspeeds graph for health main page

git-svn-id: http://www.observium.org/svn/observer/trunk@951 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/includes/graphs/device_fanspeeds.inc.php | 55 +++++++++++++++++++
 includes/syslog.php                           |  2 +-
 syslog.php                                    |  1 +
 3 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 html/includes/graphs/device_fanspeeds.inc.php

diff --git a/html/includes/graphs/device_fanspeeds.inc.php b/html/includes/graphs/device_fanspeeds.inc.php
new file mode 100644
index 000000000..e3e171999
--- /dev/null
+++ b/html/includes/graphs/device_fanspeeds.inc.php
@@ -0,0 +1,55 @@
+<?php
+
+include("common.inc.php");
+
+$rrd_options .= " -l 0 -E ";
+
+$iter = "1";
+$sql = mysql_query("SELECT * FROM fanspeed where device_id = '$device_id'");
+$rrd_options .= " COMMENT:'RPM                    Cur     Min      Max\\n'";
+while($fanspeed = mysql_fetch_array($sql)) 
+{
+  switch ($iter)
+  {
+    case "1":
+      $colour= "CC0000"; 
+      break; 
+    case "2":
+      $colour= "008C00"; 
+      break; 
+    case "3":
+      $colour= "4096EE"; 
+      break; 
+    case "4":
+      $colour= "73880A"; 
+      break;
+    case "5":
+      $colour= "D01F3C"; 
+      break;
+    case "6":
+      $colour= "36393D"; 
+      break; 
+    case "7": 
+    default:
+      $colour= "FF0084"; 
+      unset($iter);
+      break;
+  }
+
+  $hostname = gethostbyid($fanspeed['device_id']);
+  
+  $descr = substr(str_pad($fanspeed['fan_descr'], 17),0,17);
+  $rrd_filename  = $config['rrd_dir'] . "/".$hostname."/" . safename("fan-" . $fanspeed['fan_descr'] . ".rrd");
+  $fan_id = $fanspeed['fan_id'];
+
+  $rrd_options .= " DEF:fan$fan_id=$rrd_filename:fan:AVERAGE";
+  $rrd_options .= " LINE1:fan$fan_id#".$colour.":'" . $descr . "'";
+  $rrd_options .= " GPRINT:fan$fan_id:AVERAGE:%5.0lf\ ";
+  $rrd_options .= " GPRINT:fan$fan_id:MIN:%5.0lf\ ";
+  $rrd_options .= " GPRINT:fan$fan_id:MAX:%5.0lf\\\\l";
+
+  $iter++;
+}
+
+
+?>
diff --git a/includes/syslog.php b/includes/syslog.php
index fe795e89e..8e265e11d 100755
--- a/includes/syslog.php
+++ b/includes/syslog.php
@@ -62,7 +62,7 @@ function process_syslog ($entry, $update) {
     $x .= "VALUES ('".$entry['device_id']."','".$entry['program']."','".$entry['facility']."','".$entry['priority']."', '".$entry['level']."', '".$entry['tag']."', '".$entry['msg']."','".$entry['timestamp']."')";   
     if($update && $entry['device_id']) { mysql_query($x); }
     unset ($fix);
-  }
+  } else { print_r($entry); echo("D-$delete");}
 
   return $entry; 
 
diff --git a/syslog.php b/syslog.php
index 5698ed787..64fd88fb1 100755
--- a/syslog.php
+++ b/syslog.php
@@ -3,6 +3,7 @@
 
 include("config.php");
 include("includes/syslog.php");
+include("includes/common.php");
 
 $i="1";