Merge branch 'main' into rel-210

ansible-collections · Jul 9, 2024 · 39c6cb6 · 39c6cb6
2 parents 3d877da + 67c7062
commit 39c6cb6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/changelogs/fragments/patch-1.yaml b/changelogs/fragments/patch-1.yaml
@@ -0,0 +1,2 @@
+bugfixes:
+  - Fix var prefixes in silence-task in role
diff --git a/hacking/requirements.txt b/hacking/requirements.txt
@@ -1 +1 @@
-requests==2.31.0
+requests==2.32.0
diff --git 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 }}"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		bugfixes:
		- Fix var prefixes in silence-task in role