diff --git a/docs/sources/guides/index.md b/docs/sources/guides/index.md
index c80dd624624..2ea09142880 100644
--- a/docs/sources/guides/index.md
+++ b/docs/sources/guides/index.md
@@ -4,6 +4,6 @@ type = "docs"
[menu.docs]
name = "Getting Started"
identifier = "guides"
-weight = 2
+weight = 3
+++
diff --git a/docs/sources/guides/whats-new-in-v5.md b/docs/sources/guides/whats-new-in-v5.md
new file mode 100644
index 00000000000..bd960ed1694
--- /dev/null
+++ b/docs/sources/guides/whats-new-in-v5.md
@@ -0,0 +1,154 @@
++++
+title = "What's New in Grafana v5.0"
+description = "Feature & improvement highlights for Grafana v5.0"
+keywords = ["grafana", "new", "documentation", "5.0"]
+type = "docs"
+[menu.docs]
+name = "Version 5.0"
+identifier = "v5.0"
+parent = "whatsnew"
+weight = -6
++++
+
+# What's New in Grafana v5.0
+
+> Out in beta: [Download now!](https://grafana.com/grafana/download/5.0.0-beta1)
+
+This is the most substantial update that Grafana has ever seen. This article will detail the major new features and enhancements.
+
+- [New Dashboard Layout Engine]({{< relref "#new-dashboard-layout-engine" >}}) enables a much easier drag, drop and resize experience and new types of layouts.
+- [New UX]({{< relref "#new-ux-layout-engine" >}}). The UI has big improvements in both look and function.
+- [New Light Theme]({{< relref "#new-light-theme" >}}) is now looking really nice.
+- [Dashboard Folders]({{< relref "#dashboard-folders" >}}) helps you keep your dashboards organized.
+- [Permissions]({{< relref "#dashboard-folders" >}}) on folders and dashboards helps manage larger Grafana installations.
+- [Group users into teams]({{< relref "#teams" >}}) and use them in the new permission system.
+- [Datasource provisioning]({{< relref "#data-sources" >}}) makes it possible to setup datasources via config files.
+- [Dashboard provisioning]({{< relref "#dashboards" >}}) makes it possible to setup dashboards via config files.
+- [Persistent dashboard url's]({{< relref "#dashboard-model-persistent-url-s-and-api-changes" >}}) makes it possible to rename dashboards without breaking links.
+- [Graphite Tags & Integrated Function Docs]({{< relref "#graphite-tags-integrated-function-docs" >}}).
+
+### Video showing new features
+
+
+## [auth.basic] @@ -607,31 +671,6 @@ session provider you have configured. - **memcache:** ex: 127.0.0.1:11211 - **redis:** ex: `addr=127.0.0.1:6379,pool_size=100,prefix=grafana` -If you use MySQL or Postgres as the session store you need to create the -session table manually. - -Mysql Example: - -```bash -CREATE TABLE `session` ( - `key` CHAR(16) NOT NULL, - `data` BLOB, - `expiry` INT(11) UNSIGNED NOT NULL, - PRIMARY KEY (`key`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; -``` - -Postgres Example: - -```bash -CREATE TABLE session ( - key CHAR(16) NOT NULL, - data BYTEA, - expiry INTEGER NOT NULL, - PRIMARY KEY (key) -); -``` - Postgres valid `sslmode` are `disable`, `require`, `verify-ca`, and `verify-full` (default). ### cookie_name @@ -766,7 +805,7 @@ Time to live for snapshots. These options control how images should be made public so they can be shared on services like slack. ### provider -You can choose between (s3, webdav, gcs, azure_blob). If left empty Grafana will ignore the upload action. +You can choose between (s3, webdav, gcs, azure_blob, local). If left empty Grafana will ignore the upload action. ## [external_image_storage.s3] diff --git a/docs/sources/installation/debian.md b/docs/sources/installation/debian.md index b742e96c869..bfc7fdc0a3d 100644 --- a/docs/sources/installation/debian.md +++ b/docs/sources/installation/debian.md @@ -16,6 +16,7 @@ weight = 1 Description | Download ------------ | ------------- Stable for Debian-based Linux | [grafana_4.6.3_amd64.deb](https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana_4.6.3_amd64.deb) +Beta for Debian-based Linux | [grafana_5.0.0-beta1_amd64.deb](https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana_5.0.0-beta1_amd64.deb) Read [Upgrading Grafana]({{< relref "installation/upgrading.md" >}}) for tips and guidance on updating an existing installation. @@ -27,6 +28,15 @@ installation. wget https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana_4.6.3_amd64.deb sudo apt-get install -y adduser libfontconfig sudo dpkg -i grafana_4.6.3_amd64.deb +``` + +## Install Latest Beta + +```bash +wget https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana_5.0.0-beta1_amd64.deb +sudo apt-get install -y adduser libfontconfig +sudo dpkg -i grafana_5.0.0-beta1_amd64.deb + ``` ## APT Repository diff --git a/docs/sources/installation/index.md b/docs/sources/installation/index.md index 47d52817b64..a86f426dc13 100644 --- a/docs/sources/installation/index.md +++ b/docs/sources/installation/index.md @@ -7,6 +7,7 @@ aliases = ["installation/installation/", "v2.1/installation/install/"] [menu.docs] name = "Installation" identifier = "installation" +weight = 1 +++ ## Installing Grafana diff --git a/docs/sources/installation/rpm.md b/docs/sources/installation/rpm.md index d3e796a78c8..f0c498c819f 100644 --- a/docs/sources/installation/rpm.md +++ b/docs/sources/installation/rpm.md @@ -16,6 +16,7 @@ weight = 2 Description | Download ------------ | ------------- Stable for CentOS / Fedora / OpenSuse / Redhat Linux | [4.6.3 (x86-64 rpm)](https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-4.6.3-1.x86_64.rpm) +Latest Beta for CentOS / Fedora / OpenSuse / Redhat Linux | [5.0.0-beta1 (x86-64 rpm)](https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.0.0-beta1.x86_64.rpm) Read [Upgrading Grafana]({{< relref "installation/upgrading.md" >}}) for tips and guidance on updating an existing installation. @@ -28,6 +29,12 @@ You can install Grafana using Yum directly. $ sudo yum install https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-4.6.3-1.x86_64.rpm ``` +## Install Beta + +```bash +$ sudo yum install https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.0.0-beta1.x86_64.rpm +``` + Or install manually using `rpm`. #### On CentOS / Fedora / Redhat: diff --git a/docs/sources/installation/upgrading.md b/docs/sources/installation/upgrading.md index 6a4b4e8f047..af40c20a40b 100644 --- a/docs/sources/installation/upgrading.md +++ b/docs/sources/installation/upgrading.md @@ -101,3 +101,8 @@ as this will make upgrades easier without risking losing your config changes. ## Upgrading from 2.x We are not aware of any issues upgrading directly from 2.x to 4.x but to be on the safe side go via 3.x => 4.x. + +## Upgrading to v5.0 + +The dashboard grid layout engine has changed. All dashboards will be automatically upgraded to new +positioning system when you load them in v5. Dashboards saved in v5 will not work in older versions of Grafana. diff --git a/docs/sources/installation/windows.md b/docs/sources/installation/windows.md index 7c6a97085df..08d234d63f9 100644 --- a/docs/sources/installation/windows.md +++ b/docs/sources/installation/windows.md @@ -14,6 +14,7 @@ weight = 3 Description | Download ------------ | ------------- Latest stable package for Windows | [grafana.4.6.3.windows-x64.zip](https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-4.6.3.windows-x64.zip) +Latest beta package for Windows | [grafana.5.0.0-beta1.windows-x64.zip](https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.0.0-beta1.windows-x64.zip) Read [Upgrading Grafana]({{< relref "installation/upgrading.md" >}}) for tips and guidance on updating an existing installation. diff --git a/docs/sources/plugins/developing/datasources.md b/docs/sources/plugins/developing/datasources.md index 0149f06e1aa..09a005ba714 100644 --- a/docs/sources/plugins/developing/datasources.md +++ b/docs/sources/plugins/developing/datasources.md @@ -84,15 +84,15 @@ An array of: { "target":"upper_75", "datapoints":[ - [622,1450754160000], - [365,1450754220000] + [622, 1450754160000], + [365, 1450754220000] ] }, { "target":"upper_90", "datapoints":[ - [861,1450754160000], - [767,1450754220000] + [861, 1450754160000], + [767, 1450754220000] ] } ] diff --git a/docs/sources/reference/admin.md b/docs/sources/reference/admin.md deleted file mode 100644 index a6863b4ea71..00000000000 --- a/docs/sources/reference/admin.md +++ /dev/null @@ -1,42 +0,0 @@ -+++ -title = "Admin Roles" -description = "Users & Organization permission and administration" -keywords = ["grafana", "configuration", "documentation", "admin", "users", "permissions"] -type = "docs" -[menu.docs] -name = "Admin Roles" -parent = "admin" -weight = 3 -+++ - -# Administration - -Grafana has two levels of administrators: - -* Organizational administrators: These admins can manage users within specific organizations in a particular Grafana installation -* Grafana administrators: These super admins can manage users across all organizations in a Grafana installation. They can also change and access system-wide settings. - -## Organizational Administrators - -As an Organizational administrator, you can add `Data Sources`, add Users to your Organization and -modify Organization details and options. - -> *Note*: If Grafana is configured with `users.allow_org_create = true`, any User of any Organization will be able to -> start their own Organization and become the administrator of that Organization. - - -## Grafana Administrators - -
-As a Grafana Administrator, you have complete access to any Organization or User in that instance of Grafana.
-When performing actions as a Grafana admin, the sidebar will change it's appearance as below to indicate you are performing global server administration.
-
-From the Grafana Server Admin page, you can access the System Info page which summarizes all of the backend configuration settings of the Grafana server.
-
-## Why would I have multiple Organizations?
-
-Organizations in Grafana are best suited for a **multi-tenant deployment**. In a multi-tenant deployment,
-Organizations can be used to provide a full Grafana experience to different sets of users from a single Grafana instance,
-at the convenience of the Grafana Administrator.
-
-In most cases, a Grafana installation will only have **one** Organization. Since dashboards, data sources and other configuration items are not shared between organizations, there's no need to create multiple Organizations if you want all your users to have access to the same set of dashboards and data.
diff --git a/docs/sources/reference/sharing.md b/docs/sources/reference/sharing.md
index badd3b5712a..20aea1acd2e 100644
--- a/docs/sources/reference/sharing.md
+++ b/docs/sources/reference/sharing.md
@@ -39,7 +39,7 @@ Click a panel title to open the panel menu, then click share in the panel menu t
### Direct Link Rendered Image
-You also get a link to service side rendered PNG of the panel. Useful if you want to share an image of the panel. Please note that for OSX and Windows, you will need to ensure that a `phantomjs` binary is available under `vendor/phantomjs/phantomjs`. For Linux, a `phantomjs` binary is included - however, you should ensure that any requisite libraries (e.g. libfontconfig) are available.
+You also get a link to service side rendered PNG of the panel. Useful if you want to share an image of the panel. Please note that for OSX and Windows, you will need to ensure that a `phantomjs` binary is available under `tools/phantomjs/phantomjs`. For Linux, a `phantomjs` binary is included - however, you should ensure that any requisite libraries (e.g. libfontconfig) are available.
Example of a link to a server-side rendered PNG:
diff --git a/docs/sources/features/whatsnew/index.md b/docs/sources/whatsnew/index.md
similarity index 90%
rename from docs/sources/features/whatsnew/index.md
rename to docs/sources/whatsnew/index.md
index 30357af4668..df472f07093 100644
--- a/docs/sources/features/whatsnew/index.md
+++ b/docs/sources/whatsnew/index.md
@@ -3,7 +3,7 @@ title = "What's New in Grafana"
[menu.docs]
name = "What's New In Grafana"
identifier = "whatsnew"
-weight = 2
+weight = 3
+++
diff --git a/docs/versions.json b/docs/versions.json
new file mode 100644
index 00000000000..03cb40f0e1f
--- /dev/null
+++ b/docs/versions.json
@@ -0,0 +1,9 @@
+[
+ { "version": "v5.0", "path": "/v5.0", "archived": false },
+ { "version": "v4.6", "path": "/", "archived": false, "current": true },
+ { "version": "v4.5", "path": "/v4.5", "archived": true },
+ { "version": "v4.4", "path": "/v4.4", "archived": true },
+ { "version": "v4.3", "path": "/v4.3", "archived": true },
+ { "version": "v4.1", "path": "/v4.1", "archived": true },
+ { "version": "v3.1", "path": "/v3.1", "archived": true }
+]
diff --git a/package.json b/package.json
index 971e63053fc..aad7d2ce92c 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
"company": "Grafana Labs"
},
"name": "grafana",
- "version": "5.0.0-pre1",
+ "version": "5.0.0-beta1",
"repository": {
"type": "git",
"url": "http://github.com/grafana/grafana.git"
@@ -68,6 +68,7 @@
"karma-webpack": "^2.0.4",
"lint-staged": "^6.0.0",
"load-grunt-tasks": "3.5.2",
+ "mobx-react-devtools": "^4.2.15",
"mocha": "^4.0.1",
"ng-annotate-loader": "^0.6.1",
"ng-annotate-webpack-plugin": "^0.2.1-pre",
@@ -91,7 +92,7 @@
"typescript": "^2.6.2",
"webpack": "^3.10.0",
"webpack-bundle-analyzer": "^2.9.0",
- "webpack-cleanup-plugin": "^0.5.1",
+ "webpack-cleanup-plugin": "^0.5.1",
"webpack-merge": "^4.1.0",
"zone.js": "^0.7.2"
},
@@ -114,6 +115,10 @@
"*.scss": [
"prettier --write",
"git add"
+ ],
+ "*.go": [
+ "gofmt -w -s",
+ "git add"
]
},
"prettier": {
@@ -134,7 +139,7 @@
"clipboard": "^1.7.1",
"d3": "^4.11.0",
"d3-scale-chromatic": "^1.1.1",
- "eventemitter3": "^2.0.2",
+ "eventemitter3": "^2.0.3",
"file-saver": "^1.3.3",
"jquery": "^3.2.1",
"lodash": "^4.17.4",
@@ -148,11 +153,13 @@
"react": "^16.2.0",
"react-dom": "^16.2.0",
"react-grid-layout": "^0.16.2",
- "react-popper": "^0.7.5",
"react-highlight-words": "^0.10.0",
+ "react-popper": "^0.7.5",
"react-select": "^1.1.0",
"react-sizeme": "^2.3.6",
+ "react-transition-group": "^2.2.1",
"remarkable": "^1.7.1",
+ "rst2html": "github:thoward/rst2html#990cb89",
"rxjs": "^5.4.3",
"tether": "^1.4.0",
"tether-drop": "https://github.com/torkelo/drop",
diff --git a/packaging/publish/publish_testing.sh b/packaging/publish/publish_testing.sh
index 276193ad63f..ca5e7aea90c 100755
--- a/packaging/publish/publish_testing.sh
+++ b/packaging/publish/publish_testing.sh
@@ -1,6 +1,6 @@
#! /usr/bin/env bash
-deb_ver=4.6.0-beta1
-rpm_ver=4.6.0-beta1
+deb_ver=5.0.0-beta1
+rpm_ver=5.0.0-beta1
wget https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana_${deb_ver}_amd64.deb
diff --git a/pkg/api/alerting.go b/pkg/api/alerting.go
index d11122016c4..16f5f7ceb6f 100644
--- a/pkg/api/alerting.go
+++ b/pkg/api/alerting.go
@@ -8,6 +8,7 @@ import (
"github.com/grafana/grafana/pkg/middleware"
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/alerting"
+ "github.com/grafana/grafana/pkg/services/guardian"
)
func ValidateOrgAlert(c *middleware.Context) {
@@ -62,9 +63,22 @@ func GetAlerts(c *middleware.Context) Response {
return ApiError(500, "List alerts failed", err)
}
+ alertDTOs, resp := transformToDTOs(query.Result, c)
+ if resp != nil {
+ return resp
+ }
+
+ return Json(200, alertDTOs)
+}
+
+func transformToDTOs(alerts []*models.Alert, c *middleware.Context) ([]*dtos.AlertRule, Response) {
+ if len(alerts) == 0 {
+ return []*dtos.AlertRule{}, nil
+ }
+
dashboardIds := make([]int64, 0)
alertDTOs := make([]*dtos.AlertRule, 0)
- for _, alert := range query.Result {
+ for _, alert := range alerts {
dashboardIds = append(dashboardIds, alert.DashboardId)
alertDTOs = append(alertDTOs, &dtos.AlertRule{
Id: alert.Id,
@@ -83,22 +97,40 @@ func GetAlerts(c *middleware.Context) Response {
DashboardIds: dashboardIds,
}
- if len(alertDTOs) > 0 {
- if err := bus.Dispatch(&dashboardsQuery); err != nil {
- return ApiError(500, "List alerts failed", err)
- }
+ if err := bus.Dispatch(&dashboardsQuery); err != nil {
+ return nil, ApiError(500, "List alerts failed", err)
}
//TODO: should be possible to speed this up with lookup table
for _, alert := range alertDTOs {
for _, dash := range dashboardsQuery.Result {
if alert.DashboardId == dash.Id {
- alert.DashbboardUri = "db/" + dash.Slug
+ alert.Url = dash.GenerateUrl()
+ break
}
}
}
- return Json(200, alertDTOs)
+ permissionsQuery := models.GetDashboardPermissionsForUserQuery{
+ DashboardIds: dashboardIds,
+ OrgId: c.OrgId,
+ UserId: c.SignedInUser.UserId,
+ OrgRole: c.SignedInUser.OrgRole,
+ }
+
+ if err := bus.Dispatch(&permissionsQuery); err != nil {
+ return nil, ApiError(500, "List alerts failed", err)
+ }
+
+ for _, alert := range alertDTOs {
+ for _, perm := range permissionsQuery.Result {
+ if alert.DashboardId == perm.DashboardId {
+ alert.CanEdit = perm.Permission > 1
+ }
+ }
+ }
+
+ return alertDTOs, nil
}
// POST /api/alerts/test
@@ -155,24 +187,6 @@ func GetAlert(c *middleware.Context) Response {
return Json(200, &query.Result)
}
-// DEL /api/alerts/:id
-func DelAlert(c *middleware.Context) Response {
- alertId := c.ParamsInt64(":alertId")
-
- if alertId == 0 {
- return ApiError(401, "Failed to parse alertid", nil)
- }
-
- cmd := models.DeleteAlertCommand{AlertId: alertId}
-
- if err := bus.Dispatch(&cmd); err != nil {
- return ApiError(500, "Failed to delete alert", err)
- }
-
- var resp = map[string]interface{}{"alertId": alertId}
- return Json(200, resp)
-}
-
func GetAlertNotifiers(c *middleware.Context) Response {
return Json(200, alerting.GetNotifiers())
}
@@ -267,6 +281,22 @@ func NotificationTest(c *middleware.Context, dto dtos.NotificationTestCommand) R
//POST /api/alerts/:alertId/pause
func PauseAlert(c *middleware.Context, dto dtos.PauseAlertCommand) Response {
alertId := c.ParamsInt64("alertId")
+
+ query := models.GetAlertByIdQuery{Id: alertId}
+
+ if err := bus.Dispatch(&query); err != nil {
+ return ApiError(500, "Get Alert failed", err)
+ }
+
+ guardian := guardian.NewDashboardGuardian(query.Result.DashboardId, c.OrgId, c.SignedInUser)
+ if canEdit, err := guardian.CanEdit(); err != nil || !canEdit {
+ if err != nil {
+ return ApiError(500, "Error while checking permissions for Alert", err)
+ }
+
+ return ApiError(403, "Access denied to this dashboard and alert", nil)
+ }
+
cmd := models.PauseAlertCommand{
OrgId: c.OrgId,
AlertIds: []int64{alertId},
diff --git a/pkg/api/alerting_test.go b/pkg/api/alerting_test.go
new file mode 100644
index 00000000000..6b030053e22
--- /dev/null
+++ b/pkg/api/alerting_test.go
@@ -0,0 +1,97 @@
+package api
+
+import (
+ "testing"
+
+ "github.com/grafana/grafana/pkg/api/dtos"
+ "github.com/grafana/grafana/pkg/bus"
+ "github.com/grafana/grafana/pkg/middleware"
+ m "github.com/grafana/grafana/pkg/models"
+
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestAlertingApiEndpoint(t *testing.T) {
+ Convey("Given an alert in a dashboard with an acl", t, func() {
+
+ singleAlert := &m.Alert{Id: 1, DashboardId: 1, Name: "singlealert"}
+
+ bus.AddHandler("test", func(query *m.GetAlertByIdQuery) error {
+ query.Result = singleAlert
+ return nil
+ })
+
+ viewerRole := m.ROLE_VIEWER
+ editorRole := m.ROLE_EDITOR
+
+ aclMockResp := []*m.DashboardAclInfoDTO{}
+ bus.AddHandler("test", func(query *m.GetDashboardAclInfoListQuery) error {
+ query.Result = aclMockResp
+ return nil
+ })
+
+ bus.AddHandler("test", func(query *m.GetTeamsByUserQuery) error {
+ query.Result = []*m.Team{}
+ return nil
+ })
+
+ Convey("When user is editor and not in the ACL", func() {
+ Convey("Should not be able to pause the alert", func() {
+ cmd := dtos.PauseAlertCommand{
+ AlertId: 1,
+ Paused: true,
+ }
+ postAlertScenario("When calling POST on", "/api/alerts/1/pause", "/api/alerts/:alertId/pause", m.ROLE_EDITOR, cmd, func(sc *scenarioContext) {
+ CallPauseAlert(sc)
+ So(sc.resp.Code, ShouldEqual, 403)
+ })
+ })
+ })
+
+ Convey("When user is editor and dashboard has default ACL", func() {
+ aclMockResp = []*m.DashboardAclInfoDTO{
+ {Role: &viewerRole, Permission: m.PERMISSION_VIEW},
+ {Role: &editorRole, Permission: m.PERMISSION_EDIT},
+ }
+
+ Convey("Should be able to pause the alert", func() {
+ cmd := dtos.PauseAlertCommand{
+ AlertId: 1,
+ Paused: true,
+ }
+ postAlertScenario("When calling POST on", "/api/alerts/1/pause", "/api/alerts/:alertId/pause", m.ROLE_EDITOR, cmd, func(sc *scenarioContext) {
+ CallPauseAlert(sc)
+ So(sc.resp.Code, ShouldEqual, 200)
+ })
+ })
+ })
+ })
+}
+
+func CallPauseAlert(sc *scenarioContext) {
+ bus.AddHandler("test", func(cmd *m.PauseAlertCommand) error {
+ return nil
+ })
+
+ sc.fakeReqWithParams("POST", sc.url, map[string]string{}).exec()
+}
+
+func postAlertScenario(desc string, url string, routePattern string, role m.RoleType, cmd dtos.PauseAlertCommand, fn scenarioFunc) {
+ Convey(desc+" "+url, func() {
+ defer bus.ClearBusHandlers()
+
+ sc := setupScenarioContext(url)
+ sc.defaultHandler = wrap(func(c *middleware.Context) Response {
+ sc.context = c
+ sc.context.UserId = TestUserID
+ sc.context.OrgId = TestOrgID
+ sc.context.OrgRole = role
+
+ return PauseAlert(c, cmd)
+ })
+
+ sc.m.Post(routePattern, sc.defaultHandler)
+
+ fn(sc)
+ })
+}
diff --git a/pkg/api/annotations.go b/pkg/api/annotations.go
index 0bf95557abc..e3845520795 100644
--- a/pkg/api/annotations.go
+++ b/pkg/api/annotations.go
@@ -7,7 +7,9 @@ import (
"github.com/grafana/grafana/pkg/api/dtos"
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/middleware"
+ m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/annotations"
+ "github.com/grafana/grafana/pkg/services/guardian"
"github.com/grafana/grafana/pkg/util"
)
@@ -51,6 +53,10 @@ func (e *CreateAnnotationError) Error() string {
}
func PostAnnotation(c *middleware.Context, cmd dtos.PostAnnotationsCmd) Response {
+ if canSave, err := canSaveByDashboardId(c, cmd.DashboardId); err != nil || !canSave {
+ return dashboardGuardianResponse(err)
+ }
+
repo := annotations.GetRepository()
if cmd.Text == "" {
@@ -178,6 +184,10 @@ func UpdateAnnotation(c *middleware.Context, cmd dtos.UpdateAnnotationsCmd) Resp
repo := annotations.GetRepository()
+ if resp := canSave(c, repo, annotationId); resp != nil {
+ return resp
+ }
+
item := annotations.Item{
OrgId: c.OrgId,
UserId: c.UserId,
@@ -228,6 +238,10 @@ func DeleteAnnotationById(c *middleware.Context) Response {
repo := annotations.GetRepository()
annotationId := c.ParamsInt64(":annotationId")
+ if resp := canSave(c, repo, annotationId); resp != nil {
+ return resp
+ }
+
err := repo.Delete(&annotations.DeleteParams{
Id: annotationId,
})
@@ -243,6 +257,10 @@ func DeleteAnnotationRegion(c *middleware.Context) Response {
repo := annotations.GetRepository()
regionId := c.ParamsInt64(":regionId")
+ if resp := canSave(c, repo, regionId); resp != nil {
+ return resp
+ }
+
err := repo.Delete(&annotations.DeleteParams{
RegionId: regionId,
})
@@ -253,3 +271,50 @@ func DeleteAnnotationRegion(c *middleware.Context) Response {
return ApiSuccess("Annotation region deleted")
}
+
+func canSaveByDashboardId(c *middleware.Context, dashboardId int64) (bool, error) {
+ if dashboardId == 0 && !c.SignedInUser.HasRole(m.ROLE_EDITOR) {
+ return false, nil
+ }
+
+ if dashboardId > 0 {
+ guardian := guardian.NewDashboardGuardian(dashboardId, c.OrgId, c.SignedInUser)
+ if canEdit, err := guardian.CanEdit(); err != nil || !canEdit {
+ return false, err
+ }
+ }
+
+ return true, nil
+}
+
+func canSave(c *middleware.Context, repo annotations.Repository, annotationId int64) Response {
+ items, err := repo.Find(&annotations.ItemQuery{AnnotationId: annotationId, OrgId: c.OrgId})
+
+ if err != nil || len(items) == 0 {
+ return ApiError(500, "Could not find annotation to update", err)
+ }
+
+ dashboardId := items[0].DashboardId
+
+ if canSave, err := canSaveByDashboardId(c, dashboardId); err != nil || !canSave {
+ return dashboardGuardianResponse(err)
+ }
+
+ return nil
+}
+
+func canSaveByRegionId(c *middleware.Context, repo annotations.Repository, regionId int64) Response {
+ items, err := repo.Find(&annotations.ItemQuery{RegionId: regionId, OrgId: c.OrgId})
+
+ if err != nil || len(items) == 0 {
+ return ApiError(500, "Could not find annotation to update", err)
+ }
+
+ dashboardId := items[0].DashboardId
+
+ if canSave, err := canSaveByDashboardId(c, dashboardId); err != nil || !canSave {
+ return dashboardGuardianResponse(err)
+ }
+
+ return nil
+}
diff --git a/pkg/api/annotations_test.go b/pkg/api/annotations_test.go
new file mode 100644
index 00000000000..480962d8826
--- /dev/null
+++ b/pkg/api/annotations_test.go
@@ -0,0 +1,242 @@
+package api
+
+import (
+ "testing"
+
+ "github.com/grafana/grafana/pkg/api/dtos"
+ "github.com/grafana/grafana/pkg/bus"
+ "github.com/grafana/grafana/pkg/middleware"
+ m "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/services/annotations"
+
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestAnnotationsApiEndpoint(t *testing.T) {
+ Convey("Given an annotation without a dashboard id", t, func() {
+ cmd := dtos.PostAnnotationsCmd{
+ Time: 1000,
+ Text: "annotation text",
+ Tags: []string{"tag1", "tag2"},
+ IsRegion: false,
+ }
+
+ updateCmd := dtos.UpdateAnnotationsCmd{
+ Time: 1000,
+ Text: "annotation text",
+ Tags: []string{"tag1", "tag2"},
+ IsRegion: false,
+ }
+
+ Convey("When user is an Org Viewer", func() {
+ role := m.ROLE_VIEWER
+ Convey("Should not be allowed to save an annotation", func() {
+ postAnnotationScenario("When calling POST on", "/api/annotations", "/api/annotations", role, cmd, func(sc *scenarioContext) {
+ sc.fakeReqWithParams("POST", sc.url, map[string]string{}).exec()
+ So(sc.resp.Code, ShouldEqual, 403)
+ })
+
+ putAnnotationScenario("When calling PUT on", "/api/annotations/1", "/api/annotations/:annotationId", role, updateCmd, func(sc *scenarioContext) {
+ sc.fakeReqWithParams("PUT", sc.url, map[string]string{}).exec()
+ So(sc.resp.Code, ShouldEqual, 403)
+ })
+
+ loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/annotations/1", "/api/annotations/:annotationId", role, func(sc *scenarioContext) {
+ sc.handlerFunc = DeleteAnnotationById
+ sc.fakeReqWithParams("DELETE", sc.url, map[string]string{}).exec()
+ So(sc.resp.Code, ShouldEqual, 403)
+ })
+
+ loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/annotations/region/1", "/api/annotations/region/:regionId", role, func(sc *scenarioContext) {
+ sc.handlerFunc = DeleteAnnotationRegion
+ sc.fakeReqWithParams("DELETE", sc.url, map[string]string{}).exec()
+ So(sc.resp.Code, ShouldEqual, 403)
+ })
+ })
+ })
+
+ Convey("When user is an Org Editor", func() {
+ role := m.ROLE_EDITOR
+ Convey("Should be able to save an annotation", func() {
+ postAnnotationScenario("When calling POST on", "/api/annotations", "/api/annotations", role, cmd, func(sc *scenarioContext) {
+ sc.fakeReqWithParams("POST", sc.url, map[string]string{}).exec()
+ So(sc.resp.Code, ShouldEqual, 200)
+ })
+
+ putAnnotationScenario("When calling PUT on", "/api/annotations/1", "/api/annotations/:annotationId", role, updateCmd, func(sc *scenarioContext) {
+ sc.fakeReqWithParams("PUT", sc.url, map[string]string{}).exec()
+ So(sc.resp.Code, ShouldEqual, 200)
+ })
+
+ loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/annotations/1", "/api/annotations/:annotationId", role, func(sc *scenarioContext) {
+ sc.handlerFunc = DeleteAnnotationById
+ sc.fakeReqWithParams("DELETE", sc.url, map[string]string{}).exec()
+ So(sc.resp.Code, ShouldEqual, 200)
+ })
+
+ loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/annotations/region/1", "/api/annotations/region/:regionId", role, func(sc *scenarioContext) {
+ sc.handlerFunc = DeleteAnnotationRegion
+ sc.fakeReqWithParams("DELETE", sc.url, map[string]string{}).exec()
+ So(sc.resp.Code, ShouldEqual, 200)
+ })
+ })
+ })
+ })
+
+ Convey("Given an annotation with a dashboard id and the dashboard does not have an acl", t, func() {
+ cmd := dtos.PostAnnotationsCmd{
+ Time: 1000,
+ Text: "annotation text",
+ Tags: []string{"tag1", "tag2"},
+ IsRegion: false,
+ DashboardId: 1,
+ PanelId: 1,
+ }
+
+ updateCmd := dtos.UpdateAnnotationsCmd{
+ Time: 1000,
+ Text: "annotation text",
+ Tags: []string{"tag1", "tag2"},
+ IsRegion: false,
+ Id: 1,
+ }
+
+ viewerRole := m.ROLE_VIEWER
+ editorRole := m.ROLE_EDITOR
+
+ aclMockResp := []*m.DashboardAclInfoDTO{
+ {Role: &viewerRole, Permission: m.PERMISSION_VIEW},
+ {Role: &editorRole, Permission: m.PERMISSION_EDIT},
+ }
+
+ bus.AddHandler("test", func(query *m.GetDashboardAclInfoListQuery) error {
+ query.Result = aclMockResp
+ return nil
+ })
+
+ bus.AddHandler("test", func(query *m.GetTeamsByUserQuery) error {
+ query.Result = []*m.Team{}
+ return nil
+ })
+
+ Convey("When user is an Org Viewer", func() {
+ role := m.ROLE_VIEWER
+ Convey("Should not be allowed to save an annotation", func() {
+ postAnnotationScenario("When calling POST on", "/api/annotations", "/api/annotations", role, cmd, func(sc *scenarioContext) {
+ sc.fakeReqWithParams("POST", sc.url, map[string]string{}).exec()
+ So(sc.resp.Code, ShouldEqual, 403)
+ })
+
+ putAnnotationScenario("When calling PUT on", "/api/annotations/1", "/api/annotations/:annotationId", role, updateCmd, func(sc *scenarioContext) {
+ sc.fakeReqWithParams("PUT", sc.url, map[string]string{}).exec()
+ So(sc.resp.Code, ShouldEqual, 403)
+ })
+
+ loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/annotations/1", "/api/annotations/:annotationId", role, func(sc *scenarioContext) {
+ sc.handlerFunc = DeleteAnnotationById
+ sc.fakeReqWithParams("DELETE", sc.url, map[string]string{}).exec()
+ So(sc.resp.Code, ShouldEqual, 403)
+ })
+
+ loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/annotations/region/1", "/api/annotations/region/:regionId", role, func(sc *scenarioContext) {
+ sc.handlerFunc = DeleteAnnotationRegion
+ sc.fakeReqWithParams("DELETE", sc.url, map[string]string{}).exec()
+ So(sc.resp.Code, ShouldEqual, 403)
+ })
+ })
+ })
+
+ Convey("When user is an Org Editor", func() {
+ role := m.ROLE_EDITOR
+ Convey("Should be able to save an annotation", func() {
+ postAnnotationScenario("When calling POST on", "/api/annotations", "/api/annotations", role, cmd, func(sc *scenarioContext) {
+ sc.fakeReqWithParams("POST", sc.url, map[string]string{}).exec()
+ So(sc.resp.Code, ShouldEqual, 200)
+ })
+
+ putAnnotationScenario("When calling PUT on", "/api/annotations/1", "/api/annotations/:annotationId", role, updateCmd, func(sc *scenarioContext) {
+ sc.fakeReqWithParams("PUT", sc.url, map[string]string{}).exec()
+ So(sc.resp.Code, ShouldEqual, 200)
+ })
+
+ loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/annotations/1", "/api/annotations/:annotationId", role, func(sc *scenarioContext) {
+ sc.handlerFunc = DeleteAnnotationById
+ sc.fakeReqWithParams("DELETE", sc.url, map[string]string{}).exec()
+ So(sc.resp.Code, ShouldEqual, 200)
+ })
+
+ loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/annotations/region/1", "/api/annotations/region/:regionId", role, func(sc *scenarioContext) {
+ sc.handlerFunc = DeleteAnnotationRegion
+ sc.fakeReqWithParams("DELETE", sc.url, map[string]string{}).exec()
+ So(sc.resp.Code, ShouldEqual, 200)
+ })
+ })
+ })
+ })
+}
+
+type fakeAnnotationsRepo struct {
+}
+
+func (repo *fakeAnnotationsRepo) Delete(params *annotations.DeleteParams) error {
+ return nil
+}
+func (repo *fakeAnnotationsRepo) Save(item *annotations.Item) error {
+ item.Id = 1
+ return nil
+}
+func (repo *fakeAnnotationsRepo) Update(item *annotations.Item) error {
+ return nil
+}
+func (repo *fakeAnnotationsRepo) Find(query *annotations.ItemQuery) ([]*annotations.ItemDTO, error) {
+ annotations := []*annotations.ItemDTO{{Id: 1}}
+ return annotations, nil
+}
+
+var fakeAnnoRepo *fakeAnnotationsRepo
+
+func postAnnotationScenario(desc string, url string, routePattern string, role m.RoleType, cmd dtos.PostAnnotationsCmd, fn scenarioFunc) {
+ Convey(desc+" "+url, func() {
+ defer bus.ClearBusHandlers()
+
+ sc := setupScenarioContext(url)
+ sc.defaultHandler = wrap(func(c *middleware.Context) Response {
+ sc.context = c
+ sc.context.UserId = TestUserID
+ sc.context.OrgId = TestOrgID
+ sc.context.OrgRole = role
+
+ return PostAnnotation(c, cmd)
+ })
+
+ fakeAnnoRepo = &fakeAnnotationsRepo{}
+ annotations.SetRepository(fakeAnnoRepo)
+
+ sc.m.Post(routePattern, sc.defaultHandler)
+
+ fn(sc)
+ })
+}
+
+func putAnnotationScenario(desc string, url string, routePattern string, role m.RoleType, cmd dtos.UpdateAnnotationsCmd, fn scenarioFunc) {
+ Convey(desc+" "+url, func() {
+ defer bus.ClearBusHandlers()
+
+ sc := setupScenarioContext(url)
+ sc.defaultHandler = wrap(func(c *middleware.Context) Response {
+ sc.context = c
+ sc.context.UserId = TestUserID
+ sc.context.OrgId = TestOrgID
+ sc.context.OrgRole = role
+
+ return UpdateAnnotation(c, cmd)
+ })
+
+ fakeAnnoRepo = &fakeAnnotationsRepo{}
+ annotations.SetRepository(fakeAnnoRepo)
+
+ sc.m.Put(routePattern, sc.defaultHandler)
+
+ fn(sc)
+ })
+}
diff --git a/pkg/api/api.go b/pkg/api/api.go
index ea082ff4741..752af7602f5 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -15,6 +15,8 @@ func (hs *HttpServer) registerRoutes() {
reqGrafanaAdmin := middleware.Auth(&middleware.AuthOptions{ReqSignedIn: true, ReqGrafanaAdmin: true})
reqEditorRole := middleware.RoleAuth(m.ROLE_EDITOR, m.ROLE_ADMIN)
reqOrgAdmin := middleware.RoleAuth(m.ROLE_ADMIN)
+ redirectFromLegacyDashboardUrl := middleware.RedirectFromLegacyDashboardUrl()
+ redirectFromLegacyDashboardSoloUrl := middleware.RedirectFromLegacyDashboardSoloUrl()
quota := middleware.Quota
bind := binding.Bind
@@ -63,9 +65,13 @@ func (hs *HttpServer) registerRoutes() {
r.Get("/plugins/:id/edit", reqSignedIn, Index)
r.Get("/plugins/:id/page/:page", reqSignedIn, Index)
- r.Get("/dashboard/*", reqSignedIn, Index)
+ r.Get("/d/:uid/:slug", reqSignedIn, Index)
+ r.Get("/dashboard/db/:slug", reqSignedIn, redirectFromLegacyDashboardUrl, Index)
+ r.Get("/dashboard/script/*", reqSignedIn, Index)
r.Get("/dashboard-solo/snapshot/*", Index)
- r.Get("/dashboard-solo/*", reqSignedIn, Index)
+ r.Get("/d-solo/:uid/:slug", reqSignedIn, Index)
+ r.Get("/dashboard-solo/db/:slug", reqSignedIn, redirectFromLegacyDashboardSoloUrl, Index)
+ r.Get("/dashboard-solo/script/*", reqSignedIn, Index)
r.Get("/import/dashboard", reqSignedIn, Index)
r.Get("/dashboards/", reqSignedIn, Index)
r.Get("/dashboards/*", reqSignedIn, Index)
@@ -144,13 +150,13 @@ func (hs *HttpServer) registerRoutes() {
apiRoute.Group("/teams", func(teamsRoute RouteRegister) {
teamsRoute.Get("/:teamId", wrap(GetTeamById))
teamsRoute.Get("/search", wrap(SearchTeams))
- teamsRoute.Post("/", quota("teams"), bind(m.CreateTeamCommand{}), wrap(CreateTeam))
- teamsRoute.Put("/:teamId", bind(m.UpdateTeamCommand{}), wrap(UpdateTeam))
- teamsRoute.Delete("/:teamId", wrap(DeleteTeamById))
- teamsRoute.Get("/:teamId/members", wrap(GetTeamMembers))
- teamsRoute.Post("/:teamId/members", quota("teams"), bind(m.AddTeamMemberCommand{}), wrap(AddTeamMember))
- teamsRoute.Delete("/:teamId/members/:userId", wrap(RemoveTeamMember))
- }, reqOrgAdmin)
+ teamsRoute.Post("/", quota("teams"), reqOrgAdmin, bind(m.CreateTeamCommand{}), wrap(CreateTeam))
+ teamsRoute.Put("/:teamId", reqOrgAdmin, bind(m.UpdateTeamCommand{}), wrap(UpdateTeam))
+ teamsRoute.Delete("/:teamId", reqOrgAdmin, wrap(DeleteTeamById))
+ teamsRoute.Get("/:teamId/members", reqOrgAdmin, wrap(GetTeamMembers))
+ teamsRoute.Post("/:teamId/members", reqOrgAdmin, quota("teams"), bind(m.AddTeamMemberCommand{}), wrap(AddTeamMember))
+ teamsRoute.Delete("/:teamId/members/:userId", reqOrgAdmin, wrap(RemoveTeamMember))
+ })
// org information available to all users.
apiRoute.Group("/org", func(orgRoute RouteRegister) {
@@ -242,20 +248,25 @@ func (hs *HttpServer) registerRoutes() {
// Dashboard
apiRoute.Group("/dashboards", func(dashboardRoute RouteRegister) {
+ dashboardRoute.Get("/uid/:uid", wrap(GetDashboard))
+ dashboardRoute.Delete("/uid/:uid", wrap(DeleteDashboardByUid))
+
dashboardRoute.Get("/db/:slug", wrap(GetDashboard))
- dashboardRoute.Delete("/db/:slug", reqEditorRole, wrap(DeleteDashboard))
+ dashboardRoute.Delete("/db/:slug", wrap(DeleteDashboard))
dashboardRoute.Post("/calculate-diff", bind(dtos.CalculateDiffOptions{}), wrap(CalculateDashboardDiff))
- dashboardRoute.Post("/db", reqEditorRole, bind(m.SaveDashboardCommand{}), wrap(PostDashboard))
+ dashboardRoute.Post("/db", bind(m.SaveDashboardCommand{}), wrap(PostDashboard))
dashboardRoute.Get("/home", wrap(GetHomeDashboard))
dashboardRoute.Get("/tags", GetDashboardTags)
dashboardRoute.Post("/import", bind(dtos.ImportDashboardCommand{}), wrap(ImportDashboard))
+ dashboardRoute.Get("/folders", wrap(GetFoldersForSignedInUser))
+
dashboardRoute.Group("/id/:dashboardId", func(dashIdRoute RouteRegister) {
dashIdRoute.Get("/versions", wrap(GetDashboardVersions))
dashIdRoute.Get("/versions/:id", wrap(GetDashboardVersion))
- dashIdRoute.Post("/restore", reqEditorRole, bind(dtos.RestoreDashboardVersionCommand{}), wrap(RestoreDashboardVersion))
+ dashIdRoute.Post("/restore", bind(dtos.RestoreDashboardVersionCommand{}), wrap(RestoreDashboardVersion))
dashIdRoute.Group("/acl", func(aclRoute RouteRegister) {
aclRoute.Get("/", wrap(GetDashboardAclList))
@@ -317,8 +328,8 @@ func (hs *HttpServer) registerRoutes() {
annotationsRoute.Delete("/:annotationId", wrap(DeleteAnnotationById))
annotationsRoute.Put("/:annotationId", bind(dtos.UpdateAnnotationsCmd{}), wrap(UpdateAnnotation))
annotationsRoute.Delete("/region/:regionId", wrap(DeleteAnnotationRegion))
- annotationsRoute.Post("/graphite", bind(dtos.PostGraphiteAnnotationsCmd{}), wrap(PostGraphiteAnnotation))
- }, reqEditorRole)
+ annotationsRoute.Post("/graphite", reqEditorRole, bind(dtos.PostGraphiteAnnotationsCmd{}), wrap(PostGraphiteAnnotation))
+ })
// error test
r.Get("/metrics/error", wrap(GenerateError))
diff --git a/pkg/api/common_test.go b/pkg/api/common_test.go
new file mode 100644
index 00000000000..33fc1688603
--- /dev/null
+++ b/pkg/api/common_test.go
@@ -0,0 +1,105 @@
+package api
+
+import (
+ "net/http"
+ "net/http/httptest"
+ "path/filepath"
+
+ "github.com/go-macaron/session"
+ "github.com/grafana/grafana/pkg/bus"
+ "github.com/grafana/grafana/pkg/middleware"
+ "github.com/grafana/grafana/pkg/models"
+ macaron "gopkg.in/macaron.v1"
+
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func loggedInUserScenario(desc string, url string, fn scenarioFunc) {
+ loggedInUserScenarioWithRole(desc, "GET", url, url, models.ROLE_EDITOR, fn)
+}
+
+func loggedInUserScenarioWithRole(desc string, method string, url string, routePattern string, role models.RoleType, fn scenarioFunc) {
+ Convey(desc+" "+url, func() {
+ defer bus.ClearBusHandlers()
+
+ sc := setupScenarioContext(url)
+ sc.defaultHandler = wrap(func(c *middleware.Context) Response {
+ sc.context = c
+ sc.context.UserId = TestUserID
+ sc.context.OrgId = TestOrgID
+ sc.context.OrgRole = role
+ if sc.handlerFunc != nil {
+ return sc.handlerFunc(sc.context)
+ }
+
+ return nil
+ })
+
+ switch method {
+ case "GET":
+ sc.m.Get(routePattern, sc.defaultHandler)
+ case "DELETE":
+ sc.m.Delete(routePattern, sc.defaultHandler)
+ }
+
+ fn(sc)
+ })
+}
+
+func (sc *scenarioContext) fakeReq(method, url string) *scenarioContext {
+ sc.resp = httptest.NewRecorder()
+ req, err := http.NewRequest(method, url, nil)
+ So(err, ShouldBeNil)
+ sc.req = req
+
+ return sc
+}
+
+func (sc *scenarioContext) fakeReqWithParams(method, url string, queryParams map[string]string) *scenarioContext {
+ sc.resp = httptest.NewRecorder()
+ req, err := http.NewRequest(method, url, nil)
+ q := req.URL.Query()
+ for k, v := range queryParams {
+ q.Add(k, v)
+ }
+ req.URL.RawQuery = q.Encode()
+ So(err, ShouldBeNil)
+ sc.req = req
+
+ return sc
+}
+
+type scenarioContext struct {
+ m *macaron.Macaron
+ context *middleware.Context
+ resp *httptest.ResponseRecorder
+ handlerFunc handlerFunc
+ defaultHandler macaron.Handler
+ req *http.Request
+ url string
+}
+
+func (sc *scenarioContext) exec() {
+ sc.m.ServeHTTP(sc.resp, sc.req)
+}
+
+type scenarioFunc func(c *scenarioContext)
+type handlerFunc func(c *middleware.Context) Response
+
+func setupScenarioContext(url string) *scenarioContext {
+ sc := &scenarioContext{
+ url: url,
+ }
+ viewsPath, _ := filepath.Abs("../../public/views")
+
+ sc.m = macaron.New()
+ sc.m.Use(macaron.Renderer(macaron.RenderOptions{
+ Directory: viewsPath,
+ Delims: macaron.Delims{Left: "[[", Right: "]]"},
+ }))
+
+ sc.m.Use(middleware.GetContextHandler())
+ sc.m.Use(middleware.Sessioner(&session.Options{}))
+
+ return sc
+}
diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go
index 28a955d5abf..100fd41aad5 100644
--- a/pkg/api/dashboard.go
+++ b/pkg/api/dashboard.go
@@ -38,20 +38,19 @@ func isDashboardStarredByUser(c *middleware.Context, dashId int64) (bool, error)
func dashboardGuardianResponse(err error) Response {
if err != nil {
return ApiError(500, "Error while checking dashboard permissions", err)
- } else {
- return ApiError(403, "Access denied to this dashboard", nil)
}
+
+ return ApiError(403, "Access denied to this dashboard", nil)
}
func GetDashboard(c *middleware.Context) Response {
- dash, rsp := getDashboardHelper(c.OrgId, c.Params(":slug"), 0)
+ dash, rsp := getDashboardHelper(c.OrgId, c.Params(":slug"), 0, c.Params(":uid"))
if rsp != nil {
return rsp
}
guardian := guardian.NewDashboardGuardian(dash.Id, c.OrgId, c.SignedInUser)
if canView, err := guardian.CanView(); err != nil || !canView {
- fmt.Printf("%v", err)
return dashboardGuardianResponse(err)
}
@@ -89,7 +88,8 @@ func GetDashboard(c *middleware.Context) Response {
HasAcl: dash.HasAcl,
IsFolder: dash.IsFolder,
FolderId: dash.FolderId,
- FolderTitle: "Root",
+ Url: dash.GetUrl(),
+ FolderTitle: "General",
}
// lookup folder title
@@ -99,6 +99,7 @@ func GetDashboard(c *middleware.Context) Response {
return ApiError(500, "Dashboard folder could not be read", err)
}
meta.FolderTitle = query.Result.Title
+ meta.FolderUrl = query.Result.GetUrl()
}
// make sure db version is in sync with json model version
@@ -124,8 +125,15 @@ func getUserLogin(userId int64) string {
}
}
-func getDashboardHelper(orgId int64, slug string, id int64) (*m.Dashboard, Response) {
- query := m.GetDashboardQuery{Slug: slug, Id: id, OrgId: orgId}
+func getDashboardHelper(orgId int64, slug string, id int64, uid string) (*m.Dashboard, Response) {
+ var query m.GetDashboardQuery
+
+ if len(uid) > 0 {
+ query = m.GetDashboardQuery{Uid: uid, Id: id, OrgId: orgId}
+ } else {
+ query = m.GetDashboardQuery{Slug: slug, Id: id, OrgId: orgId}
+ }
+
if err := bus.Dispatch(&query); err != nil {
return nil, ApiError(404, "Dashboard not found", err)
}
@@ -133,7 +141,37 @@ func getDashboardHelper(orgId int64, slug string, id int64) (*m.Dashboard, Respo
}
func DeleteDashboard(c *middleware.Context) Response {
- dash, rsp := getDashboardHelper(c.OrgId, c.Params(":slug"), 0)
+ query := m.GetDashboardsBySlugQuery{OrgId: c.OrgId, Slug: c.Params(":slug")}
+
+ if err := bus.Dispatch(&query); err != nil {
+ return ApiError(500, "Failed to retrieve dashboards by slug", err)
+ }
+
+ if len(query.Result) > 1 {
+ return Json(412, util.DynMap{"status": "multiple-slugs-exists", "message": m.ErrDashboardsWithSameSlugExists.Error()})
+ }
+
+ dash, rsp := getDashboardHelper(c.OrgId, c.Params(":slug"), 0, "")
+ if rsp != nil {
+ return rsp
+ }
+
+ guardian := guardian.NewDashboardGuardian(dash.Id, c.OrgId, c.SignedInUser)
+ if canSave, err := guardian.CanSave(); err != nil || !canSave {
+ return dashboardGuardianResponse(err)
+ }
+
+ cmd := m.DeleteDashboardCommand{OrgId: c.OrgId, Id: dash.Id}
+ if err := bus.Dispatch(&cmd); err != nil {
+ return ApiError(500, "Failed to delete dashboard", err)
+ }
+
+ var resp = map[string]interface{}{"title": dash.Title}
+ return Json(200, resp)
+}
+
+func DeleteDashboardByUid(c *middleware.Context) Response {
+ dash, rsp := getDashboardHelper(c.OrgId, "", 0, c.Params(":uid"))
if rsp != nil {
return rsp
}
@@ -158,7 +196,14 @@ func PostDashboard(c *middleware.Context, cmd m.SaveDashboardCommand) Response {
dash := cmd.GetDashboardModel()
- guardian := guardian.NewDashboardGuardian(dash.Id, c.OrgId, c.SignedInUser)
+ dashId := dash.Id
+
+ // if new dashboard, use parent folder permissions instead
+ if dashId == 0 {
+ dashId = cmd.FolderId
+ }
+
+ guardian := guardian.NewDashboardGuardian(dashId, c.OrgId, c.SignedInUser)
if canSave, err := guardian.CanSave(); err != nil || !canSave {
return dashboardGuardianResponse(err)
}
@@ -201,7 +246,10 @@ func PostDashboard(c *middleware.Context, cmd m.SaveDashboardCommand) Response {
}
if err != nil {
- if err == m.ErrDashboardWithSameNameExists {
+ if err == m.ErrDashboardWithSameUIDExists {
+ return Json(412, util.DynMap{"status": "name-exists", "message": err.Error()})
+ }
+ if err == m.ErrDashboardWithSameNameInFolderExists {
return Json(412, util.DynMap{"status": "name-exists", "message": err.Error()})
}
if err == m.ErrDashboardVersionMismatch {
@@ -225,8 +273,17 @@ func PostDashboard(c *middleware.Context, cmd m.SaveDashboardCommand) Response {
return ApiError(500, "Invalid alert data. Cannot save dashboard", err)
}
+ dashboard.IsFolder = dash.IsFolder
+
c.TimeRequest(metrics.M_Api_Dashboard_Save)
- return Json(200, util.DynMap{"status": "success", "slug": dashboard.Slug, "version": dashboard.Version, "id": dashboard.Id})
+ return Json(200, util.DynMap{
+ "status": "success",
+ "slug": dashboard.Slug,
+ "version": dashboard.Version,
+ "id": dashboard.Id,
+ "uid": dashboard.Uid,
+ "url": dashboard.GetUrl(),
+ })
}
func GetHomeDashboard(c *middleware.Context) Response {
@@ -236,10 +293,11 @@ func GetHomeDashboard(c *middleware.Context) Response {
}
if prefsQuery.Result.HomeDashboardId != 0 {
- slugQuery := m.GetDashboardSlugByIdQuery{Id: prefsQuery.Result.HomeDashboardId}
+ slugQuery := m.GetDashboardRefByIdQuery{Id: prefsQuery.Result.HomeDashboardId}
err := bus.Dispatch(&slugQuery)
if err == nil {
- dashRedirect := dtos.DashboardRedirect{RedirectUri: "db/" + slugQuery.Result}
+ url := m.GetDashboardUrl(slugQuery.Result.Uid, slugQuery.Result.Slug)
+ dashRedirect := dtos.DashboardRedirect{RedirectUri: url}
return Json(200, &dashRedirect)
} else {
log.Warn("Failed to get slug from database, %s", err.Error())
@@ -255,7 +313,7 @@ func GetHomeDashboard(c *middleware.Context) Response {
dash := dtos.DashboardFullWithMeta{}
dash.Meta.IsHome = true
dash.Meta.CanEdit = c.SignedInUser.HasRole(m.ROLE_EDITOR)
- dash.Meta.FolderTitle = "Root"
+ dash.Meta.FolderTitle = "General"
jsonParser := json.NewDecoder(file)
if err := jsonParser.Decode(&dash.Dashboard); err != nil {
@@ -393,7 +451,7 @@ func CalculateDashboardDiff(c *middleware.Context, apiOptions dtos.CalculateDiff
// RestoreDashboardVersion restores a dashboard to the given version.
func RestoreDashboardVersion(c *middleware.Context, apiCmd dtos.RestoreDashboardVersionCommand) Response {
- dash, rsp := getDashboardHelper(c.OrgId, "", c.ParamsInt64(":dashboardId"))
+ dash, rsp := getDashboardHelper(c.OrgId, "", c.ParamsInt64(":dashboardId"), "")
if rsp != nil {
return rsp
}
@@ -416,6 +474,7 @@ func RestoreDashboardVersion(c *middleware.Context, apiCmd dtos.RestoreDashboard
saveCmd.UserId = c.UserId
saveCmd.Dashboard = version.Data
saveCmd.Dashboard.Set("version", dash.Version)
+ saveCmd.Dashboard.Set("uid", dash.Uid)
saveCmd.Message = fmt.Sprintf("Restored from version %d", version.Version)
return PostDashboard(c, saveCmd)
@@ -431,3 +490,19 @@ func GetDashboardTags(c *middleware.Context) {
c.JSON(200, query.Result)
}
+
+func GetFoldersForSignedInUser(c *middleware.Context) Response {
+ title := c.Query("query")
+ query := m.GetFoldersForSignedInUserQuery{
+ OrgId: c.OrgId,
+ SignedInUser: c.SignedInUser,
+ Title: title,
+ }
+
+ err := bus.Dispatch(&query)
+ if err != nil {
+ return ApiError(500, "Failed to get folders from database", err)
+ }
+
+ return Json(200, query.Result)
+}
diff --git a/pkg/api/dashboard_acl.go b/pkg/api/dashboard_acl.go
index 88cc74b9d1c..b5d912d25f1 100644
--- a/pkg/api/dashboard_acl.go
+++ b/pkg/api/dashboard_acl.go
@@ -24,6 +24,12 @@ func GetDashboardAclList(c *middleware.Context) Response {
return ApiError(500, "Failed to get dashboard acl", err)
}
+ for _, perm := range acl {
+ if perm.Slug != "" {
+ perm.Url = m.GetDashboardFolderUrl(perm.IsFolder, perm.Uid, perm.Slug)
+ }
+ }
+
return Json(200, acl)
}
@@ -51,6 +57,14 @@ func UpdateDashboardAcl(c *middleware.Context, apiCmd dtos.UpdateDashboardAclCom
})
}
+ if okToUpdate, err := guardian.CheckPermissionBeforeUpdate(m.PERMISSION_ADMIN, cmd.Items); err != nil || !okToUpdate {
+ if err != nil {
+ return ApiError(500, "Error while checking dashboard permissions", err)
+ }
+
+ return ApiError(403, "Cannot remove own admin permission for a folder", nil)
+ }
+
if err := bus.Dispatch(&cmd); err != nil {
if err == m.ErrDashboardAclInfoMissing || err == m.ErrDashboardPermissionDashboardEmpty {
return ApiError(409, err.Error(), err)
@@ -70,6 +84,14 @@ func DeleteDashboardAcl(c *middleware.Context) Response {
return dashboardGuardianResponse(err)
}
+ if okToDelete, err := guardian.CheckPermissionBeforeRemove(m.PERMISSION_ADMIN, aclId); err != nil || !okToDelete {
+ if err != nil {
+ return ApiError(500, "Error while checking dashboard permissions", err)
+ }
+
+ return ApiError(403, "Cannot remove own admin permission for a folder", nil)
+ }
+
cmd := m.RemoveDashboardAclCommand{OrgId: c.OrgId, AclId: aclId}
if err := bus.Dispatch(&cmd); err != nil {
return ApiError(500, "Failed to delete permission for user", err)
diff --git a/pkg/api/dashboard_acl_test.go b/pkg/api/dashboard_acl_test.go
index e22e625dcf9..467045e360a 100644
--- a/pkg/api/dashboard_acl_test.go
+++ b/pkg/api/dashboard_acl_test.go
@@ -3,8 +3,10 @@ package api
import (
"testing"
+ "github.com/grafana/grafana/pkg/api/dtos"
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/simplejson"
+ "github.com/grafana/grafana/pkg/middleware"
m "github.com/grafana/grafana/pkg/models"
. "github.com/smartystreets/goconvey/convey"
@@ -37,6 +39,12 @@ func TestDashboardAclApiEndpoint(t *testing.T) {
return nil
})
+ // This tests four scenarios:
+ // 1. user is an org admin
+ // 2. user is an org editor AND has been granted admin permission for the dashboard
+ // 3. user is an org viewer AND has been granted edit permission for the dashboard
+ // 4. user is an org editor AND has no permissions for the dashboard
+
Convey("When user is org admin", func() {
loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/id/1/acl", "/api/dashboards/id/:dashboardsId/acl", m.ROLE_ADMIN, func(sc *scenarioContext) {
Convey("Should be able to access ACL", func() {
@@ -54,9 +62,9 @@ func TestDashboardAclApiEndpoint(t *testing.T) {
})
})
- Convey("When user is editor and has admin permission in the ACL", func() {
+ Convey("When user is org editor and has admin permission in the ACL", func() {
loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/id/1/acl", "/api/dashboards/id/:dashboardId/acl", m.ROLE_EDITOR, func(sc *scenarioContext) {
- mockResult = append(mockResult, &m.DashboardAclInfoDTO{Id: 1, OrgId: 1, DashboardId: 1, UserId: 1, Permission: m.PERMISSION_ADMIN})
+ mockResult = append(mockResult, &m.DashboardAclInfoDTO{Id: 6, OrgId: 1, DashboardId: 1, UserId: 1, Permission: m.PERMISSION_ADMIN})
Convey("Should be able to access ACL", func() {
sc.handlerFunc = GetDashboardAclList
@@ -67,7 +75,7 @@ func TestDashboardAclApiEndpoint(t *testing.T) {
})
loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/dashboards/id/1/acl/1", "/api/dashboards/id/:dashboardId/acl/:aclId", m.ROLE_EDITOR, func(sc *scenarioContext) {
- mockResult = append(mockResult, &m.DashboardAclInfoDTO{Id: 1, OrgId: 1, DashboardId: 1, UserId: 1, Permission: m.PERMISSION_ADMIN})
+ mockResult = append(mockResult, &m.DashboardAclInfoDTO{Id: 6, OrgId: 1, DashboardId: 1, UserId: 1, Permission: m.PERMISSION_ADMIN})
bus.AddHandler("test3", func(cmd *m.RemoveDashboardAclCommand) error {
return nil
@@ -81,6 +89,52 @@ func TestDashboardAclApiEndpoint(t *testing.T) {
})
})
+ loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/dashboards/id/1/acl/6", "/api/dashboards/id/:dashboardId/acl/:aclId", m.ROLE_EDITOR, func(sc *scenarioContext) {
+ mockResult = append(mockResult, &m.DashboardAclInfoDTO{Id: 6, OrgId: 1, DashboardId: 1, UserId: 1, Permission: m.PERMISSION_ADMIN})
+
+ bus.AddHandler("test3", func(cmd *m.RemoveDashboardAclCommand) error {
+ return nil
+ })
+
+ Convey("Should not be able to delete their own Admin permission", func() {
+ sc.handlerFunc = DeleteDashboardAcl
+ sc.fakeReqWithParams("DELETE", sc.url, map[string]string{}).exec()
+
+ So(sc.resp.Code, ShouldEqual, 403)
+ })
+ })
+
+ Convey("Should not be able to downgrade their own Admin permission", func() {
+ cmd := dtos.UpdateDashboardAclCommand{
+ Items: []dtos.DashboardAclUpdateItem{
+ {UserId: TestUserID, Permission: m.PERMISSION_EDIT},
+ },
+ }
+
+ postAclScenario("When calling POST on", "/api/dashboards/id/1/acl", "/api/dashboards/id/:dashboardId/acl", m.ROLE_EDITOR, cmd, func(sc *scenarioContext) {
+ mockResult = append(mockResult, &m.DashboardAclInfoDTO{Id: 6, OrgId: 1, DashboardId: 1, UserId: 1, Permission: m.PERMISSION_ADMIN})
+
+ CallPostAcl(sc)
+ So(sc.resp.Code, ShouldEqual, 403)
+ })
+ })
+
+ Convey("Should be able to update permissions", func() {
+ cmd := dtos.UpdateDashboardAclCommand{
+ Items: []dtos.DashboardAclUpdateItem{
+ {UserId: TestUserID, Permission: m.PERMISSION_ADMIN},
+ {UserId: 2, Permission: m.PERMISSION_EDIT},
+ },
+ }
+
+ postAclScenario("When calling POST on", "/api/dashboards/id/1/acl", "/api/dashboards/id/:dashboardId/acl", m.ROLE_EDITOR, cmd, func(sc *scenarioContext) {
+ mockResult = append(mockResult, &m.DashboardAclInfoDTO{Id: 6, OrgId: 1, DashboardId: 1, UserId: 1, Permission: m.PERMISSION_ADMIN})
+
+ CallPostAcl(sc)
+ So(sc.resp.Code, ShouldEqual, 200)
+ })
+ })
+
Convey("When user is a member of a team in the ACL with admin permission", func() {
loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/dashboards/id/1/acl/1", "/api/dashboards/id/:dashboardsId/acl/:aclId", m.ROLE_EDITOR, func(sc *scenarioContext) {
teamResp = append(teamResp, &m.Team{Id: 2, OrgId: 1, Name: "UG2"})
@@ -99,11 +153,12 @@ func TestDashboardAclApiEndpoint(t *testing.T) {
})
})
- Convey("When user is editor and has edit permission in the ACL", func() {
- loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/id/1/acl", "/api/dashboards/id/:dashboardId/acl", m.ROLE_EDITOR, func(sc *scenarioContext) {
+ Convey("When user is org viewer and has edit permission in the ACL", func() {
+ loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/id/1/acl", "/api/dashboards/id/:dashboardId/acl", m.ROLE_VIEWER, func(sc *scenarioContext) {
mockResult = append(mockResult, &m.DashboardAclInfoDTO{Id: 1, OrgId: 1, DashboardId: 1, UserId: 1, Permission: m.PERMISSION_EDIT})
- Convey("Should not be able to access ACL", func() {
+ // Getting the permissions is an Admin permission
+ Convey("Should not be able to get list of permissions from ACL", func() {
sc.handlerFunc = GetDashboardAclList
sc.fakeReqWithParams("GET", sc.url, map[string]string{}).exec()
@@ -111,7 +166,7 @@ func TestDashboardAclApiEndpoint(t *testing.T) {
})
})
- loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/dashboards/id/1/acl/1", "/api/dashboards/id/:dashboardId/acl/:aclId", m.ROLE_EDITOR, func(sc *scenarioContext) {
+ loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/dashboards/id/1/acl/1", "/api/dashboards/id/:dashboardId/acl/:aclId", m.ROLE_VIEWER, func(sc *scenarioContext) {
mockResult = append(mockResult, &m.DashboardAclInfoDTO{Id: 1, OrgId: 1, DashboardId: 1, UserId: 1, Permission: m.PERMISSION_EDIT})
bus.AddHandler("test3", func(cmd *m.RemoveDashboardAclCommand) error {
@@ -127,7 +182,7 @@ func TestDashboardAclApiEndpoint(t *testing.T) {
})
})
- Convey("When user is editor and not in the ACL", func() {
+ Convey("When user is org editor and not in the ACL", func() {
loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/id/1/acl", "/api/dashboards/id/:dashboardsId/acl", m.ROLE_EDITOR, func(sc *scenarioContext) {
Convey("Should not be able to access ACL", func() {
@@ -172,3 +227,32 @@ func transformDashboardAclsToDTOs(acls []*m.DashboardAclInfoDTO) []*m.DashboardA
return dtos
}
+
+func CallPostAcl(sc *scenarioContext) {
+ bus.AddHandler("test", func(cmd *m.UpdateDashboardAclCommand) error {
+ return nil
+ })
+
+ sc.fakeReqWithParams("POST", sc.url, map[string]string{}).exec()
+}
+
+func postAclScenario(desc string, url string, routePattern string, role m.RoleType, cmd dtos.UpdateDashboardAclCommand, fn scenarioFunc) {
+ Convey(desc+" "+url, func() {
+ defer bus.ClearBusHandlers()
+
+ sc := setupScenarioContext(url)
+
+ sc.defaultHandler = wrap(func(c *middleware.Context) Response {
+ sc.context = c
+ sc.context.UserId = TestUserID
+ sc.context.OrgId = TestOrgID
+ sc.context.OrgRole = role
+
+ return UpdateDashboardAcl(c, cmd)
+ })
+
+ sc.m.Post(routePattern, sc.defaultHandler)
+
+ fn(sc)
+ })
+}
diff --git a/pkg/api/dashboard_test.go b/pkg/api/dashboard_test.go
index ed76544b9b8..e80b3cad4dc 100644
--- a/pkg/api/dashboard_test.go
+++ b/pkg/api/dashboard_test.go
@@ -2,12 +2,8 @@ package api
import (
"encoding/json"
- "path/filepath"
"testing"
- macaron "gopkg.in/macaron.v1"
-
- "github.com/go-macaron/session"
"github.com/grafana/grafana/pkg/api/dtos"
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/simplejson"
@@ -42,6 +38,10 @@ func (repo *fakeDashboardRepo) GetProvisionedDashboardData(name string) ([]*m.Da
var fakeRepo *fakeDashboardRepo
+// This tests two main scenarios. If a user has access to execute an action on a dashboard:
+// 1. and the dashboard is in a folder which does not have an acl
+// 2. and the dashboard is in a folder which does have an acl
+
func TestDashboardApiEndpoint(t *testing.T) {
Convey("Given a dashboard with a parent folder which does not have an acl", t, func() {
fakeDash := m.NewDashboard("Child dash")
@@ -49,8 +49,17 @@ func TestDashboardApiEndpoint(t *testing.T) {
fakeDash.FolderId = 1
fakeDash.HasAcl = false
+ bus.AddHandler("test", func(query *m.GetDashboardsBySlugQuery) error {
+ dashboards := []*m.Dashboard{fakeDash}
+ query.Result = dashboards
+ return nil
+ })
+
+ var getDashboardQueries []*m.GetDashboardQuery
+
bus.AddHandler("test", func(query *m.GetDashboardQuery) error {
query.Result = fakeDash
+ getDashboardQueries = append(getDashboardQueries, query)
return nil
})
@@ -80,12 +89,20 @@ func TestDashboardApiEndpoint(t *testing.T) {
}),
}
+ // This tests two scenarios:
+ // 1. user is an org viewer
+ // 2. user is an org editor
+
Convey("When user is an Org Viewer", func() {
role := m.ROLE_VIEWER
- loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/2", "/api/dashboards/:id", role, func(sc *scenarioContext) {
+ loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/db/child-dash", "/api/dashboards/db/:slug", role, func(sc *scenarioContext) {
dash := GetDashboardShouldReturn200(sc)
+ Convey("Should lookup dashboard by slug", func() {
+ So(getDashboardQueries[0].Slug, ShouldEqual, "child-dash")
+ })
+
Convey("Should not be able to edit or save dashboard", func() {
So(dash.Meta.CanEdit, ShouldBeFalse)
So(dash.Meta.CanSave, ShouldBeFalse)
@@ -93,9 +110,36 @@ func TestDashboardApiEndpoint(t *testing.T) {
})
})
- loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/dashboards/2", "/api/dashboards/:id", role, func(sc *scenarioContext) {
+ loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/uid/abcdefghi", "/api/dashboards/uid/:uid", role, func(sc *scenarioContext) {
+ dash := GetDashboardShouldReturn200(sc)
+
+ Convey("Should lookup dashboard by uid", func() {
+ So(getDashboardQueries[0].Uid, ShouldEqual, "abcdefghi")
+ })
+
+ Convey("Should not be able to edit or save dashboard", func() {
+ So(dash.Meta.CanEdit, ShouldBeFalse)
+ So(dash.Meta.CanSave, ShouldBeFalse)
+ So(dash.Meta.CanAdmin, ShouldBeFalse)
+ })
+ })
+
+ loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/dashboards/db/child-dash", "/api/dashboards/db/:slug", role, func(sc *scenarioContext) {
CallDeleteDashboard(sc)
So(sc.resp.Code, ShouldEqual, 403)
+
+ Convey("Should lookup dashboard by slug", func() {
+ So(getDashboardQueries[0].Slug, ShouldEqual, "child-dash")
+ })
+ })
+
+ loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/dashboards/uid/abcdefghi", "/api/dashboards/uid/:uid", role, func(sc *scenarioContext) {
+ CallDeleteDashboardByUid(sc)
+ So(sc.resp.Code, ShouldEqual, 403)
+
+ Convey("Should lookup dashboard by uid", func() {
+ So(getDashboardQueries[0].Uid, ShouldEqual, "abcdefghi")
+ })
})
loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/id/2/versions/1", "/api/dashboards/id/:dashboardId/versions/:id", role, func(sc *scenarioContext) {
@@ -117,9 +161,13 @@ func TestDashboardApiEndpoint(t *testing.T) {
Convey("When user is an Org Editor", func() {
role := m.ROLE_EDITOR
- loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/2", "/api/dashboards/:id", role, func(sc *scenarioContext) {
+ loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/db/child-dash", "/api/dashboards/db/:slug", role, func(sc *scenarioContext) {
dash := GetDashboardShouldReturn200(sc)
+ Convey("Should lookup dashboard by slug", func() {
+ So(getDashboardQueries[0].Slug, ShouldEqual, "child-dash")
+ })
+
Convey("Should be able to edit or save dashboard", func() {
So(dash.Meta.CanEdit, ShouldBeTrue)
So(dash.Meta.CanSave, ShouldBeTrue)
@@ -127,9 +175,36 @@ func TestDashboardApiEndpoint(t *testing.T) {
})
})
- loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/dashboards/2", "/api/dashboards/:id", role, func(sc *scenarioContext) {
+ loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/uid/abcdefghi", "/api/dashboards/uid/:uid", role, func(sc *scenarioContext) {
+ dash := GetDashboardShouldReturn200(sc)
+
+ Convey("Should lookup dashboard by uid", func() {
+ So(getDashboardQueries[0].Uid, ShouldEqual, "abcdefghi")
+ })
+
+ Convey("Should be able to edit or save dashboard", func() {
+ So(dash.Meta.CanEdit, ShouldBeTrue)
+ So(dash.Meta.CanSave, ShouldBeTrue)
+ So(dash.Meta.CanAdmin, ShouldBeFalse)
+ })
+ })
+
+ loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/dashboards/db/child-dash", "/api/dashboards/db/:slug", role, func(sc *scenarioContext) {
CallDeleteDashboard(sc)
So(sc.resp.Code, ShouldEqual, 200)
+
+ Convey("Should lookup dashboard by slug", func() {
+ So(getDashboardQueries[0].Slug, ShouldEqual, "child-dash")
+ })
+ })
+
+ loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/dashboards/uid/abcdefghi", "/api/dashboards/uid/:uid", role, func(sc *scenarioContext) {
+ CallDeleteDashboardByUid(sc)
+ So(sc.resp.Code, ShouldEqual, 200)
+
+ Convey("Should lookup dashboard by uid", func() {
+ So(getDashboardQueries[0].Uid, ShouldEqual, "abcdefghi")
+ })
})
loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/id/2/versions/1", "/api/dashboards/id/:dashboardId/versions/:id", role, func(sc *scenarioContext) {
@@ -143,8 +218,7 @@ func TestDashboardApiEndpoint(t *testing.T) {
})
postDashboardScenario("When calling POST on", "/api/dashboards", "/api/dashboards", role, cmd, func(sc *scenarioContext) {
- CallPostDashboard(sc)
- So(sc.resp.Code, ShouldEqual, 200)
+ CallPostDashboardShouldReturnSuccess(sc)
})
Convey("When saving a dashboard folder in another folder", func() {
@@ -178,6 +252,12 @@ func TestDashboardApiEndpoint(t *testing.T) {
fakeDash.HasAcl = true
setting.ViewersCanEdit = false
+ bus.AddHandler("test", func(query *m.GetDashboardsBySlugQuery) error {
+ dashboards := []*m.Dashboard{fakeDash}
+ query.Result = dashboards
+ return nil
+ })
+
aclMockResp := []*m.DashboardAclInfoDTO{
{
DashboardId: 1,
@@ -191,8 +271,11 @@ func TestDashboardApiEndpoint(t *testing.T) {
return nil
})
+ var getDashboardQueries []*m.GetDashboardQuery
+
bus.AddHandler("test", func(query *m.GetDashboardQuery) error {
query.Result = fakeDash
+ getDashboardQueries = append(getDashboardQueries, query)
return nil
})
@@ -210,21 +293,59 @@ func TestDashboardApiEndpoint(t *testing.T) {
}),
}
+ // This tests six scenarios:
+ // 1. user is an org viewer AND has no permissions for this dashboard
+ // 2. user is an org editor AND has no permissions for this dashboard
+ // 3. user is an org viewer AND has been granted edit permission for the dashboard
+ // 4. user is an org viewer AND all viewers have edit permission for this dashboard
+ // 5. user is an org viewer AND has been granted an admin permission
+ // 6. user is an org editor AND has been granted a view permission
+
Convey("When user is an Org Viewer and has no permissions for this dashboard", func() {
role := m.ROLE_VIEWER
- loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/2", "/api/dashboards/:id", role, func(sc *scenarioContext) {
+ loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/db/child-dash", "/api/dashboards/db/:slug", role, func(sc *scenarioContext) {
sc.handlerFunc = GetDashboard
sc.fakeReqWithParams("GET", sc.url, map[string]string{}).exec()
+ Convey("Should lookup dashboard by slug", func() {
+ So(getDashboardQueries[0].Slug, ShouldEqual, "child-dash")
+ })
+
Convey("Should be denied access", func() {
So(sc.resp.Code, ShouldEqual, 403)
})
})
- loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/dashboards/2", "/api/dashboards/:id", role, func(sc *scenarioContext) {
+ loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/uid/abcdefghi", "/api/dashboards/uid/:uid", role, func(sc *scenarioContext) {
+ sc.handlerFunc = GetDashboard
+ sc.fakeReqWithParams("GET", sc.url, map[string]string{}).exec()
+
+ Convey("Should lookup dashboard by uid", func() {
+ So(getDashboardQueries[0].Uid, ShouldEqual, "abcdefghi")
+ })
+
+ Convey("Should be denied access", func() {
+ So(sc.resp.Code, ShouldEqual, 403)
+ })
+ })
+
+ loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/dashboards/db/child-dash", "/api/dashboards/db/:slug", role, func(sc *scenarioContext) {
CallDeleteDashboard(sc)
So(sc.resp.Code, ShouldEqual, 403)
+
+ Convey("Should lookup dashboard by slug", func() {
+ So(getDashboardQueries[0].Slug, ShouldEqual, "child-dash")
+ })
+ })
+
+ loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/dashboards/uid/abcdefghi", "/api/dashboards/uid/:uid", role, func(sc *scenarioContext) {
+ CallDeleteDashboardByUid(sc)
+ So(sc.resp.Code, ShouldEqual, 403)
+
+ Convey("Should lookup dashboard by uid", func() {
+ So(getDashboardQueries[0].Uid, ShouldEqual, "abcdefghi")
+ })
})
loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/id/2/versions/1", "/api/dashboards/id/:dashboardId/versions/:id", role, func(sc *scenarioContext) {
@@ -246,18 +367,48 @@ func TestDashboardApiEndpoint(t *testing.T) {
Convey("When user is an Org Editor and has no permissions for this dashboard", func() {
role := m.ROLE_EDITOR
- loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/2", "/api/dashboards/:id", role, func(sc *scenarioContext) {
+ loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/db/child-dash", "/api/dashboards/db/:slug", role, func(sc *scenarioContext) {
sc.handlerFunc = GetDashboard
sc.fakeReqWithParams("GET", sc.url, map[string]string{}).exec()
+ Convey("Should lookup dashboard by slug", func() {
+ So(getDashboardQueries[0].Slug, ShouldEqual, "child-dash")
+ })
+
Convey("Should be denied access", func() {
So(sc.resp.Code, ShouldEqual, 403)
})
})
- loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/dashboards/2", "/api/dashboards/:id", role, func(sc *scenarioContext) {
+ loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/uid/abcdefghi", "/api/dashboards/uid/:uid", role, func(sc *scenarioContext) {
+ sc.handlerFunc = GetDashboard
+ sc.fakeReqWithParams("GET", sc.url, map[string]string{}).exec()
+
+ Convey("Should lookup dashboard by uid", func() {
+ So(getDashboardQueries[0].Uid, ShouldEqual, "abcdefghi")
+ })
+
+ Convey("Should be denied access", func() {
+ So(sc.resp.Code, ShouldEqual, 403)
+ })
+ })
+
+ loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/dashboards/db/child-dash", "/api/dashboards/db/:slug", role, func(sc *scenarioContext) {
CallDeleteDashboard(sc)
So(sc.resp.Code, ShouldEqual, 403)
+
+ Convey("Should lookup dashboard by slug", func() {
+ So(getDashboardQueries[0].Slug, ShouldEqual, "child-dash")
+ })
+ })
+
+ loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/dashboards/uid/abcdefghi", "/api/dashboards/uid/:uid", role, func(sc *scenarioContext) {
+ CallDeleteDashboardByUid(sc)
+ So(sc.resp.Code, ShouldEqual, 403)
+
+ Convey("Should lookup dashboard by uid", func() {
+ So(getDashboardQueries[0].Uid, ShouldEqual, "abcdefghi")
+ })
})
loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/id/2/versions/1", "/api/dashboards/id/:dashboardId/versions/:id", role, func(sc *scenarioContext) {
@@ -288,9 +439,13 @@ func TestDashboardApiEndpoint(t *testing.T) {
return nil
})
- loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/2", "/api/dashboards/:id", role, func(sc *scenarioContext) {
+ loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/db/child-dash", "/api/dashboards/db/:slug", role, func(sc *scenarioContext) {
dash := GetDashboardShouldReturn200(sc)
+ Convey("Should lookup dashboard by slug", func() {
+ So(getDashboardQueries[0].Slug, ShouldEqual, "child-dash")
+ })
+
Convey("Should be able to get dashboard with edit rights", func() {
So(dash.Meta.CanEdit, ShouldBeTrue)
So(dash.Meta.CanSave, ShouldBeTrue)
@@ -298,9 +453,36 @@ func TestDashboardApiEndpoint(t *testing.T) {
})
})
- loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/dashboards/2", "/api/dashboards/:id", role, func(sc *scenarioContext) {
+ loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/uid/abcdefghi", "/api/dashboards/uid/:uid", role, func(sc *scenarioContext) {
+ dash := GetDashboardShouldReturn200(sc)
+
+ Convey("Should lookup dashboard by uid", func() {
+ So(getDashboardQueries[0].Uid, ShouldEqual, "abcdefghi")
+ })
+
+ Convey("Should be able to get dashboard with edit rights", func() {
+ So(dash.Meta.CanEdit, ShouldBeTrue)
+ So(dash.Meta.CanSave, ShouldBeTrue)
+ So(dash.Meta.CanAdmin, ShouldBeFalse)
+ })
+ })
+
+ loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/dashboards/db/child-dash", "/api/dashboards/db/:slug", role, func(sc *scenarioContext) {
CallDeleteDashboard(sc)
So(sc.resp.Code, ShouldEqual, 200)
+
+ Convey("Should lookup dashboard by slug", func() {
+ So(getDashboardQueries[0].Slug, ShouldEqual, "child-dash")
+ })
+ })
+
+ loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/dashboards/uid/abcdefghi", "/api/dashboards/uid/:uid", role, func(sc *scenarioContext) {
+ CallDeleteDashboardByUid(sc)
+ So(sc.resp.Code, ShouldEqual, 200)
+
+ Convey("Should lookup dashboard by uid", func() {
+ So(getDashboardQueries[0].Uid, ShouldEqual, "abcdefghi")
+ })
})
loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/id/2/versions/1", "/api/dashboards/id/:dashboardId/versions/:id", role, func(sc *scenarioContext) {
@@ -314,8 +496,7 @@ func TestDashboardApiEndpoint(t *testing.T) {
})
postDashboardScenario("When calling POST on", "/api/dashboards", "/api/dashboards", role, cmd, func(sc *scenarioContext) {
- CallPostDashboard(sc)
- So(sc.resp.Code, ShouldEqual, 200)
+ CallPostDashboardShouldReturnSuccess(sc)
})
})
@@ -332,9 +513,13 @@ func TestDashboardApiEndpoint(t *testing.T) {
return nil
})
- loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/2", "/api/dashboards/:id", role, func(sc *scenarioContext) {
+ loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/db/child-dash", "/api/dashboards/db/:slug", role, func(sc *scenarioContext) {
dash := GetDashboardShouldReturn200(sc)
+ Convey("Should lookup dashboard by slug", func() {
+ So(getDashboardQueries[0].Slug, ShouldEqual, "child-dash")
+ })
+
Convey("Should be able to get dashboard with edit rights but can save should be false", func() {
So(dash.Meta.CanEdit, ShouldBeTrue)
So(dash.Meta.CanSave, ShouldBeFalse)
@@ -342,9 +527,36 @@ func TestDashboardApiEndpoint(t *testing.T) {
})
})
- loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/dashboards/2", "/api/dashboards/:id", role, func(sc *scenarioContext) {
+ loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/uid/abcdefghi", "/api/dashboards/uid/:uid", role, func(sc *scenarioContext) {
+ dash := GetDashboardShouldReturn200(sc)
+
+ Convey("Should lookup dashboard by uid", func() {
+ So(getDashboardQueries[0].Uid, ShouldEqual, "abcdefghi")
+ })
+
+ Convey("Should be able to get dashboard with edit rights but can save should be false", func() {
+ So(dash.Meta.CanEdit, ShouldBeTrue)
+ So(dash.Meta.CanSave, ShouldBeFalse)
+ So(dash.Meta.CanAdmin, ShouldBeFalse)
+ })
+ })
+
+ loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/dashboards/db/child-dash", "/api/dashboards/db/:slug", role, func(sc *scenarioContext) {
CallDeleteDashboard(sc)
So(sc.resp.Code, ShouldEqual, 403)
+
+ Convey("Should lookup dashboard by slug", func() {
+ So(getDashboardQueries[0].Slug, ShouldEqual, "child-dash")
+ })
+ })
+
+ loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/dashboards/uid/abcdefghi", "/api/dashboards/uid/:uid", role, func(sc *scenarioContext) {
+ CallDeleteDashboardByUid(sc)
+ So(sc.resp.Code, ShouldEqual, 403)
+
+ Convey("Should lookup dashboard by uid", func() {
+ So(getDashboardQueries[0].Uid, ShouldEqual, "abcdefghi")
+ })
})
})
@@ -360,9 +572,13 @@ func TestDashboardApiEndpoint(t *testing.T) {
return nil
})
- loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/2", "/api/dashboards/:id", role, func(sc *scenarioContext) {
+ loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/db/child-dash", "/api/dashboards/db/:slug", role, func(sc *scenarioContext) {
dash := GetDashboardShouldReturn200(sc)
+ Convey("Should lookup dashboard by slug", func() {
+ So(getDashboardQueries[0].Slug, ShouldEqual, "child-dash")
+ })
+
Convey("Should be able to get dashboard with edit rights", func() {
So(dash.Meta.CanEdit, ShouldBeTrue)
So(dash.Meta.CanSave, ShouldBeTrue)
@@ -370,9 +586,36 @@ func TestDashboardApiEndpoint(t *testing.T) {
})
})
- loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/dashboards/2", "/api/dashboards/:id", role, func(sc *scenarioContext) {
+ loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/uid/abcdefghi", "/api/dashboards/uid/:uid", role, func(sc *scenarioContext) {
+ dash := GetDashboardShouldReturn200(sc)
+
+ Convey("Should lookup dashboard by uid", func() {
+ So(getDashboardQueries[0].Uid, ShouldEqual, "abcdefghi")
+ })
+
+ Convey("Should be able to get dashboard with edit rights", func() {
+ So(dash.Meta.CanEdit, ShouldBeTrue)
+ So(dash.Meta.CanSave, ShouldBeTrue)
+ So(dash.Meta.CanAdmin, ShouldBeTrue)
+ })
+ })
+
+ loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/dashboards/db/child-dash", "/api/dashboards/db/:slug", role, func(sc *scenarioContext) {
CallDeleteDashboard(sc)
So(sc.resp.Code, ShouldEqual, 200)
+
+ Convey("Should lookup dashboard by slug", func() {
+ So(getDashboardQueries[0].Slug, ShouldEqual, "child-dash")
+ })
+ })
+
+ loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/dashboards/uid/abcdefghi", "/api/dashboards/uid/:uid", role, func(sc *scenarioContext) {
+ CallDeleteDashboardByUid(sc)
+ So(sc.resp.Code, ShouldEqual, 200)
+
+ Convey("Should lookup dashboard by uid", func() {
+ So(getDashboardQueries[0].Uid, ShouldEqual, "abcdefghi")
+ })
})
loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/id/2/versions/1", "/api/dashboards/id/:dashboardId/versions/:id", role, func(sc *scenarioContext) {
@@ -386,8 +629,7 @@ func TestDashboardApiEndpoint(t *testing.T) {
})
postDashboardScenario("When calling POST on", "/api/dashboards", "/api/dashboards", role, cmd, func(sc *scenarioContext) {
- CallPostDashboard(sc)
- So(sc.resp.Code, ShouldEqual, 200)
+ CallPostDashboardShouldReturnSuccess(sc)
})
})
@@ -403,18 +645,48 @@ func TestDashboardApiEndpoint(t *testing.T) {
return nil
})
- loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/2", "/api/dashboards/:id", role, func(sc *scenarioContext) {
+ loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/db/child-dash", "/api/dashboards/db/:slug", role, func(sc *scenarioContext) {
dash := GetDashboardShouldReturn200(sc)
+ Convey("Should lookup dashboard by slug", func() {
+ So(getDashboardQueries[0].Slug, ShouldEqual, "child-dash")
+ })
+
Convey("Should not be able to edit or save dashboard", func() {
So(dash.Meta.CanEdit, ShouldBeFalse)
So(dash.Meta.CanSave, ShouldBeFalse)
})
})
- loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/dashboards/2", "/api/dashboards/:id", role, func(sc *scenarioContext) {
+ loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/uid/abcdefghi", "/api/dashboards/uid/:uid", role, func(sc *scenarioContext) {
+ dash := GetDashboardShouldReturn200(sc)
+
+ Convey("Should lookup dashboard by uid", func() {
+ So(getDashboardQueries[0].Uid, ShouldEqual, "abcdefghi")
+ })
+
+ Convey("Should not be able to edit or save dashboard", func() {
+ So(dash.Meta.CanEdit, ShouldBeFalse)
+ So(dash.Meta.CanSave, ShouldBeFalse)
+ })
+ })
+
+ loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/dashboards/db/child-dash", "/api/dashboards/db/:slug", role, func(sc *scenarioContext) {
CallDeleteDashboard(sc)
So(sc.resp.Code, ShouldEqual, 403)
+
+ Convey("Should lookup dashboard by slug", func() {
+ So(getDashboardQueries[0].Slug, ShouldEqual, "child-dash")
+ })
+ })
+
+ loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/dashboards/uid/abcdefghi", "/api/dashboards/uid/:uid", role, func(sc *scenarioContext) {
+ CallDeleteDashboardByUid(sc)
+ So(sc.resp.Code, ShouldEqual, 403)
+
+ Convey("Should lookup dashboard by uid", func() {
+ So(getDashboardQueries[0].Uid, ShouldEqual, "abcdefghi")
+ })
})
loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/id/2/versions/1", "/api/dashboards/id/:dashboardId/versions/:id", role, func(sc *scenarioContext) {
@@ -433,6 +705,37 @@ func TestDashboardApiEndpoint(t *testing.T) {
})
})
})
+
+ Convey("Given two dashboards with the same title in different folders", t, func() {
+ dashOne := m.NewDashboard("dash")
+ dashOne.Id = 2
+ dashOne.FolderId = 1
+ dashOne.HasAcl = false
+
+ dashTwo := m.NewDashboard("dash")
+ dashTwo.Id = 4
+ dashTwo.FolderId = 3
+ dashTwo.HasAcl = false
+
+ bus.AddHandler("test", func(query *m.GetDashboardsBySlugQuery) error {
+ dashboards := []*m.Dashboard{dashOne, dashTwo}
+ query.Result = dashboards
+ return nil
+ })
+
+ role := m.ROLE_EDITOR
+
+ loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/dashboards/db/dash", "/api/dashboards/db/:slug", role, func(sc *scenarioContext) {
+ CallDeleteDashboard(sc)
+
+ Convey("Should result in 412 Precondition failed", func() {
+ So(sc.resp.Code, ShouldEqual, 412)
+ result := sc.ToJson()
+ So(result.Get("status").MustString(), ShouldEqual, "multiple-slugs-exists")
+ So(result.Get("message").MustString(), ShouldEqual, m.ErrDashboardsWithSameSlugExists.Error())
+ })
+ })
+ })
}
func GetDashboardShouldReturn200(sc *scenarioContext) dtos.DashboardFullWithMeta {
@@ -477,6 +780,15 @@ func CallDeleteDashboard(sc *scenarioContext) {
sc.fakeReqWithParams("DELETE", sc.url, map[string]string{}).exec()
}
+func CallDeleteDashboardByUid(sc *scenarioContext) {
+ bus.AddHandler("test", func(cmd *m.DeleteDashboardCommand) error {
+ return nil
+ })
+
+ sc.handlerFunc = DeleteDashboardByUid
+ sc.fakeReqWithParams("DELETE", sc.url, map[string]string{}).exec()
+}
+
func CallPostDashboard(sc *scenarioContext) {
bus.AddHandler("test", func(cmd *alerting.ValidateDashboardAlertsCommand) error {
return nil
@@ -494,24 +806,23 @@ func CallPostDashboard(sc *scenarioContext) {
sc.fakeReqWithParams("POST", sc.url, map[string]string{}).exec()
}
+func CallPostDashboardShouldReturnSuccess(sc *scenarioContext) {
+ CallPostDashboard(sc)
+
+ So(sc.resp.Code, ShouldEqual, 200)
+ result := sc.ToJson()
+ So(result.Get("status").MustString(), ShouldEqual, "success")
+ So(result.Get("id").MustInt64(), ShouldBeGreaterThan, 0)
+ So(result.Get("uid").MustString(), ShouldNotBeNil)
+ So(result.Get("slug").MustString(), ShouldNotBeNil)
+ So(result.Get("url").MustString(), ShouldNotBeNil)
+}
+
func postDashboardScenario(desc string, url string, routePattern string, role m.RoleType, cmd m.SaveDashboardCommand, fn scenarioFunc) {
Convey(desc+" "+url, func() {
defer bus.ClearBusHandlers()
- sc := &scenarioContext{
- url: url,
- }
- viewsPath, _ := filepath.Abs("../../public/views")
-
- sc.m = macaron.New()
- sc.m.Use(macaron.Renderer(macaron.RenderOptions{
- Directory: viewsPath,
- Delims: macaron.Delims{Left: "[[", Right: "]]"},
- }))
-
- sc.m.Use(middleware.GetContextHandler())
- sc.m.Use(middleware.Sessioner(&session.Options{}))
-
+ sc := setupScenarioContext(url)
sc.defaultHandler = wrap(func(c *middleware.Context) Response {
sc.context = c
sc.context.UserId = TestUserID
@@ -529,3 +840,10 @@ func postDashboardScenario(desc string, url string, routePattern string, role m.
fn(sc)
})
}
+
+func (sc *scenarioContext) ToJson() *simplejson.Json {
+ var result *simplejson.Json
+ err := json.NewDecoder(sc.resp.Body).Decode(&result)
+ So(err, ShouldBeNil)
+ return result
+}
diff --git a/pkg/api/datasources_test.go b/pkg/api/datasources_test.go
index 72336693363..490393727d6 100644
--- a/pkg/api/datasources_test.go
+++ b/pkg/api/datasources_test.go
@@ -2,17 +2,11 @@ package api
import (
"encoding/json"
- "net/http"
- "net/http/httptest"
- "path/filepath"
"testing"
"github.com/grafana/grafana/pkg/models"
- macaron "gopkg.in/macaron.v1"
- "github.com/go-macaron/session"
"github.com/grafana/grafana/pkg/bus"
- "github.com/grafana/grafana/pkg/middleware"
. "github.com/smartystreets/goconvey/convey"
)
@@ -54,88 +48,3 @@ func TestDataSourcesProxy(t *testing.T) {
})
})
}
-
-func loggedInUserScenario(desc string, url string, fn scenarioFunc) {
- loggedInUserScenarioWithRole(desc, "GET", url, url, models.ROLE_EDITOR, fn)
-}
-
-func loggedInUserScenarioWithRole(desc string, method string, url string, routePattern string, role models.RoleType, fn scenarioFunc) {
- Convey(desc+" "+url, func() {
- defer bus.ClearBusHandlers()
-
- sc := &scenarioContext{
- url: url,
- }
- viewsPath, _ := filepath.Abs("../../public/views")
-
- sc.m = macaron.New()
- sc.m.Use(macaron.Renderer(macaron.RenderOptions{
- Directory: viewsPath,
- Delims: macaron.Delims{Left: "[[", Right: "]]"},
- }))
-
- sc.m.Use(middleware.GetContextHandler())
- sc.m.Use(middleware.Sessioner(&session.Options{}))
-
- sc.defaultHandler = wrap(func(c *middleware.Context) Response {
- sc.context = c
- sc.context.UserId = TestUserID
- sc.context.OrgId = TestOrgID
- sc.context.OrgRole = role
- if sc.handlerFunc != nil {
- return sc.handlerFunc(sc.context)
- }
-
- return nil
- })
-
- switch method {
- case "GET":
- sc.m.Get(routePattern, sc.defaultHandler)
- case "DELETE":
- sc.m.Delete(routePattern, sc.defaultHandler)
- }
-
- fn(sc)
- })
-}
-
-func (sc *scenarioContext) fakeReq(method, url string) *scenarioContext {
- sc.resp = httptest.NewRecorder()
- req, err := http.NewRequest(method, url, nil)
- So(err, ShouldBeNil)
- sc.req = req
-
- return sc
-}
-
-func (sc *scenarioContext) fakeReqWithParams(method, url string, queryParams map[string]string) *scenarioContext {
- sc.resp = httptest.NewRecorder()
- req, err := http.NewRequest(method, url, nil)
- q := req.URL.Query()
- for k, v := range queryParams {
- q.Add(k, v)
- }
- req.URL.RawQuery = q.Encode()
- So(err, ShouldBeNil)
- sc.req = req
-
- return sc
-}
-
-type scenarioContext struct {
- m *macaron.Macaron
- context *middleware.Context
- resp *httptest.ResponseRecorder
- handlerFunc handlerFunc
- defaultHandler macaron.Handler
- req *http.Request
- url string
-}
-
-func (sc *scenarioContext) exec() {
- sc.m.ServeHTTP(sc.resp, sc.req)
-}
-
-type scenarioFunc func(c *scenarioContext)
-type handlerFunc func(c *middleware.Context) Response
diff --git a/pkg/api/dtos/alerting.go b/pkg/api/dtos/alerting.go
index 4285ebc89cc..d30f2697f3f 100644
--- a/pkg/api/dtos/alerting.go
+++ b/pkg/api/dtos/alerting.go
@@ -19,7 +19,8 @@ type AlertRule struct {
EvalDate time.Time `json:"evalDate"`
EvalData *simplejson.Json `json:"evalData"`
ExecutionError string `json:"executionError"`
- DashbboardUri string `json:"dashboardUri"`
+ Url string `json:"url"`
+ CanEdit bool `json:"canEdit"`
}
type AlertNotification struct {
diff --git a/pkg/api/dtos/dashboard.go b/pkg/api/dtos/dashboard.go
index 0be0537527b..e4c66aebbda 100644
--- a/pkg/api/dtos/dashboard.go
+++ b/pkg/api/dtos/dashboard.go
@@ -16,6 +16,7 @@ type DashboardMeta struct {
CanAdmin bool `json:"canAdmin"`
CanStar bool `json:"canStar"`
Slug string `json:"slug"`
+ Url string `json:"url"`
Expires time.Time `json:"expires"`
Created time.Time `json:"created"`
Updated time.Time `json:"updated"`
@@ -26,6 +27,7 @@ type DashboardMeta struct {
IsFolder bool `json:"isFolder"`
FolderId int64 `json:"folderId"`
FolderTitle string `json:"folderTitle"`
+ FolderUrl string `json:"folderUrl"`
}
type DashboardFullWithMeta struct {
diff --git a/pkg/api/http_server.go b/pkg/api/http_server.go
index 0366b9aedad..b911780913d 100644
--- a/pkg/api/http_server.go
+++ b/pkg/api/http_server.go
@@ -162,6 +162,10 @@ func (hs *HttpServer) newMacaron() *macaron.Macaron {
hs.mapStatic(m, setting.StaticRootPath, "", "public")
hs.mapStatic(m, setting.StaticRootPath, "robots.txt", "robots.txt")
+ if setting.ImageUploadProvider == "local" {
+ hs.mapStatic(m, setting.ImagesDir, "", "/public/img/attachments")
+ }
+
m.Use(macaron.Renderer(macaron.RenderOptions{
Directory: path.Join(setting.StaticRootPath, "views"),
IndentJSON: macaron.Env != macaron.PROD,
diff --git a/pkg/api/index.go b/pkg/api/index.go
index 1b836356189..5beecefab88 100644
--- a/pkg/api/index.go
+++ b/pkg/api/index.go
@@ -102,8 +102,8 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
}
dashboardChildNavs := []*dtos.NavLink{
- {Text: "Home", Url: setting.AppSubUrl + "/", Icon: "gicon gicon-home", HideFromTabs: true},
- {Divider: true, HideFromTabs: true},
+ {Text: "Home", Id: "home", Url: setting.AppSubUrl + "/", Icon: "gicon gicon-home", HideFromTabs: true},
+ {Text: "Divider", Divider: true, Id: "divider", HideFromTabs: true},
{Text: "Manage", Id: "manage-dashboards", Url: setting.AppSubUrl + "/dashboards", Icon: "gicon gicon-manage"},
{Text: "Playlists", Id: "playlists", Url: setting.AppSubUrl + "/playlists", Icon: "gicon gicon-playlists"},
{Text: "Snapshots", Id: "snapshots", Url: setting.AppSubUrl + "/dashboard/snapshots", Icon: "gicon gicon-snapshots"},
@@ -261,7 +261,7 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
if c.IsGrafanaAdmin {
cfgNode.Children = append(cfgNode.Children, &dtos.NavLink{
- Divider: true, HideFromTabs: true,
+ Divider: true, HideFromTabs: true, Id: "admin-divider", Text: "Text",
})
cfgNode.Children = append(cfgNode.Children, &dtos.NavLink{
Text: "Server Admin",
diff --git a/pkg/api/login.go b/pkg/api/login.go
index ebfe672f825..b6855af7baf 100644
--- a/pkg/api/login.go
+++ b/pkg/api/login.go
@@ -102,12 +102,13 @@ func LoginPost(c *middleware.Context, cmd dtos.LoginCommand) Response {
}
authQuery := login.LoginUserQuery{
- Username: cmd.User,
- Password: cmd.Password,
+ Username: cmd.User,
+ Password: cmd.Password,
+ IpAddress: c.Req.RemoteAddr,
}
if err := bus.Dispatch(&authQuery); err != nil {
- if err == login.ErrInvalidCredentials {
+ if err == login.ErrInvalidCredentials || err == login.ErrTooManyLoginAttempts {
return ApiError(401, "Invalid username or password", err)
}
diff --git a/pkg/api/login_oauth.go b/pkg/api/login_oauth.go
index 38aff2ac2b4..341ff212f10 100644
--- a/pkg/api/login_oauth.go
+++ b/pkg/api/login_oauth.go
@@ -29,7 +29,7 @@ var (
ErrSignUpNotAllowed = errors.New("Signup is not allowed for this adapter")
ErrUsersQuotaReached = errors.New("Users quota reached")
ErrNoEmail = errors.New("Login provider didn't return an email address")
- oauthLogger = log.New("oauth.login")
+ oauthLogger = log.New("oauth")
)
func GenStateString() string {
@@ -40,14 +40,14 @@ func GenStateString() string {
func OAuthLogin(ctx *middleware.Context) {
if setting.OAuthService == nil {
- ctx.Handle(404, "login.OAuthLogin(oauth service not enabled)", nil)
+ ctx.Handle(404, "OAuth not enabled", nil)
return
}
name := ctx.Params(":name")
connect, ok := social.SocialMap[name]
if !ok {
- ctx.Handle(404, "login.OAuthLogin(social login not enabled)", errors.New(name))
+ ctx.Handle(404, fmt.Sprintf("No OAuth with name %s configured", name), nil)
return
}
@@ -96,7 +96,9 @@ func OAuthLogin(ctx *middleware.Context) {
if setting.OAuthService.OAuthInfos[name].TlsClientCert != "" || setting.OAuthService.OAuthInfos[name].TlsClientKey != "" {
cert, err := tls.LoadX509KeyPair(setting.OAuthService.OAuthInfos[name].TlsClientCert, setting.OAuthService.OAuthInfos[name].TlsClientKey)
if err != nil {
- log.Fatal(1, "Failed to setup TlsClientCert", "oauth provider", name, "error", err)
+ ctx.Logger.Error("Failed to setup TlsClientCert", "oauth", name, "error", err)
+ ctx.Handle(500, "login.OAuthLogin(Failed to setup TlsClientCert)", nil)
+ return
}
tr.TLSClientConfig.Certificates = append(tr.TLSClientConfig.Certificates, cert)
@@ -105,7 +107,9 @@ func OAuthLogin(ctx *middleware.Context) {
if setting.OAuthService.OAuthInfos[name].TlsClientCa != "" {
caCert, err := ioutil.ReadFile(setting.OAuthService.OAuthInfos[name].TlsClientCa)
if err != nil {
- log.Fatal(1, "Failed to setup TlsClientCa", "oauth provider", name, "error", err)
+ ctx.Logger.Error("Failed to setup TlsClientCa", "oauth", name, "error", err)
+ ctx.Handle(500, "login.OAuthLogin(Failed to setup TlsClientCa)", nil)
+ return
}
caCertPool := x509.NewCertPool()
caCertPool.AppendCertsFromPEM(caCert)
@@ -124,13 +128,13 @@ func OAuthLogin(ctx *middleware.Context) {
// token.TokenType was defaulting to "bearer", which is out of spec, so we explicitly set to "Bearer"
token.TokenType = "Bearer"
- ctx.Logger.Debug("OAuthLogin Got token")
+ oauthLogger.Debug("OAuthLogin Got token", "token", token)
// set up oauth2 client
client := connect.Client(oauthCtx, token)
// get user info
- userInfo, err := connect.UserInfo(client)
+ userInfo, err := connect.UserInfo(client, token)
if err != nil {
if sErr, ok := err.(*social.Error); ok {
redirectWithError(ctx, sErr)
@@ -140,7 +144,7 @@ func OAuthLogin(ctx *middleware.Context) {
return
}
- ctx.Logger.Debug("OAuthLogin got user info", "userInfo", userInfo)
+ oauthLogger.Debug("OAuthLogin got user info", "userInfo", userInfo)
// validate that we got at least an email address
if userInfo.Email == "" {
@@ -205,8 +209,7 @@ func OAuthLogin(ctx *middleware.Context) {
}
func redirectWithError(ctx *middleware.Context, err error, v ...interface{}) {
- ctx.Logger.Info(err.Error(), v...)
- // TODO: we can use the flash storage here once it's implemented
+ ctx.Logger.Error(err.Error(), v...)
ctx.Session.Set("loginError", err.Error())
ctx.Redirect(setting.AppSubUrl + "/login")
}
diff --git a/pkg/components/imguploader/imguploader.go b/pkg/components/imguploader/imguploader.go
index 383d2c6d311..52a31f9f606 100644
--- a/pkg/components/imguploader/imguploader.go
+++ b/pkg/components/imguploader/imguploader.go
@@ -88,6 +88,8 @@ func NewImageUploader() (ImageUploader, error) {
container_name := azureBlobSec.Key("container_name").MustString("")
return NewAzureBlobUploader(account_name, account_key, container_name), nil
+ case "local":
+ return NewLocalImageUploader()
}
if setting.ImageUploadProvider != "" {
diff --git a/pkg/components/imguploader/imguploader_test.go b/pkg/components/imguploader/imguploader_test.go
index d5008c9ae9f..b0311dac975 100644
--- a/pkg/components/imguploader/imguploader_test.go
+++ b/pkg/components/imguploader/imguploader_test.go
@@ -143,5 +143,23 @@ func TestImageUploaderFactory(t *testing.T) {
So(original.container_name, ShouldEqual, "container_name")
})
})
+
+ Convey("Local uploader", func() {
+ var err error
+
+ setting.NewConfigContext(&setting.CommandLineArgs{
+ HomePath: "../../../",
+ })
+
+ setting.ImageUploadProvider = "local"
+
+ uploader, err := NewImageUploader()
+
+ So(err, ShouldBeNil)
+ original, ok := uploader.(*LocalUploader)
+
+ So(ok, ShouldBeTrue)
+ So(original, ShouldNotBeNil)
+ })
})
}
diff --git a/pkg/components/imguploader/localuploader.go b/pkg/components/imguploader/localuploader.go
new file mode 100644
index 00000000000..022d67122a7
--- /dev/null
+++ b/pkg/components/imguploader/localuploader.go
@@ -0,0 +1,22 @@
+package imguploader
+
+import (
+ "context"
+ "path"
+ "path/filepath"
+
+ "github.com/grafana/grafana/pkg/setting"
+)
+
+type LocalUploader struct {
+}
+
+func (u *LocalUploader) Upload(ctx context.Context, imageOnDiskPath string) (string, error) {
+ filename := filepath.Base(imageOnDiskPath)
+ image_url := setting.ToAbsUrl(path.Join("public/img/attachments", filename))
+ return image_url, nil
+}
+
+func NewLocalImageUploader() (*LocalUploader, error) {
+ return &LocalUploader{}, nil
+}
diff --git a/pkg/components/imguploader/localuploader_test.go b/pkg/components/imguploader/localuploader_test.go
new file mode 100644
index 00000000000..0d8c0df0e57
--- /dev/null
+++ b/pkg/components/imguploader/localuploader_test.go
@@ -0,0 +1,18 @@
+package imguploader
+
+import (
+ "context"
+ "testing"
+
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestUploadToLocal(t *testing.T) {
+ Convey("[Integration test] for external_image_store.local", t, func() {
+ localUploader, _ := NewLocalImageUploader()
+ path, err := localUploader.Upload(context.Background(), "../../../public/img/logo_transparent_400x.png")
+
+ So(err, ShouldBeNil)
+ So(path, ShouldContainSubstring, "/public/img/attachments")
+ })
+}
diff --git a/pkg/components/renderer/renderer.go b/pkg/components/renderer/renderer.go
index 25d77557342..313f7892707 100644
--- a/pkg/components/renderer/renderer.go
+++ b/pkg/components/renderer/renderer.go
@@ -91,9 +91,15 @@ func RenderToPng(params *RenderOpts) (string, error) {
timeout = 15
}
+ phantomDebugArg := "--debug=false"
+ if log.GetLogLevelFor("png-renderer") >= log.LvlDebug {
+ phantomDebugArg = "--debug=true"
+ }
+
cmdArgs := []string{
"--ignore-ssl-errors=true",
"--web-security=false",
+ phantomDebugArg,
scriptPath,
"url=" + url,
"width=" + params.Width,
@@ -109,15 +115,13 @@ func RenderToPng(params *RenderOpts) (string, error) {
}
cmd := exec.Command(binPath, cmdArgs...)
- stdout, err := cmd.StdoutPipe()
+ output, err := cmd.StdoutPipe()
if err != nil {
+ rendererLog.Error("Could not acquire stdout pipe", err)
return "", err
}
- stderr, err := cmd.StderrPipe()
- if err != nil {
- return "", err
- }
+ cmd.Stderr = cmd.Stdout
if params.Timezone != "" {
baseEnviron := os.Environ()
@@ -126,11 +130,12 @@ func RenderToPng(params *RenderOpts) (string, error) {
err = cmd.Start()
if err != nil {
+ rendererLog.Error("Could not start command", err)
return "", err
}
- go io.Copy(os.Stdout, stdout)
- go io.Copy(os.Stdout, stderr)
+ logWriter := log.NewLogWriter(rendererLog, log.LvlDebug, "[phantom] ")
+ go io.Copy(logWriter, output)
done := make(chan error)
go func() {
diff --git a/pkg/log/log.go b/pkg/log/log.go
index 88b90f0cf8e..0e6874e1b4b 100644
--- a/pkg/log/log.go
+++ b/pkg/log/log.go
@@ -21,6 +21,7 @@ import (
var Root log15.Logger
var loggersToClose []DisposableHandler
+var filters map[string]log15.Lvl
func init() {
loggersToClose = make([]DisposableHandler, 0)
@@ -114,6 +115,25 @@ func Close() {
loggersToClose = make([]DisposableHandler, 0)
}
+func GetLogLevelFor(name string) Lvl {
+ if level, ok := filters[name]; ok {
+ switch level {
+ case log15.LvlWarn:
+ return LvlWarn
+ case log15.LvlInfo:
+ return LvlInfo
+ case log15.LvlError:
+ return LvlError
+ case log15.LvlCrit:
+ return LvlCrit
+ default:
+ return LvlDebug
+ }
+ }
+
+ return LvlInfo
+}
+
var logLevels = map[string]log15.Lvl{
"trace": log15.LvlDebug,
"debug": log15.LvlDebug,
@@ -187,7 +207,7 @@ func ReadLoggingConfig(modes []string, logsPath string, cfg *ini.File) {
// Log level.
_, level := getLogLevelFromConfig("log."+mode, defaultLevelName, cfg)
- modeFilters := getFilters(util.SplitString(sec.Key("filters").String()))
+ filters := getFilters(util.SplitString(sec.Key("filters").String()))
format := getLogFormat(sec.Key("format").MustString(""))
var handler log15.Handler
@@ -219,12 +239,12 @@ func ReadLoggingConfig(modes []string, logsPath string, cfg *ini.File) {
}
for key, value := range defaultFilters {
- if _, exist := modeFilters[key]; !exist {
- modeFilters[key] = value
+ if _, exist := filters[key]; !exist {
+ filters[key] = value
}
}
- handler = LogFilterHandler(level, modeFilters, handler)
+ handler = LogFilterHandler(level, filters, handler)
handlers = append(handlers, handler)
}
diff --git a/pkg/log/log_writer.go b/pkg/log/log_writer.go
new file mode 100644
index 00000000000..2ff401a7f0a
--- /dev/null
+++ b/pkg/log/log_writer.go
@@ -0,0 +1,39 @@
+package log
+
+import (
+ "io"
+ "strings"
+)
+
+type logWriterImpl struct {
+ log Logger
+ level Lvl
+ prefix string
+}
+
+func NewLogWriter(log Logger, level Lvl, prefix string) io.Writer {
+ return &logWriterImpl{
+ log: log,
+ level: level,
+ prefix: prefix,
+ }
+}
+
+func (l *logWriterImpl) Write(p []byte) (n int, err error) {
+ message := l.prefix + strings.TrimSpace(string(p))
+
+ switch l.level {
+ case LvlCrit:
+ l.log.Crit(message)
+ case LvlError:
+ l.log.Error(message)
+ case LvlWarn:
+ l.log.Warn(message)
+ case LvlInfo:
+ l.log.Info(message)
+ default:
+ l.log.Debug(message)
+ }
+
+ return len(p), nil
+}
diff --git a/pkg/log/log_writer_test.go b/pkg/log/log_writer_test.go
new file mode 100644
index 00000000000..4537b4d6100
--- /dev/null
+++ b/pkg/log/log_writer_test.go
@@ -0,0 +1,116 @@
+package log
+
+import (
+ "testing"
+
+ "github.com/inconshreveable/log15"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+type FakeLogger struct {
+ debug string
+ info string
+ warn string
+ err string
+ crit string
+}
+
+func (f *FakeLogger) New(ctx ...interface{}) log15.Logger {
+ return nil
+}
+
+func (f *FakeLogger) Debug(msg string, ctx ...interface{}) {
+ f.debug = msg
+}
+
+func (f *FakeLogger) Info(msg string, ctx ...interface{}) {
+ f.info = msg
+}
+
+func (f *FakeLogger) Warn(msg string, ctx ...interface{}) {
+ f.warn = msg
+}
+
+func (f *FakeLogger) Error(msg string, ctx ...interface{}) {
+ f.err = msg
+}
+
+func (f *FakeLogger) Crit(msg string, ctx ...interface{}) {
+ f.crit = msg
+}
+
+func (f *FakeLogger) GetHandler() log15.Handler {
+ return nil
+}
+
+func (f *FakeLogger) SetHandler(l log15.Handler) {}
+
+func TestLogWriter(t *testing.T) {
+ Convey("When writing to a LogWriter", t, func() {
+ Convey("Should write using the correct level [crit]", func() {
+ fake := &FakeLogger{}
+
+ crit := NewLogWriter(fake, LvlCrit, "")
+ n, err := crit.Write([]byte("crit"))
+
+ So(n, ShouldEqual, 4)
+ So(err, ShouldBeNil)
+ So(fake.crit, ShouldEqual, "crit")
+ })
+
+ Convey("Should write using the correct level [error]", func() {
+ fake := &FakeLogger{}
+
+ crit := NewLogWriter(fake, LvlError, "")
+ n, err := crit.Write([]byte("error"))
+
+ So(n, ShouldEqual, 5)
+ So(err, ShouldBeNil)
+ So(fake.err, ShouldEqual, "error")
+ })
+
+ Convey("Should write using the correct level [warn]", func() {
+ fake := &FakeLogger{}
+
+ crit := NewLogWriter(fake, LvlWarn, "")
+ n, err := crit.Write([]byte("warn"))
+
+ So(n, ShouldEqual, 4)
+ So(err, ShouldBeNil)
+ So(fake.warn, ShouldEqual, "warn")
+ })
+
+ Convey("Should write using the correct level [info]", func() {
+ fake := &FakeLogger{}
+
+ crit := NewLogWriter(fake, LvlInfo, "")
+ n, err := crit.Write([]byte("info"))
+
+ So(n, ShouldEqual, 4)
+ So(err, ShouldBeNil)
+ So(fake.info, ShouldEqual, "info")
+ })
+
+ Convey("Should write using the correct level [debug]", func() {
+ fake := &FakeLogger{}
+
+ crit := NewLogWriter(fake, LvlDebug, "")
+ n, err := crit.Write([]byte("debug"))
+
+ So(n, ShouldEqual, 5)
+ So(err, ShouldBeNil)
+ So(fake.debug, ShouldEqual, "debug")
+ })
+
+ Convey("Should prefix the output with the prefix", func() {
+ fake := &FakeLogger{}
+
+ crit := NewLogWriter(fake, LvlDebug, "prefix")
+ n, err := crit.Write([]byte("debug"))
+
+ So(n, ShouldEqual, 5) // n is how much of input consumed
+ So(err, ShouldBeNil)
+ So(fake.debug, ShouldEqual, "prefixdebug")
+ })
+ })
+}
diff --git a/pkg/login/auth.go b/pkg/login/auth.go
index 45561783e43..5527c7271d6 100644
--- a/pkg/login/auth.go
+++ b/pkg/login/auth.go
@@ -3,21 +3,20 @@ package login
import (
"errors"
- "crypto/subtle"
"github.com/grafana/grafana/pkg/bus"
m "github.com/grafana/grafana/pkg/models"
- "github.com/grafana/grafana/pkg/setting"
- "github.com/grafana/grafana/pkg/util"
)
var (
- ErrInvalidCredentials = errors.New("Invalid Username or Password")
+ ErrInvalidCredentials = errors.New("Invalid Username or Password")
+ ErrTooManyLoginAttempts = errors.New("Too many consecutive incorrect login attempts for user. Login for user temporarily blocked")
)
type LoginUserQuery struct {
- Username string
- Password string
- User *m.User
+ Username string
+ Password string
+ User *m.User
+ IpAddress string
}
func Init() {
@@ -26,41 +25,31 @@ func Init() {
}
func AuthenticateUser(query *LoginUserQuery) error {
- err := loginUsingGrafanaDB(query)
- if err == nil || err != ErrInvalidCredentials {
+ if err := validateLoginAttempts(query.Username); err != nil {
return err
}
- if setting.LdapEnabled {
- for _, server := range LdapCfg.Servers {
- author := NewLdapAuthenticator(server)
- err = author.Login(query)
- if err == nil || err != ErrInvalidCredentials {
- return err
- }
+ err := loginUsingGrafanaDB(query)
+ if err == nil || (err != m.ErrUserNotFound && err != ErrInvalidCredentials) {
+ return err
+ }
+
+ ldapEnabled, ldapErr := loginUsingLdap(query)
+ if ldapEnabled {
+ if ldapErr == nil || ldapErr != ErrInvalidCredentials {
+ return ldapErr
}
+
+ err = ldapErr
+ }
+
+ if err == ErrInvalidCredentials {
+ saveInvalidLoginAttempt(query)
+ }
+
+ if err == m.ErrUserNotFound {
+ return ErrInvalidCredentials
}
return err
}
-
-func loginUsingGrafanaDB(query *LoginUserQuery) error {
- userQuery := m.GetUserByLoginQuery{LoginOrEmail: query.Username}
-
- if err := bus.Dispatch(&userQuery); err != nil {
- if err == m.ErrUserNotFound {
- return ErrInvalidCredentials
- }
- return err
- }
-
- user := userQuery.Result
-
- passwordHashed := util.EncodePassword(query.Password, user.Salt)
- if subtle.ConstantTimeCompare([]byte(passwordHashed), []byte(user.Password)) != 1 {
- return ErrInvalidCredentials
- }
-
- query.User = user
- return nil
-}
diff --git a/pkg/login/auth_test.go b/pkg/login/auth_test.go
new file mode 100644
index 00000000000..59d3c8f2b33
--- /dev/null
+++ b/pkg/login/auth_test.go
@@ -0,0 +1,214 @@
+package login
+
+import (
+ "errors"
+ "testing"
+
+ m "github.com/grafana/grafana/pkg/models"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestAuthenticateUser(t *testing.T) {
+ Convey("Authenticate user", t, func() {
+ authScenario("When a user authenticates having too many login attempts", func(sc *authScenarioContext) {
+ mockLoginAttemptValidation(ErrTooManyLoginAttempts, sc)
+ mockLoginUsingGrafanaDB(nil, sc)
+ mockLoginUsingLdap(true, nil, sc)
+ mockSaveInvalidLoginAttempt(sc)
+
+ err := AuthenticateUser(sc.loginUserQuery)
+
+ Convey("it should result in", func() {
+ So(err, ShouldEqual, ErrTooManyLoginAttempts)
+ So(sc.loginAttemptValidationWasCalled, ShouldBeTrue)
+ So(sc.grafanaLoginWasCalled, ShouldBeFalse)
+ So(sc.ldapLoginWasCalled, ShouldBeFalse)
+ So(sc.saveInvalidLoginAttemptWasCalled, ShouldBeFalse)
+ })
+ })
+
+ authScenario("When grafana user authenticate with valid credentials", func(sc *authScenarioContext) {
+ mockLoginAttemptValidation(nil, sc)
+ mockLoginUsingGrafanaDB(nil, sc)
+ mockLoginUsingLdap(true, ErrInvalidCredentials, sc)
+ mockSaveInvalidLoginAttempt(sc)
+
+ err := AuthenticateUser(sc.loginUserQuery)
+
+ Convey("it should result in", func() {
+ So(err, ShouldEqual, nil)
+ So(sc.loginAttemptValidationWasCalled, ShouldBeTrue)
+ So(sc.grafanaLoginWasCalled, ShouldBeTrue)
+ So(sc.ldapLoginWasCalled, ShouldBeFalse)
+ So(sc.saveInvalidLoginAttemptWasCalled, ShouldBeFalse)
+ })
+ })
+
+ authScenario("When grafana user authenticate and unexpected error occurs", func(sc *authScenarioContext) {
+ customErr := errors.New("custom")
+ mockLoginAttemptValidation(nil, sc)
+ mockLoginUsingGrafanaDB(customErr, sc)
+ mockLoginUsingLdap(true, ErrInvalidCredentials, sc)
+ mockSaveInvalidLoginAttempt(sc)
+
+ err := AuthenticateUser(sc.loginUserQuery)
+
+ Convey("it should result in", func() {
+ So(err, ShouldEqual, customErr)
+ So(sc.loginAttemptValidationWasCalled, ShouldBeTrue)
+ So(sc.grafanaLoginWasCalled, ShouldBeTrue)
+ So(sc.ldapLoginWasCalled, ShouldBeFalse)
+ So(sc.saveInvalidLoginAttemptWasCalled, ShouldBeFalse)
+ })
+ })
+
+ authScenario("When a non-existing grafana user authenticate and ldap disabled", func(sc *authScenarioContext) {
+ mockLoginAttemptValidation(nil, sc)
+ mockLoginUsingGrafanaDB(m.ErrUserNotFound, sc)
+ mockLoginUsingLdap(false, nil, sc)
+ mockSaveInvalidLoginAttempt(sc)
+
+ err := AuthenticateUser(sc.loginUserQuery)
+
+ Convey("it should result in", func() {
+ So(err, ShouldEqual, ErrInvalidCredentials)
+ So(sc.loginAttemptValidationWasCalled, ShouldBeTrue)
+ So(sc.grafanaLoginWasCalled, ShouldBeTrue)
+ So(sc.ldapLoginWasCalled, ShouldBeTrue)
+ So(sc.saveInvalidLoginAttemptWasCalled, ShouldBeFalse)
+ })
+ })
+
+ authScenario("When a non-existing grafana user authenticate and invalid ldap credentials", func(sc *authScenarioContext) {
+ mockLoginAttemptValidation(nil, sc)
+ mockLoginUsingGrafanaDB(m.ErrUserNotFound, sc)
+ mockLoginUsingLdap(true, ErrInvalidCredentials, sc)
+ mockSaveInvalidLoginAttempt(sc)
+
+ err := AuthenticateUser(sc.loginUserQuery)
+
+ Convey("it should result in", func() {
+ So(err, ShouldEqual, ErrInvalidCredentials)
+ So(sc.loginAttemptValidationWasCalled, ShouldBeTrue)
+ So(sc.grafanaLoginWasCalled, ShouldBeTrue)
+ So(sc.ldapLoginWasCalled, ShouldBeTrue)
+ So(sc.saveInvalidLoginAttemptWasCalled, ShouldBeTrue)
+ })
+ })
+
+ authScenario("When a non-existing grafana user authenticate and valid ldap credentials", func(sc *authScenarioContext) {
+ mockLoginAttemptValidation(nil, sc)
+ mockLoginUsingGrafanaDB(m.ErrUserNotFound, sc)
+ mockLoginUsingLdap(true, nil, sc)
+ mockSaveInvalidLoginAttempt(sc)
+
+ err := AuthenticateUser(sc.loginUserQuery)
+
+ Convey("it should result in", func() {
+ So(err, ShouldBeNil)
+ So(sc.loginAttemptValidationWasCalled, ShouldBeTrue)
+ So(sc.grafanaLoginWasCalled, ShouldBeTrue)
+ So(sc.ldapLoginWasCalled, ShouldBeTrue)
+ So(sc.saveInvalidLoginAttemptWasCalled, ShouldBeFalse)
+ })
+ })
+
+ authScenario("When a non-existing grafana user authenticate and ldap returns unexpected error", func(sc *authScenarioContext) {
+ customErr := errors.New("custom")
+ mockLoginAttemptValidation(nil, sc)
+ mockLoginUsingGrafanaDB(m.ErrUserNotFound, sc)
+ mockLoginUsingLdap(true, customErr, sc)
+ mockSaveInvalidLoginAttempt(sc)
+
+ err := AuthenticateUser(sc.loginUserQuery)
+
+ Convey("it should result in", func() {
+ So(err, ShouldEqual, customErr)
+ So(sc.loginAttemptValidationWasCalled, ShouldBeTrue)
+ So(sc.grafanaLoginWasCalled, ShouldBeTrue)
+ So(sc.ldapLoginWasCalled, ShouldBeTrue)
+ So(sc.saveInvalidLoginAttemptWasCalled, ShouldBeFalse)
+ })
+ })
+
+ authScenario("When grafana user authenticate with invalid credentials and invalid ldap credentials", func(sc *authScenarioContext) {
+ mockLoginAttemptValidation(nil, sc)
+ mockLoginUsingGrafanaDB(ErrInvalidCredentials, sc)
+ mockLoginUsingLdap(true, ErrInvalidCredentials, sc)
+ mockSaveInvalidLoginAttempt(sc)
+
+ err := AuthenticateUser(sc.loginUserQuery)
+
+ Convey("it should result in", func() {
+ So(err, ShouldEqual, ErrInvalidCredentials)
+ So(sc.loginAttemptValidationWasCalled, ShouldBeTrue)
+ So(sc.grafanaLoginWasCalled, ShouldBeTrue)
+ So(sc.ldapLoginWasCalled, ShouldBeTrue)
+ So(sc.saveInvalidLoginAttemptWasCalled, ShouldBeTrue)
+ })
+ })
+ })
+}
+
+type authScenarioContext struct {
+ loginUserQuery *LoginUserQuery
+ grafanaLoginWasCalled bool
+ ldapLoginWasCalled bool
+ loginAttemptValidationWasCalled bool
+ saveInvalidLoginAttemptWasCalled bool
+}
+
+type authScenarioFunc func(sc *authScenarioContext)
+
+func mockLoginUsingGrafanaDB(err error, sc *authScenarioContext) {
+ loginUsingGrafanaDB = func(query *LoginUserQuery) error {
+ sc.grafanaLoginWasCalled = true
+ return err
+ }
+}
+
+func mockLoginUsingLdap(enabled bool, err error, sc *authScenarioContext) {
+ loginUsingLdap = func(query *LoginUserQuery) (bool, error) {
+ sc.ldapLoginWasCalled = true
+ return enabled, err
+ }
+}
+
+func mockLoginAttemptValidation(err error, sc *authScenarioContext) {
+ validateLoginAttempts = func(username string) error {
+ sc.loginAttemptValidationWasCalled = true
+ return err
+ }
+}
+
+func mockSaveInvalidLoginAttempt(sc *authScenarioContext) {
+ saveInvalidLoginAttempt = func(query *LoginUserQuery) {
+ sc.saveInvalidLoginAttemptWasCalled = true
+ }
+}
+
+func authScenario(desc string, fn authScenarioFunc) {
+ Convey(desc, func() {
+ origLoginUsingGrafanaDB := loginUsingGrafanaDB
+ origLoginUsingLdap := loginUsingLdap
+ origValidateLoginAttempts := validateLoginAttempts
+ origSaveInvalidLoginAttempt := saveInvalidLoginAttempt
+
+ sc := &authScenarioContext{
+ loginUserQuery: &LoginUserQuery{
+ Username: "user",
+ Password: "pwd",
+ IpAddress: "192.168.1.1:56433",
+ },
+ }
+
+ defer func() {
+ loginUsingGrafanaDB = origLoginUsingGrafanaDB
+ loginUsingLdap = origLoginUsingLdap
+ validateLoginAttempts = origValidateLoginAttempts
+ saveInvalidLoginAttempt = origSaveInvalidLoginAttempt
+ }()
+
+ fn(sc)
+ })
+}
diff --git a/pkg/login/brute_force_login_protection.go b/pkg/login/brute_force_login_protection.go
new file mode 100644
index 00000000000..2ea93979c7a
--- /dev/null
+++ b/pkg/login/brute_force_login_protection.go
@@ -0,0 +1,48 @@
+package login
+
+import (
+ "time"
+
+ "github.com/grafana/grafana/pkg/bus"
+ m "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/setting"
+)
+
+var (
+ maxInvalidLoginAttempts int64 = 5
+ loginAttemptsWindow time.Duration = time.Minute * 5
+)
+
+var validateLoginAttempts = func(username string) error {
+ if setting.DisableBruteForceLoginProtection {
+ return nil
+ }
+
+ loginAttemptCountQuery := m.GetUserLoginAttemptCountQuery{
+ Username: username,
+ Since: time.Now().Add(-loginAttemptsWindow),
+ }
+
+ if err := bus.Dispatch(&loginAttemptCountQuery); err != nil {
+ return err
+ }
+
+ if loginAttemptCountQuery.Result >= maxInvalidLoginAttempts {
+ return ErrTooManyLoginAttempts
+ }
+
+ return nil
+}
+
+var saveInvalidLoginAttempt = func(query *LoginUserQuery) {
+ if setting.DisableBruteForceLoginProtection {
+ return
+ }
+
+ loginAttemptCommand := m.CreateLoginAttemptCommand{
+ Username: query.Username,
+ IpAddress: query.IpAddress,
+ }
+
+ bus.Dispatch(&loginAttemptCommand)
+}
diff --git a/pkg/login/brute_force_login_protection_test.go b/pkg/login/brute_force_login_protection_test.go
new file mode 100644
index 00000000000..5375134ba88
--- /dev/null
+++ b/pkg/login/brute_force_login_protection_test.go
@@ -0,0 +1,125 @@
+package login
+
+import (
+ "testing"
+
+ "github.com/grafana/grafana/pkg/bus"
+ m "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/setting"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestLoginAttemptsValidation(t *testing.T) {
+ Convey("Validate login attempts", t, func() {
+ Convey("Given brute force login protection enabled", func() {
+ setting.DisableBruteForceLoginProtection = false
+
+ Convey("When user login attempt count equals max-1 ", func() {
+ withLoginAttempts(maxInvalidLoginAttempts - 1)
+ err := validateLoginAttempts("user")
+
+ Convey("it should not result in error", func() {
+ So(err, ShouldBeNil)
+ })
+ })
+
+ Convey("When user login attempt count equals max ", func() {
+ withLoginAttempts(maxInvalidLoginAttempts)
+ err := validateLoginAttempts("user")
+
+ Convey("it should result in too many login attempts error", func() {
+ So(err, ShouldEqual, ErrTooManyLoginAttempts)
+ })
+ })
+
+ Convey("When user login attempt count is greater than max ", func() {
+ withLoginAttempts(maxInvalidLoginAttempts + 5)
+ err := validateLoginAttempts("user")
+
+ Convey("it should result in too many login attempts error", func() {
+ So(err, ShouldEqual, ErrTooManyLoginAttempts)
+ })
+ })
+
+ Convey("When saving invalid login attempt", func() {
+ defer bus.ClearBusHandlers()
+ createLoginAttemptCmd := &m.CreateLoginAttemptCommand{}
+
+ bus.AddHandler("test", func(cmd *m.CreateLoginAttemptCommand) error {
+ createLoginAttemptCmd = cmd
+ return nil
+ })
+
+ saveInvalidLoginAttempt(&LoginUserQuery{
+ Username: "user",
+ Password: "pwd",
+ IpAddress: "192.168.1.1:56433",
+ })
+
+ Convey("it should dispatch command", func() {
+ So(createLoginAttemptCmd, ShouldNotBeNil)
+ So(createLoginAttemptCmd.Username, ShouldEqual, "user")
+ So(createLoginAttemptCmd.IpAddress, ShouldEqual, "192.168.1.1:56433")
+ })
+ })
+ })
+
+ Convey("Given brute force login protection disabled", func() {
+ setting.DisableBruteForceLoginProtection = true
+
+ Convey("When user login attempt count equals max-1 ", func() {
+ withLoginAttempts(maxInvalidLoginAttempts - 1)
+ err := validateLoginAttempts("user")
+
+ Convey("it should not result in error", func() {
+ So(err, ShouldBeNil)
+ })
+ })
+
+ Convey("When user login attempt count equals max ", func() {
+ withLoginAttempts(maxInvalidLoginAttempts)
+ err := validateLoginAttempts("user")
+
+ Convey("it should not result in error", func() {
+ So(err, ShouldBeNil)
+ })
+ })
+
+ Convey("When user login attempt count is greater than max ", func() {
+ withLoginAttempts(maxInvalidLoginAttempts + 5)
+ err := validateLoginAttempts("user")
+
+ Convey("it should not result in error", func() {
+ So(err, ShouldBeNil)
+ })
+ })
+
+ Convey("When saving invalid login attempt", func() {
+ defer bus.ClearBusHandlers()
+ createLoginAttemptCmd := (*m.CreateLoginAttemptCommand)(nil)
+
+ bus.AddHandler("test", func(cmd *m.CreateLoginAttemptCommand) error {
+ createLoginAttemptCmd = cmd
+ return nil
+ })
+
+ saveInvalidLoginAttempt(&LoginUserQuery{
+ Username: "user",
+ Password: "pwd",
+ IpAddress: "192.168.1.1:56433",
+ })
+
+ Convey("it should not dispatch command", func() {
+ So(createLoginAttemptCmd, ShouldBeNil)
+ })
+ })
+ })
+ })
+}
+
+func withLoginAttempts(loginAttempts int64) {
+ bus.AddHandler("test", func(query *m.GetUserLoginAttemptCountQuery) error {
+ query.Result = loginAttempts
+ return nil
+ })
+}
diff --git a/pkg/login/grafana_login.go b/pkg/login/grafana_login.go
new file mode 100644
index 00000000000..677ba776e4f
--- /dev/null
+++ b/pkg/login/grafana_login.go
@@ -0,0 +1,35 @@
+package login
+
+import (
+ "crypto/subtle"
+
+ "github.com/grafana/grafana/pkg/bus"
+ m "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/util"
+)
+
+var validatePassword = func(providedPassword string, userPassword string, userSalt string) error {
+ passwordHashed := util.EncodePassword(providedPassword, userSalt)
+ if subtle.ConstantTimeCompare([]byte(passwordHashed), []byte(userPassword)) != 1 {
+ return ErrInvalidCredentials
+ }
+
+ return nil
+}
+
+var loginUsingGrafanaDB = func(query *LoginUserQuery) error {
+ userQuery := m.GetUserByLoginQuery{LoginOrEmail: query.Username}
+
+ if err := bus.Dispatch(&userQuery); err != nil {
+ return err
+ }
+
+ user := userQuery.Result
+
+ if err := validatePassword(query.Password, user.Password, user.Salt); err != nil {
+ return err
+ }
+
+ query.User = user
+ return nil
+}
diff --git a/pkg/login/grafana_login_test.go b/pkg/login/grafana_login_test.go
new file mode 100644
index 00000000000..88e52224113
--- /dev/null
+++ b/pkg/login/grafana_login_test.go
@@ -0,0 +1,139 @@
+package login
+
+import (
+ "testing"
+
+ "github.com/grafana/grafana/pkg/bus"
+ m "github.com/grafana/grafana/pkg/models"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestGrafanaLogin(t *testing.T) {
+ Convey("Login using Grafana DB", t, func() {
+ grafanaLoginScenario("When login with non-existing user", func(sc *grafanaLoginScenarioContext) {
+ sc.withNonExistingUser()
+ err := loginUsingGrafanaDB(sc.loginUserQuery)
+
+ Convey("it should result in user not found error", func() {
+ So(err, ShouldEqual, m.ErrUserNotFound)
+ })
+
+ Convey("it should not call password validation", func() {
+ So(sc.validatePasswordCalled, ShouldBeFalse)
+ })
+
+ Convey("it should not pupulate user object", func() {
+ So(sc.loginUserQuery.User, ShouldBeNil)
+ })
+ })
+
+ grafanaLoginScenario("When login with invalid credentials", func(sc *grafanaLoginScenarioContext) {
+ sc.withInvalidPassword()
+ err := loginUsingGrafanaDB(sc.loginUserQuery)
+
+ Convey("it should result in invalid credentials error", func() {
+ So(err, ShouldEqual, ErrInvalidCredentials)
+ })
+
+ Convey("it should call password validation", func() {
+ So(sc.validatePasswordCalled, ShouldBeTrue)
+ })
+
+ Convey("it should not pupulate user object", func() {
+ So(sc.loginUserQuery.User, ShouldBeNil)
+ })
+ })
+
+ grafanaLoginScenario("When login with valid credentials", func(sc *grafanaLoginScenarioContext) {
+ sc.withValidCredentials()
+ err := loginUsingGrafanaDB(sc.loginUserQuery)
+
+ Convey("it should not result in error", func() {
+ So(err, ShouldBeNil)
+ })
+
+ Convey("it should call password validation", func() {
+ So(sc.validatePasswordCalled, ShouldBeTrue)
+ })
+
+ Convey("it should pupulate user object", func() {
+ So(sc.loginUserQuery.User, ShouldNotBeNil)
+ So(sc.loginUserQuery.User.Login, ShouldEqual, sc.loginUserQuery.Username)
+ So(sc.loginUserQuery.User.Password, ShouldEqual, sc.loginUserQuery.Password)
+ })
+ })
+ })
+}
+
+type grafanaLoginScenarioContext struct {
+ loginUserQuery *LoginUserQuery
+ validatePasswordCalled bool
+}
+
+type grafanaLoginScenarioFunc func(c *grafanaLoginScenarioContext)
+
+func grafanaLoginScenario(desc string, fn grafanaLoginScenarioFunc) {
+ Convey(desc, func() {
+ origValidatePassword := validatePassword
+
+ sc := &grafanaLoginScenarioContext{
+ loginUserQuery: &LoginUserQuery{
+ Username: "user",
+ Password: "pwd",
+ IpAddress: "192.168.1.1:56433",
+ },
+ validatePasswordCalled: false,
+ }
+
+ defer func() {
+ validatePassword = origValidatePassword
+ }()
+
+ fn(sc)
+ })
+}
+
+func mockPasswordValidation(valid bool, sc *grafanaLoginScenarioContext) {
+ validatePassword = func(providedPassword string, userPassword string, userSalt string) error {
+ sc.validatePasswordCalled = true
+
+ if !valid {
+ return ErrInvalidCredentials
+ }
+
+ return nil
+ }
+}
+
+func (sc *grafanaLoginScenarioContext) getUserByLoginQueryReturns(user *m.User) {
+ bus.AddHandler("test", func(query *m.GetUserByLoginQuery) error {
+ if user == nil {
+ return m.ErrUserNotFound
+ }
+
+ query.Result = user
+ return nil
+ })
+}
+
+func (sc *grafanaLoginScenarioContext) withValidCredentials() {
+ sc.getUserByLoginQueryReturns(&m.User{
+ Id: 1,
+ Login: sc.loginUserQuery.Username,
+ Password: sc.loginUserQuery.Password,
+ Salt: "salt",
+ })
+ mockPasswordValidation(true, sc)
+}
+
+func (sc *grafanaLoginScenarioContext) withNonExistingUser() {
+ sc.getUserByLoginQueryReturns(nil)
+}
+
+func (sc *grafanaLoginScenarioContext) withInvalidPassword() {
+ sc.getUserByLoginQueryReturns(&m.User{
+ Password: sc.loginUserQuery.Password,
+ Salt: "salt",
+ })
+ mockPasswordValidation(false, sc)
+}
diff --git a/pkg/login/ldap_login.go b/pkg/login/ldap_login.go
new file mode 100644
index 00000000000..b74b69db036
--- /dev/null
+++ b/pkg/login/ldap_login.go
@@ -0,0 +1,21 @@
+package login
+
+import (
+ "github.com/grafana/grafana/pkg/setting"
+)
+
+var loginUsingLdap = func(query *LoginUserQuery) (bool, error) {
+ if !setting.LdapEnabled {
+ return false, nil
+ }
+
+ for _, server := range LdapCfg.Servers {
+ author := NewLdapAuthenticator(server)
+ err := author.Login(query)
+ if err == nil || err != ErrInvalidCredentials {
+ return true, err
+ }
+ }
+
+ return true, ErrInvalidCredentials
+}
diff --git a/pkg/login/ldap_login_test.go b/pkg/login/ldap_login_test.go
new file mode 100644
index 00000000000..6af125566e8
--- /dev/null
+++ b/pkg/login/ldap_login_test.go
@@ -0,0 +1,172 @@
+package login
+
+import (
+ "testing"
+
+ m "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/setting"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestLdapLogin(t *testing.T) {
+ Convey("Login using ldap", t, func() {
+ Convey("Given ldap enabled and a server configured", func() {
+ setting.LdapEnabled = true
+ LdapCfg.Servers = append(LdapCfg.Servers,
+ &LdapServerConf{
+ Host: "",
+ })
+
+ ldapLoginScenario("When login with invalid credentials", func(sc *ldapLoginScenarioContext) {
+ sc.withLoginResult(false)
+ enabled, err := loginUsingLdap(sc.loginUserQuery)
+
+ Convey("it should return true", func() {
+ So(enabled, ShouldBeTrue)
+ })
+
+ Convey("it should return invalid credentials error", func() {
+ So(err, ShouldEqual, ErrInvalidCredentials)
+ })
+
+ Convey("it should call ldap login", func() {
+ So(sc.ldapAuthenticatorMock.loginCalled, ShouldBeTrue)
+ })
+ })
+
+ ldapLoginScenario("When login with valid credentials", func(sc *ldapLoginScenarioContext) {
+ sc.withLoginResult(true)
+ enabled, err := loginUsingLdap(sc.loginUserQuery)
+
+ Convey("it should return true", func() {
+ So(enabled, ShouldBeTrue)
+ })
+
+ Convey("it should not return error", func() {
+ So(err, ShouldBeNil)
+ })
+
+ Convey("it should call ldap login", func() {
+ So(sc.ldapAuthenticatorMock.loginCalled, ShouldBeTrue)
+ })
+ })
+ })
+
+ Convey("Given ldap enabled and no server configured", func() {
+ setting.LdapEnabled = true
+ LdapCfg.Servers = make([]*LdapServerConf, 0)
+
+ ldapLoginScenario("When login", func(sc *ldapLoginScenarioContext) {
+ sc.withLoginResult(true)
+ enabled, err := loginUsingLdap(sc.loginUserQuery)
+
+ Convey("it should return true", func() {
+ So(enabled, ShouldBeTrue)
+ })
+
+ Convey("it should return invalid credentials error", func() {
+ So(err, ShouldEqual, ErrInvalidCredentials)
+ })
+
+ Convey("it should not call ldap login", func() {
+ So(sc.ldapAuthenticatorMock.loginCalled, ShouldBeFalse)
+ })
+ })
+ })
+
+ Convey("Given ldap disabled", func() {
+ setting.LdapEnabled = false
+
+ ldapLoginScenario("When login", func(sc *ldapLoginScenarioContext) {
+ sc.withLoginResult(false)
+ enabled, err := loginUsingLdap(&LoginUserQuery{
+ Username: "user",
+ Password: "pwd",
+ })
+
+ Convey("it should return false", func() {
+ So(enabled, ShouldBeFalse)
+ })
+
+ Convey("it should not return error", func() {
+ So(err, ShouldBeNil)
+ })
+
+ Convey("it should not call ldap login", func() {
+ So(sc.ldapAuthenticatorMock.loginCalled, ShouldBeFalse)
+ })
+ })
+ })
+ })
+}
+
+func mockLdapAuthenticator(valid bool) *mockLdapAuther {
+ mock := &mockLdapAuther{
+ validLogin: valid,
+ }
+
+ NewLdapAuthenticator = func(server *LdapServerConf) ILdapAuther {
+ return mock
+ }
+
+ return mock
+}
+
+type mockLdapAuther struct {
+ validLogin bool
+ loginCalled bool
+}
+
+func (a *mockLdapAuther) Login(query *LoginUserQuery) error {
+ a.loginCalled = true
+
+ if !a.validLogin {
+ return ErrInvalidCredentials
+ }
+
+ return nil
+}
+
+func (a *mockLdapAuther) SyncSignedInUser(signedInUser *m.SignedInUser) error {
+ return nil
+}
+
+func (a *mockLdapAuther) GetGrafanaUserFor(ldapUser *LdapUserInfo) (*m.User, error) {
+ return nil, nil
+}
+
+func (a *mockLdapAuther) SyncOrgRoles(user *m.User, ldapUser *LdapUserInfo) error {
+ return nil
+}
+
+type ldapLoginScenarioContext struct {
+ loginUserQuery *LoginUserQuery
+ ldapAuthenticatorMock *mockLdapAuther
+}
+
+type ldapLoginScenarioFunc func(c *ldapLoginScenarioContext)
+
+func ldapLoginScenario(desc string, fn ldapLoginScenarioFunc) {
+ Convey(desc, func() {
+ origNewLdapAuthenticator := NewLdapAuthenticator
+
+ sc := &ldapLoginScenarioContext{
+ loginUserQuery: &LoginUserQuery{
+ Username: "user",
+ Password: "pwd",
+ IpAddress: "192.168.1.1:56433",
+ },
+ ldapAuthenticatorMock: &mockLdapAuther{},
+ }
+
+ defer func() {
+ NewLdapAuthenticator = origNewLdapAuthenticator
+ }()
+
+ fn(sc)
+ })
+}
+
+func (sc *ldapLoginScenarioContext) withLoginResult(valid bool) {
+ sc.ldapAuthenticatorMock = mockLdapAuthenticator(valid)
+}
diff --git a/pkg/login/settings.go b/pkg/login/ldap_settings.go
similarity index 100%
rename from pkg/login/settings.go
rename to pkg/login/ldap_settings.go
diff --git a/pkg/metrics/metrics.go b/pkg/metrics/metrics.go
index 4d7de98f2ea..4d4a11d0faa 100644
--- a/pkg/metrics/metrics.go
+++ b/pkg/metrics/metrics.go
@@ -379,6 +379,7 @@ func sendUsageStats() {
metrics["stats.alerts.count"] = statsQuery.Result.Alerts
metrics["stats.active_users.count"] = statsQuery.Result.ActiveUsers
metrics["stats.datasources.count"] = statsQuery.Result.Datasources
+ metrics["stats.stars.count"] = statsQuery.Result.Stars
dsStats := models.GetDataSourceStatsQuery{}
if err := bus.Dispatch(&dsStats); err != nil {
diff --git a/pkg/middleware/auth.go b/pkg/middleware/auth.go
index be3415d990b..826287e12f3 100644
--- a/pkg/middleware/auth.go
+++ b/pkg/middleware/auth.go
@@ -42,8 +42,7 @@ func accessForbidden(c *Context) {
return
}
- c.SetCookie("redirect_to", url.QueryEscape(setting.AppSubUrl+c.Req.RequestURI), 0, setting.AppSubUrl+"/")
- c.Redirect(setting.AppSubUrl + "/login")
+ c.Redirect(setting.AppSubUrl + "/")
}
func notAuthorized(c *Context) {
diff --git a/pkg/middleware/dashboard_redirect.go b/pkg/middleware/dashboard_redirect.go
new file mode 100644
index 00000000000..4a3812fb8a2
--- /dev/null
+++ b/pkg/middleware/dashboard_redirect.go
@@ -0,0 +1,49 @@
+package middleware
+
+import (
+ "fmt"
+ "strings"
+
+ "github.com/grafana/grafana/pkg/bus"
+ m "github.com/grafana/grafana/pkg/models"
+ "gopkg.in/macaron.v1"
+)
+
+func getDashboardUrlBySlug(orgId int64, slug string) (string, error) {
+ query := m.GetDashboardQuery{Slug: slug, OrgId: orgId}
+
+ if err := bus.Dispatch(&query); err != nil {
+ return "", m.ErrDashboardNotFound
+ }
+
+ return m.GetDashboardUrl(query.Result.Uid, query.Result.Slug), nil
+}
+
+func RedirectFromLegacyDashboardUrl() macaron.Handler {
+ return func(c *Context) {
+ slug := c.Params("slug")
+
+ if slug != "" {
+ if url, err := getDashboardUrlBySlug(c.OrgId, slug); err == nil {
+ url = fmt.Sprintf("%s?%s", url, c.Req.URL.RawQuery)
+ c.Redirect(url, 301)
+ return
+ }
+ }
+ }
+}
+
+func RedirectFromLegacyDashboardSoloUrl() macaron.Handler {
+ return func(c *Context) {
+ slug := c.Params("slug")
+
+ if slug != "" {
+ if url, err := getDashboardUrlBySlug(c.OrgId, slug); err == nil {
+ url = strings.Replace(url, "/d/", "/d-solo/", 1)
+ url = fmt.Sprintf("%s?%s", url, c.Req.URL.RawQuery)
+ c.Redirect(url, 301)
+ return
+ }
+ }
+ }
+}
diff --git a/pkg/middleware/dashboard_redirect_test.go b/pkg/middleware/dashboard_redirect_test.go
new file mode 100644
index 00000000000..0af06347ed0
--- /dev/null
+++ b/pkg/middleware/dashboard_redirect_test.go
@@ -0,0 +1,58 @@
+package middleware
+
+import (
+ "strings"
+ "testing"
+
+ "github.com/grafana/grafana/pkg/bus"
+ m "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/util"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestMiddlewareDashboardRedirect(t *testing.T) {
+ Convey("Given the dashboard redirect middleware", t, func() {
+ bus.ClearBusHandlers()
+ redirectFromLegacyDashboardUrl := RedirectFromLegacyDashboardUrl()
+ redirectFromLegacyDashboardSoloUrl := RedirectFromLegacyDashboardSoloUrl()
+
+ fakeDash := m.NewDashboard("Child dash")
+ fakeDash.Id = 1
+ fakeDash.FolderId = 1
+ fakeDash.HasAcl = false
+ fakeDash.Uid = util.GenerateShortUid()
+
+ bus.AddHandler("test", func(query *m.GetDashboardQuery) error {
+ query.Result = fakeDash
+ return nil
+ })
+
+ middlewareScenario("GET dashboard by legacy url", func(sc *scenarioContext) {
+ sc.m.Get("/dashboard/db/:slug", redirectFromLegacyDashboardUrl, sc.defaultHandler)
+
+ sc.fakeReqWithParams("GET", "/dashboard/db/dash?orgId=1&panelId=2", map[string]string{}).exec()
+
+ Convey("Should redirect to new dashboard url with a 301 Moved Permanently", func() {
+ So(sc.resp.Code, ShouldEqual, 301)
+ redirectUrl, _ := sc.resp.Result().Location()
+ So(redirectUrl.Path, ShouldEqual, m.GetDashboardUrl(fakeDash.Uid, fakeDash.Slug))
+ So(len(redirectUrl.Query()), ShouldEqual, 2)
+ })
+ })
+
+ middlewareScenario("GET dashboard solo by legacy url", func(sc *scenarioContext) {
+ sc.m.Get("/dashboard-solo/db/:slug", redirectFromLegacyDashboardSoloUrl, sc.defaultHandler)
+
+ sc.fakeReqWithParams("GET", "/dashboard-solo/db/dash?orgId=1&panelId=2", map[string]string{}).exec()
+
+ Convey("Should redirect to new dashboard url with a 301 Moved Permanently", func() {
+ So(sc.resp.Code, ShouldEqual, 301)
+ redirectUrl, _ := sc.resp.Result().Location()
+ expectedUrl := m.GetDashboardUrl(fakeDash.Uid, fakeDash.Slug)
+ expectedUrl = strings.Replace(expectedUrl, "/d/", "/d-solo/", 1)
+ So(redirectUrl.Path, ShouldEqual, expectedUrl)
+ So(len(redirectUrl.Query()), ShouldEqual, 2)
+ })
+ })
+ })
+}
diff --git a/pkg/middleware/middleware.go b/pkg/middleware/middleware.go
index 259d800f0a9..f0c952811cd 100644
--- a/pkg/middleware/middleware.go
+++ b/pkg/middleware/middleware.go
@@ -206,7 +206,9 @@ func (ctx *Context) Handle(status int, title string, err error) {
ctx.Data["Title"] = title
ctx.Data["AppSubUrl"] = setting.AppSubUrl
- ctx.HTML(status, strconv.Itoa(status))
+ ctx.Data["Theme"] = "dark"
+
+ ctx.HTML(status, "error")
}
func (ctx *Context) JsonOK(message string) {
diff --git a/pkg/middleware/middleware_test.go b/pkg/middleware/middleware_test.go
index 0d9e0e5b973..ffd8e8a0af0 100644
--- a/pkg/middleware/middleware_test.go
+++ b/pkg/middleware/middleware_test.go
@@ -399,6 +399,20 @@ func (sc *scenarioContext) fakeReq(method, url string) *scenarioContext {
return sc
}
+func (sc *scenarioContext) fakeReqWithParams(method, url string, queryParams map[string]string) *scenarioContext {
+ sc.resp = httptest.NewRecorder()
+ req, err := http.NewRequest(method, url, nil)
+ q := req.URL.Query()
+ for k, v := range queryParams {
+ q.Add(k, v)
+ }
+ req.URL.RawQuery = q.Encode()
+ So(err, ShouldBeNil)
+ sc.req = req
+
+ return sc
+}
+
func (sc *scenarioContext) handler(fn handlerFunc) *scenarioContext {
sc.handlerFunc = fn
return sc
diff --git a/pkg/middleware/recovery.go b/pkg/middleware/recovery.go
index 0c9dc4670e2..388acc15afc 100644
--- a/pkg/middleware/recovery.go
+++ b/pkg/middleware/recovery.go
@@ -137,7 +137,7 @@ func Recovery() macaron.Handler {
c.JSON(500, resp)
} else {
- c.HTML(500, "500")
+ c.HTML(500, "error")
}
}
}()
diff --git a/pkg/models/alert.go b/pkg/models/alert.go
index fa3f4b466a8..b378c5cf90f 100644
--- a/pkg/models/alert.go
+++ b/pkg/models/alert.go
@@ -159,10 +159,6 @@ type SetAlertStateCommand struct {
Timestamp time.Time
}
-type DeleteAlertCommand struct {
- AlertId int64
-}
-
//Queries
type GetAlertsQuery struct {
OrgId int64
diff --git a/pkg/models/dashboard_acl.go b/pkg/models/dashboard_acl.go
index fa7ad00de7f..933487650e3 100644
--- a/pkg/models/dashboard_acl.go
+++ b/pkg/models/dashboard_acl.go
@@ -59,6 +59,11 @@ type DashboardAclInfoDTO struct {
Role *RoleType `json:"role,omitempty"`
Permission PermissionType `json:"permission"`
PermissionName string `json:"permissionName"`
+ Uid string `json:"uid"`
+ Title string `json:"title"`
+ Slug string `json:"slug"`
+ IsFolder bool `json:"isFolder"`
+ Url string `json:"url"`
}
//
diff --git a/pkg/models/dashboards.go b/pkg/models/dashboards.go
index 9e024d2db5e..adb310bd3f9 100644
--- a/pkg/models/dashboards.go
+++ b/pkg/models/dashboards.go
@@ -2,23 +2,28 @@ package models
import (
"errors"
+ "fmt"
"strings"
"time"
"github.com/gosimple/slug"
"github.com/grafana/grafana/pkg/components/simplejson"
+ "github.com/grafana/grafana/pkg/setting"
)
// Typed errors
var (
- ErrDashboardNotFound = errors.New("Dashboard not found")
- ErrDashboardSnapshotNotFound = errors.New("Dashboard snapshot not found")
- ErrDashboardWithSameNameExists = errors.New("A dashboard with the same name already exists")
- ErrDashboardVersionMismatch = errors.New("The dashboard has been changed by someone else")
- ErrDashboardTitleEmpty = errors.New("Dashboard title cannot be empty")
- ErrDashboardFolderCannotHaveParent = errors.New("A Dashboard Folder cannot be added to another folder")
- ErrDashboardContainsInvalidAlertData = errors.New("Invalid alert data. Cannot save dashboard")
- ErrDashboardFailedToUpdateAlertData = errors.New("Failed to save alert data")
+ ErrDashboardNotFound = errors.New("Dashboard not found")
+ ErrDashboardSnapshotNotFound = errors.New("Dashboard snapshot not found")
+ ErrDashboardWithSameUIDExists = errors.New("A dashboard with the same uid already exists")
+ ErrDashboardWithSameNameInFolderExists = errors.New("A dashboard with the same name in the folder already exists")
+ ErrDashboardVersionMismatch = errors.New("The dashboard has been changed by someone else")
+ ErrDashboardTitleEmpty = errors.New("Dashboard title cannot be empty")
+ ErrDashboardFolderCannotHaveParent = errors.New("A Dashboard Folder cannot be added to another folder")
+ ErrDashboardContainsInvalidAlertData = errors.New("Invalid alert data. Cannot save dashboard")
+ ErrDashboardFailedToUpdateAlertData = errors.New("Failed to save alert data")
+ ErrDashboardsWithSameSlugExists = errors.New("Multiple dashboards with the same slug exists")
+ ErrDashboardFailedGenerateUniqueUid = errors.New("Failed to generate unique dashboard id")
)
type UpdatePluginDashboardError struct {
@@ -39,6 +44,7 @@ var (
// Dashboard model
type Dashboard struct {
Id int64
+ Uid string
Slug string
OrgId int64
GnetId int64
@@ -112,6 +118,10 @@ func NewDashboardFromJson(data *simplejson.Json) *Dashboard {
dash.GnetId = int64(gnetId)
}
+ if uid, err := dash.Data.Get("uid").String(); err == nil {
+ dash.Uid = uid
+ }
+
return dash
}
@@ -152,6 +162,40 @@ func SlugifyTitle(title string) string {
return slug.Make(strings.ToLower(title))
}
+// GetUrl return the html url for a folder if it's folder, otherwise for a dashboard
+func (dash *Dashboard) GetUrl() string {
+ return GetDashboardFolderUrl(dash.IsFolder, dash.Uid, dash.Slug)
+}
+
+// Return the html url for a dashboard
+func (dash *Dashboard) GenerateUrl() string {
+ return GetDashboardUrl(dash.Uid, dash.Slug)
+}
+
+// GetDashboardFolderUrl return the html url for a folder if it's folder, otherwise for a dashboard
+func GetDashboardFolderUrl(isFolder bool, uid string, slug string) string {
+ if isFolder {
+ return GetFolderUrl(uid, slug)
+ }
+
+ return GetDashboardUrl(uid, slug)
+}
+
+// Return the html url for a dashboard
+func GetDashboardUrl(uid string, slug string) string {
+ return fmt.Sprintf("%s/d/%s/%s", setting.AppSubUrl, uid, slug)
+}
+
+// Return the full url for a dashboard
+func GetFullDashboardUrl(uid string, slug string) string {
+ return fmt.Sprintf("%s%s", setting.AppUrl, GetDashboardUrl(uid, slug))
+}
+
+// GetFolderUrl return the html url for a folder
+func GetFolderUrl(folderUid string, slug string) string {
+ return fmt.Sprintf("%s/dashboards/f/%s/%s", setting.AppSubUrl, folderUid, slug)
+}
+
//
// COMMANDS
//
@@ -197,8 +241,9 @@ type DeleteDashboardCommand struct {
//
type GetDashboardQuery struct {
- Slug string // required if no Id is specified
+ Slug string // required if no Id or Uid is specified
Id int64 // optional if slug is set
+ Uid string // optional if slug is set
OrgId int64
Result *Dashboard
@@ -219,6 +264,14 @@ type GetDashboardsQuery struct {
Result []*Dashboard
}
+type GetDashboardPermissionsForUserQuery struct {
+ DashboardIds []int64
+ OrgId int64
+ UserId int64
+ OrgRole RoleType
+ Result []*DashboardPermissionForUser
+}
+
type GetDashboardsByPluginIdQuery struct {
OrgId int64
PluginId string
@@ -235,3 +288,38 @@ type GetProvisionedDashboardDataQuery struct {
Result []*DashboardProvisioning
}
+
+type GetDashboardsBySlugQuery struct {
+ OrgId int64
+ Slug string
+
+ Result []*Dashboard
+}
+
+type GetFoldersForSignedInUserQuery struct {
+ OrgId int64
+ SignedInUser *SignedInUser
+ Title string
+ Result []*DashboardFolder
+}
+
+type DashboardFolder struct {
+ Id int64 `json:"id"`
+ Title string `json:"title"`
+}
+
+type DashboardPermissionForUser struct {
+ DashboardId int64 `json:"dashboardId"`
+ Permission PermissionType `json:"permission"`
+ PermissionName string `json:"permissionName"`
+}
+
+type DashboardRef struct {
+ Uid string
+ Slug string
+}
+
+type GetDashboardRefByIdQuery struct {
+ Id int64
+ Result *DashboardRef
+}
diff --git a/pkg/models/login_attempt.go b/pkg/models/login_attempt.go
new file mode 100644
index 00000000000..e4391927702
--- /dev/null
+++ b/pkg/models/login_attempt.go
@@ -0,0 +1,36 @@
+package models
+
+import (
+ "time"
+)
+
+type LoginAttempt struct {
+ Id int64
+ Username string
+ IpAddress string
+ Created time.Time
+}
+
+// ---------------------
+// COMMANDS
+
+type CreateLoginAttemptCommand struct {
+ Username string
+ IpAddress string
+
+ Result LoginAttempt
+}
+
+type DeleteOldLoginAttemptsCommand struct {
+ OlderThan time.Time
+ DeletedRows int64
+}
+
+// ---------------------
+// QUERIES
+
+type GetUserLoginAttemptCountQuery struct {
+ Username string
+ Since time.Time
+ Result int64
+}
diff --git a/pkg/models/stats.go b/pkg/models/stats.go
index 0d982c3f4bd..e132d88c030 100644
--- a/pkg/models/stats.go
+++ b/pkg/models/stats.go
@@ -8,6 +8,7 @@ type SystemStats struct {
Orgs int64
Playlists int64
Alerts int64
+ Stars int64
}
type DataSourceStats struct {
diff --git a/pkg/plugins/datasource/wrapper/datasource_plugin_wrapper.go b/pkg/plugins/datasource/wrapper/datasource_plugin_wrapper.go
index 0afa2a400e4..170e187b282 100644
--- a/pkg/plugins/datasource/wrapper/datasource_plugin_wrapper.go
+++ b/pkg/plugins/datasource/wrapper/datasource_plugin_wrapper.go
@@ -2,6 +2,7 @@ package wrapper
import (
"context"
+ "errors"
"fmt"
"github.com/grafana/grafana/pkg/components/null"
@@ -67,9 +68,15 @@ func (tw *DatasourcePluginWrapper) Query(ctx context.Context, ds *models.DataSou
}
for _, r := range pbres.Results {
- res.Results[r.RefId] = &tsdb.QueryResult{
+ qr := &tsdb.QueryResult{
RefId: r.RefId,
Series: []*tsdb.TimeSeries{},
+ Tables: []*tsdb.Table{},
+ }
+
+ if r.Error != "" {
+ qr.Error = errors.New(r.Error)
+ qr.ErrorString = r.Error
}
for _, s := range r.GetSeries() {
@@ -80,7 +87,7 @@ func (tw *DatasourcePluginWrapper) Query(ctx context.Context, ds *models.DataSou
points = append(points, po)
}
- res.Results[r.RefId].Series = append(res.Results[r.RefId].Series, &tsdb.TimeSeries{
+ qr.Series = append(qr.Series, &tsdb.TimeSeries{
Name: s.Name,
Tags: s.Tags,
Points: points,
@@ -91,7 +98,9 @@ func (tw *DatasourcePluginWrapper) Query(ctx context.Context, ds *models.DataSou
if err != nil {
return nil, err
}
- res.Results[r.RefId].Tables = mappedTables
+ qr.Tables = mappedTables
+
+ res.Results[r.RefId] = qr
}
return res, nil
@@ -116,6 +125,7 @@ func (tw *DatasourcePluginWrapper) mapTable(t *datasource.Table) (*tsdb.Table, e
})
}
+ table.Rows = make([]tsdb.RowValues, 0)
for _, r := range t.GetRows() {
row := tsdb.RowValues{}
for _, rv := range r.Values {
diff --git a/pkg/plugins/datasource/wrapper/datasource_plugin_wrapper_test.go b/pkg/plugins/datasource/wrapper/datasource_plugin_wrapper_test.go
index c85cb6cea52..834e8238e3a 100644
--- a/pkg/plugins/datasource/wrapper/datasource_plugin_wrapper_test.go
+++ b/pkg/plugins/datasource/wrapper/datasource_plugin_wrapper_test.go
@@ -75,7 +75,7 @@ func TestMappingRowValue(t *testing.T) {
boolRowValue, _ := dpw.mapRowValue(&datasource.RowValue{Kind: datasource.RowValue_TYPE_BOOL, BoolValue: true})
haveBool, ok := boolRowValue.(bool)
if !ok || haveBool != true {
- t.Fatalf("Expected true, was %s", haveBool)
+ t.Fatalf("Expected true, was %v", haveBool)
}
intRowValue, _ := dpw.mapRowValue(&datasource.RowValue{Kind: datasource.RowValue_TYPE_INT64, Int64Value: 42})
diff --git a/pkg/services/alerting/eval_context.go b/pkg/services/alerting/eval_context.go
index f5663deb8ca..d598203d675 100644
--- a/pkg/services/alerting/eval_context.go
+++ b/pkg/services/alerting/eval_context.go
@@ -12,17 +12,19 @@ import (
)
type EvalContext struct {
- Firing bool
- IsTestRun bool
- EvalMatches []*EvalMatch
- Logs []*ResultLogEntry
- Error error
- ConditionEvals string
- StartTime time.Time
- EndTime time.Time
- Rule *Rule
- log log.Logger
- dashboardSlug string
+ Firing bool
+ IsTestRun bool
+ EvalMatches []*EvalMatch
+ Logs []*ResultLogEntry
+ Error error
+ ConditionEvals string
+ StartTime time.Time
+ EndTime time.Time
+ Rule *Rule
+ log log.Logger
+
+ dashboardRef *m.DashboardRef
+
ImagePublicUrl string
ImageOnDiskPath string
NoDataFound bool
@@ -83,29 +85,30 @@ func (c *EvalContext) GetNotificationTitle() string {
return "[" + c.GetStateModel().Text + "] " + c.Rule.Name
}
-func (c *EvalContext) GetDashboardSlug() (string, error) {
- if c.dashboardSlug != "" {
- return c.dashboardSlug, nil
+func (c *EvalContext) GetDashboardUID() (*m.DashboardRef, error) {
+ if c.dashboardRef != nil {
+ return c.dashboardRef, nil
}
- slugQuery := &m.GetDashboardSlugByIdQuery{Id: c.Rule.DashboardId}
- if err := bus.Dispatch(slugQuery); err != nil {
- return "", err
+ uidQuery := &m.GetDashboardRefByIdQuery{Id: c.Rule.DashboardId}
+ if err := bus.Dispatch(uidQuery); err != nil {
+ return nil, err
}
- c.dashboardSlug = slugQuery.Result
- return c.dashboardSlug, nil
+ c.dashboardRef = uidQuery.Result
+ return c.dashboardRef, nil
}
+const urlFormat = "%s?fullscreen=true&edit=true&tab=alert&panelId=%d&orgId=%d"
+
func (c *EvalContext) GetRuleUrl() (string, error) {
if c.IsTestRun {
return setting.AppUrl, nil
}
- if slug, err := c.GetDashboardSlug(); err != nil {
+ if ref, err := c.GetDashboardUID(); err != nil {
return "", err
} else {
- ruleUrl := fmt.Sprintf("%sdashboard/db/%s?fullscreen&edit&tab=alert&panelId=%d&orgId=%d", setting.AppUrl, slug, c.Rule.PanelId, c.Rule.OrgId)
- return ruleUrl, nil
+ return fmt.Sprintf(urlFormat, m.GetFullDashboardUrl(ref.Uid, ref.Slug), c.Rule.PanelId, c.Rule.OrgId), nil
}
}
diff --git a/pkg/services/alerting/notifier.go b/pkg/services/alerting/notifier.go
index 47c9e0c590e..af9ba52a52a 100644
--- a/pkg/services/alerting/notifier.go
+++ b/pkg/services/alerting/notifier.go
@@ -87,10 +87,10 @@ func (n *notificationService) uploadImage(context *EvalContext) (err error) {
IsAlertContext: true,
}
- if slug, err := context.GetDashboardSlug(); err != nil {
+ if ref, err := context.GetDashboardUID(); err != nil {
return err
} else {
- renderOpts.Path = fmt.Sprintf("dashboard-solo/db/%s?&panelId=%d", slug, context.Rule.PanelId)
+ renderOpts.Path = fmt.Sprintf("d-solo/%s/%s?panelId=%d", ref.Uid, ref.Slug, context.Rule.PanelId)
}
if imagePath, err := renderer.RenderToPng(renderOpts); err != nil {
diff --git a/pkg/services/alerting/notifiers/opsgenie.go b/pkg/services/alerting/notifiers/opsgenie.go
index 1a812f49ca3..82be9d1df4e 100644
--- a/pkg/services/alerting/notifiers/opsgenie.go
+++ b/pkg/services/alerting/notifiers/opsgenie.go
@@ -23,6 +23,10 @@ func init() {
API Key
+
+ Alert API Url
+
+
- {this.renderText(rule.name)}
+ {rule.canEdit && {this.renderText(rule.name)}}
+ {!rule.canEdit && {this.renderText(rule.name)}}
{this.renderText(rule.stateText)}
@@ -156,17 +157,30 @@ export class AlertRuleItem extends React.Component {
{rule.info && {this.renderText(rule.info)}
}
Loading
; + } + + const dashboardId = folder.folder.id; + + return ( +
+
+ );
+ }
+}
diff --git a/public/app/containers/ManageDashboards/FolderSettings.jest.tsx b/public/app/containers/ManageDashboards/FolderSettings.jest.tsx
new file mode 100644
index 00000000000..3630bf534ba
--- /dev/null
+++ b/public/app/containers/ManageDashboards/FolderSettings.jest.tsx
@@ -0,0 +1,87 @@
+import React from 'react';
+import { FolderSettings } from './FolderSettings';
+import { RootStore } from 'app/stores/RootStore/RootStore';
+import { backendSrv } from 'test/mocks/common';
+import { shallow } from 'enzyme';
+
+describe('FolderSettings', () => {
+ let wrapper;
+ let page;
+
+ beforeAll(() => {
+ backendSrv.getDashboardByUid.mockReturnValue(
+ Promise.resolve({
+ dashboard: {
+ id: 1,
+ title: 'Folder Name',
+ uid: 'uid-str',
+ },
+ meta: {
+ url: '/dashboards/f/uid/folder-name',
+ canSave: true,
+ },
+ })
+ );
+
+ const store = RootStore.create(
+ {
+ view: {
+ path: 'asd',
+ query: {},
+ routeParams: {
+ uid: 'uid-str',
+ },
+ },
+ },
+ {
+ backendSrv: backendSrv,
+ }
+ );
+
+ wrapper = shallow(
+
+
+
+
+
+
+
+
+
+
+ Folder Permissions
+Loading
; + } + + return ( +
+
+ );
+ }
+}
diff --git a/public/app/containers/ServerStats/ServerStats.jest.tsx b/public/app/containers/ServerStats/ServerStats.jest.tsx
index ae5cb736ad6..a329a47527d 100644
--- a/public/app/containers/ServerStats/ServerStats.jest.tsx
+++ b/public/app/containers/ServerStats/ServerStats.jest.tsx
@@ -20,7 +20,7 @@ describe('ServerStats', () => {
}
);
- const page = renderer.create(
+
+ Folder Settings
+ +
+
+
+ - {main.children.map(TabItem)}
-
+ {main.children.map((tab, idx) => {
+ if (tab.hideFromTabs) {
+ return null;
+ }
+ const tabClasses = classNames({
+ 'gf-tabs-link': true,
+ active: tab.active,
+ });
+
+ return (
+
- + + + {tab.text} + + + ); + })} +
{title}
; + } + const breadcrumbsResult = []; for (let i = 0; i < breadcrumbs.length; i++) { const bc = breadcrumbs[i]; @@ -99,7 +114,9 @@ export default class PageHeader extends React.Component{breadcrumbsResult}
; } renderHeaderTitle(main) { @@ -111,11 +128,7 @@ export default class PageHeader extends React.Component
- {main.text &&
diff --git a/public/app/features/org/partials/team_details.html b/public/app/features/org/partials/team_details.html
index e2666697869..9f06ebdb017 100644
--- a/public/app/features/org/partials/team_details.html
+++ b/public/app/features/org/partials/team_details.html
@@ -29,7 +29,11 @@
@@ -60,3 +64,4 @@
This team has no members yet.
+
diff --git a/public/app/features/org/team_details_ctrl.ts b/public/app/features/org/team_details_ctrl.ts
index e7ccef8f3f5..3d193880635 100644
--- a/public/app/features/org/team_details_ctrl.ts
+++ b/public/app/features/org/team_details_ctrl.ts
@@ -8,6 +8,7 @@ export default class TeamDetailsCtrl {
/** @ngInject **/
constructor(private $scope, private backendSrv, private $routeParams, navModelSrv) {
this.navModel = navModelSrv.getNav('cfg', 'teams', 0);
+ this.userPicked = this.userPicked.bind(this);
this.get = this.get.bind(this);
this.get();
}
diff --git a/public/app/features/panel/panel_directive.ts b/public/app/features/panel/panel_directive.ts
index 01730e2fede..dec7868a553 100644
--- a/public/app/features/panel/panel_directive.ts
+++ b/public/app/features/panel/panel_directive.ts
@@ -100,7 +100,9 @@ module.directive('grafanaPanel', function($rootScope, $document, $timeout) {
// update scrollbar after mounting
ctrl.events.on('component-did-mount', () => {
if (ctrl.__proto__.constructor.scrollable) {
- panelScrollbar = new PerfectScrollbar(panelContent[0]);
+ panelScrollbar = new PerfectScrollbar(panelContent[0], {
+ wheelPropagation: true,
+ });
}
});
diff --git a/public/app/features/panel/solo_panel_ctrl.ts b/public/app/features/panel/solo_panel_ctrl.ts
index f141f89eb80..2c7698db08e 100644
--- a/public/app/features/panel/solo_panel_ctrl.ts
+++ b/public/app/features/panel/solo_panel_ctrl.ts
@@ -1,19 +1,33 @@
import angular from 'angular';
+import locationUtil from 'app/core/utils/location_util';
+import appEvents from 'app/core/app_events';
export class SoloPanelCtrl {
/** @ngInject */
- constructor($scope, $routeParams, $location, dashboardLoaderSrv, contextSrv) {
+ constructor($scope, $routeParams, $location, dashboardLoaderSrv, contextSrv, backendSrv) {
var panelId;
$scope.init = function() {
contextSrv.sidemenu = false;
+ appEvents.emit('toggle-sidemenu-hidden');
var params = $location.search();
panelId = parseInt(params.panelId);
$scope.onAppEvent('dashboard-initialized', $scope.initPanelScope);
- dashboardLoaderSrv.loadDashboard($routeParams.type, $routeParams.slug).then(function(result) {
+ // if no uid, redirect to new route based on slug
+ if (!($routeParams.type === 'script' || $routeParams.type === 'snapshot') && !$routeParams.uid) {
+ backendSrv.get(`/api/dashboards/db/${$routeParams.slug}`).then(res => {
+ if (res) {
+ const url = locationUtil.stripBaseFromUrl(res.meta.url.replace('/d/', '/d-solo/'));
+ $location.path(url).replace();
+ }
+ });
+ return;
+ }
+
+ dashboardLoaderSrv.loadDashboard($routeParams.type, $routeParams.slug, $routeParams.uid).then(function(result) {
result.meta.soloMode = true;
$scope.initDashboard(result, $scope);
});
diff --git a/public/app/features/playlist/playlist_search.ts b/public/app/features/playlist/playlist_search.ts
index 3b80cfdf640..785099ff61c 100644
--- a/public/app/features/playlist/playlist_search.ts
+++ b/public/app/features/playlist/playlist_search.ts
@@ -12,6 +12,7 @@ export class PlaylistSearchCtrl {
$timeout(() => {
this.query.query = '';
+ this.query.type = 'dash-db';
this.searchDashboards();
}, 100);
}
diff --git a/public/app/features/plugins/all.ts b/public/app/features/plugins/all.ts
index a0d4e61962c..fd19ea963b6 100644
--- a/public/app/features/plugins/all.ts
+++ b/public/app/features/plugins/all.ts
@@ -3,6 +3,7 @@ import './plugin_page_ctrl';
import './plugin_list_ctrl';
import './import_list/import_list';
import './ds_edit_ctrl';
+import './ds_dashboards_ctrl';
import './ds_list_ctrl';
import './datasource_srv';
import './plugin_component';
diff --git a/public/app/features/plugins/ds_dashboards_ctrl.ts b/public/app/features/plugins/ds_dashboards_ctrl.ts
new file mode 100644
index 00000000000..ed7800698b7
--- /dev/null
+++ b/public/app/features/plugins/ds_dashboards_ctrl.ts
@@ -0,0 +1,45 @@
+import { toJS } from 'mobx';
+import { coreModule } from 'app/core/core';
+import { store } from 'app/stores/store';
+
+export class DataSourceDashboardsCtrl {
+ datasourceMeta: any;
+ navModel: any;
+ current: any;
+
+ /** @ngInject */
+ constructor(private backendSrv, private $routeParams) {
+ if (store.nav.main === null) {
+ store.nav.load('cfg', 'datasources');
+ }
+
+ this.navModel = toJS(store.nav);
+
+ if (this.$routeParams.id) {
+ this.getDatasourceById(this.$routeParams.id);
+ }
+ }
+
+ getDatasourceById(id) {
+ this.backendSrv
+ .get('/api/datasources/' + id)
+ .then(ds => {
+ this.current = ds;
+ })
+ .then(this.getPluginInfo.bind(this));
+ }
+
+ updateNav() {
+ store.nav.initDatasourceEditNav(this.current, this.datasourceMeta, 'datasource-dashboards');
+ this.navModel = toJS(store.nav);
+ }
+
+ getPluginInfo() {
+ return this.backendSrv.get('/api/plugins/' + this.current.type + '/settings').then(pluginInfo => {
+ this.datasourceMeta = pluginInfo;
+ this.updateNav();
+ });
+ }
+}
+
+coreModule.controller('DataSourceDashboardsCtrl', DataSourceDashboardsCtrl);
diff --git a/public/app/features/plugins/ds_edit_ctrl.ts b/public/app/features/plugins/ds_edit_ctrl.ts
index 5a48ba74dbc..b98f0f48910 100644
--- a/public/app/features/plugins/ds_edit_ctrl.ts
+++ b/public/app/features/plugins/ds_edit_ctrl.ts
@@ -1,7 +1,8 @@
import _ from 'lodash';
-
+import { toJS } from 'mobx';
import config from 'app/core/config';
import { coreModule, appEvents } from 'app/core/core';
+import { store } from 'app/stores/store';
var datasourceTypes = [];
@@ -23,24 +24,18 @@ export class DataSourceEditCtrl {
types: any;
testing: any;
datasourceMeta: any;
- tabIndex: number;
- hasDashboards: boolean;
editForm: any;
gettingStarted: boolean;
navModel: any;
/** @ngInject */
- constructor(
- private $q,
- private backendSrv,
- private $routeParams,
- private $location,
- private datasourceSrv,
- navModelSrv
- ) {
- this.navModel = navModelSrv.getNav('cfg', 'datasources', 0);
+ constructor(private $q, private backendSrv, private $routeParams, private $location, private datasourceSrv) {
+ if (store.nav.main === null) {
+ store.nav.load('cfg', 'datasources');
+ }
+
+ this.navModel = toJS(store.nav);
this.datasources = [];
- this.tabIndex = 0;
this.loadDatasourceTypes().then(() => {
if (this.$routeParams.id) {
@@ -55,8 +50,6 @@ export class DataSourceEditCtrl {
this.isNew = true;
this.current = _.cloneDeep(defaults);
- this.navModel.breadcrumbs.push({ text: 'New' });
-
// We are coming from getting started
if (this.$location.search().gettingstarted) {
this.gettingStarted = true;
@@ -82,12 +75,6 @@ export class DataSourceEditCtrl {
this.backendSrv.get('/api/datasources/' + id).then(ds => {
this.isNew = false;
this.current = ds;
- this.navModel.node = {
- text: ds.name,
- icon: 'icon-gf icon-gf-fw icon-gf-datasources',
- id: 'ds-new',
- };
- this.navModel.breadcrumbs.push(this.navModel.node);
if (datasourceCreated) {
datasourceCreated = false;
@@ -112,11 +99,15 @@ export class DataSourceEditCtrl {
this.typeChanged();
}
+ updateNav() {
+ store.nav.initDatasourceEditNav(this.current, this.datasourceMeta, 'datasource-settings');
+ this.navModel = toJS(store.nav);
+ }
+
typeChanged() {
- this.hasDashboards = false;
return this.backendSrv.get('/api/plugins/' + this.current.type + '/settings').then(pluginInfo => {
this.datasourceMeta = pluginInfo;
- this.hasDashboards = _.find(pluginInfo.includes, { type: 'dashboard' }) !== undefined;
+ this.updateNav();
});
}
@@ -171,6 +162,7 @@ export class DataSourceEditCtrl {
if (this.current.id) {
return this.backendSrv.put('/api/datasources/' + this.current.id, this.current).then(result => {
this.current = result.datasource;
+ this.updateNav();
this.updateFrontendSettings().then(() => {
this.testDatasource();
});
diff --git a/public/app/features/plugins/partials/ds_dashboards.html b/public/app/features/plugins/partials/ds_dashboards.html
new file mode 100644
index 00000000000..a442e37d1f6
--- /dev/null
+++ b/public/app/features/plugins/partials/ds_dashboards.html
@@ -0,0 +1,7 @@
+
{main.text}
} - {main.breadcrumbs && - main.breadcrumbs.length > 0 && ( -{this.renderBreadcrumb(main.breadcrumbs)}
- )} + {this.renderTitle(main.text, main.breadcrumbs)} {main.subTitle &&{main.subTitle}
}
{main.subType && (
@@ -135,12 +148,14 @@ export default class PageHeader extends React.Component {
return null;
}
+ const main = toJS(model.main); // Convert to JS if its a mobx observable
+
return (
diff --git a/public/app/core/components/Permissions/AddPermissions.jest.tsx b/public/app/core/components/Permissions/AddPermissions.jest.tsx
new file mode 100644
index 00000000000..48ff20a16aa
--- /dev/null
+++ b/public/app/core/components/Permissions/AddPermissions.jest.tsx
@@ -0,0 +1,90 @@
+import React from 'react';
+import AddPermissions from './AddPermissions';
+import { RootStore } from 'app/stores/RootStore/RootStore';
+import { backendSrv } from 'test/mocks/common';
+import { shallow } from 'enzyme';
+
+describe('AddPermissions', () => {
+ let wrapper;
+ let store;
+ let instance;
+
+ beforeAll(() => {
+ backendSrv.get.mockReturnValue(
+ Promise.resolve([
+ { id: 2, dashboardId: 1, role: 'Viewer', permission: 1, permissionName: 'View' },
+ { id: 3, dashboardId: 1, role: 'Editor', permission: 1, permissionName: 'Edit' },
+ ])
+ );
+
+ backendSrv.post = jest.fn();
+
+ store = RootStore.create(
+ {},
+ {
+ backendSrv: backendSrv,
+ }
+ );
+
+ wrapper = shallow( {
+ constructor(props) {
+ super(props);
+ this.userPicked = this.userPicked.bind(this);
+ this.teamPicked = this.teamPicked.bind(this);
+ this.permissionPicked = this.permissionPicked.bind(this);
+ this.typeChanged = this.typeChanged.bind(this);
+ this.handleSubmit = this.handleSubmit.bind(this);
+ }
+
+ componentWillMount() {
+ const { permissions } = this.props;
+ permissions.resetNewType();
+ }
+
+ typeChanged(evt) {
+ const { value } = evt.target;
+ const { permissions } = this.props;
+
+ permissions.setNewType(value);
+ }
+
+ userPicked(user: User) {
+ const { permissions } = this.props;
+ if (!user) {
+ permissions.newItem.setUser(null, null);
+ return;
+ }
+ return permissions.newItem.setUser(user.id, user.login);
+ }
+
+ teamPicked(team: Team) {
+ const { permissions } = this.props;
+ if (!team) {
+ permissions.newItem.setTeam(null, null);
+ return;
+ }
+ return permissions.newItem.setTeam(team.id, team.name);
+ }
+
+ permissionPicked(permission: OptionWithDescription) {
+ const { permissions } = this.props;
+ return permissions.newItem.setPermission(permission.value);
+ }
+
+ resetNewType() {
+ const { permissions } = this.props;
+ return permissions.resetNewType();
+ }
+
+ handleSubmit(evt) {
+ evt.preventDefault();
+ const { permissions } = this.props;
+ permissions.addStoreItem();
+ }
+
+ render() {
+ const { permissions, backendSrv } = this.props;
+ const newItem = permissions.newItem;
+ const pickerClassName = 'width-20';
+
+ const isValid = newItem.isValid();
+
+ return (
+ {
+ permissions: any;
+
+ constructor(props) {
+ super(props);
+ this.handleAddPermission = this.handleAddPermission.bind(this);
+ this.permissions = store.permissions;
+ }
+
+ handleAddPermission() {
+ this.permissions.toggleAddPermissions();
+ }
+
+ componentWillUnmount() {
+ this.permissions.hideAddPermissions();
+ }
+
+ render() {
+ const { dashboardId, folder, backendSrv } = this.props;
+
+ return (
+ {
+ render() {
+ const { item } = this.props;
+
+ return (
+
+
+
+
+
+ Can
+
+
+
+
+
+
+ );
+ }
+}
diff --git a/public/app/core/components/Permissions/FolderInfo.ts b/public/app/core/components/Permissions/FolderInfo.ts
new file mode 100644
index 00000000000..d4a6020bb71
--- /dev/null
+++ b/public/app/core/components/Permissions/FolderInfo.ts
@@ -0,0 +1,5 @@
+export interface FolderInfo {
+ id: number;
+ title: string;
+ url: string;
+}
diff --git a/public/app/core/components/Permissions/Permissions.tsx b/public/app/core/components/Permissions/Permissions.tsx
new file mode 100644
index 00000000000..0a0572ed86e
--- /dev/null
+++ b/public/app/core/components/Permissions/Permissions.tsx
@@ -0,0 +1,92 @@
+import React, { Component } from 'react';
+import PermissionsList from './PermissionsList';
+import { observer } from 'mobx-react';
+import { FolderInfo } from './FolderInfo';
+
+export interface DashboardAcl {
+ id?: number;
+ dashboardId?: number;
+ userId?: number;
+ userLogin?: string;
+ userEmail?: string;
+ teamId?: number;
+ team?: string;
+ permission?: number;
+ permissionName?: string;
+ role?: string;
+ icon?: string;
+ nameHtml?: string;
+ inherited?: boolean;
+ sortName?: string;
+ sortRank?: number;
+}
+
+export interface IProps {
+ dashboardId: number;
+ folderInfo?: FolderInfo;
+ permissions?: any;
+ isFolder: boolean;
+ backendSrv: any;
+}
+
+@observer
+class Permissions extends Component {
+ constructor(props) {
+ super(props);
+ const { dashboardId, isFolder, folderInfo } = this.props;
+ this.permissionChanged = this.permissionChanged.bind(this);
+ this.typeChanged = this.typeChanged.bind(this);
+ this.removeItem = this.removeItem.bind(this);
+ this.loadStore(dashboardId, isFolder, folderInfo && folderInfo.id === 0);
+ }
+
+ loadStore(dashboardId, isFolder, isInRoot = false) {
+ return this.props.permissions.load(dashboardId, isFolder, isInRoot);
+ }
+
+ permissionChanged(index: number, permission: number, permissionName: string) {
+ const { permissions } = this.props;
+ permissions.updatePermissionOnIndex(index, permission, permissionName);
+ }
+
+ removeItem(index: number) {
+ const { permissions } = this.props;
+ permissions.removeStoreItem(index);
+ }
+
+ resetNewType() {
+ const { permissions } = this.props;
+ permissions.resetNewType();
+ }
+
+ typeChanged(evt) {
+ const { value } = evt.target;
+ const { permissions, dashboardId } = this.props;
+
+ if (value === 'Viewer' || value === 'Editor') {
+ permissions.addStoreItem({ permission: 1, role: value, dashboardId: dashboardId }, dashboardId);
+ this.resetNewType();
+ return;
+ }
+
+ permissions.setNewType(value);
+ }
+
+ render() {
+ const { permissions, folderInfo } = this.props;
+
+ return (
+ {
+ render() {
+ const { permissions, removeItem, permissionChanged, fetching, folderInfo } = this.props;
+
+ return (
+
+
+
+ );
+ }
+}
+
+export default PermissionsList;
diff --git a/public/app/core/components/Permissions/PermissionsListItem.tsx b/public/app/core/components/Permissions/PermissionsListItem.tsx
new file mode 100644
index 00000000000..3140b8fcc0c
--- /dev/null
+++ b/public/app/core/components/Permissions/PermissionsListItem.tsx
@@ -0,0 +1,65 @@
+import React from 'react';
+import { observer } from 'mobx-react';
+import DescriptionPicker from 'app/core/components/Picker/DescriptionPicker';
+import { permissionOptions } from 'app/stores/PermissionsStore/PermissionsStore';
+
+const setClassNameHelper = inherited => {
+ return inherited ? 'gf-form-disabled' : '';
+};
+
+export default observer(({ item, removeItem, permissionChanged, itemIndex, folderInfo }) => {
+ const handleRemoveItem = evt => {
+ evt.preventDefault();
+ removeItem(itemIndex);
+ };
+
+ const handleChangePermission = permissionOption => {
+ permissionChanged(itemIndex, permissionOption.value, permissionOption.label);
+ };
+
+ const inheritedFromRoot = item.dashboardId === -1 && folderInfo && folderInfo.id === 0;
+
+ return (
+
+
+
+
+
+
+ {item.inherited &&
+ folderInfo && (
+
+ Inherited from folder{' '}
+
+ {folderInfo.title}
+ {' '}
+
+ )}
+ {inheritedFromRoot && Default Permission}
+
+ Can
+
+
+
+ {!item.inherited ? (
+
+
+
+ ) : (
+
+ )}
+
+
+ );
+});
diff --git a/public/app/core/components/Picker/DescriptionOption.tsx b/public/app/core/components/Picker/DescriptionOption.tsx
new file mode 100644
index 00000000000..12a1fdd9163
--- /dev/null
+++ b/public/app/core/components/Picker/DescriptionOption.tsx
@@ -0,0 +1,56 @@
+import React, { Component } from 'react';
+
+export interface IProps {
+ onSelect: any;
+ onFocus: any;
+ option: any;
+ isFocused: any;
+ className: any;
+}
+
+class DescriptionOption extends Component {
+ constructor(props) {
+ super(props);
+ this.handleMouseDown = this.handleMouseDown.bind(this);
+ this.handleMouseEnter = this.handleMouseEnter.bind(this);
+ this.handleMouseMove = this.handleMouseMove.bind(this);
+ }
+
+ handleMouseDown(event) {
+ event.preventDefault();
+ event.stopPropagation();
+ this.props.onSelect(this.props.option, event);
+ }
+
+ handleMouseEnter(event) {
+ this.props.onFocus(this.props.option, event);
+ }
+
+ handleMouseMove(event) {
+ if (this.props.isFocused) {
+ return;
+ }
+ this.props.onFocus(this.props.option, event);
+ }
+
+ render() {
+ const { option, children, className } = this.props;
+ return (
+
+ );
+ }
+}
+
+export default DescriptionOption;
diff --git a/public/app/core/components/Picker/DescriptionPicker.tsx b/public/app/core/components/Picker/DescriptionPicker.tsx
new file mode 100644
index 00000000000..498c0df7ab2
--- /dev/null
+++ b/public/app/core/components/Picker/DescriptionPicker.tsx
@@ -0,0 +1,48 @@
+import React, { Component } from 'react';
+import Select from 'react-select';
+import DescriptionOption from './DescriptionOption';
+
+export interface IProps {
+ optionsWithDesc: OptionWithDescription[];
+ handlePicked: (permission) => void;
+ value: number;
+ disabled: boolean;
+ className?: string;
+}
+
+export interface OptionWithDescription {
+ value: any;
+ label: string;
+ description: string;
+}
+
+class DescriptionPicker extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {};
+ }
+
+ render() {
+ const { optionsWithDesc, handlePicked, value, disabled, className } = this.props;
+
+ return (
+ {
+ debouncedSearch: any;
+ backendSrv: any;
+
+ constructor(props) {
+ super(props);
+ this.state = {};
+ this.search = this.search.bind(this);
+
+ this.debouncedSearch = debounce(this.search, 300, {
+ leading: true,
+ trailing: false,
+ });
+ }
+
+ search(query?: string) {
+ const { toggleLoading, backendSrv } = this.props;
+
+ toggleLoading(true);
+ return backendSrv.get(`/api/teams/search?perpage=10&page=1&query=${query}`).then(result => {
+ const teams = result.teams.map(team => {
+ return {
+ id: team.id,
+ label: team.name,
+ name: team.name,
+ avatarUrl: team.avatarUrl,
+ };
+ });
+
+ toggleLoading(false);
+ return { options: teams };
+ });
+ }
+
+ render() {
+ const AsyncComponent = this.state.creatable ? Select.AsyncCreatable : Select.Async;
+ const { isLoading, handlePicked, value, className } = this.props;
+
+ return (
+ {
+ debouncedSearch: any;
+ backendSrv: any;
+
+ constructor(props) {
+ super(props);
+ this.state = {};
+ this.search = this.search.bind(this);
+
+ this.debouncedSearch = debounce(this.search, 300, {
+ leading: true,
+ trailing: false,
+ });
+ }
+
+ search(query?: string) {
+ const { toggleLoading, backendSrv } = this.props;
+
+ toggleLoading(true);
+ return backendSrv.get(`/api/users/search?perpage=10&page=1&query=${query}`).then(result => {
+ const users = result.users.map(user => {
+ return {
+ id: user.id,
+ label: `${user.login} - ${user.email}`,
+ avatarUrl: user.avatarUrl,
+ login: user.login,
+ };
+ });
+ toggleLoading(false);
+ return { options: users };
+ });
+ }
+
+ render() {
+ const AsyncComponent = this.state.creatable ? Select.AsyncCreatable : Select.Async;
+ const { isLoading, handlePicked, value, className } = this.props;
+ return (
+
+`;
diff --git a/public/app/core/components/UserPicker/__snapshots__/UserPicker.jest.tsx.snap b/public/app/core/components/Picker/__snapshots__/UserPicker.jest.tsx.snap
similarity index 94%
rename from public/app/core/components/UserPicker/__snapshots__/UserPicker.jest.tsx.snap
rename to public/app/core/components/Picker/__snapshots__/UserPicker.jest.tsx.snap
index a1563ba8bc3..3262dc10efe 100644
--- a/public/app/core/components/UserPicker/__snapshots__/UserPicker.jest.tsx.snap
+++ b/public/app/core/components/Picker/__snapshots__/UserPicker.jest.tsx.snap
@@ -5,7 +5,7 @@ exports[`UserPicker renders correctly 1`] = `
className="user-picker"
>
- {this.renderHeaderTitle(model.main)}
- {model.main.children &&
+
+
+ {permissions.error ? (
+
+ );
+ }
+}
+
+export default AddPermissions;
diff --git a/public/app/core/components/Permissions/DashboardPermissions.tsx b/public/app/core/components/Permissions/DashboardPermissions.tsx
new file mode 100644
index 00000000000..12339cc7c34
--- /dev/null
+++ b/public/app/core/components/Permissions/DashboardPermissions.tsx
@@ -0,0 +1,70 @@
+import React, { Component } from 'react';
+import { observer } from 'mobx-react';
+import { store } from 'app/stores/store';
+import Permissions from 'app/core/components/Permissions/Permissions';
+import Tooltip from 'app/core/components/Tooltip/Tooltip';
+import PermissionsInfo from 'app/core/components/Permissions/PermissionsInfo';
+import AddPermissions from 'app/core/components/Permissions/AddPermissions';
+import SlideDown from 'app/core/components/Animations/SlideDown';
+import { FolderInfo } from './FolderInfo';
+
+export interface IProps {
+ dashboardId: number;
+ folder?: FolderInfo;
+ backendSrv: any;
+}
+@observer
+class DashboardPermissions extends Component
+
+
+ {permissions.error}
+
+
+ ) : null}
+
+
+
+
+ );
+ }
+}
+
+export default DashboardPermissions;
diff --git a/public/app/core/components/Permissions/DisabledPermissionsListItem.tsx b/public/app/core/components/Permissions/DisabledPermissionsListItem.tsx
new file mode 100644
index 00000000000..db45714136e
--- /dev/null
+++ b/public/app/core/components/Permissions/DisabledPermissionsListItem.tsx
@@ -0,0 +1,40 @@
+import React, { Component } from 'react';
+import DescriptionPicker from 'app/core/components/Picker/DescriptionPicker';
+import { permissionOptions } from 'app/stores/PermissionsStore/PermissionsStore';
+
+export interface IProps {
+ item: any;
+}
+
+export default class DisabledPermissionListItem extends Component
+
+
+
+
+
+
+
+
+ Permissions
+
+ {}}
+ value={item.permission}
+ disabled={true}
+ className={'gf-form-input--form-dropdown-right'}
+ />
+
+
+
+ );
+ }
+}
+
+export default Permissions;
diff --git a/public/app/core/components/Permissions/PermissionsInfo.tsx b/public/app/core/components/Permissions/PermissionsInfo.tsx
new file mode 100644
index 00000000000..9791e344085
--- /dev/null
+++ b/public/app/core/components/Permissions/PermissionsInfo.tsx
@@ -0,0 +1,13 @@
+import React from 'react';
+
+export default () => {
+ return (
+
+
+ );
+};
diff --git a/public/app/core/components/Permissions/PermissionsList.tsx b/public/app/core/components/Permissions/PermissionsList.tsx
new file mode 100644
index 00000000000..b215dad2391
--- /dev/null
+++ b/public/app/core/components/Permissions/PermissionsList.tsx
@@ -0,0 +1,64 @@
+import React, { Component } from 'react';
+import PermissionsListItem from './PermissionsListItem';
+import DisabledPermissionsListItem from './DisabledPermissionsListItem';
+import { observer } from 'mobx-react';
+import { FolderInfo } from './FolderInfo';
+
+export interface IProps {
+ permissions: any[];
+ removeItem: any;
+ permissionChanged: any;
+ fetching: boolean;
+ folderInfo?: FolderInfo;
+}
+
+@observer
+class PermissionsList extends ComponentWhat are Permissions?
++ An Access Control List (ACL) model is used to limit access to Dashboard Folders. A user or a Team can be + assigned permissions for a folder or for a single dashboard. +
+| + Loading permissions... + | +
| + No permissions are set. Will only be accessible by admins. + | +
+
+
+
+
+ );
+ }
+}
+
+export default DescriptionPicker;
diff --git a/public/app/core/components/UserPicker/UserPickerOption.jest.tsx b/public/app/core/components/Picker/PickerOption.jest.tsx
similarity index 70%
rename from public/app/core/components/UserPicker/UserPickerOption.jest.tsx
rename to public/app/core/components/Picker/PickerOption.jest.tsx
index 6903d648870..2f46f3197c5 100644
--- a/public/app/core/components/UserPicker/UserPickerOption.jest.tsx
+++ b/public/app/core/components/Picker/PickerOption.jest.tsx
@@ -1,6 +1,6 @@
import React from 'react';
import renderer from 'react-test-renderer';
-import UserPickerOption from './UserPickerOption';
+import PickerOption from './PickerOption';
const model = {
onSelect: () => {},
@@ -14,9 +14,9 @@ const model = {
className: 'class-for-user-picker',
};
-describe('UserPickerOption', () => {
+describe('PickerOption', () => {
it('renders correctly', () => {
- const tree = renderer.create(
+
+ );
+ }
+}
+
+export default withPicker(TeamPicker);
diff --git a/public/app/core/components/UserPicker/UserPicker.jest.tsx b/public/app/core/components/Picker/UserPicker.jest.tsx
similarity index 91%
rename from public/app/core/components/UserPicker/UserPicker.jest.tsx
rename to public/app/core/components/Picker/UserPicker.jest.tsx
index 0e3c672dcbe..756fa2d9801 100644
--- a/public/app/core/components/UserPicker/UserPicker.jest.tsx
+++ b/public/app/core/components/Picker/UserPicker.jest.tsx
@@ -8,8 +8,7 @@ const model = {
return new Promise((resolve, reject) => {});
},
},
- refreshList: () => {},
- teamId: '1',
+ handlePicked: () => {},
};
describe('UserPicker', () => {
diff --git a/public/app/core/components/Picker/UserPicker.tsx b/public/app/core/components/Picker/UserPicker.tsx
new file mode 100644
index 00000000000..5c36505aeaa
--- /dev/null
+++ b/public/app/core/components/Picker/UserPicker.tsx
@@ -0,0 +1,82 @@
+import React, { Component } from 'react';
+import Select from 'react-select';
+import PickerOption from './PickerOption';
+import withPicker from './withPicker';
+import { debounce } from 'lodash';
+
+export interface IProps {
+ backendSrv: any;
+ isLoading: boolean;
+ toggleLoading: any;
+ handlePicked: (user) => void;
+ value?: string;
+ className?: string;
+}
+
+export interface User {
+ id: number;
+ label: string;
+ avatarUrl: string;
+ login: string;
+}
+
+class UserPicker extends Component
+
+ );
+ }
+}
+
+export default withPicker(UserPicker);
diff --git a/public/app/core/components/UserPicker/__snapshots__/UserPickerOption.jest.tsx.snap b/public/app/core/components/Picker/__snapshots__/PickerOption.jest.tsx.snap
similarity index 87%
rename from public/app/core/components/UserPicker/__snapshots__/UserPickerOption.jest.tsx.snap
rename to public/app/core/components/Picker/__snapshots__/PickerOption.jest.tsx.snap
index 3b9351b2338..764f7844cb7 100644
--- a/public/app/core/components/UserPicker/__snapshots__/UserPickerOption.jest.tsx.snap
+++ b/public/app/core/components/Picker/__snapshots__/PickerOption.jest.tsx.snap
@@ -1,6 +1,6 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
-exports[`UserPickerOption renders correctly 1`] = `
+exports[`PickerOption renders correctly 1`] = `
void;
+ value?: string;
+ className?: string;
+}
+
+export default function withPicker(WrappedComponent) {
+ return class WithPicker extends Component {
+ constructor(props) {
+ super(props);
+ this.toggleLoading = this.toggleLoading.bind(this);
+
+ this.state = {
+ isLoading: false,
+ };
+ }
+
+ toggleLoading(isLoading) {
+ this.setState(prevState => {
+ return {
+ ...prevState,
+ isLoading: isLoading,
+ };
+ });
+ }
+
+ render() {
+ return {
-
private container: any;
private ps: PerfectScrollbar;
@@ -16,7 +15,9 @@ export default class ScrollBar extends React.Component {
}
componentDidMount() {
- this.ps = new PerfectScrollbar(this.container);
+ this.ps = new PerfectScrollbar(this.container, {
+ wheelPropagation: true,
+ });
}
componentDidUpdate() {
diff --git a/public/app/core/components/Tooltip/Popover.jest.tsx b/public/app/core/components/Tooltip/Popover.jest.tsx
index 3850521d5e2..eea416a9262 100644
--- a/public/app/core/components/Tooltip/Popover.jest.tsx
+++ b/public/app/core/components/Tooltip/Popover.jest.tsx
@@ -6,7 +6,7 @@ describe('Popover', () => {
it('renders correctly', () => {
const tree = renderer
.create(
-
+
)
diff --git a/public/app/core/components/Tooltip/Tooltip.jest.tsx b/public/app/core/components/Tooltip/Tooltip.jest.tsx
index bc0512ecef7..d2c96bb23d2 100644
--- a/public/app/core/components/Tooltip/Tooltip.jest.tsx
+++ b/public/app/core/components/Tooltip/Tooltip.jest.tsx
@@ -6,7 +6,7 @@ describe('Tooltip', () => {
it('renders correctly', () => {
const tree = renderer
.create(
-
+
Link with tooltip
)
diff --git a/public/app/core/components/Tooltip/__snapshots__/Popover.jest.tsx.snap b/public/app/core/components/Tooltip/__snapshots__/Popover.jest.tsx.snap
index 7496c681747..12ec960a017 100644
--- a/public/app/core/components/Tooltip/__snapshots__/Popover.jest.tsx.snap
+++ b/public/app/core/components/Tooltip/__snapshots__/Popover.jest.tsx.snap
@@ -2,7 +2,7 @@
exports[`Popover renders correctly 1`] = `
- JSX.Element);
+ className?: string;
}
export default function withTooltip(WrappedComponent) {
@@ -39,10 +40,10 @@ export default function withTooltip(WrappedComponent) {
}
render() {
- const { content } = this.props;
+ const { content, className } = this.props;
return (
-
+
diff --git a/public/app/core/components/UserPicker/UserPicker.tsx b/public/app/core/components/UserPicker/UserPicker.tsx
deleted file mode 100644
index 12aca15e510..00000000000
--- a/public/app/core/components/UserPicker/UserPicker.tsx
+++ /dev/null
@@ -1,108 +0,0 @@
-import React, { Component } from 'react';
-import { debounce } from 'lodash';
-import Select from 'react-select';
-import UserPickerOption from './UserPickerOption';
-
-export interface IProps {
- backendSrv: any;
- teamId: string;
- refreshList: any;
-}
-
-export interface User {
- id: number;
- name: string;
- login: string;
- email: string;
-}
-
-class UserPicker extends Component {
- debouncedSearchUsers: any;
- backendSrv: any;
- teamId: string;
- refreshList: any;
-
- constructor(props) {
- super(props);
- this.backendSrv = this.props.backendSrv;
- this.teamId = this.props.teamId;
- this.refreshList = this.props.refreshList;
-
- this.searchUsers = this.searchUsers.bind(this);
- this.handleChange = this.handleChange.bind(this);
- this.addUser = this.addUser.bind(this);
- this.toggleLoading = this.toggleLoading.bind(this);
-
- this.debouncedSearchUsers = debounce(this.searchUsers, 300, {
- leading: true,
- trailing: false,
- });
-
- this.state = {
- multi: false,
- isLoading: false,
- };
- }
-
- handleChange(user) {
- this.addUser(user.id);
- }
-
- toggleLoading(isLoading) {
- this.setState(prevState => {
- return {
- ...prevState,
- isLoading: isLoading,
- };
- });
- }
-
- addUser(userId) {
- this.toggleLoading(true);
- this.backendSrv.post(`/api/teams/${this.teamId}/members`, { userId: userId }).then(() => {
- this.refreshList();
- this.toggleLoading(false);
- });
- }
-
- searchUsers(query) {
- this.toggleLoading(true);
-
- return this.backendSrv.get(`/api/users/search?perpage=10&page=1&query=${query}`).then(result => {
- const users = result.users.map(user => {
- return {
- id: user.id,
- label: `${user.login} - ${user.email}`,
- avatarUrl: user.avatarUrl,
- };
- });
- this.toggleLoading(false);
- return { options: users };
- });
- }
-
- render() {
- const AsyncComponent = this.state.creatable ? Select.AsyncCreatable : Select.Async;
-
- return (
-
-
- );
- }
-}
-
-export default UserPicker;
diff --git a/public/app/core/components/form_dropdown/form_dropdown.ts b/public/app/core/components/form_dropdown/form_dropdown.ts
index 1fa1dea4338..cf9c6b5efe0 100644
--- a/public/app/core/components/form_dropdown/form_dropdown.ts
+++ b/public/app/core/components/form_dropdown/form_dropdown.ts
@@ -1,9 +1,11 @@
import _ from 'lodash';
-import $ from 'jquery';
import coreModule from '../../core_module';
function typeaheadMatcher(item) {
var str = this.query;
+ if (str === '') {
+ return true;
+ }
if (str[0] === '/') {
str = str.substring(1);
}
@@ -30,6 +32,8 @@ export class FormDropdownCtrl {
getOptions: any;
optionCache: any;
lookupText: boolean;
+ placeholder: any;
+ startOpen: any;
/** @ngInject **/
constructor(private $scope, $element, private $sce, private templateSrv, private $q) {
@@ -47,6 +51,10 @@ export class FormDropdownCtrl {
this.cssClasses = 'gf-form-input gf-form-input--dropdown ' + this.cssClass;
}
+ if (this.placeholder) {
+ this.inputElement.attr('placeholder', this.placeholder);
+ }
+
this.inputElement.attr('data-provide', 'typeahead');
this.inputElement.typeahead({
source: this.typeaheadSource.bind(this),
@@ -61,8 +69,7 @@ export class FormDropdownCtrl {
var typeahead = this.inputElement.data('typeahead');
typeahead.lookup = function() {
this.query = this.$element.val() || '';
- var items = this.source(this.query, $.proxy(this.process, this));
- return items ? this.process(items) : items;
+ this.source(this.query, this.process.bind(this));
};
this.linkElement.keydown(evt => {
@@ -81,6 +88,10 @@ export class FormDropdownCtrl {
});
this.inputElement.blur(this.inputBlur.bind(this));
+
+ if (this.startOpen) {
+ setTimeout(this.open.bind(this), 0);
+ }
}
getOptionsInternal(query) {
@@ -121,9 +132,9 @@ export class FormDropdownCtrl {
});
// add custom values
- if (this.allowCustom) {
+ if (this.allowCustom && this.text !== '') {
if (_.indexOf(optionTexts, this.text) === -1) {
- options.unshift(this.text);
+ optionTexts.unshift(this.text);
}
}
@@ -228,10 +239,10 @@ const template = `
style="display:none">
+ tabindex="1"
+ ng-click="ctrl.open()"
+ give-focus="ctrl.focus"
+ ng-bind-html="ctrl.display || ' '">
`;
@@ -250,6 +261,8 @@ export function formDropdownDirective() {
allowCustom: '@',
labelMode: '@',
lookupText: '@',
+ placeholder: '@',
+ startOpen: '@',
},
};
}
diff --git a/public/app/core/components/grafana_app.ts b/public/app/core/components/grafana_app.ts
index c00b7b2181b..70a1bda3e8b 100644
--- a/public/app/core/components/grafana_app.ts
+++ b/public/app/core/components/grafana_app.ts
@@ -71,6 +71,7 @@ export function grafanaAppDirective(playlistSrv, contextSrv, $timeout, $rootScop
body.toggleClass('sidemenu-open', sidemenuOpen);
appEvents.on('toggle-sidemenu', () => {
+ sidemenuOpen = scope.contextSrv.sidemenu;
body.toggleClass('sidemenu-open');
});
@@ -82,6 +83,10 @@ export function grafanaAppDirective(playlistSrv, contextSrv, $timeout, $rootScop
body.toggleClass('sidemenu-hidden');
});
+ scope.$watch(() => playlistSrv.isPlaying, function(newValue) {
+ elem.toggleClass('playlist-active', newValue === true);
+ });
+
// tooltip removal fix
// manage page classes
var pageClass;
@@ -167,6 +172,8 @@ export function grafanaAppDirective(playlistSrv, contextSrv, $timeout, $rootScop
// mouse and keyboard is user activity
body.mousemove(userActivityDetected);
body.keydown(userActivityDetected);
+ // set useCapture = true to catch event here
+ document.addEventListener('wheel', userActivityDetected, true);
// treat tab change as activity
document.addEventListener('visibilitychange', userActivityDetected);
diff --git a/public/app/core/components/help/help.ts b/public/app/core/components/help/help.ts
index 0676b4dae99..c2f6f213dd3 100644
--- a/public/app/core/components/help/help.ts
+++ b/public/app/core/components/help/help.ts
@@ -19,7 +19,6 @@ export class HelpCtrl {
],
Dashboard: [
{ keys: ['mod+s'], description: 'Save dashboard' },
- { keys: ['mod+h'], description: 'Hide row controls' },
{ keys: ['d', 'r'], description: 'Refresh all panels' },
{ keys: ['d', 's'], description: 'Dashboard settings' },
{ keys: ['d', 'v'], description: 'Toggle in-active / view mode' },
diff --git a/public/app/core/components/manage_dashboards/manage_dashboards.html b/public/app/core/components/manage_dashboards/manage_dashboards.html
index e9d7d743063..effe9f66930 100644
--- a/public/app/core/components/manage_dashboards/manage_dashboards.html
+++ b/public/app/core/components/manage_dashboards/manage_dashboards.html
@@ -5,11 +5,11 @@
-
+
Dashboard
-
+
Folder
@@ -95,22 +95,23 @@
-
+
@@ -60,16 +61,11 @@ export class OrgSwitchCtrl {
setUsingOrg(org) {
return this.backendSrv.post('/api/user/using/' + org.orgId).then(() => {
- const re = /orgId=\d+/gi;
- this.setWindowLocationHref(this.getWindowLocationHref().replace(re, 'orgId=' + org.orgId));
+ this.setWindowLocation(config.appSubUrl + (config.appSubUrl.endsWith('/') ? '' : '/') + '?orgId=' + org.orgId);
});
}
- getWindowLocationHref() {
- return window.location.href;
- }
-
- setWindowLocationHref(href: string) {
+ setWindowLocation(href: string) {
window.location.href = href;
}
}
diff --git a/public/app/core/components/scroll/scroll.ts b/public/app/core/components/scroll/scroll.ts
index bf0bbfaec4b..720334d8973 100644
--- a/public/app/core/components/scroll/scroll.ts
+++ b/public/app/core/components/scroll/scroll.ts
@@ -6,26 +6,32 @@ export function geminiScrollbar() {
return {
restrict: 'A',
link: function(scope, elem, attrs) {
- let scrollbar = new PerfectScrollbar(elem[0]);
+ let scrollbar = new PerfectScrollbar(elem[0], {
+ wheelPropagation: true,
+ });
+ let lastPos = 0;
appEvents.on(
- 'smooth-scroll-top',
- () => {
- elem.animate(
- {
- scrollTop: 0,
- },
- 500
- );
+ 'dash-scroll',
+ evt => {
+ if (evt.restore) {
+ elem[0].scrollTop = lastPos;
+ return;
+ }
+
+ lastPos = elem[0].scrollTop;
+
+ if (evt.animate) {
+ elem.animate({ scrollTop: evt.pos }, 500);
+ } else {
+ elem[0].scrollTop = evt.pos;
+ }
},
scope
);
scope.$on('$routeChangeSuccess', () => {
- elem[0].scrollTop = 0;
- });
-
- scope.$on('$routeUpdate', () => {
+ lastPos = 0;
elem[0].scrollTop = 0;
});
diff --git a/public/app/core/components/search/search.html b/public/app/core/components/search/search.html
index 6fafad19df2..e0106740d3a 100644
--- a/public/app/core/components/search/search.html
+++ b/public/app/core/components/search/search.html
@@ -12,7 +12,6 @@
ng-model-options="{ debounce: 500 }"
spellcheck='false'
ng-change="ctrl.search()"
- ng-blur="ctrl.searchInputBlur()"
/>
@@ -46,12 +45,13 @@
+
-
- New dashboard
+ New dashboard
-
- New folder
+ New folder
+
+
+ Import dashboard
Find dashboards on Grafana.com
diff --git a/public/app/core/components/search/search.ts b/public/app/core/components/search/search.ts
index a22d1dcb88b..04b77e7b7fe 100644
--- a/public/app/core/components/search/search.ts
+++ b/public/app/core/components/search/search.ts
@@ -90,10 +90,6 @@ export class SearchCtrl {
}
}
- searchInputBlur() {
- this.search();
- }
-
onFilterboxClick() {
this.giveSearchFocus = 0;
this.preventClose();
diff --git a/public/app/core/controllers/invited_ctrl.ts b/public/app/core/controllers/invited_ctrl.ts
index e88c810b557..4bfb7106a69 100644
--- a/public/app/core/controllers/invited_ctrl.ts
+++ b/public/app/core/controllers/invited_ctrl.ts
@@ -10,8 +10,9 @@ export class InvitedCtrl {
$scope.navModel = {
main: {
icon: 'gicon gicon-branding',
+ text: 'Invite',
subTitle: 'Register your Grafana account',
- breadcrumbs: [{ title: 'Login', url: '/login' }, { title: 'Invite' }],
+ breadcrumbs: [{ title: 'Login', url: '/login' }],
},
};
diff --git a/public/app/core/controllers/reset_password_ctrl.ts b/public/app/core/controllers/reset_password_ctrl.ts
index bc184838803..360c5bf8071 100644
--- a/public/app/core/controllers/reset_password_ctrl.ts
+++ b/public/app/core/controllers/reset_password_ctrl.ts
@@ -16,8 +16,9 @@ export class ResetPasswordCtrl {
$scope.navModel = {
main: {
icon: 'gicon gicon-branding',
+ text: 'Reset Password',
subTitle: 'Reset your Grafana password',
- breadcrumbs: [{ title: 'Login', url: 'login' }, { title: 'Reset Password' }],
+ breadcrumbs: [{ title: 'Login', url: 'login' }],
},
};
diff --git a/public/app/core/core.ts b/public/app/core/core.ts
index bf041d608eb..353d8762a9a 100644
--- a/public/app/core/core.ts
+++ b/public/app/core/core.ts
@@ -1,5 +1,4 @@
import './directives/dash_class';
-import './directives/dash_edit_link';
import './directives/dropdown_typeahead';
import './directives/metric_segment';
import './directives/misc';
diff --git a/public/app/core/directives/dash_class.js b/public/app/core/directives/dash_class.js
index 9df53bdbd48..4a139272632 100644
--- a/public/app/core/directives/dash_class.js
+++ b/public/app/core/directives/dash_class.js
@@ -18,10 +18,6 @@ function (_, $, coreModule) {
elem.toggleClass('panel-in-fullscreen', false);
});
- $scope.$watch('ctrl.playlistSrv.isPlaying', function(newValue) {
- elem.toggleClass('playlist-active', newValue === true);
- });
-
$scope.$watch('ctrl.dashboardViewState.state.editview', function(newValue) {
if (newValue) {
elem.toggleClass('dashboard-page--settings-opening', _.isString(newValue));
diff --git a/public/app/core/directives/dash_edit_link.js b/public/app/core/directives/dash_edit_link.js
deleted file mode 100644
index f0dc6f59a6a..00000000000
--- a/public/app/core/directives/dash_edit_link.js
+++ /dev/null
@@ -1,150 +0,0 @@
-define([
- 'jquery',
- 'angular',
- '../core_module',
- 'lodash',
-],
-function ($, angular, coreModule, _) {
- 'use strict';
-
- var editViewMap = {
- 'settings': { src: 'public/app/features/dashboard/partials/settings.html'},
- 'annotations': { src: 'public/app/features/annotations/partials/editor.html'},
- 'templating': { src: 'public/app/features/templating/partials/editor.html'},
- 'history': { html: 'searchSrvStub);
+ return new ManageDashboardsCtrl({}, { getNav: () => {} }, searchSrvStub, { isEditor: true });
}
diff --git a/public/app/core/specs/org_switcher.jest.ts b/public/app/core/specs/org_switcher.jest.ts
index 06172604069..230da81f191 100644
--- a/public/app/core/specs/org_switcher.jest.ts
+++ b/public/app/core/specs/org_switcher.jest.ts
@@ -7,6 +7,12 @@ jest.mock('app/core/services/context_srv', () => ({
},
}));
+jest.mock('app/core/config', () => {
+ return {
+ appSubUrl: '/subUrl',
+ };
+});
+
describe('OrgSwitcher', () => {
describe('when switching org', () => {
let expectedHref;
@@ -25,8 +31,7 @@ describe('OrgSwitcher', () => {
const orgSwitcherCtrl = new OrgSwitchCtrl(backendSrvStub);
- orgSwitcherCtrl.getWindowLocationHref = () => 'http://localhost:3000?orgId=1&from=now-3h&to=now';
- orgSwitcherCtrl.setWindowLocationHref = href => (expectedHref = href);
+ orgSwitcherCtrl.setWindowLocation = href => (expectedHref = href);
return orgSwitcherCtrl.setUsingOrg({ orgId: 2 });
});
@@ -35,8 +40,8 @@ describe('OrgSwitcher', () => {
expect(expectedUsingUrl).toBe('/api/user/using/2');
});
- it('should switch orgId in url', () => {
- expect(expectedHref).toBe('http://localhost:3000?orgId=2&from=now-3h&to=now');
+ it('should switch orgId in url and redirect to home page', () => {
+ expect(expectedHref).toBe('/subUrl/?orgId=2');
});
});
});
diff --git a/public/app/core/specs/search.jest.ts b/public/app/core/specs/search.jest.ts
index 2457d71a48d..2c1172bcf55 100644
--- a/public/app/core/specs/search.jest.ts
+++ b/public/app/core/specs/search.jest.ts
@@ -49,7 +49,7 @@ describe('SearchCtrl', () => {
},
{
id: 0,
- title: 'Root',
+ title: 'General',
items: [{ id: 3, selected: false }, { id: 5, selected: false }],
selected: false,
expanded: true,
@@ -146,7 +146,7 @@ describe('SearchCtrl', () => {
},
{
id: 0,
- title: 'Root',
+ title: 'General',
items: [{ id: 3, selected: false }, { id: 5, selected: false }],
selected: false,
expanded: true,
diff --git a/public/app/core/specs/search_srv.jest.ts b/public/app/core/specs/search_srv.jest.ts
index 444939d1f4a..550d11bbf9e 100644
--- a/public/app/core/specs/search_srv.jest.ts
+++ b/public/app/core/specs/search_srv.jest.ts
@@ -190,7 +190,9 @@ describe('SearchSrv', () => {
title: 'dash in folder1 1',
type: 'dash-db',
folderId: 1,
+ folderUid: 'uid',
folderTitle: 'folder1',
+ folderUrl: '/dashboards/f/uid/folder1',
},
])
);
@@ -206,6 +208,11 @@ describe('SearchSrv', () => {
it('should group results by folder', () => {
expect(results).toHaveLength(2);
+ expect(results[0].id).toEqual(0);
+ expect(results[1].id).toEqual(1);
+ expect(results[1].uid).toEqual('uid');
+ expect(results[1].title).toEqual('folder1');
+ expect(results[1].url).toEqual('/dashboards/f/uid/folder1');
});
});
diff --git a/public/app/core/utils/file_export.ts b/public/app/core/utils/file_export.ts
index 1ebd5b90a86..670326fc068 100644
--- a/public/app/core/utils/file_export.ts
+++ b/public/app/core/utils/file_export.ts
@@ -3,19 +3,27 @@ import moment from 'moment';
import { saveAs } from 'file-saver';
const DEFAULT_DATETIME_FORMAT = 'YYYY-MM-DDTHH:mm:ssZ';
+const POINT_TIME_INDEX = 1;
+const POINT_VALUE_INDEX = 0;
-export function exportSeriesListToCsv(seriesList, dateTimeFormat = DEFAULT_DATETIME_FORMAT, excel = false) {
+export function convertSeriesListToCsv(seriesList, dateTimeFormat = DEFAULT_DATETIME_FORMAT, excel = false) {
var text = (excel ? 'sep=;\n' : '') + 'Series;Time;Value\n';
_.each(seriesList, function(series) {
_.each(series.datapoints, function(dp) {
- text += series.alias + ';' + moment(dp[1]).format(dateTimeFormat) + ';' + dp[0] + '\n';
+ text +=
+ series.alias + ';' + moment(dp[POINT_TIME_INDEX]).format(dateTimeFormat) + ';' + dp[POINT_VALUE_INDEX] + '\n';
});
});
+ return text;
+}
+
+export function exportSeriesListToCsv(seriesList, dateTimeFormat = DEFAULT_DATETIME_FORMAT, excel = false) {
+ var text = convertSeriesListToCsv(seriesList, dateTimeFormat, excel);
saveSaveBlob(text, 'grafana_data_export.csv');
}
-export function exportSeriesListToCsvColumns(seriesList, dateTimeFormat = DEFAULT_DATETIME_FORMAT, excel = false) {
- var text = (excel ? 'sep=;\n' : '') + 'Time;';
+export function convertSeriesListToCsvColumns(seriesList, dateTimeFormat = DEFAULT_DATETIME_FORMAT, excel = false) {
+ let text = (excel ? 'sep=;\n' : '') + 'Time;';
// add header
_.each(seriesList, function(series) {
text += series.alias + ';';
@@ -24,14 +32,15 @@ export function exportSeriesListToCsvColumns(seriesList, dateTimeFormat = DEFAUL
text += '\n';
// process data
+ seriesList = mergeSeriesByTime(seriesList);
var dataArr = [[]];
var sIndex = 1;
_.each(seriesList, function(series) {
var cIndex = 0;
dataArr.push([]);
_.each(series.datapoints, function(dp) {
- dataArr[0][cIndex] = moment(dp[1]).format(dateTimeFormat);
- dataArr[sIndex][cIndex] = dp[0];
+ dataArr[0][cIndex] = moment(dp[POINT_TIME_INDEX]).format(dateTimeFormat);
+ dataArr[sIndex][cIndex] = dp[POINT_VALUE_INDEX];
cIndex++;
});
sIndex++;
@@ -46,6 +55,44 @@ export function exportSeriesListToCsvColumns(seriesList, dateTimeFormat = DEFAUL
text = text.substring(0, text.length - 1);
text += '\n';
}
+
+ return text;
+}
+
+/**
+ * Collect all unique timestamps from series list and use it to fill
+ * missing points by null.
+ */
+function mergeSeriesByTime(seriesList) {
+ let timestamps = [];
+ for (let i = 0; i < seriesList.length; i++) {
+ let seriesPoints = seriesList[i].datapoints;
+ for (let j = 0; j < seriesPoints.length; j++) {
+ timestamps.push(seriesPoints[j][POINT_TIME_INDEX]);
+ }
+ }
+ timestamps = _.sortedUniq(timestamps.sort());
+
+ for (let i = 0; i < seriesList.length; i++) {
+ let seriesPoints = seriesList[i].datapoints;
+ let seriesTimestamps = _.map(seriesPoints, p => p[POINT_TIME_INDEX]);
+ let extendedSeries = [];
+ let pointIndex;
+ for (let j = 0; j < timestamps.length; j++) {
+ pointIndex = _.sortedIndexOf(seriesTimestamps, timestamps[j]);
+ if (pointIndex !== -1) {
+ extendedSeries.push(seriesPoints[pointIndex]);
+ } else {
+ extendedSeries.push([null, timestamps[j]]);
+ }
+ }
+ seriesList[i].datapoints = extendedSeries;
+ }
+ return seriesList;
+}
+
+export function exportSeriesListToCsvColumns(seriesList, dateTimeFormat = DEFAULT_DATETIME_FORMAT, excel = false) {
+ let text = convertSeriesListToCsvColumns(seriesList, dateTimeFormat, excel);
saveSaveBlob(text, 'grafana_data_export.csv');
}
diff --git a/public/app/core/utils/kbn.ts b/public/app/core/utils/kbn.ts
index ec4837fe31d..e7ae645d4e4 100644
--- a/public/app/core/utils/kbn.ts
+++ b/public/app/core/utils/kbn.ts
@@ -493,6 +493,7 @@ kbn.valueFormats.kvolt = kbn.formatBuilders.decimalSIPrefix('V', 1);
kbn.valueFormats.mvolt = kbn.formatBuilders.decimalSIPrefix('V', -1);
kbn.valueFormats.dBm = kbn.formatBuilders.decimalSIPrefix('dBm');
kbn.valueFormats.ohm = kbn.formatBuilders.decimalSIPrefix('Ω');
+kbn.valueFormats.lumens = kbn.formatBuilders.decimalSIPrefix('Lm');
// Temperature
kbn.valueFormats.celsius = kbn.formatBuilders.fixedUnit('°C');
@@ -958,6 +959,7 @@ kbn.getUnitFormats = function() {
{ text: 'Millivolt (mV)', value: 'mvolt' },
{ text: 'Decibel-milliwatt (dBm)', value: 'dBm' },
{ text: 'Ohm (Ω)', value: 'ohm' },
+ { text: 'Lumens (Lm)', value: 'lumens' },
],
},
{
diff --git a/public/app/core/utils/location_util.ts b/public/app/core/utils/location_util.ts
new file mode 100644
index 00000000000..f8d6aa4ee5f
--- /dev/null
+++ b/public/app/core/utils/location_util.ts
@@ -0,0 +1,14 @@
+import config from 'app/core/config';
+
+const _stripBaseFromUrl = url => {
+ const appSubUrl = config.appSubUrl;
+ const stripExtraChars = appSubUrl.endsWith('/') ? 1 : 0;
+ const urlWithoutBase =
+ url.length > 0 && url.indexOf(appSubUrl) === 0 ? url.slice(appSubUrl.length - stripExtraChars) : url;
+
+ return urlWithoutBase;
+};
+
+export default {
+ stripBaseFromUrl: _stripBaseFromUrl,
+};
diff --git a/public/app/core/utils/url.ts b/public/app/core/utils/url.ts
index 0b629768b92..b57d5721d57 100644
--- a/public/app/core/utils/url.ts
+++ b/public/app/core/utils/url.ts
@@ -12,7 +12,11 @@ export function toUrlParams(a) {
let add = function(k, v) {
v = typeof v === 'function' ? v() : v === null ? '' : v === undefined ? '' : v;
- s[s.length] = encodeURIComponent(k) + '=' + encodeURIComponent(v);
+ if (typeof v !== 'boolean') {
+ s[s.length] = encodeURIComponent(k) + '=' + encodeURIComponent(v);
+ } else {
+ s[s.length] = encodeURIComponent(k);
+ }
};
let buildParams = function(prefix, obj) {
diff --git a/public/app/features/annotations/annotation_tooltip.ts b/public/app/features/annotations/annotation_tooltip.ts
index fab351fe836..ed2d797b7bf 100644
--- a/public/app/features/annotations/annotation_tooltip.ts
+++ b/public/app/features/annotations/annotation_tooltip.ts
@@ -54,7 +54,7 @@ export function annotationTooltipDirective($sanitize, dashboardSrv, contextSrv,
`;
// Show edit icon only for users with at least Editor role
- if (event.id && contextSrv.isEditor) {
+ if (event.id && dashboard.meta.canEdit) {
header += `
diff --git a/public/app/features/dashboard/acl/acl.html b/public/app/features/dashboard/acl/acl.html
deleted file mode 100644
index aa73f607684..00000000000
--- a/public/app/features/dashboard/acl/acl.html
+++ /dev/null
@@ -1,126 +0,0 @@
- this.onAddPanel(panel)} title={panel.name}>
diff --git a/public/app/features/dashboard/dashgrid/DashboardRow.tsx b/public/app/features/dashboard/dashgrid/DashboardRow.tsx
index fad7c120f65..7a4d6cf8070 100644
--- a/public/app/features/dashboard/dashgrid/DashboardRow.tsx
+++ b/public/app/features/dashboard/dashgrid/DashboardRow.tsx
@@ -27,6 +27,7 @@ export class DashboardRow extends React.Component {
this.toggle = this.toggle.bind(this);
this.openSettings = this.openSettings.bind(this);
this.delete = this.delete.bind(this);
+ this.update = this.update.bind(this);
}
toggle() {
@@ -37,13 +38,18 @@ export class DashboardRow extends React.Component {
});
}
+ update() {
+ this.dashboard.processRepeats();
+ this.forceUpdate();
+ }
+
openSettings() {
appEvents.emit('show-modal', {
templateHtml: `
diff --git a/public/app/features/dashboard/partials/folder_permissions.html b/public/app/features/dashboard/partials/folder_permissions.html
index 6d037c7ab5e..be44c1051f2 100644
--- a/public/app/features/dashboard/partials/folder_permissions.html
+++ b/public/app/features/dashboard/partials/folder_permissions.html
@@ -1,7 +1,7 @@
Find dashboards on Grafana.com
diff --git a/public/app/core/components/search/search.ts b/public/app/core/components/search/search.ts
index a22d1dcb88b..04b77e7b7fe 100644
--- a/public/app/core/components/search/search.ts
+++ b/public/app/core/components/search/search.ts
@@ -90,10 +90,6 @@ export class SearchCtrl {
}
}
- searchInputBlur() {
- this.search();
- }
-
onFilterboxClick() {
this.giveSearchFocus = 0;
this.preventClose();
diff --git a/public/app/core/controllers/invited_ctrl.ts b/public/app/core/controllers/invited_ctrl.ts
index e88c810b557..4bfb7106a69 100644
--- a/public/app/core/controllers/invited_ctrl.ts
+++ b/public/app/core/controllers/invited_ctrl.ts
@@ -10,8 +10,9 @@ export class InvitedCtrl {
$scope.navModel = {
main: {
icon: 'gicon gicon-branding',
+ text: 'Invite',
subTitle: 'Register your Grafana account',
- breadcrumbs: [{ title: 'Login', url: '/login' }, { title: 'Invite' }],
+ breadcrumbs: [{ title: 'Login', url: '/login' }],
},
};
diff --git a/public/app/core/controllers/reset_password_ctrl.ts b/public/app/core/controllers/reset_password_ctrl.ts
index bc184838803..360c5bf8071 100644
--- a/public/app/core/controllers/reset_password_ctrl.ts
+++ b/public/app/core/controllers/reset_password_ctrl.ts
@@ -16,8 +16,9 @@ export class ResetPasswordCtrl {
$scope.navModel = {
main: {
icon: 'gicon gicon-branding',
+ text: 'Reset Password',
subTitle: 'Reset your Grafana password',
- breadcrumbs: [{ title: 'Login', url: 'login' }, { title: 'Reset Password' }],
+ breadcrumbs: [{ title: 'Login', url: 'login' }],
},
};
diff --git a/public/app/core/core.ts b/public/app/core/core.ts
index bf041d608eb..353d8762a9a 100644
--- a/public/app/core/core.ts
+++ b/public/app/core/core.ts
@@ -1,5 +1,4 @@
import './directives/dash_class';
-import './directives/dash_edit_link';
import './directives/dropdown_typeahead';
import './directives/metric_segment';
import './directives/misc';
diff --git a/public/app/core/directives/dash_class.js b/public/app/core/directives/dash_class.js
index 9df53bdbd48..4a139272632 100644
--- a/public/app/core/directives/dash_class.js
+++ b/public/app/core/directives/dash_class.js
@@ -18,10 +18,6 @@ function (_, $, coreModule) {
elem.toggleClass('panel-in-fullscreen', false);
});
- $scope.$watch('ctrl.playlistSrv.isPlaying', function(newValue) {
- elem.toggleClass('playlist-active', newValue === true);
- });
-
$scope.$watch('ctrl.dashboardViewState.state.editview', function(newValue) {
if (newValue) {
elem.toggleClass('dashboard-page--settings-opening', _.isString(newValue));
diff --git a/public/app/core/directives/dash_edit_link.js b/public/app/core/directives/dash_edit_link.js
deleted file mode 100644
index f0dc6f59a6a..00000000000
--- a/public/app/core/directives/dash_edit_link.js
+++ /dev/null
@@ -1,150 +0,0 @@
-define([
- 'jquery',
- 'angular',
- '../core_module',
- 'lodash',
-],
-function ($, angular, coreModule, _) {
- 'use strict';
-
- var editViewMap = {
- 'settings': { src: 'public/app/features/dashboard/partials/settings.html'},
- 'annotations': { src: 'public/app/features/annotations/partials/editor.html'},
- 'templating': { src: 'public/app/features/templating/partials/editor.html'},
- 'history': { html: '
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/public/app/features/dashboard/acl/acl.ts b/public/app/features/dashboard/acl/acl.ts
deleted file mode 100644
index d65a41a28fe..00000000000
--- a/public/app/features/dashboard/acl/acl.ts
+++ /dev/null
@@ -1,201 +0,0 @@
-import coreModule from 'app/core/core_module';
-import _ from 'lodash';
-
-export class AclCtrl {
- dashboard: any;
- items: DashboardAcl[];
- permissionOptions = [{ value: 1, text: 'View' }, { value: 2, text: 'Edit' }, { value: 4, text: 'Admin' }];
- aclTypes = [
- { value: 'Group', text: 'Team' },
- { value: 'User', text: 'User' },
- { value: 'Viewer', text: 'Everyone With Viewer Role' },
- { value: 'Editor', text: 'Everyone With Editor Role' },
- ];
-
- dismiss: () => void;
- newType: string;
- canUpdate: boolean;
- error: string;
-
- readonly duplicateError = 'This permission exists already.';
-
- /** @ngInject */
- constructor(private backendSrv, dashboardSrv, private $sce, private $scope) {
- this.items = [];
- this.resetNewType();
- this.dashboard = dashboardSrv.getCurrent();
- this.get(this.dashboard.id);
- }
-
- resetNewType() {
- this.newType = 'Group';
- }
-
- get(dashboardId: number) {
- return this.backendSrv.get(`/api/dashboards/id/${dashboardId}/acl`).then(result => {
- this.items = _.map(result, this.prepareViewModel.bind(this));
- this.sortItems();
- });
- }
-
- sortItems() {
- this.items = _.orderBy(this.items, ['sortRank', 'sortName'], ['desc', 'asc']);
- }
-
- prepareViewModel(item: DashboardAcl): DashboardAcl {
- item.inherited = !this.dashboard.meta.isFolder && this.dashboard.id !== item.dashboardId;
- item.sortRank = 0;
-
- if (item.userId > 0) {
- item.icon = 'fa fa-fw fa-user';
- item.nameHtml = this.$sce.trustAsHtml(item.userLogin);
- item.sortName = item.userLogin;
- item.sortRank = 10;
- } else if (item.teamId > 0) {
- item.icon = 'fa fa-fw fa-users';
- item.nameHtml = this.$sce.trustAsHtml(item.team);
- item.sortName = item.team;
- item.sortRank = 20;
- } else if (item.role) {
- item.icon = 'fa fa-fw fa-street-view';
- item.nameHtml = this.$sce.trustAsHtml(`Everyone with ${item.role} Role`);
- item.sortName = item.role;
- item.sortRank = 30;
- if (item.role === 'Viewer') {
- item.sortRank += 1;
- }
- }
-
- if (item.inherited) {
- item.sortRank += 100;
- }
-
- return item;
- }
-
- update() {
- var updated = [];
- for (let item of this.items) {
- if (item.inherited) {
- continue;
- }
- updated.push({
- id: item.id,
- userId: item.userId,
- teamId: item.teamId,
- role: item.role,
- permission: item.permission,
- });
- }
-
- return this.backendSrv.post(`/api/dashboards/id/${this.dashboard.id}/acl`, { items: updated }).then(() => {
- return this.dismiss();
- });
- }
-
- typeChanged() {
- if (this.newType === 'Viewer' || this.newType === 'Editor') {
- this.addNewItem({ permission: 1, role: this.newType });
- this.canUpdate = true;
- this.resetNewType();
- }
- }
-
- permissionChanged() {
- this.canUpdate = true;
- }
-
- addNewItem(item) {
- if (!this.isValid(item)) {
- return;
- }
- this.error = '';
-
- item.dashboardId = this.dashboard.id;
-
- this.items.push(this.prepareViewModel(item));
- this.sortItems();
-
- this.canUpdate = true;
- }
-
- isValid(item) {
- const dupe = _.find(this.items, it => {
- return this.isDuplicate(it, item);
- });
-
- if (dupe) {
- this.error = this.duplicateError;
- return false;
- }
-
- return true;
- }
-
- isDuplicate(origItem, newItem) {
- if (origItem.inherited) {
- return false;
- }
-
- return (
- (origItem.role && newItem.role && origItem.role === newItem.role) ||
- (origItem.userId && newItem.userId && origItem.userId === newItem.userId) ||
- (origItem.teamId && newItem.teamId && origItem.teamId === newItem.teamId)
- );
- }
-
- userPicked(user) {
- this.addNewItem({ userId: user.id, userLogin: user.login, permission: 1 });
- this.$scope.$broadcast('user-picker-reset');
- }
-
- groupPicked(group) {
- this.addNewItem({ teamId: group.id, team: group.name, permission: 1 });
- this.$scope.$broadcast('team-picker-reset');
- }
-
- removeItem(index) {
- this.items.splice(index, 1);
- this.canUpdate = true;
- }
-}
-
-export function dashAclModal() {
- return {
- restrict: 'E',
- templateUrl: 'public/app/features/dashboard/acl/acl.html',
- controller: AclCtrl,
- bindToController: true,
- controllerAs: 'ctrl',
- scope: {
- dismiss: '&',
- },
- };
-}
-
-export interface FormModel {
- dashboardId: number;
- userId?: number;
- teamId?: number;
- PermissionType: number;
-}
-
-export interface DashboardAcl {
- id?: number;
- dashboardId?: number;
- userId?: number;
- userLogin?: string;
- userEmail?: string;
- teamId?: number;
- team?: string;
- permission?: number;
- permissionName?: string;
- role?: string;
- icon?: string;
- nameHtml?: string;
- inherited?: boolean;
- sortName?: string;
- sortRank?: number;
-}
-
-coreModule.directive('dashAclModal', dashAclModal);
diff --git a/public/app/features/dashboard/acl/specs/acl_specs.ts b/public/app/features/dashboard/acl/specs/acl_specs.ts
deleted file mode 100644
index 3787545d97e..00000000000
--- a/public/app/features/dashboard/acl/specs/acl_specs.ts
+++ /dev/null
@@ -1,188 +0,0 @@
-import { describe, beforeEach, it, expect, sinon, angularMocks } from 'test/lib/common';
-import { AclCtrl } from '../acl';
-
-describe('AclCtrl', () => {
- const ctx: any = {};
- const backendSrv = {
- get: sinon.stub().returns(Promise.resolve([])),
- post: sinon.stub().returns(Promise.resolve([])),
- };
-
- const dashboardSrv = {
- getCurrent: sinon.stub().returns({ id: 1, meta: { isFolder: false } }),
- };
-
- beforeEach(angularMocks.module('grafana.core'));
- beforeEach(angularMocks.module('grafana.controllers'));
-
- beforeEach(
- angularMocks.inject(($rootScope, $controller, $q, $compile) => {
- ctx.$q = $q;
- ctx.scope = $rootScope.$new();
- AclCtrl.prototype.dashboard = { dashboard: { id: 1 } };
- ctx.ctrl = $controller(
- AclCtrl,
- {
- $scope: ctx.scope,
- backendSrv: backendSrv,
- dashboardSrv: dashboardSrv,
- },
- {
- dismiss: () => {
- return;
- },
- }
- );
- })
- );
-
- describe('when permissions are added', () => {
- beforeEach(() => {
- backendSrv.get.reset();
- backendSrv.post.reset();
-
- const userItem = {
- id: 2,
- login: 'user2',
- };
-
- ctx.ctrl.userPicked(userItem);
-
- const teamItem = {
- id: 2,
- name: 'ug1',
- };
-
- ctx.ctrl.groupPicked(teamItem);
-
- ctx.ctrl.newType = 'Editor';
- ctx.ctrl.typeChanged();
-
- ctx.ctrl.newType = 'Viewer';
- ctx.ctrl.typeChanged();
- });
-
- it('should sort the result by role, team and user', () => {
- expect(ctx.ctrl.items[0].role).to.eql('Viewer');
- expect(ctx.ctrl.items[1].role).to.eql('Editor');
- expect(ctx.ctrl.items[2].teamId).to.eql(2);
- expect(ctx.ctrl.items[3].userId).to.eql(2);
- });
-
- it('should save permissions to db', done => {
- ctx.ctrl.update().then(() => {
- done();
- });
-
- expect(backendSrv.post.getCall(0).args[0]).to.eql('/api/dashboards/id/1/acl');
- expect(backendSrv.post.getCall(0).args[1].items[0].role).to.eql('Viewer');
- expect(backendSrv.post.getCall(0).args[1].items[0].permission).to.eql(1);
- expect(backendSrv.post.getCall(0).args[1].items[1].role).to.eql('Editor');
- expect(backendSrv.post.getCall(0).args[1].items[1].permission).to.eql(1);
- expect(backendSrv.post.getCall(0).args[1].items[2].teamId).to.eql(2);
- expect(backendSrv.post.getCall(0).args[1].items[2].permission).to.eql(1);
- expect(backendSrv.post.getCall(0).args[1].items[3].userId).to.eql(2);
- expect(backendSrv.post.getCall(0).args[1].items[3].permission).to.eql(1);
- });
- });
-
- describe('when duplicate role permissions are added', () => {
- beforeEach(() => {
- backendSrv.get.reset();
- backendSrv.post.reset();
- ctx.ctrl.items = [];
-
- ctx.ctrl.newType = 'Editor';
- ctx.ctrl.typeChanged();
-
- ctx.ctrl.newType = 'Editor';
- ctx.ctrl.typeChanged();
- });
-
- it('should throw a validation error', () => {
- expect(ctx.ctrl.error).to.eql(ctx.ctrl.duplicateError);
- });
-
- it('should not add the duplicate permission', () => {
- expect(ctx.ctrl.items.length).to.eql(1);
- });
- });
-
- describe('when duplicate user permissions are added', () => {
- beforeEach(() => {
- backendSrv.get.reset();
- backendSrv.post.reset();
- ctx.ctrl.items = [];
-
- const userItem = {
- id: 2,
- login: 'user2',
- };
-
- ctx.ctrl.userPicked(userItem);
- ctx.ctrl.userPicked(userItem);
- });
-
- it('should throw a validation error', () => {
- expect(ctx.ctrl.error).to.eql(ctx.ctrl.duplicateError);
- });
-
- it('should not add the duplicate permission', () => {
- expect(ctx.ctrl.items.length).to.eql(1);
- });
- });
-
- describe('when duplicate team permissions are added', () => {
- beforeEach(() => {
- backendSrv.get.reset();
- backendSrv.post.reset();
- ctx.ctrl.items = [];
-
- const teamItem = {
- id: 2,
- name: 'ug1',
- };
-
- ctx.ctrl.groupPicked(teamItem);
- ctx.ctrl.groupPicked(teamItem);
- });
-
- it('should throw a validation error', () => {
- expect(ctx.ctrl.error).to.eql(ctx.ctrl.duplicateError);
- });
-
- it('should not add the duplicate permission', () => {
- expect(ctx.ctrl.items.length).to.eql(1);
- });
- });
-
- describe('when one inherited and one not inherited team permission are added', () => {
- beforeEach(() => {
- backendSrv.get.reset();
- backendSrv.post.reset();
- ctx.ctrl.items = [];
-
- const inheritedTeamItem = {
- id: 2,
- name: 'ug1',
- dashboardId: -1,
- };
-
- ctx.ctrl.items.push(inheritedTeamItem);
-
- const teamItem = {
- id: 2,
- name: 'ug1',
- };
- ctx.ctrl.groupPicked(teamItem);
- });
-
- it('should not throw a validation error', () => {
- expect(ctx.ctrl.error).to.eql('');
- });
-
- it('should add both permissions', () => {
- expect(ctx.ctrl.items.length).to.eql(2);
- });
- });
-});
diff --git a/public/app/features/dashboard/all.ts b/public/app/features/dashboard/all.ts
index fd79b7b1f03..f2e2e3dcdc0 100644
--- a/public/app/features/dashboard/all.ts
+++ b/public/app/features/dashboard/all.ts
@@ -23,7 +23,6 @@ import './repeat_option/repeat_option';
import './dashgrid/DashboardGridDirective';
import './dashgrid/PanelLoader';
import './dashgrid/RowOptions';
-import './acl/acl';
import './folder_picker/folder_picker';
import './move_to_folder_modal/move_to_folder';
import './settings/settings';
@@ -31,14 +30,12 @@ import './settings/settings';
import coreModule from 'app/core/core_module';
import { DashboardListCtrl } from './dashboard_list_ctrl';
import { FolderDashboardsCtrl } from './folder_dashboards_ctrl';
-import { FolderPermissionsCtrl } from './folder_permissions_ctrl';
import { FolderSettingsCtrl } from './folder_settings_ctrl';
import { DashboardImportCtrl } from './dashboard_import_ctrl';
import { CreateFolderCtrl } from './create_folder_ctrl';
coreModule.controller('DashboardListCtrl', DashboardListCtrl);
coreModule.controller('FolderDashboardsCtrl', FolderDashboardsCtrl);
-coreModule.controller('FolderPermissionsCtrl', FolderPermissionsCtrl);
coreModule.controller('FolderSettingsCtrl', FolderSettingsCtrl);
coreModule.controller('DashboardImportCtrl', DashboardImportCtrl);
coreModule.controller('CreateFolderCtrl', CreateFolderCtrl);
diff --git a/public/app/features/dashboard/create_folder_ctrl.ts b/public/app/features/dashboard/create_folder_ctrl.ts
index 414054232c2..4b74d290e34 100644
--- a/public/app/features/dashboard/create_folder_ctrl.ts
+++ b/public/app/features/dashboard/create_folder_ctrl.ts
@@ -1,4 +1,5 @@
import appEvents from 'app/core/app_events';
+import locationUtil from 'app/core/utils/location_util';
export class CreateFolderCtrl {
title = '';
@@ -19,9 +20,7 @@ export class CreateFolderCtrl {
return this.backendSrv.createDashboardFolder(this.title).then(result => {
appEvents.emit('alert-success', ['Folder Created', 'OK']);
-
- var folderUrl = `dashboards/folder/${result.dashboard.id}/${result.meta.slug}`;
- this.$location.url(folderUrl);
+ this.$location.url(locationUtil.stripBaseFromUrl(result.meta.url));
});
}
@@ -29,7 +28,7 @@ export class CreateFolderCtrl {
this.titleTouched = true;
this.validationSrv
- .validateNewDashboardOrFolderName(this.title)
+ .validateNewFolderName(this.title)
.then(() => {
this.hasValidationError = false;
})
diff --git a/public/app/features/dashboard/dashboard_import_ctrl.ts b/public/app/features/dashboard/dashboard_import_ctrl.ts
index 86fe12eab8a..c3af0a51a19 100644
--- a/public/app/features/dashboard/dashboard_import_ctrl.ts
+++ b/public/app/features/dashboard/dashboard_import_ctrl.ts
@@ -93,7 +93,7 @@ export class DashboardImportCtrl {
this.nameExists = false;
this.validationSrv
- .validateNewDashboardOrFolderName(this.dash.title)
+ .validateNewDashboardName(0, this.dash.title)
.then(() => {
this.hasNameValidationError = false;
})
diff --git a/public/app/features/dashboard/dashboard_loader_srv.ts b/public/app/features/dashboard/dashboard_loader_srv.ts
index e4def4385e1..9e458c4e4bb 100644
--- a/public/app/features/dashboard/dashboard_loader_srv.ts
+++ b/public/app/features/dashboard/dashboard_loader_srv.ts
@@ -35,18 +35,18 @@ export class DashboardLoaderSrv {
};
}
- loadDashboard(type, slug) {
+ loadDashboard(type, slug, uid) {
var promise;
if (type === 'script') {
promise = this._loadScriptedDashboard(slug);
} else if (type === 'snapshot') {
- promise = this.backendSrv.get('/api/snapshots/' + this.$routeParams.slug).catch(() => {
+ promise = this.backendSrv.get('/api/snapshots/' + slug).catch(() => {
return this._dashboardLoadFailed('Snapshot not found', true);
});
} else {
promise = this.backendSrv
- .getDashboard(this.$routeParams.type, this.$routeParams.slug)
+ .getDashboardByUid(uid)
.then(result => {
if (result.meta.isFolder) {
this.$rootScope.appEvent('alert-error', ['Dashboard not found']);
diff --git a/public/app/features/dashboard/dashboard_model.ts b/public/app/features/dashboard/dashboard_model.ts
index 072b38fba22..055b59065ae 100644
--- a/public/app/features/dashboard/dashboard_model.ts
+++ b/public/app/features/dashboard/dashboard_model.ts
@@ -12,6 +12,7 @@ import { DashboardMigrator } from './dashboard_migration';
export class DashboardModel {
id: any;
+ uid: any;
title: any;
autoUpdate: any;
description: any;
@@ -56,6 +57,7 @@ export class DashboardModel {
this.events = new Emitter();
this.id = data.id || null;
+ this.uid = data.uid || null;
this.revision = data.revision;
this.title = data.title || 'No Title';
this.autoUpdate = data.autoUpdate;
@@ -279,6 +281,40 @@ export class DashboardModel {
this.events.emit('repeats-processed');
}
+ cleanUpRowRepeats(rowPanels) {
+ let panelsToRemove = [];
+ for (let i = 0; i < rowPanels.length; i++) {
+ let panel = rowPanels[i];
+ if (!panel.repeat && panel.repeatPanelId) {
+ panelsToRemove.push(panel);
+ }
+ }
+ _.pull(rowPanels, ...panelsToRemove);
+ _.pull(this.panels, ...panelsToRemove);
+ }
+
+ processRowRepeats(row: PanelModel) {
+ if (this.snapshot || this.templating.list.length === 0) {
+ return;
+ }
+
+ let rowPanels = row.panels;
+ if (!row.collapsed) {
+ let rowPanelIndex = _.findIndex(this.panels, p => p.id === row.id);
+ rowPanels = this.getRowPanels(rowPanelIndex);
+ }
+
+ this.cleanUpRowRepeats(rowPanels);
+
+ for (let i = 0; i < rowPanels.length; i++) {
+ let panel = rowPanels[i];
+ if (panel.repeat) {
+ let panelIndex = _.findIndex(this.panels, p => p.id === panel.id);
+ this.repeatPanel(panel, panelIndex);
+ }
+ }
+ }
+
getPanelRepeatClone(sourcePanel, valueIndex, sourcePanelIndex) {
// if first clone return source
if (valueIndex === 0) {
@@ -352,8 +388,10 @@ export class DashboardModel {
copy.scopedVars[variable.name] = option;
if (panel.repeatDirection === REPEAT_DIR_VERTICAL) {
+ if (index > 0) {
+ yPos += copy.gridPos.h;
+ }
copy.gridPos.y = yPos;
- yPos += copy.gridPos.h;
} else {
// set width based on how many are selected
// assumed the repeated panels should take up full row width
@@ -370,6 +408,15 @@ export class DashboardModel {
}
}
}
+
+ // Update gridPos for panels below
+ let yOffset = yPos - panel.gridPos.y;
+ if (yOffset > 0) {
+ let panelBelowIndex = panelIndex + selectedOptions.length;
+ for (let i = panelBelowIndex; i < this.panels.length; i++) {
+ this.panels[i].gridPos.y += yOffset;
+ }
+ }
}
repeatRow(panel: PanelModel, panelIndex: number, variable) {
@@ -558,6 +605,7 @@ export class DashboardModel {
if (row.collapsed) {
row.collapsed = false;
+ let hasRepeat = _.some(row.panels, p => p.repeat);
if (row.panels.length > 0) {
// Use first panel to figure out if it was moved or pushed
@@ -588,6 +636,10 @@ export class DashboardModel {
}
row.panels = [];
+
+ if (hasRepeat) {
+ this.processRowRepeats(row);
+ }
}
// sort panels
diff --git a/public/app/features/dashboard/dashboard_srv.ts b/public/app/features/dashboard/dashboard_srv.ts
index 708ba047d2b..8d00dc4fc60 100644
--- a/public/app/features/dashboard/dashboard_srv.ts
+++ b/public/app/features/dashboard/dashboard_srv.ts
@@ -1,5 +1,6 @@
import coreModule from 'app/core/core_module';
import { DashboardModel } from './dashboard_model';
+import locationUtil from 'app/core/utils/location_util';
export class DashboardSrv {
dash: any;
@@ -73,9 +74,8 @@ export class DashboardSrv {
postSave(clone, data) {
this.dash.version = data.version;
- var dashboardUrl = '/dashboard/db/' + data.slug;
- if (dashboardUrl !== this.$location.path()) {
- this.$location.url(dashboardUrl);
+ if (data.url !== this.$location.path()) {
+ this.$location.url(locationUtil.stripBaseFromUrl(data.url)).replace();
}
this.$rootScope.appEvent('dashboard-saved', this.dash);
@@ -86,7 +86,7 @@ export class DashboardSrv {
save(clone, options) {
options = options || {};
- options.folderId = options.folderId || this.dash.meta.folderId;
+ options.folderId = options.folderId || this.dash.meta.folderId || clone.folderId;
return this.backendSrv
.saveDashboard(clone, options)
diff --git a/public/app/features/dashboard/dashgrid/AddPanelPanel.tsx b/public/app/features/dashboard/dashgrid/AddPanelPanel.tsx
index 01d16436a45..aeb840c317a 100644
--- a/public/app/features/dashboard/dashgrid/AddPanelPanel.tsx
+++ b/public/app/features/dashboard/dashgrid/AddPanelPanel.tsx
@@ -93,7 +93,6 @@ export class AddPanelPanel extends React.Component
-
-
-
-- - Permissions -
- - - - -
-
\ No newline at end of file
+
-
diff --git a/public/app/features/dashboard/save_as_modal.ts b/public/app/features/dashboard/save_as_modal.ts
index 04b029cbb4c..15a3ce5dba7 100644
--- a/public/app/features/dashboard/save_as_modal.ts
+++ b/public/app/features/dashboard/save_as_modal.ts
@@ -46,6 +46,7 @@ export class SaveDashboardAsModalCtrl {
var dashboard = this.dashboardSrv.getCurrent();
this.clone = dashboard.getSaveModelClone();
this.clone.id = null;
+ this.clone.uid = '';
this.clone.title += ' Copy';
this.clone.editable = true;
this.clone.hideControls = false;
diff --git a/public/app/features/dashboard/settings/settings.html b/public/app/features/dashboard/settings/settings.html
index 951288347d2..5103fab8b75 100644
--- a/public/app/features/dashboard/settings/settings.html
+++ b/public/app/features/dashboard/settings/settings.html
@@ -95,6 +95,17 @@
- Coming soon! Permissions will be added in Grafana 5.0 beta. -
+
+
+
+
+You have changed folder, please save to view permissions.
+Settings view not found
diff --git a/public/app/features/dashboard/settings/settings.ts b/public/app/features/dashboard/settings/settings.ts index 4f678713ffc..e9d5c6180be 100755 --- a/public/app/features/dashboard/settings/settings.ts +++ b/public/app/features/dashboard/settings/settings.ts @@ -14,6 +14,7 @@ export class SettingsCtrl { canSave: boolean; canDelete: boolean; sections: any[]; + hasUnsavedFolderChange: boolean; /** @ngInject */ constructor(private $scope, private $location, private $rootScope, private backendSrv, private dashboardSrv) { @@ -24,6 +25,9 @@ export class SettingsCtrl { this.$scope.$on('$destroy', () => { this.dashboard.updateSubmenuVisibility(); this.$rootScope.$broadcast('refresh'); + setTimeout(() => { + this.$rootScope.appEvent('dash-scroll', { restore: true }); + }); }); this.canSaveAs = contextSrv.isEditor; @@ -33,7 +37,9 @@ export class SettingsCtrl { this.buildSectionList(); this.onRouteUpdated(); - $rootScope.onAppEvent('$routeUpdate', this.onRouteUpdated.bind(this), $scope); + this.$rootScope.onAppEvent('$routeUpdate', this.onRouteUpdated.bind(this), $scope); + this.$rootScope.appEvent('dash-scroll', { animate: false, pos: 0 }); + this.$rootScope.onAppEvent('dashboard-saved', this.onPostSave.bind(this), $scope); } buildSectionList() { @@ -70,6 +76,14 @@ export class SettingsCtrl { }); } + if (this.dashboard.id && this.dashboard.meta.canAdmin) { + this.sections.push({ + title: 'Permissions', + id: 'permissions', + icon: 'fa fa-fw fa-lock', + }); + } + if (this.dashboard.meta.canMakeEditable) { this.sections.push({ title: 'General', @@ -123,6 +137,10 @@ export class SettingsCtrl { this.dashboardSrv.saveDashboard(); } + onPostSave() { + this.hasUnsavedFolderChange = false; + } + hideSettings() { var urlParams = this.$location.search(); delete urlParams.editview; @@ -174,7 +192,7 @@ export class SettingsCtrl { } deleteDashboardConfirmed() { - this.backendSrv.deleteDashboard(this.dashboard.meta.slug).then(() => { + this.backendSrv.deleteDashboard(this.dashboard.uid).then(() => { appEvents.emit('alert-success', ['Dashboard Deleted', this.dashboard.title + ' has been deleted']); this.$location.url('/'); }); @@ -183,6 +201,15 @@ export class SettingsCtrl { onFolderChange(folder) { this.dashboard.meta.folderId = folder.id; this.dashboard.meta.folderTitle = folder.title; + this.hasUnsavedFolderChange = true; + } + + getFolder() { + return { + id: this.dashboard.meta.folderId, + title: this.dashboard.meta.folderTitle, + url: this.dashboard.meta.folderUrl, + }; } } diff --git a/public/app/features/dashboard/shareModalCtrl.ts b/public/app/features/dashboard/shareModalCtrl.ts index 508658cd53b..8e30eaef91e 100644 --- a/public/app/features/dashboard/shareModalCtrl.ts +++ b/public/app/features/dashboard/shareModalCtrl.ts @@ -74,6 +74,7 @@ export class ShareModalCtrl { $scope.shareUrl = linkSrv.addParamsToUrl(baseUrl, params); var soloUrl = baseUrl.replace(config.appSubUrl + '/dashboard/', config.appSubUrl + '/dashboard-solo/'); + soloUrl = soloUrl.replace(config.appSubUrl + '/d/', config.appSubUrl + '/d-solo/'); delete params.fullscreen; delete params.edit; soloUrl = linkSrv.addParamsToUrl(soloUrl, params); @@ -84,6 +85,7 @@ export class ShareModalCtrl { config.appSubUrl + '/dashboard-solo/', config.appSubUrl + '/render/dashboard-solo/' ); + $scope.imageUrl = $scope.imageUrl.replace(config.appSubUrl + '/d-solo/', config.appSubUrl + '/render/d-solo/'); $scope.imageUrl += '&width=1000'; $scope.imageUrl += '&height=500'; $scope.imageUrl += '&tz=UTC' + encodeURIComponent(moment().format('Z')); diff --git a/public/app/features/dashboard/specs/dashboard_import_ctrl.jest.ts b/public/app/features/dashboard/specs/dashboard_import_ctrl.jest.ts index 739485b235d..3d311b8b4f8 100644 --- a/public/app/features/dashboard/specs/dashboard_import_ctrl.jest.ts +++ b/public/app/features/dashboard/specs/dashboard_import_ctrl.jest.ts @@ -19,7 +19,7 @@ describe('DashboardImportCtrl', function() { }; validationSrv = { - validateNewDashboardOrFolderName: jest.fn().mockReturnValue(Promise.resolve()), + validateNewDashboardName: jest.fn().mockReturnValue(Promise.resolve()), }; ctx.ctrl = new DashboardImportCtrl(backendSrv, validationSrv, navModelSrv, {}, {}, {}); diff --git a/public/app/features/dashboard/specs/repeat.jest.ts b/public/app/features/dashboard/specs/repeat.jest.ts index fbf1f836191..868db3b7246 100644 --- a/public/app/features/dashboard/specs/repeat.jest.ts +++ b/public/app/features/dashboard/specs/repeat.jest.ts @@ -4,6 +4,57 @@ import { expect } from 'test/lib/common'; jest.mock('app/core/services/context_srv', () => ({})); +describe('given dashboard with panel repeat', function() { + var dashboard; + + beforeEach(function() { + let dashboardJSON = { + panels: [ + { id: 1, type: 'row', gridPos: { x: 0, y: 0, h: 1, w: 24 } }, + { id: 2, repeat: 'apps', repeatDirection: 'h', gridPos: { x: 0, y: 1, h: 2, w: 8 } }, + ], + templating: { + list: [ + { + name: 'apps', + current: { + text: 'se1, se2, se3', + value: ['se1', 'se2', 'se3'], + }, + options: [ + { text: 'se1', value: 'se1', selected: true }, + { text: 'se2', value: 'se2', selected: true }, + { text: 'se3', value: 'se3', selected: true }, + { text: 'se4', value: 'se4', selected: false }, + ], + }, + ], + }, + }; + dashboard = new DashboardModel(dashboardJSON); + dashboard.processRepeats(); + }); + + it('should repeat panels when row is expanding', function() { + expect(dashboard.panels.length).toBe(4); + + // toggle row + dashboard.toggleRow(dashboard.panels[0]); + expect(dashboard.panels.length).toBe(1); + + // change variable + dashboard.templating.list[0].options[2].selected = false; + dashboard.templating.list[0].current = { + text: 'se1, se2', + value: ['se1', 'se2'], + }; + + // toggle row back + dashboard.toggleRow(dashboard.panels[0]); + expect(dashboard.panels.length).toBe(3); + }); +}); + describe('given dashboard with panel repeat in horizontal direction', function() { var dashboard; @@ -142,12 +193,9 @@ describe('given dashboard with panel repeat in vertical direction', function() { beforeEach(function() { dashboard = new DashboardModel({ panels: [ - { - id: 2, - repeat: 'apps', - repeatDirection: 'v', - gridPos: { x: 5, y: 0, h: 2, w: 8 }, - }, + { id: 1, type: 'row', gridPos: { x: 0, y: 0, h: 1, w: 24 } }, + { id: 2, repeat: 'apps', repeatDirection: 'v', gridPos: { x: 5, y: 1, h: 2, w: 8 } }, + { id: 3, type: 'row', gridPos: { x: 0, y: 3, h: 1, w: 24 } }, ], templating: { list: [ @@ -171,24 +219,95 @@ describe('given dashboard with panel repeat in vertical direction', function() { }); it('should place on items on top of each other and keep witdh', function() { - expect(dashboard.panels[0].gridPos).toMatchObject({ - x: 5, - y: 0, - h: 2, - w: 8, - }); - expect(dashboard.panels[1].gridPos).toMatchObject({ - x: 5, - y: 2, - h: 2, - w: 8, - }); - expect(dashboard.panels[2].gridPos).toMatchObject({ - x: 5, - y: 4, - h: 2, - w: 8, - }); + expect(dashboard.panels[0].gridPos).toMatchObject({ x: 0, y: 0, h: 1, w: 24 }); // first row + + expect(dashboard.panels[1].gridPos).toMatchObject({ x: 5, y: 1, h: 2, w: 8 }); + expect(dashboard.panels[2].gridPos).toMatchObject({ x: 5, y: 3, h: 2, w: 8 }); + expect(dashboard.panels[3].gridPos).toMatchObject({ x: 5, y: 5, h: 2, w: 8 }); + + expect(dashboard.panels[4].gridPos).toMatchObject({ x: 0, y: 7, h: 1, w: 24 }); // last row + }); +}); + +describe('given dashboard with row repeat and panel repeat in horizontal direction', () => { + let dashboard, dashboardJSON; + + beforeEach(() => { + dashboardJSON = { + panels: [ + { id: 1, type: 'row', repeat: 'region', gridPos: { x: 0, y: 0, h: 1, w: 24 } }, + { id: 2, type: 'graph', repeat: 'app', gridPos: { x: 0, y: 1, h: 2, w: 6 } }, + ], + templating: { + list: [ + { + name: 'region', + current: { + text: 'reg1, reg2', + value: ['reg1', 'reg2'], + }, + options: [{ text: 'reg1', value: 'reg1', selected: true }, { text: 'reg2', value: 'reg2', selected: true }], + }, + { + name: 'app', + current: { + text: 'se1, se2, se3, se4, se5, se6', + value: ['se1', 'se2', 'se3', 'se4', 'se5', 'se6'], + }, + options: [ + { text: 'se1', value: 'se1', selected: true }, + { text: 'se2', value: 'se2', selected: true }, + { text: 'se3', value: 'se3', selected: true }, + { text: 'se4', value: 'se4', selected: true }, + { text: 'se5', value: 'se5', selected: true }, + { text: 'se6', value: 'se6', selected: true }, + ], + }, + ], + }, + }; + dashboard = new DashboardModel(dashboardJSON); + dashboard.processRepeats(false); + }); + + it('should panels in self row', () => { + const panel_types = _.map(dashboard.panels, 'type'); + expect(panel_types).toEqual([ + 'row', + 'graph', + 'graph', + 'graph', + 'graph', + 'graph', + 'graph', + 'row', + 'graph', + 'graph', + 'graph', + 'graph', + 'graph', + 'graph', + ]); + }); + + it('should be placed in their places', function() { + expect(dashboard.panels[0].gridPos).toMatchObject({ x: 0, y: 0, h: 1, w: 24 }); // 1st row + + expect(dashboard.panels[1].gridPos).toMatchObject({ x: 0, y: 1, h: 2, w: 6 }); + expect(dashboard.panels[2].gridPos).toMatchObject({ x: 6, y: 1, h: 2, w: 6 }); + expect(dashboard.panels[3].gridPos).toMatchObject({ x: 12, y: 1, h: 2, w: 6 }); + expect(dashboard.panels[4].gridPos).toMatchObject({ x: 18, y: 1, h: 2, w: 6 }); + expect(dashboard.panels[5].gridPos).toMatchObject({ x: 0, y: 3, h: 2, w: 6 }); // next row + expect(dashboard.panels[6].gridPos).toMatchObject({ x: 6, y: 3, h: 2, w: 6 }); + + expect(dashboard.panels[7].gridPos).toMatchObject({ x: 0, y: 5, h: 1, w: 24 }); + + expect(dashboard.panels[8].gridPos).toMatchObject({ x: 0, y: 6, h: 2, w: 6 }); // 2nd row + expect(dashboard.panels[9].gridPos).toMatchObject({ x: 6, y: 6, h: 2, w: 6 }); + expect(dashboard.panels[10].gridPos).toMatchObject({ x: 12, y: 6, h: 2, w: 6 }); + expect(dashboard.panels[11].gridPos).toMatchObject({ x: 18, y: 6, h: 2, w: 6 }); // next row + expect(dashboard.panels[12].gridPos).toMatchObject({ x: 0, y: 8, h: 2, w: 6 }); + expect(dashboard.panels[13].gridPos).toMatchObject({ x: 6, y: 8, h: 2, w: 6 }); }); }); @@ -510,4 +629,23 @@ describe('given dashboard with row and panel repeat', () => { region: { text: 'reg2', value: 'reg2' }, }); }); + + it('should repeat panels when row is expanding', function() { + dashboard = new DashboardModel(dashboardJSON); + dashboard.processRepeats(); + + expect(dashboard.panels.length).toBe(6); + + // toggle row + dashboard.toggleRow(dashboard.panels[0]); + dashboard.toggleRow(dashboard.panels[1]); + expect(dashboard.panels.length).toBe(2); + + // change variable + dashboard.templating.list[1].current.value = ['se1', 'se2', 'se3']; + + // toggle row back + dashboard.toggleRow(dashboard.panels[1]); + expect(dashboard.panels.length).toBe(4); + }); }); diff --git a/public/app/features/dashboard/specs/share_modal_ctrl_specs.ts b/public/app/features/dashboard/specs/share_modal_ctrl_specs.ts index 8bf8f53ed46..fc70a54a41c 100644 --- a/public/app/features/dashboard/specs/share_modal_ctrl_specs.ts +++ b/public/app/features/dashboard/specs/share_modal_ctrl_specs.ts @@ -43,12 +43,23 @@ describe('ShareModalCtrl', function() { }); it('should generate render url', function() { - ctx.$location.$$absUrl = 'http://dashboards.grafana.com/dashboard/db/my-dash'; + ctx.$location.$$absUrl = 'http://dashboards.grafana.com/d/abcdefghi/my-dash'; ctx.scope.panel = { id: 22 }; ctx.scope.init(); - var base = 'http://dashboards.grafana.com/render/dashboard-solo/db/my-dash'; + var base = 'http://dashboards.grafana.com/render/d-solo/abcdefghi/my-dash'; + var params = '?from=1000&to=2000&orgId=1&panelId=22&width=1000&height=500&tz=UTC'; + expect(ctx.scope.imageUrl).to.contain(base + params); + }); + + it('should generate render url for scripted dashboard', function() { + ctx.$location.$$absUrl = 'http://dashboards.grafana.com/dashboard/script/my-dash.js'; + + ctx.scope.panel = { id: 22 }; + + ctx.scope.init(); + var base = 'http://dashboards.grafana.com/render/dashboard-solo/script/my-dash.js'; var params = '?from=1000&to=2000&orgId=1&panelId=22&width=1000&height=500&tz=UTC'; expect(ctx.scope.imageUrl).to.contain(base + params); }); diff --git a/public/app/features/dashboard/validation_srv.ts b/public/app/features/dashboard/validation_srv.ts index e70bb0c426d..817be7ca0e3 100644 --- a/public/app/features/dashboard/validation_srv.ts +++ b/public/app/features/dashboard/validation_srv.ts @@ -1,13 +1,27 @@ import coreModule from 'app/core/core_module'; +const hitTypes = { + FOLDER: 'dash-folder', + DASHBOARD: 'dash-db', +}; + export class ValidationSrv { - rootName = 'root'; + rootName = 'general'; /** @ngInject */ constructor(private $q, private backendSrv) {} - validateNewDashboardOrFolderName(name) { + validateNewDashboardName(folderId, name) { + return this.validate(folderId, name, 'A dashboard in this folder with the same name already exists'); + } + + validateNewFolderName(name) { + return this.validate(0, name, 'A folder or dashboard in the general folder with the same name already exists'); + } + + private validate(folderId, name, existingErrorMessage) { name = (name || '').trim(); + const nameLowerCased = name.toLowerCase(); if (name.length === 0) { return this.$q.reject({ @@ -16,21 +30,35 @@ export class ValidationSrv { }); } - if (name.toLowerCase() === this.rootName) { + if (folderId === 0 && nameLowerCased === this.rootName) { return this.$q.reject({ type: 'EXISTING', - message: 'A folder or dashboard with the same name already exists', + message: 'This is a reserved name and cannot be used for a folder.', }); } let deferred = this.$q.defer(); - this.backendSrv.search({ query: name }).then(res => { - for (let hit of res) { - if (name.toLowerCase() === hit.title.toLowerCase()) { + const promises = []; + promises.push(this.backendSrv.search({ type: hitTypes.FOLDER, folderIds: [folderId], query: name })); + promises.push(this.backendSrv.search({ type: hitTypes.DASHBOARD, folderIds: [folderId], query: name })); + + this.$q.all(promises).then(res => { + let hits = []; + + if (res.length > 0 && res[0].length > 0) { + hits = res[0]; + } + + if (res.length > 1 && res[1].length > 0) { + hits = hits.concat(res[1]); + } + + for (let hit of hits) { + if (nameLowerCased === hit.title.toLowerCase()) { deferred.reject({ type: 'EXISTING', - message: 'A folder or dashboard with the same name already exists', + message: existingErrorMessage, }); break; } diff --git a/public/app/features/dashboard/view_state_srv.ts b/public/app/features/dashboard/view_state_srv.ts index 1699f48510f..148f64beab0 100644 --- a/public/app/features/dashboard/view_state_srv.ts +++ b/public/app/features/dashboard/view_state_srv.ts @@ -150,6 +150,7 @@ export class DashboardViewState { this.dashboard.setViewMode(ctrl.panel, false, false); this.$scope.appEvent('panel-fullscreen-exit', { panelId: ctrl.panel.id }); + this.$scope.appEvent('dash-scroll', { restore: true }); if (!render) { return false; @@ -177,6 +178,7 @@ export class DashboardViewState { this.dashboard.setViewMode(ctrl.panel, true, ctrl.editMode); this.$scope.appEvent('panel-fullscreen-enter', { panelId: ctrl.panel.id }); + this.$scope.appEvent('dash-scroll', { animate: false, pos: 0 }); } registerPanel(panelScope) { diff --git a/public/app/features/dashlinks/editor.html b/public/app/features/dashlinks/editor.html index f6c6552e6bb..826b7aac57f 100644 --- a/public/app/features/dashlinks/editor.html +++ b/public/app/features/dashlinks/editor.html @@ -17,7 +17,7 @@What are Dashboard Links?
- Dashboad Links allow you to place links to other dashboards and web sites directly in below the dashboard header. + Dashboard Links allow you to place links to other dashboards and web sites directly in below the dashboard header.
+
+
diff --git a/public/app/features/plugins/partials/ds_edit.html b/public/app/features/plugins/partials/ds_edit.html
index 69a649b132b..f0bb8867f83 100644
--- a/public/app/features/plugins/partials/ds_edit.html
+++ b/public/app/features/plugins/partials/ds_edit.html
@@ -8,9 +8,6 @@