From 7969ae9ebe2d9fa6deb5c71eb6734c959abdf4c3 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Mon, 15 Nov 2021 21:26:23 +0100 Subject: [PATCH] bundles/grafana: fix value for battery dashboard row --- bundles/grafana/dashboard-rows/battery.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/bundles/grafana/dashboard-rows/battery.py b/bundles/grafana/dashboard-rows/battery.py index 83dda6f..117297a 100644 --- a/bundles/grafana/dashboard-rows/battery.py +++ b/bundles/grafana/dashboard-rows/battery.py @@ -70,9 +70,10 @@ def dashboard_row_battery(panel_id, node): ) |> pivot(rowKey:["_time"], columnKey: ["_field"], valueColumn: "_value") |> map(fn: (r) => ({{ - r with - _value: float(v: r.energy_now) / float(v: r.energy_full) * 100.0 - }})) + r with + _value: float(v: r.energy_now) / float(v: r.energy_full) * 100.0 + }}) + ) |> drop(columns: ["energy_now", "energy_full"])""", 'resultFormat': 'time_series', 'select': [[ @@ -182,6 +183,11 @@ def dashboard_row_battery(panel_id, node): r["_field"] == "power_now" and r["host"] == "{node.name}" ) + |> map(fn: (r) => ({{ + r with + _value: float(v: r._value) / 1000000.0 + }}) + ) |> aggregateWindow(every: v.windowPeriod, fn: mean, createEmpty: false) |> yield(name: "fan")""", 'resultFormat': 'time_series',