From 63dc6fc83135e6b8cdf6c7b252c3d933461c25d9 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Mon, 4 Jan 2021 19:34:24 +0100 Subject: [PATCH 1/3] Adjust to new logging and filter options --- systemmonitor/integrationpluginsystemmonitor.json | 12 ++++++++---- tplink/integrationplugintplink.json | 3 ++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/systemmonitor/integrationpluginsystemmonitor.json b/systemmonitor/integrationpluginsystemmonitor.json index 0c8cc28b..5b799cab 100644 --- a/systemmonitor/integrationpluginsystemmonitor.json +++ b/systemmonitor/integrationpluginsystemmonitor.json @@ -24,7 +24,8 @@ "unit": "Percentage", "defaultValue": 0, "minValue": 0, - "maxValue": 100 + "maxValue": 100, + "logged": true }, { "id": "efe2d520-3b35-4668-b6f5-db3df0c8bf0d", @@ -35,7 +36,8 @@ "unit": "Percentage", "defaultValue": 0, "minValue": 0, - "maxValue": 100 + "maxValue": 100, + "logged": true }, { "id": "d9671ee3-51be-4cf8-8601-125c0684aec9", @@ -44,7 +46,8 @@ "displayNameEvent": "RSS memory usage changed", "type": "int", "unit": "KiloByte", - "defaultValue": 0 + "defaultValue": 0, + "logged": true }, { "id": "6d71b001-c7fe-4f08-941d-47009b710d94", @@ -53,7 +56,8 @@ "displayNameEvent": "virtual memory usage changed", "type": "int", "unit": "KiloByte", - "defaultValue": 0 + "defaultValue": 0, + "logged": true } ] } diff --git a/tplink/integrationplugintplink.json b/tplink/integrationplugintplink.json index 40a756a0..4097c25c 100644 --- a/tplink/integrationplugintplink.json +++ b/tplink/integrationplugintplink.json @@ -120,7 +120,8 @@ "displayNameEvent": "Current power consumption changed", "type": "double", "unit": "Watt", - "defaultValue": 0 + "defaultValue": 0, + "filter": "adaptive" } ] }, From 3422b008fcc7ff6eb673b570ab1835132a12cd6d Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Sun, 17 Jan 2021 23:59:50 +0100 Subject: [PATCH 2/3] Add filter to shelly --- shelly/integrationpluginshelly.json | 42 +++++++++++++++++++---------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/shelly/integrationpluginshelly.json b/shelly/integrationpluginshelly.json index 6a3eebf2..e147db85 100644 --- a/shelly/integrationpluginshelly.json +++ b/shelly/integrationpluginshelly.json @@ -206,7 +206,8 @@ "displayNameEvent": "Current power consumption changed", "type": "double", "unit": "Watt", - "defaultValue": 0 + "defaultValue": 0, + "filter": "adaptive" } ], "actionTypes": [ @@ -322,7 +323,8 @@ "displayNameEvent": "Current power consumption changed", "type": "double", "unit": "Watt", - "defaultValue": 0 + "defaultValue": 0, + "filter": "adaptive" } ], "actionTypes": [ @@ -629,7 +631,8 @@ "displayNameEvent": "Power consumption changed", "type": "double", "unit": "Watt", - "defaultValue": 0 + "defaultValue": 0, + "filter": "adaptive" }, { "id": "ccec3806-cc48-42cf-94d7-811ff569d407", @@ -769,7 +772,8 @@ "displayNameEvent": "Current power consumption changed", "type": "double", "defaultValue": 0, - "unit": "Watt" + "unit": "Watt", + "filter": "adaptive" }, { "id": "3d22110c-db53-4420-8e0f-314555484926", @@ -888,7 +892,8 @@ "displayNameEvent": "Current power consumption changed", "type": "double", "defaultValue": 0, - "unit": "Watt" + "unit": "Watt", + "filter": "adaptive" }, { "id": "8d3b3d63-86f1-46cb-92ef-d27c0d9d0a4e", @@ -1362,7 +1367,8 @@ "displayNameEvent": "Current power changed", "type": "double", "unit": "Watt", - "defaultValue": 0 + "defaultValue": 0, + "filter": "adaptive" }, { "id": "432ba180-936d-4700-907e-766264bfdd35", @@ -1371,7 +1377,8 @@ "displayNameEvent": "Power (Phase A) changed", "type": "double", "unit": "Watt", - "defaultValue": 0 + "defaultValue": 0, + "filter": "adaptive" }, { "id": "50be490b-ba5d-4b1f-806c-9e15b915c1eb", @@ -1388,7 +1395,8 @@ "displayNameEvent": "Current (Phase A) changed", "type": "double", "unit": "Ampere", - "defaultValue": 0 + "defaultValue": 0, + "filter": "adaptive" }, { "id": "5977ffab-cdcf-409c-940b-aa0a59de84a5", @@ -1424,7 +1432,8 @@ "displayNameEvent": "Power (Phase B) changed", "type": "double", "unit": "Watt", - "defaultValue": 0 + "defaultValue": 0, + "filter": "adaptive" }, { "id": "f56504bb-0c6c-4425-831c-771b23aadf19", @@ -1477,7 +1486,8 @@ "displayNameEvent": "Power (Phase C) changed", "type": "double", "unit": "Watt", - "defaultValue": 0 + "defaultValue": 0, + "filter": "adaptive" }, { "id": "2e2c622f-1575-4d0b-a0c0-78bc03748c1e", @@ -1704,7 +1714,8 @@ "displayNameEvent": "Power consumption changed", "type": "double", "defaultValue": 0, - "unit": "Watt" + "unit": "Watt", + "filter": "adaptive" } ] }, @@ -1838,7 +1849,8 @@ "displayNameEvent": "Power consumption changed", "type": "double", "defaultValue": 0, - "unit": "Watt" + "unit": "Watt", + "filter": "adaptive" } ] }, @@ -1972,7 +1984,8 @@ "displayNameEvent": "Power consumption changed", "type": "double", "defaultValue": 0, - "unit": "Watt" + "unit": "Watt", + "filter": "adaptive" } ] }, @@ -2028,7 +2041,8 @@ "displayNameEvent": "Power consumption changed", "type": "double", "defaultValue": 0, - "unit": "Watt" + "unit": "Watt", + "filter": "adaptive" }, { "id": "2729d4e0-c38c-47b8-a0e8-26959090fe74", From 048874fd79004433cdb94e503539de3a873ea338 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Wed, 24 Feb 2021 18:56:43 +0100 Subject: [PATCH 3/3] update logged -> suggestLogging --- systemmonitor/integrationpluginsystemmonitor.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/systemmonitor/integrationpluginsystemmonitor.json b/systemmonitor/integrationpluginsystemmonitor.json index 5b799cab..e7f4a871 100644 --- a/systemmonitor/integrationpluginsystemmonitor.json +++ b/systemmonitor/integrationpluginsystemmonitor.json @@ -25,7 +25,7 @@ "defaultValue": 0, "minValue": 0, "maxValue": 100, - "logged": true + "suggestLogging": true }, { "id": "efe2d520-3b35-4668-b6f5-db3df0c8bf0d", @@ -37,7 +37,7 @@ "defaultValue": 0, "minValue": 0, "maxValue": 100, - "logged": true + "suggestLogging": true }, { "id": "d9671ee3-51be-4cf8-8601-125c0684aec9", @@ -47,7 +47,7 @@ "type": "int", "unit": "KiloByte", "defaultValue": 0, - "logged": true + "suggestLogging": true }, { "id": "6d71b001-c7fe-4f08-941d-47009b710d94", @@ -57,7 +57,7 @@ "type": "int", "unit": "KiloByte", "defaultValue": 0, - "logged": true + "suggestLogging": true } ] }