unify sensor rrd filenaming, move to fuction.

git-svn-id: http://www.observium.org/svn/observer/trunk@2168 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-04-26 15:07:52 +00:00
parent 8fa88ade9f
commit f80ecae2e3
12 changed files with 51 additions and 33 deletions

View File

@@ -9,7 +9,8 @@ if (is_numeric($id))
$device = device_by_id_cache($sensor['device_id']);
### This doesn't quite work for all yet.
$rrd_filename = $config['rrd_dir'] . "/".$device['hostname']."/" . safename($sensor['sensor_class']."-" . $sensor['sensor_type'] . "-".$sensor['sensor_index'].".rrd");
#$rrd_filename = $config['rrd_dir'] . "/".$device['hostname']."/" . safename($sensor['sensor_class']."-" . $sensor['sensor_type'] . "-".$sensor['sensor_index'].".rrd");
$rrd_filename = get_sensor_rrd($device, $sensor);
$title = generate_device_link($device);
$title .= " :: Sensor :: " . htmlentities($sensor['sensor_descr']);
@@ -17,4 +18,4 @@ if (is_numeric($id))
}
}
?>
?>