Merge pull request #26 from WyriHaximusNet/fix-dashboards

Fix dashboards
WyriHaximusNet · Aug 23, 2020 · 8c347d6 · 8c347d6
2 parents fbe7e1d + 057baba
commit 8c347d6
Show file tree

Hide file tree

Showing 5 changed files with 273 additions and 24 deletions.
diff --git a/charts/docker-hub-exporter/Chart.yaml b/charts/docker-hub-exporter/Chart.yaml
@@ -4,7 +4,7 @@ description: Docker Hub Exporter
 home: https://github.com/jessestuart/docker-hub-exporter
 icon: https://helm.wyrihaximus.net/images/charts/docker-hub-exporter.png
 type: application
-version: 0.5.0
+version: 0.5.1
 appVersion: d05df48
 maintainers:
   - name: WyriHaximus

diff --git a/charts/docker-hub-exporter/templates/grafana-dashboard-docker-hub-prometheus.yaml b/charts/docker-hub-exporter/templates/grafana-dashboard-docker-hub-prometheus.yaml
@@ -21,19 +21,27 @@ data:
         }
         ]
       },
+      "description": "",
       "editable": true,
       "gnetId": null,
       "graphTooltip": 0,
-      "id": 9,
-      "iteration": 1589925510054,
+      "id": 4,
+      "iteration": 1598175237978,
       "links": [],
       "panels": [
       {
         "aliasColors": {},
         "bars": false,
         "dashLength": 10,
         "dashes": false,
-        "datasource": "VictoriaMetrics",
+        "datasource": "$datasource",
+        "fieldConfig": {
+          "defaults": {
+            "custom": {},
+            "links": []
+          },
+          "overrides": []
+        },
         "fill": 1,
         "fillGradient": 0,
         "gridPos": {
@@ -58,10 +66,8 @@ data:
         "linewidth": 1,
         "links": [],
         "nullPointMode": "connected",
-        "options": {
-          "dataLinks": []
-        },
         "percentage": false,
+        "pluginVersion": "7.1.1",
         "pointradius": 5,
         "points": false,
         "renderer": "flot",
@@ -75,7 +81,7 @@ data:
           "hide": false,
           "instant": false,
           "interval": "",
-          "legendFormat": "{{"{{"}}image{{"}}"}} ({{"{{"}}user{{"}}"}})",
+          "legendFormat": "{{"{{image}} ({{user}})"}}",
           "refId": "A"
         }
         ],
@@ -123,7 +129,13 @@ data:
       },
       {
         "columns": [],
-        "datasource": "VictoriaMetrics",
+        "datasource": "$datasource",
+        "fieldConfig": {
+          "defaults": {
+            "custom": {}
+          },
+          "overrides": []
+        },
         "fontSize": "100%",
         "gridPos": {
           "h": 16,
@@ -225,14 +237,21 @@ data:
         "title": "Image last Updated At",
         "transform": "table",
         "transparent": true,
-        "type": "table"
+        "type": "table-old"
       },
       {
         "aliasColors": {},
         "bars": false,
         "dashLength": 10,
         "dashes": false,
-        "datasource": "VictoriaMetrics",
+        "datasource": "$datasource",
+        "fieldConfig": {
+          "defaults": {
+            "custom": {},
+            "links": []
+          },
+          "overrides": []
+        },
         "fill": 1,
         "fillGradient": 0,
         "gridPos": {
@@ -256,10 +275,8 @@ data:
         "linewidth": 1,
         "links": [],
         "nullPointMode": "connected",
-        "options": {
-          "dataLinks": []
-        },
         "percentage": false,
+        "pluginVersion": "7.1.1",
         "pointradius": 5,
         "points": false,
         "renderer": "flot",
@@ -271,7 +288,7 @@ data:
         {
           "expr": "sum(docker_hub_image_stars_gauge{user=~\"$user\"}) by (image, user)",
           "interval": "",
-          "legendFormat": "{{"{{"}}image{{"}}"}} ({{"{{"}}user{{"}}"}})",
+          "legendFormat": "{{"{{image}} ({{user}})"}}",
           "refId": "A"
         }
         ],
@@ -319,25 +336,43 @@ data:
       }
       ],
       "refresh": "15m",
-      "schemaVersion": 22,
+      "schemaVersion": 26,
       "style": "dark",
       "tags": [],
       "templating": {
         "list": [
+        {
+          "current": {
+            "selected": true,
+            "text": "default",
+            "value": "default"
+          },
+          "hide": 0,
+          "includeAll": false,
+          "label": "Datasource",
+          "multi": false,
+          "name": "datasource",
+          "options": [],
+          "query": "prometheus",
+          "queryValue": "",
+          "refresh": 1,
+          "regex": "",
+          "skipUrlSync": false,
+          "type": "datasource"
+        },
         {
           "allValue": null,
           "current": {
-            "tags": [],
+            "selected": true,
             "text": "All",
             "value": [
               "$__all"
             ]
           },
-          "datasource": "VictoriaMetrics",
+          "datasource": "$datasource",
           "definition": "label_values(docker_hub_image_pulls_total_counter, user)",
           "hide": 0,
           "includeAll": true,
-          "index": -1,
           "label": "User",
           "multi": true,
           "name": "user",
@@ -361,7 +396,6 @@ data:
       },
       "timepicker": {
         "refresh_intervals": [
-          "5s",
           "10s",
           "30s",
           "1m",
@@ -387,9 +421,6 @@ data:
       "timezone": "",
       "title": "Docker Hub",
       "uid": "XsMetCgiz",
-      "variables": {
-        "list": []
-      },
       "version": 1
     }
 {{ end }}
diff --git a/charts/redirect/Chart.yaml b/charts/redirect/Chart.yaml
@@ -4,7 +4,7 @@ description: Redirect
 home: https://github.com/wyrihaximusnet/docker-redirect
 icon: https://helm.wyrihaximus.net/images/charts/redirect.png
 type: application
-version: 0.5.2
+version: 0.5.3
 appVersion: random
 maintainers:
   - name: WyriHaximus