fix(database): remove grafana dashboard from dragonfly operator and a…

…dd it to grafana
tyriis · Apr 10, 2024 · 6f23a47 · 6f23a47
1 parent bc776e8
commit 6f23a47
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/kubernetes/talos-flux/apps/database/dragonfly/operator/kustomization.yaml b/kubernetes/talos-flux/apps/database/dragonfly/operator/kustomization.yaml
@@ -7,14 +7,14 @@ resources:
   - https://raw.githubusercontent.com/dragonflydb/dragonfly-operator/v1.1.2/manifests/crd.yaml
   - helm-release.yaml
   - rbac.yaml
-configMapGenerator:
-  - name: dragonfly-dashboard
-    files:
-      # renovate: datasource=github-releases depName=dragonflydb/dragonfly-operator
-      - dragonfly-dashboard.json=https://raw.githubusercontent.com/dragonflydb/dragonfly-operator/v1.1.2/monitoring/grafana-dashboard.json
-generatorOptions:
-  disableNameSuffixHash: true
-  annotations:
-    kustomize.toolkit.fluxcd.io/substitute: disabled
-  labels:
-    grafana_dashboard: "true"
+# configMapGenerator:
+#   - name: dragonfly-dashboard
+#     files:
+#       # renovate: datasource=github-releases depName=dragonflydb/dragonfly-operator
+#       - dragonfly-dashboard.json=https://raw.githubusercontent.com/dragonflydb/dragonfly-operator/v1.1.2/monitoring/grafana-dashboard.json
+# generatorOptions:
+#   disableNameSuffixHash: true
+#   annotations:
+#     kustomize.toolkit.fluxcd.io/substitute: disabled
+#   labels:
+#     grafana_dashboard: "true"
diff --git a/kubernetes/talos-flux/apps/observability/grafana/app/helm-release.yaml b/kubernetes/talos-flux/apps/observability/grafana/app/helm-release.yaml
@@ -64,6 +64,9 @@ spec:
           gnetId: 11074
           revision: 9
           datasource: Prometheus
+        dragonfly:
+          url: https://raw.githubusercontent.com/dragonflydb/dragonfly/main/tools/local/monitoring/grafana/provisioning/dashboards/dashboard.json
+          datasource: Prometheus
 
     sidecar:
       dashboards: