From cb7a0d39c732fd757c88bedf3ec2df5bb37e651e Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Wed, 5 Oct 2011 16:22:37 +0000
Subject: [PATCH] i don't remember what i changed.

git-svn-id: http://www.observium.org/svn/observer/trunk@2654 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/includes/graphs/generic_multi_bits_separated.inc.php | 2 +-
 html/includes/graphs/sensor/temperature.inc.php           | 5 +++--
 html/includes/print-interface.inc.php                     | 6 +++---
 includes/defaults.inc.php                                 | 1 +
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/html/includes/graphs/generic_multi_bits_separated.inc.php b/html/includes/graphs/generic_multi_bits_separated.inc.php
index cf08ef9c83..7b0d7ab4af 100644
--- a/html/includes/graphs/generic_multi_bits_separated.inc.php
+++ b/html/includes/graphs/generic_multi_bits_separated.inc.php
@@ -8,7 +8,7 @@ if($width > "500")
   $descr_len=18;
 } else {
   $descr_len=8;
-  $descr_len += round(($width - 250) / 8);
+  $descr_len += round(($width - 260) / 9.5);
 }
 
 $unit_text = "Bits/sec";
diff --git a/html/includes/graphs/sensor/temperature.inc.php b/html/includes/graphs/sensor/temperature.inc.php
index a2a38b8360..bc05f830fd 100644
--- a/html/includes/graphs/sensor/temperature.inc.php
+++ b/html/includes/graphs/sensor/temperature.inc.php
@@ -15,8 +15,9 @@ $rrd_options .= " DEF:sensor_max=$rrd_filename:sensor:MAX";
 $rrd_options .= " DEF:sensor_min=$rrd_filename:sensor:MIN";
 $rrd_options .= " CDEF:sensorwarm=sensor_max,".$sensor['sensor_limit'].",GT,sensor,UNKN,IF";
 $rrd_options .= " CDEF:sensorcold=sensor_min,20,LT,sensor,UNKN,IF";
-$rrd_options .= " AREA:sensor_max#c5c5c5";
-$rrd_options .= " AREA:sensor_min#ffffffff";
+$rrd_options .= " CDEF:sensor_diff=sensor_max,sensor_min,-";
+$rrd_options .= " AREA:sensor_min";
+$rrd_options .= " AREA:sensor_diff#c5c5c5::STACK";
 
 #  $rrd_options .= " AREA:sensor#bbd392";
 #  $rrd_options .= " AREA:sensorwarm#FFCCCC";
diff --git a/html/includes/print-interface.inc.php b/html/includes/print-interface.inc.php
index 405c7ce74c..503277f4ec 100644
--- a/html/includes/print-interface.inc.php
+++ b/html/includes/print-interface.inc.php
@@ -89,12 +89,12 @@ if ($port[ifDuplex] != "unknown") { echo("<span class=box-desc>" . $port['ifDupl
 if ($device['os'] == "ios" || $device['os'] == "iosxe")
 {
   if ($port['ifTrunk']) {
-    echo("<span class=box-desc><span class=red>" . $port['ifTrunk'] . "</span></span>");
+    echo("<p class=box-desc><span class=red>" . $port['ifTrunk'] . "</span></p>");
   } elseif ($port['ifVlan']) {
-    echo("<span class=box-desc><span class=blue>VLAN " . $port['ifVlan'] . "</span></span>");
+    echo("<p class=box-desc><span class=blue>VLAN " . $port['ifVlan'] . "</span></p>");
   } elseif ($port['ifVrf']) {
     $vrf = dbFetchRow("SELECT * FROM vrfs WHERE vrf_id = ?", array($port['ifVrf']));
-    echo("<span style='color: green;'>" . $vrf['vrf_name'] . "</span>");
+    echo("<p style='color: green;'>" . $vrf['vrf_name'] . "</p>");
   }
 }
 
diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index 7dd8a88222..a30d0bd5a6 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -219,6 +219,7 @@ $config['bad_if'][] = "span rp";
 $config['bad_if'][] = "span sp";
 $config['bad_if'][] = "sslvpn";
 $config['bad_if'][] = "pppoe-";
+#$config['bad_if'][] = "control plane";  ## Example for cisco control plane
 
 $config['bad_if_regexp'][] = "/serial[0-9]:/";
 $config['bad_if_regexp'][] = "/^ng[0-9]+$/";