mudhorn/meshtastic-metrics-exporter
1
0
Fork 1
mirror of https://github.com/tcivie/meshtastic-metrics-exporter.git synced 2025-02-02 07:41:11 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #61 from panaceya/patch-1

Browse source 
FIX: #60
This commit is contained in:
Gleb Tcivie 2024-10-21 16:00:55 +03:00 committed by GitHub
parent 3de42a02d2 091536c79f
commit f11ca840f7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
exporter/metric/node_metrics.py
View file

@ -1,3 +1,4 @@
from datetime import datetime
from prometheus_client import CollectorRegistry, Counter, Gauge from prometheus_client import CollectorRegistry, Counter, Gauge
from exporter.client_details import ClientDetails from exporter.client_details import ClientDetails
@ -48,9 +49,9 @@ class Metrics:
def db_operation(cur, conn): def db_operation(cur, conn):
cur.execute(""" cur.execute("""
UPDATE node_details UPDATE node_details
SET latitude = %s, longitude = %s, altitude = %s, precision = %s SET latitude = %s, longitude = %s, altitude = %s, precision = %s, updated_at = %s
WHERE node_id = %s WHERE node_id = %s
""", (latitude, longitude, altitude, precision, client_details.node_id)) """, (latitude, longitude, altitude, precision, datetime.now().isoformat(), client_details.node_id))
conn.commit() conn.commit()
self.db.execute_db_operation(db_operation) self.db.execute_db_operation(db_operation)

4
exporter/processor/processors.py
View file

@ -1,5 +1,6 @@
import os import os
from abc import ABC, abstractmethod from abc import ABC, abstractmethod
from datetime import datetime
from venv import logger from venv import logger
import psycopg import psycopg
@ -151,12 +152,13 @@ class NodeInfoAppProcessor(Processor):
update_values.append(ClientDetails.get_role_name_from_role(user.role)) update_values.append(ClientDetails.get_role_name_from_role(user.role))
if update_fields: if update_fields:
update_fields.append("updated_at = %s")
update_query = f""" update_query = f"""
UPDATE node_details UPDATE node_details
SET {", ".join(update_fields)} SET {", ".join(update_fields)}
WHERE node_id = %s WHERE node_id = %s
""" """
cur.execute(update_query, update_values + [client_details.node_id]) cur.execute(update_query, update_values + [datetime.now().isoformat(), client_details.node_id])
else: else:
# If record doesn't exist, insert a new one # If record doesn't exist, insert a new one
cur.execute(""" cur.execute("""