charts,salt,build: Bump kube-prometheus-stack chart to 51.2.0

Bump the kube-prometheus-stack chart to 48.1.1 and also bump images:
- prometheus to 2.47.0
- alertmanager to 0.26.0
- thanos to 0.32.2
- grafana to 10.1.2-ubuntu
- k8s-sidecar to 1.25.1
- kube-state-metrics to 2.10.0
- node-exporter to 1.6.1
- prometheus-config-reloader to v0.68.0
- prometheus-operator to v0.68.0

Upgrade the kube-prometheus-stack chart using:
```
rm -rf charts/kube-prometheus-stack
helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
helm repo update
helm fetch -d charts --untar prometheus-community/kube-prometheus-stack
```

Re-render prometheus-operator salt state using:
```
./doit.sh codegen:chart_kube-prometheus-stack
```

We also bump the thanos image and thanos chart using:
```
rm -rf charts/thanos
helm repo add banzaicloud-stable https://kubernetes-charts.banzaicloud.com
helm repo update
helm fetch -d charts --untar banzaicloud-stable/thanos
```

And re-render the salt state with the following command:
```
./doit.sh codegen:chart_thanos
```

Update also the extracted Prometheus rules

CHANGELOG.md

@@ -17,6 +17,35 @@
 - Bump containerd to [1.6.24](https://github.com/containerd/containerd/releases/tag/v1.6.24)
   (PR[#4164](https://github.com/scality/metalk8s/pull/4164))
 
+- Bump kube-prometheus-stack chart version to
+  [51.2.0](https://github.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-51.2.0)
+  (PR[#4167](https://github.com/scality/metalk8s/pull/4167))
+
+  This change includes:
+
+  - Bump Prometheus container version to
+    [2.47.0](https://github.com/prometheus/prometheus/releases/tag/v2.47.0)
+  - Bump AlertManager container version to
+    [0.26.0](https://github.com/prometheus/alertmanager/releases/tag/v0.26.0)
+  - Bump Thanos container version to
+    [0.32.2](https://github.com/thanos-io/thanos/releases/tag/v0.32.2)
+  - Bump grafana chart version to
+    [6.59.5](https://github.com/grafana/helm-charts/releases/tag/grafana-6.59.5),
+    Grafana container version to
+    [10.1.2](https://github.com/grafana/grafana/releases/tag/v10.1.2),
+    and kiwigrid/k8s-sidecar container version to
+    [1.25.1](https://github.com/kiwigrid/k8s-sidecar/releases/tag/1.25.1)
+  - Bump kube-state-metrics chart version to
+    [5.12.1](https://github.com/prometheus-community/helm-charts/releases/tag/kube-state-metrics-5.12.1)
+    and kube-state-metrics container version to
+    [2.10.0](https://github.com/kubernetes/kube-state-metrics/releases/tag/v2.10.0)
+  - Bump prometheus-node-exporter chart version to
+    [4.23.1](https://github.com/prometheus-community/helm-charts/releases/tag/prometheus-node-exporter-4.23.1)
+    and node-exporter container version to
+    [1.6.1](https://github.com/prometheus/node_exporter/releases/tag/v1.6.1)
+  - Bump prometheus-operator and prometheus-config-reloader containers version to
+    [0.68.0](https://github.com/prometheus-operator/prometheus-operator/releases/tag/v0.68.0)
+
 - Bump nginx image to [1.25.2-alpine](https://github.com/nginx/nginx/releases/tag/release-1.25.2)
   (PR[#4165](https://github.com/scality/metalk8s/pull/4165))
 

buildchain/buildchain/versions.py

@@ -105,8 +105,8 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
     ),
     Image(
         name="alertmanager",
-        version="v0.25.0",
-        digest="sha256:fd4d9a3dd1fd0125108417be21be917f19cc76262347086509a0d43f29b80e98",
+        version="v0.26.0",
+        digest="sha256:361db356b33041437517f1cd298462055580585f26555c317df1a3caf2868552",
     ),
     Image(
         name="calico-cni",
@@ -140,13 +140,13 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
     ),
     Image(
         name="grafana",
-        version="10.0.1-ubuntu",
-        digest="sha256:658b92200bef14ded34fd371f0c62551cf1fedf64a6cf4f2bdb9611b7015cd23",
+        version="10.1.2-ubuntu",
+        digest="sha256:480ca6650f1ee46d8b8d204f2c629482eac39deaaae53d2b2b74ad84163c77f1",
     ),
     Image(
         name="k8s-sidecar",
-        version="1.24.6",
-        digest="sha256:3b70b9f1a81e67c97e4cd32c9a918fa44fd2c9f66bdd0d28d8b82d7b502cb5e4",
+        version="1.25.1",
+        digest="sha256:415d07ee1027c3ff7af9e26e05e03ffd0ec0ccf9f619ac00ab24366efe4343bd",
     ),
     Image(
         name="kube-apiserver",
@@ -170,8 +170,8 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
     ),
     Image(
         name="kube-state-metrics",
-        version="v2.9.2",
-        digest="sha256:5ac2e67a862cd3baa0eb4fd7683d54928fd76ea3a61cde50508922c956901d8c",
+        version="v2.10.0",
+        digest="sha256:ec5d6f6be2280212da0e55572b67d76f29c0342b3b6d24cc47b32d80ee3374a4",
     ),
     Image(
         name="nginx",
@@ -187,8 +187,8 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
     ),
     Image(
         name="node-exporter",
-        version="v1.6.0",
-        digest="sha256:d2e48098c364e61ee62d9016eed863b66331d87cf67146f2068b70ed9d9b4f98",
+        version="v1.6.1",
+        digest="sha256:81f94e50ea37a88dfee849d0f4acad25b96b397061f59e5095905f6bc5829637",
     ),
     Image(
         name="pause",
@@ -197,8 +197,8 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
     ),
     Image(
         name="prometheus",
-        version="v2.45.0",
-        digest="sha256:9309deb7c981e8a94584d9ed689fd62f7ac4549d816fd3881550311cf056a237",
+        version="v2.47.0",
+        digest="sha256:c5dd3503828713c4949ae1bccd1d8d69f382c33d441954674a6b78ebe69c3331",
     ),
     Image(
         name="prometheus-adapter",
@@ -207,18 +207,18 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
     ),
     Image(
         name="prometheus-config-reloader",
-        version="v0.66.0",
-        digest="sha256:b7493034219c1465ff84d47dc8a8f337ed15465d1143e6ef3af3ba995d128a5c",
+        version="v0.68.0",
+        digest="sha256:2eada80dc7264dd53fcfa67ca86f8a398a07112cce7017eb44d6574483801356",
     ),
     Image(
         name="prometheus-operator",
-        version="v0.66.0",
-        digest="sha256:9c55b6970e37fb734c153e6c6acace285be98d095e8b221f93e38a6b179e1222",
+        version="v0.68.0",
+        digest="sha256:70f02a0fd9181a4e1afd5135e2dbb5d4264f7828df1d567b4d83a3eab63deb01",
     ),
     Image(
         name="thanos",
-        version="v0.31.0",
-        digest="sha256:e7d337d6ac2aea3f0f9314ec9830291789e16e2b480b9d353be02d05ce7f2a7e",
+        version="v0.32.2",
+        digest="sha256:4f5997e4ccf3e68dd958d7619478ee69b2b2c27d6f0d5f9b42ad2667b747abb5",
     ),
     # Local images
     Image(

charts/kube-prometheus-stack.yaml

@@ -1,6 +1,6 @@
 nameOverride: prometheus-operator
 
-kubeTargetVersionOverride: 1.26.0
+kubeTargetVersionOverride: 1.27.0
 
 commonLabels:
   # This needs to remain 'Tiller' for the render script to work properly
@@ -169,7 +169,7 @@ grafana:
 
   image:
     repository: '__image__(grafana)'
-    tag: '10.0.1-ubuntu'
+    tag: '10.1.2-ubuntu'
 
   sidecar:
     image:

charts/kube-prometheus-stack/Chart.lock

@@ -4,15 +4,15 @@ dependencies:
   version: 0.0.0
 - name: kube-state-metrics
   repository: https://prometheus-community.github.io/helm-charts
-  version: 5.8.2
+  version: 5.12.1
 - name: prometheus-node-exporter
   repository: https://prometheus-community.github.io/helm-charts
-  version: 4.18.1
+  version: 4.23.1
 - name: grafana
   repository: https://grafana.github.io/helm-charts
-  version: 6.58.2
+  version: 6.59.5
 - name: prometheus-windows-exporter
   repository: https://prometheus-community.github.io/helm-charts
-  version: 0.1.0
-digest: sha256:7d389fd2ee69d1e9dc486fec6fe8e38f0e88b8891d57b9f284e9ec460a9bc81f
-generated: "2023-07-13T14:08:47.800418365Z"
+  version: 0.1.1
+digest: sha256:f3fd0c930c37d6774e47b9423b03395c7c6b30e07860908319f7ab9dc2594f85
+generated: "2023-09-23T23:28:30.725782537Z"

charts/kube-prometheus-stack/Chart.yaml

@@ -7,7 +7,7 @@ annotations:
       url: https://github.com/prometheus-operator/kube-prometheus
   artifacthub.io/operator: "true"
 apiVersion: v2
-appVersion: v0.66.0
+appVersion: v0.68.0
 dependencies:
 - condition: crds.enabled
   name: crds
@@ -16,15 +16,15 @@ dependencies:
 - condition: kubeStateMetrics.enabled
   name: kube-state-metrics
   repository: https://prometheus-community.github.io/helm-charts
-  version: 5.8.*
+  version: 5.12.*
 - condition: nodeExporter.enabled
   name: prometheus-node-exporter
   repository: https://prometheus-community.github.io/helm-charts
-  version: 4.18.*
+  version: 4.23.*
 - condition: grafana.enabled
   name: grafana
   repository: https://grafana.github.io/helm-charts
-  version: 6.58.*
+  version: 6.59.*
 - condition: windowsMonitoring.enabled
   name: prometheus-windows-exporter
   repository: https://prometheus-community.github.io/helm-charts
@@ -39,7 +39,7 @@ keywords:
 - operator
 - prometheus
 - kube-prometheus
-kubeVersion: '>=1.16.0-0'
+kubeVersion: '>=1.19.0-0'
 maintainers:
 - email: andrew@quadcorps.co.uk
   name: andrewgkew
@@ -60,4 +60,4 @@ sources:
 - https://github.com/prometheus-community/helm-charts
 - https://github.com/prometheus-operator/kube-prometheus
 type: application
-version: 48.1.1
+version: 51.2.0

charts/kube-prometheus-stack/README.md

@@ -8,7 +8,7 @@ _Note: This chart was formerly named `prometheus-operator` chart, now renamed to
 
 ## Prerequisites
 
-- Kubernetes 1.16+
+- Kubernetes 1.19+
 - Helm 3+
 
 ## Get Helm Repository Info
@@ -82,6 +82,50 @@ _See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documen
 
 A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an incompatible breaking change needing manual actions.
 
+### From 50.x to 51.x
+
+This version upgrades Prometheus-Operator to v0.68.0, Prometheus to 2.47.0 and Thanos to v0.32.2
+
+Run these commands to update the CRDs before applying the upgrade.
+
+```console
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.68.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.68.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.68.0/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.68.0/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.68.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.68.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.68.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.68.0/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.68.0/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.68.0/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
+```
+
+### From 49.x to 50.x
+
+This version requires Kubernetes 1.19+.
+
+We do not expect any breaking changes in this version.
+
+### From 48.x to 49.x
+
+This version upgrades Prometheus-Operator to v0.67.1, 0, Alertmanager to v0.26.0, Prometheus to 2.46.0 and Thanos to v0.32.0
+
+Run these commands to update the CRDs before applying the upgrade.
+
+```console
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.67.1/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.67.1/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.67.1/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.67.1/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.67.1/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.67.1/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.67.1/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.67.1/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.67.1/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.67.1/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
+```
+
 ### From 47.x to 48.x
 
 This version moved all CRDs into a dedicated sub-chart. No new CRDs are introduced in this version.