chore: update grafana

joryirving · Jun 19, 2024 · 424f149 · 424f149
1 parent 90577de
commit 424f149
Show file tree

Hide file tree

Showing 2 changed files with 69 additions and 37 deletions.
diff --git a/kubernetes/main/apps/observability/grafana/app/helmrelease.yaml b/kubernetes/main/apps/observability/grafana/app/helmrelease.yaml
@@ -139,15 +139,23 @@ spec:
             allowUiUpdates: true
             options:
               path: /var/lib/grafana/dashboards/system
-          - name: thanos
+          # - name: thanos
+          #   orgId: 1
+          #   folder: Thanos
+          #   type: file
+          #   disableDeletion: false
+          #   editable: true
+          #   allowUiUpdates: true
+          #   options:
+          #     path: /var/lib/grafana/dashboards/thanos
+          - name: victoriametrics
             orgId: 1
-            folder: Thanos
+            folder: VictoriaMetrics
             type: file
             disableDeletion: false
             editable: true
-            allowUiUpdates: true
             options:
-              path: /var/lib/grafana/dashboards/thanos
+              path: /var/lib/grafana/dashboards/victoriametrics-folder
     datasources:
       datasources.yaml:
         apiVersion: 1
@@ -160,9 +168,9 @@ spec:
             uid: prometheus
             isDefault: true
             access: proxy
-            url: http://thanos-query-frontend.observability.svc.cluster.local:10902
+            url: http://vmsingle-victoria-metrics.observability.svc.cluster.local:8429
             jsonData:
-              prometheusType: Thanos
+              prometheusType: Prometheus
               timeInterval: 1m
           - name: Alertmanager
             type: alertmanager
@@ -375,36 +383,60 @@ spec:
           gnetId: 18089
           revision: 1
           datasource:
-            - name: DS_PROMETHEUS
-              value: Prometheus
-      thanos:
-        thanos-bucket-replicate:
-          url: https://raw.githubusercontent.com/monitoring-mixins/website/master/assets/thanos/dashboards/bucket-replicate.json
-          datasource: Prometheus
-        thanos-compact:
-          url: https://raw.githubusercontent.com/monitoring-mixins/website/master/assets/thanos/dashboards/compact.json
-          datasource: Prometheus
-        thanos-overview:
-          url: https://raw.githubusercontent.com/monitoring-mixins/website/master/assets/thanos/dashboards/overview.json
-          datasource: Prometheus
-        thanos-query:
-          url: https://raw.githubusercontent.com/monitoring-mixins/website/master/assets/thanos/dashboards/query.json
-          datasource: Prometheus
-        thanos-query-frontend:
-          url: https://raw.githubusercontent.com/monitoring-mixins/website/master/assets/thanos/dashboards/query-frontend.json
-          datasource: Prometheus
-        thanos-receieve:
-          url: https://raw.githubusercontent.com/monitoring-mixins/website/master/assets/thanos/dashboards/receive.json
-          datasource: Prometheus
-        thanos-rule:
-          url: https://raw.githubusercontent.com/monitoring-mixins/website/master/assets/thanos/dashboards/rule.json
-          datasource: Prometheus
-        thanos-sidecar:
-          url: https://raw.githubusercontent.com/monitoring-mixins/website/master/assets/thanos/dashboards/sidecar.json
-          datasource: Prometheus
-        thanos-store:
-          url: https://raw.githubusercontent.com/monitoring-mixins/website/master/assets/thanos/dashboards/store.json
-          datasource: Prometheus
+            - { name: DS_PROMETHEUS, value: Prometheus }
+      # thanos:
+      #   thanos-bucket-replicate:
+      #     url: https://raw.githubusercontent.com/monitoring-mixins/website/master/assets/thanos/dashboards/bucket-replicate.json
+      #     datasource: Prometheus
+      #   thanos-compact:
+      #     url: https://raw.githubusercontent.com/monitoring-mixins/website/master/assets/thanos/dashboards/compact.json
+      #     datasource: Prometheus
+      #   thanos-overview:
+      #     url: https://raw.githubusercontent.com/monitoring-mixins/website/master/assets/thanos/dashboards/overview.json
+      #     datasource: Prometheus
+      #   thanos-query:
+      #     url: https://raw.githubusercontent.com/monitoring-mixins/website/master/assets/thanos/dashboards/query.json
+      #     datasource: Prometheus
+      #   thanos-query-frontend:
+      #     url: https://raw.githubusercontent.com/monitoring-mixins/website/master/assets/thanos/dashboards/query-frontend.json
+      #     datasource: Prometheus
+      #   thanos-receieve:
+      #     url: https://raw.githubusercontent.com/monitoring-mixins/website/master/assets/thanos/dashboards/receive.json
+      #     datasource: Prometheus
+      #   thanos-rule:
+      #     url: https://raw.githubusercontent.com/monitoring-mixins/website/master/assets/thanos/dashboards/rule.json
+      #     datasource: Prometheus
+      #   thanos-sidecar:
+      #     url: https://raw.githubusercontent.com/monitoring-mixins/website/master/assets/thanos/dashboards/sidecar.json
+      #     datasource: Prometheus
+      #   thanos-store:
+      #     url: https://raw.githubusercontent.com/monitoring-mixins/website/master/assets/thanos/dashboards/store.json
+      #     datasource: Prometheus
+      victoriametrics:
+        vm-cluster:
+          # renovate: depName="VictoriaMetrics - cluster"
+          gnetId: 11176
+          revision: 37
+          datasource:
+            - { name: DS_PROMETHEUS, value: Prometheus }
+        vm-operator:
+          # renovate: depName="VictoriaMetrics - operator"
+          gnetId: 17869
+          revision: 2
+          datasource:
+            - { name: DS_PROMETHEUS, value: Prometheus }
+        vm-vmalert:
+          # renovate: depName="VictoriaMetrics - vmalert"
+          gnetId: 14950
+          revision: 11
+          datasource:
+            - { name: DS_PROMETHEUS, value: Prometheus }
+        vm-vmagent:
+          # renovate: depName="VictoriaMetrics - vmagent"
+          gnetId: 12683
+          revision: 18
+          datasource:
+            - { name: DS_PROMETHEUS, value: Prometheus }
     sidecar:
       dashboards:
         enabled: true

diff --git a/kubernetes/main/apps/observability/kustomization.yaml b/kubernetes/main/apps/observability/kustomization.yaml
@@ -13,7 +13,7 @@ resources:
   - ./kromgo/ks.yaml
   # - ./kube-prometheus-stack/ks.yaml
   - ./prometheus-operator-crds/ks.yaml
-  - ./thanos/ks.yaml
+  # - ./thanos/ks.yaml
   - ./unpoller/ks.yaml
   - ./victoria-metrics/ks.yaml
   # Exporters