From bbcad9609ceee8c71ed90e653a2e24dc9c256818 Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Tue, 19 Jan 2021 14:24:22 -0500 Subject: [PATCH] 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 --- group_vars/all.yml.sample | 2 +- group_vars/rhcs.yml.sample | 2 +- rhcs_edits.txt | 2 +- roles/ceph-defaults/defaults/main.yml | 2 +- tests/functional/all_daemons/container/group_vars/all | 2 +- tests/functional/all_daemons/group_vars/all | 2 +- tests/functional/collocation/container/group_vars/all | 2 +- tests/functional/collocation/group_vars/all | 2 +- tests/functional/docker2podman/group_vars/all | 2 +- tests/functional/podman/group_vars/all | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index 77422e969..789c4ef73 100644 --- 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 6d82d1e44..8337e0e53 100644 --- 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 a0844c792..56f484c03 100644 --- 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 7427e489b..955271239 100644 --- 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 9becdfcfc..d16abaf27 100644 --- 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 b4a71845d..15943304d 100644 --- 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 eb975d34e..1bdc042a8 100644 --- 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 e7a6e4ea3..440c0b781 100644 --- 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 d78e5ae18..08f2a466b 100644 --- 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 fe466ae16..ac5083b88 100644 --- 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 -- 2.39.5