From 0db7a5b36c290d5a004bf9d601660107c0bdf982 Mon Sep 17 00:00:00 2001 From: Nemental <15136847+Nemental@users.noreply.github.com> Date: Tue, 16 Jan 2024 10:46:51 +0100 Subject: [PATCH] Squashed commit of telekom-mms/ansible-role-grafana#21: commit cf0ba371a2298bb19e9d80e995a821b61df8e1ef Merge: 0d0a9fd cd0edb3 Author: Nemental <15136847+Nemental@users.noreply.github.com> Date: Fri Dec 8 09:11:37 2023 +0100 Merge branch 'main' into feat/datasource-by-org-name commit 0d0a9fd90e9a60cc185d85dc022ff5516f1678c1 Author: Nemental <15136847+Nemental@users.noreply.github.com> Date: Thu Dec 7 20:21:14 2023 +0100 fix: add org_name for datasource task commit 4ec3e68ef755d320332e75232603b3ee8047f486 Author: Nemental <15136847+Nemental@users.noreply.github.com> Date: Thu Dec 7 20:20:59 2023 +0100 docs: add org_name to readme --- roles/grafana/README.md | 1 + roles/grafana/tasks/main.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/roles/grafana/README.md b/roles/grafana/README.md index 2236684d..33a0cb5c 100644 --- a/roles/grafana/README.md +++ b/roles/grafana/README.md @@ -38,6 +38,7 @@ Configure Grafana organizations, dashboards, folders, datasources, teams and use | [**grafana_datasources**](https://docs.ansible.com/ansible/latest/collections/community/grafana/grafana_datasource_module.html) | | tls_skip_verify | no | | org_id | no | +| org_name | no | | name | yes | | ds_type | no | | access | no | diff --git a/roles/grafana/tasks/main.yml b/roles/grafana/tasks/main.yml index 1d1f404d..5bd3c505 100644 --- a/roles/grafana/tasks/main.yml +++ b/roles/grafana/tasks/main.yml @@ -18,6 +18,7 @@ community.grafana.grafana_datasource: tls_skip_verify: "{{ datasource.tls_skip_verify | default(omit) }}" org_id: "{{ datasource.org_id | default(omit) }}" + org_name: "{{ datasource.org_name | default(omit) }}" name: "{{ datasource.name }}" ds_type: "{{ datasource.ds_type | default(omit) }}" access: "{{ datasource.access | default(omit) }}"