diff --git a/.gitignore b/.gitignore index e0a0048b514..88bb7c6b8e0 100644 --- a/.gitignore +++ b/.gitignore @@ -17,5 +17,6 @@ src/css/*.min.css /data/* /bin/* /grafana-pro +/grafana grafana.custom.ini diff --git a/README.md b/README.md index a99d15676c3..e5eef25d513 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,8 @@ godep restore (will pull down all golang lib dependecies in your current GOPATH) go build -o ./bin/grafana . ``` -To build less to css for frontend: +To build less to css for the frontend you will need a recent version of of node (v0.12.0), +npm (v2.5.0) and grunt (v0.4.5). Run the following: ``` npm install diff --git a/pkg/cmd/import.go b/pkg/cmd/import.go index 1c3545904a2..aeea8cb17ed 100644 --- a/pkg/cmd/import.go +++ b/pkg/cmd/import.go @@ -106,6 +106,7 @@ func importDashboard(path string, accountId int64) error { if err := jsonParser.Decode(&dash.Data); err != nil { return err } + dash.Data["id"] = nil cmd := m.SaveDashboardCommand{ AccountId: accountId, diff --git a/src/app/directives/dashUpload.js b/src/app/directives/dashUpload.js index 889438dffc9..d9f8e3e4ae9 100644 --- a/src/app/directives/dashUpload.js +++ b/src/app/directives/dashUpload.js @@ -24,6 +24,7 @@ function (angular, kbn) { return; } var title = kbn.slugifyForUrl(window.grafanaImportDashboard.title); + window.grafanaImportDashboard.id = null; $location.path('/dashboard/import/' + title); }); };