From 39c3e5793fd88d60cf5a2ee670be0e2f4422aa35 Mon Sep 17 00:00:00 2001 From: Dustin Lee Date: Mon, 3 Dec 2018 19:54:33 -0500 Subject: [PATCH 1/5] Added grafana.ini in RO to prep for proxy --- salt/common/init.sls | 1 + 1 file changed, 1 insertion(+) diff --git a/salt/common/init.sls b/salt/common/init.sls index f0b4fd8fa..ca771afdf 100644 --- a/salt/common/init.sls +++ b/salt/common/init.sls @@ -372,6 +372,7 @@ so-grafana: - user: socore - binds: - /nsm/grafana:/var/lib/grafana:rw + - /opt/so/conf/grafana/etc/grafana.ini:/etc/grafana/grafana.ini:ro - /opt/so/conf/grafana/etc/datasources:/etc/grafana/provisioning/datasources:rw - /opt/so/conf/grafana/etc/dashboards:/etc/grafana/provisioning/dashboards:rw - /opt/so/conf/grafana/grafana_dashboards:/etc/grafana/grafana_dashboards:rw From 27dce49a31e238b66e57706d1d5f8108b486e084 Mon Sep 17 00:00:00 2001 From: Dustin Lee Date: Mon, 3 Dec 2018 19:56:09 -0500 Subject: [PATCH 2/5] Uncommented `root_url` and added proxy info --- salt/common/grafana/etc/grafana.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/common/grafana/etc/grafana.ini b/salt/common/grafana/etc/grafana.ini index adbbeb316..0327b8bc5 100644 --- a/salt/common/grafana/etc/grafana.ini +++ b/salt/common/grafana/etc/grafana.ini @@ -46,7 +46,7 @@ # The full public facing url you use in browser, used for redirects and emails # If you use reverse proxy and sub path specify full url (with sub path) -;root_url = http://localhost:3000 +root_url = %(protocol)s://%(domain)s/grafana/ # Log web requests ;router_logging = false From 935c4470e8c2e5f5cba912b429b2987da3526e35 Mon Sep 17 00:00:00 2001 From: Dustin Lee Date: Mon, 3 Dec 2018 19:59:43 -0500 Subject: [PATCH 3/5] Added /grafana/ and /kibana/ proxy info --- salt/common/nginx/nginx.conf.so-eval | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/salt/common/nginx/nginx.conf.so-eval b/salt/common/nginx/nginx.conf.so-eval index bc8dbf39b..07813d1a1 100644 --- a/salt/common/nginx/nginx.conf.so-eval +++ b/salt/common/nginx/nginx.conf.so-eval @@ -87,7 +87,20 @@ http { # try_files $uri $uri.html /index.html; # } - location / { + location /grafana/ { + rewrite /grafana/(.*) /$1 break; + proxy_pass http://{{ masterip }}:3000/; + proxy_read_timeout 90; + proxy_connect_timeout 90; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Proxy ""; + + } + + location /kibana/ { + rewrite /kibana/(.*) /$1 break; proxy_pass http://{{ masterip }}:5601/; proxy_read_timeout 90; proxy_connect_timeout 90; From 40a87d339f62d27349cfc0e8179a855b1f56c27f Mon Sep 17 00:00:00 2001 From: Dustin Lee Date: Mon, 3 Dec 2018 20:00:36 -0500 Subject: [PATCH 4/5] Added /grafana/ and /kibana/ proxy info --- salt/common/nginx/nginx.conf.so-master | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/salt/common/nginx/nginx.conf.so-master b/salt/common/nginx/nginx.conf.so-master index bc8dbf39b..07813d1a1 100644 --- a/salt/common/nginx/nginx.conf.so-master +++ b/salt/common/nginx/nginx.conf.so-master @@ -87,7 +87,20 @@ http { # try_files $uri $uri.html /index.html; # } - location / { + location /grafana/ { + rewrite /grafana/(.*) /$1 break; + proxy_pass http://{{ masterip }}:3000/; + proxy_read_timeout 90; + proxy_connect_timeout 90; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Proxy ""; + + } + + location /kibana/ { + rewrite /kibana/(.*) /$1 break; proxy_pass http://{{ masterip }}:5601/; proxy_read_timeout 90; proxy_connect_timeout 90; From afa39aa7df8975c6dc91b2c4212c81e56d492f61 Mon Sep 17 00:00:00 2001 From: Dustin Lee Date: Mon, 3 Dec 2018 20:36:53 -0500 Subject: [PATCH 5/5] Added basePath for proxy config --- salt/kibana/etc/kibana.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/salt/kibana/etc/kibana.yml b/salt/kibana/etc/kibana.yml index c29218784..bbbfeb575 100644 --- a/salt/kibana/etc/kibana.yml +++ b/salt/kibana/etc/kibana.yml @@ -3,6 +3,7 @@ {%- set ES = salt['pillar.get']('master:mainip', '') -%} server.name: kibana server.host: "0" +server.basePath: /kibana elasticsearch.url: http://{{ ES }}:9200 #elasticsearch.username: elastic #elasticsearch.password: changeme