mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix humidity and frequency graph on device health page

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@1890 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2011-03-16 21:46:41 +00:00
parent 2f1a709a3c
commit e18a7d6aab
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
html/includes/graphs/device/frequencies.inc.php
View File

@@ -8,7 +8,7 @@ $rrd_options .= " -l 0 -E ";
$iter = "1";
$sql = mysql_query("SELECT * FROM sensors WHERE sensor_class='freq' AND device_id = '$id'");
$rrd_options .= " COMMENT:' Cur Min Max\\n'";
while($frequency = mysql_fetch_array($sql))
while ($frequency = mysql_fetch_array($sql))
{
switch ($iter)
{
@@ -40,10 +40,10 @@ while($frequency = mysql_fetch_array($sql))
$hostname = gethostbyid($frequency['device_id']);
$descr = substr(str_pad($frequency['sensor_descr'], 15),0,15);
$rrd_filename = $config['rrd_dir'] . "/".$device['hostname']."/" . safename("freq-" . $frequency['sensor_descr'] . ".rrd");
$rrd_filename = $config['rrd_dir'] . "/".$device['hostname']."/" . safename("frequency-" . $frequency['sensor_descr'] . ".rrd");
$sensor_id = $frequency['sensor_id'];
$rrd_options .= " DEF:freq$sensor_id=$rrd_filename:freq:AVERAGE";
$rrd_options .= " DEF:freq$sensor_id=$rrd_filename:sensor:AVERAGE";
$rrd_options .= " LINE1:freq$sensor_id#".$colour.":'" . $descr . "'";
$rrd_options .= " GPRINT:freq$sensor_id:AVERAGE:%5.2lfHz";
$rrd_options .= " GPRINT:freq$sensor_id:MIN:%5.2lfHz";
@@ -52,5 +52,4 @@ while($frequency = mysql_fetch_array($sql))
$iter++;
}
?>
?>

7
html/includes/graphs/device/humidity.inc.php
View File

@@ -8,7 +8,7 @@ $rrd_options .= " -l 0 -E ";
$iter = "1";
$sql = mysql_query("SELECT * FROM sensors WHERE sensor_class='humidity' AND device_id = '$id' ORDER BY sensor_index");
$rrd_options .= " COMMENT:' Cur Min Max\\n'";
while($humidity = mysql_fetch_array($sql))
while ($humidity = mysql_fetch_array($sql))
{
switch ($iter)
{
@@ -38,7 +38,7 @@ while($humidity = mysql_fetch_array($sql))
}
$humidity['sensor_descr_fixed'] = substr(str_pad($humidity['sensor_descr'], 22),0,22);
$humidityrrd = $config['rrd_dir'] . "/".$device['hostname']."/".safename("humidity-" . safename($humidity['sensor_type']."-".$humidity['sensor_index']) . ".rrd");
$humidityrrd = $config['rrd_dir'] . "/".$device['hostname']."/".safename("humidity-" . safename($humidity['sensor_descr']) . ".rrd");
$rrd_options .= " DEF:sensor" . $humidity['sensor_id'] . "=$humidityrrd:sensor:AVERAGE ";
$rrd_options .= " LINE1:sensor" . $humidity['sensor_id'] . "#" . $colour . ":'" . str_replace(':','\:',str_replace('\*','*',quotemeta($humidity['sensor_descr_fixed']))) . "' ";
$rrd_options .= " GPRINT:sensor" . $humidity['sensor_id'] . ":LAST:%3.0lf%% ";
@@ -47,5 +47,4 @@ while($humidity = mysql_fetch_array($sql))
$iter++;
}
?>
?>