From 5145612bf4d5179fdcda1863989d40ef5d0bbd53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20Mass=C3=A9?= <nicolas.masse@itix.fr>
Date: Fri, 11 Oct 2024 13:11:22 +0200
Subject: [PATCH] minor changes

---
 dashboard.json      | 292 ++++++++++++++++++++++++++++++++++++++++++++
 podman-compose.yaml |   1 +
 run.sh              |  10 +-
 3 files changed, 298 insertions(+), 5 deletions(-)
 create mode 100644 dashboard.json

diff --git a/dashboard.json b/dashboard.json
new file mode 100644
index 0000000..45ba394
--- /dev/null
+++ b/dashboard.json
@@ -0,0 +1,292 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": {
+          "type": "datasource",
+          "uid": "grafana"
+        },
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "target": {
+          "limit": 100,
+          "matchAny": false,
+          "tags": [],
+          "type": "dashboard"
+        },
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 0,
+  "id": 2,
+  "links": [],
+  "panels": [
+    {
+      "datasource": {
+        "default": true,
+        "type": "prometheus",
+        "uid": "be0j8k9s522v4b"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "axisSoftMax": 200,
+            "axisSoftMin": 0,
+            "fillOpacity": 80,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineWidth": 1,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "dark-green",
+                "value": null
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 17,
+        "w": 19,
+        "x": 0,
+        "y": 0
+      },
+      "id": 69,
+      "options": {
+        "barRadius": 0,
+        "barWidth": 0.97,
+        "fullHighlight": false,
+        "groupWidth": 0.7,
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": false
+        },
+        "orientation": "horizontal",
+        "showValue": "always",
+        "stacking": "none",
+        "text": {},
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        },
+        "xTickLabelRotation": 0,
+        "xTickLabelSpacing": 0
+      },
+      "pluginVersion": "8.5.20",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "de0hbrkdhsutca"
+          },
+          "editorMode": "code",
+          "exemplar": true,
+          "expr": "opencodequest_leaderboard_hero_lifetime_bonus:prod{user=~\"${user:regex}\"}\n+ sum_over_time(opencodequest_leaderboard_hero:prod{user=~\"${user:regex}\"}[1h])\n+ opencodequest_leaderboard_villain_lifetime_bonus:prod{user=~\"${user:regex}\"}\n+ sum_over_time(opencodequest_leaderboard_villain:prod{user=~\"${user:regex}\"}[1h])\n+ opencodequest_leaderboard_fight_lifetime_bonus:prod{user=~\"${user:regex}\"}\n+ sum_over_time(opencodequest_leaderboard_fight:prod{user=~\"${user:regex}\"}[1h])",
+          "format": "table",
+          "instant": true,
+          "interval": "",
+          "legendFormat": "{{user}}",
+          "refId": "A"
+        }
+      ],
+      "title": "Leaderboard",
+      "transformations": [
+        {
+          "id": "sortBy",
+          "options": {
+            "fields": {},
+            "sort": [
+              {
+                "desc": true,
+                "field": "Value"
+              }
+            ]
+          }
+        }
+      ],
+      "type": "barchart"
+    },
+    {
+      "datasource": {
+        "default": true,
+        "type": "prometheus",
+        "uid": "be0j8k9s522v4b"
+      },
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "axisSoftMax": 200,
+            "axisSoftMin": 0,
+            "barAlignment": 0,
+            "barWidthFactor": 0.6,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 20,
+        "w": 19,
+        "x": 0,
+        "y": 17
+      },
+      "id": 70,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "be0j8k9s522v4b"
+          },
+          "editorMode": "code",
+          "expr": "opencodequest_leaderboard_hero_lifetime_bonus:prod{user=~\"${user:regex}\"}\n+ sum_over_time(opencodequest_leaderboard_hero:prod{user=~\"${user:regex}\"}[1h])\n+ opencodequest_leaderboard_villain_lifetime_bonus:prod{user=~\"${user:regex}\"}\n+ sum_over_time(opencodequest_leaderboard_villain:prod{user=~\"${user:regex}\"}[1h])\n+ opencodequest_leaderboard_fight_lifetime_bonus:prod{user=~\"${user:regex}\"}\n+ sum_over_time(opencodequest_leaderboard_fight:prod{user=~\"${user:regex}\"}[1h])",
+          "instant": false,
+          "interval": "5s",
+          "legendFormat": "__auto",
+          "range": true,
+          "refId": "A"
+        }
+      ],
+      "title": "Points over time",
+      "type": "timeseries"
+    }
+  ],
+  "refresh": "5s",
+  "schemaVersion": 39,
+  "tags": [],
+  "templating": {
+    "list": [
+      {
+        "allValue": "",
+        "current": {
+          "selected": false,
+          "text": [
+            "All"
+          ],
+          "value": [
+            "$__all"
+          ]
+        },
+        "datasource": {
+          "type": "prometheus",
+          "uid": "be0j8k9s522v4b"
+        },
+        "definition": "query_result(opencodequest_users)",
+        "hide": 0,
+        "includeAll": true,
+        "label": "Users",
+        "multi": true,
+        "name": "user",
+        "options": [],
+        "query": {
+          "qryType": 3,
+          "query": "query_result(opencodequest_users)",
+          "refId": "PrometheusVariableQueryEditor-VariableQuery"
+        },
+        "refresh": 1,
+        "regex": "/user=\"(?<value>[^\\\"]+)\"/",
+        "skipUrlSync": false,
+        "sort": 1,
+        "type": "query"
+      }
+    ]
+  },
+  "time": {
+    "from": "now-150s",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "Red Hat Summit Connect 2024",
+  "uid": "de0hckh0egfeoe",
+  "version": 8,
+  "weekStart": ""
+}
\ No newline at end of file
diff --git a/podman-compose.yaml b/podman-compose.yaml
index 914c7a1..ed77685 100644
--- a/podman-compose.yaml
+++ b/podman-compose.yaml
@@ -1,4 +1,5 @@
 version: '3.8'
+name: opencodequest-leaderboard
 
 networks:
   monitoring: {}
diff --git a/run.sh b/run.sh
index 8a4dee0..424ddcf 100755
--- a/run.sh
+++ b/run.sh
@@ -48,8 +48,8 @@ envsubst < prometheus/prometheus.yaml.template > prometheus/prometheus.yaml
 envsubst < prometheus/recording_rules.yaml.template > prometheus/recording_rules.yaml
 
 # Reload recording rules and remove all data
-sudo podman stop prometheus || true
-sudo podman rm prometheus || true
-sudo podman volume rm prometheus-grafana-testbed_prometheus_data || true
-sudo podman-compose up -d
-sudo podman logs -f prometheus
+podman stop prometheus || true
+podman rm prometheus || true
+podman volume rm opencodequest-leaderboard_prometheus_data || true
+podman-compose up -d
+podman logs -f prometheus