Bump kube-prometheus-stack helm chart #3639

TeddyAndrieux · 2021-12-14T08:41:01Z

Component:

'monitoring'

Context:

In order to have proper grafana datasource reload we need to bump grafana helm chart

See: grafana/helm-charts#887

Summary:

Bump kube-prometheus-stack charts version to 23.2.0
The following images have also been bumped accordingly:

grafana to 8.3.1
k8s-sidecar to 1.14.2
kube-state-metrics to v2.2.4
node-exporter to v1.2.2
prometheus to v2.31.1
prometheus-config-reloader to v0.52.1
prometheus-operator to v0.52.1

And add a test to check that grafana datasource properly get added

bert-e · 2021-12-14T08:41:04Z

Hello teddyandrieux,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

bert-e · 2021-12-14T08:41:10Z

Integration data created

I have created the integration data for the additional destination branches.

this pull request will merge improvement/automatically-reload-grafana-datasources into
development/2.11
w/123.0/improvement/automatically-reload-grafana-datasources will be merged into development/123.0

The following branches will NOT be impacted:

development/2.0
development/2.1
development/2.10
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6
development/2.7
development/2.8
development/2.9

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

bert-e · 2021-12-14T08:41:12Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

Bump the kube-prometheus-stack helm chart to 23.2.0, various prometheus stack images also get bumped. ``` 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 ``` NOTE: This new helm chart deploy the grafana datasource sidecar as a container so that ConfigMap for datasource get automatically deployed and reloaded in grafana configuration Some field of the helm value file moved, we no longer pin the grafana image version in the helm value file. With this new kube-prometheus-stack helm chart version some dashboard name also get updated. Re-render the chart with the following command: ``` ./charts/render.py prometheus-operator \ charts/kube-prometheus-stack.yaml \ charts/kube-prometheus-stack/ \ --namespace metalk8s-monitoring \ --service-config grafana \ metalk8s-grafana-config \ metalk8s/addons/prometheus-operator/config/grafana.yaml \ metalk8s-monitoring \ --service-config prometheus \ metalk8s-prometheus-config \ metalk8s/addons/prometheus-operator/config/prometheus.yaml \ metalk8s-monitoring \ --service-config alertmanager \ metalk8s-alertmanager-config \ metalk8s/addons/prometheus-operator/config/alertmanager.yaml \ metalk8s-monitoring \ --service-config dex \ metalk8s-dex-config \ metalk8s/addons/dex/config/dex.yaml.j2 metalk8s-auth \ --drop-prometheus-rules charts/drop-prometheus-rules.yaml \ --patch 'PrometheusRule,metalk8s-monitoring,prometheus-operator-kubernetes-system-kubelet,spec:groups:0:rules:1:for,"5m"' \ > salt/metalk8s/addons/prometheus-operator/deployed/chart.sls ``` Extract again all Prometheus rules using: ``` ./tools/rule_extractor/rule_extractor.py \ -i <control-plane-ip> -p 8443 -t rules ``` NOTE: We also no longer care about rule order in the test

bert-e · 2021-12-14T08:42:11Z

History mismatch

Merge commit #fbe05bcc1b82f1c865b3922114819a8bebe66d80 on the integration branch
w/123.0/improvement/automatically-reload-grafana-datasources is merging a branch which is neither the current
branch improvement/automatically-reload-grafana-datasources nor the development branch
development/123.0.

It is likely due to a rebase of the branch improvement/automatically-reload-grafana-datasources and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

TeddyAndrieux · 2021-12-14T08:42:16Z

/reset

bert-e · 2021-12-14T08:42:21Z

Reset complete

I have successfully deleted this pull request's integration branches.

bert-e · 2021-12-14T08:42:28Z

Integration data created

I have created the integration data for the additional destination branches.

this pull request will merge improvement/automatically-reload-grafana-datasources into
development/2.11
w/123.0/improvement/automatically-reload-grafana-datasources will be merged into development/123.0

The following branches will NOT be impacted:

development/2.0
development/2.1
development/2.10
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6
development/2.7
development/2.8
development/2.9

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

bert-e · 2021-12-14T08:42:30Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

TeddyAndrieux · 2021-12-18T00:03:29Z

/approve

bert-e · 2021-12-18T00:03:36Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

The following options are set: approve

gdemonet

Code changes look OK, CI is green, so let's merge and I'll run a manual test before we release 2.11.0-alpha.2 (cc @JBWatenbergScality).

bert-e · 2021-12-20T09:31:25Z

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

✔️ development/2.11
✔️ development/123.0

The following branches will NOT be impacted:

development/2.0
development/2.1
development/2.10
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6
development/2.7
development/2.8
development/2.9

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

Any commit you add on the source branch will trigger a new cycle after the
current queue is merged.
Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

bert-e · 2021-12-20T11:05:40Z

I have successfully merged the changeset of this pull request
into targetted development branches:

✔️ development/2.11
✔️ development/123.0

The following branches have NOT changed:

development/2.0
development/2.1
development/2.10
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6
development/2.7
development/2.8
development/2.9

Please check the status of the associated issue None.

Goodbye teddyandrieux.

TeddyAndrieux requested a review from a team December 14, 2021 08:41

TeddyAndrieux added 2 commits December 14, 2021 09:41

tests: Add test for addition of Grafana datasource

a0ff639

TeddyAndrieux force-pushed the improvement/automatically-reload-grafana-datasources branch from 01563e4 to a0ff639 Compare December 14, 2021 08:42

gdemonet approved these changes Dec 20, 2021

View reviewed changes

alexandre-allard approved these changes Dec 20, 2021

View reviewed changes

bert-e merged commit 33d04fe into development/2.11 Dec 20, 2021

bert-e deleted the improvement/automatically-reload-grafana-datasources branch December 20, 2021 11:05

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bump kube-prometheus-stack helm chart #3639

Bump kube-prometheus-stack helm chart #3639

TeddyAndrieux commented Dec 14, 2021

bert-e commented Dec 14, 2021

bert-e commented Dec 14, 2021

bert-e commented Dec 14, 2021

bert-e commented Dec 14, 2021

TeddyAndrieux commented Dec 14, 2021

bert-e commented Dec 14, 2021

bert-e commented Dec 14, 2021

bert-e commented Dec 14, 2021

TeddyAndrieux commented Dec 18, 2021

bert-e commented Dec 18, 2021

gdemonet left a comment

bert-e commented Dec 20, 2021

bert-e commented Dec 20, 2021

Bump kube-prometheus-stack helm chart #3639

Bump kube-prometheus-stack helm chart #3639

Conversation

TeddyAndrieux commented Dec 14, 2021

bert-e commented Dec 14, 2021

Hello teddyandrieux,

bert-e commented Dec 14, 2021

Integration data created

bert-e commented Dec 14, 2021

Waiting for approval

bert-e commented Dec 14, 2021

History mismatch

TeddyAndrieux commented Dec 14, 2021

bert-e commented Dec 14, 2021

Reset complete

bert-e commented Dec 14, 2021

Integration data created

bert-e commented Dec 14, 2021

Waiting for approval

TeddyAndrieux commented Dec 18, 2021

bert-e commented Dec 18, 2021

Waiting for approval

gdemonet left a comment

Choose a reason for hiding this comment

bert-e commented Dec 20, 2021

In the queue

bert-e commented Dec 20, 2021