From 0160aa6197379e4a194e273f4d9577704675c224 Mon Sep 17 00:00:00 2001
From: d3vyce <nicolas.sudres@hotmail.fr>
Date: Fri, 16 Feb 2024 18:09:34 +0100
Subject: [PATCH 1/5] fix: MQTT brocker disconnection when client connection
 timeout

---
 src/teleinfo_exporter/app.py | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/teleinfo_exporter/app.py b/src/teleinfo_exporter/app.py
index da79322..2f65e22 100644
--- a/src/teleinfo_exporter/app.py
+++ b/src/teleinfo_exporter/app.py
@@ -3,6 +3,7 @@
 import json
 import random
 import string
+import time
 
 import bcrypt
 import configargparse
@@ -92,6 +93,7 @@ teleinfo_contract_type = Gauge("teleinfo_contract_type", "contract type", ["type
 
 
 def on_connect(client, userdata, flags, rc):  # pylint: disable=unused-argument
+    client.subscribe("teleinfo/tele/SENSOR")
     if rc == 0:
         print("Connected to broker")
     else:
@@ -146,6 +148,17 @@ def on_message(client, userdata, message):  # pylint: disable=unused-argument
         teleinfo_contract_type.labels(message["TIC"]["OPTARIF"]).set(0)
 
 
+def on_disconnect(client, userdata, rc):
+    print("Diconnected from broker, reconnecting...")
+    while True:
+        try:
+            if not client.reconnect():
+                break
+        except ConnectionRefusedError:
+            pass
+            time.sleep(1)
+
+
 @app.before_request
 @auth.login_required()
 def global_auth():
@@ -162,7 +175,6 @@ def verify_password(username, password):
         return username
     return None
 
-
 @app.route("/metrics")
 def metrics():
     return make_wsgi_app()
@@ -186,7 +198,6 @@ def main():
     p.add("--http_cert", help="HTTP Server Certificate", env_var="HTTP_CERT")
     p.add("--http_key", help="HTTP Server Key", env_var="HTTP_KEY")
     options = p.parse_args()
-    print(options)
 
     if options.auth_user and options.auth_hash:
         app.config["USERS"] = {options.auth_user: options.auth_hash.encode()}
@@ -198,13 +209,12 @@ def main():
     if options.broker_user and options.broker_password:
         client.username_pw_set(options.broker_user, password=options.broker_password)
 
+    client.connect(options.broker_host, port=options.broker_port)
     client.on_connect = on_connect
     client.on_message = on_message
-    client.connect(options.broker_host, port=options.broker_port)
+    client.on_disconnect = on_disconnect
     client.loop_start()
 
-    client.subscribe(options.broker_topic)
-
     if options.http_cert and options.http_key:
         ssl_context = (options.http_cert, options.http_key)
     else:

From e2631e4e3d82451befcce4aa08eba965de82fae6 Mon Sep 17 00:00:00 2001
From: d3vyce <nicolas.sudres@hotmail.fr>
Date: Fri, 16 Feb 2024 18:13:49 +0100
Subject: [PATCH 2/5] fix: lint warning

---
 src/teleinfo_exporter/app.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/teleinfo_exporter/app.py b/src/teleinfo_exporter/app.py
index 2f65e22..1153f5f 100644
--- a/src/teleinfo_exporter/app.py
+++ b/src/teleinfo_exporter/app.py
@@ -155,7 +155,6 @@ def on_disconnect(client, userdata, rc):
             if not client.reconnect():
                 break
         except ConnectionRefusedError:
-            pass
             time.sleep(1)
 
 
@@ -175,6 +174,7 @@ def verify_password(username, password):
         return username
     return None
 
+
 @app.route("/metrics")
 def metrics():
     return make_wsgi_app()

From 9e64905fe38df07d3e8e196ba7e8357d7724943c Mon Sep 17 00:00:00 2001
From: d3vyce <nicolas.sudres@hotmail.fr>
Date: Fri, 16 Feb 2024 18:15:56 +0100
Subject: [PATCH 3/5] add: Grafana dashboard to README

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index e130f2a..614eadf 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,12 @@
 # Teleinfo Exporter
 
+![Grafana Dashboard](https://grafana.com/api/dashboards/20182/images/15332/image)
+
 Simple prometheus exporter for Linky teleinfo.
 Teleinfo Tasmota project :
 https://github.com/NicolasBernaerts/tasmota/tree/master/teleinfo
+Grafana Dashboard:
+https://grafana.com/grafana/dashboards/20182-linky-teleinfo/
 
 ## Installation
 ### Pip

From 73c3e25b910977ddfe95173736099b883ea2f2e5 Mon Sep 17 00:00:00 2001
From: d3vyce <nicolas.sudres@hotmail.fr>
Date: Fri, 16 Feb 2024 18:16:12 +0100
Subject: [PATCH 4/5] update: CHANGELOG

---
 CHANGELOG.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b58d8d..c8b313c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
-## [1.0.0] - 12-19-2023
+## 1.1.0 - 02-11-2024
+add: Grafana dashboard to README
+fix: MQTT brocker disconnection when client connection timeout
 
-Initial release
\ No newline at end of file
+## 1.0.0 - 12-19-2023
+Initial release

From a734ca1979a2e8d53e86f5524fb9d9a82ed3a73e Mon Sep 17 00:00:00 2001
From: d3vyce <nicolas.sudres@hotmail.fr>
Date: Fri, 16 Feb 2024 18:18:32 +0100
Subject: [PATCH 5/5] fix: lint warning

---
 src/teleinfo_exporter/app.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/teleinfo_exporter/app.py b/src/teleinfo_exporter/app.py
index 1153f5f..707c88c 100644
--- a/src/teleinfo_exporter/app.py
+++ b/src/teleinfo_exporter/app.py
@@ -148,7 +148,7 @@ def on_message(client, userdata, message):  # pylint: disable=unused-argument
         teleinfo_contract_type.labels(message["TIC"]["OPTARIF"]).set(0)
 
 
-def on_disconnect(client, userdata, rc):
+def on_disconnect(client, userdata, rc):  # pylint: disable=unused-argument
     print("Diconnected from broker, reconnecting...")
     while True:
         try: