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

updates and fixes

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@519 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2009-11-12 17:51:36 +00:00
parent d8155aacff
commit 17f74b5aa4
7 changed files with 1503 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/includes/graphs/device_cpu_ios.inc.php
+11 -1
View File
@@ -30,7 +30,17 @@ $scale_max = "100";
$nototal = 1;
include ("generic_multi_line.inc.php");
if($rrd_list) {include ("generic_multi_line.inc.php"); } else {
include("common.inc.php");
$database = $config['rrd_dir'] . "/" . $hostname . "/ios-cpu.rrd";
$rrd_options .= " DEF:5m=$database:LOAD5M:AVERAGE";
$rrd_options .= " DEF:5m_max=$database:LOAD5M:MAX";
$rrd_options .= " DEF:5m_min=$database:LOAD5M:MIN";
$rrd_options .= " COMMENT:\ \ \ \ \ \ \ \ \ \ Current\ \ Minimum\ \ Maximum\ \ Average\\\\n";
$rrd_options .= " AREA:5m#ffee99: LINE1.25:5m#aa2200:Load\ %";
$rrd_options .= " GPRINT:5m:LAST:%6.2lf\ GPRINT:5m_min:AVERAGE:%6.2lf\ ";
$rrd_options .= " GPRINT:5m_max:MAX:%6.2lf\ GPRINT:5m:AVERAGE:%6.2lf\\\\n";
}
?>
includes/discovery/bgp-peers.php
+4 -4
View File
@@ -10,7 +10,7 @@
if($bgpLocalAs && !strstr($bgpLocalAs, " ")) {
echo("AS$bgpLocalAs \n");
echo("AS$bgpLocalAs ");
if($bgpLocalAs != $device['bgpLocalAs']) { mysql_query("UPDATE devices SET bgpLocalAs = '$bgpLocalAs' WHERE device_id = '".$device['device_id']."'"); echo("Updated AS\n"); }
@@ -26,7 +26,7 @@
$astext = trim(str_replace("\"", "", shell_exec("/usr/bin/dig +short AS$peer_as.asn.cymru.com TXT | cut -d '|' -f 5 | sed s/\\\"//g")));
echo(str_pad($peer_ip, 40) . " AS$peer_as ");
# echo(str_pad($peer_ip, 40) . " AS$peer_as ");
#echo("$peer_ip AS$peer_as ");
if(mysql_result(mysql_query("SELECT COUNT(*) FROM `bgpPeers` WHERE `device_id` = '".$device['device_id']."' AND bgpPeerIdentifier = '$peer_ip'"),0) < '1') {
@@ -46,7 +46,7 @@
list($afisafi, $text) = explode(" = ", $af);
list($afi, $safi) = explode(".", $afisafi);
if($afi && $safi) {
echo("($afi:$safi)");
# echo("($afi:$safi)");
$af_list['$afi']['$safi'] = 1;
if(mysql_result(mysql_query("SELECT COUNT(*) FROM `bgpPeers_cbgp` WHERE `device_id` = '".$device['device_id']."' AND bgpPeerIdentifier = '$peer_ip' AND afi = '$afi' AND safi = '$safi'"),0) == 0) {
mysql_query("INSERT INTO `bgpPeers_cbgp` (device_id,bgpPeerIdentifier, afi, safi) VALUES ('".$device['device_id']."','$peer_ip','$afi','$safi')");
@@ -62,7 +62,6 @@
}
} # AF list
} # if IOS
echo("\n");
} # If Peer
} # Foreach
} else {
@@ -92,6 +91,7 @@ while ($entry = mysql_fetch_array($query)) {
}
}
echo("\n");
?>
includes/discovery/cisco-physical.php
+1 -3
View File
@@ -10,8 +10,6 @@
$entity_array = snmpwalk_cache_oid("entityPhysical", $device, $empty, "ENTITY-MIB");
$entity_array = snmpwalk_cache_oid("entSensorValues", $device, $entity_array, "CISCO-ENTITY-SENSOR-MIB");
print_r($entity_array);
foreach($entity_array[$device[device_id]] as $entPhysicalIndex => $entry) {
$entPhysicalDescr = $entry['entPhysicalDescr'];
@@ -79,7 +77,7 @@
$sql = "UPDATE `entPhysical` SET entSensorType = '', entSensorScale = '', entSensorPrecision = '', entSensorMeasuredEntity = ''";
$sql .= " WHERE device_id = '".$device['device_id']."' AND entPhysicalIndex = '$entPhysicalIndex'";
}
echo("$sql\n");
# echo("$sql\n");
mysql_query($sql);
}
$valid[$entPhysicalIndex] = 1;
includes/polling/device-ios.inc.php
+12 -6
View File
@@ -20,15 +20,13 @@
list(,$features) = explode("(", $features);
list(,$features) = explode("-", $features);
list ($cpu5m, $cpu5s) = explode("\n", shell_exec($config['snmpget'] . " -m OLD-CISCO-CPU-MIB -O qv -$snmpver -c $community $hostname:$port 1.3.6.1.4.1.9.2.1.58.0 1.3.6.1.4.1.9.2.1.56.0"));
$cpu5m = shell_exec($config['snmpget'] . " -m OLD-CISCO-CPU-MIB -O qv -$snmpver -c $community $hostname:$port avgBusy5.0");
$cpu5m = $cpu5m + 0;
$cpu5s = $cpu5s + 0;
echo("$hostname\n");
if (!is_file($cpurrd)) {
$rrdcreate = shell_exec($config['rrdtool'] . " create $cpurrd --step 300 \
DS:LOAD5S:GAUGE:600:-1:100 \
DS:LOAD5M:GAUGE:600:-1:100 \
RRA:AVERAGE:0.5:1:2000 \
RRA:AVERAGE:0.5:6:2000 \
@@ -37,10 +35,14 @@
RRA:MAX:0.5:1:2000 \
RRA:MAX:0.5:6:2000 \
RRA:MAX:0.5:24:2000 \
RRA:MAX:0.5:288:2000");
RRA:MAX:0.5:288:2000 \
RRA:MIN:0.5:1:2000 \
RRA:MIN:0.5:6:2000 \
RRA:MIN:0.5:24:2000 \
RRA:MIN:0.5:288:2000");
}
shell_exec($config['rrdtool'] . " update $cpurrd N:$cpu5s:$cpu5m");
shell_exec($config['rrdtool'] . " update $cpurrd N:$cpu5m");
$mem_get = ".1.3.6.1.4.1.9.9.48.1.1.1.6.2 .1.3.6.1.4.1.9.9.48.1.1.1.6.1 .1.3.6.1.4.1.9.9.48.1.1.1.6.3";
$mem_get .= ".1.3.6.1.4.1.9.9.48.1.1.1.5.2 .1.3.6.1.4.1.9.9.48.1.1.1.5.1 .1.3.6.1.4.1.9.9.48.1.1.1.5.3";
@@ -68,7 +70,11 @@
RRA:MAX:0.5:1:2000 \
RRA:MAX:0.5:6:2000 \
RRA:MAX:0.5:24:2000 \
RRA:MAX:0.5:288:2000");
RRA:MAX:0.5:288:2000 \
RRA:MIN:0.5:1:2000 \
RRA:MIN:0.5:6:2000 \
RRA:MIN:0.5:24:2000 \
RRA:MIN:0.5:288:2000");
}
rrdtool_update ($memrrd, "N:$memfreeio:$memusedio:$memfreeproc:$memusedproc:$memtotal");
includes/polling/device-netstats.inc.php
+3 -6
View File
@@ -17,8 +17,7 @@ if($device[os] != "Snom") {
$oids['snmp'] = array ('snmpInPkts','snmpOutPkts','snmpInBadVersions','snmpInBadCommunityNames','snmpInBadCommunityUses','snmpInASNParseErrs',
'snmpInTooBigs','snmpInNoSuchNames','snmpInBadValues','snmpInReadOnlys','snmpInGenErrs','snmpInTotalReqVars','snmpInTotalSetVars',
'snmpInGetRequests','snmpInGetNexts','snmpInSetRequests','snmpInGetResponses','snmpInTraps','snmpOutTooBigs','snmpOutNoSuchNames',
'snmpOutBadValues','snmpOutGenErrs','snmpOutGetRequests','snmpOutGetNexts','snmpOutSetRequests','snmpOutGetResponses','snmpOutTraps',
'snmpEnableAuthenTraps','snmpSilentDrops','snmpProxyDrops');
'snmpOutBadValues','snmpOutGenErrs','snmpOutGetRequests','snmpOutGetNexts','snmpOutSetRequests','snmpOutGetResponses','snmpOutTraps','snmpSilentDrops','snmpProxyDrops');
$oids['tcp'] = array ('tcpActiveOpens', 'tcpPassiveOpens', 'tcpAttemptFails', 'tcpEstabResets', 'tcpCurrEstab',
'tcpInSegs', 'tcpOutSegs', 'tcpRetransSegs', 'tcpInErrs', 'tcpOutRsts', 'tcpHCInSegs', 'tcpHCOutSegs');
@@ -40,14 +39,12 @@ if($device[os] != "Snom") {
$rrd_create .= " DS:$oid_ds:COUNTER:600:U:100000000000";
$snmpstring .= " $oid.0";
}
if(!file_exists($rrdfile)) { shell_exec($rrd_create); }
if(!file_exists($rrdfile)) { shell_exec($rrd_create); }
$snmpdata_cmd = "snmpget -m IP-MIB:SNMPv2-MIB:UDP-MIB:TCP-MIB:IP-MIB -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'] . " $snmpstring";
$snmpdata = trim(shell_exec($snmpdata_cmd));
$rrdupdate = "N";
foreach(explode("\n", $snmpdata) as $data) {
if(strstr($data, "No") || strstr($data, "d") || strstr($data, "s")) { $data = ""; }
if(strstr($data, "No") || strstr($data, "d") || strstr($data, "s")) { $data = "0"; }
$rrdupdate .= ":$data";
}
unset($snmpstring);
mibs/OLD-CISCO-MEMORY-MIB.my
+429
View File
@@ -0,0 +1,429 @@
-- *****************************************************************
-- OLD-CISCO-MEMORY-MIB.my: Old Cisco Memory MIB file
--
-- May 1994, Jeffrey T. Johnson
--
-- Copyright (c) 1994,1996 by cisco Systems, Inc.
-- All rights reserved.
--
-- *****************************************************************
--
OLD-CISCO-MEMORY-MIB DEFINITIONS ::= BEGIN
IMPORTS
OBJECT-TYPE
FROM RFC-1212
local
FROM CISCO-SMI;
lmem OBJECT IDENTIFIER ::= { local 1 }
-- lmem is same as lsystem
-- name changed to support separate compilation under mibcomp
freeMem OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS obsolete
DESCRIPTION
"Return the amount of free memory in bytes.
NOTE WELL: this mib object is obsolete as
of IOS release 11.1. IOS release 11.1
introduced the CISCO-MEMORY-POOL-MIB which
better instruments all of the memory pools"
::= { lmem 8 }
bufferElFree OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Contains the number of free buffer
elements."
::= { lmem 9 }
bufferElMax OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Contains the maximum number of buffer
elements."
::= { lmem 10 }
bufferElHit OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Contains the number of buffer element hits."
::= { lmem 11 }
bufferElMiss OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Contains the number of buffer element
misses."
::= { lmem 12 }
bufferElCreate OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Contains the number of buffer element
creates."
::= { lmem 13 }
bufferSmSize OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Contains the size of small buffers."
::= { lmem 14 }
bufferSmTotal OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Contains the total number of small buffers."
::= { lmem 15 }
bufferSmFree OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Contains the number of free small buffers."
::= { lmem 16 }
bufferSmMax OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Contains the maximum number of small
buffers."
::= { lmem 17 }
bufferSmHit OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Contains the number of small buffer hits."
::= { lmem 18 }
bufferSmMiss OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Contains the number of small buffer misses."
::= { lmem 19 }
bufferSmTrim OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Contains the number of small buffer trims."
::= { lmem 20 }
bufferSmCreate OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Contains the number of small buffer
creates."
::= { lmem 21 }
bufferMdSize OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Contains the size of medium buffers."
::= { lmem 22 }
bufferMdTotal OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Contains the total number of medium
buffers."
::= { lmem 23 }
bufferMdFree OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Contains the number of free medium buffers."
::= { lmem 24 }
bufferMdMax OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Contains the maximum number of medium
buffers."
::= { lmem 25 }
bufferMdHit OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Contains the number of medium buffer hits."
::= { lmem 26 }
bufferMdMiss OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Contains the number of medium buffer
misses."
::= { lmem 27 }
bufferMdTrim OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Contains the number of medium buffer trims."
::= { lmem 28 }
bufferMdCreate OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Contains the number of medium buffer
creates."
::= { lmem 29 }
bufferBgSize OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Contains the size of big buffers."
::= { lmem 30 }
bufferBgTotal OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Contains the total number of big buffers."
::= { lmem 31 }
bufferBgFree OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Contains the number of free big buffers."
::= { lmem 32 }
bufferBgMax OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Contains the maximum number of big buffers."
::= { lmem 33 }
bufferBgHit OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Contains the number of big buffer hits."
::= { lmem 34 }
bufferBgMiss OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Contains the number of big buffer misses."
::= { lmem 35 }
bufferBgTrim OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Contains the number of big buffer trims."
::= { lmem 36 }
bufferBgCreate OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Contains the number of big buffer creates."
::= { lmem 37 }
bufferLgSize OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Contains the size of large buffers."
::= { lmem 38 }
bufferLgTotal OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Contains the total number of large buffers."
::= { lmem 39 }
bufferLgFree OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Contains the number of free large buffers."
::= { lmem 40 }
bufferLgMax OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Contains the maximum number of large
buffers."
::= { lmem 41 }
bufferLgHit OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Contains the number of large buffer hits."
::= { lmem 42 }
bufferLgMiss OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Contains the number of large buffer misses."
::= { lmem 43 }
bufferLgTrim OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Contains the number of large buffer trims."
::= { lmem 44 }
bufferLgCreate OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Contains the number of large buffer
creates."
::= { lmem 45 }
bufferFail OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Count of the number of buffer allocation
failures."
::= { lmem 46 }
bufferNoMem OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Count of the number of buffer create
failures due to no free memory."
::= { lmem 47 }
bufferHgSize OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Contains the size of huge buffers."
::= { lmem 62 }
bufferHgTotal OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Contains the total number of huge buffers."
::= { lmem 63 }
bufferHgFree OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Contains the number of free huge buffers."
::= { lmem 64 }
bufferHgMax OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Contains the maximum number of huge
buffers."
::= { lmem 65 }
bufferHgHit OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Contains the number of huge buffer hits."
::= { lmem 66 }
bufferHgMiss OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Contains the number of huge buffer misses."
::= { lmem 67 }
bufferHgTrim OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Contains the number of huge buffer trims."
::= { lmem 68 }
bufferHgCreate OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
STATUS mandatory
DESCRIPTION
"Contains the number of huge buffer creates."
::= { lmem 69 }
END
mibs/OLD-CISCO-SYS-MIB.my
+1043
View File
File diff suppressed because it is too large Load Diff