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

feat(elastic): remove support for ES 1.x

Browse Source
This commit is contained in:
bergquist
2016-12-09 11:22:43 +01:00
parent 873024b917
commit 99c5f7d571
4 changed files with 9 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
public/app/plugins/datasource/elasticsearch/query_builder.js
View File

@@ -11,11 +11,11 @@ function (queryDef) {
ElasticQueryBuilder.prototype.getRangeFilter = function() {
var filter = {};
filter[this.timeField] = {"gte": "$timeFrom", "lte": "$timeTo"};
if (this.esVersion >= 2) {
filter[this.timeField]["format"] = "epoch_millis";
}
filter[this.timeField] = {
gte: "$timeFrom",
lte: "$timeTo",
format: "epoch_millis",
};
return filter;
};
@@ -59,15 +59,12 @@ function (queryDef) {
esAgg.field = this.timeField;
esAgg.min_doc_count = settings.min_doc_count || 0;
esAgg.extended_bounds = {min: "$timeFrom", max: "$timeTo"};
esAgg.format = "epoch_millis";
if (esAgg.interval === 'auto') {
esAgg.interval = "$interval";
}
if (this.esVersion >= 2) {
esAgg.format = "epoch_millis";
}
return esAgg;
};
@@ -108,14 +105,13 @@ function (queryDef) {
return;
}
var i, filter, condition, must;
must = query.query.bool.must;
var i, filter, condition;
for (i = 0; i < adhocFilters.length; i++) {
filter = adhocFilters[i];
condition = {};
condition[filter.key] = filter.value;
must.push({"term": condition});
query.query.bool.must.push({"term": condition});
}
};