diff --git a/glance-system/glance-kisfenyo.yaml b/glance-system/glance-kisfenyo.yaml index 61db89a..6d078e9 100644 --- a/glance-system/glance-kisfenyo.yaml +++ b/glance-system/glance-kisfenyo.yaml @@ -85,10 +85,14 @@ data: parameters: query: node_uname_info subrequests: - uptime_seconds: + uptime_days: url: ${PROMETHEUS_URL}/api/v1/query parameters: - query: time() - node_boot_time_seconds + query: floor((time() - node_boot_time_seconds) / 86400) + uptime_hours: + url: ${PROMETHEUS_URL}/api/v1/query + parameters: + query: floor((time() - node_boot_time_seconds) % 86400 / 3600) cpu: url: ${PROMETHEUS_URL}/api/v1/query parameters: @@ -209,10 +213,8 @@ data: {{ $hostname := .JSON.String "data.result.0.metric.nodename" }} - {{ $uptimeSec := (.Subrequest "uptime_seconds").JSON.Float "data.result.0.value.1" }} - {{ $uptimeDays := div $uptimeSec 86400.0 }} - {{ $uptimeHours := div (mod $uptimeSec 86400.0) 3600.0 }} - {{ $cpu := (.Subrequest "cpu").JSON.Float "data.result.0.value.1" }} + {{ $uptimeDays := (.Subrequest "uptime_days").JSON.Float "data.result.0.value.1" }} + {{ $uptimeHours := (.Subrequest "uptime_hours").JSON.Float "data.result.0.value.1" }} {{ $cpu := (.Subrequest "cpu").JSON.Float "data.result.0.value.1" }} {{ $mem := (.Subrequest "memory").JSON.Float "data.result.0.value.1" }} {{ $temp := (.Subrequest "cpu_temp").JSON.Float "data.result.0.value.1" }} {{ $fans := (.Subrequest "fans").JSON.Array "data.result" }}