From 1f6d4d23451e38ef4f14facd8374e89e574f3909 Mon Sep 17 00:00:00 2001
From: Zheng Xi Zhou <zzxwill@gmail.com>
Date: Thu, 26 Aug 2021 20:31:49 +0800
Subject: [PATCH] Fix: add fluxcd dashbaords (#2130)

Added two fluxcd dashboards and also install its dependencies

just keep the ready Dashboard
---
 charts/vela-core/templates/addons/observability.yaml |  9 +++++++++
 vela-templates/addons/auto-gen/observability.yaml    |  9 +++++++++
 vela-templates/addons/observability/template.yaml    | 10 ++++++++++
 3 files changed, 28 insertions(+)

diff --git a/charts/vela-core/templates/addons/observability.yaml b/charts/vela-core/templates/addons/observability.yaml
index 52df48f9d..8a1a46144 100644
--- a/charts/vela-core/templates/addons/observability.yaml
+++ b/charts/vela-core/templates/addons/observability.yaml
@@ -45,6 +45,7 @@ data:
                 urls:
                 - https://raw.githubusercontent.com/oam-dev/grafana-registration/master/dashboards/kubevela_core_logging.json
                 - https://raw.githubusercontent.com/oam-dev/grafana-registration/master/dashboards/kubevela_core_monitoring.json
+                - https://raw.githubusercontent.com/oam-dev/grafana-registration/master/dashboards/flux2/cluster.json
               type: import-grafana-dashboard
             type: helm
           - name: loki
@@ -113,6 +114,14 @@ data:
                   tag: v2.1.0
               version: 3.4.1
             type: helm
+          - name: kube-prometheus-stack
+            properties:
+              chart: kube-prometheus-stack
+              repoType: helm
+              targetNamespace: observability
+              url: https://prometheus-community.github.io/helm-charts
+              version: 18.0.0
+            type: helm
         status:
           rollout:
             batchRollingState: ""
diff --git a/vela-templates/addons/auto-gen/observability.yaml b/vela-templates/addons/auto-gen/observability.yaml
index a9a1ae7bf..b01fcd0ad 100644
--- a/vela-templates/addons/auto-gen/observability.yaml
+++ b/vela-templates/addons/auto-gen/observability.yaml
@@ -42,6 +42,7 @@ spec:
             urls:
             - https://raw.githubusercontent.com/oam-dev/grafana-registration/master/dashboards/kubevela_core_logging.json
             - https://raw.githubusercontent.com/oam-dev/grafana-registration/master/dashboards/kubevela_core_monitoring.json
+            - https://raw.githubusercontent.com/oam-dev/grafana-registration/master/dashboards/flux2/cluster.json
           type: import-grafana-dashboard
         type: helm
       - name: loki
@@ -110,6 +111,14 @@ spec:
               tag: v2.1.0
           version: 3.4.1
         type: helm
+      - name: kube-prometheus-stack
+        properties:
+          chart: kube-prometheus-stack
+          repoType: helm
+          targetNamespace: observability
+          url: https://prometheus-community.github.io/helm-charts
+          version: 18.0.0
+        type: helm
     status:
       rollout:
         batchRollingState: ""
diff --git a/vela-templates/addons/observability/template.yaml b/vela-templates/addons/observability/template.yaml
index d4cca201e..114d14438 100644
--- a/vela-templates/addons/observability/template.yaml
+++ b/vela-templates/addons/observability/template.yaml
@@ -55,6 +55,7 @@ spec:
                 urls:
                   - https://raw.githubusercontent.com/oam-dev/grafana-registration/master/dashboards/kubevela_core_logging.json
                   - https://raw.githubusercontent.com/oam-dev/grafana-registration/master/dashboards/kubevela_core_monitoring.json
+                  - https://raw.githubusercontent.com/oam-dev/grafana-registration/master/dashboards/flux2/cluster.json # fluxcd
         - name: loki
           type: helm
           properties:
@@ -121,6 +122,15 @@ spec:
                 repository: oamdev/kube-state-metrics
                 tag: v2.1.0
 
+        - name: kube-prometheus-stack
+          type: helm
+          properties:
+            chart: kube-prometheus-stack
+            version: 18.0.0
+            repoType: helm
+            url: https://prometheus-community.github.io/helm-charts
+            targetNamespace: observability
+
 {{ range .ResourceFiles }}
         - name: {{ .Name }}
           type: raw