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

Parse info from H3C branded comware devices (#12551)

Browse Source 
* Update comware.yaml

Fix the problem that the H3C switch cannot obtain the device hardware model

* better regex, remove ENTITY-MIB::entPhysicalName it is rubbish.

Co-authored-by: Tony Murray <murraytony@gmail.com>
This commit is contained in:
wuwei
2021-04-14 23:11:51 +08:00
committed by GitHub
parent b17b3069c9
commit 385ef98ff7
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
includes/definitions/discovery/comware.yaml
View File

@@ -1,7 +1,7 @@
mib: HH3C-LswDEVM-MIB:HH3C-ENTITY-EXT-MIB mib: HH3C-LswDEVM-MIB:HH3C-ENTITY-EXT-MIB
modules: modules:
os: os:
sysDescr_regex: '/Version (?<version>[0-9.]+).*(Release|ESS) (?<features>[R0-9P]+).*\n(HPE |HPE FF |HP )(?<hardware>.*)/' sysDescr_regex: '/Version (?<version>[0-9.]+).*(Release|ESS) (?<features>[R0-9P]+).*[\n ](HPE |HPE FF |HP |H3C )(?<hardware>.*)[\r ][\n ]/'
sensors: sensors:
pre-cache: pre-cache:
data: data:

6
tests/data/comware.json
View File

@@ -49765,9 +49765,9 @@
"sysObjectID": ".1.3.6.1.4.1.25506.11.1.172", "sysObjectID": ".1.3.6.1.4.1.25506.11.1.172",
"sysDescr": "HP Comware Platform Software, Software Version 7.1.045, Release 2416 HP FF 5700-40XG-2QSFP Switch Copyright (c) 2010-2014 Hewlett-Packard Development Company, L.P.", "sysDescr": "HP Comware Platform Software, Software Version 7.1.045, Release 2416 HP FF 5700-40XG-2QSFP Switch Copyright (c) 2010-2014 Hewlett-Packard Development Company, L.P.",
"sysContact": "<private>", "sysContact": "<private>",
"version": null, "version": "7.1.045",
"hardware": null, "hardware": "FF 5700-40XG-2QSFP",
"features": null, "features": "2416",
"os": "comware", "os": "comware",
"type": "network", "type": "network",
"serial": "DM20F3000F", "serial": "DM20F3000F",

2
tests/data/comware_a5500.json
View File

@@ -8,7 +8,7 @@
"sysDescr": "HP Comware Platform Software, Software Version 5.20.99 Release 2222P08\nHP A5500-24G EI Switch with 2 Interface Slots\r\nCopyright (c) 2010-2017 Hewlett Packard Enterprise Development LP", "sysDescr": "HP Comware Platform Software, Software Version 5.20.99 Release 2222P08\nHP A5500-24G EI Switch with 2 Interface Slots\r\nCopyright (c) 2010-2017 Hewlett Packard Enterprise Development LP",
"sysContact": "<private>", "sysContact": "<private>",
"version": "5.20.99", "version": "5.20.99",
"hardware": "A5500-24G EI Switch with 2 Interface Slots\r", "hardware": "A5500-24G EI Switch with 2 Interface Slots",
"features": "2222P08", "features": "2222P08",
"os": "comware", "os": "comware",
"type": "network", "type": "network",

2
tests/data/comware_hpe5900.json
View File

@@ -26,7 +26,7 @@
"sysDescr": "HPE Comware Platform Software, Software Version 7.1.045, Release 2422P01\nHPE 5900AF-48G-4XG-2QSFP+ Switch\r\nCopyright (c) 2010-2015 Hewlett Packard Enterprise Development LP", "sysDescr": "HPE Comware Platform Software, Software Version 7.1.045, Release 2422P01\nHPE 5900AF-48G-4XG-2QSFP+ Switch\r\nCopyright (c) 2010-2015 Hewlett Packard Enterprise Development LP",
"sysContact": "<private>", "sysContact": "<private>",
"version": "7.1.045", "version": "7.1.045",
"hardware": "5900AF-48G-4XG-2QSFP+ Switch\r", "hardware": "5900AF-48G-4XG-2QSFP+ Switch",
"features": "2422P01", "features": "2422P01",
"os": "comware", "os": "comware",
"type": "network", "type": "network",