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 #136 from rashidkpc/master

Browse Source 
Undo protocol detections
This commit is contained in:
Rashid Khan 2013-05-29 16:32:36 -07:00
commit a7ca34fe4a
2 changed files with 2 additions and 2 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: window.location.protocol+"//"+window.location.hostname+":9200", elasticsearch: "http://"+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',

2
js/services.js
View File

@ -84,7 +84,7 @@ angular.module('kibana.services', [])
}) })
.service('kbnIndex',function($http) { .service('kbnIndex',function($http) {
// returns a promise containing an array of all indices matching the index // returns a promise containing an array of all indices matching the index
// pattern that exist in a given range // pattern that exist in a given range
this.indices = function(from,to,pattern,interval) { this.indices = function(from,to,pattern,interval) {
var possible = []; var possible = [];