added support for non reverse proxied setups
This commit is contained in:
parent
1e802724ec
commit
d958bac52e
2 changed files with 3 additions and 5 deletions
|
|
@ -60,7 +60,7 @@
|
||||||
|
|
||||||
- name: "Check if grafana is accessible."
|
- name: "Check if grafana is accessible."
|
||||||
uri:
|
uri:
|
||||||
url: http://127.0.0.1
|
url: "{{ grafana.config.root_url|d('http://127.0.0.1') }}"
|
||||||
method: GET
|
method: GET
|
||||||
status_code: 200
|
status_code: 200
|
||||||
|
|
||||||
|
|
@ -74,7 +74,7 @@
|
||||||
loop: "{{ grafana.datasources|dict2items }}"
|
loop: "{{ grafana.datasources|dict2items }}"
|
||||||
grafana_datasource:
|
grafana_datasource:
|
||||||
name: "{{ item.key }}"
|
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_user: "admin"
|
||||||
grafana_password: "{{ grafana.adminpw }}"
|
grafana_password: "{{ grafana.adminpw }}"
|
||||||
ds_type: "{{ item.value.ds_type }}"
|
ds_type: "{{ item.value.ds_type }}"
|
||||||
|
|
@ -88,7 +88,7 @@
|
||||||
- name: import dashboards
|
- name: import dashboards
|
||||||
loop: "{{ grafana.dashboards|dict2items }}"
|
loop: "{{ grafana.dashboards|dict2items }}"
|
||||||
grafana_dashboard:
|
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_user: "admin"
|
||||||
grafana_password: "{{ grafana.adminpw }}"
|
grafana_password: "{{ grafana.adminpw }}"
|
||||||
path: "{{ item.value.path }}"
|
path: "{{ item.value.path }}"
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,6 @@ packages:
|
||||||
|
|
||||||
|
|
||||||
nginx:
|
nginx:
|
||||||
force_ssl: False
|
|
||||||
upstreams:
|
upstreams:
|
||||||
grafana:
|
grafana:
|
||||||
server:
|
server:
|
||||||
|
|
@ -17,4 +16,3 @@ nginx:
|
||||||
default_server: True
|
default_server: True
|
||||||
listen:
|
listen:
|
||||||
ssl: True
|
ssl: True
|
||||||
nossl: True
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue