intermediate commit

2024-10-07 16:52:45 +00:00 · 2020-01-10 08:07:15 +01:00
parent c03c281b6c
commit 2aa0b069b6
2 changed files with 68 additions and 2 deletions
--- a/includes/definitions/discovery/zynos.yaml
+++ b/includes/definitions/discovery/zynos.yaml
@ -1,4 +1,4 @@
-mib: ZYXEL-ES-COMMON:ZYXEL-HW-MONITOR-MIB
+mib: ZYXEL-ES-COMMON:ZYXEL-HW-MONITOR-MIB:ZYXEL-MGS3712-MIB
 modules:
    processors:
          data:
@ -12,6 +12,11 @@ modules:
                  value: sysMgmtCPUUsage
                  snmp_flags: ['-OeQUs', '-Pu'] # workaround for underscores in mib
                  num_oid: '.1.3.6.1.4.1.890.1.5.8.55.12.7.{{ $index }}'
+              -
+                  oid: ZYXEL-MGS3712-MIB::sysMgmtCPUUsage
+                  value: sysMgmtCPUUsage
+                  snmp_flags: ['-OeQUs', '-Pu'] # workaround for underscores in mib
+                  num_oid: '.1.3.6.1.4.1.890.1.5.8.47.11.7.{{ $index }}'
              -
                  oid: sysMgmtCPU5SecUsage
                  num_oid: '.1.3.6.1.4.1.890.1.15.3.2.7.{{ $index }}'
@ -29,6 +34,14 @@ modules:
                    high_limit: zyHwMonitorFanRpmMaxValue
                    low_limit: zyHwMonitorFanRpmMinValue
                    low_warn_limit: zyHwMonitorFanRpmLowThreshold
+                -
+                    oid: fanRpmTable 
+                    value: fanRpmCurValue
+                    snmp_flags: ['-OteQUs', '-Pu'] # workaround for underscores in mib
+                    num_oid: '.1.3.6.1.4.1.890.1.5.8.47.8.1.1.2.{{ $index }}'
+                    descr: 'Fan {{ $index }} ({{ $fanRpmDescr }})'
+                    index: 'fanRpmCurValue.{{ $index }}'
+                    low_limit: fanRpmLowThresh
        temperature:
            options:
                skip_values_lt: 0
@ -42,6 +55,33 @@ modules:
                    high_limit: zyHwMonitorTemperatureMaxValue
                    low_limit: zyHwMonitorTemperatureMinValue
                    warn_limit: zyHwMonitorTemperatureHighThreshold
+                -
+                    oid: tempTable 
+                    value: tempCurValue
+                    snmp_flags: ['-OteQUsb', '-Pu'] # workaround for underscores in mib
+                    num_oid: '.1.3.6.1.4.1.890.1.5.8.47.8.2.1.2.{{ $index }}'
+                    descr: 'Temp {{ $index }} ({{ $tempDescr }})'
+                    index: 'tempCurValue.{{ $index }}'
+                    high_limit: tempHighThresh
+                -
+                    oid: transceiverDdmInfoTable 
+                    value: transceiverDdmInfoEntryCurrent
+                    snmp_flags: ['-OteQUsb', '-Pu'] # workaround for underscores in mib
+                    num_oid: '.1.3.6.1.4.1.890.1.5.8.47.117.2.1.7.{{ $index }}'
+                    descr: 'SFP ifIndex {{ $transceiverDdmInfoEntryPort }} {{ $transceiverDdmInfoEntryDescription }}'
+                    index: 'transceiverDdmInfoEntryCurrent.{{ $index }}'
+                    high_limit: transceiverDdmInfoEntryAlarmMax
+                    low_limit: transceiverDdmInfoEntryAlarmMin
+                    warn_limit: transceiverDdmInfoEntryWarnMax
+                    low_warn_limit: transceiverDdmInfoEntryWarnMin
+                    divisor: 100
+                    entPhysicalIndex: transceiverDdmInfoEntryPort
+                    entPhysicalIndex_measured: ports
+                    skip_values:
+                    -
+                      oid: transceiverDdmInfoEntryDescription
+                      op: '!='
+                      value: 'Temperature'
        voltage:
            options:
                skip_values_lt: 0
@ -56,3 +96,30 @@ modules:
                    high_limit: zyHwMonitorVoltageMaxValue
                    low_limit: zyHwMonitorVoltageMinValue
                    low_warn_limit: zyHwMonitorVoltageLowThreshold
+                -
+                    oid: voltageTable 
+                    value: voltageCurValue
+                    snmp_flags: ['-OteQUs', '-Pu'] # workaround for underscores in mib
+                    num_oid: '.1.3.6.1.4.1.890.1.5.8.47.8.3.1.2.{{ $index }}'
+                    descr: '{{ $voltageNominalValue }}mV ({{ $voltageDescr }})'
+                    index: 'voltageCurValue.{{ $index }}'
+                    low_limit: voltageLowThresh
+                -
+                    oid: transceiverDdmInfoTable 
+                    value: transceiverDdmInfoEntryCurrent
+                    snmp_flags: ['-OteQUsb', '-Pu'] # workaround for underscores in mib
+                    num_oid: '.1.3.6.1.4.1.890.1.5.8.47.117.2.1.7.{{ $index }}'
+                    descr: 'SFP ifIndex {{ $transceiverDdmInfoEntryPort }} {{ $transceiverDdmInfoEntryDescription }}'
+                    index: 'transceiverDdmInfoEntryCurrent.{{ $index }}'
+                    high_limit: transceiverDdmInfoEntryAlarmMax
+                    low_limit: transceiverDdmInfoEntryAlarmMin
+                    warn_limit: transceiverDdmInfoEntryWarnMax
+                    low_warn_limit: transceiverDdmInfoEntryWarnMin
+                    divisor: 100
+                    entPhysicalIndex: transceiverDdmInfoEntryPort
+                    entPhysicalIndex_measured: ports
+                    skip_values:
+                    -
+                      oid: transceiverDdmInfoEntryDescription
+                      op: '!='
+                      value: 'Voltage'
--- a/includes/definitions/zynos.yaml
+++ b/includes/definitions/zynos.yaml
@ -6,7 +6,6 @@ icon: zyxel
 over:
    - { graph: device_bits, text: 'Device Traffic' }
    - { graph: device_processor, text: 'CPU Usage' }
-    - { graph: device_mempool, text: 'Memory Usage' }
 discovery:
    -
      sysObjectID: .1.3.6.1.4.1.890