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

finalize move to sensors table for frequencies

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@1550 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2010-07-30 16:44:59 +00:00
parent b34cb35a46
commit 088dde8eb0
11 changed files with 37 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,7 +6,7 @@ $device = device_by_id_cache($id);
$rrd_options .= " -l 0 -E ";
$iter = "1";
$sql = mysql_query("SELECT * FROM frequency where device_id = '$id'");
$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))
{
@@ -39,15 +39,15 @@ while($frequency = mysql_fetch_array($sql))
$hostname = gethostbyid($frequency['device_id']);
$descr = substr(str_pad($frequency['freq_descr'], 15),0,15);
$rrd_filename = $config['rrd_dir'] . "/".$device['hostname']."/" . safename("freq-" . $frequency['freq_descr'] . ".rrd");
$freq_id = $frequency['freq_id'];
$descr = substr(str_pad($frequency['sensor_descr'], 15),0,15);
$rrd_filename = $config['rrd_dir'] . "/".$device['hostname']."/" . safename("freq-" . $frequency['sensor_descr'] . ".rrd");
$sensor_id = $frequency['sensor_id'];
$rrd_options .= " DEF:freq$freq_id=$rrd_filename:freq:AVERAGE";
$rrd_options .= " LINE1:freq$freq_id#".$colour.":'" . $descr . "'";
$rrd_options .= " GPRINT:freq$freq_id:AVERAGE:%5.2lfHz";
$rrd_options .= " GPRINT:freq$freq_id:MIN:%5.2lfHz";
$rrd_options .= " GPRINT:freq$freq_id:MAX:%5.2lfHz\\\\l";
$rrd_options .= " DEF:freq$sensor_id=$rrd_filename:freq: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";
$rrd_options .= " GPRINT:freq$sensor_id:MAX:%5.2lfHz\\\\l";
$iter++;
}

8
html/includes/graphs/sensor/frequency.inc.php
View File

@@ -6,16 +6,16 @@ include("includes/graphs/common.inc.php");
$rrd_options .= " COMMENT:' Last Max\\n'";
$frequency = mysql_fetch_array(mysql_query("SELECT * FROM frequency where freq_id = '".mres($_GET['id'])."'"));
$frequency = mysql_fetch_array(mysql_query("SELECT * FROM sensors where sensor_class='freq' AND sensor_id = '".mres($_GET['id'])."'"));
$hostname = mysql_result(mysql_query("SELECT hostname FROM devices WHERE device_id = '" . $frequency['device_id'] . "'"),0);
$frequency['freq_descr_fixed'] = substr(str_pad($frequency['freq_descr'], 28),0,28);
$frequency['sensor_descr_fixed'] = substr(str_pad($frequency['sensor_descr'], 28),0,28);
$rrd_filename = $config['rrd_dir'] . "/".$hostname."/" . safename("freq-" . $frequency['freq_descr'] . ".rrd");
$rrd_filename = $config['rrd_dir'] . "/".$hostname."/" . safename("freq-" . $frequency['sensor_descr'] . ".rrd");
$rrd_options .= " DEF:freq=$rrd_filename:freq:AVERAGE";
$rrd_options .= " LINE1.5:freq#cc0000:'" . $frequency['freq_descr_fixed']."'";
$rrd_options .= " LINE1.5:freq#cc0000:'" . $frequency['sensor_descr_fixed']."'";
$rrd_options .= " GPRINT:freq:LAST:%3.0lfHz";
$rrd_options .= " GPRINT:freq:MAX:%3.0lfHz\\\\l";