grafana: update container tag to 6.7.4

This update the grafana container tag to 6.7.4.
The RHCS version is now based on the RHCS 5 container image which is
also based on 6.7.4.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index 77422e96933ee977426faf989c0550220b6ee386..789c4ef73af69f0b35d4839bd98b81deafdd7ebe 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -674,7 +674,7 @@ dummy:
 #grafana_key: ''
 # When using https, please fill with a hostname for which grafana_crt is valid.
 #grafana_server_fqdn: ''
-#grafana_container_image: "docker.io/grafana/grafana:5.4.3"
+#grafana_container_image: "docker.io/grafana/grafana:6.7.4"
 #grafana_container_cpu_period: 100000
 #grafana_container_cpu_cores: 2
 # container_memory is in GB

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index 6d82d1e449d60d994e9b0de2a0d3f954307726e6..8337e0e53ce6b701db4caf76c088acde35a03be3 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -674,7 +674,7 @@ node_exporter_container_image: registry.redhat.io/openshift4/ose-prometheus-node
 #grafana_key: ''
 # When using https, please fill with a hostname for which grafana_crt is valid.
 #grafana_server_fqdn: ''
-grafana_container_image: registry.redhat.io/rhceph/rhceph-4-dashboard-rhel8:4
+grafana_container_image: registry.redhat.io/rhceph/rhceph-5-dashboard-rhel8:5
 #grafana_container_cpu_period: 100000
 #grafana_container_cpu_cores: 2
 # container_memory is in GB

diff --git a/rhcs_edits.txt b/rhcs_edits.txt
index a0844c792ab61805902b3ad891c62e315b1c9d7f..56f484c031203787da78ef9874c28bc812cda93c 100644 (file)
--- a/rhcs_edits.txt
+++ b/rhcs_edits.txt
@@ -8,7 +8,7 @@ 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
-grafana_container_image: registry.redhat.io/rhceph/rhceph-4-dashboard-rhel8:4
+grafana_container_image: registry.redhat.io/rhceph/rhceph-5-dashboard-rhel8:5
 prometheus_container_image: registry.redhat.io/openshift4/ose-prometheus:4.1
 alertmanager_container_image: registry.redhat.io/openshift4/ose-prometheus-alertmanager:4.1
 # END OF FILE, DO NOT TOUCH ME!

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index 7427e489b13a07a9288dc9676a3887cb1b3d21bb..9552712397fdfe973d720b41cde956cd1da2ab73 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -666,7 +666,7 @@ grafana_crt: ''
 grafana_key: ''
 # When using https, please fill with a hostname for which grafana_crt is valid.
 grafana_server_fqdn: ''
-grafana_container_image: "docker.io/grafana/grafana:5.4.3"
+grafana_container_image: "docker.io/grafana/grafana:6.7.4"
 grafana_container_cpu_period: 100000
 grafana_container_cpu_cores: 2
 # container_memory is in GB

diff --git a/tests/functional/all_daemons/container/group_vars/all b/tests/functional/all_daemons/container/group_vars/all
index 9becdfcfc8082c609b5535fbb3b16d8c4e857099..d16abaf27b02bd74d060ffa9ab48fac6cf26cfa7 100644 (file)
--- a/tests/functional/all_daemons/container/group_vars/all
+++ b/tests/functional/all_daemons/container/group_vars/all
@@ -40,4 +40,4 @@ ceph_docker_image_tag: latest-master
 node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0"
 prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2"
 alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2"
-grafana_container_image: "quay.io/app-sre/grafana:5.4.3"
\ No newline at end of file
+grafana_container_image: "quay.io/app-sre/grafana:6.7.4"
\ No newline at end of file

diff --git a/tests/functional/all_daemons/group_vars/all b/tests/functional/all_daemons/group_vars/all
index b4a71845d45e3d2827efe5c4e21afb3ad52d09b5..15943304ddf2818969a295fe7d26fe9ebfe74cc8 100644 (file)
--- a/tests/functional/all_daemons/group_vars/all
+++ b/tests/functional/all_daemons/group_vars/all
@@ -32,5 +32,5 @@ ceph_docker_registry: quay.ceph.io
 node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0"
 prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2"
 alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2"
-grafana_container_image: "quay.io/app-sre/grafana:5.4.3"
+grafana_container_image: "quay.io/app-sre/grafana:6.7.4"
 grafana_server_group_name: ceph_monitoring

diff --git a/tests/functional/collocation/container/group_vars/all b/tests/functional/collocation/container/group_vars/all
index eb975d34e68e6916f515199ccaa8d67c7f21c126..1bdc042a80dd8628d3216210f28c24f0111e0b8b 100644 (file)
--- a/tests/functional/collocation/container/group_vars/all
+++ b/tests/functional/collocation/container/group_vars/all
@@ -29,4 +29,4 @@ ceph_docker_image_tag: latest-master
 node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0"
 prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2"
 alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2"
-grafana_container_image: "quay.io/app-sre/grafana:5.4.3"
\ No newline at end of file
+grafana_container_image: "quay.io/app-sre/grafana:6.7.4"
\ No newline at end of file

diff --git a/tests/functional/collocation/group_vars/all b/tests/functional/collocation/group_vars/all
index e7a6e4ea385bc237c95312464277a43fc7fb7ac2..440c0b781560d8c7f42886b190011f7d20265e48 100644 (file)
--- a/tests/functional/collocation/group_vars/all
+++ b/tests/functional/collocation/group_vars/all
@@ -24,4 +24,4 @@ ceph_docker_registry: quay.ceph.io
 node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0"
 prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2"
 alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2"
-grafana_container_image: "quay.io/app-sre/grafana:5.4.3"
+grafana_container_image: "quay.io/app-sre/grafana:6.7.4"

diff --git a/tests/functional/docker2podman/group_vars/all b/tests/functional/docker2podman/group_vars/all
index d78e5ae18785dfd2437187b52cdf88a91778b87b..08f2a466b783d0eeebdaeb46f59d8fba39378b4f 100644 (file)
--- a/tests/functional/docker2podman/group_vars/all
+++ b/tests/functional/docker2podman/group_vars/all
@@ -39,4 +39,4 @@ ceph_docker_image_tag: latest-master
 node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0"
 prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2"
 alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2"
-grafana_container_image: "quay.io/app-sre/grafana:5.4.3"
\ No newline at end of file
+grafana_container_image: "quay.io/app-sre/grafana:6.7.4"
\ No newline at end of file

diff --git a/tests/functional/podman/group_vars/all b/tests/functional/podman/group_vars/all
index fe466ae16d55e94b838abb40030228f1c88b74db..ac5083b88932cd4b97d63e1a880074645c525691 100644 (file)
--- a/tests/functional/podman/group_vars/all
+++ b/tests/functional/podman/group_vars/all
@@ -38,4 +38,4 @@ ceph_docker_image_tag: latest-master
 node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0"
 prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2"
 alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2"
-grafana_container_image: "quay.io/app-sre/grafana:5.4.3"
\ No newline at end of file
+grafana_container_image: "quay.io/app-sre/grafana:6.7.4"
\ No newline at end of file