+
Selection Options
-
+
diff --git a/public/app/plugins/datasource/graphite/datasource.ts b/public/app/plugins/datasource/graphite/datasource.ts
index 515cd490937..77d44be22e0 100644
--- a/public/app/plugins/datasource/graphite/datasource.ts
+++ b/public/app/plugins/datasource/graphite/datasource.ts
@@ -31,7 +31,7 @@ export function GraphiteDatasource(instanceSettings, $q, backendSrv, templateSrv
}
if (options.format === 'png') {
- return $q.when(this.url + '/render' + '?' + params.join('&'));
+ return $q.when({data: this.url + '/render' + '?' + params.join('&')});
}
var httpOptions: any = {method: this.render_method, url: '/render'};
diff --git a/public/app/plugins/datasource/influxdb/partials/query.editor.html b/public/app/plugins/datasource/influxdb/partials/query.editor.html
index c2efe3093f4..c3a52531ef1 100644
--- a/public/app/plugins/datasource/influxdb/partials/query.editor.html
+++ b/public/app/plugins/datasource/influxdb/partials/query.editor.html
@@ -70,6 +70,10 @@
+
+
+
+
diff --git a/public/app/plugins/datasource/influxdb/query_part.ts b/public/app/plugins/datasource/influxdb/query_part.ts
index 922440bd482..63d70be5653 100644
--- a/public/app/plugins/datasource/influxdb/query_part.ts
+++ b/public/app/plugins/datasource/influxdb/query_part.ts
@@ -239,6 +239,24 @@ QueryPartDef.register({
renderer: functionRenderer,
});
+QueryPartDef.register({
+ type: 'difference',
+ addStrategy: addTransformationStrategy,
+ category: categories.Transformations,
+ params: [],
+ defaultParams: [],
+ renderer: functionRenderer,
+});
+
+QueryPartDef.register({
+ type: 'moving_average',
+ addStrategy: addTransformationStrategy,
+ category: categories.Transformations,
+ params: [{ name: "window", type: "number", options: [5, 10, 20, 30, 40]}],
+ defaultParams: [10],
+ renderer: functionRenderer,
+});
+
QueryPartDef.register({
type: 'stddev',
addStrategy: addTransformationStrategy,
diff --git a/public/app/plugins/datasource/prometheus/datasource.ts b/public/app/plugins/datasource/prometheus/datasource.ts
index 21d8c93aa94..ca7ef051ba0 100644
--- a/public/app/plugins/datasource/prometheus/datasource.ts
+++ b/public/app/plugins/datasource/prometheus/datasource.ts
@@ -63,11 +63,14 @@ export function PrometheusDatasource(instanceSettings, $q, backendSrv, templateS
var end = getPrometheusTime(options.range.to, true);
var queries = [];
+ var activeTargets = [];
+
options = _.clone(options);
_.each(options.targets, _.bind(function(target) {
if (!target.expr || target.hide) {
return;
}
+ activeTargets.push(target);
var query: any = {};
query.expr = templateSrv.replace(target.expr, options.scopedVars, interpolateQueryExpr);
@@ -109,7 +112,7 @@ export function PrometheusDatasource(instanceSettings, $q, backendSrv, templateS
delete self.lastErrors.query;
_.each(response.data.data.result, function(metricData) {
- result.push(self.transformMetricData(metricData, options.targets[index], start, end));
+ result.push(self.transformMetricData(metricData, activeTargets[index], start, end));
});
});
diff --git a/public/sass/_old_responsive.scss b/public/sass/_old_responsive.scss
index a388f9ae26e..a86d65a01e8 100644
--- a/public/sass/_old_responsive.scss
+++ b/public/sass/_old_responsive.scss
@@ -78,7 +78,7 @@
}
}
- .dashnav-dashboards-btn a {
+ .page-dashboard .navbar-page-btn {
max-width: none;
}
.gf-timepicker-nav-btn {
diff --git a/public/sass/base/_code.scss b/public/sass/base/_code.scss
index 4222c652193..a97f04bc84b 100644
--- a/public/sass/base/_code.scss
+++ b/public/sass/base/_code.scss
@@ -11,15 +11,12 @@ pre {
background-color: $code-tag-bg;
color: $text-color;
border: 1px solid $code-tag-border;
- padding: 10px;
border-radius: 4px;
}
// Inline code
code {
color: $text-color;
- background-color: $code-tag-bg;
- border: 1px solid darken($code-tag-bg, 15%);
white-space: nowrap;
padding: 2px 5px;
margin: 0 2px;
@@ -27,7 +24,7 @@ code {
code.code--small {
font-size: $font-size-xs;
- padding: 5px;
+ padding: 0.2rem;
margin: 0 2px;
}
@@ -41,6 +38,7 @@ pre {
white-space: pre;
white-space: pre-wrap;
background-color: $code-tag-bg;
+ padding: 10px;
// Make prettyprint styles more spaced out for readability
&.prettyprint {
diff --git a/public/test/specs/templateValuesSrv-specs.js b/public/test/specs/templateValuesSrv-specs.js
index 110cb548467..3f4cd96c444 100644
--- a/public/test/specs/templateValuesSrv-specs.js
+++ b/public/test/specs/templateValuesSrv-specs.js
@@ -92,6 +92,7 @@ define([
var ds = {};
ds.metricFindQuery = sinon.stub().returns(ctx.$q.when(scenario.queryResult));
ctx.datasourceSrv.get = sinon.stub().returns(ctx.$q.when(ds));
+ ctx.datasourceSrv.getMetricSources = sinon.stub().returns(scenario.metricSources);
ctx.service.updateOptions(scenario.variable);
ctx.$rootScope.$digest();
@@ -137,7 +138,6 @@ define([
});
});
-
describeUpdateVariable('interval variable with auto', function(scenario) {
scenario.setup(function() {
scenario.variable = { type: 'interval', query: '1s,2h,5h,1d', name: 'test', auto: true, auto_count: 10 };
@@ -237,7 +237,7 @@ define([
});
});
- describeUpdateVariable('regex pattern without slashes', function(scenario) {
+ describeUpdateVariable('regex pattern without slashes', function(scenario) {
scenario.setup(function() {
scenario.variable = { type: 'query', query: 'apps.*', name: 'test' };
scenario.variable.regex = 'backend_01';
@@ -284,6 +284,23 @@ define([
});
});
- });
+ describeUpdateVariable('datasource variable with regex filter', function(scenario) {
+ scenario.setup(function() {
+ scenario.variable = {type: 'datasource', query: 'graphite', name: 'test', current: {}, regex: '/pee$/' };
+ scenario.metricSources = [
+ {name: 'backend1', meta: {id: 'influx'}},
+ {name: 'backend2_pee', meta: {id: 'graphite'}},
+ {name: 'backend3', meta: {id: 'graphite'}},
+ {name: 'backend4_pee', meta: {id: 'graphite'}},
+ ];
+ });
+ it('should set only contain graphite ds and filtered using regex', function() {
+ expect(scenario.variable.options.length).to.be(2);
+ expect(scenario.variable.options[0].value).to.be('backend2_pee');
+ expect(scenario.variable.options[1].value).to.be('backend4_pee');
+ });
+ });
+
+ });
});