From 96e5c5ee78e8d12b35a934cd38c16c22ea4866a0 Mon Sep 17 00:00:00 2001 From: Daniele Santi Date: Wed, 4 Oct 2023 22:24:33 +0200 Subject: [PATCH] Fix Raisecom devices having not increasing OIDs on snmpwalk (#15365) * Add useful IF-MIB entries as 'unordered oids' to Raisecom ROS and ROAP definitions because they don't have increasing OIDs in snmpwalk * Bump composer/composer from 2.5.8 to 2.6.4 (#15364) Bumps [composer/composer](https://github.com/composer/composer) from 2.5.8 to 2.6.4. - [Release notes](https://github.com/composer/composer/releases) - [Changelog](https://github.com/composer/composer/blob/main/CHANGELOG.md) - [Commits](https://github.com/composer/composer/compare/2.5.8...2.6.4) --- updated-dependencies: - dependency-name: composer/composer dependency-type: direct:development ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update aviat-wtm.json (#15368) * sort services by type and name (#15367) * Added support for Cambium cnMatrix switches (#15351) * Added support for Cambium cnMatrix switches * Fixed styling issues * Fixed styling issues * Fixed duplicate, incorrectly labeled LLDP-EXT-DOT3-MIB and LLDP-EXT-DOT1-MIB * Corrected MIB with the same name but with different OIDs configured: LLDP-EXT-MED/-CAMBIUM/-MIB * Removed my added duplicate MIBs * Removed unused MIBs * Rearrange AD auth settings (#15363) so it makes more sense, add missing settings * Specify radius attributes for auth roles (#15374) * Specify radius attributes for auth roles * Clarify that any role can be defined * Fixes check_dns against localhost when a search-domain is configured (#15373) * Added extra ASN-range comments, added Priv eBGP on host details, changed color to light-blue instead of red (#15372) * Moxa EDS improve discovery (#15375) Consolidate walks so less need to be performed. This should help a lot since each device model has its own MIB. * Remove unused functions (#15371) * Remove unused functions inline other legacy functions * Apply fixes from StyleCI --------- Co-authored-by: StyleCI Bot * Availability module fixes (#15369) * Refactor poller to allow modules to run even if the device is down Include core in config (but not webui) to avoid silly shenanigans Inject datastore into polling * Needed to split datastore interface * Cleanup some data_udpate() references * Apply fixes from StyleCI * Fix legacy poller :D * Output to the correct stream * Fix lint issues * Apply fixes from StyleCI * Fix discovery not including core and submodule handling * Use whereRaw --------- Co-authored-by: StyleCI Bot --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Justin Lentz Co-authored-by: SourceDoctor Co-authored-by: Noah Roufus Co-authored-by: Tony Murray Co-authored-by: barryodonovan Co-authored-by: Tim de Boer Co-authored-by: StyleCI Bot --- includes/definitions/raisecom-ros.yaml | 16 ++++++++++++++++ includes/definitions/raisecom.yaml | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/includes/definitions/raisecom-ros.yaml b/includes/definitions/raisecom-ros.yaml index 6d4fc745cf..a598474fcc 100644 --- a/includes/definitions/raisecom-ros.yaml +++ b/includes/definitions/raisecom-ros.yaml @@ -3,6 +3,22 @@ text: 'Raisecom ROS' type: network bad_snmpEngineTime: true mib_dir: raisecom +oids: + unordered: + # Tell LibreNMS to call snmpwalk with the -Cc flag for these entries + - ifEntry + - ifXEntry + - ifDescr + - ifAdminStatus + - ifOperStatus + - ifLastChange + - ifType + - ifPhysAddress + - ifMtu + - ifInErrors + - ifOutErrors + - ifInDiscards + - ifOutDiscards over: - { graph: device_bits, text: 'Device Traffic' } - { graph: device_processor, text: 'CPU Usage' } diff --git a/includes/definitions/raisecom.yaml b/includes/definitions/raisecom.yaml index 465313bb94..48c59f3669 100644 --- a/includes/definitions/raisecom.yaml +++ b/includes/definitions/raisecom.yaml @@ -3,6 +3,22 @@ text: 'Raisecom ROAP' type: network bad_snmpEngineTime: true mib_dir: raisecom +oids: + unordered: + # Tell LibreNMS to call snmpwalk with the -Cc flag for these entries + - ifEntry + - ifXEntry + - ifDescr + - ifAdminStatus + - ifOperStatus + - ifLastChange + - ifType + - ifPhysAddress + - ifMtu + - ifInErrors + - ifOutErrors + - ifInDiscards + - ifOutDiscards over: - { graph: device_bits, text: 'Device Traffic' } - { graph: device_processor, text: 'CPU Usage' }