From 4a3cead9f5919c0522f8b56031c59a31df510b67 Mon Sep 17 00:00:00 2001 From: Matthias Runge Date: Tue, 8 Mar 2022 16:24:18 +0100 Subject: [PATCH] Update prometheus and alertmanager containers and also add the pushgateway container for use with ceilometer. Change-Id: I201c693332c78b6d83e7f5beb5becccd38919197 --- container-images/container_image_prepare_defaults.yaml | 10 +++++++--- container-images/tripleo_containers.yaml | 10 +++++++--- container-images/tripleo_containers.yaml.j2 | 7 +++++++ tripleo_common/tests/image/test_kolla_builder.py | 6 ++++++ 4 files changed, 27 insertions(+), 6 deletions(-) diff --git a/container-images/container_image_prepare_defaults.yaml b/container-images/container_image_prepare_defaults.yaml index 02473cbc4..87dd784b1 100644 --- a/container-images/container_image_prepare_defaults.yaml +++ b/container-images/container_image_prepare_defaults.yaml @@ -34,15 +34,15 @@ parameter_defaults: ceph_prometheus_namespace: quay.io/prometheus ceph_prometheus_image: prometheus - ceph_prometheus_tag: v2.18.1 + ceph_prometheus_tag: v2.33.4 ceph_alertmanager_namespace: quay.io/prometheus ceph_alertmanager_image: alertmanager - ceph_alertmanager_tag: v0.20.0 + ceph_alertmanager_tag: v0.23.0 ceph_node_exporter_namespace: quay.io/prometheus ceph_node_exporter_image: node-exporter - ceph_node_exporter_tag: v0.18.1 + ceph_node_exporter_tag: v1.3.1 ceph_grafana_namespace: quay.io/ceph ceph_grafana_image: ceph-grafana @@ -55,3 +55,7 @@ parameter_defaults: ceph_keepalived_namespace: quay.io/ceph ceph_keepalived_image: keepalived ceph_keepalived_tag: 2.1.5 + + pushgateway_namespace: quay.io/prometheus + pushgateway_image: pushgateway + pushgateway_tag: v1.4.2 diff --git a/container-images/tripleo_containers.yaml b/container-images/tripleo_containers.yaml index 7706cd907..756d9415c 100644 --- a/container-images/tripleo_containers.yaml +++ b/container-images/tripleo_containers.yaml @@ -21,6 +21,8 @@ container_images: image_source: tripleo - imagename: quay.io/tripleomaster/openstack-ceilometer-ipmi:current-tripleo image_source: tripleo +- imagename: quay.io/prometheus/pushgateway:v1.4.2 + image_source: prom - imagename: quay.io/tripleomaster/openstack-cinder-api:current-tripleo image_source: tripleo - imagename: quay.io/tripleomaster/openstack-cinder-backup:current-tripleo @@ -169,11 +171,13 @@ container_images: image_source: tripleo - imagename: quay.io/ceph/daemon:v6.0.6-stable-6.0-pacific-centos-8-x86_64 image_source: ceph -- imagename: quay.io/prometheus/prometheus:v2.18.1 +- imagename: quay.io/prometheus/prometheus:v2.33.4 image_source: prom -- imagename: quay.io/prometheus/alertmanager:v0.20.0 +- imagename: quay.io/prometheus/alertmanager:v0.23.0 image_source: prom -- imagename: quay.io/prometheus/node-exporter:v0.18.1 +- imagename: quay.io/prometheus/node-exporter:v1.3.1 + image_source: prom +- imagename: quay.io/prometheus/pushgateway:v1.4.2 image_source: prom - imagename: quay.io/ceph/ceph-grafana:6.7.4 image_source: grafana diff --git a/container-images/tripleo_containers.yaml.j2 b/container-images/tripleo_containers.yaml.j2 index 73ec1803f..f800a197d 100644 --- a/container-images/tripleo_containers.yaml.j2 +++ b/container-images/tripleo_containers.yaml.j2 @@ -102,6 +102,13 @@ container_images_template: - OS::TripleO::Services::CeilometerAgentIpmi - OS::TripleO::Services::UndercloudCeilometerAgentIpmi +- imagename: "{{pushgateway_namespace}}/{{pushgateway_image}}:{{pushgateway_tag}}" + image_source: prom + params: + - ContainerCeilometerPushgatewayImage + services: + - OS::Tripleo::Services::CeilometerPushgateway + - imagename: "{{namespace}}/{{name_prefix}}cinder-api{{name_suffix}}:{{tag}}" image_source: tripleo params: diff --git a/tripleo_common/tests/image/test_kolla_builder.py b/tripleo_common/tests/image/test_kolla_builder.py index 850e51e67..5b5c25d89 100644 --- a/tripleo_common/tests/image/test_kolla_builder.py +++ b/tripleo_common/tests/image/test_kolla_builder.py @@ -270,6 +270,9 @@ class TestKollaImageBuilderTemplate(base.TestCase): 'ceph_keepalived_namespace', 'ceph_keepalived_image', 'ceph_keepalived_tag', + 'pushgateway_namespace', + 'pushgateway_image', + 'pushgateway_tag', ): if key in kb.CONTAINER_IMAGES_DEFAULTS: expected[key] = kb.CONTAINER_IMAGES_DEFAULTS[key] @@ -309,6 +312,9 @@ class TestKollaImageBuilderTemplate(base.TestCase): 'ceph_keepalived_namespace', 'ceph_keepalived_image', 'ceph_keepalived_tag', + 'pushgateway_namespace', + 'pushgateway_image', + 'pushgateway_tag', ): if key in kb.CONTAINER_IMAGES_DEFAULTS: expected[key] = kb.CONTAINER_IMAGES_DEFAULTS[key]