From 07ee35bdfdd0eef02451fb2a22527447e452125b Mon Sep 17 00:00:00 2001 From: Tallagrand Thierry Date: Fri, 25 Sep 2026 16:58:13 +0200 Subject: [PATCH] Grafana : le suiveur reconnu dans le panneau des modes (mesure prefixee sensor.) Co-Authored-By: Claude Opus 5.5 (1M context) Claude-Session: https://claude.ai/code/session_011uJ47NxgfpGnuuMr3f2n7Z --- deploy/historisation/grafana/dashboards/solaire.json | 2 +- tools/gen-grafana-dashboards.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/historisation/grafana/dashboards/solaire.json b/deploy/historisation/grafana/dashboards/solaire.json index f3fe156..35f8f9f 100644 --- a/deploy/historisation/grafana/dashboards/solaire.json +++ b/deploy/historisation/grafana/dashboards/solaire.json @@ -285,7 +285,7 @@ "type": "influxdb", "uid": "evcs-influx" }, - "query": "from(bucket: \"evcs\")\n |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n |> filter(fn: (r) => r._field == \"state\")\n |> filter(fn: (r) => r._measurement =~ /operation_mode$/)\n |> aggregateWindow(every: v.windowPeriod, fn: last, createEmpty: false)\n |> map(fn: (r) => ({ r with tracker:\n if r._measurement =~ /^v1_/ then \"Suiveur\"\n else if r._measurement =~ /solar_1/ then \"Sud 1\"\n else if r._measurement =~ /solar_2/ then \"Sud 2\"\n else if r._measurement =~ /solar_3/ then \"Sud 3\"\n else if r._measurement =~ /solar_4/ then \"Ouest\"\n else if r._measurement =~ /mppt1/ then \"Sud-est\"\n else \"Ensemble\" }))\n |> keep(columns: [\"_time\", \"_value\", \"tracker\"])\n |> pivot(rowKey: [\"_time\"], columnKey: [\"tracker\"], valueColumn: \"_value\")" + "query": "from(bucket: \"evcs\")\n |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n |> filter(fn: (r) => r._field == \"state\")\n |> filter(fn: (r) => r._measurement =~ /operation_mode$/)\n |> aggregateWindow(every: v.windowPeriod, fn: last, createEmpty: false)\n |> map(fn: (r) => ({ r with tracker:\n if r._measurement =~ /\\.v1_/ then \"Suiveur\"\n else if r._measurement =~ /solar_1/ then \"Sud 1\"\n else if r._measurement =~ /solar_2/ then \"Sud 2\"\n else if r._measurement =~ /solar_3/ then \"Sud 3\"\n else if r._measurement =~ /solar_4/ then \"Ouest\"\n else if r._measurement =~ /mppt1/ then \"Sud-est\"\n else \"Ensemble\" }))\n |> keep(columns: [\"_time\", \"_value\", \"tracker\"])\n |> pivot(rowKey: [\"_time\"], columnKey: [\"tracker\"], valueColumn: \"_value\")" } ], "gridPos": { diff --git a/tools/gen-grafana-dashboards.py b/tools/gen-grafana-dashboards.py index 28b1781..d43bd5e 100644 --- a/tools/gen-grafana-dashboards.py +++ b/tools/gen-grafana-dashboards.py @@ -409,7 +409,7 @@ solaire = dashboard("evcs-solaire", "Le solaire", ( ' |> filter(fn: (r) => r._measurement =~ /operation_mode$/)\n' ' |> aggregateWindow(every: v.windowPeriod, fn: last, createEmpty: false)\n' ' |> map(fn: (r) => ({ r with tracker:\n' - ' if r._measurement =~ /^v1_/ then "Suiveur"\n' + ' if r._measurement =~ /\\.v1_/ then "Suiveur"\n' ' else if r._measurement =~ /solar_1/ then "Sud 1"\n' ' else if r._measurement =~ /solar_2/ then "Sud 2"\n' ' else if r._measurement =~ /solar_3/ then "Sud 3"\n'