sts-sponsors team mailing list archive

[Alberto Donato <mp+443116@xxxxxxxxxxxxxxxxxx>]

Alberto Donato has proposed merging ~ack/maas-kpi:versions-column-name into maas-kpi:master.

Commit message:
add alias for versions graph series



Requested reviews:
  MAAS Committers (maas-committers)

For more details, see:
https://code.launchpad.net/~ack/maas-kpi/+git/maas-kpi/+merge/443116
-- 
Your team MAAS Committers is requested to review the proposed merge of ~ack/maas-kpi:versions-column-name into maas-kpi:master.

diff --git a/grafana/kpis.dashboard.py b/grafana/kpis.dashboard.py
index f56c8e1..6e8020c 100644
--- a/grafana/kpis.dashboard.py
+++ b/grafana/kpis.dashboard.py
@@ -51,21 +51,6 @@ def create_graph(title, targets, **kwargs):
     return Graph(**graph_args)
 
 
-def create_major_version_target(label, regexp):
-    return InfluxDBTarget(
-        rawQuery=True,
-        query=(
-            rf"""
-            SELECT SUM("count") AS "{label}"
-            FROM maas..daily_requests
-            WHERE ("maas_version" =~ /{regexp}/)
-              AND $timeFilter
-            GROUP BY time(1d)
-            """
-        ),
-    )
-
-
 dashboard = Dashboard(
     title="MAAS KPIs",
     rows=[
@@ -185,6 +170,7 @@ dashboard = Dashboard(
                                 GROUP BY time(1d)
                                 """
                             ),
+                            alias="$col",
                         )
                         for label, regexp in MAAS_VERSION_REGEXPS
                     ],