IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-10 08:03:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

Made opentsdb query_ctrl robust

Browse Source
This commit is contained in:
utkarshcmu 2016-02-28 01:35:21 -08:00
parent a883424d25
commit 18c57ea230
3 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
public/app/plugins/datasource/opentsdb/datasource.js
View File

@ -224,7 +224,7 @@ function (angular, _, dateMath) {
this.getAggregators = function() { this.getAggregators = function() {
if (aggregatorsPromise) { return aggregatorsPromise; } if (aggregatorsPromise) { return aggregatorsPromise; }
aggregatorsPromise = this._get('/api/aggregators').then(function(result) { aggregatorsPromise = this._get('/api/aggregators').then(function(result) {
if (result.data && _.isArray(result.data)) { if (result.data && _.isArray(result.data)) {
return result.data.sort(); return result.data.sort();
} }
@ -233,6 +233,19 @@ function (angular, _, dateMath) {
return aggregatorsPromise; return aggregatorsPromise;
}; };
var filterTypesPromise = null;
this.getFilterTypes = function() {
if (filterTypesPromise) { return filterTypesPromise; }
filterTypesPromise = this._get('/api/config/filters').then(function(result) {
if (result.data) {
return Object.keys(result.data).sort();
}
return [];
});
return filterTypesPromise;
};
function transformMetricData(md, groupByTags, target, options) { function transformMetricData(md, groupByTags, target, options) {
var metricLabel = createMetricLabel(md, target, groupByTags, options); var metricLabel = createMetricLabel(md, target, groupByTags, options);
var dps = []; var dps = [];

12
public/app/plugins/datasource/opentsdb/query_ctrl.ts
View File

@ -45,7 +45,15 @@ export class OpenTsQueryCtrl extends QueryCtrl {
} }
this.datasource.getAggregators().then((aggs) => { this.datasource.getAggregators().then((aggs) => {
this.aggregators = aggs; if (aggs.length !== 0) {
this.aggregators = aggs;
}
});
this.datasource.getFilterTypes().then((filterTypes) => {
if (filterTypes.length !== 0) {
this.filterTypes = filterTypes;
}
}); });
// needs to be defined here as it is called from typeahead // needs to be defined here as it is called from typeahead
@ -135,7 +143,7 @@ export class OpenTsQueryCtrl extends QueryCtrl {
} }
if (!this.target.currentFilterType) { if (!this.target.currentFilterType) {
this.target.currentFilterType = 'literal_or'; this.target.currentFilterType = 'iliteral_or';
} }
if (!this.target.currentFilterGroupBy) { if (!this.target.currentFilterGroupBy) {

1
public/app/plugins/datasource/opentsdb/specs/query-ctrl-specs.ts
View File

@ -17,6 +17,7 @@ describe('OpenTsQueryCtrl', function() {
ctx.panelCtrl = {panel: {}}; ctx.panelCtrl = {panel: {}};
ctx.panelCtrl.refresh = sinon.spy(); ctx.panelCtrl.refresh = sinon.spy();
ctx.datasource.getAggregators = sinon.stub().returns(ctx.$q.when([])); ctx.datasource.getAggregators = sinon.stub().returns(ctx.$q.when([]));
ctx.datasource.getFilterTypes = sinon.stub().returns(ctx.$q.when([]));
ctx.ctrl = $controller(OpenTsQueryCtrl, {$scope: ctx.scope}, { ctx.ctrl = $controller(OpenTsQueryCtrl, {$scope: ctx.scope}, {
panelCtrl: ctx.panelCtrl, panelCtrl: ctx.panelCtrl,