From 1c65ce86ceaecc54a6fb3497030dda68c0f3ed9e Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sat, 29 Jul 2023 21:43:06 +0200
Subject: chrony: make lua exporter closer to the output of chrony_exporter

---
 files/common/openwrt/chrony_prometheus-node-exporter.lua | 14 +++++++-------
 roles/monitoring/grafana/files/dashboard-chrony.json     |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/files/common/openwrt/chrony_prometheus-node-exporter.lua b/files/common/openwrt/chrony_prometheus-node-exporter.lua
index 95fd0093..fbce2f3c 100644
--- a/files/common/openwrt/chrony_prometheus-node-exporter.lua
+++ b/files/common/openwrt/chrony_prometheus-node-exporter.lua
@@ -54,7 +54,7 @@ local function scrape()
 
     for _, line in ipairs(chrony_tracking) do
         local items = comma_split(line)
-        metric("chrony_tracking_info", "gauge", { tracking_address = items[2], tracking_refid = items[1]}, 1)
+        metric("chrony_tracking_info", "gauge", { tracking_address = items[2], tracking_name = items[2], tracking_refid = items[1]}, 1)
         metric("chrony_tracking_last_offset_seconds", "gauge", nil, tonumber(items[6]))
         metric("chrony_tracking_reference_timestamp_seconds", "gauge", nil, tonumber(items[4]))
         metric("chrony_tracking_rms_offset_seconds", "gauge", nil, tonumber(items[7]))
@@ -67,32 +67,32 @@ local function scrape()
     local metric_sources_ls_age = metric("chrony_sources_last_sample_age_seconds", "gauge")
     for _, line in ipairs(chrony_sources) do
         local items = comma_split(line)
-        metric_sources_ls_age({ source_address = items[3] }, tonumber(items[7]))
+        metric_sources_ls_age({ source_address = items[3], source_name = items[3] }, tonumber(items[7]))
     end
     local metric_sources_ls_error = metric("chrony_sources_last_sample_error_margin_seconds", "gauge")
     for _, line in ipairs(chrony_sources) do
         local items = comma_split(line)
-        metric_sources_ls_error({ source_address = items[3] }, tonumber(items[10]))
+        metric_sources_ls_error({ source_address = items[3], source_name = items[3] }, tonumber(items[10]))
     end
     local metric_sources_ls_offset = metric("chrony_sources_last_sample_offset_seconds", "gauge")
     for _, line in ipairs(chrony_sources) do
         local items = comma_split(line)
-        metric_sources_ls_offset({ source_address = items[3] }, tonumber(items[8]))
+        metric_sources_ls_offset({ source_address = items[3], source_name = items[3] }, tonumber(items[8]))
     end
     local metric_sources_polling_int = metric("chrony_sources_polling_interval_seconds", "gauge")
     for _, line in ipairs(chrony_sources) do
         local items = comma_split(line)
-        metric_sources_polling_int({ source_address = items[3] }, 2^tonumber(items[5]))
+        metric_sources_polling_int({ source_address = items[3], source_name = items[3] }, 2^tonumber(items[5]))
     end
     local metric_sources_info = metric("chrony_sources_state_info", "gauge")
     for _, line in ipairs(chrony_sources) do
         local items = comma_split(line)
-        metric_sources_info({ source_address = items[3], source_mode = source_modes[items[1]], source_state = source_states[items[2]] }, 1)
+        metric_sources_info({ source_address = items[3], source_name = items[3], source_mode = source_modes[items[1]], source_state = source_states[items[2]] }, 1)
     end
     local metric_sources_stratum = metric("chrony_sources_stratum", "gauge")
     for _, line in ipairs(chrony_sources) do
         local items = comma_split(line)
-        metric_sources_stratum({ source_address = items[3] }, tonumber(items[4]))
+        metric_sources_stratum({ source_address = items[3], source_name = items[3] }, tonumber(items[4]))
     end
 end
 
diff --git a/roles/monitoring/grafana/files/dashboard-chrony.json b/roles/monitoring/grafana/files/dashboard-chrony.json
index d6ae5c4f..2b869e42 100644
--- a/roles/monitoring/grafana/files/dashboard-chrony.json
+++ b/roles/monitoring/grafana/files/dashboard-chrony.json
@@ -156,11 +156,11 @@
           "format": "time_series",
           "instant": true,
           "interval": "",
-          "legendFormat": "{{ tracking_address }}",
+          "legendFormat": "{{ tracking_name }}",
           "refId": "A"
         }
       ],
-      "title": "Reference Source Address",
+      "title": "Reference Source",
       "type": "stat"
     },
     {
@@ -1207,4 +1207,4 @@
   "uid": "c252be85-471b-41c9-b1cb-f0e1b8206593",
   "version": 3,
   "weekStart": ""
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3