apitech
/
grafana
mirror of https://github.com/grafana/grafana
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat(import): more import work

Browse Source
pull/5160/head
Torkel Ödegaard 9 years ago
parent d9d46096dd
commit 7cd663bbe8
13 changed files with 92 additions and 59 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      pkg/api/dtos/plugins.go
  2. 3
      pkg/api/plugins.go
  3. 29
      pkg/plugins/dashboard_importer.go
  4. 33
      pkg/plugins/dashboards.go
  5. 2
      public/app/core/components/search/search.html
  6. 5
      public/app/core/components/search/search.ts
  7. 17
      public/app/core/directives/dash_edit_link.js
  8. 10
      public/app/core/services/datasource_srv.js
  9. 3
      public/app/core/services/util_srv.ts
  10. 2
      public/app/features/dashboard/import/import.html
  11. 23
      public/app/features/dashboard/import/import.ts
  12. 12
      public/app/features/plugins/import_list/import_list.html
  13. 6
      public/app/features/plugins/import_list/import_list.ts

6
pkg/api/dtos/plugins.go
Unescape View File

@ -1,6 +1,9 @@
package dtos
import "github.com/grafana/grafana/pkg/plugins"
import (
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/plugins"
)
type PluginSetting struct {
Name string `json:"name"`
@ -50,5 +53,6 @@ type ImportDashboardCommand struct {
PluginId string `json:"pluginId"`
Path string `json:"path"`
Overwrite bool `json:"overwrite"`
Dashboard *simplejson.Json `json:"dashboard"`
Inputs []plugins.ImportDashboardInput `json:"inputs"`
}

3
pkg/api/plugins.go
Unescape View File

@ -168,10 +168,11 @@ func ImportDashboard(c *middleware.Context, apiCmd dtos.ImportDashboardCommand)
Path: apiCmd.Path,
Inputs: apiCmd.Inputs,
Overwrite: apiCmd.Overwrite,
Dashboard: apiCmd.Dashboard,
}
if err := bus.Dispatch(&cmd); err != nil {
return ApiError(500, "Failed to install dashboard", err)
return ApiError(500, "Failed to import dashboard", err)
}
return Json(200, cmd.Result)

29
pkg/plugins/dashboard_importer.go
Unescape View File

@ -11,6 +11,7 @@ import (
)
type ImportDashboardCommand struct {
Dashboard *simplejson.Json
Path string
Inputs []ImportDashboardInput
Overwrite bool
@ -41,17 +42,15 @@ func init() {
}
func ImportDashboard(cmd *ImportDashboardCommand) error {
plugin, exists := Plugins[cmd.PluginId]
if !exists {
return PluginNotFoundError{cmd.PluginId}
}
var dashboard *m.Dashboard
var err error
if dashboard, err = loadPluginDashboard(plugin, cmd.Path); err != nil {
return err
if cmd.PluginId != "" {
if dashboard, err = loadPluginDashboard(cmd.PluginId, cmd.Path); err != nil {
return err
}
} else {
dashboard = m.NewDashboardFromJson(cmd.Dashboard)
}
evaluator := &DashTemplateEvaluator{
@ -76,13 +75,13 @@ func ImportDashboard(cmd *ImportDashboardCommand) error {
}
cmd.Result = &PluginDashboardInfoDTO{
PluginId: cmd.PluginId,
Title: dashboard.Title,
Path: cmd.Path,
Revision: dashboard.GetString("revision", "1.0"),
InstalledUri: "db/" + saveCmd.Result.Slug,
InstalledRevision: dashboard.GetString("revision", "1.0"),
Installed: true,
PluginId: cmd.PluginId,
Title: dashboard.Title,
Path: cmd.Path,
Revision: dashboard.Data.Get("revision").MustInt64(1),
ImportedUri: "db/" + saveCmd.Result.Slug,
ImportedRevision: dashboard.Data.Get("revision").MustInt64(1),
Imported: true,
}
return nil

33
pkg/plugins/dashboards.go
Unescape View File

@ -10,14 +10,14 @@ import (
)
type PluginDashboardInfoDTO struct {
PluginId string `json:"pluginId"`
Title string `json:"title"`
Installed bool `json:"installed"`
InstalledUri string `json:"installedUri"`
InstalledRevision string `json:"installedRevision"`
Revision string `json:"revision"`
Description string `json:"description"`
Path string `json:"path"`
PluginId string `json:"pluginId"`
Title string `json:"title"`
Imported bool `json:"imported"`
ImportedUri string `json:"importedUri"`
ImportedRevision int64 `json:"importedRevision"`
Revision int64 `json:"revision"`
Description string `json:"description"`
Path string `json:"path"`
}
func GetPluginDashboards(orgId int64, pluginId string) ([]*PluginDashboardInfoDTO, error) {
@ -42,7 +42,12 @@ func GetPluginDashboards(orgId int64, pluginId string) ([]*PluginDashboardInfoDT
return result, nil
}
func loadPluginDashboard(plugin *PluginBase, path string) (*m.Dashboard, error) {
func loadPluginDashboard(pluginId, path string) (*m.Dashboard, error) {
plugin, exists := Plugins[pluginId]
if !exists {
return nil, PluginNotFoundError{pluginId}
}
dashboardFilePath := filepath.Join(plugin.PluginDir, path)
reader, err := os.Open(dashboardFilePath)
@ -66,14 +71,14 @@ func getDashboardImportStatus(orgId int64, plugin *PluginBase, path string) (*Pl
var dashboard *m.Dashboard
var err error
if dashboard, err = loadPluginDashboard(plugin, path); err != nil {
if dashboard, err = loadPluginDashboard(plugin.Id, path); err != nil {
return nil, err
}
res.Path = path
res.PluginId = plugin.Id
res.Title = dashboard.Title
res.Revision = dashboard.GetString("revision", "1.0")
res.Revision = dashboard.Data.Get("revision").MustInt64(1)
query := m.GetDashboardQuery{OrgId: orgId, Slug: dashboard.Slug}
@ -82,9 +87,9 @@ func getDashboardImportStatus(orgId int64, plugin *PluginBase, path string) (*Pl
return nil, err
}
} else {
res.Installed = true
res.InstalledUri = "db/" + query.Result.Slug
res.InstalledRevision = query.Result.GetString("revision", "1.0")
res.Imported = true
res.ImportedUri = "db/" + query.Result.Slug
res.ImportedRevision = query.Result.Data.Get("revision").MustInt64(1)
}
return res, nil

2
public/app/core/components/search/search.html
Unescape View File

@ -67,7 +67,7 @@
Create New
</a>
<a class="btn btn-inverse pull-left" ng-click="ctrl.import()" ng-show="ctrl.contextSrv.isEditor" ng-click="ctrl.isOpen = false;">
<a class="btn btn-inverse pull-left" href="dashboard/new/?editview=import" ng-show="ctrl.contextSrv.isEditor" ng-click="ctrl.isOpen = false;">
<i class="fa fa-upload"></i>
Import
</a>

5
public/app/core/components/search/search.ts
Unescape View File

@ -149,11 +149,6 @@ export class SearchCtrl {
this.searchDashboards();
};
import() {
appEvents.emit('show-modal', {
templateHtml: '<dash-import></dash-import>',
});
}
}
export function searchDirective() {

17
public/app/core/directives/dash_edit_link.js
Unescape View File

@ -12,7 +12,7 @@ function ($, coreModule) {
'import': { src: '<dash-import></dash-import>' }
};
coreModule.default.directive('dashEditorView', function($compile, $location) {
coreModule.default.directive('dashEditorView', function($compile, $location, $rootScope) {
return {
restrict: 'A',
link: function(scope, elem) {
@ -57,6 +57,21 @@ function ($, coreModule) {
}
};
if (editview === 'import') {
var modalScope = $rootScope.$new();
modalScope.$on("$destroy", function() {
editorScope.dismiss();
});
$rootScope.appEvent('show-modal', {
templateHtml: '<dash-import></dash-import>',
scope: modalScope,
backdrop: 'static'
});
return;
}
var view = payload.src;
if (view.indexOf('.html') > 0) {
view = $('<div class="tabbed-view" ng-include="' + "'" + view + "'" + '"></div>');

10
public/app/core/services/datasource_srv.js
Unescape View File

@ -81,11 +81,11 @@ function (angular, _, coreModule, config) {
_.each(config.datasources, function(value, key) {
if (value.meta && value.meta.metrics) {
metricSources.push({
value: key === config.defaultDatasource ? null : key,
name: key,
meta: value.meta,
});
metricSources.push({value: key, name: key, meta: value.meta});
if (key === config.defaultDatasource) {
metricSources.push({value: null, name: 'default', meta: value.meta});
}
}
});

3
public/app/core/services/util_srv.ts
Unescape View File

@ -30,7 +30,8 @@ export class UtilSrv {
persist: false,
show: false,
scope: options.scope,
keyboard: false
keyboard: false,
backdrop: options.backdrop
});
Promise.resolve(modal).then(function(modalEl) {

2
public/app/features/dashboard/import/import.html
Unescape View File

@ -84,7 +84,7 @@
</div>
<div class="gf-form-button-row">
<button type="button" class="btn gf-form-btn width-10" ng-click="ctrl.saveDashboard()" ng-class="{'btn-danger': ctrl.nameExists, 'btn-success': !ctrl.nameExists}" ng-disable="!ctrl.inputsOk">
<button type="button" class="btn gf-form-btn width-10" ng-click="ctrl.saveDashboard()" ng-class="{'btn-danger': ctrl.nameExists, 'btn-success': !ctrl.nameExists}" ng-disabled="!ctrl.inputsValid">
<i class="fa fa-save"></i> Save &amp; Open
</button>
<a class="btn btn-link" ng-click="dismiss()">Cancel</a>

23
public/app/features/dashboard/import/import.ts
Unescape View File

@ -12,7 +12,6 @@ export class DashImportCtrl {
parseError: string;
nameExists: boolean;
dash: any;
dismiss: any;
inputs: any[];
inputsValid: boolean;
@ -33,6 +32,7 @@ export class DashImportCtrl {
var inputModel = {
name: input.name,
type: input.type,
pluginId: input.pluginId,
options: []
};
@ -64,7 +64,7 @@ export class DashImportCtrl {
});
}
inputOptionChanged() {
inputValueChanged() {
this.inputsValid = true;
for (let input of this.inputs) {
if (!input.value) {
@ -86,9 +86,22 @@ export class DashImportCtrl {
}
saveDashboard() {
return this.backendSrv.saveDashboard(this.dash, {overwrite: true}).then(res => {
this.$location.url('dashboard/db/' + res.slug);
this.dismiss();
var inputs = this.inputs.map(input => {
return {
name: input.name,
type: input.type,
pluginId: input.pluginId,
value: input.value
};
});
return this.backendSrv.post('api/dashboards/import', {
dashboard: this.dash,
overwrite: true,
inputs: inputs
}).then(res => {
this.$location.url('dashboard/' + res.importedUri);
this.$scope.dismiss();
});
}

12
public/app/features/plugins/import_list/import_list.html
Unescape View File

@ -6,27 +6,27 @@
<i class="icon-gf icon-gf-dashboard"></i>
</td>
<td>
<a href="dashboard/{{dash.installedUri}}" ng-show="dash.installed">
<a href="dashboard/{{dash.importedUri}}" ng-show="dash.imported">
{{dash.title}}
</a>
<span ng-show="!dash.installed">
<span ng-show="!dash.imported">
{{dash.title}}
</span>
</td>
<td>
v{{dash.revision}}
<span ng-if="dash.installed">
&nbsp;(Imported v{{dash.installedRevision}})
&nbsp;(Imported v{{dash.importedRevision}})
<span>
</td>
<td style="text-align: right">
<button class="btn btn-secondary" ng-click="ctrl.import(dash, false)" ng-show="!dash.installed">
<button class="btn btn-secondary" ng-click="ctrl.import(dash, false)" ng-show="!dash.imported">
Import
</button>
<button class="btn btn-secondary" ng-click="ctrl.import(dash, true)" ng-show="dash.installed">
<button class="btn btn-secondary" ng-click="ctrl.import(dash, true)" ng-show="dash.imported">
Update
</button>
<button class="btn btn-danger" ng-click="ctrl.remove(dash)" ng-show="dash.installed">
<button class="btn btn-danger" ng-click="ctrl.remove(dash)" ng-show="dash.imported">
Delete
</button>
</td>

6
public/app/features/plugins/import_list/import_list.ts
Unescape View File

@ -61,15 +61,15 @@ export class DashImportListCtrl {
}
return this.backendSrv.post(`/api/dashboards/import`, installCmd).then(res => {
this.$rootScope.appEvent('alert-success', ['Dashboard Installed', dash.title]);
this.$rootScope.appEvent('alert-success', ['Dashboard Imported', dash.title]);
_.extend(dash, res);
});
}
remove(dash) {
this.backendSrv.delete('/api/dashboards/' + dash.installedUri).then(() => {
this.backendSrv.delete('/api/dashboards/' + dash.importedUri).then(() => {
this.$rootScope.appEvent('alert-success', ['Dashboard Deleted', dash.title]);
dash.installed = false;
dash.imported = false;
});
}
}

Write Preview
Loading…
Cancel
Save