From 1c8ea78c719868ece16c988f0f79f281567c9778 Mon Sep 17 00:00:00 2001 From: MiguelNdeCarvalho Date: Thu, 4 Mar 2021 22:49:46 +0000 Subject: [PATCH] Add speedtest_up metric --- src/exporter.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/exporter.py b/src/exporter.py index f4bda1f..473c400 100644 --- a/src/exporter.py +++ b/src/exporter.py @@ -17,6 +17,7 @@ 'Speedtest current Download Speed in bit/s') upload_speed = Gauge('speedtest_upload_bits_per_second', 'Speedtest current Upload speed in bits/s') +up = Gauge('speedtest_up', 'Speedtest status whether the scrape worked') def bytes_to_bits(bytes_per_sec): @@ -49,7 +50,7 @@ def runTest(): # Socket error print('Something went wrong') print(data['error']) - return None + return (0, 0, 0, 0, 0, 0) # Return all data as 0 if "type" in data: if data['type'] == 'log': print(str(data["timestamp"]) + " - " + str(data["message"])) @@ -60,17 +61,18 @@ def runTest(): download = bytes_to_bits(data['download']['bandwidth']) upload = bytes_to_bits(data['upload']['bandwidth']) return (actual_server, actual_jitter, - actual_ping, download, upload) + actual_ping, download, upload, 1) @app.route("/metrics") def updateResults(): - r_server, r_jitter, r_ping, r_download, r_upload = runTest() + r_server, r_jitter, r_ping, r_download, r_upload, r_status = runTest() server.set(r_server) jitter.set(r_jitter) ping.set(r_ping) download_speed.set(r_download) upload_speed.set(r_upload) + up.set(r_status) current_dt = datetime.datetime.now() print(current_dt.strftime("%d/%m/%Y %H:%M:%S - ") + "Server: " + str(r_server) + " | Jitter: " + str(r_jitter) + " ms | Ping: "