IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #119 from errordeveloper/master

Browse Source 
Use `window.location.protocol` so we can use ES behind SSL
This commit is contained in:
Rashid Khan 2013-05-29 13:25:06 -07:00
commit 4fe0913e35
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.js
View File

@ -17,7 +17,7 @@ var config = new Settings(
// By default this will attempt to reach ES at the same host you have // By default this will attempt to reach ES at the same host you have
// elasticsearch installed on. You probably want to set it to the FQDN of your // elasticsearch installed on. You probably want to set it to the FQDN of your
// elasticsearch host // elasticsearch host
elasticsearch: "http://"+window.location.hostname+":9200", elasticsearch: window.location.protocol+"//"+window.location.hostname+":9200",
// elasticsearch: 'http://localhost:9200', // elasticsearch: 'http://localhost:9200',
kibana_index: "kibana-int", kibana_index: "kibana-int",
modules: ['histogram','map','pie','table','stringquery','sort', modules: ['histogram','map','pie','table','stringquery','sort',