nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-28 00:24:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

updates

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@436 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2009-05-28 13:03:52 +00:00
parent a45c2c5aff
commit b6bf3ffb15
15 changed files with 42 additions and 5011 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/discovery/ipv4-addresses.php
+2 -2
View File
@@ -33,7 +33,7 @@
echo("+");
} else { echo("."); }
$full_address = "$oid/$cidr";
$full_address = "$oid/$cidr|$ifIndex";
$valid_v4[$full_address] = 1;
} else { echo("!"); }
@@ -43,7 +43,7 @@
$sql = "SELECT * FROM ipv4_addresses AS A, interfaces AS I WHERE I.device_id = '".$device['device_id']."' AND A.interface_id = I.interface_id";
$data = mysql_query($sql);
while($row = mysql_fetch_array($data)) {
$full_address = $row['ipv4_address'] . "/" . $row['ipv4_prefixlen'];
$full_address = $row['ipv4_address'] . "/" . $row['ipv4_prefixlen'] . "|" . $row['ifIndex'];
if(!$valid_v4[$full_address]) {
echo("-");
$query = @mysql_query("DELETE FROM `ipv4_addresses` WHERE `ipv4_address_id` = '".$row['ipv4_address_id']."'");
includes/discovery/storage.php
+1 -1
View File
@@ -23,7 +23,7 @@
}
}
echo("$fstype\n");
# echo("$fstype\n");
if(strstr($fstype, "FixedDisk") && $size > '0' && $allow) {
if(mysql_result(mysql_query("SELECT count(storage_id) FROM `storage` WHERE hrStorageIndex = '$hrStorageIndex' AND host_id = '".$device['device_id']."'"),0) == '0') {
includes/graphing.php
+2
View File
@@ -400,6 +400,7 @@ function graph_bits ($rrd, $graph, $from, $to, $width, $height, $title, $vertica
$options .= " LINE1:d95thout#aa0000";
} else {
$options .= " AREA:inbits_max#aDEB7B:";
$options .= " AREA:inbits#CDEB8B:";
$options .= " COMMENT:BPS\ \ \ \ Current\ \ \ Average\ \ \ \ \ \ Max\ \ \ 95th\ %\\\\n";
$options .= " LINE1.25:inbits#006600:In\ ";
$options .= " GPRINT:inbits:LAST:%6.2lf%s";
@@ -407,6 +408,7 @@ function graph_bits ($rrd, $graph, $from, $to, $width, $height, $title, $vertica
$options .= " GPRINT:inbits_max:MAX:%6.2lf%s";
$options .= " GPRINT:95thin:%6.2lf%s\\\\n";
$options .= " AREA:doutbits_max#a3b9FF:";
$options .= " AREA:doutbits#C3D9FF:";
$options .= " LINE1.25:doutbits#000099:Out";
$options .= " GPRINT:outbits:LAST:%6.2lf%s";
$options .= " GPRINT:outbits:AVERAGE:%6.2lf%s";