Merge branch 'main' of git.hsn.dev:jahanson/homelab

kubernetes/apps/database/kustomization.yaml

@@ -8,4 +8,3 @@ resources:
   # Flux-Kustomizations
   - ./crunchy-postgres-operator/ks.yaml
   - ./dragonfly/ks.yaml
-  - ./redis/ks.yaml

kubernetes/apps/observability/grafana/app/helmrelease.yaml

@@ -154,12 +154,6 @@ spec:
           gnetId: 1860
           revision: 33
           datasource: Prometheus
-        redis:
-          # renovate: depName="Redis Dashboard for Prometheus Redis Exporter 1.x"
-          gnetId: 763
-          revision: 6
-          datasource:
-            - { name: DS_PROMETHEUS, value: Prometheus }
         spegel:
           # renovate: depName="Spegel"
           gnetId: 18089
@@ -177,6 +171,10 @@ spec:
           gnetId: 7845
           revision: 4
           datasource: Prometheus
+        dragonflydb:
+          url: https://raw.githubusercontent.com/dragonflydb/dragonfly/main/tools/local/monitoring/grafana/provisioning/dashboards/dashboard.json
+          datasource:
+            - { name: DS_PROMETHEUS, value: Prometheus }
         cert-manager:
           url: https://raw.githubusercontent.com/monitoring-mixins/website/master/assets/cert-manager/dashboards/cert-manager.json
           datasource: Prometheus

kubernetes/apps/observability/kube-prometheus-stack/app/kustomization.yaml

@@ -6,7 +6,8 @@ resources:
   - ./externalsecret.yaml
   - ./helmrelease.yaml
   - ./prometheusrules
-  # - ./scrapeconfigs
+  - ./scrapeconfigs
+  - ./podmonitors
 configMapGenerator:
   - name: alertmanager-config-tpl
     files:

kubernetes/apps/observability/kube-prometheus-stack/app/podmonitors/dragonflydb.yaml

@@ -0,0 +1,19 @@
+---
+# yaml-language-server: $schema=https://ks.hsn.dev/monitoring.coreos.com/podmonitor_v1.json
+apiVersion: monitoring.coreos.com/v1
+kind: PodMonitor
+metadata:
+  name: dragonflydb-metrics
+  namespace: database
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: dragonfly
+      app: dragonfly
+  podTargetLabels:
+    - app
+  namespaceSelector:
+    matchNames:
+      - database
+  podMetricsEndpoints:
+  - port: admin

kubernetes/apps/observability/kube-prometheus-stack/app/podmonitors/kustomization.yaml

@@ -0,0 +1,6 @@
+---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ./dragonflydb.yaml

kubernetes/apps/observability/thanos/app/helmrelease.yaml

@@ -51,12 +51,8 @@ spec:
       config: &config |-
         type: REDIS
         config:
-          addr: >-
+          addr: dragonfly.database.svc.cluster.local:6379
-            redis-node-0.redis-headless.database.svc.cluster.local:26379,
+          db: 2
-            redis-node-1.redis-headless.database.svc.cluster.local:26379,
-            redis-node-2.redis-headless.database.svc.cluster.local:26379
-          db: 13
-          master_name: redis-master
       ingress:
         enabled: true
         ingressClassName: internal-nginx