From 1a6bf692c6627620972963b9196e78d12959f6fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Fri, 12 Jan 2018 13:07:50 +0100
Subject: [PATCH] fix: minor fixes

---
 public/app/plugins/datasource/graphite/config_ctrl.ts          | 1 -
 public/app/plugins/datasource/graphite/datasource.ts           | 3 +--
 .../app/plugins/datasource/graphite/partials/query.editor.html | 3 ++-
 .../app/plugins/datasource/graphite/specs/query_ctrl_specs.ts  | 1 +
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/app/plugins/datasource/graphite/config_ctrl.ts b/public/app/plugins/datasource/graphite/config_ctrl.ts
index 16a25bacbe5..b22a860315c 100644
--- a/public/app/plugins/datasource/graphite/config_ctrl.ts
+++ b/public/app/plugins/datasource/graphite/config_ctrl.ts
@@ -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();
   }
 
diff --git a/public/app/plugins/datasource/graphite/datasource.ts b/public/app/plugins/datasource/graphite/datasource.ts
index e33bee610b8..4fce3c33ccd 100644
--- a/public/app/plugins/datasource/graphite/datasource.ts
+++ b/public/app/plugins/datasource/graphite/datasource.ts
@@ -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,
     };
 
diff --git a/public/app/plugins/datasource/graphite/partials/query.editor.html b/public/app/plugins/datasource/graphite/partials/query.editor.html
index e267238ef96..8ff0b9c7adf 100755
--- a/public/app/plugins/datasource/graphite/partials/query.editor.html
+++ b/public/app/plugins/datasource/graphite/partials/query.editor.html
@@ -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)"
diff --git a/public/app/plugins/datasource/graphite/specs/query_ctrl_specs.ts b/public/app/plugins/datasource/graphite/specs/query_ctrl_specs.ts
index fbbd9134c3e..d956447e828 100644
--- a/public/app/plugins/datasource/graphite/specs/query_ctrl_specs.ts
+++ b/public/app/plugins/datasource/graphite/specs/query_ctrl_specs.ts
@@ -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 = {