IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-18 20:43:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

InfluxDB: Fixed new group by dropdown now showing (#26031)

Browse Source
This commit is contained in:
Torkel Ödegaard 2020-07-03 14:58:29 +02:00 committed by GitHub
parent 3acc2a6ac2
commit 66460ae740
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/app/plugins/datasource/influxdb/query_builder.ts
View File

@ -90,6 +90,12 @@ export class InfluxQueryBuilder {
if (tag.key === withKey) {
return memo;
}
// value operators not supported in these types of queries
if (tag.operator === '>' || tag.operator === '<') {
return memo;
}
memo.push(renderTagCondition(tag, memo.length));
return memo;
},

2
public/app/plugins/datasource/influxdb/query_ctrl.ts
View File

@ -167,6 +167,7 @@ export class InfluxQueryCtrl extends QueryCtrl {
const plusButton = this.uiSegmentSrv.newPlusButton();
this.groupBySegment.value = plusButton.value;
this.groupBySegment.html = plusButton.html;
this.groupBySegment.fake = true;
this.panelCtrl.refresh();
}
@ -308,6 +309,7 @@ export class InfluxQueryCtrl extends QueryCtrl {
if (segment.type === 'condition') {
return Promise.resolve([this.uiSegmentSrv.newSegment('AND'), this.uiSegmentSrv.newSegment('OR')]);
}
if (segment.type === 'operator') {
const nextValue = this.tagSegments[index + 1].value;
if (/^\/.*\/$/.test(nextValue)) {

9
public/app/plugins/datasource/influxdb/specs/query_builder.test.ts
View File

@ -32,6 +32,15 @@ describe('InfluxQueryBuilder', () => {
expect(query).toBe('SHOW TAG KEYS WHERE "host" = \'se1\'');
});
it('should ignore condition if operator is a value operator', () => {
const builder = new InfluxQueryBuilder({
measurement: '',
tags: [{ key: 'value', value: '10', operator: '>' }],
});
const query = builder.buildExploreQuery('TAG_KEYS');
expect(query).toBe('SHOW TAG KEYS');
});
it('should have no conditions in measurement query for query with no tags', () => {
const builder = new InfluxQueryBuilder({ measurement: '', tags: [] });
const query = builder.buildExploreQuery('MEASUREMENTS');