diff --git a/includes/definitions/discovery/raisecom.yaml b/includes/definitions/discovery/raisecom.yaml index 1cefd15b69..20613f0676 100644 --- a/includes/definitions/discovery/raisecom.yaml +++ b/includes/definitions/discovery/raisecom.yaml @@ -13,12 +13,11 @@ modules: processors: data: - - oid: raisecomTotalCPUUtilization - value: raisecomTotalCPUUtilizationOneMin + oid: raisecomTotalCPUUtilization.oneMin + value: raisecomTotalCPUUtilization num_oid: '.1.3.6.1.4.1.8886.1.1.1.3.1.2.1.2.{{ $index }}' snmp_flags: ['-OeQUsb', '-Pu'] # workaround for underscores in mib descr: 'Processor' - index: 3 sensors: fanspeed: data: diff --git a/tests/data/raisecom.json b/tests/data/raisecom.json index 09f691b187..99b04d2cac 100644 --- a/tests/data/raisecom.json +++ b/tests/data/raisecom.json @@ -26,31 +26,17 @@ { "entPhysicalIndex": 0, "hrDeviceIndex": 0, - "processor_oid": ".1.3.6.1.4.1.8886.1.1.1.3.1.2.1.2.5", + "processor_oid": ".1.3.6.1.4.1.8886.1.1.1.3.1.2.1.2.3", "processor_index": "3", "processor_type": "raisecom", - "processor_usage": 3, + "processor_usage": 6, "processor_descr": "Processor", "processor_precision": 1, "processor_perc_warn": 75 } ] }, - "poller": { - "processors": [ - { - "entPhysicalIndex": 0, - "hrDeviceIndex": 0, - "processor_oid": ".1.3.6.1.4.1.8886.1.1.1.3.1.2.1.2.5", - "processor_index": "3", - "processor_type": "raisecom", - "processor_usage": 4, - "processor_descr": "Processor", - "processor_precision": 1, - "processor_perc_warn": 75 - } - ] - } + "poller": "matches discovery" }, "sensors": { "discovery": {