diff --git a/src/app/features/account/datasourcesCtrl.js b/src/app/features/account/datasourcesCtrl.js index 983c74b4b9e..b8f9f9fda7a 100644 --- a/src/app/features/account/datasourcesCtrl.js +++ b/src/app/features/account/datasourcesCtrl.js @@ -15,6 +15,13 @@ function (angular) { access: 'proxy' }; + $scope.types = [ + { name: 'Graphite', type: 'graphite' }, + { name: 'InfluxDB', type: 'influxdb' }, + { name: 'Elasticsearch', type: 'elasticsearch' }, + { name: 'OpenTSDB', type: 'opentsdb' }, + ]; + $scope.init = function() { $scope.reset(); $scope.editor = {index: 0}; diff --git a/src/app/features/account/importCtrl.js b/src/app/features/account/importCtrl.js new file mode 100644 index 00000000000..a8548491c60 --- /dev/null +++ b/src/app/features/account/importCtrl.js @@ -0,0 +1,78 @@ +define([ + 'angular', + 'lodash', +], +function (angular, _) { + 'use strict'; + + var module = angular.module('grafana.controllers'); + + module.controller('ImportCtrl', function($scope, $http, backendSrv, datasourceSrv) { + + $scope.init = function() { + $scope.datasources = []; + $scope.sourceName = 'grafana'; + $scope.destName = 'grafana'; + $scope.imported = []; + $scope.dashboards = []; + $scope.infoText = ''; + $scope.importing = false; + + _.each(datasourceSrv.getAll(), function(ds) { + if (ds.type === 'influxdb' || ds.type === 'elasticsearch') { + $scope.sourceName = ds.name; + $scope.datasources.push(ds.name); + } else if (ds.type === 'grafana') { + $scope.datasources.push(ds.name); + } + }); + }; + + $scope.startImport = function() { + $scope.sourceDs = datasourceSrv.get($scope.sourceName); + $scope.destDs = datasourceSrv.get($scope.destName); + + $scope.sourceDs.searchDashboards('title:').then(function(results) { + $scope.dashboards = results.dashboards; + + if ($scope.dashboards.length === 0) { + $scope.infoText = 'No dashboards found'; + return; + } + + $scope.importing = true; + $scope.imported = []; + $scope.next(); + }); + }; + + $scope.next = function() { + if ($scope.dashboards.length === 0) { + $scope.infoText = "Done! Imported " + $scope.imported.length + " dashboards"; + } + + var dash = $scope.dashboards.shift(); + if (!dash.title) { + console.log(dash); + return; + } + + var infoObj = {name: dash.title, info: 'Importing...'}; + $scope.imported.push(infoObj); + $scope.infoText = "Importing " + $scope.imported.length + '/' + ($scope.imported.length + $scope.dashboards.length); + + $scope.sourceDs.getDashboard(dash.id).then(function(loadedDash) { + $scope.destDs.saveDashboard(loadedDash).then(function() { + infoObj.info = "Done!"; + $scope.next(); + }, function(err) { + infoObj.info = "Error: " + err; + $scope.next(); + }); + }); + }; + + $scope.init(); + + }); +}); diff --git a/src/app/features/account/partials/collaborators.html b/src/app/features/account/partials/collaborators.html index e66a55d0766..4d3f581c069 100644 --- a/src/app/features/account/partials/collaborators.html +++ b/src/app/features/account/partials/collaborators.html @@ -17,20 +17,20 @@
diff --git a/src/app/features/account/partials/datasources.html b/src/app/features/account/partials/datasources.html index 86264721cbe..4f5f2399d98 100644 --- a/src/app/features/account/partials/datasources.html +++ b/src/app/features/account/partials/datasources.html @@ -70,7 +70,7 @@
- +
@@ -103,6 +103,15 @@ +
+
+
Elastic search details
+
+ + +
+
+
diff --git a/src/app/features/account/partials/import.html b/src/app/features/account/partials/import.html new file mode 100644 index 00000000000..3ce6e101b1b --- /dev/null +++ b/src/app/features/account/partials/import.html @@ -0,0 +1,59 @@ +
+ +
+ +
+
+ + Import Dashboards +
+
+ +
+ +
+
+
+
    +
  • + Dashboard source +
    • +
  • + +
    • +
  • + Destination +
    • +
  • + +
    • +
  • + +
    • +
+
+
+
+
+ +
+
+
{{infoText}}
+ +
+ + + + + +
{{dash.name}} + {{dash.info}} +
+
+
+
+
+
+ diff --git a/src/app/features/admin/partials/accounts.html b/src/app/features/admin/partials/accounts.html index ffd6c701582..d8dffe75044 100644 --- a/src/app/features/admin/partials/accounts.html +++ b/src/app/features/admin/partials/accounts.html @@ -1,37 +1,39 @@ -
+
-
-
+
- - - - - - - - - - - - - - - - - -
IdLoginEmailNameAdmin
{{account.id}}{{account.login}}{{account.email}}{{account.name}}{{account.isAdmin}} - - - Edit - -    - - - -
+
+
+ + + + + + + + + + + + + + + + + +
IdLoginEmailNameAdmin
{{account.id}}{{account.login}}{{account.email}}{{account.name}}{{account.isAdmin}} + + + Edit + +    + + + +
+
diff --git a/src/app/features/all.js b/src/app/features/all.js index 6b22c50e98c..f3833c65906 100644 --- a/src/app/features/all.js +++ b/src/app/features/all.js @@ -11,6 +11,7 @@ define([ './account/collaboratorsCtrl', './account/datasourcesCtrl', './account/apiKeysCtrl', + './account/importCtrl', './admin/accountsCtrl', './grafanaDatasource/datasource', ], function () {}); diff --git a/src/app/features/annotations/partials/editor.html b/src/app/features/annotations/partials/editor.html index 14208dc2ab2..ae2d624edd9 100644 --- a/src/app/features/annotations/partials/editor.html +++ b/src/app/features/annotations/partials/editor.html @@ -26,7 +26,7 @@ {{annotation.name}} - + Edit @@ -34,7 +34,7 @@ - + diff --git a/src/app/features/elasticsearch/datasource.js b/src/app/features/elasticsearch/datasource.js index 3c82d98f8d2..0ca8ec853f1 100644 --- a/src/app/features/elasticsearch/datasource.js +++ b/src/app/features/elasticsearch/datasource.js @@ -13,7 +13,7 @@ function (angular, _, config, kbn, moment) { module.factory('ElasticDatasource', function($q, $http, templateSrv) { function ElasticDatasource(datasource) { - this.type = 'elastic'; + this.type = 'elasticsearch'; this.basicAuth = datasource.basicAuth; this.url = datasource.url; this.name = datasource.name; diff --git a/src/app/features/influxdb/datasource.js b/src/app/features/influxdb/datasource.js index cef933d8d42..692fdbdbbf1 100644 --- a/src/app/features/influxdb/datasource.js +++ b/src/app/features/influxdb/datasource.js @@ -15,7 +15,7 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) { module.factory('InfluxDatasource', function($q, $http, templateSrv) { function InfluxDatasource(datasource) { - this.type = 'influxDB'; + this.type = 'influxdb'; this.urls = datasource.urls; this.username = datasource.username; this.password = datasource.password; diff --git a/src/app/partials/sidemenu.html b/src/app/partials/sidemenu.html index 25aeca4c93d..207688965b9 100644 --- a/src/app/partials/sidemenu.html +++ b/src/app/partials/sidemenu.html @@ -26,6 +26,10 @@ API Keys + + + Import + Admin diff --git a/src/app/routes/backend/all.js b/src/app/routes/backend/all.js index ec26356038c..740baf48c17 100644 --- a/src/app/routes/backend/all.js +++ b/src/app/routes/backend/all.js @@ -42,6 +42,10 @@ define([ templateUrl: 'app/features/account/partials/apikeys.html', controller : 'ApiKeysCtrl', }) + .when('/account/import', { + templateUrl: 'app/features/account/partials/import.html', + controller : 'ImportCtrl', + }) .when('/account', { templateUrl: 'app/features/account/partials/account.html', controller : 'AccountCtrl', diff --git a/src/app/services/datasourceSrv.js b/src/app/services/datasourceSrv.js index e77ca7077e8..1a2c4db5f35 100644 --- a/src/app/services/datasourceSrv.js +++ b/src/app/services/datasourceSrv.js @@ -82,6 +82,10 @@ function (angular, _, config) { return this.default; }; + this.getAll = function() { + return datasources; + }; + this.getAnnotationSources = function() { return annotationSources; };