From 254834d93476e6154c6e70c290a9267c575bb660 Mon Sep 17 00:00:00 2001 From: sfhl <59044937+sfhl@users.noreply.github.com> Date: Tue, 9 Jul 2024 13:22:49 +0200 Subject: [PATCH 1/3] fix wrong vars --- roles/grafana/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/grafana/tasks/main.yml b/roles/grafana/tasks/main.yml index d0ddab40..80704fa7 100644 --- a/roles/grafana/tasks/main.yml +++ b/roles/grafana/tasks/main.yml @@ -345,8 +345,8 @@ created_by: "{{ silence.created_by }}" ends_at: "{{ silence.ends_at }}" matchers: "{{ silence.matchers }}" - org_id: "{{ datasource.org_id | default(omit) }}" - org_name: "{{ datasource.org_name | default(omit) }}" + org_id: "{{ silence.org_id | default(omit) }}" + org_name: "{{ silence.org_name | default(omit) }}" starts_at: "{{ silence.starts_at }}" state: "{{ silence.state | default(omit) }}" loop: "{{ grafana_silences }}" From f85699c07f96a604518903f4be80ba725c34e861 Mon Sep 17 00:00:00 2001 From: sfhl <59044937+sfhl@users.noreply.github.com> Date: Tue, 9 Jul 2024 13:58:48 +0200 Subject: [PATCH 2/3] Create patch-1.yaml --- changelogs/fragments/patch-1.yaml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 changelogs/fragments/patch-1.yaml diff --git a/changelogs/fragments/patch-1.yaml b/changelogs/fragments/patch-1.yaml new file mode 100644 index 00000000..1b2c3d60 --- /dev/null +++ b/changelogs/fragments/patch-1.yaml @@ -0,0 +1,2 @@ +bugfixes: + - Fix var prefixes From 19a8b077e12829f5cb6d51b7a8629cad53b03bae Mon Sep 17 00:00:00 2001 From: Sebastian Gumprich Date: Tue, 9 Jul 2024 14:38:16 +0200 Subject: [PATCH 3/3] Update patch-1.yaml --- changelogs/fragments/patch-1.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelogs/fragments/patch-1.yaml b/changelogs/fragments/patch-1.yaml index 1b2c3d60..84e78c92 100644 --- a/changelogs/fragments/patch-1.yaml +++ b/changelogs/fragments/patch-1.yaml @@ -1,2 +1,2 @@ bugfixes: - - Fix var prefixes + - Fix var prefixes in silence-task in role