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

Fix Sophos-XG OID for number of active tunnels (#13444)

Browse Source 
* Fix for number of active tunnels

* add test data
This commit is contained in:
Nocturr
2021-10-27 22:42:55 +02:00
committed by GitHub
parent ebc5c3eea1
commit bba7a9e3a1
2 changed files with 3 additions and 730 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
includes/definitions/discovery/sophos-xg.yaml
View File

@@ -171,7 +171,7 @@ modules:
data:
-
oid: sfosIPSecVpnActiveTunnel
num_oid: '.1.3.6.1.4.1.2604.5.1.5.2.1.{{ $index }}'
num_oid: '.1.3.6.1.4.1.2604.5.1.6.1.1.1.1.8.{{ $index }}'
index: 'sfosIPSecVpnActiveTunnel.{{ $index }}'
descr: '{{ $sfosIPSecVpnConnName }} active tunnels'
group: IPSec

731
tests/data/sophos-xg.json
View File

@@ -5443,7 +5443,7 @@
"sensor_deleted": 0,
"sensor_class": "count",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2604.5.1.5.2.1.1",
"sensor_oid": ".1.3.6.1.4.1.2604.5.1.6.1.1.1.1.8.1",
"sensor_index": "sfosIPSecVpnActiveTunnel.1",
"sensor_type": "sophos-xg",
"sensor_descr": "VPNTunnel1 active tunnels",
@@ -6165,734 +6165,7 @@
}
]
},
"poller": {
"sensors": [
{
"sensor_deleted": 0,
"sensor_class": "count",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2604.5.1.5.2.1.1",
"sensor_index": "sfosIPSecVpnActiveTunnel.1",
"sensor_type": "sophos-xg",
"sensor_descr": "VPNTunnel1 active tunnels",
"group": "IPSec",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 0,
"sensor_limit": null,
"sensor_limit_warn": null,
"sensor_limit_low": null,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": 4,
"user_func": null,
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2604.5.1.5.9.1.0",
"sensor_index": "sfosCentralOrchestrationLicRegStatus.0",
"sensor_type": "sfosCentralOrchestrationLicRegStatus",
"sensor_descr": "Central Orchestration registration Lic Status",
"group": "Licensing",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 2,
"sensor_limit": null,
"sensor_limit_warn": null,
"sensor_limit_low": null,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "sfosCentralOrchestrationLicRegStatus"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2604.5.1.4.4.0",
"sensor_index": "sfosDeviceCurrentHAState.0",
"sensor_type": "sfosDeviceCurrentHAState",
"sensor_descr": "HA local appliance state",
"group": "HA",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 0,
"sensor_limit": null,
"sensor_limit_warn": null,
"sensor_limit_low": null,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "sfosDeviceCurrentHAState"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2604.5.1.4.5.0",
"sensor_index": "sfosDevicePeerHAState.0",
"sensor_type": "sfosDevicePeerHAState",
"sensor_descr": "HA peer appliance state",
"group": "HA",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 0,
"sensor_limit": null,
"sensor_limit_warn": null,
"sensor_limit_low": null,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "sfosDevicePeerHAState"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2604.5.1.5.8.1.0",
"sensor_index": "sfosEnhancedPlusLicRegStatus.0",
"sensor_type": "sfosEnhancedPlusLicRegStatus",
"sensor_descr": "Enhanced Plus Support Lic Status",
"group": "Licensing",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 2,
"sensor_limit": null,
"sensor_limit_warn": null,
"sensor_limit_low": null,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "sfosEnhancedPlusLicRegStatus"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2604.5.1.5.7.1.0",
"sensor_index": "sfosEnhancedSupportLicRegStatus.0",
"sensor_type": "sfosEnhancedSupportLicRegStatus",
"sensor_descr": "Enhanced Support Lic Status",
"group": "Licensing",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 1,
"sensor_limit": null,
"sensor_limit_warn": null,
"sensor_limit_low": null,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "sfosEnhancedSupportLicRegStatus"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2604.5.1.4.1.0",
"sensor_index": "sfosHAStatus.0",
"sensor_type": "sfosHAStatus",
"sensor_descr": "HA status",
"group": "HA",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 0,
"sensor_limit": null,
"sensor_limit_warn": null,
"sensor_limit_low": null,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "sfosHAStatus"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2604.5.1.5.4.1.0",
"sensor_index": "sfosMailProtectionLicRegStatus.0",
"sensor_type": "sfosMailProtectionLicRegStatus",
"sensor_descr": "EMail Protection Lic Status",
"group": "Licensing",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 1,
"sensor_limit": null,
"sensor_limit_warn": null,
"sensor_limit_low": null,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "sfosMailProtectionLicRegStatus"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2604.5.1.5.2.1.0",
"sensor_index": "sfosNetProtectionLicRegStatus.0",
"sensor_type": "sfosNetProtectionLicRegStatus",
"sensor_descr": "Network Protection registration Lic status",
"group": "Licensing",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 1,
"sensor_limit": null,
"sensor_limit_warn": null,
"sensor_limit_low": null,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "sfosNetProtectionLicRegStatus"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2604.5.1.5.6.1.0",
"sensor_index": "sfosSandstromLicRegStatus.0",
"sensor_type": "sfosSandstromLicRegStatus",
"sensor_descr": "Sandstorm Protection Lic status",
"group": "Licensing",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 2,
"sensor_limit": null,
"sensor_limit_warn": null,
"sensor_limit_low": null,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "sfosSandstromLicRegStatus"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2604.5.1.5.3.1.0",
"sensor_index": "sfosWebProtectionLicRegStatus.0",
"sensor_type": "sfosWebProtectionLicRegStatus",
"sensor_descr": "Web Protection registration Lic status",
"group": "Licensing",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 1,
"sensor_limit": null,
"sensor_limit_warn": null,
"sensor_limit_low": null,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "sfosWebProtectionLicRegStatus"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2604.5.1.5.5.1.0",
"sensor_index": "sfosWebServerProtectionLicRegStatus.0",
"sensor_type": "sfosWebServerProtectionLicRegStatus",
"sensor_descr": "Web Server Protection Lic status",
"group": "Licensing",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 1,
"sensor_limit": null,
"sensor_limit_warn": null,
"sensor_limit_low": null,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": "sfosWebServerProtectionLicRegStatus"
}
],
"state_indexes": [
{
"state_name": "sfosCentralOrchestrationLicRegStatus",
"state_descr": "none",
"state_draw_graph": 0,
"state_value": 0,
"state_generic_value": 0
},
{
"state_name": "sfosCentralOrchestrationLicRegStatus",
"state_descr": "evaluating",
"state_draw_graph": 1,
"state_value": 1,
"state_generic_value": 0
},
{
"state_name": "sfosCentralOrchestrationLicRegStatus",
"state_descr": "notsubscribed",
"state_draw_graph": 2,
"state_value": 2,
"state_generic_value": 0
},
{
"state_name": "sfosCentralOrchestrationLicRegStatus",
"state_descr": "subscribed",
"state_draw_graph": 3,
"state_value": 3,
"state_generic_value": 0
},
{
"state_name": "sfosCentralOrchestrationLicRegStatus",
"state_descr": "expired",
"state_draw_graph": 4,
"state_value": 4,
"state_generic_value": 2
},
{
"state_name": "sfosCentralOrchestrationLicRegStatus",
"state_descr": "deactivated",
"state_draw_graph": 5,
"state_value": 5,
"state_generic_value": 0
},
{
"state_name": "sfosDeviceCurrentHAState",
"state_descr": "notapplicable",
"state_draw_graph": 0,
"state_value": 0,
"state_generic_value": 0
},
{
"state_name": "sfosDeviceCurrentHAState",
"state_descr": "auxiliary",
"state_draw_graph": 1,
"state_value": 1,
"state_generic_value": 2
},
{
"state_name": "sfosDeviceCurrentHAState",
"state_descr": "standAlone",
"state_draw_graph": 2,
"state_value": 2,
"state_generic_value": 2
},
{
"state_name": "sfosDeviceCurrentHAState",
"state_descr": "primary",
"state_draw_graph": 3,
"state_value": 3,
"state_generic_value": 0
},
{
"state_name": "sfosDeviceCurrentHAState",
"state_descr": "faulty",
"state_draw_graph": 4,
"state_value": 4,
"state_generic_value": 2
},
{
"state_name": "sfosDeviceCurrentHAState",
"state_descr": "ready",
"state_draw_graph": 5,
"state_value": 5,
"state_generic_value": 0
},
{
"state_name": "sfosDevicePeerHAState",
"state_descr": "notapplicable",
"state_draw_graph": 0,
"state_value": 0,
"state_generic_value": 0
},
{
"state_name": "sfosDevicePeerHAState",
"state_descr": "auxiliary",
"state_draw_graph": 1,
"state_value": 1,
"state_generic_value": 0
},
{
"state_name": "sfosDevicePeerHAState",
"state_descr": "standAlone",
"state_draw_graph": 2,
"state_value": 2,
"state_generic_value": 2
},
{
"state_name": "sfosDevicePeerHAState",
"state_descr": "primary",
"state_draw_graph": 3,
"state_value": 3,
"state_generic_value": 2
},
{
"state_name": "sfosDevicePeerHAState",
"state_descr": "faulty",
"state_draw_graph": 4,
"state_value": 4,
"state_generic_value": 2
},
{
"state_name": "sfosDevicePeerHAState",
"state_descr": "ready",
"state_draw_graph": 5,
"state_value": 5,
"state_generic_value": 0
},
{
"state_name": "sfosEnhancedPlusLicRegStatus",
"state_descr": "none",
"state_draw_graph": 0,
"state_value": 0,
"state_generic_value": 0
},
{
"state_name": "sfosEnhancedPlusLicRegStatus",
"state_descr": "evaluating",
"state_draw_graph": 1,
"state_value": 1,
"state_generic_value": 0
},
{
"state_name": "sfosEnhancedPlusLicRegStatus",
"state_descr": "notsubscribed",
"state_draw_graph": 2,
"state_value": 2,
"state_generic_value": 0
},
{
"state_name": "sfosEnhancedPlusLicRegStatus",
"state_descr": "subscribed",
"state_draw_graph": 3,
"state_value": 3,
"state_generic_value": 0
},
{
"state_name": "sfosEnhancedPlusLicRegStatus",
"state_descr": "expired",
"state_draw_graph": 4,
"state_value": 4,
"state_generic_value": 2
},
{
"state_name": "sfosEnhancedPlusLicRegStatus",
"state_descr": "deactivated",
"state_draw_graph": 5,
"state_value": 5,
"state_generic_value": 0
},
{
"state_name": "sfosEnhancedSupportLicRegStatus",
"state_descr": "none",
"state_draw_graph": 0,
"state_value": 0,
"state_generic_value": 0
},
{
"state_name": "sfosEnhancedSupportLicRegStatus",
"state_descr": "evaluating",
"state_draw_graph": 1,
"state_value": 1,
"state_generic_value": 0
},
{
"state_name": "sfosEnhancedSupportLicRegStatus",
"state_descr": "notsubscribed",
"state_draw_graph": 2,
"state_value": 2,
"state_generic_value": 0
},
{
"state_name": "sfosEnhancedSupportLicRegStatus",
"state_descr": "subscribed",
"state_draw_graph": 3,
"state_value": 3,
"state_generic_value": 0
},
{
"state_name": "sfosEnhancedSupportLicRegStatus",
"state_descr": "expired",
"state_draw_graph": 4,
"state_value": 4,
"state_generic_value": 2
},
{
"state_name": "sfosEnhancedSupportLicRegStatus",
"state_descr": "deactivated",
"state_draw_graph": 5,
"state_value": 5,
"state_generic_value": 0
},
{
"state_name": "sfosHAStatus",
"state_descr": "disabled",
"state_draw_graph": 0,
"state_value": 0,
"state_generic_value": 0
},
{
"state_name": "sfosHAStatus",
"state_descr": "enabled",
"state_draw_graph": 1,
"state_value": 1,
"state_generic_value": 0
},
{
"state_name": "sfosMailProtectionLicRegStatus",
"state_descr": "none",
"state_draw_graph": 0,
"state_value": 0,
"state_generic_value": 0
},
{
"state_name": "sfosMailProtectionLicRegStatus",
"state_descr": "evaluating",
"state_draw_graph": 1,
"state_value": 1,
"state_generic_value": 0
},
{
"state_name": "sfosMailProtectionLicRegStatus",
"state_descr": "notsubscribed",
"state_draw_graph": 2,
"state_value": 2,
"state_generic_value": 0
},
{
"state_name": "sfosMailProtectionLicRegStatus",
"state_descr": "subscribed",
"state_draw_graph": 3,
"state_value": 3,
"state_generic_value": 0
},
{
"state_name": "sfosMailProtectionLicRegStatus",
"state_descr": "expired",
"state_draw_graph": 4,
"state_value": 4,
"state_generic_value": 2
},
{
"state_name": "sfosMailProtectionLicRegStatus",
"state_descr": "deactivated",
"state_draw_graph": 5,
"state_value": 5,
"state_generic_value": 0
},
{
"state_name": "sfosNetProtectionLicRegStatus",
"state_descr": "none",
"state_draw_graph": 0,
"state_value": 0,
"state_generic_value": 0
},
{
"state_name": "sfosNetProtectionLicRegStatus",
"state_descr": "evaluating",
"state_draw_graph": 1,
"state_value": 1,
"state_generic_value": 0
},
{
"state_name": "sfosNetProtectionLicRegStatus",
"state_descr": "notsubscribed",
"state_draw_graph": 2,
"state_value": 2,
"state_generic_value": 0
},
{
"state_name": "sfosNetProtectionLicRegStatus",
"state_descr": "subscribed",
"state_draw_graph": 3,
"state_value": 3,
"state_generic_value": 0
},
{
"state_name": "sfosNetProtectionLicRegStatus",
"state_descr": "expired",
"state_draw_graph": 4,
"state_value": 4,
"state_generic_value": 2
},
{
"state_name": "sfosNetProtectionLicRegStatus",
"state_descr": "deactivated",
"state_draw_graph": 5,
"state_value": 5,
"state_generic_value": 0
},
{
"state_name": "sfosSandstromLicRegStatus",
"state_descr": "none",
"state_draw_graph": 0,
"state_value": 0,
"state_generic_value": 0
},
{
"state_name": "sfosSandstromLicRegStatus",
"state_descr": "evaluating",
"state_draw_graph": 1,
"state_value": 1,
"state_generic_value": 0
},
{
"state_name": "sfosSandstromLicRegStatus",
"state_descr": "notsubscribed",
"state_draw_graph": 2,
"state_value": 2,
"state_generic_value": 0
},
{
"state_name": "sfosSandstromLicRegStatus",
"state_descr": "subscribed",
"state_draw_graph": 3,
"state_value": 3,
"state_generic_value": 0
},
{
"state_name": "sfosSandstromLicRegStatus",
"state_descr": "expired",
"state_draw_graph": 4,
"state_value": 4,
"state_generic_value": 2
},
{
"state_name": "sfosSandstromLicRegStatus",
"state_descr": "deactivated",
"state_draw_graph": 5,
"state_value": 5,
"state_generic_value": 0
},
{
"state_name": "sfosWebProtectionLicRegStatus",
"state_descr": "none",
"state_draw_graph": 0,
"state_value": 0,
"state_generic_value": 0
},
{
"state_name": "sfosWebProtectionLicRegStatus",
"state_descr": "evaluating",
"state_draw_graph": 1,
"state_value": 1,
"state_generic_value": 0
},
{
"state_name": "sfosWebProtectionLicRegStatus",
"state_descr": "notsubscribed",
"state_draw_graph": 2,
"state_value": 2,
"state_generic_value": 0
},
{
"state_name": "sfosWebProtectionLicRegStatus",
"state_descr": "subscribed",
"state_draw_graph": 3,
"state_value": 3,
"state_generic_value": 0
},
{
"state_name": "sfosWebProtectionLicRegStatus",
"state_descr": "expired",
"state_draw_graph": 4,
"state_value": 4,
"state_generic_value": 2
},
{
"state_name": "sfosWebProtectionLicRegStatus",
"state_descr": "deactivated",
"state_draw_graph": 5,
"state_value": 5,
"state_generic_value": 0
},
{
"state_name": "sfosWebServerProtectionLicRegStatus",
"state_descr": "none",
"state_draw_graph": 0,
"state_value": 0,
"state_generic_value": 0
},
{
"state_name": "sfosWebServerProtectionLicRegStatus",
"state_descr": "evaluating",
"state_draw_graph": 1,
"state_value": 1,
"state_generic_value": 0
},
{
"state_name": "sfosWebServerProtectionLicRegStatus",
"state_descr": "notsubscribed",
"state_draw_graph": 2,
"state_value": 2,
"state_generic_value": 0
},
{
"state_name": "sfosWebServerProtectionLicRegStatus",
"state_descr": "subscribed",
"state_draw_graph": 3,
"state_value": 3,
"state_generic_value": 0
},
{
"state_name": "sfosWebServerProtectionLicRegStatus",
"state_descr": "expired",
"state_draw_graph": 4,
"state_value": 4,
"state_generic_value": 2
},
{
"state_name": "sfosWebServerProtectionLicRegStatus",
"state_descr": "deactivated",
"state_draw_graph": 5,
"state_value": 5,
"state_generic_value": 0
}
]
}
"poller": "matches discovery"
},
"storage": {
"discovery": {