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 templating using query

Browse Source
This commit is contained in:
Leandro Piccilli 2016-10-27 18:59:24 +02:00
parent 0000065053
commit 538e1fbc64
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -251,7 +251,7 @@ function (queryDef) {
};
ElasticQueryBuilder.prototype.getTermsQuery = function(queryDef) {
var query, queryPath;
var query;
if (this.esVersion >= 5) {
query = {
@ -262,7 +262,15 @@ function (queryDef) {
}
}
};
queryPath = query.query.bool.must;
if (queryDef.query) {
query.query.bool.must.push({
"query_string": {
"analyze_wildcard": true,
"query": queryDef.query,
}
});
}
} else {
query = {
@ -277,16 +285,15 @@ function (queryDef) {
}
}
};
queryPath = query.query.filtered.query;
}
if (queryDef.query) {
queryPath = {
"query_string": {
"analyze_wildcard": true,
"query": queryDef.query,
}
};
if (queryDef.query) {
query.query.filtered.query = {
"query_string": {
"analyze_wildcard": true,
"query": queryDef.query,
}
};
}
}
query.aggs = {