From b19682a76759d3fce1995bbc2b4b9bde73f7dc06 Mon Sep 17 00:00:00 2001 From: kisfenyo Date: Mon, 16 Feb 2026 11:01:08 +0100 Subject: [PATCH] fix(monitoring): hostname, tooltip timestamps, default range (v0.5.1) - Bug 1: Read hostname from /host/etc/hostname instead of os.Hostname() which returns the container ID inside Docker. Added volume mount. - Bug 2: Tooltip callback used parsed.x (category index) instead of label (actual timestamp), showing 1970 dates. - Bug 3+4: Default range changed from 24h to 1h so charts show data immediately on new deployments with limited history. Co-Authored-By: Claude Opus 4.6 --- controller/docker-compose.yml | 2 ++ controller/internal/metrics/sysinfo.go | 8 ++++++-- controller/internal/web/templates/monitoring.html | 14 +++++++------- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/controller/docker-compose.yml b/controller/docker-compose.yml index d216851..2e14b30 100644 --- a/controller/docker-compose.yml +++ b/controller/docker-compose.yml @@ -27,6 +27,8 @@ services: - /sys:/host/sys:ro # Host OS info — for monitoring page system info - /etc/os-release:/host/etc/os-release:ro + # Host hostname — for monitoring page (os.Hostname() returns container ID) + - /etc/hostname:/host/etc/hostname:ro environment: - TZ=Europe/Budapest labels: diff --git a/controller/internal/metrics/sysinfo.go b/controller/internal/metrics/sysinfo.go index 71f5e12..77ec345 100644 --- a/controller/internal/metrics/sysinfo.go +++ b/controller/internal/metrics/sysinfo.go @@ -16,8 +16,12 @@ import ( func GetStaticInfo() StaticSystemInfo { info := StaticSystemInfo{} - // Hostname - info.Hostname, _ = os.Hostname() + // Hostname — try host mount first, fall back to os.Hostname() + if data, err := os.ReadFile("/host/etc/hostname"); err == nil { + info.Hostname = strings.TrimSpace(string(data)) + } else { + info.Hostname, _ = os.Hostname() + } // OS — try host mount first, fall back to container's info.OS = readOSRelease("/host/etc/os-release") diff --git a/controller/internal/web/templates/monitoring.html b/controller/internal/web/templates/monitoring.html index 92e9513..30864ec 100644 --- a/controller/internal/web/templates/monitoring.html +++ b/controller/internal/web/templates/monitoring.html @@ -41,9 +41,9 @@

Rendszer metrikák

- + - +
@@ -94,9 +94,9 @@

- + - +
@@ -168,7 +168,7 @@ callbacks: { title: function(items) { if (!items.length) return ''; - return formatTimestamp(items[0].parsed.x || items[0].label); + return formatTimestamp(items[0].label); } } } @@ -212,7 +212,7 @@ } // --- System charts --- - let systemRange = '24h'; + let systemRange = '1h'; let chartCPU, chartMem, chartTemp, chartLoad; function initSystemCharts() { @@ -363,7 +363,7 @@ // --- Container detail --- let detailChartCPU, detailChartMem; let detailContainer = ''; - let detailRange = '24h'; + let detailRange = '1h'; function initDetailCharts() { const mkChart = (id, color, yLabel) => {