diff --git a/public/app/plugins/datasource/influxdb-ifql/plugin.json b/public/app/plugins/datasource/influxdb-ifql/plugin.json
index b4eb764d556..f87e1c33275 100644
--- a/public/app/plugins/datasource/influxdb-ifql/plugin.json
+++ b/public/app/plugins/datasource/influxdb-ifql/plugin.json
@@ -4,7 +4,7 @@
"id": "influxdb-ifql",
"defaultMatchFormat": "regex values",
"metrics": true,
- "annotations": false,
+ "annotations": true,
"alerting": false,
"queryOptions": {
"minInterval": true
diff --git a/public/app/plugins/datasource/influxdb-ifql/query_ctrl.ts b/public/app/plugins/datasource/influxdb-ifql/query_ctrl.ts
index edd00b37db8..6bccfa0aba9 100644
--- a/public/app/plugins/datasource/influxdb-ifql/query_ctrl.ts
+++ b/public/app/plugins/datasource/influxdb-ifql/query_ctrl.ts
@@ -1,3 +1,4 @@
+import appEvents from 'app/core/app_events';
import { QueryCtrl } from 'app/plugins/sdk';
function makeDefaultQuery(database) {
@@ -9,18 +10,46 @@ function makeDefaultQuery(database) {
export class InfluxIfqlQueryCtrl extends QueryCtrl {
static templateUrl = 'partials/query.editor.html';
+ dataPreview: string;
+ resultRecordCount: string;
+ resultTableCount: string;
resultFormats: any[];
/** @ngInject **/
constructor($scope, $injector) {
super($scope, $injector);
+ this.resultRecordCount = '';
+ this.resultTableCount = '';
+
if (this.target.query === undefined) {
this.target.query = makeDefaultQuery(this.datasource.database);
}
this.resultFormats = [{ text: 'Time series', value: 'time_series' }, { text: 'Table', value: 'table' }];
+
+ appEvents.on('ds-request-response', this.onResponseReceived, $scope);
+ this.panelCtrl.events.on('refresh', this.onRefresh, $scope);
+ this.panelCtrl.events.on('data-received', this.onDataReceived, $scope);
}
+ onDataReceived = dataList => {
+ this.resultRecordCount = dataList.reduce((count, model) => {
+ const records = model.type === 'table' ? model.rows.length : model.datapoints.length;
+ return count + records;
+ }, 0);
+ this.resultTableCount = dataList.length;
+ };
+
+ onResponseReceived = response => {
+ this.dataPreview = response.data;
+ };
+
+ onRefresh = () => {
+ this.dataPreview = '';
+ this.resultRecordCount = '';
+ this.resultTableCount = '';
+ };
+
getCollapsedText() {
return this.target.query;
}
diff --git a/public/app/plugins/datasource/influxdb-ifql/response_parser.ts b/public/app/plugins/datasource/influxdb-ifql/response_parser.ts
index e2ef753392c..dace2cf63d2 100644
--- a/public/app/plugins/datasource/influxdb-ifql/response_parser.ts
+++ b/public/app/plugins/datasource/influxdb-ifql/response_parser.ts
@@ -1,4 +1,5 @@
import Papa from 'papaparse';
+import flatten from 'lodash/flatten';
import groupBy from 'lodash/groupBy';
import TableModel from 'app/core/table_model';
@@ -6,17 +7,25 @@ import TableModel from 'app/core/table_model';
const filterColumnKeys = key => key && key[0] !== '_' && key !== 'result' && key !== 'table';
const IGNORE_FIELDS_FOR_NAME = ['result', '', 'table'];
+
+export const getTagsFromRecord = record =>
+ Object.keys(record)
+ .filter(key => key[0] !== '_')
+ .filter(key => IGNORE_FIELDS_FOR_NAME.indexOf(key) === -1)
+ .reduce((tags, key) => {
+ tags[key] = record[key];
+ return tags;
+ }, {});
+
export const getNameFromRecord = record => {
// Measurement and field
const metric = [record._measurement, record._field];
// Add tags
- const tags = Object.keys(record)
- .filter(key => key[0] !== '_')
- .filter(key => IGNORE_FIELDS_FOR_NAME.indexOf(key) === -1)
- .map(key => `${key}=${record[key]}`);
+ const tags = getTagsFromRecord(record);
+ const tagValues = Object.keys(tags).map(key => `${key}=${tags[key]}`);
- return [...metric, ...tags].join(' ');
+ return [...metric, ...tagValues].join(' ');
};
const parseCSV = (input: string) =>
@@ -36,6 +45,33 @@ export function parseResults(response: string): any[] {
return response.trim().split(/\n\s*\s/);
}
+export function getAnnotationsFromResult(result: string, options: any) {
+ const data = parseCSV(result);
+ if (data.length === 0) {
+ return [];
+ }
+
+ const annotations = [];
+ const textSelector = options.textCol || '_value';
+ const tagsSelector = options.tagsCol || '';
+ const tagSelection = tagsSelector.split(',').map(t => t.trim());
+
+ data.forEach(record => {
+ // Remove empty values, then split in different tags for comma separated values
+ const tags = getTagsFromRecord(record);
+ const tagValues = flatten(tagSelection.filter(tag => tags[tag]).map(tag => tags[tag].split(',')));
+
+ annotations.push({
+ annotation: options,
+ time: parseTime(record._time),
+ tags: tagValues,
+ text: record[textSelector],
+ });
+ });
+
+ return annotations;
+}
+
export function getTableModelFromResult(result: string) {
const data = parseCSV(result);
@@ -86,3 +122,8 @@ export function getTimeSeriesFromResult(result: string) {
return seriesList;
}
+
+export function getValuesFromResult(result: string) {
+ const data = parseCSV(result);
+ return data.map(record => record['_value']);
+}
diff --git a/public/app/plugins/datasource/influxdb-ifql/specs/datasource.jest.ts b/public/app/plugins/datasource/influxdb-ifql/specs/datasource.jest.ts
index d20e3884882..4d01e1f4d35 100644
--- a/public/app/plugins/datasource/influxdb-ifql/specs/datasource.jest.ts
+++ b/public/app/plugins/datasource/influxdb-ifql/specs/datasource.jest.ts
@@ -13,41 +13,27 @@ describe('InfluxDB (IFQL)', () => {
targets: [],
};
- let queries: any[];
-
- describe('prepareQueries()', () => {
- it('filters empty queries', () => {
- queries = ds.prepareQueries(DEFAULT_OPTIONS);
- expect(queries.length).toBe(0);
-
- queries = ds.prepareQueries({
- ...DEFAULT_OPTIONS,
- targets: [{ query: '' }],
- });
- expect(queries.length).toBe(0);
- });
+ describe('prepareQueryTarget()', () => {
+ let target: any;
it('replaces $range variable', () => {
- queries = ds.prepareQueries({
- ...DEFAULT_OPTIONS,
- targets: [{ query: 'from(db: "test") |> range($range)' }],
- });
- expect(queries.length).toBe(1);
- expect(queries[0].query).toBe('from(db: "test") |> range(start: -3h)');
+ target = ds.prepareQueryTarget({ query: 'from(db: "test") |> range($range)' }, DEFAULT_OPTIONS);
+ expect(target.query).toBe('from(db: "test") |> range(start: -3h)');
});
it('replaces $range variable with custom dates', () => {
const to = moment();
const from = moment().subtract(1, 'hours');
- queries = ds.prepareQueries({
- ...DEFAULT_OPTIONS,
- rangeRaw: { to, from },
- targets: [{ query: 'from(db: "test") |> range($range)' }],
- });
- expect(queries.length).toBe(1);
+ target = ds.prepareQueryTarget(
+ { query: 'from(db: "test") |> range($range)' },
+ {
+ ...DEFAULT_OPTIONS,
+ rangeRaw: { to, from },
+ }
+ );
const start = from.toISOString();
const stop = to.toISOString();
- expect(queries[0].query).toBe(`from(db: "test") |> range(start: ${start}, stop: ${stop})`);
+ expect(target.query).toBe(`from(db: "test") |> range(start: ${start}, stop: ${stop})`);
});
});
});
diff --git a/public/app/plugins/datasource/influxdb-ifql/specs/metric_find_query.jest.ts b/public/app/plugins/datasource/influxdb-ifql/specs/metric_find_query.jest.ts
new file mode 100644
index 00000000000..e56874b475f
--- /dev/null
+++ b/public/app/plugins/datasource/influxdb-ifql/specs/metric_find_query.jest.ts
@@ -0,0 +1,43 @@
+import expandMacros from '../metric_find_query';
+
+describe('metric find query', () => {
+ describe('expandMacros()', () => {
+ it('returns a non-macro query unadulterated', () => {
+ const query = 'from(db:"telegraf") |> last()';
+ const result = expandMacros(query);
+ expect(result).toBe(query);
+ });
+
+ it('returns a measurement query for measurements()', () => {
+ const query = ' measurements(mydb) ';
+ const result = expandMacros(query).replace(/\s/g, '');
+ expect(result).toBe(
+ 'from(db:"mydb")|>range($range)|>group(by:["_measurement"])|>distinct(column:"_measurement")|>group(none:true)'
+ );
+ });
+
+ it('returns a tags query for tags()', () => {
+ const query = ' tags(mydb , mymetric) ';
+ const result = expandMacros(query).replace(/\s/g, '');
+ expect(result).toBe('from(db:"mydb")|>range($range)|>filter(fn:(r)=>r._measurement=="mymetric")|>keys()');
+ });
+
+ it('returns a tag values query for tag_values()', () => {
+ const query = ' tag_values(mydb , mymetric, mytag) ';
+ const result = expandMacros(query).replace(/\s/g, '');
+ expect(result).toBe(
+ 'from(db:"mydb")|>range($range)|>filter(fn:(r)=>r._measurement=="mymetric")' +
+ '|>group(by:["mytag"])|>distinct(column:"mytag")|>group(none:true)'
+ );
+ });
+
+ it('returns a field keys query for field_keys()', () => {
+ const query = ' field_keys(mydb , mymetric) ';
+ const result = expandMacros(query).replace(/\s/g, '');
+ expect(result).toBe(
+ 'from(db:"mydb")|>range($range)|>filter(fn:(r)=>r._measurement=="mymetric")' +
+ '|>group(by:["_field"])|>distinct(column:"_field")|>group(none:true)'
+ );
+ });
+ });
+});
diff --git a/public/app/plugins/datasource/influxdb-ifql/specs/response_parser.jest.ts b/public/app/plugins/datasource/influxdb-ifql/specs/response_parser.jest.ts
index bac154c0760..9a322499463 100644
--- a/public/app/plugins/datasource/influxdb-ifql/specs/response_parser.jest.ts
+++ b/public/app/plugins/datasource/influxdb-ifql/specs/response_parser.jest.ts
@@ -1,7 +1,9 @@
import {
+ getAnnotationsFromResult,
getNameFromRecord,
getTableModelFromResult,
getTimeSeriesFromResult,
+ getValuesFromResult,
parseResults,
parseValue,
} from '../response_parser';
@@ -15,6 +17,17 @@ describe('influxdb ifql response parser', () => {
});
});
+ describe('getAnnotationsFromResult()', () => {
+ it('expects a list of annotations', () => {
+ const results = parseResults(response);
+ const annotations = getAnnotationsFromResult(results[0], { tagsCol: 'cpu' });
+ expect(annotations.length).toBe(300);
+ expect(annotations[0].tags.length).toBe(1);
+ expect(annotations[0].tags[0]).toBe('cpu-total');
+ expect(annotations[0].text).toBe('0');
+ });
+ });
+
describe('getTableModelFromResult()', () => {
it('expects a table model', () => {
const results = parseResults(response);
@@ -33,6 +46,14 @@ describe('influxdb ifql response parser', () => {
});
});
+ describe('getValuesFromResult()', () => {
+ it('returns all values from the _value field in the response', () => {
+ const results = parseResults(response);
+ const values = getValuesFromResult(results[0]);
+ expect(values.length).toBe(300);
+ });
+ });
+
describe('getNameFromRecord()', () => {
it('expects name based on measurements and tags', () => {
const record = {