Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

(prometheus) prevent error to use $__interval_ms in query #12533

Merged
merged 3 commits into from Jul 11, 2018
Merged

(prometheus) prevent error to use $__interval_ms in query #12533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2107755
add test
mtanda Jul 10, 2018
a1beaf3
prevent error to use $__interval_ms in query
mtanda Jul 9, 2018
c82afca
prevent error to use $__interval_ms in query
mtanda Jul 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion public/app/features/panel/metrics_panel_ctrl.ts
View file
Open in desktop
Expand Up @@ -222,7 +222,7 @@ class MetricsPanelCtrl extends PanelCtrl {
// and add built in variables interval and interval_ms
var scopedVars = Object.assign({}, this.panel.scopedVars, {
__interval: { text: this.interval, value: this.interval },
__interval_ms: { text: this.intervalMs, value: this.intervalMs },
__interval_ms: { text: String(this.intervalMs), value: String(this.intervalMs) },
});

var metricsQuery = {
Expand Down
2 changes: 1 addition & 1 deletion public/app/plugins/datasource/prometheus/datasource.ts
View file
Open in desktop
Expand Up @@ -196,7 +196,7 @@ export class PrometheusDatasource {
interval = adjustedInterval;
scopedVars = Object.assign({}, options.scopedVars, {
__interval: { text: interval + 's', value: interval + 's' },
__interval_ms: { text: interval * 1000, value: interval * 1000 },
__interval_ms: { text: String(interval * 1000), value: String(interval * 1000) },
});
}
query.step = interval;
Expand Down
36 changes: 18 additions & 18 deletions public/app/plugins/datasource/prometheus/specs/datasource_specs.ts
View file
Open in desktop
Expand Up @@ -452,7 +452,7 @@ describe('PrometheusDatasource', function() {
interval: '10s',
scopedVars: {
__interval: { text: '10s', value: '10s' },
__interval_ms: { text: 10 * 1000, value: 10 * 1000 },
__interval_ms: { text: String(10 * 1000), value: String(10 * 1000) },
},
};
var urlExpected =
Expand All @@ -463,8 +463,8 @@ describe('PrometheusDatasource', function() {

expect(query.scopedVars.__interval.text).to.be('10s');
expect(query.scopedVars.__interval.value).to.be('10s');
expect(query.scopedVars.__interval_ms.text).to.be(10 * 1000);
expect(query.scopedVars.__interval_ms.value).to.be(10 * 1000);
expect(query.scopedVars.__interval_ms.text).to.be(String(10 * 1000));
expect(query.scopedVars.__interval_ms.value).to.be(String(10 * 1000));
});
it('should be min interval when it is greater than auto interval', function() {
var query = {
Expand All @@ -479,7 +479,7 @@ describe('PrometheusDatasource', function() {
interval: '5s',
scopedVars: {
__interval: { text: '5s', value: '5s' },
__interval_ms: { text: 5 * 1000, value: 5 * 1000 },
__interval_ms: { text: String(5 * 1000), value: String(5 * 1000) },
},
};
var urlExpected =
Expand All @@ -490,8 +490,8 @@ describe('PrometheusDatasource', function() {

expect(query.scopedVars.__interval.text).to.be('5s');
expect(query.scopedVars.__interval.value).to.be('5s');
expect(query.scopedVars.__interval_ms.text).to.be(5 * 1000);
expect(query.scopedVars.__interval_ms.value).to.be(5 * 1000);
expect(query.scopedVars.__interval_ms.text).to.be(String(5 * 1000));
expect(query.scopedVars.__interval_ms.value).to.be(String(5 * 1000));
});
it('should account for intervalFactor', function() {
var query = {
Expand All @@ -507,7 +507,7 @@ describe('PrometheusDatasource', function() {
interval: '10s',
scopedVars: {
__interval: { text: '10s', value: '10s' },
__interval_ms: { text: 10 * 1000, value: 10 * 1000 },
__interval_ms: { text: String(10 * 1000), value: String(10 * 1000) },
},
};
var urlExpected =
Expand All @@ -518,8 +518,8 @@ describe('PrometheusDatasource', function() {

expect(query.scopedVars.__interval.text).to.be('10s');
expect(query.scopedVars.__interval.value).to.be('10s');
expect(query.scopedVars.__interval_ms.text).to.be(10 * 1000);
expect(query.scopedVars.__interval_ms.value).to.be(10 * 1000);
expect(query.scopedVars.__interval_ms.text).to.be(String(10 * 1000));
expect(query.scopedVars.__interval_ms.value).to.be(String(10 * 1000));
});
it('should be interval * intervalFactor when greater than min interval', function() {
var query = {
Expand All @@ -535,7 +535,7 @@ describe('PrometheusDatasource', function() {
interval: '5s',
scopedVars: {
__interval: { text: '5s', value: '5s' },
__interval_ms: { text: 5 * 1000, value: 5 * 1000 },
__interval_ms: { text: String(5 * 1000), value: String(5 * 1000) },
},
};
var urlExpected =
Expand All @@ -546,8 +546,8 @@ describe('PrometheusDatasource', function() {

expect(query.scopedVars.__interval.text).to.be('5s');
expect(query.scopedVars.__interval.value).to.be('5s');
expect(query.scopedVars.__interval_ms.text).to.be(5 * 1000);
expect(query.scopedVars.__interval_ms.value).to.be(5 * 1000);
expect(query.scopedVars.__interval_ms.text).to.be(String(5 * 1000));
expect(query.scopedVars.__interval_ms.value).to.be(String(5 * 1000));
});
it('should be min interval when greater than interval * intervalFactor', function() {
var query = {
Expand All @@ -563,7 +563,7 @@ describe('PrometheusDatasource', function() {
interval: '5s',
scopedVars: {
__interval: { text: '5s', value: '5s' },
__interval_ms: { text: 5 * 1000, value: 5 * 1000 },
__interval_ms: { text: String(5 * 1000), value: String(5 * 1000) },
},
};
var urlExpected =
Expand All @@ -574,8 +574,8 @@ describe('PrometheusDatasource', function() {

expect(query.scopedVars.__interval.text).to.be('5s');
expect(query.scopedVars.__interval.value).to.be('5s');
expect(query.scopedVars.__interval_ms.text).to.be(5 * 1000);
expect(query.scopedVars.__interval_ms.value).to.be(5 * 1000);
expect(query.scopedVars.__interval_ms.text).to.be(String(5 * 1000));
expect(query.scopedVars.__interval_ms.value).to.be(String(5 * 1000));
});
it('should be determined by the 11000 data points limit, accounting for intervalFactor', function() {
var query = {
Expand All @@ -590,7 +590,7 @@ describe('PrometheusDatasource', function() {
interval: '5s',
scopedVars: {
__interval: { text: '5s', value: '5s' },
__interval_ms: { text: 5 * 1000, value: 5 * 1000 },
__interval_ms: { text: String(5 * 1000), value: String(5 * 1000) },
},
};
var end = 7 * 24 * 60 * 60;
Expand All @@ -609,8 +609,8 @@ describe('PrometheusDatasource', function() {

expect(query.scopedVars.__interval.text).to.be('5s');
expect(query.scopedVars.__interval.value).to.be('5s');
expect(query.scopedVars.__interval_ms.text).to.be(5 * 1000);
expect(query.scopedVars.__interval_ms.value).to.be(5 * 1000);
expect(query.scopedVars.__interval_ms.text).to.be(String(5 * 1000));
expect(query.scopedVars.__interval_ms.value).to.be(String(5 * 1000));
});
});
});
Expand Down