diff --git a/includes/definitions/discovery/timos.yaml b/includes/definitions/discovery/timos.yaml index 34e05d50ac..2ffc2df147 100644 --- a/includes/definitions/discovery/timos.yaml +++ b/includes/definitions/discovery/timos.yaml @@ -1,4 +1,4 @@ -mib: TIMETRA-SYSTEM-MIB:TIMETRA-CHASSIS-MIB +mib: TIMETRA-SYSTEM-MIB:TIMETRA-CHASSIS-MIB:TIMETRA-SUBSCRIBER-MGMT-MIB modules: processors: data: @@ -102,3 +102,33 @@ modules: num_oid: '.1.3.6.1.4.1.6527.3.1.2.2.1.24.1.1.5.{{ $index }}' descr: 'Fanspeed {{ $index }}' index: 'tmnxPhysChassisFanSpeedPercent.{{ $index }}' + count: + data: + - + oid: tmnxSubMgmtSystStatsTable + value: tmnxSubMgmtSystSSubscribers + num_oid: '.1.3.6.1.4.1.6527.3.1.2.33.1.107.1.65.{{ $index }}' + descr: 'Active subscribers on this system' + index: 'tmnxSubMgmtSystSSubscribers.{{ $index }}' + group: 'Subscribers' + - + oid: tmnxSubMgmtSystStatsTable + value: tmnxSubMgmtSystSV4 + num_oid: '.1.3.6.1.4.1.6527.3.1.2.33.1.107.1.25.{{ $index }}' + descr: 'V4 hosts on this system' + index: 'tmnxSubMgmtSystSV4.{{ $index }}' + group: 'Subscribers' + - + oid: tmnxSubMgmtSystStatsTable + value: tmnxSubMgmtSystSV6 + num_oid: '.1.3.6.1.4.1.6527.3.1.2.33.1.107.1.27.{{ $index }}' + descr: 'V6 hosts on this system' + index: 'tmnxSubMgmtSystSV6.{{ $index }}' + group: 'Subscribers' + - + oid: tmnxSubMgmtSystStatsTable + value: tmnxSubMgmtSystSTotal + num_oid: '.1.3.6.1.4.1.6527.3.1.2.33.1.107.1.33.{{ $index }}' + descr: 'Total hosts on this system' + index: 'tmnxSubMgmtSystSTotal.{{ $index }}' + group: 'Subscribers' diff --git a/tests/data/timos.json b/tests/data/timos.json index 6e51a4f725..865086a5c7 100644 --- a/tests/data/timos.json +++ b/tests/data/timos.json @@ -20,6 +20,102 @@ "sensors": { "discovery": { "sensors": [ + { + "sensor_deleted": 0, + "sensor_class": "count", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.6527.3.1.2.33.1.107.1.65.1", + "sensor_index": "tmnxSubMgmtSystSSubscribers.1", + "sensor_type": "timos", + "sensor_descr": "Active subscribers on this system", + "group": "Subscribers", + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_current": 181, + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "count", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.6527.3.1.2.33.1.107.1.33.1", + "sensor_index": "tmnxSubMgmtSystSTotal.1", + "sensor_type": "timos", + "sensor_descr": "Total hosts on this system", + "group": "Subscribers", + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_current": 269, + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "count", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.6527.3.1.2.33.1.107.1.25.1", + "sensor_index": "tmnxSubMgmtSystSV4.1", + "sensor_type": "timos", + "sensor_descr": "V4 hosts on this system", + "group": "Subscribers", + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_current": 181, + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "count", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.6527.3.1.2.33.1.107.1.27.1", + "sensor_index": "tmnxSubMgmtSystSV6.1", + "sensor_type": "timos", + "sensor_descr": "V6 hosts on this system", + "group": "Subscribers", + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_current": 88, + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "state_name": null + }, { "sensor_deleted": 0, "sensor_class": "load", @@ -925,6 +1021,102 @@ }, "poller": { "sensors": [ + { + "sensor_deleted": 0, + "sensor_class": "count", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.6527.3.1.2.33.1.107.1.65.1", + "sensor_index": "tmnxSubMgmtSystSSubscribers.1", + "sensor_type": "timos", + "sensor_descr": "Active subscribers on this system", + "group": "Subscribers", + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_current": 181, + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "count", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.6527.3.1.2.33.1.107.1.33.1", + "sensor_index": "tmnxSubMgmtSystSTotal.1", + "sensor_type": "timos", + "sensor_descr": "Total hosts on this system", + "group": "Subscribers", + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_current": 269, + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "count", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.6527.3.1.2.33.1.107.1.25.1", + "sensor_index": "tmnxSubMgmtSystSV4.1", + "sensor_type": "timos", + "sensor_descr": "V4 hosts on this system", + "group": "Subscribers", + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_current": 181, + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "count", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.6527.3.1.2.33.1.107.1.27.1", + "sensor_index": "tmnxSubMgmtSystSV6.1", + "sensor_type": "timos", + "sensor_descr": "V6 hosts on this system", + "group": "Subscribers", + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_current": 88, + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "state_name": null + }, { "sensor_deleted": 0, "sensor_class": "load", diff --git a/tests/snmpsim/timos.snmprec b/tests/snmpsim/timos.snmprec index e53999bf43..80876701e7 100644 --- a/tests/snmpsim/timos.snmprec +++ b/tests/snmpsim/timos.snmprec @@ -3581,6 +3581,128 @@ 1.3.6.1.4.1.6527.3.1.2.14.4.8.1.141.3.1.4.38.229.46.20|4|00 00 00 00 1.3.6.1.4.1.6527.3.1.2.14.4.8.1.141.3.2.16.38.32.0.0.6.176.128.0.0.0.0.0.0.0.0.32|4|00 00 00 00 1.3.6.1.4.1.6527.3.1.2.14.4.8.1.141.3.2.16.38.32.0.0.6.176.255.0.0.0.0.0.0.0.0.32|4|00 00 00 00 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.1.1|65|181 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.2.1|65|183 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.3.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.4.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.5.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.6.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.7.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.8.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.9.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.10.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.11.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.12.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.13.1|65|88 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.14.1|65|89 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.15.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.16.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.17.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.18.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.19.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.20.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.21.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.22.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.23.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.24.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.25.1|65|181 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.26.1|65|183 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.27.1|65|88 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.28.1|65|89 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.29.1|65|269 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.30.1|65|272 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.31.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.32.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.33.1|65|269 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.34.1|65|272 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.35.1|65|181 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.36.1|65|183 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.37.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.38.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.39.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.40.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.41.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.42.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.43.1|65|181 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.44.1|65|183 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.45.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.46.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.47.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.48.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.49.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.50.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.51.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.52.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.53.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.54.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.55.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.56.1|65|3 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.57.1|65|181 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.58.1|65|183 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.59.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.60.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.61.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.62.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.63.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.64.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.65.1|65|181 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.66.1|65|183 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.67.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.68.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.69.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.70.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.71.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.72.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.73.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.74.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.75.1|65|86 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.76.1|65|87 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.77.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.78.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.79.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.80.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.81.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.82.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.83.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.84.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.85.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.86.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.87.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.88.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.89.1|65|86 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.90.1|65|87 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.91.1|65|86 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.92.1|65|87 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.93.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.94.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.95.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.96.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.97.1|65|269 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.98.1|65|272 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.99.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.100.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.101.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.102.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.103.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.104.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.105.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.106.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.107.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.108.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.109.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.110.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.111.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.112.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.113.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.114.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.115.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.116.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.117.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.118.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.119.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.120.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.121.1|65|0 +1.3.6.1.4.1.6527.3.1.2.33.1.107.1.122.1|65|0 1.3.6.1.4.1.6527.3.1.2.59.4.1.1.4.13890.35717120.1.1|2|4 1.3.6.1.4.1.6527.3.1.2.59.4.1.1.4.14402.69238784.1.1|2|4 1.3.6.1.4.1.6527.3.1.2.59.4.1.1.4.58355808.35684352.1.2|2|4