From 3575d7d8bd14feef50e3e1222557a6a07158fdd4 Mon Sep 17 00:00:00 2001 From: Dawud Date: Fri, 13 Dec 2024 19:13:08 +0000 Subject: [PATCH 1/3] Remove deprecated AngularJS plugins from Grafana Change-Id: Id81ce23fed7c19211aa8b15abce185d990be8389 --- docker/grafana/Dockerfile.j2 | 2 +- .../grafana-remove-angular-plugins-4c9ea2087c5c2bf2.yaml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/grafana-remove-angular-plugins-4c9ea2087c5c2bf2.yaml diff --git a/docker/grafana/Dockerfile.j2 b/docker/grafana/Dockerfile.j2 index a74567a9ed..8574aadc8e 100644 --- a/docker/grafana/Dockerfile.j2 +++ b/docker/grafana/Dockerfile.j2 @@ -22,7 +22,7 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start {% block grafana_plugins_install %} -{% set grafana_default_plugins = ['gnocchixyz-gnocchi-datasource', 'grafana-opensearch-datasource'] %} +{% set grafana_default_plugins = ['grafana-opensearch-datasource'] %} {% set grafana_plugins = grafana_default_plugins | customizable("plugins") %} {% if grafana_plugins | length > 0 %} diff --git a/releasenotes/notes/grafana-remove-angular-plugins-4c9ea2087c5c2bf2.yaml b/releasenotes/notes/grafana-remove-angular-plugins-4c9ea2087c5c2bf2.yaml new file mode 100644 index 0000000000..4bcfa85114 --- /dev/null +++ b/releasenotes/notes/grafana-remove-angular-plugins-4c9ea2087c5c2bf2.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Remove the gnocchixyz-gnocchi-datasource plugin from grafana due to angular + plugins being deprecated From bd42e9d435ac219630e9196bc1a5c6c384b7cc3a Mon Sep 17 00:00:00 2001 From: Jack Hodgkiss Date: Tue, 15 Apr 2025 13:17:49 +0100 Subject: [PATCH 2/3] Update prometheus alertmanager to newest available version * prometheus-alertmanager: 0.28.0 -> 0.28.1 Change-Id: Iec5b936ae77f2d8298803fbfe50f55b2ed69f4b3 --- kolla/common/sources.py | 6 +++--- .../notes/update-prometheus-services-dd195876e162251c.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kolla/common/sources.py b/kolla/common/sources.py index 2cbfbf8873..16ee4d0b73 100644 --- a/kolla/common/sources.py +++ b/kolla/common/sources.py @@ -274,11 +274,11 @@ 'location': ('$tarballs_base/openstack/placement/' 'placement-${openstack_branch}.tar.gz')}, 'prometheus-alertmanager': { - 'version': '0.28.0', + 'version': '0.28.1', 'type': 'url', 'sha256': { - 'amd64': '6b5a38d32cddef23aad4435a58c1ea39dc0a07b4b155029c601d200720da9ca4', # noqa: E501 - 'arm64': '70d7c85a364d5d5d20e36dfff6886fbc5e105822642d5603cc2f38340dd2f7ee'}, # noqa: E501 + 'amd64': '5ac7ab5e4b8ee5ce4d8fb0988f9cb275efcc3f181b4b408179fafee121693311', # noqa: E501 + 'arm64': 'd8832540e5b9f613d2fd759e31d603173b9c61cc7bb5e3bc7ae2f12038b1ce4f'}, # noqa: E501 'location': ('https://github.com/' 'prometheus/alertmanager/' 'releases/download/v${version}/' diff --git a/releasenotes/notes/update-prometheus-services-dd195876e162251c.yaml b/releasenotes/notes/update-prometheus-services-dd195876e162251c.yaml index df11420f90..4e1ee51ed7 100644 --- a/releasenotes/notes/update-prometheus-services-dd195876e162251c.yaml +++ b/releasenotes/notes/update-prometheus-services-dd195876e162251c.yaml @@ -3,7 +3,7 @@ upgrade: - | Update Prometheus services to latest releases: - * prometheus-alertmanager: 0.27.0 -> 0.28.0 + * prometheus-alertmanager: 0.28.0 -> 0.28.1 * prometheus-blackbox-exporter: 0.24.0 -> 0.25.0 * prometheus-cadvisor: 0.49.1 -> 0.49.2 * prometheus-elasticsearch-exporter: 1.7.0 -> 1.8.0 From ac79bc9b67823eab6d6e9a027a65261096cfcc19 Mon Sep 17 00:00:00 2001 From: Piotr Parczewski Date: Wed, 26 Mar 2025 15:34:21 +0100 Subject: [PATCH 3/3] Upgrade Prometheus to v3 Needed-by: https://review.opendev.org/c/openstack/kolla-ansible/+/945611 Change-Id: I4113976db743d3c5c4ff62f2876e224888f05a36 --- .../Dockerfile.j2 | 8 ++++---- kolla/common/sources.py | 8 ++++---- .../upgrade-prometheus-to-v3-d305280498e0fcaf.yaml | 11 +++++++++++ 3 files changed, 19 insertions(+), 8 deletions(-) rename docker/prometheus/{prometheus-v2-server => prometheus-server}/Dockerfile.j2 (71%) create mode 100644 releasenotes/notes/upgrade-prometheus-to-v3-d305280498e0fcaf.yaml diff --git a/docker/prometheus/prometheus-v2-server/Dockerfile.j2 b/docker/prometheus/prometheus-server/Dockerfile.j2 similarity index 71% rename from docker/prometheus/prometheus-v2-server/Dockerfile.j2 rename to docker/prometheus/prometheus-server/Dockerfile.j2 index e9f47f5c1d..bcbc3021b1 100644 --- a/docker/prometheus/prometheus-v2-server/Dockerfile.j2 +++ b/docker/prometheus/prometheus-server/Dockerfile.j2 @@ -3,12 +3,12 @@ FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} -{% block prometheus_v2_server_header %}{% endblock %} +{% block prometheus_server_header %}{% endblock %} {% import "macros.j2" as macros with context %} -{% block prometheus_v2_server_install %} -ADD prometheus-v2-server-archive /prometheus-server-source +{% block prometheus_server_install %} +ADD prometheus-server-archive /prometheus-server-source RUN ln -s /prometheus-server-source/* prometheus-server \ && mkdir -p /opt/prometheus \ @@ -18,7 +18,7 @@ RUN ln -s /prometheus-server-source/* prometheus-server \ {{ macros.kolla_patch_sources() }} -{% block prometheus_v2_server_footer %}{% endblock %} +{% block prometheus_server_footer %}{% endblock %} {% block footer %}{% endblock %} USER prometheus diff --git a/kolla/common/sources.py b/kolla/common/sources.py index 2cbfbf8873..1b97167fdd 100644 --- a/kolla/common/sources.py +++ b/kolla/common/sources.py @@ -394,12 +394,12 @@ 'releases/download/v${version}/' 'ovn-exporter' '_${version}_linux_${debian_arch}.tar.gz')}, - 'prometheus-v2-server': { - 'version': '2.55.1', + 'prometheus-server': { + 'version': '3.2.1', 'type': 'url', 'sha256': { - 'amd64': '19700bdd42ec31ee162e4079ebda4cd0a44432df4daa637141bdbea4b1cd8927', # noqa: E501 - 'arm64': 'af43368bc6379c3c8bd5ac0b82208060bba22267bf01ad3ab5df56ad5725bf88'}, # noqa: E501 + 'amd64': 'a622e3007c9109a7f470e1433cbd29bf392596715cf7eea8b81b37fa9d26b7be', # noqa: E501 + 'arm64': 'f2dec3178f1181c1b795b275750d056e71ead13f7fbfe08b76834c4ec20b748e'}, # noqa: E501 'location': ('https://github.com/' 'prometheus/prometheus/' 'releases/download/v${version}/' diff --git a/releasenotes/notes/upgrade-prometheus-to-v3-d305280498e0fcaf.yaml b/releasenotes/notes/upgrade-prometheus-to-v3-d305280498e0fcaf.yaml new file mode 100644 index 0000000000..2550ab095d --- /dev/null +++ b/releasenotes/notes/upgrade-prometheus-to-v3-d305280498e0fcaf.yaml @@ -0,0 +1,11 @@ +--- +features: + - | + Updates Prometheus version to v3.2.1. Also, switches back to + the ``prometheus-server`` generic image name by removing the ``v2`` part. +upgrade: + - | + Prometheus will be upgraded from v2 to v3 - which introduces minor breaking + changes. Make sure there's version 2.5.5 or later running before attempting + an upgrade. Read the official migration guide for more details: + https://prometheus.io/docs/prometheus/3.0/migration/.