From 8ddf39b3832f021edb978b07cd9104d18fd05760 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Sun, 25 Apr 2021 22:19:06 +0200
Subject: [PATCH] feat: Add Grafana dashboards for logging

---
 charts/kubezero-logging/dashboards.yaml         | 14 ++++++++++++++
 .../templates/grafana-dashboards.yaml           | 17 +++++++++++++++++
 charts/kubezero-logging/update.sh               |  3 +++
 charts/kubezero-logging/values.yaml             |  4 ++--
 4 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 charts/kubezero-logging/dashboards.yaml
 create mode 100644 charts/kubezero-logging/templates/grafana-dashboards.yaml

diff --git a/charts/kubezero-logging/dashboards.yaml b/charts/kubezero-logging/dashboards.yaml
new file mode 100644
index 00000000..ef119635
--- /dev/null
+++ b/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
diff --git a/charts/kubezero-logging/templates/grafana-dashboards.yaml b/charts/kubezero-logging/templates/grafana-dashboards.yaml
new file mode 100644
index 00000000..219f4416
--- /dev/null
+++ b/charts/kubezero-logging/templates/grafana-dashboards.yaml
@@ -0,0 +1,17 @@
+{{- if .Values.es.prometheus }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ printf "%s-%s" (include "kubezero-lib.fullname" $) "grafana-dashboards" | trunc 63 | trimSuffix "-" }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    grafana_dashboard: "1"
+{{ include "kubezero-lib.labels" . | indent 4 }}
+  annotations:
+    k8s-sidecar-target-directory: Logging
+binaryData:
+  fluent-logging.json.gz:
+    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
+  elasticsearch-logging.json.gz:
+    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
+{{- end }}
diff --git a/charts/kubezero-logging/update.sh b/charts/kubezero-logging/update.sh
index 22867c12..77dd2554 100755
--- a/charts/kubezero-logging/update.sh
+++ b/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
diff --git a/charts/kubezero-logging/values.yaml b/charts/kubezero-logging/values.yaml
index 96620018..efc5491c 100644
--- a/charts/kubezero-logging/values.yaml
+++ b/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