From aad45e16557c40c6066f919f703dda8fadf08228 Mon Sep 17 00:00:00 2001 From: Mauro Gattari Date: Tue, 21 Mar 2023 09:01:58 +0100 Subject: [PATCH 1/2] upd: upgrade grafana to 9.4.3 (CLOUD-1663) --- README.md | 2 +- defaults/main.yml | 2 +- tasks/monitoring.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a83ca5f..6337ca9 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ Variable for the monitoring service: - `grafana_admin_password`: string - `grafana_client_id`: string (used for the IAM login) - `grafana_client_secret`: string (used for the IAM login) -- `grafana_image`: string (default: `"dodasts/monitoring-grafana:v1.0.3-monitoring"`) +- `grafana_image`: string (default: `"dodasts/monitoring-grafana:v1.0.8-monitoring"`) - `cvmfs_repos`: string, list of the cvmfs repo to mount (default: `""`) ### vars diff --git a/defaults/main.yml b/defaults/main.yml index 15d3822..08db072 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -51,6 +51,6 @@ grafana_admin_user: "" grafana_admin_password: "" grafana_client_id: "CLIENT_ID" grafana_client_secret: "CLIENT_SECRET" -grafana_image: "dodasts/monitoring-grafana:v1.0.3-monitoring" +grafana_image: "dodasts/monitoring-grafana:v1.0.8-monitoring" # cvmfs cvmfs_repos: "" diff --git a/tasks/monitoring.yml b/tasks/monitoring.yml index 45c1bbe..e3b7314 100644 --- a/tasks/monitoring.yml +++ b/tasks/monitoring.yml @@ -4,7 +4,7 @@ repo: "https://github.com/DODAS-TS/ansible-role-monitoring.git" dest: /etc/ansible/roles/ansible-role-monitoring force: true - version: v1.2.1 + version: v1.2.3 # ---------- Execute monitoring role ---------- - name: Execute monitoring role From 95beec7058ab2c21b4315cb4fcd4595dedf479ab Mon Sep 17 00:00:00 2001 From: mginfn <116359611+mginfn@users.noreply.github.com> Date: Tue, 21 Mar 2023 09:11:05 +0100 Subject: [PATCH 2/2] Set ansible-role-monitoring version: v1.2.3 --- tasks/monitoring.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tasks/monitoring.yml b/tasks/monitoring.yml index 76cb606..0de75bb 100644 --- a/tasks/monitoring.yml +++ b/tasks/monitoring.yml @@ -4,11 +4,7 @@ repo: "https://github.com/DODAS-TS/ansible-role-monitoring.git" dest: /etc/ansible/roles/ansible-role-monitoring force: true -<<<<<<< HEAD version: v1.2.3 -======= - version: v1.2.2 ->>>>>>> main # ---------- Execute monitoring role ---------- - name: Execute monitoring role