Update prometheus and alertmanager containers
and also add the pushgateway container for use with ceilometer. Change-Id: I201c693332c78b6d83e7f5beb5becccd38919197
This commit is contained in:
parent
42f4706325
commit
4a3cead9f5
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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]
|
||||
|
|
Loading…
Reference in New Issue