diff --git a/includes/definitions/discovery/janitza-umg96.yaml b/includes/definitions/discovery/janitza-umg96.yaml index ba7dfd5e42..db5a32633f 100644 --- a/includes/definitions/discovery/janitza-umg96.yaml +++ b/includes/definitions/discovery/janitza-umg96.yaml @@ -11,15 +11,32 @@ modules: options: divisor: 10 data: + - + oid: whL1 + num_oid: .1.3.6.1.4.1.34278.3.1.{{ $index }} + index: whL1.{{ $index }} + descr: 'L1' + - + oid: whL2 + num_oid: .1.3.6.1.4.1.34278.3.2.{{ $index }} + index: whL2.{{ $index }} + descr: 'L2' + - + oid: whL3 + num_oid: .1.3.6.1.4.1.34278.3.3.{{ $index }} + index: whL3.{{ $index }} + descr: 'L3' - oid: wh3 num_oid: .1.3.6.1.4.1.34278.4.1.{{ $index }} index: wh3.{{ $index }} + group: 'Sum' descr: 'L1-L3' - oid: qh3 num_oid: .1.3.6.1.4.1.34278.4.2.{{ $index }} - index: qh2.{{ $index }} + index: qh3.{{ $index }} + group: 'Sum' descr: 'L1-L3 Reactive' voltage: options: diff --git a/includes/definitions/discovery/janitza.yaml b/includes/definitions/discovery/janitza.yaml index f1c21a38e2..26ee423b0e 100644 --- a/includes/definitions/discovery/janitza.yaml +++ b/includes/definitions/discovery/janitza.yaml @@ -6,6 +6,42 @@ modules: - oid: - janitza + power_consumed: + options: + divisor: 10 + data: + - + oid: whL1 + num_oid: .1.3.6.1.4.1.34278.4.1.{{ $index }} + index: whL1.{{ $index }} + descr: 'L1' + - + oid: whL2 + num_oid: .1.3.6.1.4.1.34278.4.2.{{ $index }} + index: whL2.{{ $index }} + descr: 'L2' + - + oid: whL3 + num_oid: .1.3.6.1.4.1.34278.4.3.{{ $index }} + index: whL3.{{ $index }} + descr: 'L3' + - + oid: whL4 + num_oid: .1.3.6.1.4.1.34278.4.4.{{ $index }} + index: whL4.{{ $index }} + descr: 'L4' + - + oid: wh3 + num_oid: .1.3.6.1.4.1.34278.5.1.{{ $index }} + index: wh3.{{ $index }} + group: 'Sum' + descr: 'L1-L3' + - + oid: qh3 + num_oid: .1.3.6.1.4.1.34278.5.2.{{ $index }} + index: qh3.{{ $index }} + group: 'Sum' + descr: 'L1-L3 Reactive' voltage: options: divisor: 10 diff --git a/tests/data/janitza-umg96_umg96.json b/tests/data/janitza-umg96_umg96.json index bd4a626f59..5733112c69 100644 --- a/tests/data/janitza-umg96_umg96.json +++ b/tests/data/janitza-umg96_umg96.json @@ -412,10 +412,10 @@ "sensor_class": "power_consumed", "poller_type": "snmp", "sensor_oid": ".1.3.6.1.4.1.34278.4.2.0", - "sensor_index": "qh2.0", + "sensor_index": "qh3.0", "sensor_type": "janitza-umg96", "sensor_descr": "L1-L3 Reactive", - "group": null, + "group": "Sum", "sensor_divisor": 10, "sensor_multiplier": 1, "sensor_current": -6383.7, @@ -439,7 +439,7 @@ "sensor_index": "wh3.0", "sensor_type": "janitza-umg96", "sensor_descr": "L1-L3", - "group": null, + "group": "Sum", "sensor_divisor": 10, "sensor_multiplier": 1, "sensor_current": 13481.2, @@ -455,6 +455,78 @@ "user_func": null, "state_name": null }, + { + "sensor_deleted": 0, + "sensor_class": "power_consumed", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.34278.3.1.0", + "sensor_index": "whL1.0", + "sensor_type": "janitza-umg96", + "sensor_descr": "L1", + "group": null, + "sensor_divisor": 10, + "sensor_multiplier": 1, + "sensor_current": 4583.9, + "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": "power_consumed", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.34278.3.2.0", + "sensor_index": "whL2.0", + "sensor_type": "janitza-umg96", + "sensor_descr": "L2", + "group": null, + "sensor_divisor": 10, + "sensor_multiplier": 1, + "sensor_current": 4679, + "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": "power_consumed", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.34278.3.3.0", + "sensor_index": "whL3.0", + "sensor_type": "janitza-umg96", + "sensor_descr": "L3", + "group": null, + "sensor_divisor": 10, + "sensor_multiplier": 1, + "sensor_current": 4218.2, + "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": "quality_factor", diff --git a/tests/data/janitza.json b/tests/data/janitza_generic.json similarity index 81% rename from tests/data/janitza.json rename to tests/data/janitza_generic.json index 774ee67da6..1ffcf1877a 100644 --- a/tests/data/janitza.json +++ b/tests/data/janitza_generic.json @@ -34,7 +34,7 @@ "group": null, "sensor_divisor": 1000, "sensor_multiplier": 1, - "sensor_current": 218.542, + "sensor_current": 216.052, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -58,7 +58,7 @@ "group": null, "sensor_divisor": 1000, "sensor_multiplier": 1, - "sensor_current": 210.211, + "sensor_current": 208.469, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -82,7 +82,7 @@ "group": null, "sensor_divisor": 1000, "sensor_multiplier": 1, - "sensor_current": 223.938, + "sensor_current": 221.687, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -106,7 +106,7 @@ "group": null, "sensor_divisor": 1000, "sensor_multiplier": 1, - "sensor_current": 8.652, + "sensor_current": 8.299, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -130,10 +130,10 @@ "group": null, "sensor_divisor": 100, "sensor_multiplier": 1, - "sensor_current": 50, - "sensor_limit": 52.5, + "sensor_current": 50.02, + "sensor_limit": 52.521, "sensor_limit_warn": null, - "sensor_limit_low": 47.5, + "sensor_limit_low": 47.519, "sensor_limit_low_warn": null, "sensor_alert": 1, "sensor_custom": "No", @@ -154,7 +154,7 @@ "group": null, "sensor_divisor": 1, "sensor_multiplier": 1, - "sensor_current": -74, + "sensor_current": -82, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -178,7 +178,7 @@ "group": "Real", "sensor_divisor": 1, "sensor_multiplier": 1, - "sensor_current": 137982, + "sensor_current": 136678, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -202,7 +202,7 @@ "group": "Real", "sensor_divisor": 1, "sensor_multiplier": 1, - "sensor_current": 46363, + "sensor_current": 45924, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -226,7 +226,7 @@ "group": "Real", "sensor_divisor": 1, "sensor_multiplier": 1, - "sensor_current": 44088, + "sensor_current": 43698, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -250,7 +250,7 @@ "group": "Real", "sensor_divisor": 1, "sensor_multiplier": 1, - "sensor_current": 47530, + "sensor_current": 47055, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -298,7 +298,7 @@ "group": "Reactiv", "sensor_divisor": 1, "sensor_multiplier": 1, - "sensor_current": -58764, + "sensor_current": -56284, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -322,7 +322,7 @@ "group": "Reactiv", "sensor_divisor": 1, "sensor_multiplier": 1, - "sensor_current": -19315, + "sensor_current": -18353, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -346,7 +346,7 @@ "group": "Reactiv", "sensor_divisor": 1, "sensor_multiplier": 1, - "sensor_current": -19714, + "sensor_current": -19047, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -370,7 +370,7 @@ "group": "Reactiv", "sensor_divisor": 1, "sensor_multiplier": 1, - "sensor_current": -19734, + "sensor_current": -18825, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -394,7 +394,7 @@ "group": null, "sensor_divisor": 1, "sensor_multiplier": 1, - "sensor_current": 150454, + "sensor_current": 148164, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -418,7 +418,7 @@ "group": null, "sensor_divisor": 1, "sensor_multiplier": 1, - "sensor_current": 50392, + "sensor_current": 49598, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -442,7 +442,7 @@ "group": null, "sensor_divisor": 1, "sensor_multiplier": 1, - "sensor_current": 48425, + "sensor_current": 47750, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -466,7 +466,151 @@ "group": null, "sensor_divisor": 1, "sensor_multiplier": 1, - "sensor_current": 51636, + "sensor_current": 50815, + "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": "power_consumed", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.34278.5.2.0", + "sensor_index": "qh3.0", + "sensor_type": "janitza", + "sensor_descr": "L1-L3 Reactive", + "group": "Sum", + "sensor_divisor": 10, + "sensor_multiplier": 1, + "sensor_current": -5353564.5, + "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": "power_consumed", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.34278.5.1.0", + "sensor_index": "wh3.0", + "sensor_type": "janitza", + "sensor_descr": "L1-L3", + "group": "Sum", + "sensor_divisor": 10, + "sensor_multiplier": 1, + "sensor_current": 11698878.8, + "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": "power_consumed", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.34278.4.1.0", + "sensor_index": "whL1.0", + "sensor_type": "janitza", + "sensor_descr": "L1", + "group": null, + "sensor_divisor": 10, + "sensor_multiplier": 1, + "sensor_current": 3930197.3, + "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": "power_consumed", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.34278.4.2.0", + "sensor_index": "whL2.0", + "sensor_type": "janitza", + "sensor_descr": "L2", + "group": null, + "sensor_divisor": 10, + "sensor_multiplier": 1, + "sensor_current": 3731497.8, + "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": "power_consumed", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.34278.4.3.0", + "sensor_index": "whL3.0", + "sensor_type": "janitza", + "sensor_descr": "L3", + "group": null, + "sensor_divisor": 10, + "sensor_multiplier": 1, + "sensor_current": 4037183.6, + "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": "power_consumed", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.34278.4.4.0", + "sensor_index": "whL4.0", + "sensor_type": "janitza", + "sensor_descr": "L4", + "group": null, + "sensor_divisor": 10, + "sensor_multiplier": 1, + "sensor_current": 9026.8, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -490,7 +634,7 @@ "group": "Cos Phi", "sensor_divisor": 1000, "sensor_multiplier": 1, - "sensor_current": 0.923, + "sensor_current": 0.927, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -514,7 +658,7 @@ "group": "Cos Phi", "sensor_divisor": 1000, "sensor_multiplier": 1, - "sensor_current": 0.913, + "sensor_current": 0.916, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -538,7 +682,7 @@ "group": "Cos Phi", "sensor_divisor": 1000, "sensor_multiplier": 1, - "sensor_current": 0.923, + "sensor_current": 0.927, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -562,7 +706,7 @@ "group": "Cos Phi", "sensor_divisor": 1000, "sensor_multiplier": 1, - "sensor_current": 0.92, + "sensor_current": 0.924, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -586,7 +730,7 @@ "group": "Harmonic Distortion Voltage", "sensor_divisor": 10, "sensor_multiplier": 1, - "sensor_current": 7.6, + "sensor_current": 9.6, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -610,7 +754,7 @@ "group": "Harmonic Distortion Voltage", "sensor_divisor": 10, "sensor_multiplier": 1, - "sensor_current": 8.1, + "sensor_current": 9.9, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -634,7 +778,7 @@ "group": "Harmonic Distortion Voltage", "sensor_divisor": 10, "sensor_multiplier": 1, - "sensor_current": 8.6, + "sensor_current": 10.1, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -658,7 +802,7 @@ "group": "Harmonic Distortion Voltage", "sensor_divisor": 10, "sensor_multiplier": 1, - "sensor_current": 214.8, + "sensor_current": 182.5, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -682,7 +826,7 @@ "group": "Harmonic Distortion Current", "sensor_divisor": 10, "sensor_multiplier": 1, - "sensor_current": 1.1, + "sensor_current": 1.2, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -706,7 +850,7 @@ "group": "Harmonic Distortion Current", "sensor_divisor": 10, "sensor_multiplier": 1, - "sensor_current": 1, + "sensor_current": 1.1, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -730,7 +874,7 @@ "group": "Harmonic Distortion Current", "sensor_divisor": 10, "sensor_multiplier": 1, - "sensor_current": 1.1, + "sensor_current": 1.2, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -754,7 +898,7 @@ "group": "Harmonic Distortion Current", "sensor_divisor": 10, "sensor_multiplier": 1, - "sensor_current": 26.7, + "sensor_current": 26.4, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -778,10 +922,10 @@ "group": "L to L", "sensor_divisor": 10, "sensor_multiplier": 1, - "sensor_current": 397.6, - "sensor_limit": 457.24, + "sensor_current": 397.7, + "sensor_limit": 457.355, "sensor_limit_warn": null, - "sensor_limit_low": 337.96, + "sensor_limit_low": 338.045, "sensor_limit_low_warn": null, "sensor_alert": 1, "sensor_custom": "No", @@ -802,10 +946,10 @@ "group": "L to L", "sensor_divisor": 10, "sensor_multiplier": 1, - "sensor_current": 397.9, - "sensor_limit": 457.585, + "sensor_current": 397.7, + "sensor_limit": 457.355, "sensor_limit_warn": null, - "sensor_limit_low": 338.215, + "sensor_limit_low": 338.045, "sensor_limit_low_warn": null, "sensor_alert": 1, "sensor_custom": "No", @@ -850,10 +994,10 @@ "group": "L to N", "sensor_divisor": 10, "sensor_multiplier": 1, - "sensor_current": 229.9, - "sensor_limit": 264.385, + "sensor_current": 230.1, + "sensor_limit": 264.615, "sensor_limit_warn": null, - "sensor_limit_low": 195.415, + "sensor_limit_low": 195.585, "sensor_limit_low_warn": null, "sensor_alert": 1, "sensor_custom": "No", @@ -874,10 +1018,10 @@ "group": "L to N", "sensor_divisor": 10, "sensor_multiplier": 1, - "sensor_current": 229.7, - "sensor_limit": 264.155, + "sensor_current": 229.6, + "sensor_limit": 264.04, "sensor_limit_warn": null, - "sensor_limit_low": 195.245, + "sensor_limit_low": 195.16, "sensor_limit_low_warn": null, "sensor_alert": 1, "sensor_custom": "No", @@ -898,10 +1042,10 @@ "group": "L to N", "sensor_divisor": 10, "sensor_multiplier": 1, - "sensor_current": 229.9, - "sensor_limit": 264.385, + "sensor_current": 229.7, + "sensor_limit": 264.155, "sensor_limit_warn": null, - "sensor_limit_low": 195.415, + "sensor_limit_low": 195.245, "sensor_limit_low_warn": null, "sensor_alert": 1, "sensor_custom": "No", @@ -922,10 +1066,10 @@ "group": "L to N", "sensor_divisor": 10, "sensor_multiplier": 1, - "sensor_current": 25.4, - "sensor_limit": 29.21, + "sensor_current": 25.3, + "sensor_limit": 29.095, "sensor_limit_warn": null, - "sensor_limit_low": 21.59, + "sensor_limit_low": 21.505, "sensor_limit_low_warn": null, "sensor_alert": 1, "sensor_custom": "No", @@ -951,7 +1095,7 @@ "group": null, "sensor_divisor": 1000, "sensor_multiplier": 1, - "sensor_current": 218.542, + "sensor_current": 216.052, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -975,7 +1119,7 @@ "group": null, "sensor_divisor": 1000, "sensor_multiplier": 1, - "sensor_current": 210.211, + "sensor_current": 208.469, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -999,7 +1143,7 @@ "group": null, "sensor_divisor": 1000, "sensor_multiplier": 1, - "sensor_current": 223.938, + "sensor_current": 221.687, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -1023,7 +1167,7 @@ "group": null, "sensor_divisor": 1000, "sensor_multiplier": 1, - "sensor_current": 8.652, + "sensor_current": 8.299, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -1047,10 +1191,10 @@ "group": null, "sensor_divisor": 100, "sensor_multiplier": 1, - "sensor_current": 50, - "sensor_limit": 52.5, + "sensor_current": 50.02, + "sensor_limit": 52.521, "sensor_limit_warn": null, - "sensor_limit_low": 47.5, + "sensor_limit_low": 47.519, "sensor_limit_low_warn": null, "sensor_alert": 1, "sensor_custom": "No", @@ -1071,7 +1215,7 @@ "group": null, "sensor_divisor": 1, "sensor_multiplier": 1, - "sensor_current": 219, + "sensor_current": 209, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -1080,7 +1224,7 @@ "sensor_custom": "No", "entPhysicalIndex": null, "entPhysicalIndex_measured": null, - "sensor_prev": -74, + "sensor_prev": -82, "user_func": null, "state_name": null }, @@ -1095,7 +1239,7 @@ "group": "Real", "sensor_divisor": 1, "sensor_multiplier": 1, - "sensor_current": 137982, + "sensor_current": 136678, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -1119,7 +1263,7 @@ "group": "Real", "sensor_divisor": 1, "sensor_multiplier": 1, - "sensor_current": 46363, + "sensor_current": 45924, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -1143,7 +1287,7 @@ "group": "Real", "sensor_divisor": 1, "sensor_multiplier": 1, - "sensor_current": 44088, + "sensor_current": 43698, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -1167,7 +1311,7 @@ "group": "Real", "sensor_divisor": 1, "sensor_multiplier": 1, - "sensor_current": 47530, + "sensor_current": 47055, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -1215,7 +1359,7 @@ "group": "Reactiv", "sensor_divisor": 1, "sensor_multiplier": 1, - "sensor_current": -58764, + "sensor_current": -56284, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -1239,7 +1383,7 @@ "group": "Reactiv", "sensor_divisor": 1, "sensor_multiplier": 1, - "sensor_current": -19315, + "sensor_current": -18353, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -1263,7 +1407,7 @@ "group": "Reactiv", "sensor_divisor": 1, "sensor_multiplier": 1, - "sensor_current": -19714, + "sensor_current": -19047, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -1287,7 +1431,7 @@ "group": "Reactiv", "sensor_divisor": 1, "sensor_multiplier": 1, - "sensor_current": -19734, + "sensor_current": -18825, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -1311,7 +1455,7 @@ "group": null, "sensor_divisor": 1, "sensor_multiplier": 1, - "sensor_current": 150454, + "sensor_current": 148164, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -1335,7 +1479,7 @@ "group": null, "sensor_divisor": 1, "sensor_multiplier": 1, - "sensor_current": 50392, + "sensor_current": 49598, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -1359,7 +1503,7 @@ "group": null, "sensor_divisor": 1, "sensor_multiplier": 1, - "sensor_current": 48425, + "sensor_current": 47750, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -1383,7 +1527,151 @@ "group": null, "sensor_divisor": 1, "sensor_multiplier": 1, - "sensor_current": 51636, + "sensor_current": 50815, + "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": "power_consumed", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.34278.5.2.0", + "sensor_index": "qh3.0", + "sensor_type": "janitza", + "sensor_descr": "L1-L3 Reactive", + "group": "Sum", + "sensor_divisor": 10, + "sensor_multiplier": 1, + "sensor_current": -5353564.5, + "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": "power_consumed", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.34278.5.1.0", + "sensor_index": "wh3.0", + "sensor_type": "janitza", + "sensor_descr": "L1-L3", + "group": "Sum", + "sensor_divisor": 10, + "sensor_multiplier": 1, + "sensor_current": 11698878.8, + "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": "power_consumed", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.34278.4.1.0", + "sensor_index": "whL1.0", + "sensor_type": "janitza", + "sensor_descr": "L1", + "group": null, + "sensor_divisor": 10, + "sensor_multiplier": 1, + "sensor_current": 3930197.3, + "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": "power_consumed", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.34278.4.2.0", + "sensor_index": "whL2.0", + "sensor_type": "janitza", + "sensor_descr": "L2", + "group": null, + "sensor_divisor": 10, + "sensor_multiplier": 1, + "sensor_current": 3731497.8, + "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": "power_consumed", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.34278.4.3.0", + "sensor_index": "whL3.0", + "sensor_type": "janitza", + "sensor_descr": "L3", + "group": null, + "sensor_divisor": 10, + "sensor_multiplier": 1, + "sensor_current": 4037183.6, + "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": "power_consumed", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.34278.4.4.0", + "sensor_index": "whL4.0", + "sensor_type": "janitza", + "sensor_descr": "L4", + "group": null, + "sensor_divisor": 10, + "sensor_multiplier": 1, + "sensor_current": 9026.8, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -1407,7 +1695,7 @@ "group": "Cos Phi", "sensor_divisor": 1000, "sensor_multiplier": 1, - "sensor_current": 0.923, + "sensor_current": 0.927, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -1431,7 +1719,7 @@ "group": "Cos Phi", "sensor_divisor": 1000, "sensor_multiplier": 1, - "sensor_current": 0.913, + "sensor_current": 0.916, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -1455,7 +1743,7 @@ "group": "Cos Phi", "sensor_divisor": 1000, "sensor_multiplier": 1, - "sensor_current": 0.923, + "sensor_current": 0.927, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -1479,7 +1767,7 @@ "group": "Cos Phi", "sensor_divisor": 1000, "sensor_multiplier": 1, - "sensor_current": 0.544, + "sensor_current": 0.527, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -1488,7 +1776,7 @@ "sensor_custom": "No", "entPhysicalIndex": null, "entPhysicalIndex_measured": null, - "sensor_prev": 0.92, + "sensor_prev": 0.924, "user_func": null, "state_name": null }, @@ -1503,7 +1791,7 @@ "group": "Harmonic Distortion Voltage", "sensor_divisor": 10, "sensor_multiplier": 1, - "sensor_current": 7.6, + "sensor_current": 9.6, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -1527,7 +1815,7 @@ "group": "Harmonic Distortion Voltage", "sensor_divisor": 10, "sensor_multiplier": 1, - "sensor_current": 8.1, + "sensor_current": 9.9, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -1551,7 +1839,7 @@ "group": "Harmonic Distortion Voltage", "sensor_divisor": 10, "sensor_multiplier": 1, - "sensor_current": 8.6, + "sensor_current": 10.1, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -1575,7 +1863,7 @@ "group": "Harmonic Distortion Voltage", "sensor_divisor": 10, "sensor_multiplier": 1, - "sensor_current": 214.8, + "sensor_current": 182.5, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -1599,7 +1887,7 @@ "group": "Harmonic Distortion Current", "sensor_divisor": 10, "sensor_multiplier": 1, - "sensor_current": 1.1, + "sensor_current": 1.2, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -1623,7 +1911,7 @@ "group": "Harmonic Distortion Current", "sensor_divisor": 10, "sensor_multiplier": 1, - "sensor_current": 1, + "sensor_current": 1.1, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -1647,7 +1935,7 @@ "group": "Harmonic Distortion Current", "sensor_divisor": 10, "sensor_multiplier": 1, - "sensor_current": 1.1, + "sensor_current": 1.2, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -1671,7 +1959,7 @@ "group": "Harmonic Distortion Current", "sensor_divisor": 10, "sensor_multiplier": 1, - "sensor_current": 26.7, + "sensor_current": 26.4, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -1695,10 +1983,10 @@ "group": "L to L", "sensor_divisor": 10, "sensor_multiplier": 1, - "sensor_current": 397.6, - "sensor_limit": 457.24, + "sensor_current": 397.7, + "sensor_limit": 457.355, "sensor_limit_warn": null, - "sensor_limit_low": 337.96, + "sensor_limit_low": 338.045, "sensor_limit_low_warn": null, "sensor_alert": 1, "sensor_custom": "No", @@ -1719,10 +2007,10 @@ "group": "L to L", "sensor_divisor": 10, "sensor_multiplier": 1, - "sensor_current": 397.9, - "sensor_limit": 457.585, + "sensor_current": 397.7, + "sensor_limit": 457.355, "sensor_limit_warn": null, - "sensor_limit_low": 338.215, + "sensor_limit_low": 338.045, "sensor_limit_low_warn": null, "sensor_alert": 1, "sensor_custom": "No", @@ -1767,10 +2055,10 @@ "group": "L to N", "sensor_divisor": 10, "sensor_multiplier": 1, - "sensor_current": 229.9, - "sensor_limit": 264.385, + "sensor_current": 230.1, + "sensor_limit": 264.615, "sensor_limit_warn": null, - "sensor_limit_low": 195.415, + "sensor_limit_low": 195.585, "sensor_limit_low_warn": null, "sensor_alert": 1, "sensor_custom": "No", @@ -1791,10 +2079,10 @@ "group": "L to N", "sensor_divisor": 10, "sensor_multiplier": 1, - "sensor_current": 229.7, - "sensor_limit": 264.155, + "sensor_current": 229.6, + "sensor_limit": 264.04, "sensor_limit_warn": null, - "sensor_limit_low": 195.245, + "sensor_limit_low": 195.16, "sensor_limit_low_warn": null, "sensor_alert": 1, "sensor_custom": "No", @@ -1815,10 +2103,10 @@ "group": "L to N", "sensor_divisor": 10, "sensor_multiplier": 1, - "sensor_current": 229.9, - "sensor_limit": 264.385, + "sensor_current": 229.7, + "sensor_limit": 264.155, "sensor_limit_warn": null, - "sensor_limit_low": 195.415, + "sensor_limit_low": 195.245, "sensor_limit_low_warn": null, "sensor_alert": 1, "sensor_custom": "No", @@ -1839,10 +2127,10 @@ "group": "L to N", "sensor_divisor": 10, "sensor_multiplier": 1, - "sensor_current": 25.4, - "sensor_limit": 29.21, + "sensor_current": 25.3, + "sensor_limit": 29.095, "sensor_limit_warn": null, - "sensor_limit_low": 21.59, + "sensor_limit_low": 21.505, "sensor_limit_low_warn": null, "sensor_alert": 1, "sensor_custom": "No", diff --git a/tests/snmpsim/janitza.snmprec b/tests/snmpsim/janitza.snmprec deleted file mode 100644 index 8622645a48..0000000000 --- a/tests/snmpsim/janitza.snmprec +++ /dev/null @@ -1,44 +0,0 @@ -1.3.6.1.2.1.1.1.0|4x|4A616E69747A6120556E6976657273610a3643203644203635203733203733203637203635203732204534203734203230203336203330203334203230 -1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.34278.10.1 -1.3.6.1.2.1.1.3.0|67|3404279486 -1.3.6.1.2.1.1.5.0|4| -1.3.6.1.4.1.34278.1.1.0|2|2299 -1.3.6.1.4.1.34278.1.2.0|2|2297 -1.3.6.1.4.1.34278.1.3.0|2|2299 -1.3.6.1.4.1.34278.1.4.0|2|254 -1.3.6.1.4.1.34278.1.5.0|2|3976 -1.3.6.1.4.1.34278.1.6.0|2|3979 -1.3.6.1.4.1.34278.1.7.0|2|3987 -1.3.6.1.4.1.34278.1.8.0|2|218542 -1.3.6.1.4.1.34278.1.9.0|2|210211 -1.3.6.1.4.1.34278.1.10.0|2|223938 -1.3.6.1.4.1.34278.1.11.0|2|8652 -1.3.6.1.4.1.34278.1.12.0|2|46363 -1.3.6.1.4.1.34278.1.13.0|2|44088 -1.3.6.1.4.1.34278.1.14.0|2|47530 -1.3.6.1.4.1.34278.1.15.0|2|92 -1.3.6.1.4.1.34278.1.16.0|2|-19315 -1.3.6.1.4.1.34278.1.17.0|2|-19714 -1.3.6.1.4.1.34278.1.18.0|2|-19734 -1.3.6.1.4.1.34278.1.19.0|2|-74 -1.3.6.1.4.1.34278.1.20.0|2|50392 -1.3.6.1.4.1.34278.1.21.0|2|48425 -1.3.6.1.4.1.34278.1.22.0|2|51636 -1.3.6.1.4.1.34278.1.23.0|2|219 -1.3.6.1.4.1.34278.1.24.0|2|923 -1.3.6.1.4.1.34278.1.25.0|2|913 -1.3.6.1.4.1.34278.1.26.0|2|923 -1.3.6.1.4.1.34278.1.27.0|2|544 -1.3.6.1.4.1.34278.2.1.0|2|137982 -1.3.6.1.4.1.34278.2.2.0|2|-58764 -1.3.6.1.4.1.34278.2.3.0|2|150454 -1.3.6.1.4.1.34278.3.4.0|2|920 -1.3.6.1.4.1.34278.7.1.0|2|11 -1.3.6.1.4.1.34278.7.2.0|2|10 -1.3.6.1.4.1.34278.7.3.0|2|11 -1.3.6.1.4.1.34278.7.4.0|2|267 -1.3.6.1.4.1.34278.7.5.0|2|76 -1.3.6.1.4.1.34278.7.6.0|2|81 -1.3.6.1.4.1.34278.7.7.0|2|86 -1.3.6.1.4.1.34278.7.8.0|2|2148 -1.3.6.1.4.1.34278.8.1.0|2|5000 diff --git a/tests/snmpsim/janitza_generic.snmprec b/tests/snmpsim/janitza_generic.snmprec new file mode 100644 index 0000000000..6f44b27d4e --- /dev/null +++ b/tests/snmpsim/janitza_generic.snmprec @@ -0,0 +1,50 @@ +1.3.6.1.2.1.1.1.0|4x|4A616E69747A6120556E6976657273610a3643203644203635203733203733203637203635203732204534203734203230203336203330203334203230 +1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.34278.10.1 +1.3.6.1.2.1.1.3.0|67|3811943881 +1.3.6.1.2.1.1.5.0|4| +1.3.6.1.4.1.34278.1.1.0|2|2301 +1.3.6.1.4.1.34278.1.2.0|2|2296 +1.3.6.1.4.1.34278.1.3.0|2|2297 +1.3.6.1.4.1.34278.1.4.0|2|253 +1.3.6.1.4.1.34278.1.5.0|2|3977 +1.3.6.1.4.1.34278.1.6.0|2|3977 +1.3.6.1.4.1.34278.1.7.0|2|3987 +1.3.6.1.4.1.34278.1.8.0|2|216052 +1.3.6.1.4.1.34278.1.9.0|2|208469 +1.3.6.1.4.1.34278.1.10.0|2|221687 +1.3.6.1.4.1.34278.1.11.0|2|8299 +1.3.6.1.4.1.34278.1.12.0|2|45924 +1.3.6.1.4.1.34278.1.13.0|2|43698 +1.3.6.1.4.1.34278.1.14.0|2|47055 +1.3.6.1.4.1.34278.1.15.0|2|92 +1.3.6.1.4.1.34278.1.16.0|2|-18353 +1.3.6.1.4.1.34278.1.17.0|2|-19047 +1.3.6.1.4.1.34278.1.18.0|2|-18825 +1.3.6.1.4.1.34278.1.19.0|2|-82 +1.3.6.1.4.1.34278.1.20.0|2|49598 +1.3.6.1.4.1.34278.1.21.0|2|47750 +1.3.6.1.4.1.34278.1.22.0|2|50815 +1.3.6.1.4.1.34278.1.23.0|2|209 +1.3.6.1.4.1.34278.1.24.0|2|927 +1.3.6.1.4.1.34278.1.25.0|2|916 +1.3.6.1.4.1.34278.1.26.0|2|927 +1.3.6.1.4.1.34278.1.27.0|2|527 +1.3.6.1.4.1.34278.2.1.0|2|136678 +1.3.6.1.4.1.34278.2.2.0|2|-56284 +1.3.6.1.4.1.34278.2.3.0|2|148164 +1.3.6.1.4.1.34278.3.4.0|2|924 +1.3.6.1.4.1.34278.4.1.0|2|39301973 +1.3.6.1.4.1.34278.4.2.0|2|37314978 +1.3.6.1.4.1.34278.4.3.0|2|40371836 +1.3.6.1.4.1.34278.4.4.0|2|90268 +1.3.6.1.4.1.34278.5.1.0|2|116988788 +1.3.6.1.4.1.34278.5.2.0|2|-53535645 +1.3.6.1.4.1.34278.7.1.0|2|12 +1.3.6.1.4.1.34278.7.2.0|2|11 +1.3.6.1.4.1.34278.7.3.0|2|12 +1.3.6.1.4.1.34278.7.4.0|2|264 +1.3.6.1.4.1.34278.7.5.0|2|96 +1.3.6.1.4.1.34278.7.6.0|2|99 +1.3.6.1.4.1.34278.7.7.0|2|101 +1.3.6.1.4.1.34278.7.8.0|2|1825 +1.3.6.1.4.1.34278.8.1.0|2|5002