From 1ab76d475b64fa44e3a8bea2dd8da2f59fe4f5be Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Wed, 21 Jun 2017 18:07:26 -0600 Subject: [PATCH] Ship grafana.ini from this repo Signed-off-by: Zack Cerza --- ansible/roles/ceph-grafana/files/grafana.ini | 1 + .../ceph-grafana/tasks/configure_grafana.yml | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) create mode 120000 ansible/roles/ceph-grafana/files/grafana.ini diff --git a/ansible/roles/ceph-grafana/files/grafana.ini b/ansible/roles/ceph-grafana/files/grafana.ini new file mode 120000 index 0000000..d27ea1e --- /dev/null +++ b/ansible/roles/ceph-grafana/files/grafana.ini @@ -0,0 +1 @@ +../../../../etc/grafana/grafana.ini \ No newline at end of file diff --git a/ansible/roles/ceph-grafana/tasks/configure_grafana.yml b/ansible/roles/ceph-grafana/tasks/configure_grafana.yml index ca516fd..20b1a11 100644 --- a/ansible/roles/ceph-grafana/tasks/configure_grafana.yml +++ b/ansible/roles/ceph-grafana/tasks/configure_grafana.yml @@ -52,21 +52,22 @@ status_code: 200 when: grafana_data_source_result is defined and grafana_data_source_result.status == 409 -- name: Set domain in grafana.ini - lineinfile: +- name: Write grafana.ini + copy: + src: files/grafana.ini dest: /etc/grafana/grafana.ini - regexp: "^domain = .*" - insertafter: "^;domain = .*" - line: "domain = {{ ansible_fqdn }}" + owner: root + group: grafana + mode: 0640 tags: [ini] notify: Restart Grafana -- name: Set root_url in grafana.ini +- name: Set domain in grafana.ini lineinfile: dest: /etc/grafana/grafana.ini - regexp: "^root_url = .*" - insertafter: "^;root_url = .*" - line: "root_url = %(protocol)s://%(domain)s:3000" + regexp: "^domain = .*" + insertafter: "^;domain = .*" + line: "domain = {{ ansible_fqdn }}" tags: [ini] notify: Restart Grafana -- 2.47.3