charts/kubezero-logging/dashboards.yaml

@@ -0,0 +1,14 @@
+configmap: grafana-dashboards
+gzip: true
+folder: Logging
+condition: '.Values.es.prometheus'
+dashboards:
+- name: fluent-logging
+  url: https://grafana.com/api/dashboards/7752/revisions/4/download
+  #url: https://grafana.com/api/dashboards/13042/revisions/2/download
+  tags:
+  - Fluent
+- name: elasticsearch-logging
+  url: https://grafana.com/api/dashboards/266/revisions/4/download
+  tags:
+  - ECK

charts/kubezero-logging/update.sh

@@ -15,3 +15,6 @@ rm -rf charts/fluentd
 curl -L -s -o - https://github.com/fluent/helm-charts/releases/download/fluentd-${FLUENTD_VERSION}/fluentd-${FLUENTD_VERSION}.tgz | tar xfz - -C charts
 
 patch -i fluentd.patch -p0 --no-backup-if-mismatch
+
+# Fetch dashboards from Grafana.com and update ZDT CM
+../kubezero-metrics/sync_grafana_dashboards.py dashboards.yaml templates/grafana-dashboards.yaml

charts/kubezero-logging/values.yaml

@@ -205,7 +205,7 @@ fluent-bit:
   enabled: false
 
   serviceMonitor:
-    enabled: true
+    enabled: false
     selector:
       release: metrics
 
@@ -216,7 +216,7 @@ fluent-bit:
   resources:
     requests:
       cpu: 20m
-      memory: 16Mi
+      memory: 32Mi
     limits:
       memory: 64Mi