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

Merge remote-tracking branch 'upstream/master' into issue-714

Browse Source 
Conflicts:
	html/includes/authentication/ldap.inc.php
This commit is contained in:
Ultra2D
2015-04-08 08:43:24 +02:00
parent 3eaaac4ce4 9323dbe285
commit 6f299a9679
15 changed files with 12130 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/definitions.inc.php
+17
View File
@@ -547,6 +547,17 @@ $config['os'][$os]['over'][0]['text'] = "Device Traffic";
$config['os'][$os]['over'][1]['graph'] = "device_processor";
$config['os'][$os]['over'][1]['text'] = "CPU Usage";
$os = "f5";
$config['os'][$os]['text'] = "F5 Big IP";
$config['os'][$os]['type'] = "loadbalancer";
$config['os'][$os]['icon'] = "f5";
$config['os'][$os]['over'][0]['graph'] = "device_bits";
$config['os'][$os]['over'][0]['text'] = "Device Traffic";
$config['os'][$os]['over'][1]['graph'] = "device_processor";
$config['os'][$os]['over'][1]['text'] = "CPU Usage";
$config['os'][$os]['over'][2]['graph'] = "device_ucd_memory";
$config['os'][$os]['over'][2]['text'] = "Memory Usage";
$os = "proxim";
$config['os'][$os]['text'] = "Proxim";
$config['os'][$os]['type'] = "network";
@@ -1016,6 +1027,12 @@ $config['os'][$os]['text'] = "Hikvision";
$config['os'][$os]['type'] = "network";
$config['os'][$os]['icon'] = "hikvision";
// Canopy / Cambium support
$os = "canopy";
$config['os'][$os]['text'] = "Cambium";
$config['os'][$os]['type'] = "wireless";
$config['os'][$os]['icon'] = "cambium";
foreach ($config['os'] as $this_os => $blah)
{
if (isset($config['os'][$this_os]['group']))
includes/discovery/os/canopy.inc.php
+7
View File
@@ -0,0 +1,7 @@
<?php
if (!$os) {
if (preg_match("/^CANOPY/", $sysDescr)) {
$os = 'canopy';
}
}
includes/discovery/os/f5.inc.php
+6
View File
@@ -0,0 +1,6 @@
<?php
if(!$os || $os === "linux") {
$f5_sys_parent = "1.3.6.1.4.1.3375.2.1";
if(strpos($sysObjectId, $f5_sys_parent)) { $os = "f5"; }
}
?>
includes/discovery/processors/ciscosb.inc.php
+2 -2
View File
@@ -14,10 +14,10 @@ if ($device['os'] == "ciscosb") {
echo("Cisco SB : ");
$descr = "CPU";
$usage = snmp_get($device, "rlCpuUtilDuringLastMinute", "-Ovqn", "CISCOSB-rndMng");
$usage = snmp_get($device, "rlCpuUtilDuringLastMinute.0", "-Ovqn", "CISCOSB-rndMng");
if (is_numeric($usage)) {
discover_processor($valid['processor'], $device, "CISCOSB-rndMng::rlCpuUtilDuringLastMinute", "0", "ciscosb", $descr, "1", $usage, NULL, NULL);
discover_processor($valid['processor'], $device, "CISCOSB-rndMng::rlCpuUtilDuringLastMinute.0", "0", "ciscosb", $descr, "1", $usage, NULL, NULL);
}
}
includes/polling/os/canopy.inc.php
+11
View File
@@ -0,0 +1,11 @@
<?php
$canopy_type = snmp_get($device,"boxDeviceType.0", "-Oqv", "WHISP-BOX-MIBV2-MIB");
if (stristr($canopy_type,"MIMO OFDM")) {
$hardware = 'PMP 450';
} elseif (stristr($canopy_type,"OFDM")) {
$hardware = 'PMP 430';
} else {
$hardware = 'PMP 100';
}
includes/polling/os/f5.inc.php
+3
View File
@@ -0,0 +1,3 @@
<?php
$version = trim(snmp_get($device, ".1.3.6.1.4.1.3375.2.1.4.2.0", "-OQv", "", ""),'"');
?>
includes/polling/ports.inc.php
+7
View File
@@ -251,8 +251,12 @@ foreach ($ports as $port)
echo("VLAN == ".$this_port['ifVlan']);
// Update IF-MIB data
$brk = false;
foreach ($data_oids as $oid)
{
if( $brk === true ) {
break;
}
if ($port[$oid] != $this_port[$oid] && !isset($this_port[$oid]))
{
$port['update'][$oid] = array('NULL');
@@ -263,6 +267,9 @@ foreach ($ports as $port)
log_event($oid . ": ".$port[$oid]." -> " . $this_port[$oid], $device, 'interface', $port['port_id']);
if ($debug) { echo($oid . ": ".$port[$oid]." -> " . $this_port[$oid]." "); } else { echo($oid . " "); }
}
if( ( $oid == 'ifOperStatus' || $oid == 'ifAdminStatus' ) && $this_port[$oid] == 'down' ) {
$brk = true;
}
}
// Parse description (usually ifAlias) if config option set