From ecfefc6041494f5ce6b2ef208ac4361f8ac9ec79 Mon Sep 17 00:00:00 2001 From: Tobias Wolf Date: Sat, 25 Mar 2023 20:23:01 +0100 Subject: [PATCH] Add uptime to Prometheus metrics --- src/web/web.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/web/web.h b/src/web/web.h index 46e5ccb7..7612b6b9 100644 --- a/src/web/web.h +++ b/src/web/web.h @@ -681,8 +681,13 @@ class Web { mApp->getVersion(), mConfig->sys.deviceName); metrics = String(type) + String(topic); - snprintf(topic,sizeof(topic),"# TYPE ahoy_solar_freeheap gauge\nahoy_solar_freeheap{devicename=\"%s\"} %u\n",mConfig->sys.deviceName,ESP.getFreeHeap()); - metrics += String(topic); + snprintf(type,sizeof(type),"# TYPE ahoy_solar_freeheap gauge\n"); + snprintf(topic,sizeof(topic),"ahoy_solar_freeheap{devicename=\"%s\"} %u\n",mConfig->sys.deviceName,ESP.getFreeHeap()); + metrics += String(type) + String(topic); + + snprintf(type,sizeof(type),"# TYPE ahoy_solar_uptime counter\n"); + snprintf(topic,sizeof(topic),"ahoy_solar_uptime{devicename=\"%s\"} %u\n", mApp->getUptime()); + metrics += String(type) + String(topic); // NRF Statistics stat = mApp->getStatistics(); @@ -789,7 +794,7 @@ class Web { String radioStatistic(String statistic, uint32_t value) { char type[60], topic[80], val[25]; - snprintf(type, sizeof(type), "# TYPE ahoy_solar_radio_%s gauge",statistic.c_str()); + snprintf(type, sizeof(type), "# TYPE ahoy_solar_radio_%s counter",statistic.c_str()); snprintf(topic, sizeof(topic), "ahoy_solar_radio_%s",statistic.c_str()); snprintf(val, sizeof(val), "%d", value); return ( String(type) + "\n" + String(topic) + " " + String(val) + "\n");