From c192555ef13e9cf531902468b100f8ecd0f2b8ec Mon Sep 17 00:00:00 2001
From: Tyler Witlin <45468117+coolguy1771@users.noreply.github.com>
Date: Wed, 1 Jan 2025 21:12:45 -0500
Subject: [PATCH] fix(kyak): back to thanos

Signed-off-by: Tyler Witlin <45468117+coolguy1771@users.noreply.github.com>
---
 .../apps/monitoring/grafana/app/helmrelease.yaml | 16 ++++------------
 .../kube-prometheus-stack/app/helmrelease.yaml   |  1 -
 .../kyak/apps/monitoring/kustomization.yaml      |  8 ++++----
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/kubernetes/kyak/apps/monitoring/grafana/app/helmrelease.yaml b/kubernetes/kyak/apps/monitoring/grafana/app/helmrelease.yaml
index fc25db27a9..f993b8a98b 100644
--- a/kubernetes/kyak/apps/monitoring/grafana/app/helmrelease.yaml
+++ b/kubernetes/kyak/apps/monitoring/grafana/app/helmrelease.yaml
@@ -25,7 +25,7 @@ spec:
   dependsOn:
     # - name: authelia
     #   namespace: auth
-    - name: mimir
+    - name: kube-prometheus-stack
       namespace: monitoring
     - name: loki
       namespace: monitoring
@@ -45,7 +45,7 @@ spec:
       GF_DATE_FORMATS_USE_BROWSER_LOCALE: true
       GF_EXPLORE_ENABLED: true
       GF_FEATURE_TOGGLES_ENABLE: publicDashboards
-      GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS: natel-discrete-panel,pr0ps-trackmap-panel,panodata-map-panel
+      GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS: natel-discrete-panel,pr0ps-trackmap-panel,panodata-map-panel,yesoreyeram-infinity-datasource
       GF_SECURITY_ANGULAR_SUPPORT_ENABLED: true
       GF_SECURITY_COOKIE_SAMESITE: grafana
       GF_SERVER_ROOT_URL: https://grafana.${SECRET_PUBLIC_DOMAIN}
@@ -164,14 +164,6 @@ spec:
             editable: true
             options:
               path: /var/lib/grafana/dashboards/kepler-folder
-          - name: Mimir
-            orgId: 1
-            folder: mimir
-            type: file
-            disableDeletion: false
-            editable: true
-            options:
-              path: /var/lib/grafana/dashboards/mimir-folder
     datasources:
       datasources.yaml:
         apiVersion: 1
@@ -184,9 +176,9 @@ spec:
             type: prometheus
             uid: prometheus
             access: proxy
-            url: http://mimir-gateway.monitoring.svc:80/prometheus
+            url: http://thanos-query-frontend.monitoring.svc.cluster.local:10902
             jsonData:
-              prometheusType: Mimir
+              prometheusType: Thanos
               timeInterval: 1m
             isDefault: true
           - name: Loki
diff --git a/kubernetes/kyak/apps/monitoring/kube-prometheus-stack/app/helmrelease.yaml b/kubernetes/kyak/apps/monitoring/kube-prometheus-stack/app/helmrelease.yaml
index ac92f5dcb1..de3dac9e14 100644
--- a/kubernetes/kyak/apps/monitoring/kube-prometheus-stack/app/helmrelease.yaml
+++ b/kubernetes/kyak/apps/monitoring/kube-prometheus-stack/app/helmrelease.yaml
@@ -125,7 +125,6 @@ spec:
         image:
           registry: quay.io
           repository: prometheus/prometheus
-          tag: v2.54.0-dedupelabels
         thanos:
           image: quay.io/thanos/thanos:${THANOS_VERSION}
           version: "${THANOS_VERSION#v}"
diff --git a/kubernetes/kyak/apps/monitoring/kustomization.yaml b/kubernetes/kyak/apps/monitoring/kustomization.yaml
index d227768667..505f126c39 100644
--- a/kubernetes/kyak/apps/monitoring/kustomization.yaml
+++ b/kubernetes/kyak/apps/monitoring/kustomization.yaml
@@ -10,13 +10,13 @@ resources:
   - ./grafana/ks.yaml
   - ./grafana-k8s-monitoring/ks.yaml
   - ./kromgo/ks.yaml
-  # - ./kube-prometheus-stack/ks.yaml
+  - ./kube-prometheus-stack/ks.yaml
   - ./loki/ks.yaml
-  - ./mimir/ks.yaml
+#  - ./mimir/ks.yaml
   - ./nut-exporter/ks.yaml
   - ./smartctl-exporter/ks.yaml
   - ./snmp-exporter/ks.yaml
   - ./tempo/ks.yaml
-  # - ./thanos/ks.yaml
+  - ./thanos/ks.yaml
   - ./unpoller/ks.yaml
-  # - ./vector/ks.yaml
+  - ./vector/ks.yaml