Skip to content

Commit 192607f

Browse files
committed
install grafana plugins and dashboard during fatimage and skip by default during site.yml
1 parent c409e52 commit 192607f

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

ansible/fatimage.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@
134134
import_role:
135135
name: openondemand
136136
tasks_from: vnc_compute.yml
137-
138137
when: "'openondemand_desktop' in group_names"
139138

140139
- name: Open Ondemand jupyter node
@@ -247,6 +246,11 @@
247246
- import_role:
248247
name: cloudalchemy.grafana
249248
tasks_from: install.yml
249+
- import_role:
250+
name: cloudalchemy.grafana
251+
tasks_from: plugins.yml
252+
- include_role: # done in same play so it can use handlers from cloudalchemy.grafana
253+
name: grafana-dashboards
250254

251255
- name: Run post.yml hook
252256
vars:

ansible/monitoring.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,13 @@
8989
- include_role:
9090
name: cloudalchemy.grafana
9191
vars:
92-
# We use internal roles to register the dashboards as the role does not support all options that we require.
92+
# Plugin installation done during fatimage:
93+
grafana_plugins: "{{ if appliances_mode == 'configure' else grafana_plugins }}"
94+
# Internal role used to install dashboards as cloudalchemy role does not support all required options:
9395
grafana_dashboards: []
94-
- import_role: # done in same play so it can use handlers from cloudalchemy.grafana
96+
- include_role: # done in same play so it can use handlers from cloudalchemy.grafana
9597
name: grafana-dashboards
98+
when: "{{ appliances_mode != 'configure '}}"
9699

97100
- name: Deploy alertmanager
98101
hosts: alertmanager

0 commit comments

Comments
 (0)