Revert "support panel repeat for datasource template variable (#7711)"

This reverts commit 554f972a.

public/app/core/services/datasource_srv.js

@@ -14,12 +14,12 @@ function (angular, _, coreModule, config) {
       this.datasources = {};
       this.datasources = {};
     };
     };
 
 
-    this.get = function(name, scopedDsVars) {
+    this.get = function(name) {
       if (!name) {
       if (!name) {
         return this.get(config.defaultDatasource);
         return this.get(config.defaultDatasource);
       }
       }
 
 
-      name = templateSrv.replace(name, scopedDsVars || {});
+      name = templateSrv.replace(name);
 
 
       if (name === 'default') {
       if (name === 'default') {
         return this.get(config.defaultDatasource);
         return this.get(config.defaultDatasource);

public/app/features/panel/metrics_panel_ctrl.ts

@@ -92,7 +92,7 @@ class MetricsPanelCtrl extends PanelCtrl {
 
 
     // load datasource service
     // load datasource service
     this.setTimeQueryStart();
     this.setTimeQueryStart();
-    this.datasourceSrv.get(this.panel.datasource, this.panel.scopedVars)
+    this.datasourceSrv.get(this.panel.datasource)
     .then(this.updateTimeRange.bind(this))
     .then(this.updateTimeRange.bind(this))
     .then(this.issueQueries.bind(this))
     .then(this.issueQueries.bind(this))
     .then(this.handleQueryResult.bind(this))
     .then(this.handleQueryResult.bind(this))

public/app/features/templating/datasource_variable.ts

@@ -10,8 +10,6 @@ export class DatasourceVariable implements Variable {
   query: string;
   query: string;
   options: any;
   options: any;
   current: any;
   current: any;
-  multi: boolean;
-  includeAll: boolean;
   refresh: any;
   refresh: any;
 
 
  defaults = {
  defaults = {
@@ -23,8 +21,6 @@ export class DatasourceVariable implements Variable {
     regex: '',
     regex: '',
     options: [],
     options: [],
     query: '',
     query: '',
-    multi: false,
-    includeAll: false,
     refresh: 1,
     refresh: 1,
   };
   };
 
 
@@ -75,16 +71,9 @@ export class DatasourceVariable implements Variable {
     }
     }
 
 
     this.options = options;
     this.options = options;
-    if (this.includeAll) {
-      this.addAllOption();
-    }
     return this.variableSrv.validateVariableSelectionState(this);
     return this.variableSrv.validateVariableSelectionState(this);
   }
   }
 
 
-  addAllOption() {
-    this.options.unshift({text: 'All', value: "$__all"});
-  }
-
   dependsOn(variable) {
   dependsOn(variable) {
     if (this.regex) {
     if (this.regex) {
       return containsVariable(this.regex, variable.name);
       return containsVariable(this.regex, variable.name);
@@ -97,9 +86,6 @@ export class DatasourceVariable implements Variable {
   }
   }
 
 
   getValueForUrl() {
   getValueForUrl() {
-    if (this.current.text === 'All') {
-      return 'All';
-    }
     return this.current.value;
     return this.current.value;
   }
   }
 }
 }
@@ -107,6 +93,5 @@ export class DatasourceVariable implements Variable {
 variableTypes['datasource'] = {
 variableTypes['datasource'] = {
   name: 'Datasource',
   name: 'Datasource',
   ctor: DatasourceVariable,
   ctor: DatasourceVariable,
-  supportsMulti: true,
   description: 'Enabled you to dynamically switch the datasource for multiple panels',
   description: 'Enabled you to dynamically switch the datasource for multiple panels',
 };
 };