clones/librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-09-26 21:07:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove old rrd file check after a little over a year, douchebags should svn up :>

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@3118 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans 2012-05-02 22:06:03 +00:00
parent 613e8b1e29
commit 2f9ed9c987
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
includes/polling/functions.inc.php
View File

@ -2,7 +2,7 @@
function poll_sensor($device, $class, $unit)
{
global $config; global $memcache;
global $config, $memcache;
foreach (dbFetchRows("SELECT * FROM `sensors` WHERE `sensor_class` = ? AND `device_id` = ? AND `poller_type` = 'snmp'", array($class, $device['device_id'])) as $sensor)
{
@ -16,7 +16,7 @@ function poll_sensor($device, $class, $unit)
$sensor_value = snmp_get($device, $sensor['sensor_oid'], "-OUqnv", "SNMPv2-MIB");
$sensor_value = trim(str_replace("\"", "", $sensor_value));
if ($sensor_value != 9999) break; # TME sometimes sends 999.9 when it is right in the middle of an update;
if ($sensor_value < 9000) break; # TME sometimes sends 999.9 when it is right in the middle of an update;
sleep(1); # Give the TME some time to reset
}
} else {
@ -30,22 +30,6 @@ function poll_sensor($device, $class, $unit)
$rrd_file = get_sensor_rrd($device, $sensor);
#$rrd_file = $config['rrd_dir']."/".$device['hostname']."/".safename("sensor-".$sensor['sensor_class']."-".$sensor['sensor_type']."-".$sensor['sensor_index'] . ".rrd");
## FIXME - sensor name format change 2011/04/26 - remove this in $amount_of_time.
## We don't want to reduce performance forever because douchebags don't svn up!
$old_rrd_file = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename("$class-" . $sensor['sensor_descr'] . ".rrd");
$old_rrd_file_b = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename("$class-" . $sensor['sensor_index'] . ".rrd");
if (is_file($old_rrd_file) && is_file($old_rrd_file_b))
{
rename($old_rrd_file, $rrd_file);
unlink($old_rrd_file_b);
} elseif (is_file($old_rrd_file)) {
rename($old_rrd_file, $rrd_file);
} elseif (is_file($old_rrd_file_b)) {
rename($old_rrd_file_b, $rrd_file);
}
if (!is_file($rrd_file))
{
rrdtool_create($rrd_file,"--step 300 \