Merge branch 'feature/thanos-query-file-service-discovery' into q/129.0

Author: bert-e

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Release 129.0.1 (in development)
 
+### Enhancements
+
+- Allow Thanos Querier to discover sidecars for more Prometheus instances through a ConfigMap
+  (PR[#4546](https://github.com/scality/metalk8s/pull/4546))
+
 ## Release 129.0.0
 
 ### Removals

buildchain/buildchain/salt_tree.py

@@ -376,6 +376,7 @@ def task(self) -> types.TaskDict:
     ),
     Path("salt/metalk8s/addons/prometheus-operator/deployed/service-configuration.sls"),
     Path("salt/metalk8s/addons/prometheus-operator/deployed/thanos-chart.sls"),
+    Path("salt/metalk8s/addons/prometheus-operator/deployed/thanos-query-sd-files.sls"),
     Path("salt/metalk8s/addons/ui/deployed/dependencies.sls"),
     Path("salt/metalk8s/addons/ui/deployed/ingress.sls"),
     Path("salt/metalk8s/addons/ui/deployed/init.sls"),

charts/thanos.yaml

@@ -29,11 +29,14 @@ query:
 
   storeDNSDiscovery: false
   sidecarDNSDiscovery: false
-  
+
   stores:
     # Service deployed by Prometheus operator to expose Thanos sidecars
     - dnssrv+_grpc._tcp.prometheus-operator-thanos-discovery
 
+  serviceDiscoveryFileConfigMaps:
+    - thanos-query-sd-files
+
   tolerations:
     - key: 'node-role.kubernetes.io/bootstrap'
       operator: 'Exists'

salt/metalk8s/addons/prometheus-operator/deployed/init.sls

@@ -8,4 +8,5 @@ include:
   - .chart
   - .node-alerts-rules
   - .kube-alerts-rules
+  - .thanos-query-sd-files
   - .thanos-chart

salt/metalk8s/addons/prometheus-operator/deployed/thanos-chart.sls

@@ -99,6 +99,9 @@ spec:
         - --query.auto-downsampling
         - --store.sd-dns-resolver=miekgdns
         - --store=dnssrv+_grpc._tcp.prometheus-operator-thanos-discovery
+        - --store.sd-files=/etc/query/thanos-query-sd-files/*.yaml
+        - --store.sd-files=/etc/query/thanos-query-sd-files/*.yml
+        - --store.sd-files=/etc/query/thanos-query-sd-files/*.json
         - --store.sd-interval=5m
         image: {% endraw -%}{{ build_image_name("thanos", False) }}{%- raw %}:v0.36.1
         imagePullPolicy: IfNotPresent
@@ -117,7 +120,9 @@ spec:
             path: /-/ready
             port: http
         resources: {}
-        volumeMounts: null
+        volumeMounts:
+        - mountPath: /etc/query/thanos-query-sd-files
+          name: thanos-query-sd-files
       nodeSelector:
         node-role.kubernetes.io/infra: ''
       tolerations:
@@ -127,6 +132,10 @@ spec:
       - effect: NoSchedule
         key: node-role.kubernetes.io/infra
         operator: Exists
-      volumes: null
+      volumes:
+      - configMap:
+          defaultMode: 420
+          name: thanos-query-sd-files
+        name: thanos-query-sd-files
 
 {% endraw %}

salt/metalk8s/addons/prometheus-operator/deployed/thanos-query-sd-files.sls

@@ -0,0 +1,14 @@
+#!jinja | metalk8s_kubernetes
+
+{% raw %}
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: thanos-query-sd-files
+  namespace: metalk8s-monitoring
+  labels:
+    app.kubernetes.io/component: query
+    app.kubernetes.io/instance: thanos
+
+{% endraw %}