From 542c76c79d7b6024239f773efe236b8acac6efcd Mon Sep 17 00:00:00 2001 From: LarsTi Date: Wed, 16 Nov 2022 08:48:56 +0100 Subject: [PATCH 1/4] support for newer tasmota releases (tested with 12.1.1) --- metrics.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/metrics.py b/metrics.py index 888a52c..99bf79b 100644 --- a/metrics.py +++ b/metrics.py @@ -49,10 +49,18 @@ class TasmotaCollector(object): string_values = str(page.text).split("{s}") for i in range(1,len(string_values)): - label = string_values[i].split("{m}")[0] - value = string_values[i].split("{m}")[1].split("{e}")[0] - values[label] = value + try: + label = string_values[i].split("{m}")[0] + value = string_values[i].split("{m}")[1].split("{e}")[0] + if "", "").split("")[0] + values[label] = value + except IndexError: + print("Index Error") + continue + print(label) + print(value) return values def signal_handler(signal, frame): @@ -71,4 +79,4 @@ if __name__ == '__main__': while(True): sleep(1) - \ No newline at end of file + From 7cf3c34f7d82e62be5a4a758aff8fe62d42853b1 Mon Sep 17 00:00:00 2001 From: LarsTi Date: Wed, 16 Nov 2022 08:52:16 +0100 Subject: [PATCH 2/4] removed logging --- metrics.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/metrics.py b/metrics.py index 99bf79b..3f68c15 100644 --- a/metrics.py +++ b/metrics.py @@ -57,10 +57,7 @@ class TasmotaCollector(object): values[label] = value except IndexError: - print("Index Error") continue - print(label) - print(value) return values def signal_handler(signal, frame): From 5631de230de1589bfc59b43364028ea7672a30fc Mon Sep 17 00:00:00 2001 From: LarsTi Date: Wed, 16 Nov 2022 09:07:25 +0100 Subject: [PATCH 3/4] readded unit --- metrics.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/metrics.py b/metrics.py index 3f68c15..58b8176 100644 --- a/metrics.py +++ b/metrics.py @@ -53,11 +53,15 @@ class TasmotaCollector(object): label = string_values[i].split("{m}")[0] value = string_values[i].split("{m}")[1].split("{e}")[0] if "", "").split("")[0] + value = value.replace("", "") + value = value.replace(" ", "") values[label] = value except IndexError: + print("Index Error") continue + print(label) + print(value) return values def signal_handler(signal, frame): From 5d4c9662d954e4032bf6354cdc91ec72caf72ccb Mon Sep 17 00:00:00 2001 From: LarsTi Date: Wed, 16 Nov 2022 09:09:15 +0100 Subject: [PATCH 4/4] deleted logging --- metrics.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/metrics.py b/metrics.py index 58b8176..bf0183c 100644 --- a/metrics.py +++ b/metrics.py @@ -58,10 +58,7 @@ class TasmotaCollector(object): values[label] = value except IndexError: - print("Index Error") continue - print(label) - print(value) return values def signal_handler(signal, frame):