nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-28 00:24:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

vastly improved entity-sensors and cisco-entity-sensors speed. improved entity-mib inventory. removed device_id element from oid caches. add min/max ranges to sensor graphs.

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@1669 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2010-08-11 17:08:56 +00:00
parent 5facf544d7
commit 0db6ad08ff
54 changed files with 262 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/includes/graphs/graph.inc.php
+1 -1
View File
@@ -100,7 +100,7 @@ if(!$auth)
graph_error("No Authorisation");
}
} else {
$rrd_options .= " HRULE:0#999999";
#$rrd_options .= " HRULE:0#999999";
if($no_file)
{
if($width < 200)
html/includes/graphs/sensor/current.inc.php
+4
View File
@@ -16,4 +16,8 @@ include("includes/graphs/common.inc.php");
$rrd_options .= " GPRINT:current:LAST:%5.2lfA";
$rrd_options .= " GPRINT:current:MAX:%5.2lfA\\\\l";
if(is_numeric($sensor['sensor_limit'])) $rrd_options .= " HRULE:".$sensor['sensor_limit']."#999999::dashes";
if(is_numeric($sensor['sensor_limit_low'])) $rrd_options .= " HRULE:".$sensor['sensor_limit_low']."#999999::dashes";
?>
html/includes/graphs/sensor/fanspeed.inc.php
+3
View File
@@ -15,4 +15,7 @@ include("includes/graphs/common.inc.php");
$rrd_options .= " GPRINT:fan:LAST:%3.0lfrpm";
$rrd_options .= " GPRINT:fan:MAX:%3.0lfrpm\\\\l";
if(is_numeric($sensor['sensor_limit'])) $rrd_options .= " HRULE:".$sensor['sensor_limit']."#999999::dashes";
if(is_numeric($sensor['sensor_limit_low'])) $rrd_options .= " HRULE:".$sensor['sensor_limit_low']."#999999::dashes";
?>
html/includes/graphs/sensor/frequency.inc.php
+3
View File
@@ -15,4 +15,7 @@ include("includes/graphs/common.inc.php");
$rrd_options .= " GPRINT:freq:LAST:%3.0lfHz";
$rrd_options .= " GPRINT:freq:MAX:%3.0lfHz\\\\l";
if(is_numeric($sensor['sensor_limit'])) $rrd_options .= " HRULE:".$sensor['sensor_limit']."#999999::dashes";
if(is_numeric($sensor['sensor_limit_low'])) $rrd_options .= " HRULE:".$sensor['sensor_limit_low']."#999999::dashes";
?>
html/includes/graphs/sensor/humidity.inc.php
+3
View File
@@ -28,4 +28,7 @@ include("includes/graphs/common.inc.php");
$rrd_options .= " GPRINT:humidity:LAST:%3.0lf%%";
$rrd_options .= " GPRINT:humidity:MAX:%3.0lf%%\\\\l";
if(is_numeric($sensor['sensor_limit'])) $rrd_options .= " HRULE:".$sensor['sensor_limit']."#999999::dashes";
if(is_numeric($sensor['sensor_limit_low'])) $rrd_options .= " HRULE:".$sensor['sensor_limit_low']."#999999::dashes";
?>
html/includes/graphs/sensor/temperature.inc.php
+2 -4
View File
@@ -33,9 +33,7 @@ include("includes/graphs/common.inc.php");
$rrd_options .= " GPRINT:temp_min:MIN:%4.1lfC";
$rrd_options .= " GPRINT:temp_max:MAX:%4.1lfC\\\\l";
$rrd_options .= " HRULE:".$sensor['sensor_limit']."#999999::dashes";
$rrd_options .= " HRULE:".$sensor['sensor_limit_low']."#999999::dashes";
if(is_numeric($sensor['sensor_limit'])) $rrd_options .= " HRULE:".$sensor['sensor_limit']."#999999::dashes";
if(is_numeric($sensor['sensor_limit_low'])) $rrd_options .= " HRULE:".$sensor['sensor_limit_low']."#999999::dashes";
?>
html/includes/graphs/sensor/voltage.inc.php
+3
View File
@@ -24,4 +24,7 @@ $rrd_options .= " LINE1.5:volt#cc0000:'" . $sensor['sensor_descr_fixed']."'";
$rrd_options .= " GPRINT:volt:LAST:%6.2lfV";
$rrd_options .= " GPRINT:volt:MAX:%6.2lfV\\\\l";
if(is_numeric($sensor['sensor_limit'])) $rrd_options .= " HRULE:".$sensor['sensor_limit']."#999999::dashes";
if(is_numeric($sensor['sensor_limit_low'])) $rrd_options .= " HRULE:".$sensor['sensor_limit_low']."#999999::dashes";
?>
html/pages/device/health/sensors.inc.php
+3 -3
View File
@@ -14,9 +14,9 @@ while($temp = mysql_fetch_array($query)) {
echo("<tr class=list-large style=\"background-color: $row_colour; padding: 5px;\">
<td width=500>" . $temp['sensor_descr'] . "</td>
<td>" . $temp['sensor_type'] . "</td>
<td width=50>" . print_temperature($temp['sensor_current'], $temp['sensor_limit']) .$unit. "</td>
<td width=50>" . $temp['sensor_limit'] . $unit . "</td>
<td width=50>" . $temp['sensor_limit_low'] . $unit ."</td>
<td width=50>" . format_si($temp['sensor_current']) .$unit. "</td>
<td width=50>" . format_si($temp['sensor_limit']) . $unit . "</td>
<td width=50>" . format_si($temp['sensor_limit_low']) . $unit ."</td>
</tr>\n");
echo("<tr bgcolor=$row_colour><td colspan='5'>");