salt: replace fluent-bit dashboard by one in helm chart

scality · Sep 4, 2024 · 79dc5ad · 79dc5ad
1 parent 117f180
commit 79dc5ad
Show file tree

Hide file tree

Showing 8 changed files with 1,618 additions and 1,521 deletions.
diff --git a/buildchain/buildchain/salt_tree.py b/buildchain/buildchain/salt_tree.py
@@ -313,7 +313,6 @@ def task(self) -> types.TaskDict:
     Path("salt/metalk8s/addons/logging/deployed/init.sls"),
     Path("salt/metalk8s/addons/logging/deployed/dashboards.sls"),
     Path("salt/metalk8s/addons/logging/deployed/namespace.sls"),
-    Path("salt/metalk8s/addons/logging/deployed/files/fluent-bit.json"),
     Path("salt/metalk8s/addons/logging/deployed/files/logs.json"),
     Path("salt/metalk8s/addons/logging/deployed/files/loki.json"),
     Path("salt/metalk8s/addons/logging/fluent-bit/config/fluent-bit.yaml.j2"),

diff --git a/charts/fluent-bit.yaml b/charts/fluent-bit.yaml
@@ -53,3 +53,7 @@ serviceMonitor:
   enabled: true
   selector:
     metalk8s.scality.com/monitor: ''
+
+dashboards:
+  enabled: true
+  deterministicUid: true
diff --git a/salt/metalk8s/addons/logging/deployed/dashboards.sls b/salt/metalk8s/addons/logging/deployed/dashboards.sls
@@ -3,11 +3,6 @@
     import configmaps_from_dashboards with context %}
 
 {{ configmaps_from_dashboards([
-      {
-          'name': 'fluent-bit',
-          'title': 'Fluent Bit',
-          'tags': ['logging'],
-      },
       {
           'name': 'logs',
           'title': 'Logs',
@@ -19,3 +14,14 @@
           'tags': ['logging'],
       },
 ]) }}
+
+{#- In MetalK8s 127.0 we changed the fluent-bit dashboard to use
+    the one from the helm chart. We need to remove the old one
+    to avoid conflicts.
+    This can be removed in `development/129.0` #}
+Ensure old fluent-bit dashboard does no longer exists:
+   metalk8s_kubernetes.object_absent:
+     - name: fluent-bit-dashboard
+     - namespace: metalk8s-monitoring
+     - apiVersion: v1
+     - kind: ConfigMap