Update prometheus from 2.38.0 to 2.43.0+stringlabels
What does this MR do?
- Bump bundles Prometheus to 2.43.0+stringlabels.
- About the
stringlabels
optimization: https://prometheus.io/blog/2023/03/21/stringlabel/ - Remove the
gzip
patch, as its merged upstream (MR). - Remove the patch for CVE-2021-29622, which is fixed upstream and is not being applied since !5849 (merged).
- Add licenses for Prometheus dependencies which could not be detected automatically.
-
https://gitlab.com/gitlab-org/omnibus-gitlab/-/jobs/4049448765
github.com/hashicorp/nomad/api - v0.0.0-20230308192510-48e7d70fcd4b - unknown - Unknown license github.com/ovh/go-ovh - v1.3.0 - unknown - Unknown license
-
https://gitlab.com/gitlab-org/omnibus-gitlab/-/jobs/4049448765
Related issues
Closes #7655 (closed)
Checklist
See Definition of done.
For anything in this list which will not be completed, please provide a reason in the MR discussion
Test Plan
Check Prometheus version
docker run --rm registry.gitlab.com/gitlab-org/omnibus-gitlab/gitlab-ee:15.10.1-rfbranch.826444658.055966d5-0 /opt/gitlab/embedded/bin/prometheus --version
prometheus, version 2.43.0+stringlabels (branch: master, revision: d8ec24a7c76ab90a2332893fe12fa34e2d6e5570)
build user: GitLab-Omnibus
build date:
go version: go1.18.7
platform: linux/amd64
tags: netgo,builtinassets
Upgrade path
- Run nightly (docker/container image) build
- Upgrade to p(docker/container image) build from last pipeline
- Verify pre- and post-upgrade Prometheus data exists and can be queried
example docker compose
version: '3.6'
volumes:
conf:
logs:
data:
services:
ee-test:
# image: 'gitlab/gitlab-ee:nightly'
image: registry.gitlab.com/gitlab-org/omnibus-gitlab/gitlab-ee:15.10.1-rfbranch.826444658.055966d5-0
environment:
GITLAB_OMNIBUS_CONFIG: |
prometheus['listen_address'] = '0.0.0.0:10100'
shm_size: '256m'
ports:
- 9990:80
- 10100:10100
volumes:
- conf:/etc/gitlab
- logs:/var/opt/gitlab
- data:/var/opt/gitlab
Required
-
Merge Request Title, and Description are up to date, accurate, and descriptive -
MR targeting the appropriate branch -
MR has a green pipeline on GitLab.com -
Pipeline is green on dev.gitlab.org if the change is touching anything besides documentation or internal cookbooks -
trigger-package
has a green pipeline running against latest commit
Expected (please provide an explanation if not completing)
-
Test plan indicating conditions for success has been posted and passes -
Documentation created/updated -
Tests added -
Integration tests added to GitLab QA -
Equivalent MR/issue for the GitLab Chart opened
Edited by Clemens Beck