Merge pull request #1029 from lsst-it/IT-6397_kona_prometheus

(fleet/kube-prometheus-stack) deploy on kona and some other improvements to the stack

Author: csilva-cl

fleet/lib/kube-prometheus-stack-pre/externalsecret-grafana-opensearch.yaml

@@ -13,37 +13,13 @@ dependsOn:
       matchLabels:
         bundle: external-secrets
 targetCustomizations:
-  - name: ayekan
-    clusterSelector:
-      matchExpressions:
-        - key: management.cattle.io/cluster-display-name
-          operator: In
-          values:
-            - ayekan
-    yaml:
-      overlays:
-        - ayekan
-  - name: ogldap  # remove if/when direct ldap is dropped
+  - name: pillan
     clusterSelector:
       matchExpressions:
         - key: management.cattle.io/cluster-display-name
           operator: In
           values:
             - pillan
-            - ruka
-            - kueyen
     yaml:
       overlays:
-        - prod
         - ldap
-  - name: prod
-    clusterSelector:
-      matchExpressions:
-        - key: site
-          operator: In
-          values:
-            - ls
-            - cp
-    yaml:
-      overlays:
-        - prod

fleet/lib/kube-prometheus-stack-pre/overlays/prod/externalsecrets-alertmanager-webhooks.yaml renamed to fleet/lib/kube-prometheus-stack-pre/externalsecrets-alertmanager-webhooks.yaml

@@ -167,13 +167,3 @@ grafana:
           jsonData:
             handleGrafanaManagedAlerts: false
             implementation: prometheus
-        - name: loki
-          type: loki
-          uid: loki
-          url: http://loki-gateway.loki
-          access: proxy
-          jsonData:
-            maxLines: 1000
-            httpMethod: POST
-            timeout: 60
-            timeInterval: 60s

fleet/lib/kube-prometheus-stack-pre/fleet.yaml

@@ -14,9 +14,6 @@ helm:
   valuesFiles:
     - values.yaml
 dependsOn:
-  # XXX An "aggegrator" cluster should also depend on snmp-exporter-pre but
-  # targetCustomizations for dependsOn is not implemented.
-  # https://github.com/rancher/fleet/issues/2193
   - selector:
       matchLabels:
         bundle: prometheus-operator-crds
@@ -43,19 +40,17 @@ diff:
       jsonPointers:
         - /spec/automountServiceAccountToken
 targetCustomizations:
-  - name: kueyen
+  - name: dev
     clusterSelector:
       matchExpressions:
-        - key: management.cattle.io/cluster-display-name
+        - key: site
           operator: In
           values:
-            - kueyen
+            - dev
     helm:
       valuesFiles:
-        - pvc/values.yaml
         - aggregator/values.yaml
-        - ldap/values.yaml
-        - overlays/kueyen/values.yaml
+        - overlays/dev/values.yaml
   - name: pillan
     clusterSelector:
       matchExpressions:
@@ -67,21 +62,7 @@ targetCustomizations:
       valuesFiles:
         - pvc/values.yaml
         - aggregator/values.yaml
-        - ldap/values.yaml
         - overlays/pillan/values.yaml
-  - name: ruka
-    clusterSelector:
-      matchExpressions:
-        - key: management.cattle.io/cluster-display-name
-          operator: In
-          values:
-            - ruka
-    helm:
-      valuesFiles:
-        - pvc/values.yaml
-        - aggregator/values.yaml
-        - ldap/values.yaml
-        - overlays/ruka/values.yaml
   - name: antu
     clusterSelector:
       matchExpressions:
@@ -117,6 +98,7 @@ targetCustomizations:
               - url: https://mimir.ruka.dev.lsst.org/api/v1/push
               - url: https://mimir.antu.ls.lsst.org/api/v1/push
               - url: https://mimir.kueyen.dev.lsst.org/api/v1/push
+              - url: https://mimir.kona.dev.lsst.org/api/v1/push
   - name: cl-default
     clusterSelector:
       matchExpressions: