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

Support for all ad-hoc filter operators on Elasticsearch (#7612)

Browse Source
This commit is contained in:
tamayika
2017-02-21 05:01:52 +09:00
committed by Torkel Ödegaard
parent 072c1559ba
commit b01fd3d0b5
2 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -120,7 +120,28 @@ function (queryDef) {
filter = adhocFilters[i];
condition = {};
condition[filter.key] = filter.value;
query.query.bool.filter.push({"term": condition});
switch(filter.operator){
case "=":
query.query.bool.filter.push({"term": condition});
break;
case "!=":
query.query.bool.filter.push({"bool": {"must_not": {"term": condition}}});
break;
case "<":
condition[filter.key] = {"lt": filter.value};
query.query.bool.filter.push({"range": condition});
break;
case ">":
condition[filter.key] = {"gt": filter.value};
query.query.bool.filter.push({"range": condition});
break;
case "=~":
query.query.bool.filter.push({"regexp": condition});
break;
case "!~":
query.query.bool.filter.push({"bool": {"must_not": {"regexp": condition}}});
break;
}
}
};