Commit 1a6bf692 by Torkel Ödegaard Committed by Dan Cech

fix: minor fixes

parent 38f4d5d0
......@@ -8,7 +8,6 @@ export class GraphiteConfigCtrl {
this.datasourceSrv = datasourceSrv;
this.current.jsonData = this.current.jsonData || {};
this.current.jsonData.graphiteVersion = this.current.jsonData.graphiteVersion || '0.9';
this.autoDetectGraphiteVersion();
}
......
......@@ -387,8 +387,7 @@ export function GraphiteDatasource(instanceSettings, $q, backendSrv, templateSrv
let httpOptions = {
method: 'GET',
url: '/version/_', // Prevent last / trimming
// for cancellations
url: '/version',
requestId: options.requestId,
};
......
......@@ -16,6 +16,7 @@
lookup-text="false"
allow-custom="true"
label-mode="true"
placeholder="Tag key"
css-class="query-segment-key"
get-options="ctrl.getTags($index, $query)"
on-change="ctrl.tagChanged(tag, $index)"
......@@ -36,7 +37,7 @@
allow-custom="true"
label-mode="true"
css-class="query-segment-value"
placeholder="select tag value"
placeholder="Tag value"
get-options="ctrl.getTagValues(tag, $index, $query)"
on-change="ctrl.tagChanged(tag, $index)"
start-open="!ctrl.showDelimiter($index)"
......
......@@ -26,6 +26,7 @@ describe('GraphiteQueryCtrl', function() {
ctx.datasource.metricFindQuery = sinon.stub().returns(ctx.$q.when([]));
ctx.datasource.getFuncDefs = sinon.stub().returns(ctx.$q.when(gfunc.getFuncDefs('1.0')));
ctx.datasource.getFuncDef = gfunc.getFuncDef;
ctx.datasource.waitForFuncDefsLoaded = ctx.$q.when(null);
ctx.datasource.createFuncInstance = gfunc.createFuncInstance;
ctx.panelCtrl = { panel: {} };
ctx.panelCtrl = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment