From b483d42d34635e8f436798d0d331de59d83b14bc Mon Sep 17 00:00:00 2001
From: Dan Cech <dcech@grafana.com>
Date: Thu, 11 Jan 2018 11:21:02 -0500
Subject: [PATCH] fix issue with metric find & functions being loaded multiple
 times

---
 public/app/plugins/datasource/graphite/datasource.ts | 4 +++-
 public/app/plugins/datasource/graphite/query_ctrl.ts | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/public/app/plugins/datasource/graphite/datasource.ts b/public/app/plugins/datasource/graphite/datasource.ts
index 15f7c3ef961..b5e5d45e9fb 100644
--- a/public/app/plugins/datasource/graphite/datasource.ts
+++ b/public/app/plugins/datasource/graphite/datasource.ts
@@ -429,7 +429,7 @@ export function GraphiteDatasource(instanceSettings, $q, backendSrv, templateSrv
       url: '/functions',
     };
 
-    return self
+    self.funcDefs = self
       .doGraphiteRequest(httpOptions)
       .then(results => {
         if (results.status !== 200 || typeof results.data !== 'object') {
@@ -530,6 +530,8 @@ export function GraphiteDatasource(instanceSettings, $q, backendSrv, templateSrv
         self.funcDefs = gfunc.getFuncDefs(self.graphiteVersion);
         return self.funcDefs;
       });
+
+    return self.funcDefs;
   };
 
   this.testDatasource = function() {
diff --git a/public/app/plugins/datasource/graphite/query_ctrl.ts b/public/app/plugins/datasource/graphite/query_ctrl.ts
index d7bb924a4f6..5482fbcdd08 100644
--- a/public/app/plugins/datasource/graphite/query_ctrl.ts
+++ b/public/app/plugins/datasource/graphite/query_ctrl.ts
@@ -106,7 +106,7 @@ export class GraphiteQueryCtrl extends QueryCtrl {
   }
 
   getAltSegments(index, prefix) {
-    var query = '*' + prefix + '*';
+    var query = prefix && prefix.length > 0 ? '*' + prefix + '*' : '*';
     if (index > 0) {
       query = this.queryModel.getSegmentPathUpTo(index) + '.' + query;
     }