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

Cisco Processor update (#8216)

Browse Source 
Fix issues with newer devices by updating CISCO-PROCESS-MIB
Detect individual cores on supported processors
This commit is contained in:
Tony Murray
2018-02-07 20:47:56 -06:00
committed by GitHub
parent 7a2e5f4e40
commit 8abe508cfd
4 changed files with 1455 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
LibreNMS/OS/Shared/Cisco.php
View File

@@ -70,17 +70,34 @@ class Cisco extends OS implements ProcessorDiscovery
$descr = "Processor $index";
}
$processors[] = Processor::discover(
'cpm',
$this->getDeviceId(),
$usage_oid,
$index,
$descr,
1,
$usage,
null,
$entPhysicalIndex
);
if (is_array($entry['cpmCore5min'])) {
// This CPU has data per individual core
foreach ($entry['cpmCore5min'] as $core_index => $core_usage) {
$processors[] = Processor::discover(
'cpm',
$this->getDeviceId(),
".1.3.6.1.4.1.9.9.109.1.1.2.1.5.$index.$core_index",
"$index.$core_index",
"$descr: Core $core_index",
1,
$core_usage,
null,
$entPhysicalIndex
);
}
} else {
$processors[] = Processor::discover(
'cpm',
$this->getDeviceId(),
$usage_oid,
$index,
$descr,
1,
$usage,
null,
$entPhysicalIndex
);
}
}
if (empty($processors)) {

1610
mibs/CISCO-PROCESS-MIB
View File

File diff suppressed because it is too large Load Diff

53
tests/data/iosxe_c3650.json Normal file
View File

@@ -0,0 +1,53 @@
{
"processors": {
"discovery": {
"processors": [
{
"entPhysicalIndex": "1000",
"hrDeviceIndex": "0",
"processor_oid": ".1.3.6.1.4.1.9.9.109.1.1.2.1.5.1000.0",
"processor_index": "1000.0",
"processor_type": "cpm",
"processor_usage": "8",
"processor_descr": "Switch 1: Core 0",
"processor_precision": "1",
"processor_perc_warn": "75"
},
{
"entPhysicalIndex": "1000",
"hrDeviceIndex": "0",
"processor_oid": ".1.3.6.1.4.1.9.9.109.1.1.2.1.5.1000.1",
"processor_index": "1000.1",
"processor_type": "cpm",
"processor_usage": "2",
"processor_descr": "Switch 1: Core 1",
"processor_precision": "1",
"processor_perc_warn": "75"
},
{
"entPhysicalIndex": "1000",
"hrDeviceIndex": "0",
"processor_oid": ".1.3.6.1.4.1.9.9.109.1.1.2.1.5.1000.2",
"processor_index": "1000.2",
"processor_type": "cpm",
"processor_usage": "3",
"processor_descr": "Switch 1: Core 2",
"processor_precision": "1",
"processor_perc_warn": "75"
},
{
"entPhysicalIndex": "1000",
"hrDeviceIndex": "0",
"processor_oid": ".1.3.6.1.4.1.9.9.109.1.1.2.1.5.1000.3",
"processor_index": "1000.3",
"processor_type": "cpm",
"processor_usage": "2",
"processor_descr": "Switch 1: Core 3",
"processor_precision": "1",
"processor_perc_warn": "75"
}
]
},
"poller": "matches discovery"
}
}

46
tests/snmpsim/iosxe_c3650.snmprec Normal file
View File

@@ -0,0 +1,46 @@
1.3.6.1.2.1.1.1.0|4x|436973636f20494f5320536f6674776172652c20494f532d584520536f6674776172652c20436174616c797374204c332053776974636820536f6674776172652028434154334b5f4341412d554e4956455253414c4b392d4d292c2056657273696f6e2030332e30372e3035452052454c4541534520534f4654574152452028666331290a546563686e6963616c20537570706f72743a20687474703a2f2f7777772e636973636f2e636f6d2f74656368737570706f72740d0a436f707972696768742028632920313938362d3230313720627920436973636f2053797374656d732c20496e632e0d0a436f6d70696c6564204672692031302d4665622d
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.9.1.2066
1.3.6.1.2.1.1.3.0|67|1819136138
1.3.6.1.2.1.1.4.0|4|<private>
1.3.6.1.2.1.1.5.0|4|<private>
1.3.6.1.2.1.1.6.0|4|<private>
1.3.6.1.2.1.47.1.1.1.1.7.1000|4|Switch 1
1.3.6.1.4.1.9.9.109.1.1.1.1.2.1000|2|1000
1.3.6.1.4.1.9.9.109.1.1.1.1.3.1000|66|3
1.3.6.1.4.1.9.9.109.1.1.1.1.4.1000|66|3
1.3.6.1.4.1.9.9.109.1.1.1.1.5.1000|66|3
1.3.6.1.4.1.9.9.109.1.1.1.1.6.1000|66|3
1.3.6.1.4.1.9.9.109.1.1.1.1.7.1000|66|3
1.3.6.1.4.1.9.9.109.1.1.1.1.8.1000|66|3
1.3.6.1.4.1.9.9.109.1.1.1.1.9.1000|66|5
1.3.6.1.4.1.9.9.109.1.1.1.1.10.1000|66|3
1.3.6.1.4.1.9.9.109.1.1.1.1.11.1000|66|0
1.3.6.1.4.1.9.9.109.1.1.1.1.12.1000|66|1530216
1.3.6.1.4.1.9.9.109.1.1.1.1.13.1000|66|2407092
1.3.6.1.4.1.9.9.109.1.1.1.1.14.1000|66|222060
1.3.6.1.4.1.9.9.109.1.1.1.1.15.1000|66|1796564220
1.3.6.1.4.1.9.9.109.1.1.1.1.16.1000|66|0
1.3.6.1.4.1.9.9.109.1.1.1.1.17.1000|70|0
1.3.6.1.4.1.9.9.109.1.1.1.1.18.1000|66|0
1.3.6.1.4.1.9.9.109.1.1.1.1.19.1000|70|0
1.3.6.1.4.1.9.9.109.1.1.1.1.20.1000|66|0
1.3.6.1.4.1.9.9.109.1.1.1.1.21.1000|70|0
1.3.6.1.4.1.9.9.109.1.1.1.1.22.1000|66|0
1.3.6.1.4.1.9.9.109.1.1.1.1.23.1000|70|0
1.3.6.1.4.1.9.9.109.1.1.2.1.2.1000.0|2|0
1.3.6.1.4.1.9.9.109.1.1.2.1.2.1000.1|2|0
1.3.6.1.4.1.9.9.109.1.1.2.1.2.1000.2|2|0
1.3.6.1.4.1.9.9.109.1.1.2.1.2.1000.3|2|0
1.3.6.1.4.1.9.9.109.1.1.2.1.3.1000.0|66|9
1.3.6.1.4.1.9.9.109.1.1.2.1.3.1000.1|66|2
1.3.6.1.4.1.9.9.109.1.1.2.1.3.1000.2|66|0
1.3.6.1.4.1.9.9.109.1.1.2.1.3.1000.3|66|0
1.3.6.1.4.1.9.9.109.1.1.2.1.4.1000.0|66|8
1.3.6.1.4.1.9.9.109.1.1.2.1.4.1000.1|66|3
1.3.6.1.4.1.9.9.109.1.1.2.1.4.1000.2|66|3
1.3.6.1.4.1.9.9.109.1.1.2.1.4.1000.3|66|1
1.3.6.1.4.1.9.9.109.1.1.2.1.5.1000.0|66|8
1.3.6.1.4.1.9.9.109.1.1.2.1.5.1000.1|66|2
1.3.6.1.4.1.9.9.109.1.1.2.1.5.1000.2|66|3
1.3.6.1.4.1.9.9.109.1.1.2.1.5.1000.3|66|2
1.3.6.1.6.3.10.2.1.3.0|2|18191089