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

replace old hrStorage poller with generic storage poller and hrStorage plugin

Browse Source 
*** OLD RRDFILES ARE USELESS NOW***
remove a load of old processor and storage stuff add more % bars to things


git-svn-id: http://www.observium.org/svn/observer/trunk@936 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2010-02-24 02:16:56 +00:00
parent bafbe9b5c7
commit afdf4fbfc3
18 changed files with 70 additions and 483 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
html/includes/graphs/cpmCPU.inc.php
View File

@@ -1,26 +0,0 @@
<?php
$scale_min = "0";
$scale_max = "100";
include("common.inc.php");
$iter = "1";
$sql = mysql_query("SELECT * FROM `cpmCPU` AS C, `devices` AS D where C.`cpmCPU_id` = '".mres($_GET['id'])."' AND C.device_id = D.device_id");
$rrd_options .= " COMMENT:' Cur Max\\n'";
while($proc = mysql_fetch_array($sql)) {
if($iter=="1") {$colour="CC0000";} elseif($iter=="2") {$colour="008C00";} elseif($iter=="3") {$colour="4096EE";
} elseif($iter=="4") {$colour="73880A";} elseif($iter=="5") {$colour="D01F3C";} elseif($iter=="6") {$colour="36393D";
} elseif($iter=="7") {$colour="FF0084"; unset($iter); }
$proc['descr_fixed'] = str_pad($proc['entPhysicalDescr'], 28);
$proc['descr_fixed'] = substr($proc['descr_fixed'],0,28);
$rrd = $config['rrd_dir'] . "/".$proc['hostname']."/" . safename("cpmCPU-" . $proc['cpmCPU_oid'] . ".rrd");
$rrd_options .= " DEF:proc" . $proc['cpmCPU_oid'] . "=$rrd:usage:AVERAGE ";
$rrd_options .= " LINE1:proc" . $proc['cpmCPU_oid'] . "#" . $colour . ":'" . $proc['descr_fixed'] . "' ";
$rrd_options .= " GPRINT:proc" . $proc['cpmCPU_oid'] . ":LAST:%3.0lf";
$rrd_options .= " GPRINT:proc" . $proc['cpmCPU_oid'] . ":MAX:%3.0lf\\\l ";
$iter++;
}
?>

6
html/includes/graphs/device_hrstorage.inc.php
View File

@@ -6,15 +6,15 @@ $scale_max = "100";
include("common.inc.php");
$iter = "1";
$sql = mysql_query("SELECT * FROM storage where host_id = '$device_id'");
$sql = mysql_query("SELECT * FROM storage where device_id = '$device_id'");
$rrd_options .= " COMMENT:' Size Used %age\\l'";
while($fs = mysql_fetch_array($sql)) {
if($iter=="1") {$colour="CC0000";} elseif($iter=="2") {$colour="008C00";} elseif($iter=="3") {$colour="4096EE";
} elseif($iter=="4") {$colour="73880A";} elseif($iter=="5") {$colour="D01F3C";} elseif($iter=="6") {$colour="36393D";
} elseif($iter=="7") {$colour="FF0084"; $iter = "0"; }
$descr = substr(str_pad($fs[hrStorageDescr], 12),0,12);
$descr = substr(str_pad($fs[storage_descr], 12),0,12);
$descr = str_replace(":","\:",$descr);
$rrd = $config['rrd_dir'] . "/$hostname/" . safename("hrStorage-".$fs['hrStorageIndex'].".rrd");
$rrd = $config['rrd_dir'] . "/$hostname/" . safename("hrStorage-".$fs['storage_index'].".rrd");
$rrd_options .= " DEF:$fs[storage_id]=$rrd:used:AVERAGE";
$rrd_options .= " DEF:$fs[storage_id]s=$rrd:size:AVERAGE";
$rrd_options .= " DEF:$fs[storage_id]p=$rrd:perc:AVERAGE";

27
html/includes/graphs/hrProcessor.inc.php
View File

@@ -1,27 +0,0 @@
<?php
$scale_min = "0";
$scale_max = "100";
include("common.inc.php");
$iter = "1";
$sql = mysql_query("SELECT * FROM `hrDevice` AS C, `devices` AS D where C.`hrDevice_id` = '".mres($_GET['id'])."' AND C.device_id = D.device_id");
$rrd_options .= " COMMENT:' Cur Max\\n'";
while($proc = mysql_fetch_array($sql)) {
if($iter=="1") {$colour="CC0000";} elseif($iter=="2") {$colour="008C00";} elseif($iter=="3") {$colour="4096EE";
} elseif($iter=="4") {$colour="73880A";} elseif($iter=="5") {$colour="D01F3C";} elseif($iter=="6") {$colour="36393D";
} elseif($iter=="7") {$colour="FF0084"; unset($iter); }
$proc['descr_fixed'] = substr(str_pad(short_hrDeviceDescr($proc['hrDeviceDescr']), 28),0,28);
$proc['descr_fixed'] = str_replace(":", "\:", $proc['descr_fixed']);
$rrd = $config['rrd_dir'] . "/".$proc['hostname']."/" . safename("hrProcessor-" . $proc['hrDeviceIndex'] . ".rrd");
$rrd_options .= " DEF:proc" . $proc['hrDeviceIndex'] . "=$rrd:usage:AVERAGE ";
$rrd_options .= " LINE1:proc" . $proc['hrDeviceIndex'] . "#" . $colour . ":'" . $proc['descr_fixed'] . "' ";
$rrd_options .= " GPRINT:proc" . $proc['hrDeviceIndex'] . ":LAST:%3.0lf";
$rrd_options .= " GPRINT:proc" . $proc['hrDeviceIndex'] . ":MAX:%3.0lf\\\l ";
$iter++;
}
?>

31
html/includes/graphs/hrstorage.inc.php
View File

@@ -1,31 +0,0 @@
<?php
$scale_min = "0";
$scale_max = "100";
include("common.inc.php");
$rrd_options .= " -b 1024";
$iter = "1";
$sql = mysql_query("SELECT * FROM storage where storage_id = '".mres($_GET['id'])."'");
$rrd_options .= " COMMENT:' Size Used %age\\n'";
while($fs = mysql_fetch_array($sql)) {
$hostname = gethostbyid($fs['host_id']);
if($iter=="1") {$colour="CC0000";} elseif($iter=="2") {$colour="008C00";} elseif($iter=="3") {$colour="4096EE";
} elseif($iter=="4") {$colour="73880A";} elseif($iter=="5") {$colour="D01F3C";} elseif($iter=="6") {$colour="36393D";
} elseif($iter=="7") {$colour="FF0084"; $iter = "0"; }
$descr = substr(str_pad($fs[hrStorageDescr], 12),0,12);
$descr = str_replace(":","\:",$descr);
$rrd = $config['rrd_dir'] . "/$hostname/" . safename("hrStorage-".$fs['hrStorageIndex'].".rrd");
$rrd_options .= " DEF:$fs[storage_id]=$rrd:used:AVERAGE";
$rrd_options .= " DEF:$fs[storage_id]s=$rrd:size:AVERAGE";
$rrd_options .= " DEF:$fs[storage_id]p=$rrd:perc:AVERAGE";
$rrd_options .= " LINE1.25:$fs[storage_id]p#" . $colour . ":'$descr'";
$rrd_options .= " GPRINT:$fs[storage_id]s:LAST:%6.2lf%SB";
$rrd_options .= " GPRINT:$fs[storage_id]:LAST:%6.2lf%SB";
$rrd_options .= " GPRINT:$fs[storage_id]p:LAST:%5.2lf%%\\\\n";
$iter++;
}
?>