From 48c4e549f59b8ca0fce58f37ef5aa613413833a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Tue, 4 Apr 2017 09:28:33 +0200
Subject: [PATCH] Revert "support panel repeat for datasource template variable
 (#7711)"

This reverts commit 554f972a25f483e22db5d74aeb3fd3a9cbe89129.
---
 public/app/core/services/datasource_srv.js        |  4 ++--
 public/app/features/panel/metrics_panel_ctrl.ts   |  2 +-
 .../features/templating/datasource_variable.ts    | 15 ---------------
 3 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/public/app/core/services/datasource_srv.js b/public/app/core/services/datasource_srv.js
index bb187a7d5fb..e722aae355b 100644
--- a/public/app/core/services/datasource_srv.js
+++ b/public/app/core/services/datasource_srv.js
@@ -14,12 +14,12 @@ function (angular, _, coreModule, config) {
       this.datasources = {};
     };
 
-    this.get = function(name, scopedDsVars) {
+    this.get = function(name) {
       if (!name) {
         return this.get(config.defaultDatasource);
       }
 
-      name = templateSrv.replace(name, scopedDsVars || {});
+      name = templateSrv.replace(name);
 
       if (name === 'default') {
         return this.get(config.defaultDatasource);
diff --git a/public/app/features/panel/metrics_panel_ctrl.ts b/public/app/features/panel/metrics_panel_ctrl.ts
index 6f066723741..b42d4a8b02a 100644
--- a/public/app/features/panel/metrics_panel_ctrl.ts
+++ b/public/app/features/panel/metrics_panel_ctrl.ts
@@ -92,7 +92,7 @@ class MetricsPanelCtrl extends PanelCtrl {
 
     // load datasource service
     this.setTimeQueryStart();
-    this.datasourceSrv.get(this.panel.datasource, this.panel.scopedVars)
+    this.datasourceSrv.get(this.panel.datasource)
     .then(this.updateTimeRange.bind(this))
     .then(this.issueQueries.bind(this))
     .then(this.handleQueryResult.bind(this))
diff --git a/public/app/features/templating/datasource_variable.ts b/public/app/features/templating/datasource_variable.ts
index 66b0ab2eff9..41f2262ab4a 100644
--- a/public/app/features/templating/datasource_variable.ts
+++ b/public/app/features/templating/datasource_variable.ts
@@ -10,8 +10,6 @@ export class DatasourceVariable implements Variable {
   query: string;
   options: any;
   current: any;
-  multi: boolean;
-  includeAll: boolean;
   refresh: any;
 
  defaults = {
@@ -23,8 +21,6 @@ export class DatasourceVariable implements Variable {
     regex: '',
     options: [],
     query: '',
-    multi: false,
-    includeAll: false,
     refresh: 1,
   };
 
@@ -75,16 +71,9 @@ export class DatasourceVariable implements Variable {
     }
 
     this.options = options;
-    if (this.includeAll) {
-      this.addAllOption();
-    }
     return this.variableSrv.validateVariableSelectionState(this);
   }
 
-  addAllOption() {
-    this.options.unshift({text: 'All', value: "$__all"});
-  }
-
   dependsOn(variable) {
     if (this.regex) {
       return containsVariable(this.regex, variable.name);
@@ -97,9 +86,6 @@ export class DatasourceVariable implements Variable {
   }
 
   getValueForUrl() {
-    if (this.current.text === 'All') {
-      return 'All';
-    }
     return this.current.value;
   }
 }
@@ -107,6 +93,5 @@ export class DatasourceVariable implements Variable {
 variableTypes['datasource'] = {
   name: 'Datasource',
   ctor: DatasourceVariable,
-  supportsMulti: true,
   description: 'Enabled you to dynamically switch the datasource for multiple panels',
 };