Skip to content

Update to Prometheus v3 #1630

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 30, 2025
Merged

Update to Prometheus v3 #1630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
928fcc7
Rename prometheus-v2-server to prometheus-server
MoteHue Apr 29, 2025
6c00184
Whitelist Prometheus CVEs
MoteHue Apr 30, 2025
595fd25
Bump ansible-core version in lint jobs
Alex-Welsh Apr 23, 2025
898cfc1
Bump Prometheus container images to v3
MoteHue Apr 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/stackhpc-pull-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ jobs:
matrix:
include:
# NOTE(upgrade): Keep these in sync with Kayobe's supported Ansible and Python versions (see release notes).
- ansible: "2.17"
- ansible: "2.18"
python: "3.12"
- ansible: "2.16"
- ansible: "2.17"
python: "3.10"
name: Ansible ${{ matrix.ansible }} lint with Python ${{ matrix.python }}
if: github.repository == 'stackhpc/stackhpc-kayobe-config'
Expand Down
3 changes: 3 additions & 0 deletions etc/kayobe/kolla-image-tags.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,6 @@ kolla_image_tags:
ovn_sb_db_relay:
rocky-9: master-rocky-9-20250305T111730
ubuntu-noble: master-ubuntu-noble-20250305T111730
prometheus:
rocky-9: master-rocky-9-20250430T112026
ubuntu-noble: master-ubuntu-noble-20250430T112026
2 changes: 1 addition & 1 deletion etc/kayobe/pulp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ stackhpc_pulp_images_kolla:
- prometheus-mysqld-exporter
- prometheus-node-exporter
- prometheus-openstack-exporter
- prometheus-v2-server
- prometheus-server
- proxysql
- rabbitmq
- redis
Expand Down
18 changes: 18 additions & 0 deletions etc/kayobe/trivy/allowed-vulnerabilities.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,27 @@
# - CVE-2023-31047
fluentd_allowed_vulnerabilities:
- CVE-2024-27280

grafana_allowed_vulnerabilities:
- CVE-2024-8986

prometheus_blackbox_exporter_allowed_vulnerabilities:
- CVE-2024-45337
prometheus_memcached_exporter_allowed_vulnerabilities:
- CVE-2024-45337
prometheus_mysqld_exporter_allowed_vulnerabilities:
- CVE-2024-45337
prometheus_elasticsearch_exporter_allowed_vulnerabilities:
- CVE-2024-45337
prometheus_node_exporter_allowed_vulnerabilities:
- CVE-2024-45337
prometheus_openstack_exporter_allowed_vulnerabilities:
- CVE-2024-45337
prometheus_libvirt_exporter_allowed_vulnerabilities:
- CVE-2024-45337
prometheus_cadvisor_allowed_vulnerabilities:
- CVE-2024-41110
- CVE-2024-45337

###############################################################################
# Dummy variable to allow Ansible to accept this file.
Expand Down
4 changes: 4 additions & 0 deletions releasenotes/notes/prometheus-v3-68fd3d9d6cf3e420.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
features:
- |
Bumps the Prometheus container images to bring in Prometheus v3.
2 changes: 1 addition & 1 deletion tools/kolla-images.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"ovn-sb-db-server": [
"ovn_sb_db",
],
"prometheus-v2-server": [
"prometheus-server": [
"prometheus_server",
],
}
Expand Down
Loading