Merge pull request #45 from dlee35/master

Proxy path setup

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

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

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;

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;

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