diff --git a/doc/Developing/Sensor-State-Support.md b/doc/Developing/Sensor-State-Support.md index c906e36ed2..08c8e9b879 100644 --- a/doc/Developing/Sensor-State-Support.md +++ b/doc/Developing/Sensor-State-Support.md @@ -58,7 +58,7 @@ modules: - oid: dryContactSensorTable value: dryContactSensorValue - num_oid: .1.3.6.1.4.1.5528.100.4.2.1.1.2. + num_oid: '.1.3.6.1.4.1.5528.100.4.2.1.1.2.{{ $index }}' descr: dryContactSensorLabel index: 'dryContactSensor.{{ $index }}' state_name: dryContactSensor @@ -69,7 +69,7 @@ modules: - oid: doorSwitchSensorTable value: doorSwitchSensorValue - num_oid: .1.3.6.1.4.1.5528.100.4.2.2.1.2. + num_oid: '.1.3.6.1.4.1.5528.100.4.2.2.1.2.{{ $index }}' descr: doorSwitchSensorLabel index: 'doorSwitchSensor.{{ $index }}' state_name: doorSwitchSensor @@ -80,7 +80,7 @@ modules: - oid: cameraMotionSensorTable value: cameraMotionSensorValue - num_oid: .1.3.6.1.4.1.5528.100.4.2.3.1.2. + num_oid: '.1.3.6.1.4.1.5528.100.4.2.3.1.2.{{ $index }}' descr: cameraMotionSensorLabel index: 'cameraMotionSensor.{{ $index }}' state_name: cameraMotionSensor @@ -91,7 +91,7 @@ modules: - oid: otherStateSensorTable value: otherStateSensorErrorStatus - num_oid: .1.3.6.1.4.1.5528.100.4.2.10.1.3. + num_oid: '.1.3.6.1.4.1.5528.100.4.2.10.1.3.{{ $index }}' descr: otherStateSensorLabel index: '{{ $index }}' state_name: otherStateSensorErrorStatus diff --git a/doc/Developing/os/Health-Information.md b/doc/Developing/os/Health-Information.md index 0e0642be7b..bac139aa40 100644 --- a/doc/Developing/os/Health-Information.md +++ b/doc/Developing/os/Health-Information.md @@ -58,7 +58,7 @@ modules: oid: airFlowSensorTable value: airFlowSensorValue divisor: 10 - num_oid: .1.3.6.1.4.1.5528.100.4.1.5.1.2. + num_oid: '.1.3.6.1.4.1.5528.100.4.1.5.1.2.{{ $index }}' descr: airFlowSensorLabel index: 'airFlowSensorValue.{{ $index }}' ``` diff --git a/includes/definitions/discovery/acos.yaml b/includes/definitions/discovery/acos.yaml index 81e41de06d..5d8a425843 100644 --- a/includes/definitions/discovery/acos.yaml +++ b/includes/definitions/discovery/acos.yaml @@ -12,7 +12,7 @@ modules: - oid: axSysPowerSupplyStatusTable value: axPowerSupplyStatus - num_oid: .1.3.6.1.4.1.22610.2.4.1.5.12.1.3. + num_oid: '.1.3.6.1.4.1.22610.2.4.1.5.12.1.3.{{ $index }}' descr: axPowerSupplyName index: 'axPowerSupplyStatus.{{ $index }}' states: @@ -23,7 +23,7 @@ modules: - oid: axSysFanStatusTable value: axFanStatus - num_oid: .1.3.6.1.4.1.22610.2.4.1.5.9.1.3. + num_oid: '.1.3.6.1.4.1.22610.2.4.1.5.9.1.3.{{ $index }}' descr: axFanName index: 'axFanStatus.{{ $index }}' states: @@ -37,7 +37,7 @@ modules: - oid: axPowerSupplyVoltageTable value: axPowerSupplyVoltageStatus - num_oid: .1.3.6.1.4.1.22610.2.4.1.5.11.1.2. + num_oid: '.1.3.6.1.4.1.22610.2.4.1.5.11.1.2.{{ $index }}' descr: axPowerSupplyVoltageDescription index: 'axPowerSupplyVoltageStatus.{{ $index }}' states: @@ -46,7 +46,7 @@ modules: - { value: 2, descr: unknown, graph: 1, generic: 3 } - oid: axSysHwPhySystemTempStatus - num_oid: .1.3.6.1.4.1.22610.2.4.1.5.5. + num_oid: '.1.3.6.1.4.1.22610.2.4.1.5.5.{{ $index }}' descr: System Temp index: 'axSysHwPhySystemTempStatus.{{ $index }}' states: @@ -59,7 +59,7 @@ modules: data: - oid: axPowerSupplyVoltageTotal - num_oid: .1.3.6.1.4.1.22610.2.4.1.5.10. + num_oid: '.1.3.6.1.4.1.22610.2.4.1.5.10.{{ $index }}' index: 'axPowerSupplyVoltageTotal.{{ $index }}' descr: Power Supply fanspeed: @@ -67,28 +67,28 @@ modules: - oid: axSysFanStatusTable value: axFanSpeed - num_oid: .1.3.6.1.4.1.22610.2.4.1.5.9.1.4. + num_oid: '.1.3.6.1.4.1.22610.2.4.1.5.9.1.4.{{ $index }}' descr: axFanName index: 'axFanName.{{ $index }}' - oid: axSysHwFan1Speed - num_oid: .1.3.6.1.4.1.22610.2.4.1.5.2. + num_oid: '.1.3.6.1.4.1.22610.2.4.1.5.2.{{ $index }}' descr: Fan 1 Speed index: 'axSysHwFan1Speed.{{ $index }}' - oid: axSysHwFan2Speed - num_oid: .1.3.6.1.4.1.22610.2.4.1.5.3. + num_oid: '.1.3.6.1.4.1.22610.2.4.1.5.3.{{ $index }}' descr: Fan 2 Speed index: 'axSysHwFan2Speed.{{ $index }}' - oid: axSysHwFan3Speed - num_oid: .1.3.6.1.4.1.22610.2.4.1.5.4. + num_oid: '.1.3.6.1.4.1.22610.2.4.1.5.4.{{ $index }}' descr: Fan 3 Speed index: 'axSysHwFan3Speed.{{ $index }}' temperature: data: - oid: axSysHwPhySystemTemp - num_oid: .1.3.6.1.4.1.22610.2.4.1.5.1. + num_oid: '.1.3.6.1.4.1.22610.2.4.1.5.1.{{ $index }}' descr: System Temp index: 'axSysHwPhySystemTemp.{{ $index }}' diff --git a/includes/definitions/discovery/airos.yaml b/includes/definitions/discovery/airos.yaml index 09455c3cf8..b459c9aabe 100644 --- a/includes/definitions/discovery/airos.yaml +++ b/includes/definitions/discovery/airos.yaml @@ -11,7 +11,7 @@ modules: data: - oid: ubntGpsFix - num_oid: .1.3.6.1.4.1.41112.1.4.9.2. + num_oid: '.1.3.6.1.4.1.41112.1.4.9.2.{{ $index }}' descr: GPS Fix state_name: ubntGpsFix states: @@ -25,6 +25,6 @@ modules: - oid: ubntHostTemperature divisor: 1 - num_oid: .1.3.6.1.4.1.41112.1.4.8.4. + num_oid: '.1.3.6.1.4.1.41112.1.4.8.4.{{ $index }}' descr: Temperature diff --git a/includes/definitions/discovery/akcp.yaml b/includes/definitions/discovery/akcp.yaml index c10076fe3d..7407a1aa3a 100644 --- a/includes/definitions/discovery/akcp.yaml +++ b/includes/definitions/discovery/akcp.yaml @@ -6,7 +6,7 @@ modules: - oid: hhmsSensorArrayTable value: hhmsSensorArraySwitchStatus - num_oid: .1.3.6.1.4.1.3854.1.2.2.1.18.1.3. + num_oid: '.1.3.6.1.4.1.3854.1.2.2.1.18.1.3.{{ $index }}' descr: '{{ $hhmsSensorArraySwitchDescription }}' index: 'hhmsSensorArraySwitchStatus.{{ $index }}' skip_values: 1 @@ -14,4 +14,4 @@ modules: - { descr: noStatus, graph: 1, value: 1, generic: 3 } - { descr: normal, graph: 1, value: 2, generic: 0 } - { descr: critical, graph: 1, value: 4, generic: 2 } - - { descr: sensorError, graph: 1, value: 7, generic: 3 } \ No newline at end of file + - { descr: sensorError, graph: 1, value: 7, generic: 3 } diff --git a/includes/definitions/discovery/alcoma-almp.yaml b/includes/definitions/discovery/alcoma-almp.yaml index 2c0cbbfd03..010fa3e447 100644 --- a/includes/definitions/discovery/alcoma-almp.yaml +++ b/includes/definitions/discovery/alcoma-almp.yaml @@ -6,6 +6,6 @@ modules: - oid: alMPTemperature value: alMPTemperature - num_oid: .1.3.6.1.4.1.12140.2.3.9. + num_oid: '.1.3.6.1.4.1.12140.2.3.9.{{ $index }}' descr: Internal Temp index: 'alMPTemperatur.{{ $index }}' diff --git a/includes/definitions/discovery/apc-mgeups.yaml b/includes/definitions/discovery/apc-mgeups.yaml index ad7372e19a..07ca50b770 100644 --- a/includes/definitions/discovery/apc-mgeups.yaml +++ b/includes/definitions/discovery/apc-mgeups.yaml @@ -6,7 +6,7 @@ modules: - oid: upsmgOutputPhaseTable value: mgoutputLoadPerPhase - num_oid: .1.3.6.1.4.1.705.1.7.2.1.4. + num_oid: '.1.3.6.1.4.1.705.1.7.2.1.4.{{ $index }}' multiplier: 1000 descr: 'Output (VA) Phase {{ $index }}' index: 'kva.mgoutputLoadPerPhase.{{ $index }}' @@ -15,21 +15,21 @@ modules: - oid: upsmgInputPhaseTable value: mginputCurrent - num_oid: .1.3.6.1.4.1.705.1.6.2.1.6. + num_oid: '.1.3.6.1.4.1.705.1.6.2.1.6.{{ $index }}' divisor: 10 descr: 'Input Current Phase {{ $index }}' index: 'mginputCurrent.{{ $index }}' - oid: upsmgOutputPhaseTable value: mgoutputCurrent - num_oid: .1.3.6.1.4.1.705.1.7.2.1.5. + num_oid: '.1.3.6.1.4.1.705.1.7.2.1.5.{{ $index }}' divisor: 10 descr: 'Output Current Phase {{ $index }}' index: 'mgoutputCurrent.{{ $index }}' - oid: upsmgBattery value: upsmgBatteryCurrent - num_oid: .1.3.6.1.4.1.705.1.5.6. + num_oid: '.1.3.6.1.4.1.705.1.5.6.{{ $index }}' divisor: 10 descr: 'Battery' index: 'upsmgBatteryCurrent.{{ $index }}' @@ -38,7 +38,7 @@ modules: - oid: upsmgBattery value: upsmgBatteryTemperature - num_oid: .1.3.6.1.4.1.705.1.5.7. + num_oid: '.1.3.6.1.4.1.705.1.5.7.{{ $index }}' descr: 'Battery' index: 'upsmgBatteryTemperature.{{ $index }}' frequency: @@ -46,14 +46,14 @@ modules: - oid: upsmgInputPhaseTable value: mginputFrequency - num_oid: .1.3.6.1.4.1.705.1.6.2.1.3. + num_oid: '.1.3.6.1.4.1.705.1.6.2.1.3.{{ $index }}' divisor: 10 descr: 'Input Frequency Phase {{ $index }}' index: 'mginputFrequency.{{ $index }}' - oid: upsmgOutputPhaseTable value: mgoutputFrequency - num_oid: .1.3.6.1.4.1.705.1.7.2.1.3. + num_oid: '.1.3.6.1.4.1.705.1.7.2.1.3.{{ $index }}' divisor: 10 descr: 'Output Frequency Phase {{ $index }}' index: 'mgoutputFrequency.{{ $index }}' @@ -62,7 +62,7 @@ modules: - oid: upsmgBattery value: upsmgBatteryRemainingTime - num_oid: .1.3.6.1.4.1.705.1.5.1. + num_oid: '.1.3.6.1.4.1.705.1.5.1.{{ $index }}' descr: 'Remaining time' index: 'upsmgBatteryRemainingTime.{{ $index }}' charge: @@ -70,7 +70,7 @@ modules: - oid: upsmgBattery value: upsmgBatteryLevel - num_oid: .1.3.6.1.4.1.705.1.5.2. + num_oid: '.1.3.6.1.4.1.705.1.5.2.{{ $index }}' descr: 'Remaining battery capacity' index: 'upsmgBatteryLevel.{{ $index }}' voltage: @@ -78,21 +78,21 @@ modules: - oid: upsmgInputPhaseTable value: mginputVoltage - num_oid: .1.3.6.1.4.1.705.1.6.2.1.2. + num_oid: '.1.3.6.1.4.1.705.1.6.2.1.2.{{ $index }}' divisor: 10 descr: 'Input Phase/Phase {{ $index }}' index: 'mginputVoltage.{{ $index }}' - oid: upsmgOutputPhaseTable value: mgoutputVoltage - num_oid: .1.3.6.1.4.1.705.1.7.2.1.2. + num_oid: '.1.3.6.1.4.1.705.1.7.2.1.2.{{ $index }}' divisor: 10 descr: 'Output Phase/Phase {{ $index }}' index: 'mgoutputVoltage.{{ $index }}' - oid: upsmgBattery value: upsmgBatteryVoltage - num_oid: .1.3.6.1.4.1.705.1.5.5. + num_oid: '.1.3.6.1.4.1.705.1.5.5.{{ $index }}' divisor: 10 descr: 'Battery' index: 'upsmgBatteryVoltage.{{ $index }}' @@ -102,7 +102,7 @@ modules: - oid: upsmgOutputOnBattery value: upsmgOutputOnBattery - num_oid: .1.3.6.1.4.1.705.1.7.3. + num_oid: '.1.3.6.1.4.1.705.1.7.3.{{ $index }}' descr: 'Input Status' index: 'upsmgOutputOnBattery.{{ $index }}' state_name: upsmgOutputOnBattery @@ -112,7 +112,7 @@ modules: - oid: upsmgOutputOnByPass value: upsmgOutputOnByPass - num_oid: .1.3.6.1.4.1.705.1.7.4. + num_oid: '.1.3.6.1.4.1.705.1.7.4.{{ $index }}' descr: 'Bypass Status' index: 'upsmgOutputOnBypass.{{ $index }}' state_name: upsmgOutputOnByPass @@ -122,7 +122,7 @@ modules: - oid: upsmgOutputUtilityOff value: upsmgOutputUtilityOff - num_oid: .1.3.6.1.4.1.705.1.7.7. + num_oid: '.1.3.6.1.4.1.705.1.7.7.{{ $index }}' descr: 'Utility Status' index: 'upsmgOutputUtilityOff.{{ $index }}' state_name: upsmgOutputUtilityOff @@ -132,7 +132,7 @@ modules: - oid: upsmgOutputInverterOff value: upsmgOutputInverterOff - num_oid: .1.3.6.1.4.1.705.1.7.9. + num_oid: '.1.3.6.1.4.1.705.1.7.9.{{ $index }}' descr: 'UPS Inverter Status' index: 'upsmgOutputInverterOff.{{ $index }}' state_name: upsmgOutputInverterOff @@ -142,7 +142,7 @@ modules: - oid: upsmgOutputOverLoad value: upsmgOutputOverLoad - num_oid: .1.3.6.1.4.1.705.1.7.10. + num_oid: '.1.3.6.1.4.1.705.1.7.10.{{ $index }}' descr: 'Output OverLoad' index: 'upsmgOutputOverLoad.{{ $index }}' state_name: upsmgOutputOverLoad @@ -152,7 +152,7 @@ modules: - oid: upsmgOutputOverTemp value: upsmgOutputOverTemp - num_oid: .1.3.6.1.4.1.705.1.7.11. + num_oid: '.1.3.6.1.4.1.705.1.7.11.{{ $index }}' descr: 'Over Temperature' index: 'upsmgOutputOverTemp.{{ $index }}' state_name: upsmgOutputOverTemp @@ -162,7 +162,7 @@ modules: - oid: upsmgBattery value: upsmgBatteryFaultBattery - num_oid: .1.3.6.1.4.1.705.1.5.9. + num_oid: '.1.3.6.1.4.1.705.1.5.9.{{ $index }}' descr: 'Battery Fault' index: 'upsmgBatteryFaultBattery.{{ $index }}' state_name: upsmgBatteryFaultBattery @@ -172,7 +172,7 @@ modules: - oid: upsmgBattery value: upsmgBatteryReplacement - num_oid: .1.3.6.1.4.1.705.1.5.11. + num_oid: '.1.3.6.1.4.1.705.1.5.11.{{ $index }}' descr: 'Battery Replacement Status' index: 'upsmgBatteryReplacement.{{ $index }}' state_name: upsmgBatteryReplacement @@ -182,7 +182,7 @@ modules: - oid: upsmgBattery value: upsmgBatteryLowBattery - num_oid: .1.3.6.1.4.1.705.1.5.14. + num_oid: '.1.3.6.1.4.1.705.1.5.14.{{ $index }}' descr: 'Battery Charge Status' index: 'upsmgBatteryLowBattery.{{ $index }}' state_name: upsmgBatteryLowBattery @@ -192,7 +192,7 @@ modules: - oid: upsmgBattery value: upsmgBatteryChargerFault - num_oid: .1.3.6.1.4.1.705.1.5.15. + num_oid: '.1.3.6.1.4.1.705.1.5.15.{{ $index }}' descr: 'Battery Charger Status' index: 'upsmgBatteryChargerFault.{{ $index }}' state_name: upsmgBatteryChargerFault @@ -202,7 +202,7 @@ modules: - oid: upsmgBattery value: upsmgBatteryLowCondition - num_oid: .1.3.6.1.4.1.705.1.5.16. + num_oid: '.1.3.6.1.4.1.705.1.5.16.{{ $index }}' descr: 'Battery Condition' index: 'upsmgBatteryLowCondition.{{ $index }}' state_name: upsmgBatteryLowCondition @@ -212,7 +212,7 @@ modules: - oid: upsmgInputBadStatus value: upsmgInputBadStatus - num_oid: .1.3.6.1.4.1.705.1.6.3. + num_oid: '.1.3.6.1.4.1.705.1.6.3.{{ $index }}' descr: 'Input Status' index: 'upsmgInputBadStatus.{{ $index }}' state_name: upsmgInputBadStatus @@ -222,7 +222,7 @@ modules: - oid: upsmgInputLineFailCause value: upsmgInputLineFailCause - num_oid: .1.3.6.1.4.1.705.1.6.4. + num_oid: '.1.3.6.1.4.1.705.1.6.4.{{ $index }}' descr: 'Input Line Fail Cause' index: 'upsmgInputLineFailCause.{{ $index }}' state_name: upsmgInputLineFailCause diff --git a/includes/definitions/discovery/apc.yaml b/includes/definitions/discovery/apc.yaml index 719a692781..45c7d5c13c 100644 --- a/includes/definitions/discovery/apc.yaml +++ b/includes/definitions/discovery/apc.yaml @@ -12,7 +12,7 @@ modules: - oid: upsBasicOutputStatus value: upsBasicOutputStatus - num_oid: .1.3.6.1.4.1.318.1.1.1.4.1.1. + num_oid: '.1.3.6.1.4.1.318.1.1.1.4.1.1.{{ $index }}' descr: Output Status index: '{{ $index }}' state_name: upsBasicOutputStatus @@ -41,7 +41,7 @@ modules: - { descr: inverterSpotmode, graph: 0, value: 22, generic: 0 } - oid: airIRRP100UnitStatusOperateMode - num_oid: .1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.1. + num_oid: '.1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.1.{{ $index }}' descr: Unit Status states: - { descr: standby, graph: 1, value: 1, generic: 1 } @@ -53,21 +53,21 @@ modules: - { descr: assist, graph: 1, value: 7, generic: 1 } - oid: airIRRP100UnitStatusInputState - num_oid: .1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.21. + num_oid: '.1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.21.{{ $index }}' descr: Input State states: - { descr: open, graph: 1, value: 1, generic: 0 } - { descr: closed, graph: 1, value: 2, generic: 2 } - oid: airIRRP100UnitStatusOutputState - num_oid: .1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.22. + num_oid: '.1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.22.{{ $index }}' descr: Output State states: - { descr: open, graph: 1, value: 1, generic: 0 } - { descr: closed, graph: 1, value: 2, generic: 2 } - oid: airIRRP500UnitStatusOperateMode - num_oid: .1.3.6.1.4.1.318.1.1.13.3.3.2.2.2.1. + num_oid: '.1.3.6.1.4.1.318.1.1.13.3.3.2.2.2.1.{{ $index }}' descr: Unit Status states: - { descr: standby, graph: 1, value: 1, generic: 1 } @@ -78,14 +78,14 @@ modules: - { descr: assist, graph: 1, value: 6, generic: 1 } - oid: airIRRP500UnitStatusInputState - num_oid: .1.3.6.1.4.1.318.1.1.13.3.3.2.2.2.21. + num_oid: '.1.3.6.1.4.1.318.1.1.13.3.3.2.2.2.21.{{ $index }}' descr: Input State states: - { descr: open, graph: 1, value: 1, generic: 0 } - { descr: closed, graph: 1, value: 2, generic: 2 } - oid: airIRRP500UnitStatusOutputState - num_oid: .1.3.6.1.4.1.318.1.1.13.3.3.2.2.2.22. + num_oid: '.1.3.6.1.4.1.318.1.1.13.3.3.2.2.2.22.{{ $index }}' descr: Output State states: - { descr: open, graph: 1, value: 1, generic: 0 } @@ -94,7 +94,7 @@ modules: oid: rPDU2PhaseStatusTable state_name: rPDU2PhaseStatusLoadState value: rPDU2PhaseStatusLoadState - num_oid: .1.3.6.1.4.1.318.1.1.26.6.3.1.4. + num_oid: '.1.3.6.1.4.1.318.1.1.26.6.3.1.4.{{ $index }}' index: 'rPDU2PhaseStatusLoadState.{{ $index }}' descr: 'Load State, Phase #{{ $index }}' states: @@ -106,7 +106,7 @@ modules: oid: rPDU2DeviceStatusTable state_name: rPDU2DeviceStatusLoadState value: rPDU2DeviceStatusLoadState - num_oid: .1.3.6.1.4.1.318.1.1.26.4.3.1.4. + num_oid: '.1.3.6.1.4.1.318.1.1.26.4.3.1.4.{{ $index }}' index: 'rPDU2DeviceStatusLoadState.{{ $index }}' descr: 'Device State' states: @@ -119,7 +119,7 @@ modules: oid: rPDU2DeviceStatusTable state_name: rPDU2DeviceStatusPowerSupplyAlarm value: rPDU2DeviceStatusPowerSupplyAlarm - num_oid: .1.3.6.1.4.1.318.1.1.26.4.3.1.12. + num_oid: '.1.3.6.1.4.1.318.1.1.26.4.3.1.12.{{ $index }}' index: 'rPDU2DeviceStatusPowerSupplyAlarm.{{ $index }}' descr: 'Power Supply State' states: @@ -129,7 +129,7 @@ modules: oid: rPDU2SensorTempHumidityStatusTable state_name: rPDU2SensorTempHumidityStatusTempStatus value: rPDU2SensorTempHumidityStatusTempStatus - num_oid: .1.3.6.1.4.1.318.1.1.26.10.2.2.1.9. + num_oid: '.1.3.6.1.4.1.318.1.1.26.10.2.2.1.9.{{ $index }}' index: 'rPDU2SensorTempHumidityStatusTempStatus.{{ $index }}' descr: 'Temperature Probe Status' states: @@ -149,7 +149,7 @@ modules: oid: rPDU2SensorTempHumidityStatusTable state_name: rPDU2SensorTempHumidityStatusHumidityStatus value: rPDU2SensorTempHumidityStatusHumidityStatus - num_oid: .1.3.6.1.4.1.318.1.1.26.10.2.2.1.11. + num_oid: '.1.3.6.1.4.1.318.1.1.26.10.2.2.1.11.{{ $index }}' index: 'rPDU2SensorTempHumidityStatusHumidityStatus.{{ $index }}' descr: 'Humidity Probe Status' states: @@ -168,7 +168,7 @@ modules: oid: atsStatusSourceAStatus value: atsStatusSourceAStatus state_name: atsStatusSourceAStatus - num_oid: .1.3.6.1.4.1.318.1.1.8.5.1.12. + num_oid: '.1.3.6.1.4.1.318.1.1.8.5.1.12.{{ $index }}' index: 'atsStatusSourceAStatus.{{ $index }}' descr: Source A Status states: @@ -178,7 +178,7 @@ modules: oid: atsStatusSourceBStatus value: atsStatusSourceBStatus state_name: atsStatusSourceBStatus - num_oid: .1.3.6.1.4.1.318.1.1.8.5.1.13. + num_oid: '.1.3.6.1.4.1.318.1.1.8.5.1.13.{{ $index }}' index: 'atsStatusSourceBStatus.{{ $index }}' descr: Source B Status states: @@ -188,7 +188,7 @@ modules: oid: atsStatusSwitchStatus value: atsStatusSwitchStatus state_name: atsStatusSwitchStatus - num_oid: .1.3.6.1.4.1.318.1.1.8.5.1.10. + num_oid: '.1.3.6.1.4.1.318.1.1.8.5.1.10.{{ $index }}' index: 'atsStatusSwitchStatus.{{ $index }}' descr: Global Switch Status states: @@ -198,7 +198,7 @@ modules: oid: atsStatusSelectedSource value: atsStatusSelectedSource state_name: atsStatusSelectedSource - num_oid: .1.3.6.1.4.1.318.1.1.8.5.1.2. + num_oid: '.1.3.6.1.4.1.318.1.1.8.5.1.2.{{ $index }}' index: 'atsStatusSelectedSource.{{ $index }}' descr: Selected Source states: @@ -208,7 +208,7 @@ modules: oid: atsStatusRedundancyState value: atsStatusRedundancyState state_name: atsStatusRedundancyState - num_oid: .1.3.6.1.4.1.318.1.1.8.5.1.3. + num_oid: '.1.3.6.1.4.1.318.1.1.8.5.1.3.{{ $index }}' index: 'atsStatusRedundancyState.{{ $index }}' descr: Redundancy State states: @@ -218,7 +218,7 @@ modules: oid: atsStatusPhaseSyncStatus value: atsStatusPhaseSyncStatus state_name: atsStatusPhaseSyncStatus - num_oid: .1.3.6.1.4.1.318.1.1.8.5.1.14. + num_oid: '.1.3.6.1.4.1.318.1.1.8.5.1.14.{{ $index }}' index: 'atsStatusPhaseSyncStatus.{{ $index }}' descr: Phase Sync Status states: @@ -229,113 +229,113 @@ modules: data: - oid: airIRRP100UnitStatusRackInletTempMetric - num_oid: .1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.3. + num_oid: '.1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.3.{{ $index }}' index: 'airIRRP100UnitStatusRackInletTempMetric.{{ $index }}' descr: Rack Inlet divisor: 10 - oid: airIRRP100UnitStatusSupplyAirTempMetric - num_oid: .1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.5. + num_oid: '.1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.5.{{ $index }}' index: 'airIRRP100UnitStatusSupplyAirTempMetric.{{ $index }}' descr: Supply Air divisor: 10 - oid: airIRRP100UnitStatusReturnAirTempMetric - num_oid: .1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.7. + num_oid: '.1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.7.{{ $index }}' index: 'airIRRP100UnitStatusReturnAirTempMetric.{{ $index }}' descr: Return Air divisor: 10 - oid: airIRRP100UnitStatusRackInletTemperature1Metric - num_oid: .1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.24. + num_oid: '.1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.24.{{ $index }}' index: 'airIRRP100UnitStatusRackInletTemperature1Metric.{{ $index }}' descr: 'Inlet #1' divisor: 10 - oid: airIRRP100UnitStatusRackInletTemperature2Metric - num_oid: .1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.26. + num_oid: '.1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.26.{{ $index }}' index: 'airIRRP100UnitStatusRackInletTemperature2Metric.{{ $index }}' descr: 'Inlet #2' divisor: 10 - oid: airIRRP100UnitStatusRackInletTemperature3Metric - num_oid: .1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.28. + num_oid: '.1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.28.{{ $index }}' index: 'airIRRP100UnitStatusRackInletTemperature3Metric.{{ $index }}' descr: 'Inlet #3' divisor: 10 - oid: airIRRP100UnitStatusCompressorDriveHeatSinkTempMetric - num_oid: .1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.41. + num_oid: '.1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.41.{{ $index }}' index: 'airIRRP100UnitStatusCompressorDriveHeatSinkTempMetric.{{ $index }}' descr: 'Compressor Drive Heatsink' divisor: 10 - oid: airIRRP100UnitStatusCompressorDriveControlCardTempMetric - num_oid: .1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.43. + num_oid: '.1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.43.{{ $index }}' index: 'airIRRP100UnitStatusCompressorDriveControlCardTempMetric.{{ $index }}' descr: 'Compressor Drive Control Card' divisor: 10 - oid: airIRRP500UnitStatusSupplyAirTempMetric - num_oid: .1.3.6.1.4.1.318.1.1.13.3.3.2.2.2.5. + num_oid: '.1.3.6.1.4.1.318.1.1.13.3.3.2.2.2.5.{{ $index }}' index: 'airIRRP500UnitStatusSupplyAirTempMetric.{{ $index }}' descr: Supply Air divisor: 10 - oid: airIRRP500UnitStatusReturnAirTempMetric - num_oid: .1.3.6.1.4.1.318.1.1.13.3.3.2.2.2.7. + num_oid: '.1.3.6.1.4.1.318.1.1.13.3.3.2.2.2.7.{{ $index }}' index: 'airIRRP500UnitStatusReturnAirTempMetric.{{ $index }}' descr: Return Air divisor: 10 - oid: airIRRP500UnitStatusRackInletTemperature1Metric - num_oid: .1.3.6.1.4.1.318.1.1.13.3.3.2.2.2.24. + num_oid: '.1.3.6.1.4.1.318.1.1.13.3.3.2.2.2.24.{{ $index }}' index: 'airIRRP500UnitStatusRackInletTemperature1Metric.{{ $index }}' descr: 'Inlet #1' divisor: 10 - oid: airIRRP500UnitStatusRackInletTemperature2Metric - num_oid: .1.3.6.1.4.1.318.1.1.13.3.3.2.2.2.26. + num_oid: '.1.3.6.1.4.1.318.1.1.13.3.3.2.2.2.26.{{ $index }}' index: 'airIRRP500UnitStatusRackInletTemperature2Metric.{{ $index }}' descr: 'Inlet #2' divisor: 10 - oid: airIRRP500UnitStatusRackInletTemperature3Metric - num_oid: .1.3.6.1.4.1.318.1.1.13.3.3.2.2.2.28. + num_oid: '.1.3.6.1.4.1.318.1.1.13.3.3.2.2.2.28.{{ $index }}' index: 'airIRRP500UnitStatusRackInletTemperature3Metric.{{ $index }}' descr: 'Inlet #3' divisor: 10 - oid: airIRG2RDT2StatusRackInletTempMetric - num_oid: .1.3.6.1.4.1.318.1.1.13.4.5.2.1.7. + num_oid: '.1.3.6.1.4.1.318.1.1.13.4.5.2.1.7.{{ $index }}' index: 'airIRG2RDT2StatusRackInletTempMetric.{{ $index }}' descr: 'Rack Inlet' divisor: 10 high_limit: airIRG2RDT2ThresholdsRackInletHighTempMetric - oid: airIRG2RDT2StatusSupplyAirTempMetric - num_oid: .1.3.6.1.4.1.318.1.1.13.4.5.2.1.9. + num_oid: '.1.3.6.1.4.1.318.1.1.13.4.5.2.1.9.{{ $index }}' index: 'airIRG2RDT2StatusSupplyAirTempMetric.{{ $index }}' descr: 'Supply Air' divisor: 10 high_limit: airIRG2RDT2ThresholdsSupplyAirHighTempMetric - oid: airIRG2RDT2StatusReturnAirTempMetric - num_oid: .1.3.6.1.4.1.318.1.1.13.4.5.2.1.11. + num_oid: '.1.3.6.1.4.1.318.1.1.13.4.5.2.1.11.{{ $index }}' index: 'airIRG2RDT2StatusReturnAirTempMetric.{{ $index }}' descr: 'Return Air' divisor: 10 high_limit: airIRG2RDT2ThresholdsReturnAirHighTempMetric - oid: airIRG2RDT2StatusSuctionTempMetric - num_oid: .1.3.6.1.4.1.318.1.1.13.4.5.2.1.13. + num_oid: '.1.3.6.1.4.1.318.1.1.13.4.5.2.1.13.{{ $index }}' index: 'airIRG2RDT2StatusSuctionTempMetric.{{ $index }}' descr: 'Suction' divisor: 10 - oid: rPDU2SensorTempHumidityStatusTable value: rPDU2SensorTempHumidityStatusTempC - num_oid: .1.3.6.1.4.1.318.1.1.26.10.2.2.1.8. + num_oid: '.1.3.6.1.4.1.318.1.1.26.10.2.2.1.8.{{ $index }}' index: 'rPDU2SensorTempHumidityStatusTempC.{{ $index }}' descr: 'Temperature Probe' divisor: 10 @@ -348,32 +348,32 @@ modules: data: - oid: airIRRP100UnitStatusSupplyHumidity - num_oid: .1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.8. + num_oid: '.1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.8.{{ $index }}' index: 'airIRRP100UnitStatusSupplyHumidity.{{ $index }}' descr: Supply divisor: 10 - oid: airIRRP100UnitStatusReturnHumidity - num_oid: .1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.8. + num_oid: '.1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.8.{{ $index }}' index: 'airIRRP100UnitStatusReturnHumidity.{{ $index }}' descr: Return divisor: 10 - oid: airIRRP500UnitStatusSupplyHumidity - num_oid: .1.3.6.1.4.1.318.1.1.13.3.3.2.2.2.8. + num_oid: '.1.3.6.1.4.1.318.1.1.13.3.3.2.2.2.8.{{ $index }}' index: 'airIRRP500UnitStatusSupplyHumidity.{{ $index }}' descr: Supply divisor: 10 - oid: airIRRP500UnitStatusReturnHumidity - num_oid: .1.3.6.1.4.1.318.1.1.13.3.3.2.2.2.8. + num_oid: '.1.3.6.1.4.1.318.1.1.13.3.3.2.2.2.8.{{ $index }}' index: 'airIRRP500UnitStatusSupplyHumidity.{{ $index }}' descr: Return divisor: 10 - oid: rPDU2SensorTempHumidityStatusTable value: rPDU2SensorTempHumidityStatusRelativeHumidity - num_oid: .1.3.6.1.4.1.318.1.1.26.10.2.2.1.10. + num_oid: '.1.3.6.1.4.1.318.1.1.26.10.2.2.1.10.{{ $index }}' index: 'rPDU2SensorTempHumidityStatusRelativeHumidity.{{ $index }}' descr: 'Humidity Probe' skip_values: @@ -389,32 +389,32 @@ modules: data: - oid: airIRRP100UnitStatusAirFlowMetric - num_oid: .1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.11. + num_oid: '.1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.11.{{ $index }}' index: 'airIRRP100UnitStatusAirFlowMetric.{{ $index }}' descr: Air Flow divisor: 10 - oid: airIRRP500UnitStatusAirFlowMetric - num_oid: .1.3.6.1.4.1.318.1.1.13.3.3.2.2.2.11. + num_oid: '.1.3.6.1.4.1.318.1.1.13.3.3.2.2.2.11.{{ $index }}' index: 'airIRRP500UnitStatusAirFlowMetric.{{ $index }}' descr: Air Flow divisor: 10 - oid: airIRG2RDT2StatusAirFlowMetric - num_oid: .1.3.6.1.4.1.318.1.1.13.4.5.2.1.5. + num_oid: '.1.3.6.1.4.1.318.1.1.13.4.5.2.1.5.{{ $index }}' index: 'airIRG2RDT2StatusAirFlowMetric.{{ $index }}' descr: Air Flow voltage: data: - oid: airIRRP100UnitStatusCompressorDriveVoltage - num_oid: .1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.37. + num_oid: '.1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.37.{{ $index }}' index: 'airIRRP100UnitStatusCompressorDriveVoltage.{{ $index }}' descr: Compressor Drive divisor: 10 - oid: airIRRP100UnitStatusCompressorDriveDCLinkVoltage - num_oid: .1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.39. + num_oid: '.1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.39.{{ $index }}' index: 'airIRRP100UnitStatusCompressorDriveDCLinkVoltage.{{ $index }}' descr: Compressor Drive DC Link divisor: 10 @@ -422,19 +422,19 @@ modules: data: - oid: airIRRP100UnitStatusHumidifierCurrent - num_oid: .1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.33. + num_oid: '.1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.33.{{ $index }}' index: 'airIRRP100UnitStatusHumidifierCurrent.{{ $index }}' descr: Humidifier divisor: 10 - oid: airIRRP100UnitStatusCompressorDriveCurrent - num_oid: .1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.38. + num_oid: '.1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.38.{{ $index }}' index: 'airIRRP100UnitStatusCompressorDriveCurrent.{{ $index }}' descr: Compressor Drive divisor: 10 - oid: airIRRP500UnitStatusHumidifierCurrent - num_oid: .1.3.6.1.4.1.318.1.1.13.3.3.2.2.2.33. + num_oid: '.1.3.6.1.4.1.318.1.1.13.3.3.2.2.2.33.{{ $index }}' index: 'airIRRP100UnitStatusHumidifierCurrent.{{ $index }}' descr: Humidifier divisor: 10 @@ -442,13 +442,13 @@ modules: data: - oid: airIRRP100UnitStatusFanSpeed - num_oid: .1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.12. + num_oid: '.1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.12.{{ $index }}' index: 'airIRRP100UnitStatusFanSpeed.{{ $index }}' descr: 'Fan Speed (%)' divisor: 10 - oid: airIRRP500UnitStatusFanSpeed - num_oid: .1.3.6.1.4.1.318.1.1.13.3.3.2.2.2.12. + num_oid: '.1.3.6.1.4.1.318.1.1.13.3.3.2.2.2.12.{{ $index }}' index: 'airIRRP500UnitStatusFanSpeed.{{ $index }}' descr: 'Fan Speed (%)' divisor: 10 @@ -456,7 +456,7 @@ modules: data: - oid: airIRRP100UnitStatusCompressorDriveSpeed - num_oid: .1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.35. + num_oid: '.1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.35.{{ $index }}' index: 'airIRRP100UnitStatusCompressorDriveSpeed.{{ $index }}' descr: 'Drive Speed' divisor: 10 @@ -464,38 +464,38 @@ modules: data: - oid: airIRRP100UnitStatusCompressorDrivePower - num_oid: .1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.35. + num_oid: '.1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.35.{{ $index }}' index: 'airIRRP100UnitStatusCompressorDrivePower.{{ $index }}' descr: 'Drive Power' multiplier: 10 - oid: airIRRP100UnitStatusCoolDemand - num_oid: .1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.13. + num_oid: '.1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.13.{{ $index }}' index: 'airIRRP100UnitStatusCoolDemand.{{ $index }}' descr: 'Cooling Demand' multiplier: 100 - oid: airIRRP100UnitStatusCoolOutput - num_oid: .1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.14. + num_oid: '.1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.14.{{ $index }}' index: 'airIRRP100UnitStatusCoolOutput.{{ $index }}' descr: 'Cooling Output' multiplier: 100 - oid: airIRRP500UnitStatusCoolDemand - num_oid: .1.3.6.1.4.1.318.1.1.13.3.3.2.2.2.13. + num_oid: '.1.3.6.1.4.1.318.1.1.13.3.3.2.2.2.13.{{ $index }}' index: 'airIRRP500UnitStatusCoolDemand.{{ $index }}' descr: 'Cooling Demand' multiplier: 100 - oid: airIRRP500UnitStatusCoolOutput - num_oid: .1.3.6.1.4.1.318.1.1.13.3.3.2.2.2.14. + num_oid: '.1.3.6.1.4.1.318.1.1.13.3.3.2.2.2.14.{{ $index }}' index: 'airIRRP500UnitStatusCoolOutput.{{ $index }}' descr: 'Cooling Output' multiplier: 100 - oid: rPDU2DeviceStatusTable value: rPDU2DeviceStatusPower - num_oid: .1.3.6.1.4.1.318.1.1.26.4.3.1.5. + num_oid: '.1.3.6.1.4.1.318.1.1.26.4.3.1.5.{{ $index }}' multiplier: 10 index: 'rPDU2DeviceStatusPower.{{ $index }}' descr: 'Power, Total' @@ -503,25 +503,25 @@ modules: data: - oid: airIRG2RDT2StatusSuctionPressureMetric - num_oid: .1.3.6.1.4.1.318.1.1.13.4.5.2.1.19. + num_oid: '.1.3.6.1.4.1.318.1.1.13.4.5.2.1.19.{{ $index }}' index: 'airIRG2RDT2StatusSuctionPressureMetric.{{ $index }}' descr: Suction Pressure - oid: airIRG2RDT2StatusDischargePressureMetric - num_oid: .1.3.6.1.4.1.318.1.1.13.4.5.2.1.21. + num_oid: '.1.3.6.1.4.1.318.1.1.13.4.5.2.1.21.{{ $index }}' index: 'airIRG2RDT2StatusDischargePressureMetric.{{ $index }}' descr: Discharge Pressure cooling: data: - oid: airIRG2RDT2StatusCoolOutput - num_oid: .1.3.6.1.4.1.318.1.1.13.4.5.2.1.2. + num_oid: '.1.3.6.1.4.1.318.1.1.13.4.5.2.1.2.{{ $index }}' index: 'airIRG2RDT2StatusCoolOutput.{{ $index }}' descr: Output multiplier: 100 - oid: airIRG2RDT2StatusCoolDemand - num_oid: .1.3.6.1.4.1.318.1.1.13.4.5.2.1.3. + num_oid: '.1.3.6.1.4.1.318.1.1.13.4.5.2.1.3.{{ $index }}' index: 'airIRG2RDT2StatusCoolDemand.{{ $index }}' descr: Demand multiplier: 100 diff --git a/includes/definitions/discovery/apsoluteos.yaml b/includes/definitions/discovery/apsoluteos.yaml index 5f41302a95..a6b8eb1465 100644 --- a/includes/definitions/discovery/apsoluteos.yaml +++ b/includes/definitions/discovery/apsoluteos.yaml @@ -11,6 +11,6 @@ modules: - oid: rsHWCPUTemperatureTable value: rsHWCPUTemperatureValue - num_oid: .1.3.6.1.4.1.89.35.1.165.1.2. + num_oid: '.1.3.6.1.4.1.89.35.1.165.1.2.{{ $index }}' descr: CPU {{ $index }} index: '{{ $index }}' diff --git a/includes/definitions/discovery/arris-c3.yaml b/includes/definitions/discovery/arris-c3.yaml index a4ba83e596..12c319d991 100644 --- a/includes/definitions/discovery/arris-c3.yaml +++ b/includes/definitions/discovery/arris-c3.yaml @@ -6,32 +6,32 @@ modules: - oid: dcxFPDTemp1Status divisor: 100 - num_oid: .1.3.6.1.4.1.4115.1.4.3.3.1.2.4. + num_oid: '.1.3.6.1.4.1.4115.1.4.3.3.1.2.4.{{ $index }}' descr: 'CPU card closest to the CPU' index: 'dcxFPDTemp1Status.{{ $index }}' - oid: dcxFPDTemp2Status divisor: 100 - num_oid: .1.3.6.1.4.1.4115.1.4.3.3.1.2.5. + num_oid: '.1.3.6.1.4.1.4115.1.4.3.3.1.2.5.{{ $index }}' descr: 'CPU card, on the right hand side.' index: 'dcxFPDTemp2Status.{{ $index }}' - oid: dcxFPDTemp3Status divisor: 100 - num_oid: .1.3.6.1.4.1.4115.1.4.3.3.1.2.6. + num_oid: '.1.3.6.1.4.1.4115.1.4.3.3.1.2.6.{{ $index }}' descr: 'Kanga, under Roo cards between RX4 and RX5.' index: 'dcxFPDTemp3Status.{{ $index }}' - oid: dcxFPDTemp4Status divisor: 100 - num_oid: .1.3.6.1.4.1.4115.1.4.3.3.1.2.7. + num_oid: '.1.3.6.1.4.1.4115.1.4.3.3.1.2.7.{{ $index }}' descr: 'Kanga, under Roo cards between RX2 and RX3.' index: 'dcxFPDTemp4Status.{{ $index }}' state: data: - oid: dcxFPDFan1Status - num_oid: .1.3.6.1.4.1.4115.1.4.3.3.1.2.8. + num_oid: '.1.3.6.1.4.1.4115.1.4.3.3.1.2.8.{{ $index }}' descr: 'Fan 1' index: 'dcxFPDFan1Status.{{ $index }}' state_name: dcxFPDFan1Status @@ -40,7 +40,7 @@ modules: - { descr: bad Rotating, graph: 0, value: 2, generic: 2 } - oid: dcxFPDFan2Status - num_oid: .1.3.6.1.4.1.4115.1.4.3.3.1.2.9. + num_oid: '.1.3.6.1.4.1.4115.1.4.3.3.1.2.9.{{ $index }}' descr: 'Fan 2' index: 'dcxFPDFan2Status.{{ $index }}' state_name: dcxFPDFan2Status @@ -49,7 +49,7 @@ modules: - { descr: bad Rotating, graph: 0, value: 2, generic: 2 } - oid: dcxFPDFan3Status - num_oid: .1.3.6.1.4.1.4115.1.4.3.3.1.2.10. + num_oid: '.1.3.6.1.4.1.4115.1.4.3.3.1.2.10.{{ $index }}' descr: 'Fan 3' index: 'dcxFPDFan3Status.{{ $index }}' state_name: dcxFPDFan3Status @@ -58,7 +58,7 @@ modules: - { descr: bad Rotating, graph: 0, value: 2, generic: 2 } - oid: dcxFPDFan4Status - num_oid: .1.3.6.1.4.1.4115.1.4.3.3.1.2.11. + num_oid: '.1.3.6.1.4.1.4115.1.4.3.3.1.2.11.{{ $index }}' descr: 'Fan 4' index: 'dcxFPDFan4Status.{{ $index }}' state_name: dcxFPDFan4Status @@ -67,7 +67,7 @@ modules: - { descr: bad Rotating, graph: 0, value: 2, generic: 2 } - oid: dcxFPDFan5Status - num_oid: .1.3.6.1.4.1.4115.1.4.3.3.1.2.12. + num_oid: '.1.3.6.1.4.1.4115.1.4.3.3.1.2.12.{{ $index }}' descr: 'Fan 5' index: 'dcxFPDFan5Status.{{ $index }}' state_name: dcxFPDFan5Status @@ -76,7 +76,7 @@ modules: - { descr: bad Rotating, graph: 0, value: 2, generic: 2 } - oid: dcxFPDFan6Status - num_oid: .1.3.6.1.4.1.4115.1.4.3.3.1.2.13. + num_oid: '.1.3.6.1.4.1.4115.1.4.3.3.1.2.13.{{ $index }}' descr: 'Fan 6' index: 'dcxFPDFan6Status.{{ $index }}' state_name: dcxFPDFan6Status @@ -85,7 +85,7 @@ modules: - { descr: bad Rotating, graph: 0, value: 2, generic: 2 } - oid: dcxFPDPowerStatus2 - num_oid: .1.3.6.1.4.1.4115.1.4.3.3.1.2.3. + num_oid: '.1.3.6.1.4.1.4115.1.4.3.3.1.2.3.{{ $index }}' descr: 'Power status' index: 'dcxFPDPowerStatus2.{{ $index }}' state_name: dcxFPDPowerStatus2 @@ -94,7 +94,7 @@ modules: - { descr: off, graph: 0, value: 2, generic: 2 } - oid: dcxFPDAttachedStatus - num_oid: .1.3.6.1.4.1.4115.1.4.3.3.1.2.1. + num_oid: '.1.3.6.1.4.1.4115.1.4.3.3.1.2.1.{{ $index }}' descr: 'Front panel' index: 'dcxFPDAttachedStatus.{{ $index }}' state_name: dcxFPDAttachedStatus diff --git a/includes/definitions/discovery/arubaos.yaml b/includes/definitions/discovery/arubaos.yaml index b4f0ec584f..a58447cfa4 100644 --- a/includes/definitions/discovery/arubaos.yaml +++ b/includes/definitions/discovery/arubaos.yaml @@ -8,5 +8,5 @@ modules: descr: 'Network Processor CPU{{ $index }}' - oid: WLSX-SYSTEMEXT-MIB::sysExtProcessorLoad.1 - num_oid: '.1.3.6.1.4.1.14823.2.2.1.2.1.13.1.3.1' + num_oid: '.1.3.6.1.4.1.14823.2.2.1.2.1.13.1.3.1.{{ $index }}' descr: 'Supervisor Card CPU' diff --git a/includes/definitions/discovery/avocent.yaml b/includes/definitions/discovery/avocent.yaml index ef12f7030f..445a163438 100644 --- a/includes/definitions/discovery/avocent.yaml +++ b/includes/definitions/discovery/avocent.yaml @@ -7,25 +7,25 @@ modules: data: - oid: pmPowerMgmtPDUTable - num_oid: .1.3.6.1.4.1.10418.17.2.5.3.1.70. + num_oid: '.1.3.6.1.4.1.10418.17.2.5.3.1.70.{{ $index }}' value: pmPowerMgmtPDUTableVoltageValue descr: PDU index: 'pmPowerMgmtPDUTableVoltageValue.{{ $index }}' - oid: pmPowerMgmtOutletsTable - num_oid: .1.3.6.1.4.1.10418.17.2.5.5.1.70. + num_oid: '.1.3.6.1.4.1.10418.17.2.5.5.1.70.{{ $index }}' value: pmPowerMgmtOutletsTableVoltageValue descr: 'Outlet {{ $pmPowerMgmtOutletsTableName }}' index: 'pmPowerMgmtOutletsTableName.{{ $index }}' - oid: pmPowerMgmtPhasesTable - num_oid: .1.3.6.1.4.1.10418.17.2.5.9.1.70. + num_oid: '.1.3.6.1.4.1.10418.17.2.5.9.1.70.{{ $index }}' value: pmPowerMgmtPhasesTableVoltageValue descr: 'Phase {{ $pmPowerMgmtPhasesTableName }}' index: 'pmPowerMgmtPhasesTableVoltageValue.{{ $index }}' - oid: pmPowerMgmtBanksTable - num_oid: .1.3.6.1.4.1.10418.17.2.5.11.1.70. + num_oid: '.1.3.6.1.4.1.10418.17.2.5.11.1.70.{{ $index }}' value: pmPowerMgmtBanksTableVoltageValue descr: 'Bank {{ $pmPowerMgmtBanksTableName }}' index: 'pmPowerMgmtBanksTableVoltageValue.{{ $index }}' @@ -36,25 +36,25 @@ modules: data: - oid: pmPowerMgmtPDUTable - num_oid: .1.3.6.1.4.1.10418.17.2.5.3.1.60. + num_oid: '.1.3.6.1.4.1.10418.17.2.5.3.1.60.{{ $index }}' value: pmPowerMgmtPDUTablePowerValue descr: PDU index: 'pmPowerMgmtPDUTablePowerValue.{{ $index }}' - oid: pmPowerMgmtOutletsTable - num_oid: .1.3.6.1.4.1.10418.17.2.5.5.1.60. + num_oid: '.1.3.6.1.4.1.10418.17.2.5.5.1.60.{{ $index }}' value: pmPowerMgmtOutletsTablePowerValue descr: 'Outlet {{ $pmPowerMgmtOutletsTableName }}' index: 'pmPowerMgmtOutletsTablePowerValue.{{ $index }}' - oid: pmPowerMgmtPhasesTable - num_oid: .1.3.6.1.4.1.10418.17.2.5.9.1.60. + num_oid: '.1.3.6.1.4.1.10418.17.2.5.9.1.60.{{ $index }}' value: pmPowerMgmtPhasesTablePowerValue descr: 'Phase {{ $pmPowerMgmtPhasesTableName }}' index: 'pmPowerMgmtPhasesTablePowerValue.{{ $index }}' - oid: pmPowerMgmtBanksTable - num_oid: .1.3.6.1.4.1.10418.17.2.5.11.1.60. + num_oid: '.1.3.6.1.4.1.10418.17.2.5.11.1.60.{{ $index }}' value: pmPowerMgmtBanksTablePowerValue descr: 'Bank {{ $pmPowerMgmtBanksTableName }}' index: ' pmPowerMgmtBanksTablePowerValue.{{ $index }}' @@ -65,7 +65,7 @@ modules: data: - oid: pmPowerMgmtPDUTable - num_oid: .1.3.6.1.4.1.10418.17.2.5.3.1.10.1 + num_oid: '.1.3.6.1.4.1.10418.17.2.5.3.1.10.{{ $index }}' value: pmPowerMgmtPDUTableCurrent1Value descr: Current #1 index: 'pmPowerMgmtPDUTableCurrent1Value.{{ $index }}' @@ -75,7 +75,7 @@ modules: high_limit: pmPowerMgmtPDUTableCurrentHighCritical - oid: pmPowerMgmtPDUTable - num_oid: .1.3.6.1.4.1.10418.17.2.5.3.1.12.1 + num_oid: '.1.3.6.1.4.1.10418.17.2.5.3.1.12.{{ $index }}' value: pmPowerMgmtPDUTableCurrent2Value descr: Current #2 index: 'pmPowerMgmtPDUTableCurrent2Value.{{ $index }}' @@ -85,7 +85,7 @@ modules: high_limit: pmPowerMgmtPDUTableCurrentHighCritical - oid: pmPowerMgmtPDUTable - num_oid: .1.3.6.1.4.1.10418.17.2.5.3.1.14.1 + num_oid: '.1.3.6.1.4.1.10418.17.2.5.3.1.14.{{ $index }}' value: pmPowerMgmtPDUTableCurrent3Value descr: Current #3 index: 'pmPowerMgmtPDUTableCurrent3Value.{{ $index }}' @@ -95,7 +95,7 @@ modules: high_limit: pmPowerMgmtPDUTableCurrentHighCritical - oid: pmPowerMgmtOutletsTable - num_oid: .1.3.6.1.4.1.10418.17.2.5.5.1.50. + num_oid: '.1.3.6.1.4.1.10418.17.2.5.5.1.50.{{ $index }}' value: pmPowerMgmtOutletsTableCurrentValue descr: 'Outlet {{ $pmPowerMgmtOutletsTableName }}' index: 'pmPowerMgmtOutletsTableCurrentValue.{{ $index }}' @@ -105,7 +105,7 @@ modules: high_limit: pmPowerMgmtOutletsTableCurrentHighCritical - oid: pmPowerMgmtPhasesTable - num_oid: .1.3.6.1.4.1.10418.17.2.5.9.1.50. + num_oid: '.1.3.6.1.4.1.10418.17.2.5.9.1.50.{{ $index }}' value: pmPowerMgmtPhasesTableCurrentValue descr: 'Phase {{ $pmPowerMgmtPhasesTableName }}' index: 'pmPowerMgmtPhasesTableCurrentValue.{{ $index }}' @@ -115,7 +115,7 @@ modules: high_limit: pmPowerMgmtPhasesTableCurrentHighCritical - oid: pmPowerMgmtBanksTable - num_oid: .1.3.6.1.4.1.10418.17.2.5.11.1.50. + num_oid: '.1.3.6.1.4.1.10418.17.2.5.11.1.50.{{ $index }}' value: pmPowerMgmtBanksTableCurrentValue descr: 'Bank {{ $pmPowerMgmtBanksTableName }}' index: ' pmPowerMgmtBanksTableCurrentValue.{{ $index }}' @@ -130,19 +130,19 @@ modules: data: - oid: pmPowerMgmtPDUTable - num_oid: .1.3.6.1.4.1.10418.17.2.5.3.1.17. + num_oid: '.1.3.6.1.4.1.10418.17.2.5.3.1.17.{{ $index }}' value: pmPowerMgmtPDUTableTemperature1Value descr: Temp #1 index: 'pmPowerMgmtPDUTableTemperature1Value.{{ $index }}' - oid: pmPowerMgmtPDUTable - num_oid: .1.3.6.1.4.1.10418.17.2.5.3.1.19. + num_oid: '.1.3.6.1.4.1.10418.17.2.5.3.1.19.{{ $index }}' value: pmPowerMgmtPDUTableTemperature2Value descr: Temp #2 index: 'pmPowerMgmtPDUTableTemperature2Value.{{ $index }}' - oid: pmPowerMgmtPDUTable - num_oid: .1.3.6.1.4.1.10418.17.2.5.3.1.19. + num_oid: '.1.3.6.1.4.1.10418.17.2.5.3.1.19.{{ $index }}' value: pmPowerMgmtPDUTableTemperature3Value descr: Temp #3 index: 'pmPowerMgmtPDUTableTemperature3Value.{{ $index }}' @@ -150,7 +150,7 @@ modules: data: - oid: pmPowerMgmtPDUTable - num_oid: .1.3.6.1.4.1.10418.17.2.5.3.1.45. + num_oid: '.1.3.6.1.4.1.10418.17.2.5.3.1.45.{{ $index }}' value: pmPowerMgmtPDUTableAlarm descr: PDU index: 'pmPowerMgmtPDUTableAlarm.{{ $index }}' @@ -165,7 +165,7 @@ modules: - { value: 7, generic: 2, graph: 1, descr: low-critical } - oid: pmPowerMgmtOutletsTable - num_oid: .1.3.6.1.4.1.10418.17.2.5.5.1.45. + num_oid: '.1.3.6.1.4.1.10418.17.2.5.5.1.45.{{ $index }}' value: pmPowerMgmtOutletsTableAlarm descr: 'Outlet {{ $pmPowerMgmtOutletsTableName }}' index: 'pmPowerMgmtOutletsTableAlarm.{{ $index }}' @@ -180,7 +180,7 @@ modules: - { value: 7, generic: 2, graph: 1, descr: low-critical } - oid: pmPowerMgmtPhasesTable - num_oid: .1.3.6.1.4.1.10418.17.2.5.9.1.45. + num_oid: '.1.3.6.1.4.1.10418.17.2.5.9.1.45.{{ $index }}' value: pmPowerMgmtPhasesTableAlarm descr: 'Phase {{ $pmPowerMgmtPhasesTableName }}' index: 'pmPowerMgmtPhasesTableAlarm.{{ $index }}' @@ -195,7 +195,7 @@ modules: - { value: 7, generic: 2, graph: 1, descr: low-critical } - oid: pmPowerMgmtBanksTable - num_oid: .1.3.6.1.4.1.10418.17.2.5.11.1.45. + num_oid: '.1.3.6.1.4.1.10418.17.2.5.11.1.45.{{ $index }}' value: pmPowerMgmtBanksTableAlarm descr: 'Bank {{ $pmPowerMgmtBanksTableName }}' index: 'pmPowerMgmtBanksTableAlarm.{{ $index }}' @@ -207,4 +207,4 @@ modules: - { value: 4, generic: 2, graph: 1, descr: high-critical } - { value: 5, generic: 1, graph: 1, descr: high-warning } - { value: 6, generic: 1, graph: 1, descr: low-warning } - - { value: 7, generic: 2, graph: 1, descr: low-critical } \ No newline at end of file + - { value: 7, generic: 2, graph: 1, descr: low-critical } diff --git a/includes/definitions/discovery/avtech.yaml b/includes/definitions/discovery/avtech.yaml index aa59c0667e..36c189f5fc 100644 --- a/includes/definitions/discovery/avtech.yaml +++ b/includes/definitions/discovery/avtech.yaml @@ -7,114 +7,114 @@ modules: data: - # RoomAlert 3E internal oid: .1.3.6.1.4.1.20916.1.9.1.1.1.1.0 - num_oid: .1.3.6.1.4.1.20916.1.9.1.1.1.1. + num_oid: '.1.3.6.1.4.1.20916.1.9.1.1.1.1.{{ $index }}' index: 0 descr: .1.3.6.1.4.1.20916.1.9.1.1.1.3.0 - # RoomAlert 3E sen1 oid: .1.3.6.1.4.1.20916.1.9.1.1.2.1.0 - num_oid: .1.3.6.1.4.1.20916.1.9.1.1.2.1. + num_oid: '.1.3.6.1.4.1.20916.1.9.1.1.2.1.{{ $index }}' index: 1 descr: .1.3.6.1.4.1.20916.1.9.1.1.2.6.0 - # RoomAlert 4E internal oid: .1.3.6.1.4.1.20916.1.6.1.1.1.2.0 - num_oid: .1.3.6.1.4.1.20916.1.6.1.1.1.2. + num_oid: '.1.3.6.1.4.1.20916.1.6.1.1.1.2.{{ $index }}' divisor: 1 index: 0 descr: .1.3.6.1.4.1.20916.1.6.1.1.2.1.0 - # RoomAlert 4E sen1 oid: .1.3.6.1.4.1.20916.1.6.1.2.2.1.0 - num_oid: .1.3.6.1.4.1.20916.1.6.1.2.2.1. + num_oid: '.1.3.6.1.4.1.20916.1.6.1.2.2.1.{{ $index }}' divisor: 1 index: 1 descr: .1.3.6.1.4.1.20916.1.6.1.2.1.6.0 - # RoomAlert 4E sen2 oid: .1.3.6.1.4.1.20916.1.6.1.2.2.1.0 - num_oid: .1.3.6.1.4.1.20916.1.6.1.2.2.1. + num_oid: '.1.3.6.1.4.1.20916.1.6.1.2.2.1.{{ $index }}' divisor: 1 index: 2 descr: .1.3.6.1.4.1.20916.1.6.1.2.2.6.0 - # RoomAlert 11E sensor 2 oid: .1.3.6.1.4.1.20916.1.3.1.2.1.0 - num_oid: .1.3.6.1.4.1.20916.1.3.1.2.1. + num_oid: '.1.3.6.1.4.1.20916.1.3.1.2.1.{{ $index }}' divisor: 1 index: 2 descr: .1.3.6.1.4.1.20916.1.3.1.2.6.0 - # RoomAlert 11E sensor 3 oid: .1.3.6.1.4.1.20916.1.3.1.3.1.0 - num_oid: .1.3.6.1.4.1.20916.1.3.1.3.1. + num_oid: '.1.3.6.1.4.1.20916.1.3.1.3.1.{{ $index }}' divisor: 1 index: 3 descr: .1.3.6.1.4.1.20916.1.3.1.3.6.0 - # RoomAlert 11E sensor 4 oid: .1.3.6.1.4.1.20916.1.3.1.4.1.0 - num_oid: .1.3.6.1.4.1.20916.1.3.1.4.1. + num_oid: '.1.3.6.1.4.1.20916.1.3.1.4.1.{{ $index }}' divisor: 1 index: 4 descr: .1.3.6.1.4.1.20916.1.3.1.4.6.0 - # RoomAlert 32E/W internal temp oid: .1.3.6.1.4.1.20916.1.8.1.1.1.2.0 - num_oid: .1.3.6.1.4.1.20916.1.8.1.1.1.2. + num_oid: '.1.3.6.1.4.1.20916.1.8.1.1.1.2.{{ $index }}' index: 0 descr: Internal Temperature - # RoomAlert 32E/W internal heat oid: .1.3.6.1.4.1.20916.1.8.1.1.4.2.0 - num_oid: .1.3.6.1.4.1.20916.1.8.1.1.4.2. + num_oid: '.1.3.6.1.4.1.20916.1.8.1.1.4.2.{{ $index }}' index: 1 descr: Internal Heat Index - # RoomAlert 32E/W ext temp oid: ra32-ext-temp - num_oid: .1.3.6.1.4.1.20916.1.8.1.2. + num_oid: '.1.3.6.1.4.1.20916.1.8.1.2.{{ $index }}' value: value descr: Sensor {{ $id }} - # RoomAlert 32W wish temp oid: ra32-wish-temp - num_oid: .1.3.6.1.4.1.20916.1.8.1.4. + num_oid: '.1.3.6.1.4.1.20916.1.8.1.4.{{ $index }}' value: value descr: WiSH {{ $id }} Internal - # TemPageR 3E internal oid: .1.3.6.1.4.1.20916.1.7.1.1.1.1.0 - num_oid: .1.3.6.1.4.1.20916.1.7.1.1.1.1. + num_oid: '.1.3.6.1.4.1.20916.1.7.1.1.1.1.{{ $index }}' index: 0 descr: .1.3.6.1.4.1.20916.1.7.1.1.2.0 - # TemPageR 3E sen1 oid: .1.3.6.1.4.1.20916.1.7.1.2.1.1.0 - num_oid: .1.3.6.1.4.1.20916.1.7.1.2.1.1. + num_oid: '.1.3.6.1.4.1.20916.1.7.1.2.1.1.{{ $index }}' index: 1 descr: .1.3.6.1.4.1.20916.1.7.1.2.1.3.0 - # TemPageR 3E sen2 oid: .1.3.6.1.4.1.20916.1.7.1.2.2.1.0 - num_oid: .1.3.6.1.4.1.20916.1.7.1.2.2.1. + num_oid: '.1.3.6.1.4.1.20916.1.7.1.2.2.1.{{ $index }}' index: 2 descr: .1.3.6.1.4.1.20916.1.7.1.2.2.3.0 - # TemPageR 4E internal oid: .1.3.6.1.4.1.20916.1.1.1.1.1.0 - num_oid: .1.3.6.1.4.1.20916.1.1.1.1.1. + num_oid: '.1.3.6.1.4.1.20916.1.1.1.1.1.{{ $index }}' index: 0 descr: Internal high_limit: .1.3.6.1.4.1.20916.1.1.3.1.0 low_limit: .1.3.6.1.4.1.20916.1.1.3.2.0 - # TemPageR 4E sen1 oid: .1.3.6.1.4.1.20916.1.1.1.1.2.0 - num_oid: .1.3.6.1.4.1.20916.1.1.1.1.2. + num_oid: '.1.3.6.1.4.1.20916.1.1.1.1.2.{{ $index }}' index: 1 descr: Sensor 1 high_limit: .1.3.6.1.4.1.20916.1.1.3.3.0 low_limit: .1.3.6.1.4.1.20916.1.1.3.4.0 - # TemPageR 4E sen2 oid: .1.3.6.1.4.1.20916.1.1.1.1.3.0 - num_oid: .1.3.6.1.4.1.20916.1.1.1.1.3. + num_oid: '.1.3.6.1.4.1.20916.1.1.1.1.3.{{ $index }}' index: 2 descr: Sensor 2 high_limit: .1.3.6.1.4.1.20916.1.1.3.5.0 low_limit: .1.3.6.1.4.1.20916.1.1.3.6.0 - # TemPageR 4E sen3 oid: .1.3.6.1.4.1.20916.1.1.1.1.4.0 - num_oid: .1.3.6.1.4.1.20916.1.1.1.1.4. + num_oid: '.1.3.6.1.4.1.20916.1.1.1.1.4.{{ $index }}' index: 3 descr: Sensor 3 high_limit: .1.3.6.1.4.1.20916.1.1.3.7.0 @@ -125,14 +125,14 @@ modules: data: - # RoomAlert 32E/W oid: .1.3.6.1.4.1.20916.1.8.1.1.2.1.0 - num_oid: .1.3.6.1.4.1.20916.1.8.1.1.2.1. + num_oid: '.1.3.6.1.4.1.20916.1.8.1.1.2.1.{{ $index }}' index: 0 descr: Internal Humidity voltage: data: - # RoomAlert 32E/W analog oid: ra32-analog - num_oid: .1.3.6.1.4.1.20916.1.8.1.1.5. + num_oid: '.1.3.6.1.4.1.20916.1.8.1.1.5.{{ $index }}' value: value low_limit: 0 high_limit: 5 @@ -141,7 +141,7 @@ modules: data: - # RoomAlert 3E switch oid: .1.3.6.1.4.1.20916.1.9.1.2.1.0 - num_oid: .1.3.6.1.4.1.20916.1.9.1.2.1. + num_oid: '.1.3.6.1.4.1.20916.1.9.1.2.1.{{ $index }}' index: 0 descr: .1.3.6.1.4.1.20916.1.9.1.2.2.0 states: @@ -150,7 +150,7 @@ modules: - # RoomAlert 4E switch oid: .1.3.6.1.4.1.20916.1.6.1.3.1.0 - num_oid: .1.3.6.1.4.1.20916.1.6.1.3.1. + num_oid: '.1.3.6.1.4.1.20916.1.6.1.3.1.{{ $index }}' index: 0 descr: .1.3.6.1.4.1.20916.1.6.1.3.2.0 state_name: switch @@ -160,7 +160,7 @@ modules: - # RoomAlert 32E/W power oid: .1.3.6.1.4.1.20916.1.8.1.1.3.1.0 - num_oid: .1.3.6.1.4.1.20916.1.8.1.1.3.1. + num_oid: '.1.3.6.1.4.1.20916.1.8.1.1.3.1.{{ $index }}' index: 0 descr: Power Source state_name: power @@ -170,7 +170,7 @@ modules: - # RoomAlert 32E/W relays oid: ra32-relay value: value - num_oid: .1.3.6.1.4.1.20916.1.8.1.1.6. + num_oid: '.1.3.6.1.4.1.20916.1.8.1.1.6.{{ $index }}' descr: Relay {{ $id }} state_name: relay states: @@ -179,7 +179,7 @@ modules: - # RoomAlert 32E/W switches oid: ra32-switch value: value - num_oid: .1.3.6.1.4.1.20916.1.8.1.3. + num_oid: '.1.3.6.1.4.1.20916.1.8.1.3.{{ $index }}' descr: Switch {{ $id }} state_name: switch states: diff --git a/includes/definitions/discovery/awplus.yaml b/includes/definitions/discovery/awplus.yaml index e87dc99ae5..0b7ee459b4 100644 --- a/includes/definitions/discovery/awplus.yaml +++ b/includes/definitions/discovery/awplus.yaml @@ -15,7 +15,7 @@ modules: - oid: atEnvMonv2FanTable value: atEnvMonv2FanCurrentSpeed - num_oid: .1.3.6.1.4.1.207.8.4.4.3.12.1.1.5. + num_oid: '.1.3.6.1.4.1.207.8.4.4.3.12.1.1.5.{{ $index }}' descr: atEnvMonv2FanDescription index: 'atEnvMonv2FanIndex.{{ $index }}' low_limit: atEnvMonv2FanLowerThreshold @@ -24,7 +24,7 @@ modules: - oid: atEnvMonv2VoltageTable value: atEnvMonv2VoltageCurrent - num_oid: .1.3.6.1.4.1.207.8.4.4.3.12.2.1.5. + num_oid: '.1.3.6.1.4.1.207.8.4.4.3.12.2.1.5.{{ $index }}' descr: atEnvMonv2VoltageDescription index: 'atEnvMonv2VoltageIndex.{{ $index }}' divisor: 1000 @@ -37,7 +37,7 @@ modules: - oid: atEnvMonv2TemperatureTable value: atEnvMonv2TemperatureCurrent - num_oid: .1.3.6.1.4.1.207.8.4.4.3.12.3.1.5. + num_oid: '.1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.{{ $index }}' descr: atEnvMonv2TemperatureDescription index: 'atEnvMonv2TemperatureIndex.{{ $index }}' high_limit: atEnvMonv2TemperatureUpperThreshold @@ -46,7 +46,7 @@ modules: - oid: atEnvMonv2FanTable value: atEnvMonv2FanStatus - num_oid: .1.3.6.1.4.1.207.8.4.4.3.12.1.1.7. + num_oid: '.1.3.6.1.4.1.207.8.4.4.3.12.1.1.7.{{ $index }}' descr: atEnvMonv2FanDescription index: 'atEnvMonv2FanIndex.{{ $index }}' state_name: 'AtFanState' @@ -57,7 +57,7 @@ modules: - oid: atEnvMonv2VoltageTable value: atEnvMonv2VoltageStatus - num_oid: .1.3.6.1.4.1.207.8.4.4.3.12.2.1.8. + num_oid: '.1.3.6.1.4.1.207.8.4.4.3.12.2.1.8.{{ $index }}' descr: atEnvMonv2VoltageDescription index: 'atEnvMonv2VoltageIndex.{{ $index }}' state_name: 'AtVoltageState' @@ -68,7 +68,7 @@ modules: - oid: atEnvMonv2TemperatureTable value: atEnvMonv2TemperatureStatus - num_oid: .1.3.6.1.4.1.207.8.4.4.3.12.3.1.7. + num_oid: '.1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.{{ $index }}' descr: atEnvMonv2TemperatureDescription index: 'atEnvMonv2TemperatureIndex.{{ $index }}' state_name: 'AtTemperatureState' @@ -79,7 +79,7 @@ modules: - oid: atEnvMonv2PsbSensorTable value: atEnvMonv2PsbSensorStatus - num_oid: .1.3.6.1.4.1.207.8.4.4.3.12.4.2.1.6. + num_oid: '.1.3.6.1.4.1.207.8.4.4.3.12.4.2.1.6.{{ $index }}' descr: atEnvMonv2PsbSensorDescription index: 'atEnvMonv2PsbSensorIndex.{{ $index }}' state_name: 'AtPowerSupplyState' diff --git a/includes/definitions/discovery/cimc.yaml b/includes/definitions/discovery/cimc.yaml index 9b0115a90b..54cee5e03a 100644 --- a/includes/definitions/discovery/cimc.yaml +++ b/includes/definitions/discovery/cimc.yaml @@ -6,7 +6,7 @@ modules: - oid: cucsComputeMbPowerStatsTable value: cucsComputeMbPowerStatsInputCurrent - num_oid: .1.3.6.1.4.1.9.9.719.1.9.14.1.8. + num_oid: '.1.3.6.1.4.1.9.9.719.1.9.14.1.8.{{ $index }}' descr: MB Input Current index: 'mb-input-current' voltage: @@ -14,7 +14,7 @@ modules: - oid: cucsComputeMbPowerStatsTable value: cucsComputeMbPowerStatsInputVoltage - num_oid: .1.3.6.1.4.1.9.9.719.1.9.14.1.12. + num_oid: '.1.3.6.1.4.1.9.9.719.1.9.14.1.12.{{ $index }}' descr: MB Input Voltage index: 'mb-input-voltage' power: @@ -22,7 +22,7 @@ modules: - oid: cucsComputeMbPowerStatsTable value: cucsComputeMbPowerStatsConsumedPower - num_oid: .1.3.6.1.4.1.9.9.719.1.9.14.1.4. + num_oid: '.1.3.6.1.4.1.9.9.719.1.9.14.1.4.{{ $index }}' descr: MB Input Power index: 'mb-input-power' temperature: @@ -30,44 +30,44 @@ modules: - oid: cucsComputeRackUnitMbTempStatsTable value: cucsComputeRackUnitMbTempStatsAmbientTemp - num_oid: .1.3.6.1.4.1.9.9.719.1.9.44.1.4. + num_oid: '.1.3.6.1.4.1.9.9.719.1.9.44.1.4.{{ $index }}' descr: 'Rack Unit Ambient Temperature' index: 'ambient.{{ $index }}' - oid: cucsComputeRackUnitMbTempStatsTable value: cucsComputeRackUnitMbTempStatsIoh1Temp - num_oid: .1.3.6.1.4.1.9.9.719.1.9.44.1.13. + num_oid: '.1.3.6.1.4.1.9.9.719.1.9.44.1.13.{{ $index }}' descr: 'IO Hub 1 Temperature' index: 'ioh1.{{ $index }}' - oid: cucsComputeRackUnitMbTempStatsTable value: cucsComputeRackUnitMbTempStatsIoh2Temp - num_oid: .1.3.6.1.4.1.9.9.719.1.9.44.1.17. + num_oid: '.1.3.6.1.4.1.9.9.719.1.9.44.1.17.{{ $index }}' descr: 'IO Hub 2 Temperature' index: 'ioh2.{{ $index }}' - oid: cucsComputeRackUnitMbTempStatsTable value: cucsComputeRackUnitMbTempStatsFrontTemp - num_oid: .1.3.6.1.4.1.9.9.719.1.9.44.1.8. + num_oid: '.1.3.6.1.4.1.9.9.719.1.9.44.1.8.{{ $index }}' descr: 'Rack Unit Front Temperature' index: 'front.{{ $index }}' - oid: cucsComputeRackUnitMbTempStatsTable value: cucsComputeRackUnitMbTempStatsRearTemp - num_oid: .1.3.6.1.4.1.9.9.719.1.9.44.1.21. + num_oid: '.1.3.6.1.4.1.9.9.719.1.9.44.1.21.{{ $index }}' descr: 'Rack Unit Rear Temperature' index: 'rear.{{ $index }}' - oid: cucsMemoryUnitEnvStatsTable value: cucsMemoryUnitEnvStatsTemperature - num_oid: .1.3.6.1.4.1.9.9.719.1.30.12.1.6. + num_oid: '.1.3.6.1.4.1.9.9.719.1.30.12.1.6.{{ $index }}' warn_limit: 40 descr: 'Memory {{ $index }} Temperature' index: 'mem.{{ $index }}' - oid: cucsProcessorEnvStatsTable value: cucsProcessorEnvStatsTemperature - num_oid: .1.3.6.1.4.1.9.9.719.1.41.2.1.10. + num_oid: '.1.3.6.1.4.1.9.9.719.1.41.2.1.10.{{ $index }}' warn_limit: 40 descr: 'CPU {{ $index }} Temperature' index: 'cpu.{{ $index }}' diff --git a/includes/definitions/discovery/cmm.yaml b/includes/definitions/discovery/cmm.yaml index 9b0511b2ab..23f8901b03 100644 --- a/includes/definitions/discovery/cmm.yaml +++ b/includes/definitions/discovery/cmm.yaml @@ -5,9 +5,9 @@ modules: - oid: CMM3-MIB::powerStatus value: powerStatus - num_oid: .1.3.6.1.4.1.161.19.3.4.4.1.1.5. + num_oid: '.1.3.6.1.4.1.161.19.3.4.4.1.1.5.{{ $index }}' index: powerStatus.{{ $index }} descr: Power Status {{ $index }} states: - { value: 0, generic: 2, graph: 1, descr: Power Off } - - { value: 1, generic: 0, graph: 1, descr: Power On } \ No newline at end of file + - { value: 1, generic: 0, graph: 1, descr: Power On } diff --git a/includes/definitions/discovery/cmm4.yaml b/includes/definitions/discovery/cmm4.yaml index 085b3dbedb..c0f071dd58 100644 --- a/includes/definitions/discovery/cmm4.yaml +++ b/includes/definitions/discovery/cmm4.yaml @@ -5,10 +5,10 @@ modules: - oid: CMM4-MIB::cmm4PortPowerStatus value: cmm4PortPowerStatus - num_oid: .1.3.6.1.4.1.161.19.3.6.3.1.1.4. + num_oid: '.1.3.6.1.4.1.161.19.3.6.3.1.1.4.{{ $index }}' index: cmm4PortPowerStatus.{{ $index }} descr: Power Status {{ $index }} states: - { value: -1, generic: 1, graph: 1, descr: POE Fault } - { value: 0, generic: 2, graph: 1, descr: Power Off } - - { value: 1, generic: 0, graph: 1, descr: Power On } \ No newline at end of file + - { value: 1, generic: 0, graph: 1, descr: Power On } diff --git a/includes/definitions/discovery/cnos.yaml b/includes/definitions/discovery/cnos.yaml index f476fa2d2b..1b8fc741b3 100644 --- a/includes/definitions/discovery/cnos.yaml +++ b/includes/definitions/discovery/cnos.yaml @@ -6,7 +6,7 @@ modules: - oid: lenovoEnvMibPowerSupplyEntry value: lenovoEnvMibPowerSupplyState - num_oid: .1.3.6.1.4.1.19046.2.3.11.1.1.1.5. + num_oid: '.1.3.6.1.4.1.19046.2.3.11.1.1.1.5.{{ $index }}' descr: 'PS{{ $lenovoEnvMibPowerSupplyID }}' index: 'lenovoEnvMibPowerSupplyState.{{ $index }}' states: @@ -18,7 +18,7 @@ modules: - oid: lenovoEnvMibFanEntry value: lenovoEnvMibFanState - num_oid: .1.3.6.1.4.1.19046.2.3.11.1.2.1.1.5. + num_oid: '.1.3.6.1.4.1.19046.2.3.11.1.2.1.1.5.{{ $index }}' descr: lenovoEnvMibFanName index: 'lenovoEnvMibFanState.{{ $index }}' states: @@ -29,7 +29,7 @@ modules: - oid: lenovoEnvMibTempSensorEntry value: lenovoEnvMibTempSensorState - num_oid: .1.3.6.1.4.1.19046.2.3.11.1.3.1.1.5. + num_oid: '.1.3.6.1.4.1.19046.2.3.11.1.3.1.1.5.{{ $index }}' descr: lenovoEnvMibTempSensorDesc index: 'lenovoEnvMibTempSensorState.{{ $index }}' states: @@ -41,7 +41,7 @@ modules: - oid: lenovoEnvMibFanEntry value: lenovoEnvMibFanSpeedRPM - num_oid: .1.3.6.1.4.1.19046.2.3.11.1.2.1.8. + num_oid: '.1.3.6.1.4.1.19046.2.3.11.1.2.1.8.{{ $index }}' index: 'lenovoEnvMibFanSpeedRPM.{{ $index }}' descr: lenovoEnvMibFanName @@ -50,6 +50,6 @@ modules: - oid: lenovoEnvMibTempSensorEntry value: lenovoEnvMibTempSensorTemperature - num_oid: .1.3.6.1.4.1.19046.2.3.11.1.3.1.6. + num_oid: '.1.3.6.1.4.1.19046.2.3.11.1.3.1.6.{{ $index }}' index: 'lenovoEnvTempSensorTemperature.{{ $index }}' descr: lenovoEnvMibTempSensorName diff --git a/includes/definitions/discovery/comware.yaml b/includes/definitions/discovery/comware.yaml index 281f3ab7ed..5bb0651707 100644 --- a/includes/definitions/discovery/comware.yaml +++ b/includes/definitions/discovery/comware.yaml @@ -10,7 +10,7 @@ modules: - oid: hh3cdevMFanStatusTable value: hh3cDevMFanStatus - num_oid: .1.3.6.1.4.1.25506.8.35.9.1.1.1.2. + num_oid: '.1.3.6.1.4.1.25506.8.35.9.1.1.1.2.{{ $index }}' descr: 'Fan {{ $index }}' index: '{{ $index }}' states: @@ -21,7 +21,7 @@ modules: - oid: hh3cdevMPowerStatusTable value: hh3cDevMPowerStatus - num_oid: .1.3.6.1.4.1.25506.8.35.9.1.2.1.2. + num_oid: '.1.3.6.1.4.1.25506.8.35.9.1.2.1.2.{{ $index }}' descr: 'Power Supply {{ $index }}' index: '{{ $index }}' states: @@ -34,7 +34,7 @@ modules: - oid: hh3cEntityExtPowerEntry value: hh3cEntityExtCurrentPower - num_oid: .1.3.6.1.4.1.25506.2.6.1.3.1.1.3. + num_oid: '.1.3.6.1.4.1.25506.2.6.1.3.1.1.3.{{ $index }}' descr: '{{ $entPhysicalName }} Power Usage' index: 'hh3cEntityExtCurrentPower.{{ $index }}' divisor: 1000 diff --git a/includes/definitions/discovery/ctm.yaml b/includes/definitions/discovery/ctm.yaml index e583f77988..6c9adcae43 100644 --- a/includes/definitions/discovery/ctm.yaml +++ b/includes/definitions/discovery/ctm.yaml @@ -5,28 +5,28 @@ modules: data: - oid: pwrP - num_oid: .1.3.6.1.4.1.25868.1.6. + num_oid: '.1.3.6.1.4.1.25868.1.6.{{ $index }}' descr: 'Master Primary Power' states: - { descr: Power OK, graph: 0, value: 1, generic: 0 } - { descr: Power off or Low, graph: 0, value: 0, generic: 2 } - oid: pwrS - num_oid: .1.3.6.1.4.1.25868.1.7. + num_oid: '.1.3.6.1.4.1.25868.1.7.{{ $index }}' descr: 'Master Secondary Power' states: - { descr: Power OK, graph: 0, value: 1, generic: 0 } - { descr: Power off or Low, graph: 0, value: 0, generic: 2 } - oid: pwrSP - num_oid: .1.3.6.1.4.1.25868.1.23. + num_oid: '.1.3.6.1.4.1.25868.1.23.{{ $index }}' descr: 'Slave Primary Power' states: - { descr: Power OK, graph: 0, value: 1, generic: 0 } - { descr: Power off or Low, graph: 0, value: 0, generic: 2 } - oid: pwrSS - num_oid: .1.3.6.1.4.1.25868.1.24. + num_oid: '.1.3.6.1.4.1.25868.1.24.{{ $index }}' descr: 'Slave Secondary Power' states: - { descr: Power OK, graph: 0, value: 1, generic: 0 } @@ -38,29 +38,29 @@ modules: data: - oid: voltsM1 - num_oid: .1.3.6.1.4.1.25868.1.10. + num_oid: '.1.3.6.1.4.1.25868.1.10.{{ $index }}' descr: 'Master Primary Voltage' index: portPwrM1.0 - oid: voltsM2 - num_oid: .1.3.6.1.4.1.25868.1.11. + num_oid: '.1.3.6.1.4.1.25868.1.11.{{ $index }}' descr: 'Master Secondary Voltage' index: portPwrM2.0 - oid: voltsS1 - num_oid: .1.3.6.1.4.1.25868.1.27. + num_oid: '.1.3.6.1.4.1.25868.1.27.{{ $index }}' descr: 'Slave Primary Voltage' index: portPwrS1.0 - oid: voltsS2 - num_oid: .1.3.6.1.4.1.25868.1.28. + num_oid: '.1.3.6.1.4.1.25868.1.28.{{ $index }}' descr: 'Slave Secondary Voltage' index: portPwrS2.0 temperature: data: - oid: tempC - num_oid: .1.3.6.1.4.1.25868.1.9. + num_oid: '.1.3.6.1.4.1.25868.1.9.{{ $index }}' index: tempC.0 descr: 'Temperature' power: @@ -69,81 +69,81 @@ modules: data: - oid: portPwrM1 - num_oid: .1.3.6.1.4.1.25868.1.14. + num_oid: '.1.3.6.1.4.1.25868.1.14.{{ $index }}' descr: 'Port Power Master 1' index: portPwrM1.0 - oid: portPwrM2 - num_oid: .1.3.6.1.4.1.25868.1.15. + num_oid: '.1.3.6.1.4.1.25868.1.15.{{ $index }}' descr: 'Port Power Master 2' index: portPwrM2.0 - oid: portPwrM3 - num_oid: .1.3.6.1.4.1.25868.1.16. + num_oid: '.1.3.6.1.4.1.25868.1.16.{{ $index }}' descr: 'Port Power Master 3' index: portPwrM3.0 - oid: portPwrM4 - num_oid: .1.3.6.1.4.1.25868.1.17. + num_oid: '.1.3.6.1.4.1.25868.1.17.{{ $index }}' descr: 'Port Power Master 4' index: portPwrM4.0 - oid: portPwrM5 - num_oid: .1.3.6.1.4.1.25868.1.18. + num_oid: '.1.3.6.1.4.1.25868.1.18.{{ $index }}' descr: 'Port Power Master 5' index: portPwrM5.0 - oid: portPwrM6 - num_oid: .1.3.6.1.4.1.25868.1.19. + num_oid: '.1.3.6.1.4.1.25868.1.19.{{ $index }}' descr: 'Port Power Master 6' index: portPwrM6.0 - oid: portPwrM7 - num_oid: .1.3.6.1.4.1.25868.1.20. + num_oid: '.1.3.6.1.4.1.25868.1.20.{{ $index }}' descr: 'Port Power Master 7' index: portPwrM7.0 - oid: portPwrM8 - num_oid: .1.3.6.1.4.1.25868.1.21. + num_oid: '.1.3.6.1.4.1.25868.1.21.{{ $index }}' descr: 'Port Power Master 8' index: portPwrM8.0 - oid: portPwrS1 - num_oid: .1.3.6.1.4.1.25868.1.31. + num_oid: '.1.3.6.1.4.1.25868.1.31.{{ $index }}' descr: 'Port Power Slave 1' index: portPwrS1.0 - oid: portPwrS2 - num_oid: .1.3.6.1.4.1.25868.1.32. + num_oid: '.1.3.6.1.4.1.25868.1.32.{{ $index }}' descr: 'Port Power Slave 2' index: portPwrS2.0 - oid: portPwrS3 - num_oid: .1.3.6.1.4.1.25868.1.33. + num_oid: '.1.3.6.1.4.1.25868.1.33.{{ $index }}' descr: 'Port Power Slave 3' index: portPwrS3.0 - oid: portPwrS4 - num_oid: .1.3.6.1.4.1.25868.1.34. + num_oid: '.1.3.6.1.4.1.25868.1.34.{{ $index }}' descr: 'Port Power Slave 4' index: portPwrS4.0 - oid: portPwrS5 - num_oid: .1.3.6.1.4.1.25868.1.35. + num_oid: '.1.3.6.1.4.1.25868.1.35.{{ $index }}' descr: 'Port Power Slave 5' index: portPwrS5.0 - oid: portPwrS6 - num_oid: .1.3.6.1.4.1.25868.1.36. + num_oid: '.1.3.6.1.4.1.25868.1.36.{{ $index }}' descr: 'Port Power Slave 6' index: portPwrS6.0 - oid: portPwrS7 - num_oid: .1.3.6.1.4.1.25868.1.37. + num_oid: '.1.3.6.1.4.1.25868.1.37.{{ $index }}' descr: 'Port Power Slave 7' index: portPwrS7.0 - oid: portPwrS8 - num_oid: .1.3.6.1.4.1.25868.1.38. + num_oid: '.1.3.6.1.4.1.25868.1.38.{{ $index }}' descr: 'Port Power Slave 8' index: portPwrS8.0 diff --git a/includes/definitions/discovery/cxr-ts.yaml b/includes/definitions/discovery/cxr-ts.yaml index 80cb5043cf..fc41fb75bd 100644 --- a/includes/definitions/discovery/cxr-ts.yaml +++ b/includes/definitions/discovery/cxr-ts.yaml @@ -6,7 +6,7 @@ modules: - oid: system value: ftpdService - num_oid: .1.3.6.1.4.1.1425.1040.1.8. + num_oid: '.1.3.6.1.4.1.1425.1040.1.8.{{ $index }}' descr: FTP Service state_name: ftpdService states: @@ -15,7 +15,7 @@ modules: - oid: system value: httpdService - num_oid: .1.3.6.1.4.1.1425.1040.1.9. + num_oid: '.1.3.6.1.4.1.1425.1040.1.9.{{ $index }}' descr: HTTP Service state_name: httpdService states: @@ -24,7 +24,7 @@ modules: - oid: system value: telnetdService - num_oid: .1.3.6.1.4.1.1425.1040.1.10. + num_oid: '.1.3.6.1.4.1.1425.1040.1.10.{{ $index }}' descr: Telnet Service state_name: telnetdService states: diff --git a/includes/definitions/discovery/cyberpower.yaml b/includes/definitions/discovery/cyberpower.yaml index 180c0e1f4b..b8d93ea228 100644 --- a/includes/definitions/discovery/cyberpower.yaml +++ b/includes/definitions/discovery/cyberpower.yaml @@ -5,7 +5,7 @@ modules: data: - oid: upsBaseBatteryStatus - num_oid: .1.3.6.1.4.1.3808.1.1.1.2.1.1. + num_oid: '.1.3.6.1.4.1.3808.1.1.1.2.1.1.{{ $index }}' descr: 'Battery Status' index: 'upsBaseBatteryStatus.{{ $index }}' states: @@ -14,7 +14,7 @@ modules: - { value: 3, descr: Low, graph: 1, generic: 2 } - oid: upsAdvanceBatteryReplaceIndicator - num_oid: .1.3.6.1.4.1.3808.1.1.1.2.2.5. + num_oid: '.1.3.6.1.4.1.3808.1.1.1.2.2.5.{{ $index }}' descr: 'Battery Replace Indicator' index: 'upsAdvanceBatteryReplaceIndicator.{{ $index }}' states: @@ -22,7 +22,7 @@ modules: - { value: 2, descr: Replace, graph: 1, generic: 2 } - oid: upsAdvanceInputLineFailCause - num_oid: .1.3.6.1.4.1.3808.1.1.1.3.2.5. + num_oid: '.1.3.6.1.4.1.3808.1.1.1.3.2.5.{{ $index }}' descr: 'Input Line Cause' index: 'upsAdvanceInputLineFailCause.{{ $index }}' states: @@ -32,7 +32,7 @@ modules: - { value: 4, descr: 'Self Test', graph: 1, generic: 1 } - oid: upsAdvanceInputStatus - num_oid: .1.3.6.1.4.1.3808.1.1.1.3.2.6. + num_oid: '.1.3.6.1.4.1.3808.1.1.1.3.2.6.{{ $index }}' descr: 'Input Status' index: 'upsAdvanceInputStatus.{{ $index }}' states: @@ -43,7 +43,7 @@ modules: - { value: 5, descr: 'Blackout', graph: 1, generic: 2 } - oid: upsBaseOutputStatus - num_oid: .1.3.6.1.4.1.3808.1.1.1.4.1.1. + num_oid: '.1.3.6.1.4.1.3808.1.1.1.4.1.1.{{ $index }}' descr: 'Output Status' index: 'upsBaseOutputStatus.{{ $index }}' states: @@ -58,32 +58,32 @@ modules: data: - oid: upsAdvanceBatteryCapacity - num_oid: .1.3.6.1.4.1.3808.1.1.1.2.2.1. + num_oid: '.1.3.6.1.4.1.3808.1.1.1.2.2.1.{{ $index }}' index: 'upsAdvanceBatteryCapacity.{{ $index }}' descr: 'Battery Capacity' current: data: - oid: upsAdvanceOutputCurrent - num_oid: .1.3.6.1.4.1.3808.1.1.1.4.2.4. + num_oid: '.1.3.6.1.4.1.3808.1.1.1.4.2.4.{{ $index }}' index: 'upsAdvanceOutputCurrent.{{ $index }}' descr: 'Output' voltage: data: - oid: upsAdvanceBatteryVoltage - num_oid: .1.3.6.1.4.1.3808.1.1.1.2.2.2. + num_oid: '.1.3.6.1.4.1.3808.1.1.1.2.2.2.{{ $index }}' index: 'upsAdvanceBatteryVoltage.{{ $index }}' descr: 'Battery Voltage' - oid: upsAdvanceInputLineVoltage - num_oid: .1.3.6.1.4.1.3808.1.1.1.3.2.1. + num_oid: '.1.3.6.1.4.1.3808.1.1.1.3.2.1.{{ $index }}' index: 'upsAdvanceInputLineVoltage.{{ $index }}' descr: 'Input Line Voltage' divisor: 10 - oid: upsAdvanceOutputVoltage - num_oid: .1.3.6.1.4.1.3808.1.1.1.4.2.1. + num_oid: '.1.3.6.1.4.1.3808.1.1.1.4.2.1.{{ $index }}' index: 'upsAdvanceOutputVoltage.{{ $index }}' descr: 'Output Voltage' divisor: 10 @@ -91,12 +91,12 @@ modules: data: - oid: upsAdvanceBatteryTemperature - num_oid: .1.3.6.1.4.1.3808.1.1.1.2.2.3. + num_oid: '.1.3.6.1.4.1.3808.1.1.1.2.2.3.{{ $index }}' index: 'upsAdvanceBatteryTemperature.{{ $index }}' descr: 'Battery Temperature' - oid: envirTemperature - num_oid: .1.3.6.1.4.1.3808.1.1.4.2.1. + num_oid: '.1.3.6.1.4.1.3808.1.1.4.2.1.{{ $index }}' index: 'envirTemperature.{{ $index }}' descr: 'Environment Sensor Temperature' user_func: fahrenheit_to_celsius @@ -106,7 +106,7 @@ modules: data: - oid: upsAdvanceBatteryRunTimeRemaining - num_oid: .1.3.6.1.4.1.3808.1.1.1.2.2.4. + num_oid: '.1.3.6.1.4.1.3808.1.1.1.2.2.4.{{ $index }}' index: 'upsAdvanceBatteryRunTimeRemaining.{{ $index }}' descr: 'Battery Runtime' divisor: 6000 @@ -114,13 +114,13 @@ modules: data: - oid: upsAdvanceInputFrequency - num_oid: .1.3.6.1.4.1.3808.1.1.1.3.2.4. + num_oid: '.1.3.6.1.4.1.3808.1.1.1.3.2.4.{{ $index }}' index: 'upsAdvanceInputFrequency.{{ $index }}' descr: 'Input' divisor: 10 - oid: upsAdvanceOutputFrequency - num_oid: .1.3.6.1.4.1.3808.1.1.1.4.2.2. + num_oid: '.1.3.6.1.4.1.3808.1.1.1.4.2.2.{{ $index }}' index: 'upsAdvanceOutputFrequency.{{ $index }}' descr: 'Output' divisor: 10 @@ -128,6 +128,6 @@ modules: data: - oid: envirHumidity - num_oid: .1.3.6.1.4.1.3808.1.1.4.3.1. + num_oid: '.1.3.6.1.4.1.3808.1.1.4.3.1.{{ $index }}' index: 'envirHumidity.{{ $index }}' descr: 'Environment Sensor Humidity' diff --git a/includes/definitions/discovery/dahua-nvr.yaml b/includes/definitions/discovery/dahua-nvr.yaml index 58a116041d..31520b2ffb 100644 --- a/includes/definitions/discovery/dahua-nvr.yaml +++ b/includes/definitions/discovery/dahua-nvr.yaml @@ -4,16 +4,16 @@ modules: data: - oid: cpuUsage - num_oid: .1.3.6.1.4.1.1004849.2.1.3.{{ $index }} + num_oid: '.1.3.6.1.4.1.1004849.2.1.3.{{ $index }}' descr: CPU Usage sensors: state: data: - oid: deviceStatus - num_oid: .1.3.6.1.4.1.1004849.2.1.2.8. + num_oid: '.1.3.6.1.4.1.1004849.2.1.2.8.{{ $index }}' descr: 'Device Status' index: 'deviceStatus.{{ $index }}' states: - { value: 0, descr: Bad, graph: 1, generic: 2 } - - { value: 1, descr: Good, graph: 1, generic: 0 } \ No newline at end of file + - { value: 1, descr: Good, graph: 1, generic: 0 } diff --git a/includes/definitions/discovery/datacom.yaml b/includes/definitions/discovery/datacom.yaml index 7e3b8625df..c0fb693044 100644 --- a/includes/definitions/discovery/datacom.yaml +++ b/includes/definitions/discovery/datacom.yaml @@ -12,6 +12,6 @@ modules: - oid: SwitchInfoEntry value: swTemperature - num_oid: .1.3.6.1.4.1.3709.3.5.201.1.1.2.1.12. + num_oid: '.1.3.6.1.4.1.3709.3.5.201.1.1.2.1.12.{{ $index }}' descr: 'Temperature {{ $index }}' index: 'swTemperature.{{ $index }}' diff --git a/includes/definitions/discovery/ddnos.yaml b/includes/definitions/discovery/ddnos.yaml index e5e7417f93..985025ed53 100644 --- a/includes/definitions/discovery/ddnos.yaml +++ b/includes/definitions/discovery/ddnos.yaml @@ -6,7 +6,7 @@ modules: - oid: tempTable value: tempStatus - num_oid: .1.3.6.1.4.1.6894.2.2.1.4. + num_oid: '.1.3.6.1.4.1.6894.2.2.1.4.{{ $index }}' descr: 'Temperature Sensor {{ $index }}' index: '{{ $index }}' states: @@ -16,7 +16,7 @@ modules: - oid: fanTable value: fanStatus - num_oid: .1.3.6.1.4.1.6894.2.4.1.4. + num_oid: '.1.3.6.1.4.1.6894.2.4.1.4.{{ $index }}' descr: 'Fan Sensor {{ $index }}' index: '{{ $index }}' states: @@ -25,7 +25,7 @@ modules: - oid: powerTable value: powerStatus - num_oid: .1.3.6.1.4.1.6894.2.6.1.4. + num_oid: '.1.3.6.1.4.1.6894.2.6.1.4.{{ $index }}' descr: 'Power Supply Sensor {{ $index }}' index: '{{ $index }}' states: @@ -34,7 +34,7 @@ modules: - oid: physicalDiskTable value: physDiskState - num_oid: .1.3.6.1.4.1.6894.2.9.1.7. + num_oid: '.1.3.6.1.4.1.6894.2.9.1.7.{{ $index }}' descr: 'Disk Sensor {{ $index }}' index: '{{ $index }}' states: diff --git a/includes/definitions/discovery/dell-rpdu.yaml b/includes/definitions/discovery/dell-rpdu.yaml index c8be429b7f..1bafa3d0f2 100644 --- a/includes/definitions/discovery/dell-rpdu.yaml +++ b/includes/definitions/discovery/dell-rpdu.yaml @@ -9,13 +9,13 @@ modules: data: - oid: rPDUOutletMeteredStatusCurrent - num_oid: .1.3.6.1.4.1.674.10903.200.2.200.130.2.2.1.6. + num_oid: '.1.3.6.1.4.1.674.10903.200.2.200.130.2.2.1.6.{{ $index }}' index: 'rPDUOutletMeteredStatusIndex.{{ $index }}' descr: Outlet, {{ $rPDUOutletMeteredStatusName }}, Current divisor: 0 - oid: rPDUPhaseStatusCurrent - num_oid: .1.3.6.1.4.1.674.10903.200.2.200.120.2.1.4. + num_oid: '.1.3.6.1.4.1.674.10903.200.2.200.120.2.1.4.{{ $index }}' index: 'rPDUPhaseStatusIndex.{{ $index }}' descr: 'Current, Phase #{{ $index }}' divisor: 10 @@ -23,13 +23,13 @@ modules: data: - oid: rPDUOutletMeteredStatusPower - num_oid: .1.3.6.1.4.1.674.10903.200.2.200.130.2.2.1.8. + num_oid: '.1.3.6.1.4.1.674.10903.200.2.200.130.2.2.1.8.{{ $index }}' index: 'rPDUOutletMeteredStatusIndex.{{ $index }}' descr: Outlet, {{ $rPDUOutletMeteredStatusName }}, Power divisor: 0 - oid: rPDUPhaseStatusPower - num_oid: .1.3.6.1.4.1.674.10903.200.2.200.120.2.1.6. + num_oid: '.1.3.6.1.4.1.674.10903.200.2.200.120.2.1.6.{{ $index }}' index: 'rPDUPhaseStatusIndex.{{ $index }}' descr: 'Power, Phase #{{ $index }}' divisor: 0 @@ -38,7 +38,7 @@ modules: data: - oid: rPDUPhaseStatusVoltage - num_oid: .1.3.6.1.4.1.674.10903.200.2.200.120.2.1.5. + num_oid: '.1.3.6.1.4.1.674.10903.200.2.200.120.2.1.5.{{ $index }}' index: 'rPDUPhaseStatusIndex.{{ $index }}' descr: 'Voltage, Phase #{{ $index }}' divisor: 0 @@ -46,7 +46,7 @@ modules: data: - oid: rPDUOutMeteredStatusLoadState - num_oid: .1.3.6.1.4.1.674.10903.200.2.200.130.2.2.1.11. + num_oid: '.1.3.6.1.4.1.674.10903.200.2.200.130.2.2.1.11.{{ $index }}' descr: Outlet, {{ $rPDUOutletMeteredStatusName }}, Load index: 'rPDUOutletMeteredStatusIndex.{{ $index }}' state_name: rPDUOutMeteredStatusLoadState @@ -59,7 +59,7 @@ modules: oid: rPDUPhaseStatusTable state_name: rPDUPhaseStatusLoadState value: rPDUPhaseStatusLoadState - num_oid: .1.3.6.1.4.1.674.10903.200.2.200.120.2.1.3. + num_oid: '.1.3.6.1.4.1.674.10903.200.2.200.120.2.1.3.{{ $index }}' index: 'rPDUPhaseStatusLoadState.{{ $index }}' descr: 'Load State, Phase #{{ $index }}' states: @@ -71,7 +71,7 @@ modules: oid: rPDUDeviceStatusTable state_name: rPDUDeviceStatusLoadState value: rPDUDeviceStatusLoadState - num_oid: .1.3.6.1.4.1.674.10903.200.2.200.110.2.1.6. + num_oid: '.1.3.6.1.4.1.674.10903.200.2.200.110.2.1.6.{{ $index }}' index: 'rPDUDeviceStatusLoadState.{{ $index }}' descr: 'Device State' states: @@ -83,7 +83,7 @@ modules: data: - oid: rPDUSensorTempStatusTempC - num_oid: .1.3.6.1.4.1.674.10903.200.2.200.150.2.2.1.5. + num_oid: '.1.3.6.1.4.1.674.10903.200.2.200.150.2.2.1.5.{{ $index }}' index: 'rPDUSensorTempStatusTempC.{{ $index }}' descr: 'Temperature' divisor: 10 @@ -91,6 +91,6 @@ modules: data: - oid: rPDUSnsorHumStatRelativeHumdity - num_oid: .1.3.6.1.4.1.674.10903.200.2.200.150.3.2.1.4. + num_oid: '.1.3.6.1.4.1.674.10903.200.2.200.150.3.2.1.4.{{ $index }}' index: 'rPDUSnsorHumStatRelativeHumdity .{{ $index }}' descr: 'Humidity' diff --git a/includes/definitions/discovery/dell-ups.yaml b/includes/definitions/discovery/dell-ups.yaml index 6bb4c85c5a..b30f2e2ff9 100644 --- a/includes/definitions/discovery/dell-ups.yaml +++ b/includes/definitions/discovery/dell-ups.yaml @@ -6,7 +6,7 @@ modules: - oid: productStatusGlobalStatus value: productStatusGlobalStatus - num_oid: .1.3.6.1.4.1.674.10902.2.110.1. + num_oid: '.1.3.6.1.4.1.674.10902.2.110.1.{{ $index }}' descr: 'Current Status' index: '{{ $index }}' states: diff --git a/includes/definitions/discovery/dlink.yaml b/includes/definitions/discovery/dlink.yaml index 75ea8b6cd8..4e1912aed5 100644 --- a/includes/definitions/discovery/dlink.yaml +++ b/includes/definitions/discovery/dlink.yaml @@ -12,6 +12,6 @@ modules: - oid: swTemperatureTable value: swTemperatureCurrent - num_oid: .1.3.6.1.4.1.171.12.11.1.8.1.2. + num_oid: '.1.3.6.1.4.1.171.12.11.1.8.1.2.{{ $index }}' descr: 'Current Sys Temp {{ $index }}' index: 'swTemperatureCurrent.{{ $index }}' diff --git a/includes/definitions/discovery/drac.yaml b/includes/definitions/discovery/drac.yaml index 083f613347..a36e295d3e 100644 --- a/includes/definitions/discovery/drac.yaml +++ b/includes/definitions/discovery/drac.yaml @@ -6,7 +6,7 @@ modules: - oid: drsGlobalSystemStatus value: drsGlobalSystemStatus - num_oid: .1.3.6.1.4.1.674.10892.2.2.1. + num_oid: '.1.3.6.1.4.1.674.10892.2.2.1.{{ $index }}' descr: 'Global System Status' index: 'drsGlobalSystemStatus.{{ $index }}' states: @@ -19,7 +19,7 @@ modules: - oid: systemStateIDSDMCardUnitStatusCombined value: systemStateIDSDMCardUnitStatusCombined - num_oid: .1.3.6.1.4.1.674.10892.5.4.200.10.1.58. + num_oid: '.1.3.6.1.4.1.674.10892.5.4.200.10.1.58.{{ $index }}' descr: 'IDSDM Card Unit Combined Status' index: 'systemStateIDSDMCardUnitStatusCombined.{{ $index }}' states: @@ -32,7 +32,7 @@ modules: - oid: systemStateIDSDMCardDeviceStatusCombined value: systemStateIDSDMCardDeviceStatusCombined - num_oid: .1.3.6.1.4.1.674.10892.5.4.200.10.1.60. + num_oid: '.1.3.6.1.4.1.674.10892.5.4.200.10.1.60.{{ $index }}' descr: 'IDSDM Card Device Combined Status' index: 'systemStateIDSDMCardDeviceStatusCombined.{{ $index }}' states: @@ -45,7 +45,7 @@ modules: - oid: intrusionStatus value: intrusionStatus - num_oid: .1.3.6.1.4.1.674.10892.5.4.300.70.1.5. + num_oid: '.1.3.6.1.4.1.674.10892.5.4.300.70.1.5.{{ $index }}' descr: 'Intrusion Status' index: 'intrusionStatus.{{ $index }}' states: @@ -58,7 +58,7 @@ modules: - oid: intrusionReading value: intrusionReading - num_oid: .1.3.6.1.4.1.674.10892.5.4.300.70.1.6. + num_oid: '.1.3.6.1.4.1.674.10892.5.4.300.70.1.6.{{ $index }}' descr: 'Intrusion Reading' index: 'intrusionReading.{{ $index }}' states: diff --git a/includes/definitions/discovery/eaton-ats.yaml b/includes/definitions/discovery/eaton-ats.yaml index 3097f912b1..41f49d0cdc 100644 --- a/includes/definitions/discovery/eaton-ats.yaml +++ b/includes/definitions/discovery/eaton-ats.yaml @@ -6,7 +6,7 @@ modules: - oid: ats2OutputVoltage value: ats2OutputVoltage - num_oid: .1.3.6.1.4.1.534.10.2.2.3.1. + num_oid: '.1.3.6.1.4.1.534.10.2.2.3.1.{{ $index }}' divisor: 10 descr: 'Output' index: 'ats2OutputVoltage.{{ $index }}' @@ -15,7 +15,7 @@ modules: - oid: ats2OperationMode value: ats2OperationMode - num_oid: .1.3.6.1.4.1.534.10.2.2.4. + num_oid: '.1.3.6.1.4.1.534.10.2.2.4.{{ $index }}' descr: 'ats2OperationMode' index: 'ats2OperationMode.{{ $index }}' state_name: ats2OperationMode @@ -30,7 +30,7 @@ modules: - oid: ats2InputStatusDephasing value: ats2InputStatusDephasing - num_oid: .1.3.6.1.4.1.534.10.2.3.1.1. + num_oid: '.1.3.6.1.4.1.534.10.2.3.1.1.{{ $index }}' descr: 'ats2InputStatusDephasing' index: 'ats2InputStatusDephasing.{{ $index }}' state_name: ats2InputStatusDephasing diff --git a/includes/definitions/discovery/eaton-mgeups.yaml b/includes/definitions/discovery/eaton-mgeups.yaml index ad7372e19a..07ca50b770 100644 --- a/includes/definitions/discovery/eaton-mgeups.yaml +++ b/includes/definitions/discovery/eaton-mgeups.yaml @@ -6,7 +6,7 @@ modules: - oid: upsmgOutputPhaseTable value: mgoutputLoadPerPhase - num_oid: .1.3.6.1.4.1.705.1.7.2.1.4. + num_oid: '.1.3.6.1.4.1.705.1.7.2.1.4.{{ $index }}' multiplier: 1000 descr: 'Output (VA) Phase {{ $index }}' index: 'kva.mgoutputLoadPerPhase.{{ $index }}' @@ -15,21 +15,21 @@ modules: - oid: upsmgInputPhaseTable value: mginputCurrent - num_oid: .1.3.6.1.4.1.705.1.6.2.1.6. + num_oid: '.1.3.6.1.4.1.705.1.6.2.1.6.{{ $index }}' divisor: 10 descr: 'Input Current Phase {{ $index }}' index: 'mginputCurrent.{{ $index }}' - oid: upsmgOutputPhaseTable value: mgoutputCurrent - num_oid: .1.3.6.1.4.1.705.1.7.2.1.5. + num_oid: '.1.3.6.1.4.1.705.1.7.2.1.5.{{ $index }}' divisor: 10 descr: 'Output Current Phase {{ $index }}' index: 'mgoutputCurrent.{{ $index }}' - oid: upsmgBattery value: upsmgBatteryCurrent - num_oid: .1.3.6.1.4.1.705.1.5.6. + num_oid: '.1.3.6.1.4.1.705.1.5.6.{{ $index }}' divisor: 10 descr: 'Battery' index: 'upsmgBatteryCurrent.{{ $index }}' @@ -38,7 +38,7 @@ modules: - oid: upsmgBattery value: upsmgBatteryTemperature - num_oid: .1.3.6.1.4.1.705.1.5.7. + num_oid: '.1.3.6.1.4.1.705.1.5.7.{{ $index }}' descr: 'Battery' index: 'upsmgBatteryTemperature.{{ $index }}' frequency: @@ -46,14 +46,14 @@ modules: - oid: upsmgInputPhaseTable value: mginputFrequency - num_oid: .1.3.6.1.4.1.705.1.6.2.1.3. + num_oid: '.1.3.6.1.4.1.705.1.6.2.1.3.{{ $index }}' divisor: 10 descr: 'Input Frequency Phase {{ $index }}' index: 'mginputFrequency.{{ $index }}' - oid: upsmgOutputPhaseTable value: mgoutputFrequency - num_oid: .1.3.6.1.4.1.705.1.7.2.1.3. + num_oid: '.1.3.6.1.4.1.705.1.7.2.1.3.{{ $index }}' divisor: 10 descr: 'Output Frequency Phase {{ $index }}' index: 'mgoutputFrequency.{{ $index }}' @@ -62,7 +62,7 @@ modules: - oid: upsmgBattery value: upsmgBatteryRemainingTime - num_oid: .1.3.6.1.4.1.705.1.5.1. + num_oid: '.1.3.6.1.4.1.705.1.5.1.{{ $index }}' descr: 'Remaining time' index: 'upsmgBatteryRemainingTime.{{ $index }}' charge: @@ -70,7 +70,7 @@ modules: - oid: upsmgBattery value: upsmgBatteryLevel - num_oid: .1.3.6.1.4.1.705.1.5.2. + num_oid: '.1.3.6.1.4.1.705.1.5.2.{{ $index }}' descr: 'Remaining battery capacity' index: 'upsmgBatteryLevel.{{ $index }}' voltage: @@ -78,21 +78,21 @@ modules: - oid: upsmgInputPhaseTable value: mginputVoltage - num_oid: .1.3.6.1.4.1.705.1.6.2.1.2. + num_oid: '.1.3.6.1.4.1.705.1.6.2.1.2.{{ $index }}' divisor: 10 descr: 'Input Phase/Phase {{ $index }}' index: 'mginputVoltage.{{ $index }}' - oid: upsmgOutputPhaseTable value: mgoutputVoltage - num_oid: .1.3.6.1.4.1.705.1.7.2.1.2. + num_oid: '.1.3.6.1.4.1.705.1.7.2.1.2.{{ $index }}' divisor: 10 descr: 'Output Phase/Phase {{ $index }}' index: 'mgoutputVoltage.{{ $index }}' - oid: upsmgBattery value: upsmgBatteryVoltage - num_oid: .1.3.6.1.4.1.705.1.5.5. + num_oid: '.1.3.6.1.4.1.705.1.5.5.{{ $index }}' divisor: 10 descr: 'Battery' index: 'upsmgBatteryVoltage.{{ $index }}' @@ -102,7 +102,7 @@ modules: - oid: upsmgOutputOnBattery value: upsmgOutputOnBattery - num_oid: .1.3.6.1.4.1.705.1.7.3. + num_oid: '.1.3.6.1.4.1.705.1.7.3.{{ $index }}' descr: 'Input Status' index: 'upsmgOutputOnBattery.{{ $index }}' state_name: upsmgOutputOnBattery @@ -112,7 +112,7 @@ modules: - oid: upsmgOutputOnByPass value: upsmgOutputOnByPass - num_oid: .1.3.6.1.4.1.705.1.7.4. + num_oid: '.1.3.6.1.4.1.705.1.7.4.{{ $index }}' descr: 'Bypass Status' index: 'upsmgOutputOnBypass.{{ $index }}' state_name: upsmgOutputOnByPass @@ -122,7 +122,7 @@ modules: - oid: upsmgOutputUtilityOff value: upsmgOutputUtilityOff - num_oid: .1.3.6.1.4.1.705.1.7.7. + num_oid: '.1.3.6.1.4.1.705.1.7.7.{{ $index }}' descr: 'Utility Status' index: 'upsmgOutputUtilityOff.{{ $index }}' state_name: upsmgOutputUtilityOff @@ -132,7 +132,7 @@ modules: - oid: upsmgOutputInverterOff value: upsmgOutputInverterOff - num_oid: .1.3.6.1.4.1.705.1.7.9. + num_oid: '.1.3.6.1.4.1.705.1.7.9.{{ $index }}' descr: 'UPS Inverter Status' index: 'upsmgOutputInverterOff.{{ $index }}' state_name: upsmgOutputInverterOff @@ -142,7 +142,7 @@ modules: - oid: upsmgOutputOverLoad value: upsmgOutputOverLoad - num_oid: .1.3.6.1.4.1.705.1.7.10. + num_oid: '.1.3.6.1.4.1.705.1.7.10.{{ $index }}' descr: 'Output OverLoad' index: 'upsmgOutputOverLoad.{{ $index }}' state_name: upsmgOutputOverLoad @@ -152,7 +152,7 @@ modules: - oid: upsmgOutputOverTemp value: upsmgOutputOverTemp - num_oid: .1.3.6.1.4.1.705.1.7.11. + num_oid: '.1.3.6.1.4.1.705.1.7.11.{{ $index }}' descr: 'Over Temperature' index: 'upsmgOutputOverTemp.{{ $index }}' state_name: upsmgOutputOverTemp @@ -162,7 +162,7 @@ modules: - oid: upsmgBattery value: upsmgBatteryFaultBattery - num_oid: .1.3.6.1.4.1.705.1.5.9. + num_oid: '.1.3.6.1.4.1.705.1.5.9.{{ $index }}' descr: 'Battery Fault' index: 'upsmgBatteryFaultBattery.{{ $index }}' state_name: upsmgBatteryFaultBattery @@ -172,7 +172,7 @@ modules: - oid: upsmgBattery value: upsmgBatteryReplacement - num_oid: .1.3.6.1.4.1.705.1.5.11. + num_oid: '.1.3.6.1.4.1.705.1.5.11.{{ $index }}' descr: 'Battery Replacement Status' index: 'upsmgBatteryReplacement.{{ $index }}' state_name: upsmgBatteryReplacement @@ -182,7 +182,7 @@ modules: - oid: upsmgBattery value: upsmgBatteryLowBattery - num_oid: .1.3.6.1.4.1.705.1.5.14. + num_oid: '.1.3.6.1.4.1.705.1.5.14.{{ $index }}' descr: 'Battery Charge Status' index: 'upsmgBatteryLowBattery.{{ $index }}' state_name: upsmgBatteryLowBattery @@ -192,7 +192,7 @@ modules: - oid: upsmgBattery value: upsmgBatteryChargerFault - num_oid: .1.3.6.1.4.1.705.1.5.15. + num_oid: '.1.3.6.1.4.1.705.1.5.15.{{ $index }}' descr: 'Battery Charger Status' index: 'upsmgBatteryChargerFault.{{ $index }}' state_name: upsmgBatteryChargerFault @@ -202,7 +202,7 @@ modules: - oid: upsmgBattery value: upsmgBatteryLowCondition - num_oid: .1.3.6.1.4.1.705.1.5.16. + num_oid: '.1.3.6.1.4.1.705.1.5.16.{{ $index }}' descr: 'Battery Condition' index: 'upsmgBatteryLowCondition.{{ $index }}' state_name: upsmgBatteryLowCondition @@ -212,7 +212,7 @@ modules: - oid: upsmgInputBadStatus value: upsmgInputBadStatus - num_oid: .1.3.6.1.4.1.705.1.6.3. + num_oid: '.1.3.6.1.4.1.705.1.6.3.{{ $index }}' descr: 'Input Status' index: 'upsmgInputBadStatus.{{ $index }}' state_name: upsmgInputBadStatus @@ -222,7 +222,7 @@ modules: - oid: upsmgInputLineFailCause value: upsmgInputLineFailCause - num_oid: .1.3.6.1.4.1.705.1.6.4. + num_oid: '.1.3.6.1.4.1.705.1.6.4.{{ $index }}' descr: 'Input Line Fail Cause' index: 'upsmgInputLineFailCause.{{ $index }}' state_name: upsmgInputLineFailCause diff --git a/includes/definitions/discovery/edgeswitch.yaml b/includes/definitions/discovery/edgeswitch.yaml index 7a44bd74e2..43b96f40ab 100644 --- a/includes/definitions/discovery/edgeswitch.yaml +++ b/includes/definitions/discovery/edgeswitch.yaml @@ -6,7 +6,7 @@ modules: - oid: boxServicesTempUnitEntry value: boxServicesTempUnitState - num_oid: .1.3.6.1.4.1.4413.1.1.43.1.15.1.2. + num_oid: '.1.3.6.1.4.1.4413.1.1.43.1.15.1.2.{{ $index }}' descr: 'Chassis state' index: 'boxServicesTempUnitState.{{ $index }}' states: @@ -20,7 +20,7 @@ modules: - oid: boxServicesTempSensorsEntry value: boxServicesTempSensorState - num_oid: .1.3.6.1.4.1.4413.1.1.43.1.8.1.4. + num_oid: '.1.3.6.1.4.1.4413.1.1.43.1.8.1.4.{{ $index }}' descr: 'Temp Sensor {{ $index }}' index: 'boxServicesTempSensorState.{{ $index }}' states: @@ -35,7 +35,7 @@ modules: - oid: boxServicesFansEntry value: boxServicesFanItemState - num_oid: .1.3.6.1.4.1.4413.1.1.43.1.6.1.3. + num_oid: '.1.3.6.1.4.1.4413.1.1.43.1.6.1.3.{{ $index }}' descr: 'Fan {{ $index }}' index: 'boxServicesFanItemState.{{ $index }}' states: @@ -52,7 +52,7 @@ modules: - oid: boxServicesFansEntry value: boxServicesFanSpeed - num_oid: .1.3.6.1.4.1.4413.1.1.43.1.6.1.4. + num_oid: '.1.3.6.1.4.1.4413.1.1.43.1.6.1.4.{{ $index }}' index: 'boxServicesFanSpeed.{{ $index }}' descr: 'Fan {{ $index }}' @@ -61,6 +61,6 @@ modules: - oid: boxServicesTempSensorsEntry value: boxServicesTempSensorTemperature - num_oid: .1.3.6.1.4.1.4413.1.1.43.1.8.1.5. + num_oid: '.1.3.6.1.4.1.4413.1.1.43.1.8.1.5.{{ $index }}' index: 'boxServicesTempSensorTemperature.{{ $index }}' descr: 'Temperature {{ $index }}' diff --git a/includes/definitions/discovery/ees.yaml b/includes/definitions/discovery/ees.yaml index 2510023bc1..021275c861 100644 --- a/includes/definitions/discovery/ees.yaml +++ b/includes/definitions/discovery/ees.yaml @@ -5,7 +5,7 @@ modules: data: - oid: psTemperatureTable - num_oid: .1.3.6.1.4.1.6302.2.1.2.7.3.1.2. + num_oid: '.1.3.6.1.4.1.6302.2.1.2.7.3.1.2.{{ $index }}' value: psTemperatureMeasurement index: 'psTemperatureMeasurement.{{ $index }}' descr: psTemperatureName @@ -14,42 +14,42 @@ modules: data: - oid: systemVoltage - num_oid: .1.3.6.1.4.1.6302.2.1.2.2. + num_oid: '.1.3.6.1.4.1.6302.2.1.2.2.{{ $index }}' divisor: 1000 index: 'systemVoltage.{{ $index }}' descr: 'System Voltage' skip_values: 2147483647 - oid: psBatteryVoltage - num_oid: .1.3.6.1.4.1.6302.2.1.2.5.1. + num_oid: '.1.3.6.1.4.1.6302.2.1.2.5.1.{{ $index }}' divisor: 1000 index: 'psBatteryVoltage.{{ $index }}' descr: 'Battery Voltage' skip_values: 2147483647 - oid: psInputLineAVoltage - num_oid: .1.3.6.1.4.1.6302.2.1.2.6.1. + num_oid: '.1.3.6.1.4.1.6302.2.1.2.6.1.{{ $index }}' divisor: 1000 index: 'psInputLineAVoltage.{{ $index }}' descr: 'Input Line A Voltage' skip_values: 2147483647 - oid: psInputLineBVoltage - num_oid: .1.3.6.1.4.1.6302.2.1.2.6.2. + num_oid: '.1.3.6.1.4.1.6302.2.1.2.6.2.{{ $index }}' divisor: 1000 index: 'psInputLineBVoltage.{{ $index }}' descr: 'Input Line B Voltage' skip_values: 2147483647 - oid: psInputLineCVoltage - num_oid: .1.3.6.1.4.1.6302.2.1.2.6.3. + num_oid: '.1.3.6.1.4.1.6302.2.1.2.6.3.{{ $index }}' divisor: 1000 index: 'psInputLineCVoltage.{{ $index }}' descr: 'Input Line C Voltage' skip_values: 2147483647 - oid: psConverterVoltage - num_oid: .1.3.6.1.4.1.6302.2.1.2.13.4. + num_oid: '.1.3.6.1.4.1.6302.2.1.2.13.4.{{ $index }}' divisor: 1000 index: 'psConverterVoltage.{{ $index }}' descr: 'Convertor Voltage' @@ -58,54 +58,54 @@ modules: data: - oid: systemCurrent - num_oid: .1.3.6.1.4.1.6302.2.1.2.3. + num_oid: '.1.3.6.1.4.1.6302.2.1.2.3.{{ $index }}' divisor: 1000 index: 'systemCurrent.{{ $index }}' descr: 'System Current' skip_values: 2147483647 - oid: psTotalBatteryCurrent - num_oid: .1.3.6.1.4.1.6302.2.1.2.5.2. + num_oid: '.1.3.6.1.4.1.6302.2.1.2.5.2.{{ $index }}' divisor: 1000 index: 'psTotalBatteryCurrent.{{ $index }}' descr: 'Battery Current' skip_values: 2147483647 - oid: psBatteryTable - num_oid: .1.3.6.1.4.1.6302.2.1.2.5.5.1.2. + num_oid: '.1.3.6.1.4.1.6302.2.1.2.5.5.1.2.{{ $index }}' value: psBatteryCurrent index: 'psBatteryTable.{{ $index }}' descr: psBatteryName - oid: psRectifierTable - num_oid: .1.3.6.1.4.1.6302.2.1.2.11.4.1.6. + num_oid: '.1.3.6.1.4.1.6302.2.1.2.11.4.1.6.{{ $index }}' value: psRectifierCurrent divisor: 1000 index: 'psRectifierTable.{{ $index }}' descr: psRectifierIdent - oid: psDistributionLoadTable - num_oid: .1.3.6.1.4.1.6302.2.1.2.12.2.1.2. + num_oid: '.1.3.6.1.4.1.6302.2.1.2.12.2.1.2.{{ $index }}' value: psDistributionLoadCurrent divisor: 1000 index: 'psDistributionLoadTable.{{ $index }}' descr: psDistributionLoadName - oid: psDistributionGeneralTable - num_oid: .1.3.6.1.4.1.6302.2.1.2.12.3.1.2. + num_oid: '.1.3.6.1.4.1.6302.2.1.2.12.3.1.2.{{ $index }}' value: psDistributionGeneralCurrent divisor: 1000 index: 'psDistributionGeneralTable.{{ $index }}' descr: psDistributionGeneralName - oid: psTotalConverterCurrent - num_oid: .1.3.6.1.4.1.6302.2.1.2.13.5. + num_oid: '.1.3.6.1.4.1.6302.2.1.2.13.5.{{ $index }}' index: 'psTotalConverterCurrent.{{ $index }}' descr: 'Converter Current' skip_values: 2147483647 - oid: psConverterTable - num_oid: .1.3.6.1.4.1.6302.2.1.2.13.6.1.6. + num_oid: '.1.3.6.1.4.1.6302.2.1.2.13.6.1.6.{{ $index }}' value: psConverterCurrent divisor: 1000 index: 'psConverterTable.{{ $index }}' @@ -114,7 +114,7 @@ modules: data: - oid: systemStatus - num_oid: .1.3.6.1.4.1.6302.2.1.2.1. + num_oid: '.1.3.6.1.4.1.6302.2.1.2.1.{{ $index }}' descr: 'System Status' index: 'systemStatus.{{ $index }}' states: @@ -130,7 +130,7 @@ modules: - { descr: disabled, graph: 1, value: 10, generic: 1 } - oid: psStatusCommunication - num_oid: .1.3.6.1.4.1.6302.2.1.2.8. + num_oid: '.1.3.6.1.4.1.6302.2.1.2.8.{{ $index }}' descr: 'Communication Status' index: 'psStatusCommunication.{{ $index }}' states: @@ -139,7 +139,7 @@ modules: - { descr: interupt, graph: 1, value: 3, generic: 2 } - oid: psStatusBatteryMode - num_oid: .1.3.6.1.4.1.6302.2.1.2.9. + num_oid: '.1.3.6.1.4.1.6302.2.1.2.9.{{ $index }}' descr: 'Battery Status' index: 'psStatusBatteryMode.{{ $index }}' states: @@ -158,7 +158,7 @@ modules: - { descr: masterBT, graph: 1, value: 13, generic: 1 } - oid: psTemperatureTable - num_oid: .1.3.6.1.4.1.6302.2.1.2.7.3.1.5. + num_oid: '.1.3.6.1.4.1.6302.2.1.2.7.3.1.5.{{ $index }}' value: psTemperatureAlarmStatus index: 'psTemperatureAlarmStatus.{{ $index }}' descr: psTemperatureName @@ -166,4 +166,4 @@ modules: - { descr: high, graph: 1, value: 1, generic: 2 } - { descr: low, graph: 1, value: 2, generic: 2 } - { descr: fail, graph: 1, value: 3, generic: 2 } - - { descr: none, graph: 1, value: 4, generic: 3 } \ No newline at end of file + - { descr: none, graph: 1, value: 4, generic: 3 } diff --git a/includes/definitions/discovery/eltek-webpower.yaml b/includes/definitions/discovery/eltek-webpower.yaml index 400a1c75cd..8795c7a8c8 100644 --- a/includes/definitions/discovery/eltek-webpower.yaml +++ b/includes/definitions/discovery/eltek-webpower.yaml @@ -6,7 +6,7 @@ modules: - oid: batteryCapacityData value: batteryTimeToDisconnect - num_oid: .1.3.6.1.4.1.12148.9.3.20.1. + num_oid: '.1.3.6.1.4.1.12148.9.3.20.1.{{ $index }}' index: 'batteryTimeToDisconnect.{{ $index }}' descr: Battery time to disconnect state: @@ -14,7 +14,7 @@ modules: - oid: dcSystem value: systemOperationalStatus - num_oid: .1.3.6.1.4.1.12148.9.2.2. + num_oid: '.1.3.6.1.4.1.12148.9.2.2.{{ $index }}' descr: System operational status state_name: systemOperationalStatus.{{ $index }} states: @@ -25,7 +25,7 @@ modules: - oid: dcPlant value: systemNominalVoltage - num_oid: .1.3.6.1.4.1.12148.9.2.1.4. + num_oid: '.1.3.6.1.4.1.12148.9.2.1.4.{{ $index }}' descr: The nominal voltage rating state_name: systemNominalVoltage.{{ $index }} states: @@ -37,7 +37,7 @@ modules: - oid: battery value: batteryBreakerStatus - num_oid: .1.3.6.1.4.1.12148.9.3.5. + num_oid: '.1.3.6.1.4.1.12148.9.3.5.{{ $index }}' descr: Battery breaker status state_name: batteryBreakerStatus.{{ $index }} states: @@ -46,7 +46,7 @@ modules: - oid: rectifier value: rectifierRectifiersActive - num_oid: .1.3.6.1.4.1.12148.9.5.2. + num_oid: '.1.3.6.1.4.1.12148.9.5.2.{{ $index }}' state_name: rectifierRectifiersActive descr: Rectifiers active states: @@ -73,7 +73,7 @@ modules: - oid: rectifier value: rectifierInstalledRectifiers - num_oid: .1.3.6.1.4.1.12148.9.5.1. + num_oid: '.1.3.6.1.4.1.12148.9.5.1.{{ $index }}' state_name: rectifierInstalledRectifiers descr: Rectifiers installed states: @@ -100,7 +100,7 @@ modules: - oid: rectifierStatusEntry value: rectifierStatusStatus - num_oid: .1.3.6.1.4.1.12148.9.5.5.2.1.2. + num_oid: '.1.3.6.1.4.1.12148.9.5.5.2.1.2.{{ $index }}' descr: Rectifier {{ $index }} status state_name: rectifierStatusStatus.{{ $index }} skip_value_lt: 1 @@ -115,87 +115,87 @@ modules: - oid: acDistribution value: acVoltage1 - num_oid: .1.3.6.1.4.1.12148.9.6.1. + num_oid: '.1.3.6.1.4.1.12148.9.6.1.{{ $index }}' index: 'acVoltage1.{{ $index }}' descr: AC L1 input - oid: acDistribution value: acVoltage2 - num_oid: .1.3.6.1.4.1.12148.9.6.2. + num_oid: '.1.3.6.1.4.1.12148.9.6.2.{{ $index }}' index: 'acVoltage2.{{ $index }}' descr: AC L2 input - oid: acDistribution value: acVoltage3 - num_oid: .1.3.6.1.4.1.12148.9.6.3. + num_oid: '.1.3.6.1.4.1.12148.9.6.3.{{ $index }}' index: 'acVoltage3.{{ $index }}' descr: AC L3 input - oid: rectifierStatusEntry value: rectifierStatusOutputVoltage - num_oid: .1.3.6.1.4.1.12148.9.5.5.2.1.4. + num_oid: '.1.3.6.1.4.1.12148.9.5.5.2.1.4.{{ $index }}' index: 'rectifierStatusOutputVoltage.{{ $index }}' descr: Rectifier{{ $index }} out divisor: 100 skip_value_lt: 1 - oid: batteryVoltage - num_oid: .1.3.6.1.4.1.12148.9.3.2. + num_oid: '.1.3.6.1.4.1.12148.9.3.2.{{ $index }}' index: 'batteryVoltage.{{ $index }}' descr: Battery bank divisor: 100 - oid: batteryBanksSymmetry1deltaVoltage - num_oid: .1.3.6.1.4.1.12148.9.3.19.3.1.4. + num_oid: '.1.3.6.1.4.1.12148.9.3.19.3.1.4.{{ $index }}' index: 'batteryBanksSymmetry1deltaVoltage.{{ $index }}' descr: ΔV Battery banks symmetry 1 divisor: 100 skip_value_lt: 1 - oid: batteryBanksSymmetry2deltaVoltage - num_oid: .1.3.6.1.4.1.12148.9.3.19.3.1.7. + num_oid: '.1.3.6.1.4.1.12148.9.3.19.3.1.7.{{ $index }}' index: 'batteryBanksSymmetry2deltaVoltage.{{ $index }}' descr: ΔV Battery banks symmetry 2 divisor: 100 skip_value_lt: 1 - oid: batteryBanksSymmetry3deltaVoltage - num_oid: .1.3.6.1.4.1.12148.9.3.19.3.1.10. + num_oid: '.1.3.6.1.4.1.12148.9.3.19.3.1.10.{{ $index }}' index: 'batteryBanksSymmetry3deltaVoltage.{{ $index }}' descr: ΔV Battery banks symmetry 3 divisor: 100 skip_value_lt: 1 - oid: batteryBanksSymmetry4deltaVoltage - num_oid: .1.3.6.1.4.1.12148.9.3.19.3.1.13. + num_oid: '.1.3.6.1.4.1.12148.9.3.19.3.1.13.{{ $index }}' index: 'batteryBanksSymmetry4deltaVoltage.{{ $index }}' descr: ΔV Battery banks symmetry 4 divisor: 100 skip_value_lt: 1 - oid: batteryBanksSymmetry5deltaVoltage - num_oid: .1.3.6.1.4.1.12148.9.3.19.3.1.16. + num_oid: '.1.3.6.1.4.1.12148.9.3.19.3.1.16.{{ $index }}' index: 'batteryBanksSymmetry5deltaVoltage.{{ $index }}' descr: ΔV Battery banks symmetry 5 divisor: 100 skip_value_lt: 1 - oid: batteryBanksSymmetry6deltaVoltage - num_oid: .1.3.6.1.4.1.12148.9.3.19.3.1.19. + num_oid: '.1.3.6.1.4.1.12148.9.3.19.3.1.19.{{ $index }}' index: 'batteryBanksSymmetry6deltaVoltage.{{ $index }}' descr: ΔV Battery banks symmetry 6 divisor: 100 skip_value_lt: 1 - oid: batteryBanksSymmetry7deltaVoltage - num_oid: .1.3.6.1.4.1.12148.9.3.19.3.1.22. + num_oid: '.1.3.6.1.4.1.12148.9.3.19.3.1.22.{{ $index }}' index: 'batteryBanksSymmetry7deltaVoltage.{{ $index }}' descr: ΔV Battery banks symmetry 7 divisor: 100 skip_value_lt: 1 - oid: batteryBanksSymmetry8deltaVoltage - num_oid: .1.3.6.1.4.1.12148.9.3.19.3.1.25. + num_oid: '.1.3.6.1.4.1.12148.9.3.19.3.1.25.{{ $index }}' index: 'batteryBanksSymmetry8deltaVoltage.{{ $index }}' descr: ΔV Battery banks symmetry 8 divisor: 100 @@ -205,7 +205,7 @@ modules: - oid: rectifierStatusEntry value: rectifierStatusTemp - num_oid: .1.3.6.1.4.1.12148.9.5.5.2.1.5. + num_oid: '.1.3.6.1.4.1.12148.9.5.5.2.1.5.{{ $index }}' index: 'rectifierStatusTemp.{{ $index }}' descr: Rectifier {{ $index }} divisor: 1 @@ -215,7 +215,7 @@ modules: - oid: rectifier value: rectifierUtilization - num_oid: .1.3.6.1.4.1.12148.9.5.4. + num_oid: '.1.3.6.1.4.1.12148.9.5.4.{{ $index }}' index: 'rectifierUtilization.{{ $index }}' descr: Rectifier current utilization current: @@ -223,14 +223,14 @@ modules: - oid: loadDistribution value: loadDistributionCurrent - num_oid: .1.3.6.1.4.1.12148.9.4.1. + num_oid: '.1.3.6.1.4.1.12148.9.4.1.{{ $index }}' index: 'loadDistributionCurrent.{{ $index }}' descr: Distribution total out divisor: 1 - oid: rectifierStatusEntry value: rectifierStatusOutputCurrent - num_oid: .1.3.6.1.4.1.12148.9.5.5.2.1.3. + num_oid: '.1.3.6.1.4.1.12148.9.5.5.2.1.3.{{ $index }}' index: 'rectifierStatusOutputCurrent.{{ $index }}' descr: Rectifier {{ $index }} out divisor: 10 @@ -238,19 +238,19 @@ modules: - oid: battery value: batteryCurrent - num_oid: .1.3.6.1.4.1.12148.9.3.3. + num_oid: '.1.3.6.1.4.1.12148.9.3.3.{{ $index }}' index: 'batteryCurrent.{{ $index }}' descr: Battery (charge/drain) divisor: 1 - oid: batteryCapacityData value: batteryCapacityLeft - num_oid: .1.3.6.1.4.1.12148.9.3.20.2. + num_oid: '.1.3.6.1.4.1.12148.9.3.20.2.{{ $index }}' index: 'batteryCapacityLeft.{{ $index }}' descr: Battery remaining capacity (Ah) - oid: batteryCapacityData value: batteryCapacityUsed - num_oid: .1.3.6.1.4.1.12148.9.3.20.3. + num_oid: '.1.3.6.1.4.1.12148.9.3.20.3.{{ $index }}' index: 'batteryCapacityUsed.{{ $index }}' descr: Battery capacity used (Ah) diff --git a/includes/definitions/discovery/enexus.yaml b/includes/definitions/discovery/enexus.yaml index 2fff2bf835..0d55385208 100644 --- a/includes/definitions/discovery/enexus.yaml +++ b/includes/definitions/discovery/enexus.yaml @@ -6,7 +6,7 @@ modules: - oid: powerSystem value: powerSystemStatus - num_oid: .1.3.6.1.4.1.12148.10.2.1. + num_oid: '.1.3.6.1.4.1.12148.10.2.1.{{ $index }}' descr: System Status state_name: powerSystemStatus states: @@ -33,7 +33,7 @@ modules: - oid: mains value: mainsStatus - num_oid: .1.3.6.1.4.1.12148.10.3.1. + num_oid: '.1.3.6.1.4.1.12148.10.3.1.{{ $index }}' descr: Mains Status state_name: mainsStatus states: @@ -60,7 +60,7 @@ modules: - oid: rectifiers.rectifierTable.rectifierEntry value: rectifierStatus - num_oid: .1.3.6.1.4.1.12148.10.5.6.1.2. + num_oid: '.1.3.6.1.4.1.12148.10.5.6.1.2.{{ $index }}' descr: Rectifier {{ $index }} Status state_name: rectifierStatus states: @@ -87,7 +87,7 @@ modules: - oid: load value: loadFusesStatus - num_oid: .1.3.6.1.4.1.12148.10.9.3. + num_oid: '.1.3.6.1.4.1.12148.10.9.3.{{ $index }}' descr: Load Fuses {{ $index }} Status state_name: loadFusesStatus states: @@ -114,7 +114,7 @@ modules: - oid: battery value: batteryStatus - num_oid: .1.3.6.1.4.1.12148.10.10.1. + num_oid: '.1.3.6.1.4.1.12148.10.10.1.{{ $index }}' descr: Battery Status state_name: batteryStatus states: @@ -143,17 +143,17 @@ modules: - oid: mains.mainsVoltageTable.mainsVoltageEntry value: mainsVoltageValue - num_oid: .1.3.6.1.4.1.12148.10.3.4.1.6. + num_oid: '.1.3.6.1.4.1.12148.10.3.4.1.6.{{ $index }}' descr: Mains Input Voltage - oid: rectifiers.rectifierTable.rectifierEntry value: rectifierInputVoltageValue - num_oid: .1.3.6.1.4.1.12148.10.5.6.1.4. + num_oid: '.1.3.6.1.4.1.12148.10.5.6.1.4.{{ $index }}' descr: Rectifier {{ $index }} Input Voltage - oid: battery.batteryVoltage value: batteryVoltageValue - num_oid: .1.3.6.1.4.1.12148.10.10.5.5. + num_oid: '.1.3.6.1.4.1.12148.10.10.5.5.{{ $index }}' descr: Battery Voltage divisor: 100 current: @@ -161,19 +161,19 @@ modules: - oid: rectifiers.rectifiersCurrent value: rectifiersCurrentValue - num_oid: .1.3.6.1.4.1.12148.10.5.2.5. + num_oid: '.1.3.6.1.4.1.12148.10.5.2.5.{{ $index }}' descr: System Output Current divisor: 10 - oid: rectifiers.rectifierTable.rectifierEntry value: rectifierOutputCurrentValue - num_oid: .1.3.6.1.4.1.12148.10.5.6.1.3. + num_oid: '.1.3.6.1.4.1.12148.10.5.6.1.3.{{ $index }}' descr: Rectifier {{ $index }} Output Current divisor: 10 - oid: battery.batteryCurrents value: batteryCurrentsValue - num_oid: .1.3.6.1.4.1.12148.10.10.6.5. + num_oid: '.1.3.6.1.4.1.12148.10.10.6.5.{{ $index }}' descr: Battery Current divisor: 10 temperature: @@ -181,12 +181,12 @@ modules: - oid: battery.batteryTemperatures value: batteryTemperaturesValue - num_oid: .1.3.6.1.4.1.12148.10.10.7.5. + num_oid: '.1.3.6.1.4.1.12148.10.10.7.5.{{ $index }}' descr: Battery Temperature runtime: data: - oid: battery.batteryTimeLeft value: batteryTimeLeftValue - num_oid: .1.3.6.1.4.1.12148.10.10.8.5. + num_oid: '.1.3.6.1.4.1.12148.10.10.8.5.{{ $index }}' descr: Battery Run Time Remaining diff --git a/includes/definitions/discovery/epmp.yaml b/includes/definitions/discovery/epmp.yaml index 04673c3550..ca1879a3cb 100644 --- a/includes/definitions/discovery/epmp.yaml +++ b/includes/definitions/discovery/epmp.yaml @@ -12,7 +12,7 @@ modules: data: - oid: cambiumEffectiveSyncSource - num_oid: '.1.3.6.1.4.1.17713.21.1.1.7.' + num_oid: '.1.3.6.1.4.1.17713.21.1.1.7.{{ $index }}' index: '{{ $index }}' descr: GPS Status states: diff --git a/includes/definitions/discovery/ets.yaml b/includes/definitions/discovery/ets.yaml index 0c42932514..7a5cb94fd3 100644 --- a/includes/definitions/discovery/ets.yaml +++ b/includes/definitions/discovery/ets.yaml @@ -5,7 +5,7 @@ modules: data: - oid: etsPrimPowAvail - num_oid: .1.3.6.1.4.1.28507.4.1.2. + num_oid: '.1.3.6.1.4.1.28507.4.1.2.{{ $index }}' descr: 'Primary power' index: 'etsPrimPowAvail.{{ $index }}' states: @@ -13,9 +13,9 @@ modules: - { descr: available, graph: 1, value: 1, generic: 0 } - oid: etsSecPowAvail - num_oid: .1.3.6.1.4.1.28507.4.1.3. + num_oid: '.1.3.6.1.4.1.28507.4.1.3.{{ $index }}' descr: 'Secondary power' index: 'etsSecPowAvail.{{ $index }}' states: - { descr: unavailable, graph: 1, value: 0, generic: 2 } - - { descr: available, graph: 1, value: 1, generic: 0 } \ No newline at end of file + - { descr: available, graph: 1, value: 1, generic: 0 } diff --git a/includes/definitions/discovery/fiberhome-switch.yaml b/includes/definitions/discovery/fiberhome-switch.yaml index 9769118419..170f8c45df 100644 --- a/includes/definitions/discovery/fiberhome-switch.yaml +++ b/includes/definitions/discovery/fiberhome-switch.yaml @@ -5,7 +5,7 @@ modules: - oid: cpuTable value: cpuUsage - num_oid: .1.3.6.1.4.1.3807.1.8012.1.4.1.1.2.{{ $index }} + num_oid: '.1.3.6.1.4.1.3807.1.8012.1.4.1.1.2.{{ $index }}' descr: cpuIndexDescr precision: 100 sensors: @@ -14,7 +14,7 @@ modules: - oid: temperatureTable value: temperatureValue - num_oid: .1.3.6.1.4.1.3807.1.8012.1.6.2.1.5. + num_oid: '.1.3.6.1.4.1.3807.1.8012.1.6.2.1.5.{{ $index }}' descr: temperatureIndexDescr low_limit: temperatureLThreshold high_limit: temperatureHThreshold @@ -24,7 +24,7 @@ modules: - oid: voltageTable value: voltageValue - num_oid: .1.3.6.1.4.1.3807.1.8012.1.7.2.1.5. + num_oid: '.1.3.6.1.4.1.3807.1.8012.1.7.2.1.5.{{ $index }}' descr: 'Int. {{ $voltageIndexDescr }}' low_limit: voltageLThreshold high_limit: voltageHThreshold @@ -34,14 +34,14 @@ modules: - oid: fanCtrlTable value: fanCtrlSpeed - num_oid: .1.3.6.1.4.1.3807.1.8012.1.11.4.1.2. + num_oid: '.1.3.6.1.4.1.3807.1.8012.1.11.4.1.2.{{ $index }}' descr: fanCtrlIndexDescr divisor: 1 state: data: - oid: powerTable - num_oid: .1.3.6.1.4.1.3807.1.8012.1.2.1.1.3. + num_oid: '.1.3.6.1.4.1.3807.1.8012.1.2.1.1.3.{{ $index }}' value: powerState descr: 'Supply {{ $powerIndexDescr }}' state_name: powerState @@ -52,7 +52,7 @@ modules: - oid: cpuTable value: cpuStatus - num_oid: .1.3.6.1.4.1.3807.1.8012.1.4.1.1.7. + num_oid: '.1.3.6.1.4.1.3807.1.8012.1.4.1.1.7.{{ $index }}' descr: CPU Status state_name: cpuStatus states: diff --git a/includes/definitions/discovery/fiberhome.yaml b/includes/definitions/discovery/fiberhome.yaml index f4c00ab1a7..5b4eba4c2c 100644 --- a/includes/definitions/discovery/fiberhome.yaml +++ b/includes/definitions/discovery/fiberhome.yaml @@ -18,7 +18,7 @@ modules: data: - oid: sysTemperature - num_oid: .1.3.6.1.4.1.5875.800.3.9.4.5. + num_oid: '.1.3.6.1.4.1.5875.800.3.9.4.5.{{ $index }}' descr: 'Internal Temperature {{ $index }}' low_limit: 0 high_limit: 100 @@ -28,7 +28,7 @@ modules: data: - oid: fanAlarmStatus - num_oid: .1.3.6.1.4.1.5875.800.3.60.2.1.1. + num_oid: '.1.3.6.1.4.1.5875.800.3.60.2.1.1.{{ $index }}' descr: "Fan slot {{ $index }} Status" state_name: fanState states: @@ -36,7 +36,7 @@ modules: - { descr: Failed, graph: 0, value: 2, generic: 2 } - oid: powerAlarmStatus - num_oid: .1.3.6.1.4.1.5875.800.3.60.1.1.2. + num_oid: '.1.3.6.1.4.1.5875.800.3.60.1.1.2.{{ $index }}' descr: "Power slot {{ $index }} Status" state_name: powerState states: diff --git a/includes/definitions/discovery/fusion.yaml b/includes/definitions/discovery/fusion.yaml index 46b0ca7365..3a33739846 100644 --- a/includes/definitions/discovery/fusion.yaml +++ b/includes/definitions/discovery/fusion.yaml @@ -11,7 +11,7 @@ modules: - oid: portOpticalMonitoringInfoTable value: portOpticalMonitoringInfoVcc - num_oid: .1.3.6.1.4.1.259.6.10.120.1.2.11.1.3. + num_oid: '.1.3.6.1.4.1.259.6.10.120.1.2.11.1.3.{{ $index }}' descr: '{{ $portName }}' index: 'portOpticalMonitoringInfoVcc.{{ $index }}' low_warn_limit: portTransceiverThresholdInfoVccLowWarn @@ -23,7 +23,7 @@ modules: - oid: portOpticalMonitoringInfoTable value: portOpticalMonitoringInfoTxBiasCurrent - num_oid: .1.3.6.1.4.1.259.6.10.120.1.2.11.1.4. + num_oid: '.1.3.6.1.4.1.259.6.10.120.1.2.11.1.4.{{ $index }}' descr: '{{ $portName }} - Tx' index: 'portOpticalMonitoringInfoTxBiasCurrent.{{ $index }}' low_warn_limit: portTransceiverThresholdInfoTxBiasCurrentLowWarn @@ -36,7 +36,7 @@ modules: - oid: portOpticalMonitoringInfoTable value: portOpticalMonitoringInfoTxPower - num_oid: .1.3.6.1.4.1.259.6.10.120.1.2.11.1.5. + num_oid: '.1.3.6.1.4.1.259.6.10.120.1.2.11.1.5.{{ $index }}' descr: '{{ $portName }} - Tx' index: 'portOpticalMonitoringInfoTxPower.{{ $index }}' low_warn_limit: portTransceiverThresholdInfoTxPowerLowWarn @@ -46,7 +46,7 @@ modules: - oid: portOpticalMonitoringInfoTable value: portOpticalMonitoringInfoRxPower - num_oid: .1.3.6.1.4.1.259.6.10.120.1.2.11.1.6. + num_oid: '.1.3.6.1.4.1.259.6.10.120.1.2.11.1.6.{{ $index }}' descr: '{{ $portName }} - Rx' index: 'portOpticalMonitoringInfoRxPower.{{ $index }}' low_warn_limit: portTransceiverThresholdInfoRxPowerLowWarn @@ -58,7 +58,7 @@ modules: - oid: portOpticalMonitoringInfoTable value: portOpticalMonitoringInfoTemperature - num_oid: .1.3.6.1.4.1.259.6.10.120.1.2.11.1.2. + num_oid: '.1.3.6.1.4.1.259.6.10.120.1.2.11.1.2.{{ $index }}' descr: '{{ $portName }}' index: 'portOpticalMonitoringInfoTemperature.{{ $index }}' low_warn_limit: portTransceiverThresholdInfoTemperatureLowWarn @@ -68,7 +68,7 @@ modules: - oid: switchThermalTempTable value: switchThermalTempValue - num_oid: .1.3.6.1.4.1.259.6.10.120.1.1.11.1.3. + num_oid: '.1.3.6.1.4.1.259.6.10.120.1.1.11.1.3.{{ $index }}' descr: 'Thermal {{ $index }}' index: 'switchThermalTempValue.{{ $index }}' fanspeed: @@ -76,7 +76,7 @@ modules: - oid: switchFanTable value: switchFanOperSpeed - num_oid: .1.3.6.1.4.1.259.6.10.120.1.1.9.1.6. + num_oid: '.1.3.6.1.4.1.259.6.10.120.1.1.9.1.6.{{ $index }}' descr: 'Fan {{ $index }}' index: 'switchFanOperSpeed.{{ $index }}' state: @@ -84,7 +84,7 @@ modules: - oid: switchFanTable value: switchFanStatus - num_oid: .1.3.6.1.4.1.259.6.10.120.1.1.9.1.3. + num_oid: '.1.3.6.1.4.1.259.6.10.120.1.1.9.1.3.{{ $index }}' descr: 'Fan {{ $index }}' index: 'switchFanStatus.{{ $index }}' state_name: switchFanStatus @@ -94,7 +94,7 @@ modules: - oid: switchInfoTable value: swPowerStatus - num_oid: .1.3.6.1.4.1.259.6.10.120.1.1.3.1.8. + num_oid: '.1.3.6.1.4.1.259.6.10.120.1.1.3.1.8.{{ $index }}' descr: Power state index: 'swPowerStatus.{{ $index }}' state_name: swPowerStatus @@ -105,7 +105,7 @@ modules: - oid: switchInfoTable value: swRoleInSystem - num_oid: .1.3.6.1.4.1.259.6.10.120.1.1.3.1.9. + num_oid: '.1.3.6.1.4.1.259.6.10.120.1.1.3.1.9.{{ $index }}' descr: Switch role index: 'swRoleInSystem.{{ $index }}' state_name: swRoleInSystem diff --git a/includes/definitions/discovery/fxm.yaml b/includes/definitions/discovery/fxm.yaml index ab970a7617..c56ea6ee98 100644 --- a/includes/definitions/discovery/fxm.yaml +++ b/includes/definitions/discovery/fxm.yaml @@ -8,18 +8,18 @@ modules: - oid: upsOutputTable value: upsOutputVoltage - num_oid: .1.3.6.1.4.1.7309.6.1.4.4.1.2. + num_oid: '.1.3.6.1.4.1.7309.6.1.4.4.1.2.{{ $index }}' index: 'upsOutputVoltage.{{ $index }}' descr: 'Output #{{ $index }}' - oid: upsInputTable value: upsInputVoltage - num_oid: .1.3.6.1.4.1.7309.6.1.3.2.1.3. + num_oid: '.1.3.6.1.4.1.7309.6.1.3.2.1.3.{{ $index }}' index: 'upsInputVoltage.{{ $index }}' descr: 'Input #{{ $index }}' - oid: upsBatteryVoltage - num_oid: .1.3.6.1.4.1.7309.6.1.2.3. + num_oid: '.1.3.6.1.4.1.7309.6.1.2.3.{{ $index }}' index: 'upsBatteryVoltage.{{ $index }}' descr: Battery frequency: @@ -27,12 +27,12 @@ modules: - oid: upsInputTable value: upsInputFrequency - num_oid: .1.3.6.1.4.1.7309.6.1.3.2.1.2. + num_oid: '.1.3.6.1.4.1.7309.6.1.3.2.1.2.{{ $index }}' index: 'upsInputFrequency.{{ $index }}' descr: 'Input #{{ $index }}' - oid: upsOutputFrequency - num_oid: .1.3.6.1.4.1.7309.6.1.4.2. + num_oid: '.1.3.6.1.4.1.7309.6.1.4.2.{{ $index }}' index: 'upsOutputFrequency.{{ $index }}' descr: Output divisor: 10 @@ -43,7 +43,7 @@ modules: - oid: upsOutputTable value: upsOutputCurrent - num_oid: .1.3.6.1.4.1.7309.6.1.4.4.1.3. + num_oid: '.1.3.6.1.4.1.7309.6.1.4.4.1.3.{{ $index }}' index: 'upsOutputCurrent.{{ $index }}' descr: 'Output #{{ $index }}' power: @@ -51,7 +51,7 @@ modules: - oid: upsOutputTable value: upsOutputPowerWatt - num_oid: .1.3.6.1.4.1.7309.6.1.4.4.1.5. + num_oid: '.1.3.6.1.4.1.7309.6.1.4.4.1.5.{{ $index }}' index: 'upsOutputPowerWatt.{{ $index }}' descr: 'Output #{{ $index }}' load: @@ -59,19 +59,19 @@ modules: - oid: upsOutputTable value: upsOutputPercentLoad - num_oid: .1.3.6.1.4.1.7309.6.1.4.4.1.7. + num_oid: '.1.3.6.1.4.1.7309.6.1.4.4.1.7.{{ $index }}' index: 'upsOutputPercentLoad.{{ $index }}' descr: 'Output {{ $index }}' temperature: data: - oid: upsConfigFanOnTemperature - num_oid: .1.3.6.1.4.1.7309.6.1.6.4. + num_oid: '.1.3.6.1.4.1.7309.6.1.6.4.{{ $index }}' index: 'upsConfigFanOnTemperature.{{ $index }}' descr: Fan On - oid: upsBatteryTemperature - num_oid: .1.3.6.1.4.1.7309.6.1.2.6. + num_oid: '.1.3.6.1.4.1.7309.6.1.2.6.{{ $index }}' index: 'upsBatteryTemperature.{{ $index }}' descr: Battery runtime: @@ -80,14 +80,14 @@ modules: data: - oid: upsMinutesOnBattery - num_oid: .1.3.6.1.4.1.7309.6.1.2.2. + num_oid: '.1.3.6.1.4.1.7309.6.1.2.2.{{ $index }}' index: 'upsMinutesOnBattery.{{ $index }}' descr: Minutes on battery state: data: - oid: upsOutputSource - num_oid: .1.3.6.1.4.1.7309.6.1.4.1. + num_oid: '.1.3.6.1.4.1.7309.6.1.4.1.{{ $index }}' descr: Output Source index: 'upsOutputSource.{{ $index }}' state_name: upsOutputSource @@ -105,7 +105,7 @@ modules: - { value: 11, generic: 2, graph: 1, descr: bypass } - oid: upsBatteryStatus - num_oid: .1.3.6.1.4.1.7309.6.1.2.1. + num_oid: '.1.3.6.1.4.1.7309.6.1.2.1.{{ $index }}' descr: Battery Status index: 'upsBatteryStatus.{{ $index }}' state_name: upsBatteryStatus diff --git a/includes/definitions/discovery/gaia.yaml b/includes/definitions/discovery/gaia.yaml index 54db800eed..f014fa577f 100644 --- a/includes/definitions/discovery/gaia.yaml +++ b/includes/definitions/discovery/gaia.yaml @@ -12,7 +12,7 @@ modules: - oid: tempertureSensorStatus value: tempertureSensorStatus - num_oid: .1.3.6.1.4.1.2620.1.6.7.8.1.1.6. + num_oid: '.1.3.6.1.4.1.2620.1.6.7.8.1.1.6.{{ $index }}' descr: '{{ $tempertureSensorName }}, Temperature Out Of Range' index: 'tempertureSensorStatus.{{ $index }}' states: @@ -22,7 +22,7 @@ modules: - oid: fanSpeedSensorStatus value: fanSpeedSensorStatus - num_oid: .1.3.6.1.4.1.2620.1.6.7.8.2.1.6. + num_oid: '.1.3.6.1.4.1.2620.1.6.7.8.2.1.6.{{ $index }}' descr: '{{ $fanSpeedSensorName }}, Fanspeed Out Of Range' index: 'fanSpeedSensorStatus.{{ $index }}' states: @@ -32,7 +32,7 @@ modules: - oid: voltageSensorStatus value: voltageSensorStatus - num_oid: .1.3.6.1.4.1.2620.1.6.7.8.3.1.6. + num_oid: '.1.3.6.1.4.1.2620.1.6.7.8.3.1.6.{{ $index }}' descr: '{{ $voltageSensorName }}, Voltage Out Of Range' index: 'voltageSensorStatus.{{ $index }}' states: @@ -44,7 +44,7 @@ modules: - oid: tempertureSensorValue value: tempertureSensorValue - num_oid: .1.3.6.1.4.1.2620.1.6.7.8.1.1.3. + num_oid: '.1.3.6.1.4.1.2620.1.6.7.8.1.1.3.{{ $index }}' descr: tempertureSensorName index: 'tempertureSensorValue.{{ $index }}' @@ -53,7 +53,7 @@ modules: - oid: fanSpeedSensorValue value: fanSpeedSensorValue - num_oid: .1.3.6.1.4.1.2620.1.6.7.8.2.1.3. + num_oid: '.1.3.6.1.4.1.2620.1.6.7.8.2.1.3.{{ $index }}' descr: fanSpeedSensorName index: 'fanSpeedSensorValue.{{ $index }}' voltage: @@ -61,6 +61,6 @@ modules: - oid: voltageSensorValue value: voltageSensorValue - num_oid: .1.3.6.1.4.1.2620.1.6.7.8.3.1.3. + num_oid: '.1.3.6.1.4.1.2620.1.6.7.8.3.1.3.{{ $index }}' descr: voltageSensorName index: 'voltageSensorValue.{{ $index }}' diff --git a/includes/definitions/discovery/geist-watchdog.yaml b/includes/definitions/discovery/geist-watchdog.yaml index e84d628c2e..e78ea88599 100644 --- a/includes/definitions/discovery/geist-watchdog.yaml +++ b/includes/definitions/discovery/geist-watchdog.yaml @@ -8,38 +8,38 @@ modules: - oid: internalTable value: internalTemp - num_oid: .1.3.6.1.4.1.21239.5.1.2.1.5. + num_oid: '.1.3.6.1.4.1.21239.5.1.2.1.5.{{ $index }}' descr: internalName - oid: tempSensorTable value: tempSensorTemp - num_oid: .1.3.6.1.4.1.21239.5.1.4.1.5. + num_oid: '.1.3.6.1.4.1.21239.5.1.4.1.5.{{ $index }}' descr: tempSensorName - oid: airFlowSensorTable value: airFlowSensorTemp - num_oid: .1.3.6.1.4.1.21239.5.1.5.1.5. + num_oid: '.1.3.6.1.4.1.21239.5.1.5.1.5.{{ $index }}' descr: airFlowSensorName - oid: dewPointSensorTable value: dewPointSensorTemp - num_oid: .1.3.6.1.4.1.21239.5.1.6.1.5. + num_oid: '.1.3.6.1.4.1.21239.5.1.6.1.5.{{ $index }}' descr: dewPointSensorName - oid: t3hdSensorTable value: t3hdSensorIntTemp - num_oid: .1.3.6.1.4.1.21239.5.1.8.1.6. + num_oid: '.1.3.6.1.4.1.21239.5.1.8.1.6.{{ $index }}' descr: t3hdSensorIntName - oid: thdSensorTable value: thdSensorTemp - num_oid: .1.3.6.1.4.1.21239.5.1.9.1.5. + num_oid: '.1.3.6.1.4.1.21239.5.1.9.1.5.{{ $index }}' descr: thdSensorName - oid: thdSensorTable value: thdSensorTempC divisor: 1 - num_oid: .1.3.6.1.4.1.21239.2.32.1.5. + num_oid: '.1.3.6.1.4.1.21239.2.32.1.5.{{ $index }}' descr: thdSensorName skip_values: - @@ -50,7 +50,7 @@ modules: oid: t3hdSensorTable value: t3hdSensorIntTempC divisor: 1 - num_oid: .1.3.6.1.4.1.21239.2.31.1.6. + num_oid: '.1.3.6.1.4.1.21239.2.31.1.6.{{ $index }}' descr: t3hdSensorName skip_values: - @@ -61,7 +61,7 @@ modules: oid: climateRelayTable value: climateRelayTempC divisor: 1 - num_oid: .1.3.6.1.4.1.21239.2.26.1.5. + num_oid: '.1.3.6.1.4.1.21239.2.26.1.5.{{ $index }}' descr: climateRelayName skip_values: - @@ -72,7 +72,7 @@ modules: oid: dewPointSensorTable value: dewPointSensorTempC divisor: 1 - num_oid: .1.3.6.1.4.1.21239.2.17.1.5. + num_oid: '.1.3.6.1.4.1.21239.2.17.1.5.{{ $index }}' descr: dewPointSensorName skip_values: - @@ -83,7 +83,7 @@ modules: oid: vsfcTable value: vsfcIntTempC divisor: 1 - num_oid: .1.3.6.1.4.1.21239.2.13.1.8. + num_oid: '.1.3.6.1.4.1.21239.2.13.1.8.{{ $index }}' descr: vsfcName skip_values: - @@ -94,7 +94,7 @@ modules: oid: airFlowSensorTable value: airFlowSensorTempC divisor: 1 - num_oid: .1.3.6.1.4.1.21239.2.5.1.5. + num_oid: '.1.3.6.1.4.1.21239.2.5.1.5.{{ $index }}' descr: airFlowSensorName skip_values: - @@ -105,7 +105,7 @@ modules: oid: tempSensorTable value: tempSensorTempC divisor: 1 - num_oid: .1.3.6.1.4.1.21239.2.4.1.5. + num_oid: '.1.3.6.1.4.1.21239.2.4.1.5.{{ $index }}' descr: tempSensorName skip_values: - @@ -116,7 +116,7 @@ modules: oid: climateTable value: climateTempC divisor: 1 - num_oid: .1.3.6.1.4.1.21239.2.2.1.5. + num_oid: '.1.3.6.1.4.1.21239.2.2.1.5.{{ $index }}' descr: climateName skip_values: - @@ -127,7 +127,7 @@ modules: oid: dstsTable value: dstsSourceATempC divisor: 1 - num_oid: .1.3.6.1.4.1.21239.2.19.1.13. + num_oid: '.1.3.6.1.4.1.21239.2.19.1.13.{{ $index }}' descr: dstsName skip_values: - @@ -138,7 +138,7 @@ modules: oid: dstsTable value: dstsSourceBTempC divisor: 1 - num_oid: .1.3.6.1.4.1.21239.2.19.1.14. + num_oid: '.1.3.6.1.4.1.21239.2.19.1.14.{{ $index }}' descr: dstsName skip_values: - @@ -150,7 +150,7 @@ modules: - oid: rpmSensorTable value: rpmSensorCurrent - num_oid: .1.3.6.1.4.1.21239.5.1.10.1.10. + num_oid: '.1.3.6.1.4.1.21239.5.1.10.1.10.{{ $index }}' descr: rpmSensorName divisor: 10 voltage: @@ -158,12 +158,12 @@ modules: - oid: rpmSensorTable value: rpmSensorVoltage - num_oid: .1.3.6.1.4.1.21239.5.1.10.1.6. + num_oid: '.1.3.6.1.4.1.21239.5.1.10.1.6.{{ $index }}' descr: rpmSensorName - oid: pos60VdcSensorTable value: pos60VdcSensorVoltage - num_oid: .1.3.6.1.4.1.21239.2.33.1.5. + num_oid: '.1.3.6.1.4.1.21239.2.33.1.5.{{ $index }}' descr: pos60VdcSensorName skip_values: - @@ -173,7 +173,7 @@ modules: - oid: ctrl3ChIECTable value: ctrl3ChIECVoltsA - num_oid: .1.3.6.1.4.1.21239.2.25.1.6. + num_oid: '.1.3.6.1.4.1.21239.2.25.1.6.{{ $index }}' descr: ctrl3ChIECName skip_values: - @@ -183,7 +183,7 @@ modules: - oid: ctrl3ChIECTable value: ctrl3ChIECVoltsB - num_oid: .1.3.6.1.4.1.21239.2.25.1.14. + num_oid: '.1.3.6.1.4.1.21239.2.25.1.14.{{ $index }}' descr: ctrl3ChIECName skip_values: - @@ -193,7 +193,7 @@ modules: - oid: ctrl3ChIECTable value: ctrl3ChIECVoltsC - num_oid: .1.3.6.1.4.1.21239.2.25.1.22. + num_oid: '.1.3.6.1.4.1.21239.2.25.1.22.{{ $index }}' descr: ctrl3ChIECName skip_values: - @@ -203,7 +203,7 @@ modules: - oid: pos30VdcSensorTable value: pos30VdcSensorVoltage - num_oid: .1.3.6.1.4.1.21239.2.23.1.5. + num_oid: '.1.3.6.1.4.1.21239.2.23.1.5.{{ $index }}' descr: pos30VdcSensorName skip_values: - @@ -213,7 +213,7 @@ modules: - oid: neg48VdcSensorTable value: neg48VdcSensorVoltage - num_oid: .1.3.6.1.4.1.21239.2.22.1.5. + num_oid: '.1.3.6.1.4.1.21239.2.22.1.5.{{ $index }}' descr: neg48VdcSensorName skip_values: - @@ -223,7 +223,7 @@ modules: - oid: dstsTable value: dstsVoltsA - num_oid: .1.3.6.1.4.1.21239.2.19.1.5. + num_oid: '.1.3.6.1.4.1.21239.2.19.1.5.{{ $index }}' descr: dstsName skip_values: - @@ -233,7 +233,7 @@ modules: - oid: dstsTable value: dstsVoltsB - num_oid: .1.3.6.1.4.1.21239.2.19.1.7. + num_oid: '.1.3.6.1.4.1.21239.2.19.1.7.{{ $index }}' descr: dstsName skip_values: - @@ -243,7 +243,7 @@ modules: - oid: ctrl3ChTable value: ctrl3ChVoltsA - num_oid: .1.3.6.1.4.1.21239.2.14.1.5. + num_oid: '.1.3.6.1.4.1.21239.2.14.1.5.{{ $index }}' descr: ctrl3ChName skip_values: - @@ -253,7 +253,7 @@ modules: - oid: ctrl3ChTable value: ctrl3ChVoltsB - num_oid: .1.3.6.1.4.1.21239.2.14.1.12. + num_oid: '.1.3.6.1.4.1.21239.2.14.1.12.{{ $index }}' descr: ctrl3ChName skip_values: - @@ -263,7 +263,7 @@ modules: - oid: ctrl3ChTable value: ctrl3ChVoltsC - num_oid: .1.3.6.1.4.1.21239.2.14.1.19. + num_oid: '.1.3.6.1.4.1.21239.2.14.1.19.{{ $index }}' descr: ctrl3ChName skip_values: - @@ -273,7 +273,7 @@ modules: - oid: pow3ChTable value: pow3ChVoltsA - num_oid: .1.3.6.1.4.1.21239.2.11.1.6. + num_oid: '.1.3.6.1.4.1.21239.2.11.1.6.{{ $index }}' descr: pow3ChName skip_values: - @@ -283,7 +283,7 @@ modules: - oid: pow3ChTable value: pow3ChVoltsB - num_oid: .1.3.6.1.4.1.21239.2.11.1.15. + num_oid: '.1.3.6.1.4.1.21239.2.11.1.15.{{ $index }}' descr: pow3ChName skip_values: - @@ -293,7 +293,7 @@ modules: - oid: pow3ChTable value: pow3ChVoltsC - num_oid: .1.3.6.1.4.1.21239.2.11.1.24. + num_oid: '.1.3.6.1.4.1.21239.2.11.1.24.{{ $index }}' descr: pow3ChName skip_values: - @@ -303,7 +303,7 @@ modules: - oid: powMonTable value: powMonVolts - num_oid: .1.3.6.1.4.1.21239.2.3.1.6. + num_oid: '.1.3.6.1.4.1.21239.2.3.1.6.{{ $index }}' descr: powMonName skip_values: - @@ -314,7 +314,7 @@ modules: oid: climateTable value: climateVolts divisor: 1 - num_oid: .1.3.6.1.4.1.21239.2.2.1.14. + num_oid: '.1.3.6.1.4.1.21239.2.2.1.14.{{ $index }}' descr: climateName skip_values: - @@ -326,22 +326,22 @@ modules: - oid: thdSensorTable value: thdSensorHumidity - num_oid: .1.3.6.1.4.1.21239.5.1.9.1.6. + num_oid: '.1.3.6.1.4.1.21239.5.1.9.1.6.{{ $index }}' descr: thdSensorName - oid: t3hdSensorTable value: t3hdSensorIntHumidity - num_oid: .1.3.6.1.4.1.21239.5.1.8.1.7. + num_oid: '.1.3.6.1.4.1.21239.5.1.8.1.7.{{ $index }}' descr: t3hdSensorIntName - oid: internalTable value: internalHumidity - num_oid: .1.3.6.1.4.1.21239.5.1.2.1.6. + num_oid: '.1.3.6.1.4.1.21239.5.1.2.1.6.{{ $index }}' descr: internalName - oid: thdSensorTable value: thdSensorHumidity - num_oid: .1.3.6.1.4.1.21239.2.32.1.7. + num_oid: '.1.3.6.1.4.1.21239.2.32.1.7.{{ $index }}' descr: thdSensorName skip_values: - @@ -352,7 +352,7 @@ modules: oid: t3hdSensorTable value: t3hdSensorIntHumidity divisor: 1 - num_oid: .1.3.6.1.4.1.21239.2.31.1.8. + num_oid: '.1.3.6.1.4.1.21239.2.31.1.8.{{ $index }}' descr: t3hdSensorName skip_values: - @@ -363,7 +363,7 @@ modules: oid: dewPointSensorTable value: dewPointSensorHumidity divisor: 1 - num_oid: .1.3.6.1.4.1.21239.2.17.1.7. + num_oid: '.1.3.6.1.4.1.21239.2.17.1.7.{{ $index }}' descr: dewPointSensorName skip_values: - @@ -374,7 +374,7 @@ modules: oid: airFlowSensorTable value: airFlowSensorHumidity divisor: 1 - num_oid: .1.3.6.1.4.1.21239.2.5.1.8. + num_oid: '.1.3.6.1.4.1.21239.2.5.1.8.{{ $index }}' descr: airFlowSensorName skip_values: - @@ -385,7 +385,7 @@ modules: oid: climateTable value: climateHumidity divisor: 1 - num_oid: .1.3.6.1.4.1.21239.2.2.1.7. + num_oid: '.1.3.6.1.4.1.21239.2.2.1.7.{{ $index }}' descr: climateName skip_values: - @@ -397,13 +397,13 @@ modules: - oid: airFlowSensorTable value: airFlowSensorFlow - num_oid: .1.3.6.1.4.1.21239.5.1.5.1.6. + num_oid: '.1.3.6.1.4.1.21239.5.1.5.1.6.{{ $index }}' descr: airFlowSensorName - oid: climateTable value: climateAirflow divisor: 1 - num_oid: .1.3.6.1.4.1.21239.2.2.1.9. + num_oid: '.1.3.6.1.4.1.21239.2.2.1.9.{{ $index }}' descr: climateName skip_values: - @@ -416,10 +416,10 @@ modules: oid: vsfcTable value: vsfcFanSpeed divisor: 1 - num_oid: .1.3.6.1.4.1.21239.2.13.1.7. + num_oid: '.1.3.6.1.4.1.21239.2.13.1.7.{{ $index }}' descr: vsfcName skip_values: - oid: vsfcAvail op: '!=' - value: 1 \ No newline at end of file + value: 1 diff --git a/includes/definitions/discovery/himoinsa-gensets.yaml b/includes/definitions/discovery/himoinsa-gensets.yaml index 9ec637efe8..7164dde793 100644 --- a/includes/definitions/discovery/himoinsa-gensets.yaml +++ b/includes/definitions/discovery/himoinsa-gensets.yaml @@ -5,14 +5,14 @@ modules: data: - oid: conmutationmeasuresTable - num_oid: .1.3.6.1.4.1.41809.1.49.1.1. + num_oid: '.1.3.6.1.4.1.41809.1.49.1.1.{{ $index }}' value: mainsFreqConm index: 'mainsFreqConm.{{ $index }}' descr: Mains frequency divisor: 10 - oid: conmutationmeasuresTable - num_oid: .1.3.6.1.4.1.41809.1.49.1.8. + num_oid: '.1.3.6.1.4.1.41809.1.49.1.8.{{ $index }}' value: genFreqConm index: 'genFreqConm.{{ $index }}' descr: Genset frequency @@ -21,73 +21,73 @@ modules: data: - oid: conmutationmeasuresTable - num_oid: .1.3.6.1.4.1.41809.1.49.1.2. + num_oid: '.1.3.6.1.4.1.41809.1.49.1.2.{{ $index }}' value: mainsVL12Conm index: 'mainsVL12Conm.{{ $index }}' descr: Mains voltage 12 - oid: conmutationmeasuresTable - num_oid: .1.3.6.1.4.1.41809.1.49.1.3. + num_oid: '.1.3.6.1.4.1.41809.1.49.1.3.{{ $index }}' value: mainsVL23Conm index: 'mainsVL23Conm.{{ $index }}' descr: Mains voltage 23 - oid: conmutationmeasuresTable - num_oid: .1.3.6.1.4.1.41809.1.49.1.4. + num_oid: '.1.3.6.1.4.1.41809.1.49.1.4.{{ $index }}' value: mainsVL13Conm index: 'mainsVL13Conm.{{ $index }}' descr: Mains voltage 13 - oid: conmutationmeasuresTable - num_oid: .1.3.6.1.4.1.41809.1.49.1.5. + num_oid: '.1.3.6.1.4.1.41809.1.49.1.5.{{ $index }}' value: mainsVL1NConm index: 'mainsVL1NConm.{{ $index }}' descr: Mains voltage 1N - oid: conmutationmeasuresTable - num_oid: .1.3.6.1.4.1.41809.1.49.1.6. + num_oid: '.1.3.6.1.4.1.41809.1.49.1.6.{{ $index }}' value: mainsVL2NConm index: 'mainsVL2NConm.{{ $index }}' descr: Mains voltage 2N - oid: conmutationmeasuresTable - num_oid: .1.3.6.1.4.1.41809.1.49.1.7. + num_oid: '.1.3.6.1.4.1.41809.1.49.1.7.{{ $index }}' value: mainsVL3NConm index: 'mainsVL3NConm.{{ $index }}' descr: Mains voltage 3N - oid: conmutationmeasuresTable - num_oid: .1.3.6.1.4.1.41809.1.49.1.9. + num_oid: '.1.3.6.1.4.1.41809.1.49.1.9.{{ $index }}' value: genVL12Conm index: 'genVL12Conm.{{ $index }}' descr: Genset voltage 12 - oid: conmutationmeasuresTable - num_oid: .1.3.6.1.4.1.41809.1.49.1.10. + num_oid: '.1.3.6.1.4.1.41809.1.49.1.10.{{ $index }}' value: genVL23Conm index: 'genVL23Conm.{{ $index }}' descr: Genset voltage 23 - oid: conmutationmeasuresTable - num_oid: .1.3.6.1.4.1.41809.1.49.1.11. + num_oid: '.1.3.6.1.4.1.41809.1.49.1.11.{{ $index }}' value: genVL13Conm index: 'genVL13Conm.{{ $index }}' descr: Genset voltage 13 - oid: conmutationmeasuresTable - num_oid: .1.3.6.1.4.1.41809.1.49.1.12. + num_oid: '.1.3.6.1.4.1.41809.1.49.1.12.{{ $index }}' value: genVL1NConm index: 'genVL1NConm.{{ $index }}' descr: Genset voltage 1N - oid: conmutationmeasuresTable - num_oid: .1.3.6.1.4.1.41809.1.49.1.13. + num_oid: '.1.3.6.1.4.1.41809.1.49.1.13.{{ $index }}' value: genVL2NConm index: 'genVL2NConm.{{ $index }}' descr: Genset voltage 2N - oid: conmutationmeasuresTable - num_oid: .1.3.6.1.4.1.41809.1.49.1.14. + num_oid: '.1.3.6.1.4.1.41809.1.49.1.14.{{ $index }}' value: genVL3NConm index: 'genVL3NConm.{{ $index }}' descr: Genset voltage 3N @@ -95,19 +95,19 @@ modules: data: - oid: conmutationmeasuresTable - num_oid: .1.3.6.1.4.1.41809.1.49.1.15. + num_oid: '.1.3.6.1.4.1.41809.1.49.1.15.{{ $index }}' value: ph1AmpConm index: 'ph1AmpConm.{{ $index }}' descr: Phase current 1 - oid: conmutationmeasuresTable - num_oid: .1.3.6.1.4.1.41809.1.49.1.16. + num_oid: '.1.3.6.1.4.1.41809.1.49.1.16.{{ $index }}' value: ph2AmpConm index: 'ph2AmpConm.{{ $index }}' descr: Phase current 2 - oid: conmutationmeasuresTable - num_oid: .1.3.6.1.4.1.41809.1.49.1.17. + num_oid: '.1.3.6.1.4.1.41809.1.49.1.17.{{ $index }}' value: ph3AmpConm index: 'ph3AmpConm.{{ $index }}' descr: Phase current 3 diff --git a/includes/definitions/discovery/hiveos-wireless.yaml b/includes/definitions/discovery/hiveos-wireless.yaml index 0d20fdbd64..6ecdf07fc3 100644 --- a/includes/definitions/discovery/hiveos-wireless.yaml +++ b/includes/definitions/discovery/hiveos-wireless.yaml @@ -6,6 +6,6 @@ modules: - oid: ahSystem value: ahEnvirmentTemp - num_oid: .1.3.6.1.4.1.26928.1.2.10. + num_oid: '.1.3.6.1.4.1.26928.1.2.10.{{ $index }}' index: 0 descr: 'Internal Temperature' diff --git a/includes/definitions/discovery/hpe-ilo.yaml b/includes/definitions/discovery/hpe-ilo.yaml index 8d4cb99cbb..d97e027161 100644 --- a/includes/definitions/discovery/hpe-ilo.yaml +++ b/includes/definitions/discovery/hpe-ilo.yaml @@ -6,7 +6,7 @@ modules: - oid: cpqHeFltTolPowerSupplyTable value: cpqHeFltTolPowerSupplyCapacityUsed - num_oid: .1.3.6.1.4.1.232.6.2.9.3.1.7. + num_oid: '.1.3.6.1.4.1.232.6.2.9.3.1.7.{{ $index }}' index: 'cpqHeFltTolPowerSupplyBay.{{ $index }}' descr: 'PowerSupply #{{ $cpqHeFltTolPowerSupplyBay }}' high_limit: cpqHeFltTolPowerSupplyCapacityMaximum @@ -15,7 +15,7 @@ modules: - oid: cpqHeTemperatureTable value: cpqHeTemperatureCelsius - num_oid: .1.3.6.1.4.1.232.6.2.6.8.1.4. + num_oid: '.1.3.6.1.4.1.232.6.2.6.8.1.4.{{ $index }}' snmp_flags: '-OQUs' index: 'cpqHeTemperatureCelsius.{{ $index }}' descr: cpqHeTemperatureLocale @@ -23,7 +23,7 @@ modules: - oid: cpqDaPhyDrvTable value: cpqDaPhyDrvCurrentTemperature - num_oid: .1.3.6.1.4.1.232.3.2.5.1.1.70. + num_oid: '.1.3.6.1.4.1.232.3.2.5.1.1.70.{{ $index }}' snmp_flags: '-OQUs' index: 'cpqDaPhyDrvCurrentTemperature.{{ $index }}' descr: cpqDaPhyDrvLocationString @@ -32,7 +32,7 @@ modules: - oid: cpqDaPhyDrvTable value: cpqDaPhyDrvCondition - num_oid: .1.3.6.1.4.1.232.3.2.5.1.1.37. + num_oid: '.1.3.6.1.4.1.232.3.2.5.1.1.37.{{ $index }}' descr: 'Disk #{{ $cpqDaPhyDrvLocationString }}' index: 'cpqDaPhyDrvCondition.{{ $index }}' state_name: cpqDaPhyDrvCondition @@ -44,7 +44,7 @@ modules: - oid: cpqHeFltTolPowerSupplyTable value: cpqHeFltTolPowerSupplyCondition - num_oid: .1.3.6.1.4.1.232.6.2.9.3.1.4. + num_oid: '.1.3.6.1.4.1.232.6.2.9.3.1.4.{{ $index }}' descr: 'PowerSupply #{{ $cpqHeFltTolPowerSupplyBay }}' index: 'cpqHeFltTolPowerSupplyCondition.{{ $index }}' state_name: cpqHeFltTolPowerSupplyCondition @@ -56,7 +56,7 @@ modules: - oid: cpqHeFltTolFanTable value: cpqHeFltTolFanCondition - num_oid: .1.3.6.1.4.1.232.6.2.6.7.1.9. + num_oid: '.1.3.6.1.4.1.232.6.2.6.7.1.9.{{ $index }}' descr: 'Fan #{{ $cpqHeFltTolFanIndex }}' index: 'cpqHeFltTolFanCondition.{{ $index }}' state_name: cpqHeFltTolFanCondition @@ -68,7 +68,7 @@ modules: - oid: cpqSeCpuTable value: cpqSeCpuStatus - num_oid: .1.3.6.1.4.1.232.1.2.2.1.1.6. + num_oid: '.1.3.6.1.4.1.232.1.2.2.1.1.6.{{ $index }}' descr: 'Processor #{{ $cpqSeCpuSlot }}' index: 'cpqSeCpuStatus.{{ $index }}' state_name: cpqSeCpuStatus @@ -80,7 +80,7 @@ modules: - oid: cpqHeResMem2ModuleTable value: cpqHeResMem2ModuleCondition - num_oid: .1.3.6.1.4.1.232.6.2.14.13.1.20. + num_oid: '.1.3.6.1.4.1.232.6.2.14.13.1.20.{{ $index }}' descr: cpqHeResMem2ModuleHwLocation index: 'cpqHeResMem2ModuleCondition.{{ $index }}' state_name: cpqHeResMem2ModuleCondition @@ -92,7 +92,7 @@ modules: - oid: cpqDaCntlrTable value: cpqDaCntlrCondition - num_oid: .1.3.6.1.4.1.232.3.2.2.1.1.6. + num_oid: '.1.3.6.1.4.1.232.3.2.2.1.1.6.{{ $index }}' descr: 'Array Controller Slot#{{ $cpqDaCntlrSlot }}' index: 'cpqDaCntlrCondition.{{ $index }}' state_name: cpqDaCntlrCondition @@ -104,7 +104,7 @@ modules: - oid: cpqDaLogDrvTable value: cpqDaLogDrvCondition - num_oid: .1.3.6.1.4.1.232.3.2.3.1.1.11. + num_oid: '.1.3.6.1.4.1.232.3.2.3.1.1.11.{{ $index }}' descr: 'Logical Drive #{{ $cpqDaLogDrvIndex }}' index: 'cpqDaLogDrvCondition.{{ $index }}' state_name: cpqDaLogDrvCondition diff --git a/includes/definitions/discovery/hpe-ipdu.yaml b/includes/definitions/discovery/hpe-ipdu.yaml index 304bad7f15..46e1b2e015 100644 --- a/includes/definitions/discovery/hpe-ipdu.yaml +++ b/includes/definitions/discovery/hpe-ipdu.yaml @@ -6,7 +6,7 @@ modules: - oid: mpduOutputEntry value: mpduOutputCurrent - num_oid: .1.3.6.1.4.1.232.165.5.2.1.1.7. + num_oid: '.1.3.6.1.4.1.232.165.5.2.1.1.7.{{ $index }}' skip_values: -1 divisor: 100 index: 'mpduOutputCurrent.{{ $index }}' @@ -16,7 +16,7 @@ modules: - oid: mpduOutputEntry value: mpduOutputPercentLoad - num_oid: .1.3.6.1.4.1.232.165.5.2.1.1.5. + num_oid: '.1.3.6.1.4.1.232.165.5.2.1.1.5.{{ $index }}' skip_values: -1 divisor: 10 index: 'mpduOutputPercentLoad.{{ $index }}' @@ -28,7 +28,7 @@ modules: - oid: mpduOutputEntry value: mpduOutputPowerFactor - num_oid: .1.3.6.1.4.1.232.165.5.2.1.1.10. + num_oid: '.1.3.6.1.4.1.232.165.5.2.1.1.10.{{ $index }}' skip_values: -1 divisor: 100 index: 'mpduOutputPowerFactor.{{ $index }}' @@ -38,7 +38,7 @@ modules: - oid: mpduOutputEntry value: mpduOutputVoltage - num_oid: .1.3.6.1.4.1.232.165.5.2.1.1.6. + num_oid: '.1.3.6.1.4.1.232.165.5.2.1.1.6.{{ $index }}' skip_values: -1 divisor: 10 index: 'mpduOutputVoltage.{{ $index }}' diff --git a/includes/definitions/discovery/hpe-msa.yaml b/includes/definitions/discovery/hpe-msa.yaml index 91595e2bef..abf5b94b55 100644 --- a/includes/definitions/discovery/hpe-msa.yaml +++ b/includes/definitions/discovery/hpe-msa.yaml @@ -6,7 +6,7 @@ modules: - oid: connUnitSensorTable value: connUnitSensorStatus - num_oid: .1.3.6.1.3.94.1.8.1.4. + num_oid: '.1.3.6.1.3.94.1.8.1.4.{{ $index }}' descr: connUnitSensorName index: 'connUnitSensorStatus.{{ $index }}' snmp_flags: '-OQUsbe' @@ -20,7 +20,7 @@ modules: - oid: connUnitTable value: connUnitState - num_oid: .1.3.6.1.3.94.1.6.1.5. + num_oid: '.1.3.6.1.3.94.1.6.1.5.{{ $index }}' descr: connUnitName index: 'connUnitState.{{ $index }}' snmp_flags: '-OQUsbe' @@ -32,7 +32,7 @@ modules: - oid: connUnitTable value: connUnitStatus - num_oid: .1.3.6.1.3.94.1.6.1.6. + num_oid: '.1.3.6.1.3.94.1.6.1.6.{{ $index }}' descr: connUnitName index: 'connUnitStatus.{{ $index }}' snmp_flags: '-OQUsbe' diff --git a/includes/definitions/discovery/hpe-msl.yaml b/includes/definitions/discovery/hpe-msl.yaml index 185ac09daa..0156f096df 100644 --- a/includes/definitions/discovery/hpe-msl.yaml +++ b/includes/definitions/discovery/hpe-msl.yaml @@ -5,7 +5,7 @@ modules: data: - oid: hpHttpMgHealth - num_oid: .1.3.6.1.4.1.11.2.36.1.1.2.3. + num_oid: '.1.3.6.1.4.1.11.2.36.1.1.2.3.{{ $index }}' index: 'hpHttpMgHealth.{{ $index }}' descr: Operating Status states: diff --git a/includes/definitions/discovery/hwg-poseidon.yaml b/includes/definitions/discovery/hwg-poseidon.yaml index a27ddd0f99..ee175f6e27 100644 --- a/includes/definitions/discovery/hwg-poseidon.yaml +++ b/includes/definitions/discovery/hwg-poseidon.yaml @@ -6,7 +6,7 @@ modules: - oid: sensTable value: sensValue - num_oid: .1.3.6.1.4.1.21796.3.3.3.1.6. + num_oid: '.1.3.6.1.4.1.21796.3.3.3.1.6.{{ $index }}' divisor: 10 descr: sensName index: 'sensTable.{{ $index }}' @@ -20,7 +20,7 @@ modules: - oid: sensTable value: sensValue - num_oid: .1.3.6.1.4.1.21796.3.3.3.1.6. + num_oid: '.1.3.6.1.4.1.21796.3.3.3.1.6.{{ $index }}' divisor: 10 descr: sensName index: 'sensTable.{{ $index }}' @@ -34,7 +34,7 @@ modules: - oid: inpTable value: inpValue - num_oid: .1.3.6.1.4.1.21796.4.1.1.1.2. + num_oid: '.1.3.6.1.4.1.21796.4.1.1.1.2.{{ $index }}' descr: inpName index: 'inpValue.{{ $index }}' state_name: inpValue @@ -44,7 +44,7 @@ modules: - oid: inpTable value: inpAlarmState - num_oid: .1.3.6.1.4.1.21796.4.1.1.1.4. + num_oid: '.1.3.6.1.4.1.21796.4.1.1.1.4.{{ $index }}' descr: 'alarm : {{ $inpName }}' index: 'inpAlarmState.{{ $index }}' state_name: inpAlarmState @@ -54,7 +54,7 @@ modules: - oid: sensTable value: sensState - num_oid: .1.3.6.1.4.1.21796.4.1.3.1.3. + num_oid: '.1.3.6.1.4.1.21796.4.1.3.1.3.{{ $index }}' descr: sensName index: 'sensState.{{ $index }}' state_name: sensName diff --git a/includes/definitions/discovery/hwg-ste.yaml b/includes/definitions/discovery/hwg-ste.yaml index c5c487606e..7d71900ead 100644 --- a/includes/definitions/discovery/hwg-ste.yaml +++ b/includes/definitions/discovery/hwg-ste.yaml @@ -6,7 +6,7 @@ modules: - oid: sensTable value: sensValue - num_oid: .1.3.6.1.4.1.21796.4.1.3.1.5. + num_oid: '.1.3.6.1.4.1.21796.4.1.3.1.5.{{ $index }}' divisor: 10 descr: sensName index: 'sensTable.{{ $index }}' @@ -20,7 +20,7 @@ modules: - oid: sensTable value: sensValue - num_oid: .1.3.6.1.4.1.21796.4.1.3.1.5. + num_oid: '.1.3.6.1.4.1.21796.4.1.3.1.5.{{ $index }}' divisor: 10 descr: sensName index: 'sensTable.{{ $index }}' @@ -34,7 +34,7 @@ modules: - oid: inpTable value: inpValue - num_oid: .1.3.6.1.4.1.21796.4.1.1.1.2. + num_oid: '.1.3.6.1.4.1.21796.4.1.1.1.2.{{ $index }}' descr: inpName index: 'inpValue.{{ $index }}' state_name: inpValue @@ -44,7 +44,7 @@ modules: - oid: inpTable value: inpAlarmState - num_oid: .1.3.6.1.4.1.21796.4.1.1.1.4. + num_oid: '.1.3.6.1.4.1.21796.4.1.1.1.4.{{ $index }}' descr: 'alarm : {{ $inpName }}' index: 'inpAlarmState.{{ $index }}' state_name: inpAlarmState @@ -54,7 +54,7 @@ modules: - oid: sensTable value: sensState - num_oid: .1.3.6.1.4.1.21796.4.1.3.1.3. + num_oid: '.1.3.6.1.4.1.21796.4.1.3.1.3.{{ $index }}' descr: sensName index: 'sensState.{{ $index }}' state_name: sensName diff --git a/includes/definitions/discovery/hwg-ste2.yaml b/includes/definitions/discovery/hwg-ste2.yaml index bf12e5f708..d35d5bbc61 100644 --- a/includes/definitions/discovery/hwg-ste2.yaml +++ b/includes/definitions/discovery/hwg-ste2.yaml @@ -6,7 +6,7 @@ modules: - oid: sensTable value: sensValue - num_oid: .1.3.6.1.4.1.21796.4.9.3.1.5. + num_oid: '.1.3.6.1.4.1.21796.4.9.3.1.5.{{ $index }}' descr: sensName index: '{{ $index }}' divisor: 10 @@ -20,7 +20,7 @@ modules: - oid: sensTable value: sensValue - num_oid: .1.3.6.1.4.1.21796.4.9.3.1.5. + num_oid: '.1.3.6.1.4.1.21796.4.9.3.1.5.{{ $index }}' descr: sensName index: '{{ $index }}' divisor: 10 @@ -34,7 +34,7 @@ modules: - oid: inpTable value: inpAlarmState - num_oid: .1.3.6.1.4.1.21796.4.9.1.1.4. + num_oid: '.1.3.6.1.4.1.21796.4.9.1.1.4.{{ $index }}' descr: 'Alarm: {{ $inpName }}' index: 'inpAlarmState.{{ $index }}' state_name: inpAlarmState diff --git a/includes/definitions/discovery/ibmc.yaml b/includes/definitions/discovery/ibmc.yaml index 4b859a7367..639f64ea25 100644 --- a/includes/definitions/discovery/ibmc.yaml +++ b/includes/definitions/discovery/ibmc.yaml @@ -8,7 +8,7 @@ modules: - oid: fanDescriptionEntry value: fanSpeed - num_oid: .1.3.6.1.4.1.2011.2.235.1.1.8.50.1.2. + num_oid: '.1.3.6.1.4.1.2011.2.235.1.1.8.50.1.2.{{ $index }}' descr: 'fanDevicename' index: 'fanSpeed.{{ $index }}' power: @@ -18,7 +18,7 @@ modules: - oid: powerSupplyDescriptionEntry value: powerSupplyInputPower - num_oid: .1.3.6.1.4.1.2011.2.235.1.1.6.50.1.8. + num_oid: '.1.3.6.1.4.1.2011.2.235.1.1.6.50.1.8.{{ $index }}' descr: 'Power Supply {{ $index }} Input' index: 'powerSupplyIndex.{{ $index }}' temperature: @@ -27,7 +27,7 @@ modules: oid: TemperatureDescriptionEntry value: temperatureReading divisor: 10 - num_oid: .1.3.6.1.4.1.2011.2.235.1.1.26.50.1.3. + num_oid: '.1.3.6.1.4.1.2011.2.235.1.1.26.50.1.3.{{ $index }}' descr: 'temperatureObject' index: 'temperatureIndex.{{ $index }}' state: @@ -35,7 +35,7 @@ modules: - oid: cpuDescriptionEntry value: cpuStatus - num_oid: .1.3.6.1.4.1.2011.2.235.1.1.15.50.1.6. + num_oid: '.1.3.6.1.4.1.2011.2.235.1.1.15.50.1.6.{{ $index }}' descr: 'Processor {{ $cpuFamily }} @{{ $cpuClockRate }} #{{ $cpuIndex }}' index: 'cpuStatus.{{ $index }}' state_name: cpuStatus @@ -49,7 +49,7 @@ modules: - oid: hardDiskDescriptionEntry value: hardDiskStatus - num_oid: .1.3.6.1.4.1.2011.2.235.1.1.18.50.1.3. + num_oid: '.1.3.6.1.4.1.2011.2.235.1.1.18.50.1.3.{{ $index }}' descr: 'Drive Bay {{ $index }} {{ $hardDiskDevicename }}' index: 'hardDiskStatus.{{ $index }}' state_name: hardDiskStatus @@ -63,7 +63,7 @@ modules: - oid: fanDescriptionEntry value: fanStatus - num_oid: .1.3.6.1.4.1.2011.2.235.1.1.8.50.1.4. + num_oid: '.1.3.6.1.4.1.2011.2.235.1.1.8.50.1.4.{{ $index }}' descr: 'fanDevicename' index: 'fanSpeed.{{ $index }}' state_name: fanStatus @@ -77,7 +77,7 @@ modules: - oid: memoryEntireStatus value: memoryEntireStatus - num_oid: .1.3.6.1.4.1.2011.2.235.1.1.16.1. + num_oid: '.1.3.6.1.4.1.2011.2.235.1.1.16.1.{{ $index }}' descr: 'Memory Status' index: 'memoryEntireStatus.{{ $index }}' state_name: memoryEntireStatus @@ -91,7 +91,7 @@ modules: - oid: memoryDescriptionEntry value: memoryStatus - num_oid: .1.3.6.1.4.1.2011.2.235.1.1.16.50.1.6. + num_oid: '.1.3.6.1.4.1.2011.2.235.1.1.16.50.1.6.{{ $index }}' descr: '{{ $memoryLogic }} {{ $memoryManufacturer }} {{ $memorySize }} {{ $memoryClockRate }}' index: 'memoryStatus.{{ $index }}' state_name: memoryStatus diff --git a/includes/definitions/discovery/ird.yaml b/includes/definitions/discovery/ird.yaml index 6a8b6f7d2a..24062ce546 100644 --- a/includes/definitions/discovery/ird.yaml +++ b/includes/definitions/discovery/ird.yaml @@ -5,18 +5,18 @@ modules: data: - oid: tunerBER - num_oid: .1.3.6.1.4.1.1070.3.1.1.104.1.1.7. + num_oid: '.1.3.6.1.4.1.1070.3.1.1.104.1.1.7.{{ $index }}' descr: 'BER' index: 'tunerBER.{{ $index }}' - oid: tunerCN - num_oid: .1.3.6.1.4.1.1070.3.1.1.104.1.1.8. + num_oid: '.1.3.6.1.4.1.1070.3.1.1.104.1.1.8.{{ $index }}' descr: 'C/N' index: 'tunerCN.{{ $index }}' divisor: 10 - oid: tunerEbNo - num_oid: .1.3.6.1.4.1.1070.3.1.1.104.1.1.9. + num_oid: '.1.3.6.1.4.1.1070.3.1.1.104.1.1.9.{{ $index }}' descr: 'Eb/N0' index: 'tunerEbNo.{{ $index }}' divisor: 10 @@ -24,7 +24,7 @@ modules: data: - oid: tunerStrength - num_oid: .1.3.6.1.4.1.1070.3.1.1.104.1.1.6. + num_oid: '.1.3.6.1.4.1.1070.3.1.1.104.1.1.6.{{ $index }}' descr: 'Signal Strength' index: 'tunerStrength.{{ $index }}' divisor: -10 @@ -32,7 +32,7 @@ modules: data: - oid: tunerLock - num_oid: .1.3.6.1.4.1.1070.3.1.1.104.1.1.1. + num_oid: '.1.3.6.1.4.1.1070.3.1.1.104.1.1.1.{{ $index }}' descr: Tuner Lock state_name: tunerLock states: @@ -40,7 +40,7 @@ modules: - { descr: Yes, graph: 1, value: 1, generic: 0 } - oid: lnbVoltage - num_oid: .1.3.6.1.4.1.1070.3.1.1.104.3.4. + num_oid: '.1.3.6.1.4.1.1070.3.1.1.104.3.4.{{ $index }}' descr: LNB Voltage state_name: lnbVoltage states: @@ -49,7 +49,7 @@ modules: - { descr: 18V, graph: 1, value: 2, generic: 0 } - oid: lnb22KHz - num_oid: .1.3.6.1.4.1.1070.3.1.1.104.3.5. + num_oid: '.1.3.6.1.4.1.1070.3.1.1.104.3.5.{{ $index }}' descr: LNB 22KHz state_name: lnb22KHz states: @@ -57,7 +57,7 @@ modules: - { descr: On, graph: 1, value: 1, generic: 0 } - oid: diseqc - num_oid: .1.3.6.1.4.1.1070.3.1.1.104.3.6. + num_oid: '.1.3.6.1.4.1.1070.3.1.1.104.3.6.{{ $index }}' descr: DiSEqC state_name: diseq states: diff --git a/includes/definitions/discovery/junos.yaml b/includes/definitions/discovery/junos.yaml index f80f8e06dc..51e403dfb3 100644 --- a/includes/definitions/discovery/junos.yaml +++ b/includes/definitions/discovery/junos.yaml @@ -24,7 +24,7 @@ modules: - oid: jnxOpticsPMCurrentTable value: jnxPMCurChromaticDispersion - num_oid: .1.3.6.1.4.1.2636.3.71.1.2.1.1.1. + num_oid: '.1.3.6.1.4.1.2636.3.71.1.2.1.1.1.{{ $index }}' entPhysicalIndex: '{{ $index }}' entPhysicalIndex_measured: 'ports' descr: '{{ $ifDescr }} CD' @@ -34,7 +34,7 @@ modules: - oid: jnxOpticsPMCurrentTable value: jnxPMCurDiffGroupDelay - num_oid: .1.3.6.1.4.1.2636.3.71.1.2.1.1.2. + num_oid: '.1.3.6.1.4.1.2636.3.71.1.2.1.1.2.{{ $index }}' entPhysicalIndex: '{{ $index }}' entPhysicalIndex_measured: 'ports' divisor: 1000000000000 @@ -45,7 +45,7 @@ modules: - oid: jnxOpticsPMCurrentTable value: jnxPMCurRxInputPower - num_oid: .1.3.6.1.4.1.2636.3.71.1.2.1.1.8. + num_oid: '.1.3.6.1.4.1.2636.3.71.1.2.1.1.8.{{ $index }}' entPhysicalIndex: '{{ $index }}' entPhysicalIndex_measured: 'ports' divisor: 100 @@ -54,7 +54,7 @@ modules: - oid: jnxOpticsPMCurrentTable value: jnxPMCurTxOutputPower - num_oid: .1.3.6.1.4.1.2636.3.71.1.2.1.1.7. + num_oid: '.1.3.6.1.4.1.2636.3.71.1.2.1.1.7.{{ $index }}' entPhysicalIndex: '{{ $index }}' entPhysicalIndex_measured: 'ports' divisor: 100 @@ -65,7 +65,7 @@ modules: - oid: jnxOpticsPMCurrentTable value: jnxPMCurQ - num_oid: .1.3.6.1.4.1.2636.3.71.1.2.1.1.5. + num_oid: '.1.3.6.1.4.1.2636.3.71.1.2.1.1.5.{{ $index }}' entPhysicalIndex: '{{ $index }}' entPhysicalIndex_measured: 'ports' divisor: 10 @@ -76,7 +76,7 @@ modules: - oid: jnxOpticsPMCurrentTable value: jnxPMCurSNR - num_oid: .1.3.6.1.4.1.2636.3.71.1.2.1.1.6. + num_oid: '.1.3.6.1.4.1.2636.3.71.1.2.1.1.6.{{ $index }}' entPhysicalIndex: '{{ $index }}' entPhysicalIndex_measured: 'ports' divisor: 10 @@ -87,7 +87,7 @@ modules: - oid: jnxOpticsPMCurrentTable value: jnxPMCurCarFreqOffset - num_oid: .1.3.6.1.4.1.2636.3.71.1.2.1.1.43. + num_oid: '.1.3.6.1.4.1.2636.3.71.1.2.1.1.43.{{ $index }}' entPhysicalIndex: '{{ $index }}' entPhysicalIndex_measured: 'ports' multiplier: 1000000 @@ -98,7 +98,7 @@ modules: - oid: jnxOpticsPMCurrentTable value: jnxPMCurTemperature - num_oid: .1.3.6.1.4.1.2636.3.71.1.2.1.1.39. + num_oid: '.1.3.6.1.4.1.2636.3.71.1.2.1.1.39.{{ $index }}' entPhysicalIndex: '{{ $index }}' entPhysicalIndex_measured: 'ports' descr: '{{ $ifDescr }} Temperature' @@ -108,7 +108,7 @@ modules: - oid: jnxOpticsPMCurrentTable value: jnxPMCurTxLaserBiasCurrent - num_oid: .1.3.6.1.4.1.2636.3.71.1.2.1.1.35. + num_oid: '.1.3.6.1.4.1.2636.3.71.1.2.1.1.35.{{ $index }}' entPhysicalIndex: '{{ $index }}' entPhysicalIndex_measured: 'ports' divisor: 1000 @@ -119,7 +119,7 @@ modules: - oid: jnxYellowAlarmState value: jnxYellowAlarmState - num_oid: .1.3.6.1.4.1.2636.3.4.2.2.1. + num_oid: '.1.3.6.1.4.1.2636.3.4.2.2.1.{{ $index }}' descr: 'Yellow Alarm' index: '{{ $index }}' states: @@ -129,7 +129,7 @@ modules: - oid: jnxRedAlarmState value: jnxRedAlarmState - num_oid: .1.3.6.1.4.1.2636.3.4.2.3.1. + num_oid: '.1.3.6.1.4.1.2636.3.4.2.3.1.{{ $index }}' descr: 'Red Alarm' index: '{{ $index }}' states: @@ -139,7 +139,7 @@ modules: - oid: jnxFruState value: jnxFruState - num_oid: .1.3.6.1.4.1.2636.3.1.15.1.8. + num_oid: '.1.3.6.1.4.1.2636.3.1.15.1.8.{{ $index }}' descr: '{{ $jnxFruName }}' skip_values: 2 index: '{{ $index }}' diff --git a/includes/definitions/discovery/logmaster.yaml b/includes/definitions/discovery/logmaster.yaml index 9d2528e57d..09492fb372 100644 --- a/includes/definitions/discovery/logmaster.yaml +++ b/includes/definitions/discovery/logmaster.yaml @@ -5,46 +5,46 @@ modules: data: - oid: upsSmartBatteryCapacity - num_oid: .1.3.6.1.4.1.935.1.1.1.2.2.1. + num_oid: '.1.3.6.1.4.1.935.1.1.1.2.2.1.{{ $index }}' index: 'upsSmartBatteryCapacity.{{ $index }' descr: Battery charge remaining temperature: data: - oid: upsSmartBatteryTemperature - num_oid: .1.3.6.1.4.1.935.1.1.1.2.2.3. + num_oid: '.1.3.6.1.4.1.935.1.1.1.2.2.3.{{ $index }}' index: 'upsSmartBatteryTemperature.{{ $index }}' descr: Battery divisor: 10 - oid: upsEnvTemperature - num_oid: .1.3.6.1.4.1.935.1.1.1.9.1.1. + num_oid: '.1.3.6.1.4.1.935.1.1.1.9.1.1.{{ $index }}' index: 'upsEnvTemperature.{{ $index }}' descr: Environment humidity: data: - oid: upsEnvHumidity - num_oid: .1.3.6.1.4.1.935.1.1.1.9.1.2. + num_oid: '.1.3.6.1.4.1.935.1.1.1.9.1.2.{{ $index }}' index: 'upsEnvHumidity.{{ $index }}' descr: Environment voltage: data: - oid: upsSmartBatteryVoltage - num_oid: .1.3.6.1.4.1.935.1.1.1.2.2.2. + num_oid: '.1.3.6.1.4.1.935.1.1.1.2.2.2.{{ $index }}' index: 'upsSmartBatteryVoltage.{{ $index }}' descr: Battery Voltage divisor: 10 - oid: upsSmartInputLineVoltage - num_oid: .1.3.6.1.4.1.935.1.1.1.3.2.1. + num_oid: '.1.3.6.1.4.1.935.1.1.1.3.2.1.{{ $index }}' index: 'upsSmartInputLineVoltage.{{ $index }}' descr: Input Voltage divisor: 10 - oid: upsSmartOutputVoltage - num_oid: .1.3.6.1.4.1.935.1.1.1.4.2.1. + num_oid: '.1.3.6.1.4.1.935.1.1.1.4.2.1.{{ $index }}' index: 'upsSmartOutputVoltage.{{ $index }}' descr: Output Voltage divisor: 10 @@ -52,14 +52,14 @@ modules: data: - oid: upsSmartOutputLoad - num_oid: .1.3.6.1.4.1.935.1.1.1.4.2.3. + num_oid: '.1.3.6.1.4.1.935.1.1.1.4.2.3.{{ $index }}' index: 'upsSmartOutputLoad.{{ $index }}' descr: 'Output Load' runtime: data: - oid: upsSecondsOnBattery - num_oid: .1.3.6.1.2.1.33.1.2.2. + num_oid: '.1.3.6.1.2.1.33.1.2.2.{{ $index }}' index: 'upsSecondsOnBattery.{{ $index }}' descr: 'Time running on battery' divisor: 60 @@ -67,14 +67,14 @@ modules: data: - oid: upsSmartBatteryCurrent - num_oid: .1.3.6.1.4.1.935.1.1.1.2.2.7. + num_oid: '.1.3.6.1.4.1.935.1.1.1.2.2.7.{{ $index }}' index: 'upsSmartBatteryCurrent.{{ $index }}' descr: Battery Current state: data: - oid: upsBaseBatteryStatus - num_oid: .1.3.6.1.4.1.935.1.1.1.2.1.1. + num_oid: '.1.3.6.1.4.1.935.1.1.1.2.1.1.{{ $index }}' descr: Battery Status index: 'upsBaseBatteryStatus.{{ $index }}' state_name: upsBaseBatteryStatus @@ -84,7 +84,7 @@ modules: - { descr: BatteryLow, graph: 0, value: 3, generic: 1 } - oid: upsSmartBatteryReplaceIndicator - num_oid: .1.3.6.1.4.1.935.1.1.1.2.2.5. + num_oid: '.1.3.6.1.4.1.935.1.1.1.2.2.5.{{ $index }}' descr: Battery Replace Status index: 'upsSmartBatteryReplaceIndicator.{{ $index }}' state_name: upsSmartBatteryReplaceIndicator @@ -93,7 +93,7 @@ modules: - { descr: batteryNeedsReplacing, graph: 0, value: 2, generic: 2 } - oid: upsBaseOutputStatus - num_oid: .1.3.6.1.4.1.935.1.1.1.4.1.1. + num_oid: '.1.3.6.1.4.1.935.1.1.1.4.1.1.{{ $index }}' descr: Output Status index: 'upsBaseOutputStatus.{{ $index }}' state_name: upsBaseOutputStatus @@ -109,7 +109,7 @@ modules: - { descr: onBuck, graph: 0, value: 9, generic: 1 } - oid: upsEnvWater - num_oid: .1.3.6.1.4.1.935.1.1.1.9.1.3. + num_oid: '.1.3.6.1.4.1.935.1.1.1.9.1.3.{{ $index }}' descr: Water Status index: 'upsEnvWater.{{ $index }}' state_name: upsEnvWater @@ -118,7 +118,7 @@ modules: - { descr: abnormal, graph: 0, value: 2, generic: 1 } - oid: upsEnvSmoke - num_oid: .1.3.6.1.4.1.935.1.1.1.9.1.4. + num_oid: '.1.3.6.1.4.1.935.1.1.1.9.1.4.{{ $index }}' descr: Smoke Status index: 'upsEnvSmoke.{{ $index }}' state_name: upsEnvSmoke diff --git a/includes/definitions/discovery/luminato.yaml b/includes/definitions/discovery/luminato.yaml index 786873cf56..3ae64eea13 100644 --- a/includes/definitions/discovery/luminato.yaml +++ b/includes/definitions/discovery/luminato.yaml @@ -10,7 +10,7 @@ modules: data: - oid: statusInternalTemperature - num_oid: .1.3.6.1.4.1.3715.99.2.2.1.1.3. + num_oid: '.1.3.6.1.4.1.3715.99.2.2.1.1.3.{{ $index }}' descr: "Slot {{ $moduleSlotNo }} ({{ $moduleHwType }}) " index: '{{ $index }}' divisor: 10 @@ -19,7 +19,7 @@ modules: data: - oid: statusGeneral - num_oid: .1.3.6.1.4.1.3715.99.1.2.1. + num_oid: '.1.3.6.1.4.1.3715.99.1.2.1.{{ $index }}' descr: General Status state_name: statusGeneral states: @@ -29,7 +29,7 @@ modules: - { descr: Alarm, graph: 1, value: 4, generic: 3} - oid: statusTemperature - num_oid: .1.3.6.1.4.1.3715.99.1.2.5. + num_oid: '.1.3.6.1.4.1.3715.99.1.2.5.{{ $index }}' descr: Temperature Status state_name: statusTemperature states: @@ -40,7 +40,7 @@ modules: - { descr: Lolo, graph: 1, value: 5, generic: 2} - oid: statusFan - num_oid: .1.3.6.1.4.1.3715.99.1.2.6. + num_oid: '.1.3.6.1.4.1.3715.99.1.2.6.{{ $index }}' descr: Temperature Status state_name: statusTemperature states: @@ -48,7 +48,7 @@ modules: - { descr: Failure, graph: 1, value: 2, generic: 3} - oid: statusHardware - num_oid: .1.3.6.1.4.1.3715.99.1.2.7. + num_oid: '.1.3.6.1.4.1.3715.99.1.2.7.{{ $index }}' descr: Hardware Status state_name: statusHardware states: @@ -56,7 +56,7 @@ modules: - { descr: Failure, graph: 1, value: 2, generic: 3} - oid: statusSoftware - num_oid: .1.3.6.1.4.1.3715.99.1.2.8. + num_oid: '.1.3.6.1.4.1.3715.99.1.2.8.{{ $index }}' descr: Software Status state_name: statusSoftware states: diff --git a/includes/definitions/discovery/mimosa.yaml b/includes/definitions/discovery/mimosa.yaml index 62444b5bc1..eb0beab2d6 100644 --- a/includes/definitions/discovery/mimosa.yaml +++ b/includes/definitions/discovery/mimosa.yaml @@ -6,7 +6,7 @@ modules: - oid: mimosaSatelliteStrength value: mimosaSatelliteStrength - num_oid: .1.3.6.1.4.1.43356.2.1.2.2.5. + num_oid: '.1.3.6.1.4.1.43356.2.1.2.2.5.{{ $index }}' descr: 'Satellite Strength' index: '{{ $index }}' states: diff --git a/includes/definitions/discovery/moxa-etherdevice.yaml b/includes/definitions/discovery/moxa-etherdevice.yaml index 7d2ff70f2a..c6fca8cb40 100644 --- a/includes/definitions/discovery/moxa-etherdevice.yaml +++ b/includes/definitions/discovery/moxa-etherdevice.yaml @@ -9,19 +9,19 @@ modules: data: - oid: powerConsumption - num_oid: .1.3.6.1.4.1.8691.7.116.1.10.8. + num_oid: '.1.3.6.1.4.1.8691.7.116.1.10.8.{{ $index }}' descr: 'Power Consumption' index: 'powerConsumption.{{ $index }}' value: powerConsumption - oid: powerConsumption - num_oid: .1.3.6.1.4.1.8691.7.69.1.10.8. + num_oid: '.1.3.6.1.4.1.8691.7.69.1.10.8.{{ $index }}' descr: 'Power Consumption' index: 'powerConsumption.{{ $index }}' value: powerConsumption - oid: poePortConsumption - num_oid: .1.3.6.1.4.1.8691.7.86.1.40.6.1.2. + num_oid: '.1.3.6.1.4.1.8691.7.86.1.40.6.1.2.{{ $index }}' descr: '{{ $ifDescr }} PoE Consumption' index: 'poePortConsumption.{{ $index }}' value: poePortConsumption @@ -29,7 +29,7 @@ modules: data: - oid: sfpTemperature - num_oid: .1.3.6.1.4.1.8691.7.86.1.10.7.1.3. + num_oid: '.1.3.6.1.4.1.8691.7.86.1.10.7.1.3.{{ $index }}' descr: '{{ $ifDescr }} SFP module temperature' index: 'sfpTemperature.{{ $index }}' value: sfpTemperature @@ -37,7 +37,7 @@ modules: data: - oid: sfpVoltage - num_oid: .1.3.6.1.4.1.8691.7.86.1.10.7.1.4. + num_oid: '.1.3.6.1.4.1.8691.7.86.1.10.7.1.4.{{ $index }}' descr: '{{ $ifDescr }} SFP module Supply Voltage' index: 'sfpVoltage.{{ $index }}' value: sfpVoltage @@ -45,13 +45,13 @@ modules: data: - oid: sfpTxPower - num_oid: .1.3.6.1.4.1.8691.7.86.1.10.7.1.5. + num_oid: '.1.3.6.1.4.1.8691.7.86.1.10.7.1.5.{{ $index }}' descr: '{{ $ifDescr }} SFP module Transmit Power' index: 'sfpTxPower.{{ $index }}' value: sfpTxPower - oid: sfpRXPower - num_oid: .1.3.6.1.4.1.8691.7.86.1.10.7.1.6. + num_oid: '.1.3.6.1.4.1.8691.7.86.1.10.7.1.6.{{ $index }}' descr: '{{ $ifDescr }} SFP module Receive Power' index: 'sfpRxPower.{{ $index }}' value: sfpRXPower @@ -59,7 +59,7 @@ modules: data: - oid: power1InputStatus - num_oid: .1.3.6.1.4.1.8691.7.86.1.10.1. + num_oid: '.1.3.6.1.4.1.8691.7.86.1.10.1.{{ $index }}' descr: 'Power Input 1 Status' index: 'powerInputStatus.1' value: power1InputStatus @@ -69,7 +69,7 @@ modules: - { value: 1, generic: 0, graph: 0, descr: present } - oid: power2InputStatus - num_oid: .1.3.6.1.4.1.8691.7.86.1.10.2. + num_oid: '.1.3.6.1.4.1.8691.7.86.1.10.2.{{ $index }}' descr: 'Power Input 2 Status' index: 'powerInputStatus.2' value: power2InputStatus diff --git a/includes/definitions/discovery/netagent2.yaml b/includes/definitions/discovery/netagent2.yaml index f8bd1a5a1f..d896410606 100644 --- a/includes/definitions/discovery/netagent2.yaml +++ b/includes/definitions/discovery/netagent2.yaml @@ -5,7 +5,7 @@ modules: data: - oid: upsBaseBatteryStatus - num_oid: .1.3.6.1.4.1.935.1.1.1.2.1.1. + num_oid: '.1.3.6.1.4.1.935.1.1.1.2.1.1.{{ $index }}' descr: Battery Status index: 'upsBaseBatteryStatus.{{ $index }}' state_name: upsBaseBatteryStatus @@ -15,7 +15,7 @@ modules: - { descr: BatteryLow, graph: 0, value: 3, generic: 1 } - oid: upsSmartBatteryReplaceIndicator - num_oid: .1.3.6.1.4.1.935.1.1.1.2.2.5. + num_oid: '.1.3.6.1.4.1.935.1.1.1.2.2.5.{{ $index }}' descr: Battery Replace Status index: 'upsSmartBatteryReplaceIndicator.{{ $index }}' state_name: upsSmartBatteryReplaceIndicator @@ -24,7 +24,7 @@ modules: - { descr: batteryNeedsReplacing, graph: 0, value: 2, generic: 2 } - oid: upsEnvWater - num_oid: .1.3.6.1.4.1.935.1.1.1.9.1.3. + num_oid: '.1.3.6.1.4.1.935.1.1.1.9.1.3.{{ $index }}' descr: Water Status index: 'upsEnvWater.{{ $index }}' state_name: upsEnvWater @@ -34,7 +34,7 @@ modules: - { descr: abnormal, graph: 0, value: 2, generic: 2 } - oid: upsEnvSmoke - num_oid: .1.3.6.1.4.1.935.1.1.1.9.1.4. + num_oid: '.1.3.6.1.4.1.935.1.1.1.9.1.4.{{ $index }}' descr: Smoke Status index: 'upsEnvSmoke.{{ $index }}' state_name: upsEnvSmoke diff --git a/includes/definitions/discovery/netbotz.yaml b/includes/definitions/discovery/netbotz.yaml index f5292f9588..326e1b1fe5 100644 --- a/includes/definitions/discovery/netbotz.yaml +++ b/includes/definitions/discovery/netbotz.yaml @@ -7,7 +7,7 @@ modules: oid: airFlowSensorTable value: airFlowSensorValue divisor: 10 - num_oid: .1.3.6.1.4.1.5528.100.4.1.5.1.2. + num_oid: '.1.3.6.1.4.1.5528.100.4.1.5.1.2.{{ $index }}' descr: airFlowSensorLabel index: 'airFlowSensorValue.{{ $index }}' temperature: @@ -16,13 +16,13 @@ modules: oid: dewPointSensorTable value: dewPointSensorValue divisor: 10 - num_oid: .1.3.6.1.4.1.5528.100.4.1.3.1.2. + num_oid: '.1.3.6.1.4.1.5528.100.4.1.3.1.2.{{ $index }}' descr: dewPointSensorLabel index: 'dewPointSensorValue.{{ $index }}' - oid: tempSensorTable value: tempSensorValueInt - num_oid: .1.3.6.1.4.1.5528.100.4.1.1.1.8. + num_oid: '.1.3.6.1.4.1.5528.100.4.1.1.1.8.{{ $index }}' descr: tempSensorLabel index: '{{ $index }}' humidity: @@ -30,7 +30,7 @@ modules: - oid: humiSensorTable value: humiSensorValue - num_oid: .1.3.6.1.4.1.5528.100.4.1.2.1.8. + num_oid: '.1.3.6.1.4.1.5528.100.4.1.2.1.8.{{ $index }}' descr: humiSensorLabel index: '{{ $index }}' state: @@ -38,7 +38,7 @@ modules: - oid: dryContactSensorTable value: dryContactSensorValue - num_oid: .1.3.6.1.4.1.5528.100.4.2.1.1.2. + num_oid: '.1.3.6.1.4.1.5528.100.4.2.1.1.2.{{ $index }}' descr: dryContactSensorLabel index: 'dryContactSensor.{{ $index }}' state_name: dryContactSensor @@ -49,7 +49,7 @@ modules: - oid: doorSwitchSensorTable value: doorSwitchSensorValue - num_oid: .1.3.6.1.4.1.5528.100.4.2.2.1.2. + num_oid: '.1.3.6.1.4.1.5528.100.4.2.2.1.2.{{ $index }}' descr: doorSwitchSensorLabel index: 'doorSwitchSensor.{{ $index }}' state_name: doorSwitchSensor @@ -60,7 +60,7 @@ modules: - oid: cameraMotionSensorTable value: cameraMotionSensorValue - num_oid: .1.3.6.1.4.1.5528.100.4.2.3.1.2. + num_oid: '.1.3.6.1.4.1.5528.100.4.2.3.1.2.{{ $index }}' descr: cameraMotionSensorLabel index: 'cameraMotionSensor.{{ $index }}' state_name: cameraMotionSensor @@ -71,7 +71,7 @@ modules: - oid: otherStateSensorTable value: otherStateSensorErrorStatus - num_oid: .1.3.6.1.4.1.5528.100.4.2.10.1.3. + num_oid: '.1.3.6.1.4.1.5528.100.4.2.10.1.3.{{ $index }}' descr: otherStateSensorLabel index: '{{ $index }}' state_name: otherStateSensorErrorStatus @@ -81,4 +81,4 @@ modules: - { descr: warning, graph: 0, value: 2, generic: 1 } - { descr: error, graph: 0, value: 3, generic: 2 } - { descr: critical, graph: 0, value: 4, generic: 2 } - - { descr: failure, graph: 0, value: 5, generic: 2 } \ No newline at end of file + - { descr: failure, graph: 0, value: 5, generic: 2 } diff --git a/includes/definitions/discovery/netguardian.yaml b/includes/definitions/discovery/netguardian.yaml index a947fea73e..537842832c 100644 --- a/includes/definitions/discovery/netguardian.yaml +++ b/includes/definitions/discovery/netguardian.yaml @@ -6,13 +6,13 @@ modules: - oid: cgStringChannels value: cgStrVoltage - num_oid: .1.3.6.1.4.1.2682.2.1.1.4. + num_oid: '.1.3.6.1.4.1.2682.2.1.1.4.{{ $index }}' descr: 'Battery string {{ $index }}' index: 'cgStrVoltage.{{ $index }}' - oid: cgBatteryChannels value: cgVoltage - num_oid: .1.3.6.1.4.1.2682.2.2.1.4. + num_oid: '.1.3.6.1.4.1.2682.2.2.1.4.{{ $index }}' descr: 'Battery {{ $index }}' index: 'cgVoltage.{{ $index }}' current: @@ -20,7 +20,7 @@ modules: - oid: cgStringChannels value: cgStrCurrent - num_oid: .1.3.6.1.4.1.2682.2.1.1.5. + num_oid: '.1.3.6.1.4.1.2682.2.1.1.5.{{ $index }}' descr: 'Battery string {{ $index }}' index: 'cgStrCurrent.{{ $index }}' temperature: @@ -28,18 +28,18 @@ modules: - oid: cgStringChannels value: cgStrTempA - num_oid: .1.3.6.1.4.1.2682.2.1.1.6. + num_oid: '.1.3.6.1.4.1.2682.2.1.1.6.{{ $index }}' descr: 'Battery string {{ $index }}' index: 'cgStrTempA.{{ $index }}' - oid: cgStringChannels value: cgStrTempB - num_oid: .1.3.6.1.4.1.2682.2.1.1.7. + num_oid: '.1.3.6.1.4.1.2682.2.1.1.7.{{ $index }}' descr: 'Battery string {{ $index }}' index: 'cgStrTempB.{{ $index }}' - oid: cgBatteryChannels value: cgTemperature - num_oid: .1.3.6.1.4.1.2682.2.2.1.5. + num_oid: '.1.3.6.1.4.1.2682.2.2.1.5.{{ $index }}' descr: 'Battery {{ $index }}' - index: 'cgTemperature.{{ $index }}' \ No newline at end of file + index: 'cgTemperature.{{ $index }}' diff --git a/includes/definitions/discovery/netonix.yaml b/includes/definitions/discovery/netonix.yaml index 1f9a8a71af..c0db946515 100644 --- a/includes/definitions/discovery/netonix.yaml +++ b/includes/definitions/discovery/netonix.yaml @@ -6,7 +6,7 @@ modules: - oid: poeStatusTable value: poeStatus - num_oid: .1.3.6.1.4.1.46242.5.1.2. + num_oid: '.1.3.6.1.4.1.46242.5.1.2.{{ $index }}' descr: Port {{ $index }} PoE index: '{{ $index }}' state_name: netonixPoeStatus diff --git a/includes/definitions/discovery/netscaler.yaml b/includes/definitions/discovery/netscaler.yaml index 9ad8d1d71e..2b757e2ca8 100644 --- a/includes/definitions/discovery/netscaler.yaml +++ b/includes/definitions/discovery/netscaler.yaml @@ -13,7 +13,7 @@ modules: data: - oid: haCurStatus - num_oid: '.1.3.6.1.4.1.5951.4.1.1.23.23.' + num_oid: '.1.3.6.1.4.1.5951.4.1.1.23.23.{{ $index }}' index: 'haCurStatus.{{ $index }}' descr: Configured for HA state_name: haCurStatus @@ -22,7 +22,7 @@ modules: - { value: 1, generic: 0, graph: 1, descr: yes } - oid: sysHighAvailabilityMode - num_oid: '.1.3.6.1.4.1.5951.4.1.1.6.' + num_oid: '.1.3.6.1.4.1.5951.4.1.1.6.{{ $index }}' index: 'sysHighAvailabilityMode.{{ $index }}' descr: Current HA mode state_name: sysHighAvailabilityMode @@ -33,7 +33,7 @@ modules: - { value: 3, generic: 3, graph: 1, descr: unknown } - oid: haCurState - num_oid: '.1.3.6.1.4.1.5951.4.1.1.23.24.' + num_oid: '.1.3.6.1.4.1.5951.4.1.1.23.24.{{ $index }}' index: 'haCurState.{{ $index }}' descr: Current HA state state_name: haCurState @@ -52,7 +52,7 @@ modules: - { value: 11, generic: 2, graph: 1, descr: ROUTEMONITORFAIL } - oid: haPeerState - num_oid: '.1.3.6.1.4.1.5951.4.1.1.23.3.' + num_oid: '.1.3.6.1.4.1.5951.4.1.1.23.3.{{ $index }}' index: 'haPeerState.{{ $index }}' descr: Peer HA mode state_name: haPeerState diff --git a/includes/definitions/discovery/netspire.yaml b/includes/definitions/discovery/netspire.yaml index 5b5907a759..704a9f2c0e 100644 --- a/includes/definitions/discovery/netspire.yaml +++ b/includes/definitions/discovery/netspire.yaml @@ -11,6 +11,6 @@ modules: data: - oid: netSpireDeviceSystemTemperature - num_oid: .1.3.6.1.4.1.1732.2.1.10. + num_oid: '.1.3.6.1.4.1.1732.2.1.10.{{ $index }}' descr: 'System Temperature' diff --git a/includes/definitions/discovery/nxos.yaml b/includes/definitions/discovery/nxos.yaml index 45b1281277..18dd55d793 100644 --- a/includes/definitions/discovery/nxos.yaml +++ b/includes/definitions/discovery/nxos.yaml @@ -12,7 +12,7 @@ modules: - oid: cucsEquipmentChassisOperState value: cucsEquipmentChassisOperState - num_oid: .1.3.6.1.4.1.9.9.719.1.15.7.1.27. + num_oid: '.1.3.6.1.4.1.9.9.719.1.15.7.1.27.{{ $index }}' descr: 'Chassis - {{ $cucsEquipmentChassisDn }}' index: '{{ $index }}' states: @@ -49,7 +49,7 @@ modules: - oid: cucsEquipmentFanModuleOperState value: cucsEquipmentFanModuleOperState - num_oid: .1.3.6.1.4.1.9.9.719.1.15.13.1.7. + num_oid: '.1.3.6.1.4.1.9.9.719.1.15.13.1.7.{{ $index }}' descr: 'Fan Module - {{ $cucsEquipmentFanModuleDn }}' index: '{{ $index }}' states: @@ -66,7 +66,7 @@ modules: - oid: cucsEquipmentPsuPower value: cucsEquipmentPsuPower - num_oid: .1.3.6.1.4.1.9.9.719.1.15.56.1.10. + num_oid: '.1.3.6.1.4.1.9.9.719.1.15.56.1.10.{{ $index }}' descr: 'PSU - {{ $cucsEquipmentPsuDn }}' index: '{{ $index }}' states: diff --git a/includes/definitions/discovery/omnitron-iconverter.yaml b/includes/definitions/discovery/omnitron-iconverter.yaml index 291b929573..a4eb38749c 100644 --- a/includes/definitions/discovery/omnitron-iconverter.yaml +++ b/includes/definitions/discovery/omnitron-iconverter.yaml @@ -6,7 +6,7 @@ modules: - oid: ostPoePortCfgTable value: ostPoePortPseStatus - num_oid: .1.3.6.1.4.1.7342.15.2.1.7. + num_oid: '.1.3.6.1.4.1.7342.15.2.1.7.{{ $index }}' descr: 'PSE Port Status {{ $index }}' state_name: PoePortPseStatus index: 'pseStatus.{{ $index }}' @@ -19,7 +19,7 @@ modules: - oid: ostPoePortCfgTable value: ostPoEPortHeartbeatStatus - num_oid: .1.3.6.1.4.1.7342.15.2.1.14. + num_oid: '.1.3.6.1.4.1.7342.15.2.1.14.{{ $index }}' descr: 'PSE Port Heartbeat Status {{ $index }}' index: 'pseHeart.{{ $index }}' state_name: PoePortHeartbeatStatus @@ -32,7 +32,7 @@ modules: - oid: ostEnvironmentalStatusTable value: ostEnvironmentalPs1Status - num_oid: .1.3.6.1.4.1.7342.2.1.11.1.1. + num_oid: '.1.3.6.1.4.1.7342.2.1.11.1.1.{{ $index }}' descr: 'PS1 Status' index: 'ps1Status.{{ $index }}' state_name: PSstatus @@ -44,7 +44,7 @@ modules: - oid: ostEnvironmentalStatusTable value: ostEnvironmentalPs2Status - num_oid: .1.3.6.1.4.1.7342.2.1.11.1.5. + num_oid: '.1.3.6.1.4.1.7342.2.1.11.1.5.{{ $index }}' descr: 'PS2 Status' index: 'ps2Status.{{ $index }}' state_name: PSstatus @@ -58,7 +58,7 @@ modules: - oid: ostPoePortCfgTable value: ostPoePortPseCurrentSupplied - num_oid: .1.3.6.1.4.1.7342.15.2.1.6. + num_oid: '.1.3.6.1.4.1.7342.15.2.1.6.{{ $index }}' divisor: 1000 descr: 'PSE Port Ouput Current {{ $index }}' index: 'pseCurrent.{{ $index }}' @@ -67,7 +67,7 @@ modules: - oid: ostPoeGlobalCfgTable value: ostPoeGlobalCfgTotalPwr - num_oid: .1.3.6.1.4.1.7342.15.1.2. + num_oid: '.1.3.6.1.4.1.7342.15.1.2.{{ $index }}' descr: Total Power index: 'pwr.{{ $index }}' @@ -76,13 +76,13 @@ modules: - oid: moduleMgtCfgTable value: cpuTemperature - num_oid: .1.3.6.1.4.1.7342.2.1.3.1.38. + num_oid: '.1.3.6.1.4.1.7342.2.1.3.1.38.{{ $index }}' descr: CPU Ambient Temperature index: 'cpuTemp.{{ $index }}' - oid: ostEnvironmentalStatusTable value: ostEnvironmentalTemperature - num_oid: .1.3.6.1.4.1.7342.2.1.11.1.9. + num_oid: '.1.3.6.1.4.1.7342.2.1.11.1.9.{{ $index }}' descr: Module Internal Ambient Temperature index: 'envTemp.{{ $index }}' voltage: @@ -90,48 +90,48 @@ modules: - oid: ostPoePortCfgTable value: ostPoePortPseVoltageSupplied - num_oid: .1.3.6.1.4.1.7342.15.2.1.5. + num_oid: '.1.3.6.1.4.1.7342.15.2.1.5.{{ $index }}' descr: 'PSE Port Output Voltage {{ $index }}' index: 'pseVoltage.{{ $index }}' - oid: moduleMgtCfgTable value: cpuVoltageIn divisor: 1000 - num_oid: .1.3.6.1.4.1.7342.2.1.3.1.36. + num_oid: '.1.3.6.1.4.1.7342.2.1.3.1.36.{{ $index }}' descr: CPU Input Voltage index: 'cpuVoltIn.{{ $index }}' - oid: moduleMgtCfgTable value: cpuVoltageOut - num_oid: .1.3.6.1.4.1.7342.2.1.3.1.37. + num_oid: '.1.3.6.1.4.1.7342.2.1.3.1.37.{{ $index }}' divisor: 1000 descr: CPU Output Voltage index: 'cpuVoltOut{{ $index }}' - oid: ostEnvironmentalStatusTable value: ostEnvironmentalPs1VoltageIn - num_oid: .1.3.6.1.4.1.7342.2.1.11.1.2. + num_oid: '.1.3.6.1.4.1.7342.2.1.11.1.2.{{ $index }}' divisor: 1000 descr: PS1 Input Voltage index: 'ps1VoltIn.{{ $index }}' - oid: ostEnvironmentalStatusTable value: ostEnvironmentalPs1VoltageOut - num_oid: .1.3.6.1.4.1.7342.2.1.11.1.3. + num_oid: '.1.3.6.1.4.1.7342.2.1.11.1.3.{{ $index }}' divisor: 1000 descr: PS1 Output Votlage index: 'ps1VoltOut.{{ $index }}' - oid: ostEnvironmentalStatusTable value: ostEnvironmentalPs2VoltageIn - num_oid: .1.3.6.1.4.1.7342.2.1.11.1.6. + num_oid: '.1.3.6.1.4.1.7342.2.1.11.1.6.{{ $index }}' divisor: 1000 descr: PS2 Input Voltage index: 'ps2VoltIn.{{ $index }}' - oid: ostEnvironmentalStatusTable value: ostEnvironmentalPs2VoltageOut - num_oid: .1.3.6.1.4.1.7342.2.1.11.1.7. + num_oid: '.1.3.6.1.4.1.7342.2.1.11.1.7.{{ $index }}' divisor: 1000 descr: PS2 Output Voltage index: 'ps2VoltOut.{{ $index }}' diff --git a/includes/definitions/discovery/ons.yaml b/includes/definitions/discovery/ons.yaml index a00ea9c0e0..d1c2a71126 100644 --- a/includes/definitions/discovery/ons.yaml +++ b/includes/definitions/discovery/ons.yaml @@ -9,7 +9,7 @@ modules: data: - oid: cerentEnvMonVoltageStatsTable - num_oid: .1.3.6.1.4.1.3607.2.80.10.1.30. + num_oid: '.1.3.6.1.4.1.3607.2.80.10.1.30.{{ $index }}' value: cerentEnvMonVoltageStatsCurrentValue index: 'cerentEnvMonVoltageStats.{{ $index }}' descr: '{{ $entPhysicalDescr }} - {{ $cerentEnvMonVoltageStatsDescr }}' @@ -22,7 +22,7 @@ modules: data: - oid: cerentEnvMonTemperatureStatsTable - num_oid: .1.3.6.1.4.1.3607.2.80.20.1.30. + num_oid: '.1.3.6.1.4.1.3607.2.80.20.1.30.{{ $index }}' value: cerentEnvMonTemperatureStatsCurrentValue index: 'cerentEnvMonTemperatureStats.{{ $index }}' descr: '{{ $entPhysicalDescr }} - {{ $cerentEnvMonTemperatureStatsDescr }}' diff --git a/includes/definitions/discovery/openbsd.yaml b/includes/definitions/discovery/openbsd.yaml index 1645723660..8c6bcd0947 100644 --- a/includes/definitions/discovery/openbsd.yaml +++ b/includes/definitions/discovery/openbsd.yaml @@ -6,7 +6,7 @@ modules: - oid: carpIfTable value: carpIfState - num_oid: .1.3.6.1.4.1.30155.6.2.2.1.7. + num_oid: '.1.3.6.1.4.1.30155.6.2.2.1.7.{{ $index }}' descr: 'CARP - {{ $carpIfDev }}' index: '{{ $index }}' states: diff --git a/includes/definitions/discovery/panos.yaml b/includes/definitions/discovery/panos.yaml index 05391eac02..804dbc44ff 100644 --- a/includes/definitions/discovery/panos.yaml +++ b/includes/definitions/discovery/panos.yaml @@ -5,7 +5,7 @@ modules: data: - oid: panSysHAMode - num_oid: .1.3.6.1.4.1.25461.2.1.2.1.13. + num_oid: '.1.3.6.1.4.1.25461.2.1.2.1.13.{{ $index }}' index: 'panSysHAMode.{{ $index }}' descr: High Availability Mode states: @@ -13,7 +13,7 @@ modules: - { value: 2, generic: 0, graph: 1, descr: active-active } - oid: panSysHAState - num_oid: .1.3.6.1.4.1.25461.2.1.2.1.11. + num_oid: '.1.3.6.1.4.1.25461.2.1.2.1.11.{{ $index }}' index: 'panSysHAState.{{ $index }}' descr: High Availability Local Status states: @@ -22,10 +22,10 @@ modules: - { value: 3, generic: 2, graph: 1, descr: suspended } - oid: panSysHAPeerState - num_oid: .1.3.6.1.4.1.25461.2.1.2.1.12. + num_oid: '.1.3.6.1.4.1.25461.2.1.2.1.12.{{ $index }}' index: 'panSysHAPeerState.{{ $index }}' descr: High Availability Peer Status states: - { value: 1, generic: 0, graph: 1, descr: active } - { value: 2, generic: 3, graph: 1, descr: passive } - - { value: 3, generic: 2, graph: 1, descr: suspended } \ No newline at end of file + - { value: 3, generic: 2, graph: 1, descr: suspended } diff --git a/includes/definitions/discovery/pcoweb-rittalchiller.yaml b/includes/definitions/discovery/pcoweb-rittalchiller.yaml index 50b2cbd41f..79c4471264 100644 --- a/includes/definitions/discovery/pcoweb-rittalchiller.yaml +++ b/includes/definitions/discovery/pcoweb-rittalchiller.yaml @@ -7,7 +7,7 @@ modules: oid: flow-value.0 value: flow-value divisor: 10 - num_oid: .1.3.6.1.4.1.9839.2.1.2.73. + num_oid: '.1.3.6.1.4.1.9839.2.1.2.73.{{ $index }}' descr: Water Flow Rate index: 'flow-value.{{ $index }}' eer: @@ -15,7 +15,7 @@ modules: - oid: analogObjects.120 value: analogObjects - num_oid: .1.3.6.1.4.1.9839.2.1.3. + num_oid: '.1.3.6.1.4.1.9839.2.1.3.{{ $index }}' descr: Energy Efficiency Ratio index: 'analogObjects.{{ $index }}' power: @@ -24,7 +24,7 @@ modules: oid: analogObjects.103 value: analogObjects multiplier: 100 - num_oid: .1.3.6.1.4.1.9839.2.1.2. + num_oid: '.1.3.6.1.4.1.9839.2.1.2.{{ $index }}' descr: Power Consumption index: 'analogObjects.{{ $index }}' current: @@ -33,7 +33,7 @@ modules: oid: amp-value.0 value: amp-value divisor: 10 - num_oid: .1.3.6.1.4.1.9839.2.1.2.74. + num_oid: '.1.3.6.1.4.1.9839.2.1.2.74.{{ $index }}' descr: Current Consumption index: 'amp-value.{{ $index }}' temperature: @@ -42,21 +42,21 @@ modules: oid: analogObjects.140 value: analogObjects divisor: 10 - num_oid: .1.3.6.1.4.1.9839.2.1.2. + num_oid: '.1.3.6.1.4.1.9839.2.1.2.{{ $index }}' descr: Temperature Ambient index: 'analogObjects.{{ $index }}' - oid: analogObjects.137 value: analogObjects divisor: 10 - num_oid: .1.3.6.1.4.1.9839.2.1.2. + num_oid: '.1.3.6.1.4.1.9839.2.1.2.{{ $index }}' descr: Temperature Out index: 'analogObjects.{{ $index }}' - oid: analogObjects.136 value: analogObjects divisor: 10 - num_oid: .1.3.6.1.4.1.9839.2.1.2. + num_oid: '.1.3.6.1.4.1.9839.2.1.2.{{ $index }}' descr: Temperature In index: 'analogObjects.{{ $index }}' cooling: @@ -65,21 +65,21 @@ modules: oid: cooling-capacity.0 value: cooling-capacity multiplier: 100 - num_oid: .1.3.6.1.4.1.9839.2.1.2.100. + num_oid: '.1.3.6.1.4.1.9839.2.1.2.100.{{ $index }}' descr: Free Cooling Capacity index: 'cooling-capacity.{{ $index }}' - oid: freecooling-capacity.0 value: freecooling-capacity multiplier: 100 - num_oid: .1.3.6.1.4.1.9839.2.1.2.101. + num_oid: '.1.3.6.1.4.1.9839.2.1.2.101.{{ $index }}' descr: Compressor Cooling Capacity index: 'freecooling-capacity.{{ $index }}' - oid: total-capacity.0 value: total-capacity multiplier: 100 - num_oid: .1.3.6.1.4.1.9839.2.1.2.102. + num_oid: '.1.3.6.1.4.1.9839.2.1.2.102.{{ $index }}' descr: Total cooling Capacity index: 'total-capacity.{{ $index }}' humidity: @@ -88,14 +88,14 @@ modules: oid: pp1.0 value: pp1 divisor: 10 - num_oid: .1.3.6.1.4.1.9839.2.1.2.90. + num_oid: '.1.3.6.1.4.1.9839.2.1.2.90.{{ $index }}' descr: Hydraulic Pump 1 Speed index: 'pp1.{{ $index }}' - oid: pp2.0 value: pp2 divisor: 10 - num_oid: .1.3.6.1.4.1.9839.2.1.2.91. + num_oid: '.1.3.6.1.4.1.9839.2.1.2.91.{{ $index }}' descr: Hydraulic Pump 2 Speed index: 'pp2.{{ $index }}' pressure: @@ -104,27 +104,27 @@ modules: oid: analogObjects.138 value: analogObjects multiplier: 10 - num_oid: .1.3.6.1.4.1.9839.2.1.2. + num_oid: '.1.3.6.1.4.1.9839.2.1.2.{{ $index }}' descr: Hydraulic Pressure (Suction) index: 'analogObjects.{{ $index }}' - oid: analogObjects.133 value: analogObjects multiplier: 10 - num_oid: .1.3.6.1.4.1.9839.2.1.2. + num_oid: '.1.3.6.1.4.1.9839.2.1.2.{{ $index }}' descr: Hydraulic Pressure (Discharge) index: 'analogObjects.{{ $index }}' - oid: pressione1.0 value: pressione1 multiplier: 10 - num_oid: .1.3.6.1.4.1.9839.2.1.2.77. + num_oid: '.1.3.6.1.4.1.9839.2.1.2.77.{{ $index }}' descr: Condensation Pressure 1 index: 'pressione1.{{ $index }}' - oid: pressione2.0 value: pressione2 multiplier: 10 - num_oid: .1.3.6.1.4.1.9839.2.1.2.78. + num_oid: '.1.3.6.1.4.1.9839.2.1.2.78.{{ $index }}' descr: Condensation Pressure 2 - index: 'pressione2.{{ $index }}' \ No newline at end of file + index: 'pressione2.{{ $index }}' diff --git a/includes/definitions/discovery/pmp.yaml b/includes/definitions/discovery/pmp.yaml index b6045656bc..35b64e0448 100644 --- a/includes/definitions/discovery/pmp.yaml +++ b/includes/definitions/discovery/pmp.yaml @@ -5,7 +5,7 @@ modules: - oid: WHISP-BOX-MIBV2-MIB::boxTemperatureC value: boxTemperatureC - num_oid: .1.3.6.1.4.1.161.19.3.3.1.35. + num_oid: '.1.3.6.1.4.1.161.19.3.3.1.35.{{ $index }}' index: 0 descr: 'Cambium Temperature' state: @@ -13,10 +13,10 @@ modules: - oid: WHISP-APS-MIB::whispGPSStats value: whispGPSStats - num_oid: .1.3.6.1.4.1.161.19.3.1.3.1. + num_oid: '.1.3.6.1.4.1.161.19.3.1.3.1.{{ $index }}' index: 0 descr: GPS Status states: - { value: 1, generic: 0, graph: 1, descr: gpsSynchronized } - { value: 2, generic: 2, graph: 1, descr: gpsLostSync } - - { value: 3, generic: 0, graph: 1, descr: generatingSync } \ No newline at end of file + - { value: 3, generic: 0, graph: 1, descr: generatingSync } diff --git a/includes/definitions/discovery/powerwalker.yaml b/includes/definitions/discovery/powerwalker.yaml index fa4af15efd..575a75ddc6 100644 --- a/includes/definitions/discovery/powerwalker.yaml +++ b/includes/definitions/discovery/powerwalker.yaml @@ -5,7 +5,7 @@ modules: data: - oid: upsEBatteryEstimatedMinutesRemaining - num_oid: .1.3.6.1.4.1.935.10.1.1.3.3. + num_oid: '.1.3.6.1.4.1.935.10.1.1.3.3.{{ $index }}' index: 'upsEBatteryEstimatedMinutesRemaining.{{ $index }}' descr: Battery time remaining voltage: @@ -15,53 +15,53 @@ modules: data: - oid: upsEPositiveBatteryVoltage - num_oid: .1.3.6.1.4.1.935.10.1.1.3.5. + num_oid: '.1.3.6.1.4.1.935.10.1.1.3.5.{{ $index }}' index: 'upsEPositiveBatteryVoltage.{{ $index }}' descr: Postitive Battery Voltage - oid: upsENegativeBatteryVoltage - num_oid: .1.3.6.1.4.1.935.10.1.1.3.6. + num_oid: '.1.3.6.1.4.1.935.10.1.1.3.6.{{ $index }}' index: 'upsENegativeBatteryVoltage.{{ $index }}' descr: Negative Battery Voltage - oid: upsESystemInputTable - num_oid: .1.3.6.1.4.1.935.10.1.1.2.16.1.3. + num_oid: '.1.3.6.1.4.1.935.10.1.1.2.16.1.3.{{ $index }}' value: upsESystemInputVoltage index: 'upsESystemInputVoltage.{{ $index }}' descr: Input - oid: upsESystemOutputTable - num_oid: .1.3.6.1.4.1.935.10.1.1.2.18.1.3. + num_oid: '.1.3.6.1.4.1.935.10.1.1.2.18.1.3.{{ $index }}' value: upsESystemOutputVoltage index: 'upsESystemOutputVoltage.{{ $index }}' descr: Output - oid: upsESystemBypassTable - num_oid: .1.3.6.1.4.1.935.10.1.1.2.20.1.3. + num_oid: '.1.3.6.1.4.1.935.10.1.1.2.20.1.3.{{ $index }}' value: upsESystemBypassVoltage index: 'upsESystemBypassVoltage.{{ $index }}' descr: System Bypass - oid: upsEChargerModulesTable - num_oid: .1.3.6.1.4.1.935.10.1.1.3.12.1.3. + num_oid: '.1.3.6.1.4.1.935.10.1.1.3.12.1.3.{{ $index }}' value: positiveChargeVotlage index: 'positiveChargeVotlage.{{ $index }}' descr: Positive Charge - oid: upsEChargerModulesTable - num_oid: .1.3.6.1.4.1.935.10.1.1.3.12.1.4. + num_oid: '.1.3.6.1.4.1.935.10.1.1.3.12.1.4.{{ $index }}' value: negativeChargeVotlage index: 'negativeChargeVotlage.{{ $index }}' descr: Negative Charge - oid: upsEModulesTable - num_oid: .1.3.6.1.4.1.935.10.1.1.4.2.1.3. + num_oid: '.1.3.6.1.4.1.935.10.1.1.4.2.1.3.{{ $index }}' value: upsEModulePositiveBusVolt index: 'upsEModulePositiveBusVolt.{{ $index }}' descr: Module Positive Charge - oid: upsEModulesTable - num_oid: .1.3.6.1.4.1.935.10.1.1.4.2.1.4. + num_oid: '.1.3.6.1.4.1.935.10.1.1.4.2.1.4.{{ $index }}' value: upsEModuleNegativeBusVolt index: 'upsEModuleNegativeBusVolt.{{ $index }}' descr: Module Negative Charge @@ -72,19 +72,19 @@ modules: data: - oid: upsESystemInputTable - num_oid: .1.3.6.1.4.1.935.10.1.1.2.16.1.2. + num_oid: '.1.3.6.1.4.1.935.10.1.1.2.16.1.2.{{ $index }}' value: upsESystemInputFrequency index: 'upsESystemInputFrequency.{{ $index }}' descr: System Input - oid: upsESystemOutputTable - num_oid: .1.3.6.1.4.1.935.10.1.1.2.18.1.2. + num_oid: '.1.3.6.1.4.1.935.10.1.1.2.18.1.2.{{ $index }}' value: upsESystemOutputFrequency index: 'upsESystemOutputFrequency.{{ $index }}' descr: System Output - oid: upsESystemBypassTable - num_oid: .1.3.6.1.4.1.935.10.1.1.2.20.1.2. + num_oid: '.1.3.6.1.4.1.935.10.1.1.2.20.1.2.{{ $index }}' value: upsESystemBypassFrequency index: 'upsESystemBypassFrequency.{{ $index }}' descr: System Bypass @@ -92,7 +92,7 @@ modules: data: - oid: upsEBatteryEstimatedChargeRemaining - num_oid: .1.3.6.1.4.1.935.10.1.1.3.4. + num_oid: '.1.3.6.1.4.1.935.10.1.1.3.4.{{ $index }}' index: 'upsEBatteryEstimatedChargeRemaining.{{ $index }}' descr: Battery charge remaining temperature: @@ -102,29 +102,29 @@ modules: data: - oid: upsESystemTemperature - num_oid: .1.3.6.1.4.1.935.10.1.1.3.4. + num_oid: '.1.3.6.1.4.1.935.10.1.1.3.4.{{ $index }}' index: 'upsESystemTemperature.{{ $index }}' descr: Ambient Temperature - oid: upsEBatteryTemperature - num_oid: .1.3.6.1.4.1.935.10.1.1.3.8. + num_oid: '.1.3.6.1.4.1.935.10.1.1.3.8.{{ $index }}' index: 'upsEBatteryTemperature.{{ $index }}' descr: Battery - oid: upsEChargerModulesTable - num_oid: .1.3.6.1.4.1.935.10.1.1.3.12.1.8. + num_oid: '.1.3.6.1.4.1.935.10.1.1.3.12.1.8.{{ $index }}' value: chargerModulesTemperature index: 'chargerModulesTemperature.{{ $index }}' descr: Charger Module - oid: upsEModulesTable - num_oid: .1.3.6.1.4.1.935.10.1.1.4.2.1.5. + num_oid: '.1.3.6.1.4.1.935.10.1.1.4.2.1.5.{{ $index }}' value: upsEModuleTemperature index: 'upsEModuleTemperature.{{ $index }}' descr: Module - oid: upsEEnvironmentTemperature - num_oid: .1.3.6.1.4.1.935.10.1.1.6.1. + num_oid: '.1.3.6.1.4.1.935.10.1.1.6.1.{{ $index }}' value: upsEEnvironmentCurrentTemperature index: 'upsEEnvironmentCurrentTemperature.{{ $index }}' descr: Env Current Temp @@ -137,31 +137,31 @@ modules: data: - oid: upsESystemInputTable - num_oid: .1.3.6.1.4.1.935.10.1.1.2.16.1.4. + num_oid: '.1.3.6.1.4.1.935.10.1.1.2.16.1.4.{{ $index }}' value: upsESystemInputCurrent index: 'upsESystemInputCurrent.{{ $index }}' descr: System Input Current - oid: upsESystemOutputTable - num_oid: .1.3.6.1.4.1.935.10.1.1.2.18.1.4. + num_oid: '.1.3.6.1.4.1.935.10.1.1.2.18.1.4.{{ $index }}' value: upsESystemOutputCurrent index: 'upsESystemOutputCurrent.{{ $index }}' descr: System Output Current - oid: upsESystemBypassTable - num_oid: .1.3.6.1.4.1.935.10.1.1.2.20.1.4. + num_oid: '.1.3.6.1.4.1.935.10.1.1.2.20.1.4.{{ $index }}' value: upsESystemBypassCurrent index: 'upsESystemBypassCurrent.{{ $index }}' descr: System Bypass - oid: upsEChargerModulesTable - num_oid: .1.3.6.1.4.1.935.10.1.1.3.12.1.5. + num_oid: '.1.3.6.1.4.1.935.10.1.1.3.12.1.5.{{ $index }}' value: positiveChargeCurrent index: 'positiveChargeCurrent.{{ $index }}' descr: Postitive Charge - oid: upsEChargerModulesTable - num_oid: .1.3.6.1.4.1.935.10.1.1.3.12.1.6. + num_oid: '.1.3.6.1.4.1.935.10.1.1.3.12.1.6.{{ $index }}' value: negativeChargeCurrent index: 'negativeChargeCurrent.{{ $index }}' descr: Negative Charge @@ -171,7 +171,7 @@ modules: data: - oid: upsEEnvironmentHumidity - num_oid: .1.3.6.1.4.1.935.10.1.1.6.2.1. + num_oid: '.1.3.6.1.4.1.935.10.1.1.6.2.1.{{ $index }}' value: upsEEnvironmentCurrentHumidity index: 'upsEEnvironmentCurrentHumidity.{{ $index }}' descr: Environment Current @@ -181,19 +181,19 @@ modules: data: - oid: upsESystemInputTable - num_oid: .1.3.6.1.4.1.935.10.1.1.2.16.1.5. + num_oid: '.1.3.6.1.4.1.935.10.1.1.2.16.1.5.{{ $index }}' value: upsESystemInputWatts index: 'upsESystemInputWatts.{{ $index }}' descr: System Input Watts - oid: upsESystemOutputTable - num_oid: .1.3.6.1.4.1.935.10.1.1.2.18.1.5. + num_oid: '.1.3.6.1.4.1.935.10.1.1.2.18.1.5.{{ $index }}' value: upsESystemOutputWatts index: 'upsESystemOutputWatts.{{ $index }}' descr: System Output Watts - oid: upsESystemBypassTable - num_oid: .1.3.6.1.4.1.935.10.1.1.2.20.1.5. + num_oid: '.1.3.6.1.4.1.935.10.1.1.2.20.1.5.{{ $index }}' value: upsESystemBypassWatts index: 'upsESystemBypassWatts.{{ $index }}' descr: System Bypass @@ -202,7 +202,7 @@ modules: data: - oid: upsESystemOutputTable - num_oid: .1.3.6.1.4.1.935.10.1.1.2.18.1.7. + num_oid: '.1.3.6.1.4.1.935.10.1.1.2.18.1.7.{{ $index }}' value: upsESystemOutputLoad index: 'upsESystemOutputLoad.{{ $index }}' descr: System Output Load @@ -210,7 +210,7 @@ modules: data: - oid: upsEBatteryStatus - num_oid: .1.3.6.1.4.1.935.10.1.1.3.1. + num_oid: '.1.3.6.1.4.1.935.10.1.1.3.1.{{ $index }}' index: 'upsEBatteryStatus.{{ $index }}' descr: Battery Status state_name: upsEBatteryStatus @@ -220,4 +220,4 @@ modules: - { descr: batteryLow, graph: 1, value: 3, generic: 1 } - { descr: batteryDepleted, graph: 1, value: 4, generic: 2 } - { descr: batteryDischarging, graph: 1, value: 5, generic: 1 } - - { descr: batteryFailure, graph: 1, value: 6, generic: 2 } \ No newline at end of file + - { descr: batteryFailure, graph: 1, value: 6, generic: 2 } diff --git a/includes/definitions/discovery/procurve.yaml b/includes/definitions/discovery/procurve.yaml index f25f0cd68f..4f17a71a3e 100644 --- a/includes/definitions/discovery/procurve.yaml +++ b/includes/definitions/discovery/procurve.yaml @@ -12,7 +12,7 @@ modules: - oid: hpicfPsTable value: hpicfPsTemp - num_oid: .1.3.6.1.4.1.11.2.14.11.5.1.55.1.1.1.4. + num_oid: '.1.3.6.1.4.1.11.2.14.11.5.1.55.1.1.1.4.{{ $index }}' index: 'hpicfPsTemp.{{ $index }}' descr: 'Power Supply #{{ $index }}' power: @@ -20,7 +20,7 @@ modules: - oid: hpicfPsTable value: hpicfPsWattageCur - num_oid: .1.3.6.1.4.1.11.2.14.11.5.1.55.1.1.1.6. + num_oid: '.1.3.6.1.4.1.11.2.14.11.5.1.55.1.1.1.6.{{ $index }}' index: 'hpicfPsWattageCur.{{ $index }}' high_limit: hpicfPsWattageMax descr: 'Power Supply #{{ $index }}' @@ -29,7 +29,7 @@ modules: - oid: hpicfFanTable value: hpicfFanState - num_oid: .1.3.6.1.4.1.11.2.14.11.5.1.54.2.1.1.4. + num_oid: '.1.3.6.1.4.1.11.2.14.11.5.1.54.2.1.1.4.{{ $index }}' descr: 'Fan #{{ $index }}' index: 'hpicfFanState.{{ $index }}' state_name: hpicfFanState @@ -43,7 +43,7 @@ modules: - oid: hpicfPsTable value: hpicfPsState - num_oid: .1.3.6.1.4.1.11.2.14.11.5.1.55.1.1.1.2. + num_oid: '.1.3.6.1.4.1.11.2.14.11.5.1.55.1.1.1.2.{{ $index }}' descr: 'Power Supply #{{ $index }}' index: 'hpicfPsState.{{ $index }}' state_name: hpicfPsState diff --git a/includes/definitions/discovery/ptp500.yaml b/includes/definitions/discovery/ptp500.yaml index 247573f586..6c836f5e9b 100644 --- a/includes/definitions/discovery/ptp500.yaml +++ b/includes/definitions/discovery/ptp500.yaml @@ -5,7 +5,7 @@ modules: data: - oid: transmitModulationMode - num_oid: .1.3.6.1.4.1.17713.5.12.9. + num_oid: '.1.3.6.1.4.1.17713.5.12.9.{{ $index }}' index: 'transmitModulationMode.{{ $index }}' descr: Transmit Modulation Mode states: @@ -26,7 +26,7 @@ modules: - { value: 15, generic: 0, graph: 1, descr: modReserved2 } - oid: receiveModulationMode - num_oid: .1.3.6.1.4.1.17713.5.12.8. + num_oid: '.1.3.6.1.4.1.17713.5.12.8.{{ $index }}' index: 'receiveModulationMode.{{ $index }}' descr: Receive Modulation Mode states: diff --git a/includes/definitions/discovery/ptp600.yaml b/includes/definitions/discovery/ptp600.yaml index eb45dfa437..720ee88cb2 100644 --- a/includes/definitions/discovery/ptp600.yaml +++ b/includes/definitions/discovery/ptp600.yaml @@ -5,7 +5,7 @@ modules: data: - oid: transmitModulationMode - num_oid: .1.3.6.1.4.1.17713.6.12.9. + num_oid: '.1.3.6.1.4.1.17713.6.12.9.{{ $index }}' index: 'transmitModulationMode.{{ $index }}' descr: Transmit Modulation Mode states: @@ -36,7 +36,7 @@ modules: - { value: 24, generic: 0, graph: 1, descr: mod256qam81percentDual } - oid: receiveModulationMode - num_oid: .1.3.6.1.4.1.17713.6.12.8 + num_oid: '.1.3.6.1.4.1.17713.6.12.8.{{ $index }}' index: 'receiveModulationMode.{{ $index }}' descr: Receive Modulation Mode states: @@ -65,4 +65,3 @@ modules: - { value: 22, generic: 0, graph: 1, descr: mod64qam92percentDual } - { value: 23, generic: 0, graph: 1, descr: modTransient10 } - { value: 24, generic: 0, graph: 1, descr: mod256qam81percentDual } - \ No newline at end of file diff --git a/includes/definitions/discovery/ptp650.yaml b/includes/definitions/discovery/ptp650.yaml index 37cbe445ca..19b9891cf9 100644 --- a/includes/definitions/discovery/ptp650.yaml +++ b/includes/definitions/discovery/ptp650.yaml @@ -5,7 +5,7 @@ modules: data: - oid: tDDSynchronizationStatus - num_oid: .1.3.6.1.4.1.17713.7.13.11. + num_oid: '.1.3.6.1.4.1.17713.7.13.11.{{ $index }}' index: 0 descr: Sync Status states: @@ -18,4 +18,4 @@ modules: - { value: 6, generic: 0, graph: 1, descr: initialising } - { value: 7, generic: 0, graph: 1, descr: clusterTimingMaster } - { value: 8, generic: 0, graph: 1, descr: acquiringLock } - - { value: 9, generic: 0, graph: 1, descr: inactive } \ No newline at end of file + - { value: 9, generic: 0, graph: 1, descr: inactive } diff --git a/includes/definitions/discovery/ptp800.yaml b/includes/definitions/discovery/ptp800.yaml index c9e23aa06d..c585e2c448 100644 --- a/includes/definitions/discovery/ptp800.yaml +++ b/includes/definitions/discovery/ptp800.yaml @@ -5,7 +5,7 @@ modules: data: - oid: transmitModulation - num_oid: .1.3.6.1.4.1.17713.8.12.9. + num_oid: '.1.3.6.1.4.1.17713.8.12.9.{{ $index }}' index: 'transmitModulation.{{ $index }}' descr: Transmit Modulation Mode states: @@ -18,7 +18,7 @@ modules: - { value: 6, generic: 0, graph: 1, descr: mod256QAM } - oid: receiveModulation - num_oid: .1.3.6.1.4.1.17713.8.12.8. + num_oid: '.1.3.6.1.4.1.17713.8.12.8.{{ $index }}' index: 'receiveModulation.{{ $index }}' descr: Receive Modulation Mode states: @@ -28,4 +28,4 @@ modules: - { value: 3, generic: 0, graph: 1, descr: mod32QAM } - { value: 4, generic: 0, graph: 1, descr: mod64QAM } - { value: 5, generic: 0, graph: 1, descr: mod128QAM } - - { value: 6, generic: 0, graph: 1, descr: mod256QAM } \ No newline at end of file + - { value: 6, generic: 0, graph: 1, descr: mod256QAM } diff --git a/includes/definitions/discovery/remoteye4.yaml b/includes/definitions/discovery/remoteye4.yaml index 7bfa6b88bc..84f74d7991 100644 --- a/includes/definitions/discovery/remoteye4.yaml +++ b/includes/definitions/discovery/remoteye4.yaml @@ -5,52 +5,52 @@ modules: data: - oid: upsInputLLVoltageAB - num_oid: .1.3.6.1.4.1.186.1.19.2.5.1.2.2. + num_oid: '.1.3.6.1.4.1.186.1.19.2.5.1.2.2.{{ $index }}' index: 'upsInputLLVoltageAB.{{ $index }}' descr: Input LL (AB) - oid: upsInputLLVoltageBC - num_oid: .1.3.6.1.4.1.186.1.19.2.5.1.2.3. + num_oid: '.1.3.6.1.4.1.186.1.19.2.5.1.2.3.{{ $index }}' index: 'upsInputLLVoltageBC.{{ $index }}' descr: Input (BC) - oid: upsInputLLVoltageCA - num_oid: .1.3.6.1.4.1.186.1.19.2.5.1.2.4. + num_oid: '.1.3.6.1.4.1.186.1.19.2.5.1.2.4.{{ $index }}' index: 'upsInputLLVoltageCA.{{ $index }}' descr: Input (CA) - oid: upsOutputLLVoltageAB - num_oid: .1.3.6.1.4.1.186.1.19.2.5.1.3.3. + num_oid: '.1.3.6.1.4.1.186.1.19.2.5.1.3.3.{{ $index }}' index: 'upsOutputLLVoltageAB.{{ $index }}' descr: Output LL (AB) - oid: upsOutputLLVoltageBC - num_oid: .1.3.6.1.4.1.186.1.19.2.5.1.3.4. + num_oid: '.1.3.6.1.4.1.186.1.19.2.5.1.3.4.{{ $index }}' index: 'upsOutputLLVoltageBC.{{ $index }}' descr: Output (BC) - oid: upsOutputLLVoltageCA - num_oid: .1.3.6.1.4.1.186.1.19.2.5.1.3.5. + num_oid: '.1.3.6.1.4.1.186.1.19.2.5.1.3.5.{{ $index }}' index: 'upsOutputLLVoltageCA.{{ $index }}' descr: Output (CA) - oid: upsBypassLLVoltageAB - num_oid: .1.3.6.1.4.1.186.1.19.2.5.1.4.2. + num_oid: '.1.3.6.1.4.1.186.1.19.2.5.1.4.2.{{ $index }}' index: 'upsBypassLLVoltageAB.{{ $index }}' descr: Bypass LL (AB) - oid: upsBypassLLVoltageBC - num_oid: .1.3.6.1.4.1.186.1.19.2.5.1.4.3. + num_oid: '.1.3.6.1.4.1.186.1.19.2.5.1.4.3.{{ $index }}' index: 'upsBypassLLVoltageBC.{{ $index }}' descr: Bypass (BC) - oid: upsBypassLLVoltageCA - num_oid: .1.3.6.1.4.1.186.1.19.2.5.1.4.4. + num_oid: '.1.3.6.1.4.1.186.1.19.2.5.1.4.4.{{ $index }}' index: 'upsBypassLLVoltageCA.{{ $index }}' descr: Bypass (CA) - oid: upsBatteryVoltage - num_oid: .1.3.6.1.4.1.186.1.19.2.5.1.5.4. + num_oid: '.1.3.6.1.4.1.186.1.19.2.5.1.5.4.{{ $index }}' index: 'upsBatteryVoltage.{{ $index }}' descr: Battery current: @@ -59,32 +59,32 @@ modules: data: - oid: upsInputCurrentPhaseA - num_oid: .1.3.6.1.4.1.186.1.19.2.5.1.2.8. + num_oid: '.1.3.6.1.4.1.186.1.19.2.5.1.2.8.{{ $index }}' index: 'upsInputCurrentPhaseA.{{ $index }}' descr: Input Phase A - oid: upsInputCurrentPhaseB - num_oid: .1.3.6.1.4.1.186.1.19.2.5.1.2.9. + num_oid: '.1.3.6.1.4.1.186.1.19.2.5.1.2.9.{{ $index }}' index: 'upsInputCurrentPhaseB.{{ $index }}' descr: Input Phase B - oid: upsInputCurrentPhaseC - num_oid: .1.3.6.1.4.1.186.1.19.2.5.1.2.10. + num_oid: '.1.3.6.1.4.1.186.1.19.2.5.1.2.10.{{ $index }}' index: 'upsInputCurrentPhaseC.{{ $index }}' descr: Input Phase C - oid: upsOutputCurrentPhaseA - num_oid: .1.3.6.1.4.1.186.1.19.2.5.1.3.6. + num_oid: '.1.3.6.1.4.1.186.1.19.2.5.1.3.6.{{ $index }}' index: 'upsOutputCurrentPhaseA.{{ $index }}' descr: Output Phase A - oid: upsOutputCurrentPhaseB - num_oid: .1.3.6.1.4.1.186.1.19.2.5.1.3.7. + num_oid: '.1.3.6.1.4.1.186.1.19.2.5.1.3.7.{{ $index }}' index: 'upsOutputCurrentPhaseB.{{ $index }}' descr: Output Phase B - oid: upsOutputCurrentPhaseC - num_oid: .1.3.6.1.4.1.186.1.19.2.5.1.3.8. + num_oid: '.1.3.6.1.4.1.186.1.19.2.5.1.3.8.{{ $index }}' index: 'upsOutputCurrentPhaseC.{{ $index }}' descr: Output Phase C frequency: @@ -93,38 +93,38 @@ modules: data: - oid: upsInputFrequency - num_oid: .1.3.6.1.4.1.186.1.19.2.5.1.2.11. + num_oid: '.1.3.6.1.4.1.186.1.19.2.5.1.2.11.{{ $index }}' index: 'upsInputFrequency.{{ $index }}' descr: Input - oid: upsOutputFrequency - num_oid: .1.3.6.1.4.1.186.1.19.2.5.1.3.9. + num_oid: '.1.3.6.1.4.1.186.1.19.2.5.1.3.9.{{ $index }}' index: 'upsOutputFrequency.{{ $index }}' descr: Output - oid: upsBypassFrequency - num_oid: .1.3.6.1.4.1.186.1.19.2.5.1.4.5. + num_oid: '.1.3.6.1.4.1.186.1.19.2.5.1.4.5.{{ $index }}' index: 'upsBypassFrequency.{{ $index }}' descr: Bypass runtime: data: - oid: upsEstimatedBatteryRuntime - num_oid: .1.3.6.1.4.1.186.1.19.2.5.1.5.3. + num_oid: '.1.3.6.1.4.1.186.1.19.2.5.1.5.3.{{ $index }}' index: 'upsEstimatedBatteryRuntime.{{ $index }}' descr: Estimated runtime charge: data: - oid: upsBatteryChargeCurrent - num_oid: .1.3.6.1.4.1.186.1.19.2.5.1.5.8. + num_oid: '.1.3.6.1.4.1.186.1.19.2.5.1.5.8.{{ $index }}' index: 'upsBatteryChargeCurrent.{{ $index }}' descr: Battery charge state: data: - oid: upsBatteryStatus - num_oid: .1.3.6.1.4.1.186.1.19.2.5.1.5.1. + num_oid: '.1.3.6.1.4.1.186.1.19.2.5.1.5.1.{{ $index }}' descr: 'Battery status' index: 'upsBatteryStatus.{{ $index }}' states: @@ -133,4 +133,4 @@ modules: - { descr: batteryLow, graph: 1, value: 3, generic: 1 } - { descr: batteryDepleted, graph: 1, value: 4, generic: 2 } - { descr: batteryDischarging, graph: 1, value: 5, generic: 2 } - - { descr: batteryFailure, graph: 1, value: 6, generic: 2 } \ No newline at end of file + - { descr: batteryFailure, graph: 1, value: 6, generic: 2 } diff --git a/includes/definitions/discovery/rittal-lcp.yaml b/includes/definitions/discovery/rittal-lcp.yaml index 1cac04af06..81f8e6bf61 100644 --- a/includes/definitions/discovery/rittal-lcp.yaml +++ b/includes/definitions/discovery/rittal-lcp.yaml @@ -7,10 +7,10 @@ modules: oid: cmcIIIUnitStatus value: cmcIIIUnitStatus state_name: cmcIIIUnitStatus - num_oid: .1.3.6.1.4.1.2606.7.2.1. + num_oid: '.1.3.6.1.4.1.2606.7.2.1.{{ $index }}' index: 'cmcIIIUnitStatus.{{ $index }}' descr: Unit Status states: - { descr: OK, graph: 1, value: 1, generic: 0 } - { descr: Failed, graph: 1, value: 2, generic: 2 } - - { descr: Overload, graph: 1, value: 3, generic: 1 } \ No newline at end of file + - { descr: Overload, graph: 1, value: 3, generic: 1 } diff --git a/includes/definitions/discovery/riverbed.yaml b/includes/definitions/discovery/riverbed.yaml index 9ecf6c278c..8e58ad7af2 100644 --- a/includes/definitions/discovery/riverbed.yaml +++ b/includes/definitions/discovery/riverbed.yaml @@ -14,7 +14,7 @@ modules: - oid: systemTemperature value: systemTemperature - num_oid: .1.3.6.1.4.1.17163.1.1.2.9. + num_oid: '.1.3.6.1.4.1.17163.1.1.2.9.{{ $index }}' snmp_flags: '-OQUs' index: 0 descr: 'System Temperature' @@ -24,7 +24,7 @@ modules: - oid: systemHealth value: systemHealth - num_oid: .1.3.6.1.4.1.17163.1.1.2.7. + num_oid: '.1.3.6.1.4.1.17163.1.1.2.7.{{ $index }}' descr: 'System Health' index: 0 state_name: systemHealth @@ -36,7 +36,7 @@ modules: - oid: optServiceStatus value: optServiceStatus - num_oid: .1.3.6.1.4.1.17163.1.1.2.8. + num_oid: '.1.3.6.1.4.1.17163.1.1.2.8.{{ $index }}' descr: 'Optimization Service Status' index: 0 state_name: optServiceStatus diff --git a/includes/definitions/discovery/ros.yaml b/includes/definitions/discovery/ros.yaml index f274942051..487d154cd9 100644 --- a/includes/definitions/discovery/ros.yaml +++ b/includes/definitions/discovery/ros.yaml @@ -5,7 +5,7 @@ modules: data: - oid: rcDeviceStsPowerSupply1 - num_oid: .1.3.6.1.4.1.15004.4.2.2.4. + num_oid: '.1.3.6.1.4.1.15004.4.2.2.4.{{ $index }}' descr: 'Power Supply 1 Status' index: 'rcDeviceStsPowerSupply1.{{ $index }}' states: @@ -15,7 +15,7 @@ modules: - { descr: notConnected, graph: 0, value: 4, generic: 1 } - oid: rcDeviceStsPowerSupply2 - num_oid: .1.3.6.1.4.1.15004.4.2.2.5. + num_oid: '.1.3.6.1.4.1.15004.4.2.2.5.{{ $index }}' descr: 'Power Supply 2 Status' index: 'rcDeviceStsPowerSupply2.{{ $index }}' states: @@ -25,7 +25,7 @@ modules: - { descr: notConnected, graph: 0, value: 4, generic: 1 } - oid: rcDeviceStsFailSafeRelay - num_oid: .1.3.6.1.4.1.15004.4.2.2.7. + num_oid: '.1.3.6.1.4.1.15004.4.2.2.7.{{ $index }}' descr: Fail Safe Relay index: 'rcDeviceStsFailSafeRelay.{{ $index }}' states: @@ -33,7 +33,7 @@ modules: - { descr: deEnergized, graph: 0, value: 2, generic: 2 } - oid: rcDeviceStsFanBank1 - num_oid: .1.3.6.1.4.1.15004.4.2.2.10. + num_oid: '.1.3.6.1.4.1.15004.4.2.2.10.{{ $index }}' descr: 'Fan Bank Module 1' index: 'rcDeviceStsFanBank1.{{ $index }}' states: @@ -44,7 +44,7 @@ modules: - { descr: on, graph: 0, value: 5, generic: 0 } - oid: rcDeviceStsFanBank2 - num_oid: .1.3.6.1.4.1.15004.4.2.2.11. + num_oid: '.1.3.6.1.4.1.15004.4.2.2.11.{{ $index }}' descr: 'Fan Bank Module 2' index: 'rcDeviceStsFanBank2.{{ $index }}' states: @@ -57,7 +57,7 @@ modules: data: - oid: rcDeviceStsTemperature - num_oid: .1.3.6.1.4.1.15004.4.2.2.3. + num_oid: '.1.3.6.1.4.1.15004.4.2.2.3.{{ $index }}' index: 'rcDeviceStsTemperature.{{ $index }}' descr: System Temperature divisor: 1 diff --git a/includes/definitions/discovery/routeros.yaml b/includes/definitions/discovery/routeros.yaml index f534ada6c3..ac7862e628 100644 --- a/includes/definitions/discovery/routeros.yaml +++ b/includes/definitions/discovery/routeros.yaml @@ -10,30 +10,30 @@ modules: - oid: mtxrOpticalTable value: mtxrOpticalTemperature - num_oid: .1.3.6.1.4.1.14988.1.1.19.1.1.6. + num_oid: '.1.3.6.1.4.1.14988.1.1.19.1.1.6.{{ $index }}' descr: mtxrOpticalName index: 'mtxrOpticalTemperature.{{ $index }}' - oid: mtxrHlSensorTemperature - num_oid: .1.3.6.1.4.1.14988.1.1.3.5. + num_oid: '.1.3.6.1.4.1.14988.1.1.3.5.{{ $index }}' divisor: 10 descr: 'Sensor chip' index: 'mtxrHlSensorTemperature.{{ $index }}' - oid: mtxrHlCpuTemperature - num_oid: .1.3.6.1.4.1.14988.1.1.3.6. + num_oid: '.1.3.6.1.4.1.14988.1.1.3.6.{{ $index }}' divisor: 10 descr: 'Processor' index: 'mtxrHlCpuTemperature.{{ $index }}' - oid: mtxrHlBoardTemperature - num_oid: .1.3.6.1.4.1.14988.1.1.3.7. + num_oid: '.1.3.6.1.4.1.14988.1.1.3.7.{{ $index }}' divisor: 10 descr: 'System board' index: 'mtxrHlBoardTemperature.{{ $index }}' - oid: mtxrHlTemperature - num_oid: .1.3.6.1.4.1.14988.1.1.3.10. + num_oid: '.1.3.6.1.4.1.14988.1.1.3.10.{{ $index }}' index: 0 divisor: 10 descr: 'Temperature {{ $index }}' @@ -43,7 +43,7 @@ modules: high_limit: 70 - oid: mtxrHlProcessorTemperature - num_oid: .1.3.6.1.4.1.14988.1.1.3.11. + num_oid: '.1.3.6.1.4.1.14988.1.1.3.11.{{ $index }}' index: 1 divisor: 10 descr: 'Processor Temperature {{ $index }}' @@ -52,40 +52,40 @@ modules: - oid: mtxrOpticalTable value: mtxrOpticalSupplyVoltage - num_oid: .1.3.6.1.4.1.14988.1.1.19.1.1.7. + num_oid: '.1.3.6.1.4.1.14988.1.1.19.1.1.7.{{ $index }}' divisor: 1000 descr: mtxrOpticalName index: 'mtxrOpticalSupplyVoltage.{{ $index }}' - oid: mtxrPOETable value: mtxrPOEVoltage - num_oid: .1.3.6.1.4.1.14988.1.1.15.1.1.4. + num_oid: '.1.3.6.1.4.1.14988.1.1.15.1.1.4.{{ $index }}' divisor: 10 descr: '{{ $mtxrPOEName }} POE' index: 'mtxrPOEVoltage.{{ $index }}' - oid: mtxrHlCoreVoltage - num_oid: .1.3.6.1.4.1.14988.1.1.3.1. + num_oid: '.1.3.6.1.4.1.14988.1.1.3.1.{{ $index }}' descr: 'Core' index: 'mtxrHlCoreVoltage.{{ $index }}' - oid: mtxrHlThreeDotThreeVoltage - num_oid: .1.3.6.1.4.1.14988.1.1.3.2. + num_oid: '.1.3.6.1.4.1.14988.1.1.3.2.{{ $index }}' descr: '3.3V' index: 'mtxrHlThreeDotThreeVoltage.{{ $index }}' - oid: mtxrHlFiveVoltage - num_oid: .1.3.6.1.4.1.14988.1.1.3.3. + num_oid: '.1.3.6.1.4.1.14988.1.1.3.3.{{ $index }}' descr: '5V' index: 'mtxrHlFiveVoltage.{{ $index }}' - oid: mtxrHlTwelveVoltage - num_oid: .1.3.6.1.4.1.14988.1.1.3.4. + num_oid: '.1.3.6.1.4.1.14988.1.1.3.4.{{ $index }}' descr: '12V' index: 'mtxrHlTwelveVoltage.{{ $index }}' - oid: mtxrHlVoltage - num_oid: .1.3.6.1.4.1.14988.1.1.3.8. + num_oid: '.1.3.6.1.4.1.14988.1.1.3.8.{{ $index }}' divisor: 10 descr: 'Voltage {{ $index }}' current: @@ -93,20 +93,20 @@ modules: - oid: mtxrOpticalTable value: mtxrOpticalTxBiasCurrent - num_oid: .1.3.6.1.4.1.14988.1.1.19.1.1.8. + num_oid: '.1.3.6.1.4.1.14988.1.1.19.1.1.8.{{ $index }}' divisor: 1000 descr: '{{ $mtxrOpticalName }} Tx' index: 'mtxrOpticalTxBiasCurrent.{{ $index }}' - oid: mtxrPOETable value: mtxrPOECurrent - num_oid: .1.3.6.1.4.1.14988.1.1.15.1.1.5. + num_oid: '.1.3.6.1.4.1.14988.1.1.15.1.1.5.{{ $index }}' divisor: 1000 descr: '{{ $mtxrPOEName }} POE' index: 'mtxrPOECurrent.{{ $index }}' - oid: mtxrHlCurrent - num_oid: .1.3.6.1.4.1.14988.1.1.3.13. + num_oid: '.1.3.6.1.4.1.14988.1.1.3.13.{{ $index }}' divisor: 1000 descr: 'Current' index: '0' @@ -115,14 +115,14 @@ modules: - oid: mtxrOpticalTable value: mtxrOpticalTxPower - num_oid: .1.3.6.1.4.1.14988.1.1.19.1.1.9. + num_oid: '.1.3.6.1.4.1.14988.1.1.19.1.1.9.{{ $index }}' divisor: 1000 descr: '{{ $mtxrOpticalName }} Tx' index: 'mtxrOpticalTxPower.{{ $index }}' - oid: mtxrOpticalTable value: mtxrOpticalRxPower - num_oid: .1.3.6.1.4.1.14988.1.1.19.1.1.10. + num_oid: '.1.3.6.1.4.1.14988.1.1.19.1.1.10.{{ $index }}' divisor: 1000 descr: '{{ $mtxrOpticalName }} Rx' index: 'mtxrOpticalRxPower.{{ $index }}' @@ -131,7 +131,7 @@ modules: - oid: mtxrOpticalTable value: mtxrOpticalRxLoss - num_oid: .1.3.6.1.4.1.14988.1.1.19.1.1.3. + num_oid: '.1.3.6.1.4.1.14988.1.1.19.1.1.3.{{ $index }}' descr: '{{ $mtxrOpticalName }} Rx' index: 'mtxrOpticalRxLoss.{{ $index }}' state_name: mtxrOpticalRxLoss @@ -142,7 +142,7 @@ modules: - oid: mtxrOpticalTable value: mtxrOpticalTxFault - num_oid: .1.3.6.1.4.1.14988.1.1.19.1.1.4. + num_oid: '.1.3.6.1.4.1.14988.1.1.19.1.1.4.{{ $index }}' descr: '{{ $mtxrOpticalName }} Tx' index: 'mtxrOpticalTxFault.{{ $index }}' state_name: mtxrOpticalTxFault @@ -152,7 +152,7 @@ modules: - { descr: 'null', graph: 1, value: 2, generic: 3 } - oid: mtxrHlPowerSupplyState - num_oid: .1.3.6.1.4.1.14988.1.1.3.15. + num_oid: '.1.3.6.1.4.1.14988.1.1.3.15.{{ $index }}' descr: Primary PSU index: 'mtxrHlPowerSupplyState.{{ $index }}' state_name: mtxrHlPowerSupplyState @@ -161,7 +161,7 @@ modules: - { value: 1, generic: 0, graph: 1, descr: 'true' } - oid: mtxrHlBackupPowerSupplyState - num_oid: .1.3.6.1.4.1.14988.1.1.3.16. + num_oid: '.1.3.6.1.4.1.14988.1.1.3.16.{{ $index }}' descr: Backup PSU index: 'mtxrHlBackupPowerSupplyState.{{ $index }}' state_name: mtxrHlBackupPowerSupplyState @@ -170,7 +170,7 @@ modules: - { value: 1, generic: 0, graph: 1, descr: 'true' } - oid: mtxrWl60GConnected - num_oid: .1.3.6.1.4.1.14988.1.1.1.8.1.4. + num_oid: '.1.3.6.1.4.1.14988.1.1.1.8.1.4.{{ $index }}' descr: Station Connected index: 'mtxrWl60GConnected.{{ $index ]]' state_name: mtxrWl60GConnected @@ -179,7 +179,7 @@ modules: - { value: 1, generic: 0, graph: 1, descr: 'connected' } - oid: mtxrWl60GMode - num_oid: .1.3.6.1.4.1.14988.1.1.1.8.1.2. + num_oid: '.1.3.6.1.4.1.14988.1.1.1.8.1.2.{{ $index }}' descr: Mode index: 'mtxrWl60GMode.{{ $index }}' state_name: mtxrWl60GMode @@ -193,13 +193,13 @@ modules: - oid: mtxrPOETable value: mtxrPOEPower - num_oid: .1.3.6.1.4.1.14988.1.1.15.1.1.6. + num_oid: '.1.3.6.1.4.1.14988.1.1.15.1.1.6.{{ $index }}' divisor: 10 descr: '{{ $mtxrPOEName }} POE' index: 'mtxrPOEPower.{{ $index }}' - oid: mtxrHlPower - num_oid: .1.3.6.1.4.1.14988.1.1.3.12. + num_oid: '.1.3.6.1.4.1.14988.1.1.3.12.{{ $index }}' divisor: 10 descr: 'Power Usage' index: '1' @@ -207,11 +207,11 @@ modules: data: - oid: mtxrHlFanSpeed1 - num_oid: .1.3.6.1.4.1.14988.1.1.3.17. + num_oid: '.1.3.6.1.4.1.14988.1.1.3.17.{{ $index }}' descr: 'Fan #1' index: '0' - oid: mtxrHlFanSpeed2 - num_oid: .1.3.6.1.4.1.14988.1.1.3.18. + num_oid: '.1.3.6.1.4.1.14988.1.1.3.18.{{ $index }}' descr: 'Fan #2' index: '1' diff --git a/includes/definitions/discovery/saf-integra-b.yaml b/includes/definitions/discovery/saf-integra-b.yaml index 5a8e257ad1..d0ad455e71 100644 --- a/includes/definitions/discovery/saf-integra-b.yaml +++ b/includes/definitions/discovery/saf-integra-b.yaml @@ -14,12 +14,12 @@ modules: data: - oid: integraBsysCPUtemperature - num_oid: .1.3.6.1.4.1.7571.100.1.1.7.1.4.2. + num_oid: '.1.3.6.1.4.1.7571.100.1.1.7.1.4.2.{{ $index }}' descr: System CPU index: 'integraBsysCPUtemperature.{{ $index }}' - oid: integraBsysBoardTemperature - num_oid: .1.3.6.1.4.1.7571.100.1.1.7.1.4.8. + num_oid: '.1.3.6.1.4.1.7571.100.1.1.7.1.4.8.{{ $index }}' descr: System Board index: 'integraBsysBoardTemperature.{{ $index }}' voltage: @@ -28,7 +28,7 @@ modules: data: - oid: integraBsysPSUvoltage - num_oid: .1.3.6.1.4.1.7571.100.1.1.7.1.4.5. + num_oid: '.1.3.6.1.4.1.7571.100.1.1.7.1.4.5.{{ $index }}' descr: PSU Voltage index: 'integraBsysPSUvoltage.{{ $index }}' current: @@ -37,7 +37,7 @@ modules: data: - oid: integraBsysPSUcurrent - num_oid: .1.3.6.1.4.1.7571.100.1.1.7.1.4.6. + num_oid: '.1.3.6.1.4.1.7571.100.1.1.7.1.4.6.{{ $index }}' descr: PSU Current index: 'integraBsysPSUcurrent.{{ $index }}' power: @@ -46,14 +46,14 @@ modules: data: - oid: integraBsysPSUpower - num_oid: .1.3.6.1.4.1.7571.100.1.1.7.1.4.7. + num_oid: '.1.3.6.1.4.1.7571.100.1.1.7.1.4.7.{{ $index }}' descr: PSU Power index: 'integraBsysPSUpower.{{ $index }}' state: data: - oid: integraBsysLicenseGenStatus - num_oid: .1.3.6.1.4.1.7571.100.1.1.7.1.4.4. + num_oid: '.1.3.6.1.4.1.7571.100.1.1.7.1.4.4.{{ $index }}' descr: License Status index: 'integraBsysLicenseGenStatus.{{ $index }}' state_name: integraBsysLicenseGenStatus diff --git a/includes/definitions/discovery/saf-integra-w.yaml b/includes/definitions/discovery/saf-integra-w.yaml index 36c734ae04..4ea87997e2 100644 --- a/includes/definitions/discovery/saf-integra-w.yaml +++ b/includes/definitions/discovery/saf-integra-w.yaml @@ -14,12 +14,12 @@ modules: data: - oid: integraWsysCPUtemperature - num_oid: .1.3.6.1.4.1.7571.100.1.1.7.2.4.2. + num_oid: '.1.3.6.1.4.1.7571.100.1.1.7.2.4.2.{{ $index }}' descr: System CPU index: 'integraWsysCPUtemperature.{{ $index }}' - oid: integraWsysBoardTemperature - num_oid: .1.3.6.1.4.1.7571.100.1.1.7.2.4.8. + num_oid: '.1.3.6.1.4.1.7571.100.1.1.7.2.4.8.{{ $index }}' descr: System Board index: 'integraWsysBoardTemperature.{{ $index }}' voltage: @@ -28,7 +28,7 @@ modules: data: - oid: integraWsysPSUvoltage - num_oid: .1.3.6.1.4.1.7571.100.1.1.7.2.4.5. + num_oid: '.1.3.6.1.4.1.7571.100.1.1.7.2.4.5.{{ $index }}' descr: PSU Voltage index: 'integraWsysPSUvoltage.{{ $index }}' current: @@ -37,7 +37,7 @@ modules: data: - oid: integraWsysPSUcurrent - num_oid: .1.3.6.1.4.1.7571.100.1.1.7.2.4.6. + num_oid: '.1.3.6.1.4.1.7571.100.1.1.7.2.4.6.{{ $index }}' descr: PSU Current index: 'integraWsysPSUcurrent.{{ $index }}' power: @@ -46,14 +46,14 @@ modules: data: - oid: integraWsysPSUpower - num_oid: .1.3.6.1.4.1.7571.100.1.1.7.2.4.7. + num_oid: '.1.3.6.1.4.1.7571.100.1.1.7.2.4.7.{{ $index }}' descr: PSU Power index: 'integraWsysPSUpower.{{ $index }}' state: data: - oid: integraWsysLicenseGenStatus - num_oid: .1.3.6.1.4.1.7571.100.1.1.7.2.4.4. + num_oid: '.1.3.6.1.4.1.7571.100.1.1.7.2.4.4.{{ $index }}' descr: License Status index: 'integraWsysLicenseGenStatus.{{ $index }}' state_name: integraWsysLicenseGenStatus diff --git a/includes/definitions/discovery/secureplatform.yaml b/includes/definitions/discovery/secureplatform.yaml index a260a97c6e..f1a8690b15 100644 --- a/includes/definitions/discovery/secureplatform.yaml +++ b/includes/definitions/discovery/secureplatform.yaml @@ -12,18 +12,18 @@ modules: - oid: fanSpeedSensorTable value: fanSpeedSensorValue - num_oid: .1.3.6.1.4.1.2620.1.6.7.8.2.1.3. + num_oid: '.1.3.6.1.4.1.2620.1.6.7.8.2.1.3.{{ $index }}' descr: '{{ $fanSpeedSensorName }}' index: 'fanSpeedSensorValue.{{ $index }}' load: data: - oid: procUsage - num_oid: .1.3.6.1.4.1.2620.1.6.7.2.4. + num_oid: '.1.3.6.1.4.1.2620.1.6.7.2.4.{{ $index }}' descr: Overall CPU utilization - oid: multiProcUsage - num_oid: .1.3.6.1.4.1.2620.1.6.7.5.1.5. + num_oid: '.1.3.6.1.4.1.2620.1.6.7.5.1.5.{{ $index }}' descr: CPU {{ $index }} index: 'multiProcUsage.{{ $index }}.0' @@ -32,7 +32,7 @@ modules: - oid: fanSpeedSensorTable value: fanSpeedSensorStatus - num_oid: .1.3.6.1.4.1.2620.1.6.7.8.2.1.6. + num_oid: '.1.3.6.1.4.1.2620.1.6.7.8.2.1.6.{{ $index }}' descr: '{{ $fanSpeedSensorName }}' index: 'fanSpeedSensorValue.{{ $index }}' state_name: fanSpeedSensor @@ -42,7 +42,7 @@ modules: - { value: 2, generic: 3, graph: 0, descr: Unknown } - oid: haStatCode - num_oid: .1.3.6.1.4.1.2620.1.5.101 + num_oid: '.1.3.6.1.4.1.2620.1.5.101.{{ $index }}' descr: HA Status state_name: haSensor states: @@ -54,6 +54,6 @@ modules: - oid: tempertureSensorTable value: tempertureSensorValue - num_oid: .1.3.6.1.4.1.2620.1.6.7.8.1.1.3. + num_oid: '.1.3.6.1.4.1.2620.1.6.7.8.1.1.3.{{ $index }}' descr: '{{ $tempertureSensorName }}' index: 'tempertureSensorValue.{{ $index }}' diff --git a/includes/definitions/discovery/sentry4.yaml b/includes/definitions/discovery/sentry4.yaml index 78df3c2a04..f4074cb211 100644 --- a/includes/definitions/discovery/sentry4.yaml +++ b/includes/definitions/discovery/sentry4.yaml @@ -13,13 +13,13 @@ modules: data: - oid: st4LineCurrent - num_oid: .1.3.6.1.4.1.1718.4.1.4.3.1.3. + num_oid: '.1.3.6.1.4.1.1718.4.1.4.3.1.3.{{ $index }}' index: 'st4LineCurrent.{{ $index }}' descr: Line, {{ $st4LineLabel }}, Current divisor: 100 - oid: st4PhaseCurrent - num_oid: .1.3.6.1.4.1.1718.4.1.5.3.1.6. + num_oid: '.1.3.6.1.4.1.1718.4.1.5.3.1.6.{{ $index }}' index: 'st4PhaseCurrent.{{ $index }}' descr: Phase, {{ $st4PhaseLabel }}, Current divisor: 100 @@ -27,7 +27,7 @@ modules: data: - oid: st4InputCordFrequency - num_oid: .1.3.6.1.4.1.1718.4.1.3.3.1.11. + num_oid: '.1.3.6.1.4.1.1718.4.1.3.3.1.11.{{ $index }}' index: 'st4InputCord.{{ $index }}' descr: Line, {{ $st4InputCordName }}, Frequency divisor: 10 @@ -35,13 +35,13 @@ modules: data: - oid: st4InputCordActivePower - num_oid: .1.3.6.1.4.1.1718.4.1.3.3.1.3. + num_oid: '.1.3.6.1.4.1.1718.4.1.3.3.1.3.{{ $index }}' index: 'st4InputCord.{{ $index }}' descr: Cord, {{ $st4InputCordName }}, Active Power divisor: 0 - oid: st4PhaseActivePower - num_oid: .1.3.6.1.4.1.1718.4.1.5.3.1.8. + num_oid: '.1.3.6.1.4.1.1718.4.1.5.3.1.8.{{ $index }}' index: 'st4PhaseActivePower.{{ $index }}' descr: Phase, {{ $st4PhaseLabel }}, Active Power divisor: 0 @@ -49,7 +49,7 @@ modules: data: - oid: st4PhaseVoltage - num_oid: .1.3.6.1.4.1.1718.4.1.5.3.1.3. + num_oid: '.1.3.6.1.4.1.1718.4.1.5.3.1.3.{{ $index }}' index: 'st4PhaseVoltage.{{ $index }}' descr: Phase, {{ $st4PhaseLabel }}, Voltage divisor: 10 @@ -58,7 +58,7 @@ modules: - oid: st4UnitStatus value: st4UnitStatus - num_oid: .1.3.6.1.4.1.1718.4.1.2.3.1.1. + num_oid: '.1.3.6.1.4.1.1718.4.1.2.3.1.1.{{ $index }}' descr: Unit Status index: 'st4UnitStatus.{{ $index }}' state_name: st4UnitStatus @@ -88,7 +88,7 @@ modules: - oid: st4InputCordState value: st4InputCordState - num_oid: .1.3.6.1.4.1.1718.4.1.3.3.1.1. + num_oid: '.1.3.6.1.4.1.1718.4.1.3.3.1.1.{{ $index }}' descr: Input Cord State index: 'st4InputCordState.{{ $index }}' state_name: st4InputCordState @@ -99,7 +99,7 @@ modules: - oid: st4InputCordStatus value: st4InputCordStatus - num_oid: .1.3.6.1.4.1.1718.4.1.3.3.1.2. + num_oid: '.1.3.6.1.4.1.1718.4.1.3.3.1.2.{{ $index }}' descr: Input Cord Status index: 'st4InputCordStatus.{{ $index }}' state_name: st4InputCordStatus @@ -129,7 +129,7 @@ modules: - oid: st4InputCordActivePowerStatus value: st4InputCordActivePowerStatus - num_oid: .1.3.6.1.4.1.1718.4.1.3.3.1.4. + num_oid: '.1.3.6.1.4.1.1718.4.1.3.3.1.4.{{ $index }}' descr: Input Cord Active Power Status index: 'st4InputCordActivePowerStatus.{{ $index }}' state_name: st4InputCordActivePowerStatus @@ -159,7 +159,7 @@ modules: - oid: st4InputCordApparentPowerStatus value: st4InputCordApparentPowerStatus - num_oid: .1.3.6.1.4.1.1718.4.1.3.3.1.6. + num_oid: '.1.3.6.1.4.1.1718.4.1.3.3.1.6.{{ $index }}' descr: Input Cord Apparent Power Status index: 'st4InputCordApparentPowerStatus.{{ $index }}' state_name: st4InputCordApparentPowerStatus @@ -189,7 +189,7 @@ modules: - oid: st4InputCordPowerFactorStatus value: st4InputCordPowerFactorStatus - num_oid: .1.3.6.1.4.1.1718.4.1.3.3.1.9. + num_oid: '.1.3.6.1.4.1.1718.4.1.3.3.1.9.{{ $index }}' descr: Input Cord Power Factor Status index: 'st4InputCordPowerFactorStatus.{{ $index }}' state_name: st4InputCordPowerFactorStatus @@ -219,7 +219,7 @@ modules: - oid: st4InputCordOutOfBalanceStatus value: st4InputCordOutOfBalanceStatus - num_oid: .1.3.6.1.4.1.1718.4.1.3.3.1.13. + num_oid: '.1.3.6.1.4.1.1718.4.1.3.3.1.13.{{ $index }}' descr: Input Out Of Balance Status index: 'st4InputCordOutOfBalanceStatus.{{ $index }}' state_name: st4InputCordOutOfBalanceStatus @@ -249,7 +249,7 @@ modules: - oid: st4LineState value: st4LineState - num_oid: .1.3.6.1.4.1.1718.4.1.4.3.1.1. + num_oid: '.1.3.6.1.4.1.1718.4.1.4.3.1.1.{{ $index }}' descr: Line {{ $st4LineLabel }} State index: 'st4LineState.{{ $index }}' state_name: st4LineState @@ -260,7 +260,7 @@ modules: - oid: st4LineStatus value: st4LineStatus - num_oid: .1.3.6.1.4.1.1718.4.1.4.3.1.2. + num_oid: '.1.3.6.1.4.1.1718.4.1.4.3.1.2.{{ $index }}' descr: Line {{ $st4LineLabel }} Status index: 'st4LineStatus.{{ $index }}' state_name: st4LineStatus @@ -290,7 +290,7 @@ modules: - oid: st4PhaseState value: st4PhaseState - num_oid: .1.3.6.1.4.1.1718.4.1.5.3.1.1. + num_oid: '.1.3.6.1.4.1.1718.4.1.5.3.1.1.{{ $index }}' descr: Phase {{ $st4PhaseLabel }} State index: 'st4PhaseState.{{ $index }}' state_name: st4PhaseState @@ -301,7 +301,7 @@ modules: - oid: st4PhaseStatus value: st4PhaseStatus - num_oid: .1.3.6.1.4.1.1718.4.1.5.3.1.2. + num_oid: '.1.3.6.1.4.1.1718.4.1.5.3.1.2.{{ $index }}' descr: Phase {{ $st4PhaseLabel }} Status index: 'st4PhaseStatus.{{ $index }}' state_name: st4PhaseStatus @@ -331,7 +331,7 @@ modules: - oid: st4PhaseVoltageStatus value: st4PhaseVoltageStatus - num_oid: .1.3.6.1.4.1.1718.4.1.5.3.1.4. + num_oid: '.1.3.6.1.4.1.1718.4.1.5.3.1.4.{{ $index }}' descr: Phase {{ $st4PhaseLabel }} Voltage Status index: 'st4PhaseVoltageStatus.{{ $index }}' state_name: st4PhaseVoltageStatus @@ -361,7 +361,7 @@ modules: - oid: st4PhasePowerFactorStatus value: st4PhasePowerFactorStatus - num_oid: .1.3.6.1.4.1.1718.4.1.5.3.1.11. + num_oid: '.1.3.6.1.4.1.1718.4.1.5.3.1.11.{{ $index }}' descr: Phase {{ $st4PhaseLabel }} Power Factor Status index: 'st4PhasePowerFactorStatus.{{ $index }}' state_name: st4PhasePowerFactorStatus @@ -391,7 +391,7 @@ modules: - oid: st4OcpStatus value: st4OcpStatus - num_oid: .1.3.6.1.4.1.1718.4.1.6.3.1.1. + num_oid: '.1.3.6.1.4.1.1718.4.1.6.3.1.1.{{ $index }}' descr: Over-current Protector {{ $st4OcpLabel }} Status index: 'st4OcpStatus.{{ $index }}' state_name: st4OcpStatus @@ -421,7 +421,7 @@ modules: - oid: st4BranchState value: st4BranchState - num_oid: .1.3.6.1.4.1.1718.4.1.7.3.1.1. + num_oid: '.1.3.6.1.4.1.1718.4.1.7.3.1.1.{{ $index }}' descr: Branch {{ $st4OcpLabel }} State index: 'st4BranchState.{{ $index }}' state_name: st4BranchState @@ -432,7 +432,7 @@ modules: - oid: st4BranchStatus value: st4BranchStatus - num_oid: .1.3.6.1.4.1.1718.4.1.7.3.1.2. + num_oid: '.1.3.6.1.4.1.1718.4.1.7.3.1.2.{{ $index }}' descr: Branch {{ $st4OcpLabel }} Status index: 'st4BranchStatus.{{ $index }}' state_name: st4BranchStatus @@ -462,7 +462,7 @@ modules: - oid: st4BranchCurrentStatus value: st4BranchCurrentStatus - num_oid: .1.3.6.1.4.1.1718.4.1.7.3.1.4. + num_oid: '.1.3.6.1.4.1.1718.4.1.7.3.1.4.{{ $index }}' descr: Branch Current {{ $st4OcpLabel }} Status index: 'st4BranchCurrentStatus.{{ $index }}' state_name: st4BranchCurrentStatus diff --git a/includes/definitions/discovery/siteboss.yaml b/includes/definitions/discovery/siteboss.yaml index c6a8ad1467..53345618d5 100644 --- a/includes/definitions/discovery/siteboss.yaml +++ b/includes/definitions/discovery/siteboss.yaml @@ -6,7 +6,7 @@ modules: - oid: esPointTable value: esPointValueStr - num_oid: .1.3.6.1.4.1.3052.12.1.1.1.1.7. + num_oid: '.1.3.6.1.4.1.3052.12.1.1.1.1.7.{{ $index }}' descr: esPointName skip_values: - diff --git a/includes/definitions/discovery/sixnet.yaml b/includes/definitions/discovery/sixnet.yaml index cac56c14e4..55097ef31d 100644 --- a/includes/definitions/discovery/sixnet.yaml +++ b/includes/definitions/discovery/sixnet.yaml @@ -5,7 +5,7 @@ modules: data: - oid: p1status - num_oid: .1.3.6.1.4.1.20540.2.1.1.1. + num_oid: '.1.3.6.1.4.1.20540.2.1.1.1.{{ $index }}' descr: 'Power Supply #1' index: 'p1status.{{ $index }}' state_name: p1status @@ -15,7 +15,7 @@ modules: - { value: 2, generic: 3, graph: 1, descr: Unknown } - oid: p2status - num_oid: .1.3.6.1.4.1.20540.2.1.1.2. + num_oid: '.1.3.6.1.4.1.20540.2.1.1.2.{{ $index }}' descr: 'Power Supply #2' index: 'p2status.{{ $index }}' state_name: p2status @@ -25,7 +25,7 @@ modules: - { value: 2, generic: 3, graph: 1, descr: Unknown } - oid: oKstatus - num_oid: .1.3.6.1.4.1.20540.2.1.1.3. + num_oid: '.1.3.6.1.4.1.20540.2.1.1.3.{{ $index }}' descr: 'Ok Relay' index: 'oKstatus.{{ $index }}' state_name: oKstatus @@ -35,11 +35,11 @@ modules: - { value: 2, generic: 3, graph: 1, descr: Unknown } - oid: fromPLCstatus - num_oid: .1.3.6.1.4.1.20540.2.1.1.7. + num_oid: '.1.3.6.1.4.1.20540.2.1.1.7.{{ $index }}' descr: 'PLC Input' index: 'fromPLCstatus.{{ $index }}' state_name: fromPLCstatus states: - { value: 0, generic: 2, graph: 1, descr: Off } - { value: 1, generic: 0, graph: 1, descr: On } - - { value: 2, generic: 3, graph: 1, descr: Unknown } \ No newline at end of file + - { value: 2, generic: 3, graph: 1, descr: Unknown } diff --git a/includes/definitions/discovery/smartos.yaml b/includes/definitions/discovery/smartos.yaml index b09a58304f..e24f0d1d65 100644 --- a/includes/definitions/discovery/smartos.yaml +++ b/includes/definitions/discovery/smartos.yaml @@ -5,7 +5,7 @@ modules: data: - oid: smartPortTable - num_oid: .1.3.6.1.4.1.30826.1.3.1.2.1.1.6. + num_oid: '.1.3.6.1.4.1.30826.1.3.1.2.1.1.6.{{ $index }}' value: smartPortStatus descr: '{{ $smartPortAlias }} - {{ $smartPortName }}' index: 'smartPortStatus.{{ $index }}' @@ -24,16 +24,16 @@ modules: - oid: smartEnvMonTemperatureTable value: smartEnvMonTemperatureValue - num_oid: .1.3.6.1.4.1.30826.1.4.1.1.1.3. + num_oid: '.1.3.6.1.4.1.30826.1.4.1.1.1.3.{{ $index }}' descr: smartEnvMonTemperatureDescr power: data: - oid: smartPortTable value: smartPortPower - num_oid: .1.3.6.1.4.1.30826.1.3.1.2.1.1.5. + num_oid: '.1.3.6.1.4.1.30826.1.3.1.2.1.1.5.{{ $index }}' divisor: 10 descr: '{{ $smartPortAlias }} - {{ $smartPortName }}' low_limit: smartPortLowPowerAlarmThreshold high_limit: smartPortHighPowerAlarmThreshold - skip_values: -400 \ No newline at end of file + skip_values: -400 diff --git a/includes/definitions/discovery/stoneos.yaml b/includes/definitions/discovery/stoneos.yaml index a881cd41a8..005442ff2b 100644 --- a/includes/definitions/discovery/stoneos.yaml +++ b/includes/definitions/discovery/stoneos.yaml @@ -12,14 +12,14 @@ modules: - oid: HILLSTONE-TEMPERATURE-MIB::HillstoneTemperatureEntry value: hillstoneTemperatureValue - num_oid: .1.3.6.1.4.1.28557.2.28.1.2.1.3. + num_oid: '.1.3.6.1.4.1.28557.2.28.1.2.1.3.{{ $index }}' descr: '{{ $hillstoneTemperatureDescr }}' state: data: - oid: HILLSTONE-POWER-MIB::HillstonePowerEntry value: hillstonePowerState - num_oid: .1.3.6.1.4.1.28557.2.27.1.2.1.3. + num_oid: '.1.3.6.1.4.1.28557.2.27.1.2.1.3.{{ $index }}' descr: '{{ $hillstonePowerDescr }}' index: 'hillstonePowerIndex.{{ $index }}' state_name: hillstonePowerState diff --git a/includes/definitions/discovery/uniping.yaml b/includes/definitions/discovery/uniping.yaml index dcd8d2300c..ba8c3e2ccd 100644 --- a/includes/definitions/discovery/uniping.yaml +++ b/includes/definitions/discovery/uniping.yaml @@ -6,7 +6,7 @@ modules: - oid: npRelHumTable value: npRelHumValue - num_oid: .1.3.6.1.4.1.25728.8400.1.1.2. + num_oid: '.1.3.6.1.4.1.25728.8400.1.1.2.{{ $index }}' low_limit: npRelHumSafeRangeLow high_limit: npRelHumSafeRangeHigh skip_values: 0 @@ -16,7 +16,7 @@ modules: - oid: npSmokeTable value: npSmokeStatus - num_oid: .1.3.6.1.4.1.25728.8200.1.1.2. + num_oid: '.1.3.6.1.4.1.25728.8200.1.1.2.{{ $index }}' descr: 'Smoke {{ $index }}' skip_values: 5 index: 'npSmokeStatus.{{ $index }}' @@ -29,7 +29,7 @@ modules: - oid: npCurLoopTable value: npCurLoopStatus - num_oid: .1.3.6.1.4.1.25728.8300.1.1.2. + num_oid: '.1.3.6.1.4.1.25728.8300.1.1.2.{{ $index }}' descr: 'Loop {{ $index }}' index: 'npCurLoopStatus.{{ $index }}' state_name: npCurLoopStatus @@ -42,7 +42,7 @@ modules: - oid: npRelayTable value: npRelayState - num_oid: .1.3.6.1.4.1.25728.5500.5.1.15. + num_oid: '.1.3.6.1.4.1.25728.5500.5.1.15.{{ $index }}' descr: 'Relay {{ $index }}' index: 'npRelayState.{{ $index }}' state_name: npRelayState @@ -52,7 +52,7 @@ modules: - oid: npThermoTable value: npThermoStatus - num_oid: .1.3.6.1.4.1.25728.8800.1.1.3 + num_oid: '.1.3.6.1.4.1.25728.8800.1.1.3.{{ $index }}' descr: 'Thermo {{ $index }}' skip_values: 0 index: 'npThermoStatus.{{ $index }}' @@ -65,7 +65,7 @@ modules: - oid: npRelHumTable value: npRelHumStatus - num_oid: .1.3.6.1.4.1.25728.8400.1.1.3. + num_oid: '.1.3.6.1.4.1.25728.8400.1.1.3.{{ $index }}' descr: 'Relative Humidity {{ $index }}' skip_values: 0 index: 'npRelHumStatus.{{ $index }}' @@ -78,7 +78,7 @@ modules: - oid: npRelHumTable value: npRelHumTempStatus - num_oid: .1.3.6.1.4.1.25728.8400.1.1.5. + num_oid: '.1.3.6.1.4.1.25728.8400.1.1.5.{{ $index }}' descr: 'Humidity Temp {{ $index }}' skip_values: 0 index: 'npRelHumTempStatus.{{ $index }}' @@ -93,7 +93,7 @@ modules: - oid: npThermoTable value: npThermoValue - num_oid: .1.3.6.1.4.1.25728.8800.1.1.2. + num_oid: '.1.3.6.1.4.1.25728.8800.1.1.2.{{ $index }}' low_limit: npThermoLow high_limit: npThermoHigh skip_values: 0 @@ -101,8 +101,8 @@ modules: - oid: npRelHumTable value: npRelHumTempValue - num_oid: .1.3.6.1.4.1.25728.8400.1.1.4. + num_oid: '.1.3.6.1.4.1.25728.8400.1.1.4.{{ $index }}' low_limit: npRelHumTempSafeRangeLow high_limit: npRelHumTempSafeRangeHigh skip_values: 0 - descr: 'Humidity Temp {{ $index }}' \ No newline at end of file + descr: 'Humidity Temp {{ $index }}' diff --git a/includes/definitions/discovery/valere.yaml b/includes/definitions/discovery/valere.yaml index eb7d7c0e27..484995a4b0 100644 --- a/includes/definitions/discovery/valere.yaml +++ b/includes/definitions/discovery/valere.yaml @@ -6,7 +6,7 @@ modules: - oid: vpwrSystemParameterGroup value: vpwrSystemVoltage - num_oid: .1.3.6.1.4.1.13858.2.3.2. + num_oid: '.1.3.6.1.4.1.13858.2.3.2.{{ $index }}' descr: System Voltage divisor: 100 current: @@ -14,21 +14,21 @@ modules: - oid: vpwrSystemParameterGroup value: vpwrSystemCurrent - num_oid: .1.3.6.1.4.1.13858.2.3.3. + num_oid: '.1.3.6.1.4.1.13858.2.3.3.{{ $index }}' descr: System Current temperature: data: - oid: vpwrSystemParameterGroup value: vpwrSystemInternalTemperature - num_oid: .1.3.6.1.4.1.13858.2.3.5. + num_oid: '.1.3.6.1.4.1.13858.2.3.5.{{ $index }}' descr: Internal Temperature state: data: - oid: vpwrSystemParameterGroup value: vpwrSystemControllerState - num_oid: .1.3.6.1.4.1.13858.2.3.4. + num_oid: '.1.3.6.1.4.1.13858.2.3.4.{{ $index }}' descr: Controller State state_name: vpwrSystemControllerState states: @@ -41,7 +41,7 @@ modules: - oid: vpwrSystemParameterGroup value: vpwrSystemTempCompensationState - num_oid: .1.3.6.1.4.1.13858.2.3.4. + num_oid: '.1.3.6.1.4.1.13858.2.3.4.{{ $index }}' descr: Temperature Compensation State state_name: vpwrSystemTempCompensationState states: diff --git a/includes/definitions/discovery/vrp.yaml b/includes/definitions/discovery/vrp.yaml index 7c647db849..73f8f3061a 100644 --- a/includes/definitions/discovery/vrp.yaml +++ b/includes/definitions/discovery/vrp.yaml @@ -26,14 +26,14 @@ modules: - oid: hwOpticalModuleInfoTable value: hwEntityOpticalTemperature - num_oid: .1.3.6.1.4.1.2011.5.25.31.1.1.3.1.5. + num_oid: '.1.3.6.1.4.1.2011.5.25.31.1.1.3.1.5.{{ $index }}' descr: '{{ $entPhysicalName }}' index: '{{ $index }}' skip_value_lt: -50 - oid: hwEntityStateTable value: hwEntityTemperature - num_oid: .1.3.6.1.4.1.2011.5.25.31.1.1.1.1.11. + num_oid: '.1.3.6.1.4.1.2011.5.25.31.1.1.1.1.11.{{ $index }}' descr: '{{ $entPhysicalName }}' index: '{{ $index }}' skip_values: 0 @@ -42,7 +42,7 @@ modules: - oid: hwOpticalModuleInfoTable value: hwEntityOpticalRxPower - num_oid: .1.3.6.1.4.1.2011.5.25.31.1.1.3.1.8. + num_oid: '.1.3.6.1.4.1.2011.5.25.31.1.1.3.1.8.{{ $index }}' descr: '{{ $entPhysicalName }} Rx' entPhysicalIndex: '{{ $index }}' entPhysicalIndex_measured: ports @@ -56,7 +56,7 @@ modules: - oid: hwOpticalModuleInfoTable value: hwEntityOpticalTxPower - num_oid: .1.3.6.1.4.1.2011.5.25.31.1.1.3.1.9. + num_oid: '.1.3.6.1.4.1.2011.5.25.31.1.1.3.1.9.{{ $index }}' descr: '{{ $entPhysicalName }} Tx' entPhysicalIndex: '{{ $index }}' entPhysicalIndex_measured: ports @@ -70,7 +70,7 @@ modules: - oid: hwOpticalModuleInfoTable value: hwEntityOpticalLaneRxPower - num_oid: .1.3.6.1.4.1.2011.5.25.31.1.1.3.1.32. + num_oid: '.1.3.6.1.4.1.2011.5.25.31.1.1.3.1.32.{{ $index }}' descr: '{{ $entPhysicalName }} Rx' entPhysicalIndex: '{{ $index }}' entPhysicalIndex_measured: ports @@ -84,7 +84,7 @@ modules: - oid: hwOpticalModuleInfoTable value: hwEntityOpticalLaneTxPower - num_oid: .1.3.6.1.4.1.2011.5.25.31.1.1.3.1.33. + num_oid: '.1.3.6.1.4.1.2011.5.25.31.1.1.3.1.33.{{ $index }}' descr: '{{ $entPhysicalName }} Tx' entPhysicalIndex: '{{ $index }}' entPhysicalIndex_measured: ports @@ -100,7 +100,7 @@ modules: - oid: hwOpticalModuleInfoTable value: hwEntityOpticalVoltage - num_oid: .1.3.6.1.4.1.2011.5.25.31.1.1.3.1.6. + num_oid: '.1.3.6.1.4.1.2011.5.25.31.1.1.3.1.6.{{ $index }}' descr: '{{ $entPhysicalName }}' index: '{{ $index }}' skip_values: -1 @@ -110,7 +110,7 @@ modules: - oid: hwOpticalModuleInfoTable value: hwEntityOpticalBiasCurrent - num_oid: .1.3.6.1.4.1.2011.5.25.31.1.1.3.1.7. + num_oid: '.1.3.6.1.4.1.2011.5.25.31.1.1.3.1.7.{{ $index }}' descr: '{{ $entPhysicalName }}' index: '{{ $index }}' skip_values: -1 diff --git a/includes/definitions/discovery/waas.yaml b/includes/definitions/discovery/waas.yaml index 8b99cfb1bb..20d920c1e8 100644 --- a/includes/definitions/discovery/waas.yaml +++ b/includes/definitions/discovery/waas.yaml @@ -6,7 +6,7 @@ modules: - oid: cwoTfoStatsLoadStatus value: cwoTfoStatsLoadStatus - num_oid: .1.3.6.1.4.1.9.9.762.1.2.1.13. + num_oid: '.1.3.6.1.4.1.9.9.762.1.2.1.13.{{ $index }}' descr: 'TFO Load Status' index: '{{ $index }}' states: diff --git a/includes/definitions/discovery/xirrus_aos.yaml b/includes/definitions/discovery/xirrus_aos.yaml index 27aee1ce84..b17461bb59 100644 --- a/includes/definitions/discovery/xirrus_aos.yaml +++ b/includes/definitions/discovery/xirrus_aos.yaml @@ -5,6 +5,6 @@ modules: data: - oid: systemTempCelsius - num_oid: .1.3.6.1.4.1.21013.1.2.28.21.1.3. + num_oid: '.1.3.6.1.4.1.21013.1.2.28.21.1.3.{{ $index }}' descr: "Temperature(C)" index: 1 diff --git a/includes/definitions/discovery/zywall.yaml b/includes/definitions/discovery/zywall.yaml index e090f26de1..9799356cd2 100644 --- a/includes/definitions/discovery/zywall.yaml +++ b/includes/definitions/discovery/zywall.yaml @@ -15,7 +15,7 @@ modules: - oid: vpnConnectStatus value: vpnConnectStatus - num_oid: .1.3.6.1.4.1.890.1.6.22.2.4.1.6. + num_oid: '.1.3.6.1.4.1.890.1.6.22.2.4.1.6.{{ $index }}' descr: 'vpn : {{ $vpnConnectionName }}' index: 'vpnIndex.{{ $index }}' state_name: vpnConnectStatus diff --git a/includes/discovery/functions.inc.php b/includes/discovery/functions.inc.php index fffefd8f55..dc75132a56 100644 --- a/includes/discovery/functions.inc.php +++ b/includes/discovery/functions.inc.php @@ -1034,7 +1034,7 @@ function discovery_process(&$valid, $device, $sensor_type, $pre_cache) d_echo("Final sensor value: $value\n"); if (can_skip_sensor($value, $data, $sensor_options, $raw_data[$index]) === false && is_numeric($value)) { - $oid = $data['num_oid'] . $index; + $oid = str_replace('{{ $index }}', $index, $data['num_oid']); // process the description $descr = dynamic_discovery_get_value('descr', $index, $data, $pre_cache); diff --git a/misc/discovery_schema.json b/misc/discovery_schema.json index 812dc8bb05..fdbf8d404b 100644 --- a/misc/discovery_schema.json +++ b/misc/discovery_schema.json @@ -116,7 +116,7 @@ }, "num_oid": { "type": "string", - "pattern": "^(\\.\\d+)+\\.?$" + "pattern": "^(\\.\\d+)+\\.?\\{\\{ \\$index \\}\\}(\\.\\d+)*$" }, "descr": { "type": "string" @@ -286,7 +286,7 @@ }, "num_oid": { "type": "string", - "pattern": "^(\\.\\d+)+\\.?$" + "pattern": "^(\\.\\d+)+\\.?\\{\\{ \\$index \\}\\}(\\.\\d+)*$" }, "index": { "type": ["integer", "string"] diff --git a/scripts/new-os.php b/scripts/new-os.php index 2c2809534a..b4c8393943 100755 --- a/scripts/new-os.php +++ b/scripts/new-os.php @@ -121,7 +121,7 @@ discovery: - oid: $table_name value: $value - num_oid: {$tmp_table[$value]}. + num_oid: {$tmp_table[$value]}.{{ \$index }} descr: $descr"; if ($multiplier) { $discovery[$type] .= "\n multiplier: $multiplier"; diff --git a/tests/data/arubaos_aruba7210.json b/tests/data/arubaos_aruba7210.json index 3868907eb1..ee013f1fb3 100644 --- a/tests/data/arubaos_aruba7210.json +++ b/tests/data/arubaos_aruba7210.json @@ -8,7 +8,7 @@ "sysDescr": "ArubaOS (MODEL: Aruba7210), Version 8.2.0.2 (62929)", "sysContact": null, "version": null, - "hardware": "", + "hardware": null, "features": null, "location": null, "os": "arubaos", @@ -45,16 +45,16 @@ "entPhysicalIndex": null, "hrDeviceIndex": null, "mempool_type": "arubaos", - "mempool_precision": "1", + "mempool_precision": 1, "mempool_descr": "Memory", - "mempool_perc": "0", - "mempool_used": "0", - "mempool_free": "0", - "mempool_total": "0", + "mempool_perc": 0, + "mempool_used": 0, + "mempool_free": 0, + "mempool_total": 0, "mempool_largestfree": null, "mempool_lowestfree": null, - "mempool_deleted": "0", - "mempool_perc_warn": "75" + "mempool_deleted": 0, + "mempool_perc_warn": 75 } ] }, @@ -65,16 +65,16 @@ "entPhysicalIndex": null, "hrDeviceIndex": null, "mempool_type": "arubaos", - "mempool_precision": "1", + "mempool_precision": 1, "mempool_descr": "Memory", - "mempool_perc": "83", - "mempool_used": "4430102528", - "mempool_free": "878575616", - "mempool_total": "5308678144", + "mempool_perc": 83, + "mempool_used": 4430102528, + "mempool_free": 878575616, + "mempool_total": 5308678144, "mempool_largestfree": null, "mempool_lowestfree": null, - "mempool_deleted": "0", - "mempool_perc_warn": "75" + "mempool_deleted": 0, + "mempool_perc_warn": 75 } ] } @@ -83,103 +83,103 @@ "discovery": { "processors": [ { - "entPhysicalIndex": "0", - "hrDeviceIndex": "0", + "entPhysicalIndex": 0, + "hrDeviceIndex": 0, "processor_oid": ".1.3.6.1.4.1.14823.2.2.1.2.1.13.1.3.1", "processor_index": "1", "processor_type": "arubaos", - "processor_usage": "2", - "processor_descr": "Supervisor Card CPU", - "processor_precision": "1", - "processor_perc_warn": "75" + "processor_usage": 2, + "processor_descr": "Network Processor CPU1", + "processor_precision": 1, + "processor_perc_warn": 75 }, { - "entPhysicalIndex": "0", - "hrDeviceIndex": "0", + "entPhysicalIndex": 0, + "hrDeviceIndex": 0, "processor_oid": ".1.3.6.1.4.1.14823.2.2.1.2.1.13.1.3.8", "processor_index": "8", "processor_type": "arubaos", - "processor_usage": "0", + "processor_usage": 0, "processor_descr": "Network Processor CPU8", - "processor_precision": "1", - "processor_perc_warn": "75" + "processor_precision": 1, + "processor_perc_warn": 75 }, { - "entPhysicalIndex": "0", - "hrDeviceIndex": "0", + "entPhysicalIndex": 0, + "hrDeviceIndex": 0, "processor_oid": ".1.3.6.1.4.1.14823.2.2.1.2.1.13.1.3.9", "processor_index": "9", "processor_type": "arubaos", - "processor_usage": "1", + "processor_usage": 1, "processor_descr": "Network Processor CPU9", - "processor_precision": "1", - "processor_perc_warn": "75" + "processor_precision": 1, + "processor_perc_warn": 75 }, { - "entPhysicalIndex": "0", - "hrDeviceIndex": "0", + "entPhysicalIndex": 0, + "hrDeviceIndex": 0, "processor_oid": ".1.3.6.1.4.1.14823.2.2.1.2.1.13.1.3.10", "processor_index": "10", "processor_type": "arubaos", - "processor_usage": "0", + "processor_usage": 0, "processor_descr": "Network Processor CPU10", - "processor_precision": "1", - "processor_perc_warn": "75" + "processor_precision": 1, + "processor_perc_warn": 75 }, { - "entPhysicalIndex": "0", - "hrDeviceIndex": "0", + "entPhysicalIndex": 0, + "hrDeviceIndex": 0, "processor_oid": ".1.3.6.1.4.1.14823.2.2.1.2.1.13.1.3.11", "processor_index": "11", "processor_type": "arubaos", - "processor_usage": "0", + "processor_usage": 0, "processor_descr": "Network Processor CPU11", - "processor_precision": "1", - "processor_perc_warn": "75" + "processor_precision": 1, + "processor_perc_warn": 75 }, { - "entPhysicalIndex": "0", - "hrDeviceIndex": "0", + "entPhysicalIndex": 0, + "hrDeviceIndex": 0, "processor_oid": ".1.3.6.1.4.1.14823.2.2.1.2.1.13.1.3.12", "processor_index": "12", "processor_type": "arubaos", - "processor_usage": "0", + "processor_usage": 0, "processor_descr": "Network Processor CPU12", - "processor_precision": "1", - "processor_perc_warn": "75" + "processor_precision": 1, + "processor_perc_warn": 75 }, { - "entPhysicalIndex": "0", - "hrDeviceIndex": "0", + "entPhysicalIndex": 0, + "hrDeviceIndex": 0, "processor_oid": ".1.3.6.1.4.1.14823.2.2.1.2.1.13.1.3.13", "processor_index": "13", "processor_type": "arubaos", - "processor_usage": "0", + "processor_usage": 0, "processor_descr": "Network Processor CPU13", - "processor_precision": "1", - "processor_perc_warn": "75" + "processor_precision": 1, + "processor_perc_warn": 75 }, { - "entPhysicalIndex": "0", - "hrDeviceIndex": "0", + "entPhysicalIndex": 0, + "hrDeviceIndex": 0, "processor_oid": ".1.3.6.1.4.1.14823.2.2.1.2.1.13.1.3.14", "processor_index": "14", "processor_type": "arubaos", - "processor_usage": "0", + "processor_usage": 0, "processor_descr": "Network Processor CPU14", - "processor_precision": "1", - "processor_perc_warn": "75" + "processor_precision": 1, + "processor_perc_warn": 75 }, { - "entPhysicalIndex": "0", - "hrDeviceIndex": "0", + "entPhysicalIndex": 0, + "hrDeviceIndex": 0, "processor_oid": ".1.3.6.1.4.1.14823.2.2.1.2.1.13.1.3.15", "processor_index": "15", "processor_type": "arubaos", - "processor_usage": "1", + "processor_usage": 1, "processor_descr": "Network Processor CPU15", - "processor_precision": "1", - "processor_perc_warn": "75" + "processor_precision": 1, + "processor_perc_warn": 75 } ] },