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

clean up polling source files, remove dead code

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@1865 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2011-03-16 01:11:27 +00:00
parent 0b55624ba0
commit ecbcd1db43
41 changed files with 1135 additions and 1246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
includes/polling/processors.inc.php
View File

@@ -2,12 +2,13 @@
$query = "SELECT * FROM processors WHERE device_id = '" . $device['device_id'] . "'";
$proc_data = mysql_query($query);
while($processor = mysql_fetch_array($proc_data)) {
while ($processor = mysql_fetch_array($proc_data))
{
echo("Processor " . $processor['processor_descr'] . "... ");
$file = $config['install_dir']."/includes/polling/processors-".$processor['processor_type'].".inc.php";
if(is_file($file)) {
if (is_file($file))
{
include($file);
} else {
$proc = snmp_get ($device, $processor['processor_oid'], "-O Uqnv");
@@ -15,8 +16,9 @@ while($processor = mysql_fetch_array($proc_data)) {
$procrrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename("processor-" . $processor['processor_type'] . "-" . $processor['processor_index'] . ".rrd");
if (!is_file($procrrd)) {
rrdtool_create($procrrd, "--step 300 \
if (!is_file($procrrd))
{
rrdtool_create($procrrd, "--step 300 \
DS:usage:GAUGE:600:-273:1000 \
RRA:AVERAGE:0.5:1:1200 \
RRA:MIN:0.5:12:2400 \
@@ -25,9 +27,9 @@ while($processor = mysql_fetch_array($proc_data)) {
}
$proc = trim(str_replace("\"", "", $proc));
list($proc) = preg_split("@\ @", $proc);
list($proc) = preg_split("@\ @", $proc);
if(!$processor['processor_precision']) {$processor['processor_precision'] = "1";};
if (!$processor['processor_precision']) { $processor['processor_precision'] = "1"; };
$proc = round($proc / $processor['processor_precision'],2);
echo($proc . "%\n");
@@ -35,7 +37,6 @@ while($processor = mysql_fetch_array($proc_data)) {
rrdtool_update($procrrd,"N:$proc");
mysql_query("UPDATE `processors` SET `processor_usage` = '$proc' WHERE `processor_id` = '".$processor['processor_id']."'");
}
?>
?>