From 680a120bf114ad6179796f2ab2e81ab4351e3176 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 23 Jan 2025 13:30:20 -0800 Subject: [PATCH] Update grafana to 10.4.14 This is the latest release of the 10.x series and we're currently stuck on 10.2.2. We can update to 11.x after we're up to date on 10.x. We bundle this change up with an update to run on Noble. The plan is we'll put the old 10.2 focal server in the emergency file, land this change, then add a new Noble server to inventory. This should allow us to easily rollback to 10.2 if Noble with Grafana 10.4.14 don't work for some reason. Basically killing two birds with one stone here and getting a safer upgrade process out of it. Depends-On: https://review.opendev.org/c/openstack/project-config/+/940276 Change-Id: Icc5e02d4b80cb1f8524ab3dde888aba7db430ffe --- playbooks/roles/grafana/templates/docker-compose.yaml.j2 | 3 +-- zuul.d/system-config-run.yaml | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/playbooks/roles/grafana/templates/docker-compose.yaml.j2 b/playbooks/roles/grafana/templates/docker-compose.yaml.j2 index 2a14ea6b0d..f8be3cc4a5 100644 --- a/playbooks/roles/grafana/templates/docker-compose.yaml.j2 +++ b/playbooks/roles/grafana/templates/docker-compose.yaml.j2 @@ -5,8 +5,7 @@ version: '2' services: grafana: restart: always - # Temporarily pin to 10.2.2 instead of latest due to selector errors - image: docker.io/grafana/grafana-oss:10.2.2 + image: docker.io/grafana/grafana-oss:10.4.14 network_mode: host environment: GF_SERVER_DOMAIN: 'grafana.opendev.org' diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml index e91c27248b..3d716193b0 100644 --- a/zuul.d/system-config-run.yaml +++ b/zuul.d/system-config-run.yaml @@ -734,7 +734,7 @@ nodes: - <<: *bridge_node_x86 - name: grafana01.opendev.org - label: ubuntu-focal + label: ubuntu-noble groups: - <<: *bastion_group vars: