Skip to content

Commit e822530

Browse files
grafana: include config file for Grafana v9
1 parent 2338351 commit e822530

File tree

3 files changed

+1192
-10
lines changed

3 files changed

+1192
-10
lines changed

roles/grafana/tasks/main.yml

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,29 @@
1717
name: "{{ __grafana_packages + __grafana_packages_extra }}"
1818
state: present
1919

20-
- name: Template Grafana configuration
20+
- name: Get package facts now that Grafana is installed
21+
package_facts:
22+
manager: "auto"
23+
24+
- name: Get Grafana version number from installed packages
25+
set_fact:
26+
grafana_version: "{{ ansible_facts.packages.grafana[0].version }}"
27+
28+
- name: Template Grafana v7 configuration
2129
template:
22-
src: grafana.ini.j2
30+
src: grafana_7.ini.j2
2331
dest: "{{ __grafana_conf }}"
2432
mode: 0640
2533
notify: restart grafana
34+
when: grafana_version is version('9.0.0', '<')
35+
36+
- name: Template Grafana v9 configuration
37+
template:
38+
src: grafana_9.ini.j2
39+
dest: "{{ __grafana_conf }}"
40+
mode: 0640
41+
notify: restart grafana
42+
when: grafana_version is version('9.0.0', '>=')
2643

2744
- name: Ensure Grafana configuration directory exists
2845
file:
@@ -46,14 +63,6 @@
4663
state: started
4764
enabled: yes
4865

49-
- name: Get package facts now that Grafana is installed
50-
package_facts:
51-
manager: "auto"
52-
53-
- name: Get Grafana version number from installed packages
54-
set_fact:
55-
grafana_version: "{{ ansible_facts.packages.grafana[0].version }}"
56-
5766
# yamllint disable rule:line-length
5867
- name: Ensure graphing service settings are configured by HTTP POST
5968
uri:
File renamed without changes.

0 commit comments

Comments
 (0)