diff --git a/grafana/argocd.yaml b/grafana/argocd.yaml index 173e9c7..31a9659 100644 --- a/grafana/argocd.yaml +++ b/grafana/argocd.yaml @@ -32,7 +32,6 @@ spec: - CreateNamespace=true - PrunePropagationPolicy=foreground - PruneLast=true - - ServerSideApply=true retry: limit: 5 backoff: diff --git a/grafana/helm-values.yaml b/grafana/helm-values.yaml index e510459..ded7fa1 100644 --- a/grafana/helm-values.yaml +++ b/grafana/helm-values.yaml @@ -54,43 +54,8 @@ datasources: jsonData: implementation: prometheus -# Sidecar for dashboard ConfigMaps -sidecar: - dashboards: - enabled: true - label: grafana_dashboard - labelValue: "1" - searchNamespace: grafana - folderAnnotation: grafana_folder - provider: - foldersFromFilesStructure: false - -# Dashboards from grafana.com (only those not in ConfigMaps) -dashboardProviders: - dashboardproviders.yaml: - apiVersion: 1 - providers: - - name: 'default' - orgId: 1 - folder: '' - type: file - disableDeletion: false - editable: true - options: - path: /var/lib/grafana/dashboards/default - -dashboards: - default: - # Longhorn Storage - longhorn: - gnetId: 16888 - revision: 9 - datasource: Prometheus - # Traefik Official - traefik-official: - gnetId: 17346 - revision: 9 - datasource: Prometheus +# Dashboards are manually imported via Grafana UI +# JSON files stored in dashboards/ directory for reference grafana.ini: server: diff --git a/grafana/kustomization.yaml b/grafana/kustomization.yaml index 0d82169..af24a3b 100644 --- a/grafana/kustomization.yaml +++ b/grafana/kustomization.yaml @@ -4,91 +4,5 @@ resources: - vault/grafana-admin-password.yaml - ingress.yaml -configMapGenerator: -- name: grafana-dashboard-argocd - files: - - dashboards/argocd.json - options: - labels: - grafana_dashboard: "1" -- name: grafana-dashboard-cert-manager - files: - - dashboards/cert-manager.json - options: - labels: - grafana_dashboard: "1" -- name: grafana-dashboard-cloudnative-pg - files: - - dashboards/cloudnative-pg.json - options: - labels: - grafana_dashboard: "1" -- name: grafana-dashboard-coredns - files: - - dashboards/coredns.json - options: - labels: - grafana_dashboard: "1" -- name: grafana-dashboard-falco - files: - - dashboards/falco.json - options: - labels: - grafana_dashboard: "1" -- name: grafana-dashboard-k8s-global - files: - - dashboards/kubernetes-views-global.json - options: - labels: - grafana_dashboard: "1" -- name: grafana-dashboard-k8s-namespaces - files: - - dashboards/kubernetes-views-namespaces.json - options: - labels: - grafana_dashboard: "1" -- name: grafana-dashboard-k8s-pods - files: - - dashboards/kubernetes-views-pods.json - options: - labels: - grafana_dashboard: "1" -- name: grafana-dashboard-loki-logs - files: - - dashboards/loki-logs-app.json - options: - labels: - grafana_dashboard: "1" -- name: grafana-dashboard-loki-metrics - files: - - dashboards/loki-metrics.json - options: - labels: - grafana_dashboard: "1" -- name: grafana-dashboard-minio - files: - - dashboards/minio.json - options: - labels: - grafana_dashboard: "1" -- name: grafana-dashboard-node-exporter - files: - - dashboards/node-exporter-full.json - options: - labels: - grafana_dashboard: "1" -- name: grafana-dashboard-traefik - files: - - dashboards/traefik-custom.json - options: - labels: - grafana_dashboard: "1" -- name: grafana-dashboard-trivy - files: - - dashboards/trivy-operator.json - options: - labels: - grafana_dashboard: "1" - -generatorOptions: - disableNameSuffixHash: true +# Dashboard JSON files are stored in dashboards/ for manual import reference +# Auto-provisioning disabled due to ConfigMap size limits