DEV-1004 hotfix after merge due to dashboard types on qa/prod

- dashboard folders are given by rest api, added filtering
qa
Sven Ketelsen 3 years ago
parent 1bb111ce7f
commit fb45c9b8cd

@ -102,13 +102,13 @@
- name: "Get all existing Dashboard uids" - name: "Get all existing Dashboard uids"
set_fact: set_fact:
grafana_dashboards_uids: "{{ grafana_dashboards.json | json_query('[].uid') }}" grafana_dashboards: "{{ grafana_dashboards.json | json_query('[].{uid: uid, type: type, title: title}') }}"
tags: tags:
- grafana-user-update - grafana-user-update
- name: "Printing Grafana Dashboard IDs" - name: "Printing Grafana Dashboards"
debug: debug:
msg: "{{ grafana_dashboards_uids }}" msg: "{{ grafana_dashboards }}"
tags: tags:
- grafana-user-update - grafana-user-update
when: when:
@ -116,7 +116,7 @@
- name: Restrict admin dashboard permissions - name: Restrict admin dashboard permissions
uri: uri:
url: "{{ http_s }}://{{ grafana_id }}.{{ domain }}/api/dashboards/uid/{{ item }}/permissions" url: "{{ http_s }}://{{ grafana_id }}.{{ domain }}/api/dashboards/uid/{{ item.uid }}/permissions"
url_username: "{{ grafana_admin_username }}" url_username: "{{ grafana_admin_username }}"
url_password: "{{ grafana_admin_password }}" url_password: "{{ grafana_admin_password }}"
force_basic_auth: yes force_basic_auth: yes
@ -129,13 +129,16 @@
- role: Admin - role: Admin
permission: 4 permission: 4
return_content: yes return_content: yes
loop: "{{ grafana_dashboards_uids | difference(grafana_dashboard_whitelist) | list }}" loop: "{{ grafana_dashboards }}"
when:
- item.type == 'dash-db'
- item.uid not in grafana_dashboard_whitelist
tags: tags:
- grafana-user-update - grafana-user-update
- name: Allow viewer dashboard permissions - name: Allow viewer dashboard permissions
uri: uri:
url: "{{ http_s }}://{{ grafana_id }}.{{ domain }}/api/dashboards/uid/{{ item }}/permissions" url: "{{ http_s }}://{{ grafana_id }}.{{ domain }}/api/dashboards/uid/{{ item.uid }}/permissions"
url_username: "{{ grafana_admin_username }}" url_username: "{{ grafana_admin_username }}"
url_password: "{{ grafana_admin_password }}" url_password: "{{ grafana_admin_password }}"
force_basic_auth: yes force_basic_auth: yes
@ -148,7 +151,10 @@
- role: Viewer - role: Viewer
permission: 1 permission: 1
return_content: yes return_content: yes
loop: "{{ grafana_dashboard_whitelist }}" loop: "{{ grafana_dashboards }}"
when:
- item.type == 'dash-db'
- item.uid in grafana_dashboard_whitelist
tags: tags:
- grafana-user-update - grafana-user-update

Loading…
Cancel
Save