From 128286a40b82bec6adbce414df3843b6a2f4d451 Mon Sep 17 00:00:00 2001 From: Dan Kerse Date: Tue, 12 Apr 2022 09:25:20 +1200 Subject: [PATCH] PrimeKey Improvements (#13901) * Use OID names for indexing * Fewer, (mostly) longer walks * Use bulkwalk --- includes/definitions/discovery/primekey.yaml | 144 +++++++++------- includes/definitions/primekey.yaml | 1 - tests/data/primekey_ejbca.json | 170 +++++++++---------- 3 files changed, 172 insertions(+), 143 deletions(-) diff --git a/includes/definitions/discovery/primekey.yaml b/includes/definitions/discovery/primekey.yaml index a855e3f7d6..cdeee341b8 100644 --- a/includes/definitions/discovery/primekey.yaml +++ b/includes/definitions/discovery/primekey.yaml @@ -1,121 +1,140 @@ mib: PRIMEKEY-APPLIANCE-MIB modules: + pre-cache: + oids: + - PRIMEKEY-APPLIANCE-MIB::pkSfp + - PRIMEKEY-APPLIANCE-MIB::pkVhsm os: version: 'PRIMEKEY-APPLIANCE-MIB::pkAVersion' serial: 'PRIMEKEY-APPLIANCE-MIB::pkAHsmSerialNumber' # The Appliance S/N is not available via SNMP, - # but we can retrieve the S/N for the Hardware Security Module. + # but we can retrieve the S/N for the Hardware Security Module. sensors: count: options: skip_value_lt: 0 data: - - oid: PRIMEKEY-APPLIANCE-MIB::pkASfpLoad1m + oid: PRIMEKEY-APPLIANCE-MIB::pkSfp + value: PRIMEKEY-APPLIANCE-MIB::pkASfpLoad1m num_oid: '.1.3.6.1.4.1.22408.1.1.2.1.5.108.111.97.100.50.1{{ $index }}' descr: ' 1m CPU load' group: 'CPU' - index: 1 + index: pkASfpLoad1m - - oid: PRIMEKEY-APPLIANCE-MIB::pkASfpLoad5m + oid: PRIMEKEY-APPLIANCE-MIB::pkSfp + value: PRIMEKEY-APPLIANCE-MIB::pkASfpLoad5m num_oid: '.1.3.6.1.4.1.22408.1.1.2.1.5.108.111.97.100.51.1{{ $index }}' descr: ' 5m CPU load' group: 'CPU' - index: 2 + index: pkASfpLoad5m - - oid: PRIMEKEY-APPLIANCE-MIB::pkASfpLoad15m + oid: PRIMEKEY-APPLIANCE-MIB::pkSfp + value: PRIMEKEY-APPLIANCE-MIB::pkASfpLoad15m num_oid: '.1.3.6.1.4.1.22408.1.1.2.1.5.108.111.97.100.52.1{{ $index }}' descr: '15m CPU load' group: 'CPU' - index: 3 + index: pkASfpLoad15m - - oid: PRIMEKEY-APPLIANCE-MIB::pkAClusterLocalNodeID + oid: PRIMEKEY-APPLIANCE-MIB::pkSfp + value: PRIMEKEY-APPLIANCE-MIB::pkAClusterLocalNodeID num_oid: '.1.3.6.1.4.1.22408.1.1.2.1.8.99.108.117.115.116.101.114.49.1{{ $index }}' descr: 'Node ID' group: 'Database' - index: 4 + index: pkAClusterLocalNodeID - - oid: PRIMEKEY-APPLIANCE-MIB::pkAClusterSize + oid: PRIMEKEY-APPLIANCE-MIB::pkSfp + value: PRIMEKEY-APPLIANCE-MIB::pkAClusterSize num_oid: '.1.3.6.1.4.1.22408.1.1.2.1.8.99.108.117.115.116.101.114.50.1{{ $index }}' descr: 'Node Count' group: 'Database' - index: 5 + index: pkAClusterSize - - oid: PRIMEKEY-APPLIANCE-MIB::pkAClusterActiveNodes + oid: PRIMEKEY-APPLIANCE-MIB::pkSfp + value: PRIMEKEY-APPLIANCE-MIB::pkAClusterActiveNodes num_oid: '.1.3.6.1.4.1.22408.1.1.2.1.8.99.108.117.115.116.101.114.51.1{{ $index }}' descr: 'Nodes Active' group: 'Database' - index: 6 + index: pkAClusterActiveNodes - - oid: PRIMEKEY-APPLIANCE-MIB::pkASfpRaidTotalDevices + oid: PRIMEKEY-APPLIANCE-MIB::pkSfp + value: PRIMEKEY-APPLIANCE-MIB::pkASfpRaidTotalDevices num_oid: '.1.3.6.1.4.1.22408.1.1.2.1.5.114.97.105.100.52.1{{ $index }}' descr: 'RAID Devices' group: 'RAID' - index: 7 + index: pkASfpRaidTotalDevices - - oid: PRIMEKEY-APPLIANCE-MIB::pkASfpRaidActiveDevices + oid: PRIMEKEY-APPLIANCE-MIB::pkSfp + value: PRIMEKEY-APPLIANCE-MIB::pkASfpRaidActiveDevices num_oid: '.1.3.6.1.4.1.22408.1.1.2.1.5.114.97.105.100.54.1{{ $index }}' descr: 'RAID Active' group: 'RAID' - index: 8 + index: pkASfpRaidActiveDevices fanspeed: options: skip_value_lt: 0 data: - - oid: PRIMEKEY-APPLIANCE-MIB::pkASfpCpuFan + oid: PRIMEKEY-APPLIANCE-MIB::pkSfp + value: PRIMEKEY-APPLIANCE-MIB::pkASfpCpuFan num_oid: '.1.3.6.1.4.1.22408.1.1.2.1.4.102.97.110.49.1{{ $index }}' descr: 'CPU Fan' group: 'CPU' - index: 49 + index: pkASfpCpuFan - - oid: PRIMEKEY-APPLIANCE-MIB::pkASfpSysFan1 + oid: PRIMEKEY-APPLIANCE-MIB::pkSfp + value: PRIMEKEY-APPLIANCE-MIB::pkASfpSysFan1 num_oid: '.1.3.6.1.4.1.22408.1.1.2.1.4.102.97.110.50.1{{ $index }}' descr: 'System Fan 1' group: 'System' - index: 50 + index: pkASfpSysFan1 - - oid: PRIMEKEY-APPLIANCE-MIB::pkASfpSysFan2 + oid: PRIMEKEY-APPLIANCE-MIB::pkSfp + value: PRIMEKEY-APPLIANCE-MIB::pkASfpSysFan2 num_oid: '.1.3.6.1.4.1.22408.1.1.2.1.4.102.97.110.51.1{{ $index }}' descr: 'System Fan 2' group: 'System' - index: 51 + index: pkASfpSysFan2 - - oid: PRIMEKEY-APPLIANCE-MIB::pkASfpSysFan3 + oid: PRIMEKEY-APPLIANCE-MIB::pkSfp + value: PRIMEKEY-APPLIANCE-MIB::pkASfpSysFan3 num_oid: '.1.3.6.1.4.1.22408.1.1.2.1.4.102.97.110.52.1{{ $index }}' descr: 'System Fan 3' group: 'System' - index: 52 + index: pkASfpSysFan3 percent: options: skip_value_lt: 0 data: - - oid: PRIMEKEY-APPLIANCE-MIB::pkAVdbUsagePercent + oid: PRIMEKEY-APPLIANCE-MIB::pkSfp + value: PRIMEKEY-APPLIANCE-MIB::pkAVdbUsagePercent num_oid: '.1.3.6.1.4.1.22408.1.1.2.1.4.118.100.98.49.1{{ $index }}' descr: 'DB Usage %' group: 'Database' - index: 1 + index: pkAVdbUsagePercent warn_limit: 80 high_limit: 100 state: data: - - oid: PRIMEKEY-APPLIANCE-MIB::pkASfpVmStatus + oid: PRIMEKEY-APPLIANCE-MIB::pkSfp + value: PRIMEKEY-APPLIANCE-MIB::pkASfpVmStatus num_oid: '.1.3.6.1.4.1.22408.1.1.2.1.2.118.109.1{{ $index }}' descr: 'Health VMs' group: 'Health of VMs' - index: 1 + index: pkASfpVmStatus state_name: HealthVMs states: - { value: 0, generic: 0, graph: 0, descr: 'All OK' } - { value: 1, generic: 2, graph: 1, descr: 'Some Inactive' } - - oid: PRIMEKEY-APPLIANCE-MIB::pkAEJBCAHealth + oid: PRIMEKEY-APPLIANCE-MIB::pkSfp + value: PRIMEKEY-APPLIANCE-MIB::pkAEJBCAHealth num_oid: '.1.3.6.1.4.1.22408.1.1.2.1.8.104.101.97.108.116.104.101.50.1{{ $index }}' descr: 'Health EJBCA' group: 'Health of VMs' - index: 2 + index: pkAEJBCAHealth state_name: HealthEjbca states: - { value: 0, generic: 0, graph: 0, descr: 'All OK' } @@ -125,48 +144,52 @@ modules: num_oid: '.1.3.6.1.4.1.22408.1.1.2.1.8.104.101.97.108.116.104.115.50.1{{ $index }}' descr: 'Health SignServer' group: 'Health of VMs' - index: 3 - state_name: HealthSignserver + index: pkASignServerHealth snmp_flags: ['-OteQUS', '-Ci'] # Workaround to prevent walking off the end of the MiB + state_name: HealthSignserver states: - { value: 0, generic: 0, graph: 0, descr: 'All OK' } - { value: 1, generic: 3, graph: 1, descr: 'Not Running or Unhealthy' } - - oid: PRIMEKEY-APPLIANCE-MIB::pkASfpCpuFanStatus + oid: PRIMEKEY-APPLIANCE-MIB::pkSfp + value: PRIMEKEY-APPLIANCE-MIB::pkASfpCpuFanStatus num_oid: '.1.3.6.1.4.1.22408.1.1.2.1.4.102.97.110.53.1{{ $index }}' descr: 'Fan CPU' group: 'Fans' - index: 4 + index: pkASfpCpuFanStatus state_name: FansCpu states: - { value: 0, generic: 0, graph: 0, descr: 'OK' } - { value: 1, generic: 2, graph: 1, descr: 'Fail' } - - oid: PRIMEKEY-APPLIANCE-MIB::pkASfpSysFansStatus + oid: PRIMEKEY-APPLIANCE-MIB::pkSfp + value: PRIMEKEY-APPLIANCE-MIB::pkASfpSysFansStatus num_oid: '.1.3.6.1.4.1.22408.1.1.2.1.4.102.97.110.54.1' descr: 'Fans System' group: 'Fans' - index: 5 + index: pkASfpSysFansStatus state_name: FansSystem states: - { value: 0, generic: 0, graph: 0, descr: 'All OK' } - { value: 1, generic: 1, graph: 1, descr: 'Fail' } - - oid: PRIMEKEY-APPLIANCE-MIB::pkAVdbStatus + oid: PRIMEKEY-APPLIANCE-MIB::pkSfp + value: PRIMEKEY-APPLIANCE-MIB::pkAVdbStatus num_oid: '.1.3.6.1.4.1.22408.1.1.2.1.4.118.100.98.50.1{{ $index }}' descr: 'DB Storage' group: 'Database' - index: 6 + index: pkAVdbStatus state_name: DbStorage states: - { value: 0, generic: 0, graph: 0, descr: '< 80% full' } - { value: 1, generic: 2, graph: 1, descr: '> 80% full' } - - oid: PRIMEKEY-APPLIANCE-MIB::pkAClusterLocalGaleraState + oid: PRIMEKEY-APPLIANCE-MIB::pkSfp + value: PRIMEKEY-APPLIANCE-MIB::pkAClusterLocalGaleraState num_oid: '.1.3.6.1.4.1.22408.1.1.2.1.8.99.108.117.115.116.101.114.52.1{{ $index }}' descr: 'DB Enum' group: 'Database' - index: 7 + index: pkAClusterLocalGaleraState state_name: DbEnum # Galera node status can be reported as a number or a comment: # - wsrep_local_state @@ -188,21 +211,23 @@ modules: - { value: 5, generic: 2, graph: 5, descr: 'Error' } # this and above is provider-specific error code - { value: 6, generic: 2, graph: 6, descr: 'Max' } - - oid: PRIMEKEY-APPLIANCE-MIB::pkASfpRaidStatus + oid: PRIMEKEY-APPLIANCE-MIB::pkSfp + value: PRIMEKEY-APPLIANCE-MIB::pkASfpRaidStatus num_oid: '.1.3.6.1.4.1.22408.1.1.2.1.5.114.97.105.100.49.1{{ $index }}' descr: 'RAID Health' group: 'RAID' - index: 8 + index: pkASfpRaidStatus state_name: RaidHealth states: - { value: 0, generic: 0, graph: 0, descr: 'Clean or Active' } - { value: 1, generic: 2, graph: 1, descr: 'Degraded' } - - oid: PRIMEKEY-APPLIANCE-MIB::pkAHsmStatusEnum + oid: PRIMEKEY-APPLIANCE-MIB::pkVhsm + value: PRIMEKEY-APPLIANCE-MIB::pkAHsmStatusEnum num_oid: '.1.3.6.1.4.1.22408.1.1.2.2.4.104.115.109.50.1{{ $index }}' descr: 'HSM Enum' group: 'HSM' - index: 9 + index: pkAHsmStatusEnum state_name: HsmEnum states: - { value: 0, generic: 0, graph: 0, descr: 'STATUS_is_OPER' } @@ -213,21 +238,23 @@ modules: - { value: 5, generic: 2, graph: 5, descr: 'STATUS_is_FAIL' } - { value: 5, generic: 3, graph: 6, descr: 'STATUS_is_OTHER' } - - oid: PRIMEKEY-APPLIANCE-MIB::pkAHsmStatusBool + oid: PRIMEKEY-APPLIANCE-MIB::pkVhsm + value: PRIMEKEY-APPLIANCE-MIB::pkAHsmStatusBool num_oid: '.1.3.6.1.4.1.22408.1.1.2.2.4.104.115.109.51.1{{ $index }}' descr: 'HSM Healthy' group: 'HSM' - index: 10 + index: pkAHsmStatusBool state_name: HsmHealthy states: - { value: 0, generic: 0, graph: 0, descr: 'OK' } - { value: 1, generic: 2, graph: 1, descr: 'Fail' } - - oid: PRIMEKEY-APPLIANCE-MIB::pkAHsmBatteryIntStatus + oid: PRIMEKEY-APPLIANCE-MIB::pkVhsm + value: PRIMEKEY-APPLIANCE-MIB::pkAHsmBatteryIntStatus num_oid: '.1.3.6.1.4.1.22408.1.1.2.2.4.104.115.109.53.1{{ $index }}' descr: 'Battery Int' group: 'HSM' - index: 11 + index: pkAHsmBatteryIntStatus state_name: BatteryInt states: - { value: 0, generic: 0, graph: 0, descr: 'OK' } @@ -237,35 +264,38 @@ modules: num_oid: '.1.3.6.1.4.1.22408.1.1.2.2.4.104.115.109.56.1{{ $index }}' descr: 'Battery Ext' group: 'HSM' - index: 12 - state_name: BatteryExt + index: pkAHsmBatteryExtStatus snmp_flags: ['-OteQUS', '-Ci'] # Workaround to prevent walking off the end of the MiB + state_name: BatteryExt states: - { value: 0, generic: 0, graph: 0, descr: 'Ok or Absent' } - { value: 1, generic: 2, graph: 1, descr: 'Low or Fail' } temperature: data: - - oid: PRIMEKEY-APPLIANCE-MIB::pkASfpCpuTemp + oid: PRIMEKEY-APPLIANCE-MIB::pkSfp + value: PRIMEKEY-APPLIANCE-MIB::pkASfpCpuTemp num_oid: '.1.3.6.1.4.1.22408.1.1.2.1.3.99.112.117.1{{ $index }}' descr: 'CPU Temp' group: 'CPU' - index: 1 + index: pkASfpCpuTemp voltage: options: skip_value_lt: 0 data: - - oid: PRIMEKEY-APPLIANCE-MIB::pkAHsmBatteryInt + oid: PRIMEKEY-APPLIANCE-MIB::pkVhsm + value: PRIMEKEY-APPLIANCE-MIB::pkAHsmBatteryInt num_oid: '.1.3.6.1.4.1.22408.1.1.2.2.4.104.115.109.52.1{{ $index }}' descr: 'Int Battery' group: 'HSM' - index: 52 + index: pkAHsmBatteryInt user_func: Number::cast - - oid: PRIMEKEY-APPLIANCE-MIB::pkAHsmBatteryExt + oid: PRIMEKEY-APPLIANCE-MIB::pkVhsm + value: PRIMEKEY-APPLIANCE-MIB::pkAHsmBatteryExt num_oid: '.1.3.6.1.4.1.22408.1.1.2.2.4.104.115.109.55.1{{ $index }}' descr: 'Ext Battery' group: 'HSM' - index: 55 + index: pkAHsmBatteryExt user_func: Number::cast diff --git a/includes/definitions/primekey.yaml b/includes/definitions/primekey.yaml index 490602465a..dc420ca2ec 100644 --- a/includes/definitions/primekey.yaml +++ b/includes/definitions/primekey.yaml @@ -4,7 +4,6 @@ type: appliance icon: primekey group: primekey mib_dir: primekey -snmp_bulk: false over: - { graph: device_percent, text: "Database Usage" } - { graph: device_voltage, text: "HSM Voltage" } diff --git a/tests/data/primekey_ejbca.json b/tests/data/primekey_ejbca.json index 8cd91e6e80..9b1b3af065 100644 --- a/tests/data/primekey_ejbca.json +++ b/tests/data/primekey_ejbca.json @@ -27,62 +27,14 @@ "sensor_deleted": 0, "sensor_class": "count", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.22408.1.1.2.1.5.108.111.97.100.50.1", - "sensor_index": "1", + "sensor_oid": ".1.3.6.1.4.1.22408.1.1.2.1.8.99.108.117.115.116.101.114.51.1", + "sensor_index": "pkAClusterActiveNodes", "sensor_type": "primekey", - "sensor_descr": " 1m CPU load", - "group": "CPU", + "sensor_descr": "Nodes Active", + "group": "Database", "sensor_divisor": 1, "sensor_multiplier": 1, - "sensor_current": 0.36, - "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": null - }, - { - "sensor_deleted": 0, - "sensor_class": "count", - "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.22408.1.1.2.1.5.108.111.97.100.51.1", - "sensor_index": "2", - "sensor_type": "primekey", - "sensor_descr": " 5m CPU load", - "group": "CPU", - "sensor_divisor": 1, - "sensor_multiplier": 1, - "sensor_current": 0.34, - "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": null - }, - { - "sensor_deleted": 0, - "sensor_class": "count", - "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.22408.1.1.2.1.5.108.111.97.100.52.1", - "sensor_index": "3", - "sensor_type": "primekey", - "sensor_descr": "15m CPU load", - "group": "CPU", - "sensor_divisor": 1, - "sensor_multiplier": 1, - "sensor_current": 0.37, + "sensor_current": 1, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -100,7 +52,7 @@ "sensor_class": "count", "poller_type": "snmp", "sensor_oid": ".1.3.6.1.4.1.22408.1.1.2.1.8.99.108.117.115.116.101.114.49.1", - "sensor_index": "4", + "sensor_index": "pkAClusterLocalNodeID", "sensor_type": "primekey", "sensor_descr": "Node ID", "group": "Database", @@ -124,7 +76,7 @@ "sensor_class": "count", "poller_type": "snmp", "sensor_oid": ".1.3.6.1.4.1.22408.1.1.2.1.8.99.108.117.115.116.101.114.50.1", - "sensor_index": "5", + "sensor_index": "pkAClusterSize", "sensor_type": "primekey", "sensor_descr": "Node Count", "group": "Database", @@ -147,14 +99,14 @@ "sensor_deleted": 0, "sensor_class": "count", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.22408.1.1.2.1.8.99.108.117.115.116.101.114.51.1", - "sensor_index": "6", + "sensor_oid": ".1.3.6.1.4.1.22408.1.1.2.1.5.108.111.97.100.52.1", + "sensor_index": "pkASfpLoad15m", "sensor_type": "primekey", - "sensor_descr": "Nodes Active", - "group": "Database", + "sensor_descr": "15m CPU load", + "group": "CPU", "sensor_divisor": 1, "sensor_multiplier": 1, - "sensor_current": 1, + "sensor_current": 0.37, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -171,10 +123,58 @@ "sensor_deleted": 0, "sensor_class": "count", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.22408.1.1.2.1.5.114.97.105.100.52.1", - "sensor_index": "7", + "sensor_oid": ".1.3.6.1.4.1.22408.1.1.2.1.5.108.111.97.100.50.1", + "sensor_index": "pkASfpLoad1m", "sensor_type": "primekey", - "sensor_descr": "RAID Devices", + "sensor_descr": " 1m CPU load", + "group": "CPU", + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_current": 0.36, + "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": null + }, + { + "sensor_deleted": 0, + "sensor_class": "count", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.22408.1.1.2.1.5.108.111.97.100.51.1", + "sensor_index": "pkASfpLoad5m", + "sensor_type": "primekey", + "sensor_descr": " 5m CPU load", + "group": "CPU", + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_current": 0.34, + "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": null + }, + { + "sensor_deleted": 0, + "sensor_class": "count", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.22408.1.1.2.1.5.114.97.105.100.54.1", + "sensor_index": "pkASfpRaidActiveDevices", + "sensor_type": "primekey", + "sensor_descr": "RAID Active", "group": "RAID", "sensor_divisor": 1, "sensor_multiplier": 1, @@ -195,10 +195,10 @@ "sensor_deleted": 0, "sensor_class": "count", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.22408.1.1.2.1.5.114.97.105.100.54.1", - "sensor_index": "8", + "sensor_oid": ".1.3.6.1.4.1.22408.1.1.2.1.5.114.97.105.100.52.1", + "sensor_index": "pkASfpRaidTotalDevices", "sensor_type": "primekey", - "sensor_descr": "RAID Active", + "sensor_descr": "RAID Devices", "group": "RAID", "sensor_divisor": 1, "sensor_multiplier": 1, @@ -220,7 +220,7 @@ "sensor_class": "fanspeed", "poller_type": "snmp", "sensor_oid": ".1.3.6.1.4.1.22408.1.1.2.1.4.102.97.110.49.1", - "sensor_index": "49", + "sensor_index": "pkASfpCpuFan", "sensor_type": "primekey", "sensor_descr": "CPU Fan", "group": "CPU", @@ -244,7 +244,7 @@ "sensor_class": "fanspeed", "poller_type": "snmp", "sensor_oid": ".1.3.6.1.4.1.22408.1.1.2.1.4.102.97.110.50.1", - "sensor_index": "50", + "sensor_index": "pkASfpSysFan1", "sensor_type": "primekey", "sensor_descr": "System Fan 1", "group": "System", @@ -268,7 +268,7 @@ "sensor_class": "fanspeed", "poller_type": "snmp", "sensor_oid": ".1.3.6.1.4.1.22408.1.1.2.1.4.102.97.110.51.1", - "sensor_index": "51", + "sensor_index": "pkASfpSysFan2", "sensor_type": "primekey", "sensor_descr": "System Fan 2", "group": "System", @@ -292,7 +292,7 @@ "sensor_class": "fanspeed", "poller_type": "snmp", "sensor_oid": ".1.3.6.1.4.1.22408.1.1.2.1.4.102.97.110.52.1", - "sensor_index": "52", + "sensor_index": "pkASfpSysFan3", "sensor_type": "primekey", "sensor_descr": "System Fan 3", "group": "System", @@ -316,7 +316,7 @@ "sensor_class": "percent", "poller_type": "snmp", "sensor_oid": ".1.3.6.1.4.1.22408.1.1.2.1.4.118.100.98.49.1", - "sensor_index": "1", + "sensor_index": "pkAVdbUsagePercent", "sensor_type": "primekey", "sensor_descr": "DB Usage %", "group": "Database", @@ -340,7 +340,7 @@ "sensor_class": "state", "poller_type": "snmp", "sensor_oid": ".1.3.6.1.4.1.22408.1.1.2.2.4.104.115.109.56.1", - "sensor_index": "12", + "sensor_index": "pkAHsmBatteryExtStatus", "sensor_type": "BatteryExt", "sensor_descr": "Battery Ext", "group": "HSM", @@ -364,7 +364,7 @@ "sensor_class": "state", "poller_type": "snmp", "sensor_oid": ".1.3.6.1.4.1.22408.1.1.2.2.4.104.115.109.53.1", - "sensor_index": "11", + "sensor_index": "pkAHsmBatteryIntStatus", "sensor_type": "BatteryInt", "sensor_descr": "Battery Int", "group": "HSM", @@ -388,7 +388,7 @@ "sensor_class": "state", "poller_type": "snmp", "sensor_oid": ".1.3.6.1.4.1.22408.1.1.2.1.8.99.108.117.115.116.101.114.52.1", - "sensor_index": "7", + "sensor_index": "pkAClusterLocalGaleraState", "sensor_type": "DbEnum", "sensor_descr": "DB Enum", "group": "Database", @@ -412,7 +412,7 @@ "sensor_class": "state", "poller_type": "snmp", "sensor_oid": ".1.3.6.1.4.1.22408.1.1.2.1.4.118.100.98.50.1", - "sensor_index": "6", + "sensor_index": "pkAVdbStatus", "sensor_type": "DbStorage", "sensor_descr": "DB Storage", "group": "Database", @@ -436,7 +436,7 @@ "sensor_class": "state", "poller_type": "snmp", "sensor_oid": ".1.3.6.1.4.1.22408.1.1.2.1.4.102.97.110.53.1", - "sensor_index": "4", + "sensor_index": "pkASfpCpuFanStatus", "sensor_type": "FansCpu", "sensor_descr": "Fan CPU", "group": "Fans", @@ -460,7 +460,7 @@ "sensor_class": "state", "poller_type": "snmp", "sensor_oid": ".1.3.6.1.4.1.22408.1.1.2.1.4.102.97.110.54.1", - "sensor_index": "5", + "sensor_index": "pkASfpSysFansStatus", "sensor_type": "FansSystem", "sensor_descr": "Fans System", "group": "Fans", @@ -484,7 +484,7 @@ "sensor_class": "state", "poller_type": "snmp", "sensor_oid": ".1.3.6.1.4.1.22408.1.1.2.1.8.104.101.97.108.116.104.101.50.1", - "sensor_index": "2", + "sensor_index": "pkAEJBCAHealth", "sensor_type": "HealthEjbca", "sensor_descr": "Health EJBCA", "group": "Health of VMs", @@ -508,7 +508,7 @@ "sensor_class": "state", "poller_type": "snmp", "sensor_oid": ".1.3.6.1.4.1.22408.1.1.2.1.8.104.101.97.108.116.104.115.50.1", - "sensor_index": "3", + "sensor_index": "pkASignServerHealth", "sensor_type": "HealthSignserver", "sensor_descr": "Health SignServer", "group": "Health of VMs", @@ -532,7 +532,7 @@ "sensor_class": "state", "poller_type": "snmp", "sensor_oid": ".1.3.6.1.4.1.22408.1.1.2.1.2.118.109.1", - "sensor_index": "1", + "sensor_index": "pkASfpVmStatus", "sensor_type": "HealthVMs", "sensor_descr": "Health VMs", "group": "Health of VMs", @@ -556,7 +556,7 @@ "sensor_class": "state", "poller_type": "snmp", "sensor_oid": ".1.3.6.1.4.1.22408.1.1.2.2.4.104.115.109.50.1", - "sensor_index": "9", + "sensor_index": "pkAHsmStatusEnum", "sensor_type": "HsmEnum", "sensor_descr": "HSM Enum", "group": "HSM", @@ -580,7 +580,7 @@ "sensor_class": "state", "poller_type": "snmp", "sensor_oid": ".1.3.6.1.4.1.22408.1.1.2.2.4.104.115.109.51.1", - "sensor_index": "10", + "sensor_index": "pkAHsmStatusBool", "sensor_type": "HsmHealthy", "sensor_descr": "HSM Healthy", "group": "HSM", @@ -604,7 +604,7 @@ "sensor_class": "state", "poller_type": "snmp", "sensor_oid": ".1.3.6.1.4.1.22408.1.1.2.1.5.114.97.105.100.49.1", - "sensor_index": "8", + "sensor_index": "pkASfpRaidStatus", "sensor_type": "RaidHealth", "sensor_descr": "RAID Health", "group": "RAID", @@ -628,7 +628,7 @@ "sensor_class": "temperature", "poller_type": "snmp", "sensor_oid": ".1.3.6.1.4.1.22408.1.1.2.1.3.99.112.117.1", - "sensor_index": "1", + "sensor_index": "pkASfpCpuTemp", "sensor_type": "primekey", "sensor_descr": "CPU Temp", "group": "CPU", @@ -652,7 +652,7 @@ "sensor_class": "voltage", "poller_type": "snmp", "sensor_oid": ".1.3.6.1.4.1.22408.1.1.2.2.4.104.115.109.52.1", - "sensor_index": "52", + "sensor_index": "pkAHsmBatteryInt", "sensor_type": "primekey", "sensor_descr": "Int Battery", "group": "HSM",