Merge branch 'improvement/deploy-thanos-querier' into q/2.11

CHANGELOG.md

@@ -48,6 +48,10 @@
   PR[#3420](https://github.com/scality/metalk8s/pull/3420),
   PR[#3501](https://github.com/scality/metalk8s/pull/3501))
 
+- Deploy Thanos querier in front of Prometheus in order to make metrics
+  highly-available when we have multiple Prometheus instances
+  (PR[#3573](https://github.com/scality/metalk8s/pull/3573))
+
 ## Release 2.10.5 (in development)
 ## Enhancements
 

buildchain/buildchain/constants.py

@@ -30,6 +30,7 @@
 PROMETHEUS_ADAPTER_REPOSITORY: str = "docker.io/directxman12"
 PROMETHEUS_OPERATOR_REPOSITORY: str = "quay.io/prometheus-operator"
 PROMETHEUS_REPOSITORY: str = "quay.io/prometheus"
+THANOS_REPOSITORY: str = "quay.io/thanos"
 
 # Paths {{{
 

buildchain/buildchain/image.py

@@ -222,6 +222,9 @@ def _operator_image(name: str, **kwargs: Any) -> targets.OperatorImage:
         "node-exporter",
         "prometheus",
     ],
+    constants.THANOS_REPOSITORY: [
+        "thanos",
+    ],
 }
 
 REMOTE_NAMES: Dict[str, str] = {

buildchain/buildchain/salt_tree.py

@@ -357,6 +357,7 @@ def task(self) -> types.TaskDict:
     Path("salt/metalk8s/addons/prometheus-operator/deployed/namespace.sls"),
     Path("salt/metalk8s/addons/prometheus-operator/deployed/prometheus-rules.sls"),
     Path("salt/metalk8s/addons/prometheus-operator/deployed/service-configuration.sls"),
+    Path("salt/metalk8s/addons/prometheus-operator/deployed/thanos-chart.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"),
@@ -387,6 +388,7 @@ def task(self) -> types.TaskDict:
             "ShellUIVersion": versions.SHELL_UI_VERSION,
         },
     ),
+    Path("salt/metalk8s/addons/ui/post-upgrade.sls"),
     Path("salt/metalk8s/addons/solutions/deployed/configmap.sls"),
     Path("salt/metalk8s/addons/solutions/deployed/init.sls"),
     Path("salt/metalk8s/addons/solutions/deployed/namespace.sls"),

buildchain/buildchain/versions.py

@@ -210,6 +210,11 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
         version="v0.48.1",
         digest="sha256:2e7b61c86ee8b0aef4f5da8b6a4e51ecef249c9ccf4a329c5aa0c81e3fd074c1",
     ),
+    Image(
+        name="thanos",
+        version="v0.23.1",
+        digest="sha256:2f7d1ddc7877b076efbc3fa626b5003f7f197efbd777cff0eec2b20c2cd68d20",
+    ),
     # Local images
     Image(
         name="metalk8s-alert-logger",

charts/kube-prometheus-stack.yaml

@@ -87,7 +87,13 @@ prometheusOperator:
 
 
 prometheus:
+  thanosService:
+    enabled: true
+
   prometheusSpec:
+    thanos:
+      image: '__full_image__(thanos)'
+
     image:
       repository: '__image__(prometheus)'
 
@@ -149,6 +155,10 @@ grafana:
     image:
       repository: '__image__(k8s-sidecar)'
 
+    datasources:
+      # Service deployed by Thanos
+      url: http://thanos-query-http:10902/
+
   nodeSelector:
     node-role.kubernetes.io/infra: ''
 

charts/thanos.yaml

@@ -0,0 +1,46 @@
+store:
+  enabled: false
+
+queryFrontend:
+  enabled: false
+
+compact:
+  enabled: false
+
+bucket:
+  enabled: false
+
+rule:
+  enabled: false
+
+# This one is deployed by Prometheus operator
+sidecar:
+  enabled: false
+
+image:
+  repository: '__image__(thanos)'
+  tag: v0.23.1
+
+query:
+  enabled: true
+
+  replicaLabels:
+    - prometheus_replica
+
+  storeDNSDiscovery: false
+  sidecarDNSDiscovery: false
+
+  stores:
+    # Service deployed by Prometheus operator to expose Thanos sidecars
+    - dnssrv+_grpc._tcp.prometheus-operator-thanos-discovery
+
+  tolerations:
+    - key: 'node-role.kubernetes.io/bootstrap'
+      operator: 'Exists'
+      effect: 'NoSchedule'
+    - key: 'node-role.kubernetes.io/infra'
+      operator: 'Exists'
+      effect: 'NoSchedule'
+
+  nodeSelector:
+    node-role.kubernetes.io/infra: ''

charts/thanos/.helmignore

@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj

charts/thanos/Chart.yaml

@@ -0,0 +1,18 @@
+apiVersion: v1
+appVersion: 0.17.1
+description: Thanos is a set of components that can be composed into a highly available
+  metric system with unlimited storage capacity, which can be added seamlessly on
+  top of existing Prometheus deployments.
+icon: https://raw.githubusercontent.com/thanos-io/thanos/master/docs/img/Thanos-logo_fullmedium.png
+keywords:
+- thanos
+- prometheus
+- metrics
+maintainers:
+- email: [email protected]
+  name: Banzai Cloud
+name: thanos
+sources:
+- https://github.com/thanos-io/thanos
+- https://github.com/banzaicloud/banzai-charts/tree/master/thanos
+version: 0.4.6