Merge pull request #1618 from edx/cg/add_port_to_config

Add port support for kibana configuration

Merge pull request #1618 from edx/cg/add_port_to_config
Add port support for kibana configuration
23b99bc2 · Carson Gee · e71b37b1 · 731f6320 · 23b99bc2
Commit 23b99bc2 authored Oct 07, 2014 by Carson Gee
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

playbooks/roles/kibana/templates/config.js.j2
+2 -2

No files found.
--- a/playbooks/roles/kibana/templates/config.js.j2
+++ b/playbooks/roles/kibana/templates/config.js.j2
@@ -21,11 +21,11 @@ function (Settings) {
    //elasticsearch: "http://"+window.location.hostname+":9200",
 	{% if NGINX_ENABLE_SSL %}

-	  elasticsearch: "https://{{ KIBANA_SERVER_NAME }}/e",
+	  elasticsearch: "https://{{ KIBANA_SERVER_NAME }}:{{ KIBANA_SSL_NGINX_PORT }}/e",

 	{% else %}

-	  elasticsearch: "http://{{ KIBANA_SERVER_NAME }}/e",
+	  elasticsearch: "http://{{ KIBANA_SERVER_NAME }}:{{ KIBANA_NGINX_PORT }}/e",

 	{% endif %}