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 branch 'master' of https://github.com/grafana/grafana

Browse Source
This commit is contained in:
Leandro Piccilli
2016-07-18 10:34:11 +02:00
parent 0ebf469f5f 51940fa209
commit 2a501d6cdb
50 changed files with 615 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/plugins/datasource/elasticsearch/datasource.js
View File

@@ -257,7 +257,7 @@ function (angular, _, moment, kbn, ElasticQueryBuilder, IndexPattern, ElasticRes
esQuery = esQuery.replace(/\$timeTo/g, range.to.valueOf());
esQuery = header + '\n' + esQuery + '\n';
return this._post('/_msearch?search_type=' + searchType, esQuery).then(function(res) {
return this._post('_msearch?search_type=' + searchType, esQuery).then(function(res) {
var buckets = res.responses[0].aggregations["1"].buckets;
return _.map(buckets, function(bucket) {
return {text: bucket.key, value: bucket.key};