finalize move to sensors table for frequencies

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

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";