From b2a2f4aebaca80d301200ff3a524c125973ef3e6 Mon Sep 17 00:00:00 2001 From: Jakub Stejskal Date: Wed, 27 Mar 2024 12:07:50 +0100 Subject: [PATCH] Bump Grafana to 10.4.1 Signed-off-by: Jakub Stejskal --- .../templates/acm/08-extend-default-metrics-allowlist.yaml.j2 | 4 ++-- .../roles/automation-hub/templates/grafana/grafana.yaml.j2 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/install/roles/automation-hub/templates/acm/08-extend-default-metrics-allowlist.yaml.j2 b/install/roles/automation-hub/templates/acm/08-extend-default-metrics-allowlist.yaml.j2 index 297188d4..14dadd40 100644 --- a/install/roles/automation-hub/templates/acm/08-extend-default-metrics-allowlist.yaml.j2 +++ b/install/roles/automation-hub/templates/acm/08-extend-default-metrics-allowlist.yaml.j2 @@ -11,12 +11,12 @@ data: - container_cpu_usage_seconds_total - container_memory_usage_bytes matches: - - __name__=~".*(kafka|strimzi|jvm|argo|tealc|thor|strimzi-e2e|odh-e2e).*" + - __name__=~".*(kafka|zookeeper|strimzi|jvm|argo|loki|tealc|thor|strimzi-e2e|odh-e2e).*" uwl_metrics_list.yaml: | names: - container_memory_usage_bytes - container_cpu_usage_seconds_total - process_open_fds matches: - - __name__=~".*(kafka|strimzi|jvm|argo|debezium|tealc|thor|strimzi-e2e|odh-e2e).*" + - __name__=~".*(kafka|zookeeper|strimzi|jvm|argo|loki|debezium|tealc|thor|strimzi-e2e|odh-e2e).*" - container=~".*(dmt|kafka|strimzi).*" diff --git a/install/roles/automation-hub/templates/grafana/grafana.yaml.j2 b/install/roles/automation-hub/templates/grafana/grafana.yaml.j2 index ca2c1748..03cb32fa 100644 --- a/install/roles/automation-hub/templates/grafana/grafana.yaml.j2 +++ b/install/roles/automation-hub/templates/grafana/grafana.yaml.j2 @@ -95,11 +95,11 @@ spec: name: ocp-injected-certs containers: - name: grafana - image: docker.io/grafana/grafana:9.4.7 + image: docker.io/grafana/grafana:10.4.1 resources: limits: cpu: 1000m - memory: 800Mi + memory: 4000Mi requests: cpu: 100m memory: 200Mi