Parcourir la source

import from graphite: set correct datasource for panel

Nikolay Bryskin il y a 11 ans
Parent
commit
ae9d9ea284
1 fichiers modifiés avec 5 ajouts et 4 suppressions
  1. 5 4
      src/app/controllers/graphiteImport.js

+ 5 - 4
src/app/controllers/graphiteImport.js

@@ -13,7 +13,7 @@ function (angular, app, _) {
     $scope.init = function() {
       console.log('hej!');
       $scope.datasources = datasourceSrv.listOptions();
-      $scope.setDatasource(datasourceSrv.default.value);
+      $scope.setDatasource(null);
     };
 
 
@@ -48,14 +48,14 @@ function (angular, app, _) {
             throw { message: 'no dashboard state received from graphite' };
           }
 
-          graphiteToGrafanaTranslator(results.data.state);
+          graphiteToGrafanaTranslator(results.data.state, $scope.datasource.name);
         })
         .then(null, function(err) {
           $scope.error = err.message || 'Failed to import dashboard';
         });
     };
 
-    function graphiteToGrafanaTranslator(state) {
+    function graphiteToGrafanaTranslator(state, datasource) {
       var graphsPerRow = 2;
       var rowHeight = 300;
       var rowTemplate;
@@ -85,7 +85,8 @@ function (angular, app, _) {
           type: 'graphite',
           span: 12 / graphsPerRow,
           title: graph[1].title,
-          targets: []
+          targets: [],
+          datasource: datasource
         };
 
         _.each(graph[1].target, function(target) {