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 remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Rashid Khan 2013-09-09 07:20:47 -07:00
commit cad7784d03
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/services.js
View File

@ -89,9 +89,10 @@ angular.module('kibana.services', [])
if(status === 0) { if(status === 0) {
alertSrv.set('Error',"Could not contact Elasticsearch at "+config.elasticsearch+ alertSrv.set('Error',"Could not contact Elasticsearch at "+config.elasticsearch+
". Please ensure that Elasticsearch is reachable from your system." ,'error'); ". Please ensure that Elasticsearch is reachable from your system." ,'error');
} else { } else {
alertSrv.set('Error',"Could not find "+config.elasticsearch+"/"+indices.join(',')+"/_mapping. If you"+ alertSrv.set('Error',"No index found at "+config.elasticsearch+"/" +
" are using a proxy, ensure it is configured correctly",'error'); indices.join(',')+"/_mapping. Please create at least one index." +
"If you're using a proxy ensure it is configured correctly.",'error');
} }
}); });
@ -963,4 +964,4 @@ angular.module('kibana.services', [])
return false; return false;
}); });
}; };
}); });