defaults: update rhcs dashboard images versions

The current dashboard images deployed have a bad health index.
Updating to a newer version fixes this issue.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1925350
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit a16ae693d8e1d3502acf92004179d84c6b60c873)

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index 1134e010f8b349ab7516b05097621f9d005b55c8..1a812d6b81a4c66eeb00e4fb4b72c8ff84c07281 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -755,7 +755,7 @@ ceph_docker_registry_auth: true
 #dashboard_rgw_api_admin_resource: ''
 #dashboard_rgw_api_no_ssl_verify: False
 #dashboard_frontend_vip: ''
-node_exporter_container_image: registry.redhat.io/openshift4/ose-prometheus-node-exporter:v4.1
+node_exporter_container_image: registry.redhat.io/openshift4/ose-prometheus-node-exporter:v4.6
 #node_exporter_port: 9100
 #grafana_admin_user: admin
 # This variable must be set with a strong custom password when dashboard_enabled is True
@@ -791,7 +791,7 @@ grafana_container_image: registry.redhat.io/rhceph/rhceph-4-dashboard-rhel8:4
 #  - grafana-piechart-panel
 #grafana_allow_embedding: True
 #grafana_port: 3000
-prometheus_container_image: registry.redhat.io/openshift4/ose-prometheus:4.1
+prometheus_container_image: registry.redhat.io/openshift4/ose-prometheus:v4.6
 #prometheus_container_cpu_period: 100000
 #prometheus_container_cpu_cores: 2
 # container_memory is in GB
@@ -800,7 +800,7 @@ prometheus_container_image: registry.redhat.io/openshift4/ose-prometheus:4.1
 #prometheus_conf_dir: /etc/prometheus
 #prometheus_user_id: '65534'  # This is the UID used by the prom/prometheus container image
 #prometheus_port: 9092
-alertmanager_container_image: registry.redhat.io/openshift4/ose-prometheus-alertmanager:4.1
+alertmanager_container_image: registry.redhat.io/openshift4/ose-prometheus-alertmanager:v4.6
 #alertmanager_container_cpu_period: 100000
 #alertmanager_container_cpu_cores: 2
 # container_memory is in GB

diff --git a/rhcs_edits.txt b/rhcs_edits.txt
index 8e77019523e7aeb018c8a8ce8cc36ff735272981..ce95535ccd69bbe3790502094535e2ef53087291 100644 (file)
--- a/rhcs_edits.txt
+++ b/rhcs_edits.txt
@@ -6,8 +6,8 @@ ceph_docker_image: "rhceph/rhceph-4-rhel8"
 ceph_docker_image_tag: "latest"
 ceph_docker_registry: "registry.redhat.io"
 ceph_docker_registry_auth: true
-node_exporter_container_image: registry.redhat.io/openshift4/ose-prometheus-node-exporter:v4.1
+node_exporter_container_image: registry.redhat.io/openshift4/ose-prometheus-node-exporter:v4.6
 grafana_container_image: registry.redhat.io/rhceph/rhceph-4-dashboard-rhel8:4
-prometheus_container_image: registry.redhat.io/openshift4/ose-prometheus:4.1
-alertmanager_container_image: registry.redhat.io/openshift4/ose-prometheus-alertmanager:4.1
+prometheus_container_image: registry.redhat.io/openshift4/ose-prometheus:v4.6
+alertmanager_container_image: registry.redhat.io/openshift4/ose-prometheus-alertmanager:v4.6
 # END OF FILE, DO NOT TOUCH ME!