From d958bac52e5881a3ee2d8450d2ec80633e6546a5 Mon Sep 17 00:00:00 2001 From: nd Date: Sat, 12 Dec 2020 21:22:42 +0100 Subject: [PATCH] added support for non reverse proxied setups --- tasks/main.yml | 6 +++--- vars/main.yml | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index c26b2d5..f767e0d 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -60,7 +60,7 @@ - name: "Check if grafana is accessible." uri: - url: http://127.0.0.1 + url: "{{ grafana.config.root_url|d('http://127.0.0.1') }}" method: GET status_code: 200 @@ -74,7 +74,7 @@ loop: "{{ grafana.datasources|dict2items }}" grafana_datasource: name: "{{ item.key }}" - grafana_url: "http://127.0.0.1" + grafana_url: "{{ grafana.config.root_url|d('http://127.0.0.1') }}" grafana_user: "admin" grafana_password: "{{ grafana.adminpw }}" ds_type: "{{ item.value.ds_type }}" @@ -88,7 +88,7 @@ - name: import dashboards loop: "{{ grafana.dashboards|dict2items }}" grafana_dashboard: - grafana_url: "http://127.0.0.1" + grafana_url: "{{ grafana.config.root_url|d('http://127.0.0.1') }}" grafana_user: "admin" grafana_password: "{{ grafana.adminpw }}" path: "{{ item.value.path }}" diff --git a/vars/main.yml b/vars/main.yml index d737f74..b3ae832 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -6,7 +6,6 @@ packages: nginx: - force_ssl: False upstreams: grafana: server: @@ -17,4 +16,3 @@ nginx: default_server: True listen: ssl: True - nossl: True