clones/librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-09-22 10:58:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

storage fixes, moving things from graphing page, ironware dynamic memory pool (static!)

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@947 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong 2010-02-25 00:56:13 +00:00
parent 17fe4219c2
commit 81eb203abe
17 changed files with 138 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
html/includes/graphs/device_processors.inc.php Normal file
View File

@ -0,0 +1,36 @@
<?php
$query = mysql_query("SELECT * FROM `processors` where `device_id` = '".mres($device_id)."'");
$i=0;
while($proc = mysql_fetch_array($query)) {
$rrd_filename = $config['rrd_dir'] . "/$hostname/" . safename("processor-" . $proc['processor_type'] . "-" . $proc['processor_index'] . ".rrd");
if(is_file($rrd_filename)) {
$descr = short_hrDeviceDescr($proc['processor_descr']);
$rrd_list[$i]['filename'] = $rrd_filename;
$rrd_list[$i]['descr'] = $descr;
$rrd_list[$i]['rra'] = "usage";
$i++;
}
}
$unit_text = "Load %";
$units='%';
$total_units='%';
$colours='mixed';
$scale_min = "0";
$scale_max = "100";
$nototal = 1;
if ($rrd_list) {
include ("generic_multi_line.inc.php");
}
?>

2
html/includes/graphs/device_storage.inc.php
View File

@ -14,7 +14,7 @@ include("common.inc.php");
} elseif($iter=="7") {$colour="FF0084"; $iter = "0"; }
$descr = substr(str_pad($storage[storage_descr], 12),0,12);
$descr = str_replace(":","\:",$descr);
$rrd = $config['rrd_dir'] . "/$hostname/" . safename("storage-".$storage['storage_mib']."-".$storage['storage_index'].".rrd");
$rrd = $config['rrd_dir'] . "/$hostname/" . safename("storage-".$storage['storage_mib']."-".$storage['storage_descr'].".rrd");
$rrd_options .= " DEF:$storage[storage_id]used=$rrd:used:AVERAGE";
$rrd_options .= " DEF:$storage[storage_id]free=$rrd:free:AVERAGE";
$rrd_options .= " CDEF:$storage[storage_id]size=$storage[storage_id]used,$storage[storage_id]free,+";

55
html/includes/graphs/device_voltages.inc.php Normal file
View File

@ -0,0 +1,55 @@
<?php
include("common.inc.php");
$rrd_options .= " -l 0 -E ";
$iter = "1";
$sql = mysql_query("SELECT * FROM voltage where device_id = '$device_id'");
$rrd_options .= " COMMENT:' Cur Min Max\\n'";
while($voltage = mysql_fetch_array($sql))
{
switch ($iter)
{
case "1":
$colour= "CC0000";
break;
case "2":
$colour= "008C00";
break;
case "3":
$colour= "4096EE";
break;
case "4":
$colour= "73880A";
break;
case "5":
$colour= "D01F3C";
break;
case "6":
$colour= "36393D";
break;
case "7":
default:
$colour= "FF0084";
unset($iter);
break;
}
$hostname = gethostbyid($voltage['device_id']);
$descr = substr(str_pad($voltage['volt_descr'], 17),0,17);
$rrd_filename = $config['rrd_dir'] . "/".$hostname."/" . safename("volt-" . $voltage['volt_descr'] . ".rrd");
$volt_id = $voltage['volt_id'];
$rrd_options .= " DEF:volt$volt_id=$rrd_filename:volt:AVERAGE";
$rrd_options .= " LINE1:volt$volt_id#".$colour.":'" . $descr . "'";
$rrd_options .= " GPRINT:volt$volt_id:AVERAGE:%5.2lfV";
$rrd_options .= " GPRINT:volt$volt_id:MIN:%5.2lfV";
$rrd_options .= " GPRINT:volt$volt_id:MAX:%5.2lfV\\\\l";
$iter++;
}
?>

2
html/includes/graphs/storage.inc.php
View File

@ -17,7 +17,7 @@ $rrd_options .= " -b 1024";
} elseif($iter=="7") {$colour="FF0084"; $iter = "0"; }
$descr = substr(str_pad($storage[storage_descr], 12),0,12);
$descr = str_replace(":","\:",$descr);
$rrd = $config['rrd_dir'] . "/" . $hostname . "/" . safename("storage-" . $storage['storage_mib'] . "-" . $storage['storage_index'] . ".rrd");
$rrd = $config['rrd_dir'] . "/" . $hostname . "/" . safename("storage-" . $storage['storage_mib'] . "-" . $storage['storage_descr'] . ".rrd");
$rrd_options .= " DEF:$storage[storage_id]used=$rrd:used:AVERAGE";
$rrd_options .= " DEF:$storage[storage_id]free=$rrd:free:AVERAGE";
$rrd_options .= " CDEF:$storage[storage_id]size=$storage[storage_id]used,$storage[storage_id]free,+";

6
html/pages/device/graphs/os-ios.inc.php
View File

@ -1,8 +1,8 @@
<?php
include("cpu.inc.php");
include("memory.inc.php");
include("temperatures.inc.php");
#include("cpu.inc.php");
#include("memory.inc.php");
#include("temperatures.inc.php");
include("netstats.inc.php");
include("uptime.inc.php");

2
html/pages/device/graphs/os-ironware.inc.php
View File

@ -2,7 +2,7 @@
#include("cpu.inc.php");
#include("memory.inc.php");
include("temperatures.inc.php");
#include("temperatures.inc.php");
include("netstats.inc.php");
include("uptime.inc.php");

4
html/pages/device/graphs/os-junos.inc.php
View File

@ -1,6 +1,6 @@
<?php
include("cpu.inc.php");
include("temperatures.inc.php");
#include("cpu.inc.php");
#include("temperatures.inc.php");
include("netstats.inc.php");
include("uptime.inc.php");
?>

5
html/pages/device/graphs/os-junose.inc.php
View File

@ -1,6 +1,7 @@
<?php
include("cpu.inc.php");
include("temperatures.inc.php");
#include("cpu.inc.php");
#include("temperatures.inc.php");
include("netstats.inc.php");
include("uptime.inc.php");
?>

1
html/pages/device/graphs/os-unix.inc.php
View File

@ -2,7 +2,6 @@
include("cpu.inc.php");
include("memory.inc.php");
include("temperatures.inc.php");
include("netstats.inc.php");
include("laload.inc.php");
include("hrusers.inc.php");

2
html/pages/device/graphs/os-windows.inc.php
View File

@ -1,8 +1,6 @@
<?php
include("cpu.inc.php");
include("memory.inc.php");
include("temperatures.inc.php");
include("netstats.inc.php");
include("laload.inc.php");
include("hrusers.inc.php");

7
html/pages/device/graphs/temperatures.inc.php
View File

@ -1,7 +0,0 @@
<?php
if(mysql_result(mysql_query("SELECT count(*) FROM temperature WHERE device_id = '" . $device['device_id'] . "'"),0)) {
$graph_title = "Temperatures";
$graph_type = "device_temperatures"; include ("includes/print-device-graph.php");
echo("<br />");
}
?>

13
html/pages/device/health.inc.php
View File

@ -7,10 +7,10 @@ $processor = mysql_result(mysql_query("select count(*) from processors WHERE de
$fans = mysql_result(mysql_query("select count(*) from fanspeed WHERE device_id = '" . $device['device_id'] . "'"), 0);
$volts = mysql_result(mysql_query("select count(*) from voltage WHERE device_id = '" . $device['device_id'] . "'"), 0);
if ($temperatures) { $datas[] = 'temp'; }
if ($storage) { $datas[] = 'storage'; }
if ($memory) { $datas[] = 'memory'; }
if ($processor) { $datas[] = 'processors'; }
if ($memory) { $datas[] = 'memory'; }
if ($storage) { $datas[] = 'storage'; }
if ($temperatures) { $datas[] = 'temperatures'; }
if ($fans) { $datas[] = 'fanspeeds'; }
if ($volts) { $datas[] = 'voltages'; }
@ -23,11 +23,14 @@ $type_text['fanspeeds'] = "Fan Speeds";
print_optionbar_start();
if(!$_GET['opta']) { echo("<b>"); }
echo("<a href='".$config['base_url']."/device/" . $device['device_id'] . "/health/'>Main</a>\n");
if(!$_GET['opta']) { echo("</b>"); }
foreach ($datas as $type) {
if ($_GET['opta'] == $type) { echo(" | <strong>"); }
echo("<a href='".$config['base_url']."/device/" . $device['device_id'] . "/health/" . $type . "/'>" . $type_text[$type] ."</a>\n");
if ($_GET['opta'] == $type) { echo("<strong>"); }
echo(" | <a href='".$config['base_url']."/device/" . $device['device_id'] . "/health/" . $type . "/'>" . $type_text[$type] ."</a>\n");
if ($_GET['opta'] == $type) { echo("</strong>"); }
}

16
includes/discovery/mempools-ironware-dyn.inc.php Executable file
View File

@ -0,0 +1,16 @@
<?php
if($device['os'] == "ironware" || $device['os_type'] == "ironware") {
echo("Ironware Dynamic: ");
$percent = snmp_get($device, "snAgGblDynMemUtil.0", "-OvQ", "FOUNDRY-SN-AGENT-MIB");
if(is_numeric($percent)) {
discover_mempool($valid_mempool, $device, 0, "ironware-dyn", "Dynamic Memory", "1", NULL, NULL);
}
}
?>

1
includes/discovery/mempools.inc.php
View File

@ -3,6 +3,7 @@
echo("Memory : ");
include("mempools-cmp.inc.php");
include("mempools-ironware-dyn.inc.php");
### Remove memory pools which weren't redetected here

9
includes/polling/mempools-ironware-dyn.inc.php Executable file
View File

@ -0,0 +1,9 @@
<?php
## Simple hard-coded poller for Brocade Ironware Dynamic Memory (old style)
$mempool['total'] = snmp_get($device, "snAgGblDynMemTotal.0", "-OvQ", "FOUNDRY-SN-AGENT-MIB");
$mempool['free'] = snmp_get($device, "snAgGblDynMemFree.0", "-OvQ", "FOUNDRY-SN-AGENT-MIB");
$mempool['used'] = $mempool['total'] - $mempool['free'];
?>

5
includes/polling/mempools.inc.php
View File

@ -28,16 +28,13 @@ while($mempool = mysql_fetch_array($mempool_data)) {
}
$file = $config['install_dir']."/includes/polling/mempools-".$mempool['mempool_type'].".inc.php";
echo($file);
if(is_file($file)) {
include($file);
} else {
### FIXME GENERIC
}
$percent = $mempool['used'] * $mempool['total'] * 100;
print_r($mempool);
$percent = round($mempool['used'] * $mempool['total'] * 100);
echo($percent."% ");

2
includes/polling/storage.inc.php
View File

@ -8,7 +8,7 @@ while($storage = mysql_fetch_array($storage_data)) {
echo($storage['storage_descr'] . ": ");
$storage_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename("storage-" . $storage['storage_mib'] . "-" . $storage['storage_index'] . ".rrd");
$storage_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename("storage-" . $storage['storage_mib'] . "-" . safename($storage['storage_descr']) . ".rrd");
if (!is_file($storage_rrd)) {
rrdtool_create($storage_rrd, "--step 300 \