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

fix: Elasticsearch and adhoc filters fix, fixes #9165

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-09-05 10:16:02 +02:00
parent 52676161bb
commit 4e387ed47a
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -135,6 +135,7 @@ function (queryDef, _) {
}
var i, filter, condition, queryCondition;
for (i = 0; i < adhocFilters.length; i++) {
filter = adhocFilters[i];
condition = {};
@ -144,10 +145,12 @@ function (queryDef, _) {
switch(filter.operator){
case "=":
_.set(query, "query.bool.must.match_phrase", queryCondition);
if (!query.query.bool.must) { query.query.bool.must = []; }
query.query.bool.must.push({match_phrase: queryCondition});
break;
case "!=":
_.set(query, "query.bool.must_not.match_phrase", queryCondition);
if (!query.query.bool.must_not) { query.query.bool.must_not = []; }
query.query.bool.must_not.push({match_phrase: queryCondition});
break;
case "<":
condition[filter.key] = {"lt": filter.value};

9
public/app/plugins/datasource/elasticsearch/specs/query_builder_specs.ts
View File

@ -40,8 +40,7 @@ describe('ElasticQueryBuilder', function() {
var query = builder.build({
metrics: [{type: 'count', id: '1'}],
timeField: '@timestamp',
bucketAggs: [
{type: 'terms', field: '@host', id: '2'},
bucketAggs: [ {type: 'terms', field: '@host', id: '2'},
{type: 'date_histogram', field: '@timestamp', id: '3'}
],
});
@ -282,6 +281,7 @@ describe('ElasticQueryBuilder', function() {
bucketAggs: [{type: 'date_histogram', field: '@timestamp', id: '3'}],
}, [
{key: 'key1', operator: '=', value: 'value1'},
{key: 'key2', operator: '=', value: 'value2'},
{key: 'key2', operator: '!=', value: 'value2'},
{key: 'key3', operator: '<', value: 'value3'},
{key: 'key4', operator: '>', value: 'value4'},
@ -289,8 +289,9 @@ describe('ElasticQueryBuilder', function() {
{key: 'key6', operator: '!~', value: 'value6'},
]);
expect(query.query.bool.must.match_phrase["key1"].query).to.be("value1");
expect(query.query.bool.must_not.match_phrase["key2"].query).to.be("value2");
expect(query.query.bool.must[0].match_phrase["key1"].query).to.be("value1");
expect(query.query.bool.must[1].match_phrase["key2"].query).to.be("value2");
expect(query.query.bool.must_not[0].match_phrase["key2"].query).to.be("value2");
expect(query.query.bool.filter[2].range["key3"].lt).to.be("value3");
expect(query.query.bool.filter[3].range["key4"].gt).to.be("value4");
expect(query.query.bool.filter[4].regexp["key5"]).to.be("value5");