diff --git a/docs/sources/reference/export_import.md b/docs/sources/reference/export_import.md index bfcdd7bd0d1..8ae39cb0cf2 100644 --- a/docs/sources/reference/export_import.md +++ b/docs/sources/reference/export_import.md @@ -6,45 +6,5 @@ page_keywords: grafana, export, import, documentation # Export and Import -## Export (Json file) - -Load the dashboard you wish to export (e.g. via search) - -Click on the "Save" icon (floppy disk) - -![](/img/v1/export_import_save_menu.png) - -Click on "Export schema" - -![](/img/v1/export_schema_link.png) - -Save file on local disk - -![](/img/v1/export_save_file.png) - -## Import - -Click the "Search" icon (open folder) - -![](/img/v1/export_import_search_menu.png) - -Click "Import" button - -![](/img/v1/export_import_button.png) - -Click "Browse" button and browse to previously exported dashboard on local disk (which should be a valid Json file) - -![](/img/v1/export_import_browse_button.png) - -Select exported dashboard - -![](/img/v1/export_import_popup.png) - - -Click "Save" icon to show save menu - -![](/img/v1/export_import_save_menu.png) - -Click new save icon (floppy disk) to Save newly imported dashboard - -![](/img/v1/export_import_save_dashboard.png) +You find the import view in the bottom of the search dropdown. From this view you +can import local json files or migrate dashboards stored in Elasticsearch or InfluxDB. diff --git a/docs/sources/reference/playlist.md b/docs/sources/reference/playlist.md index 0f81bfe48fc..e45219657a9 100644 --- a/docs/sources/reference/playlist.md +++ b/docs/sources/reference/playlist.md @@ -6,28 +6,6 @@ page_keywords: grafana, playlist, documentation # Playlist Guide -In Grafana v1.5 a playlist feature was added. You can use this feature by first marking a couple - of dashboards as favorites. This is accomplished in the Save menu. Click on the save icon and then _Mark As Favorite_. +*TODO* - -## Step 1 - Mark as favorire -![](/img/v1/mark_as_favorite.png) - -Then open the playlist modal. You will find this button in the open dashboard / search popup (CTRL+F). - -## Step 2 - Open playlist view -![](/img/v1/playlist_button.png) - -This opens the playlist view. - -## Step 3 - Select dashbords and interval - -![](/img/v1/playlist_modal.png) - -In this view you can select the dashboards you want to include in the playlist, and even remove dashboards from you favorites list. Set the time span between dashboard change, for example 1m, 10m, 1h for 1 minute, 10 minute or 1 hour interval. - -To start the dashboard click the Start button. - -When a dashboard playlist is running, most menu buttons and dashboard controls are hidden. This is in order to present as clear a view of the dashboard as possible for big tv displays. Click the stop playlist link in the top menu to the right to stop the playlist. - -![](playlist_playing_hiden_menu.png) +Needs update for Grafana 2.0 diff --git a/public/app/features/dashboard/all.js b/public/app/features/dashboard/all.js index 1380034dd19..a279e9f3078 100644 --- a/public/app/features/dashboard/all.js +++ b/public/app/features/dashboard/all.js @@ -5,7 +5,7 @@ define([ './saveDashboardAsCtrl', './playlistCtrl', './rowCtrl', - './sharePanelCtrl', + './shareModalCtrl', './shareSnapshotCtrl', './submenuCtrl', './dashboardSrv', diff --git a/public/app/features/dashboard/dashboardNavCtrl.js b/public/app/features/dashboard/dashboardNavCtrl.js index 6c017ae856e..5334852d967 100644 --- a/public/app/features/dashboard/dashboardNavCtrl.js +++ b/public/app/features/dashboard/dashboardNavCtrl.js @@ -37,7 +37,7 @@ function (angular, _) { $scope.shareDashboard = function() { $scope.appEvent('show-modal', { - src: './app/features/dashboard/partials/shareDashboard.html', + src: './app/features/dashboard/partials/shareModal.html', scope: $scope.$new(), }); }; diff --git a/public/app/features/dashboard/dashboardSrv.js b/public/app/features/dashboard/dashboardSrv.js index 20f04b421d7..dc01a328b12 100644 --- a/public/app/features/dashboard/dashboardSrv.js +++ b/public/app/features/dashboard/dashboardSrv.js @@ -78,6 +78,19 @@ function (angular, $, kbn, _, moment) { } }; + p.getPanelById = function(id) { + for (var i = 0; i < this.rows.length; i++) { + var row = this.rows[i]; + for (var j = 0; j < row.panels.length; j++) { + var panel = row.panels[j]; + if (panel.id === id) { + return panel; + } + } + } + return null; + }; + p.rowSpan = function(row) { return _.reduce(row.panels, function(p,v) { return p + v.span; diff --git a/public/app/features/dashboard/partials/shareDashboard.html b/public/app/features/dashboard/partials/shareModal.html similarity index 58% rename from public/app/features/dashboard/partials/shareDashboard.html rename to public/app/features/dashboard/partials/shareModal.html index 295ac71e0f5..881d30ada97 100644 --- a/public/app/features/dashboard/partials/shareDashboard.html +++ b/public/app/features/dashboard/partials/shareModal.html @@ -1,12 +1,12 @@ -