mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
alerting: show alerts for user with Viewer role
changelog: add notes about closing #11167 remove changelog note reformat alert_test.go
This commit is contained in:
parent
f5cf926364
commit
13c6f37ea5
@ -79,7 +79,7 @@ func GetAlerts(c *m.ReqContext) Response {
|
|||||||
DashboardIds: dashboardIDs,
|
DashboardIds: dashboardIDs,
|
||||||
Type: string(search.DashHitDB),
|
Type: string(search.DashHitDB),
|
||||||
FolderIds: folderIDs,
|
FolderIds: folderIDs,
|
||||||
Permission: m.PERMISSION_EDIT,
|
Permission: m.PERMISSION_VIEW,
|
||||||
}
|
}
|
||||||
|
|
||||||
err := bus.Dispatch(&searchQuery)
|
err := bus.Dispatch(&searchQuery)
|
||||||
|
@ -116,7 +116,7 @@ func HandleAlertsQuery(query *m.GetAlertsQuery) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if query.User.OrgRole != m.ROLE_ADMIN {
|
if query.User.OrgRole != m.ROLE_ADMIN {
|
||||||
builder.writeDashboardPermissionFilter(query.User, m.PERMISSION_EDIT)
|
builder.writeDashboardPermissionFilter(query.User, m.PERMISSION_VIEW)
|
||||||
}
|
}
|
||||||
|
|
||||||
builder.Write(" ORDER BY name ASC")
|
builder.Write(" ORDER BY name ASC")
|
||||||
|
@ -2,7 +2,6 @@ package sqlstore
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/grafana/grafana/pkg/components/simplejson"
|
"github.com/grafana/grafana/pkg/components/simplejson"
|
||||||
@ -110,11 +109,12 @@ func TestAlertingDataAccess(t *testing.T) {
|
|||||||
})
|
})
|
||||||
|
|
||||||
Convey("Viewer cannot read alerts", func() {
|
Convey("Viewer cannot read alerts", func() {
|
||||||
alertQuery := m.GetAlertsQuery{DashboardIDs: []int64{testDash.Id}, PanelId: 1, OrgId: 1, User: &m.SignedInUser{OrgRole: m.ROLE_VIEWER}}
|
viewerUser := &m.SignedInUser{OrgRole: m.ROLE_VIEWER, OrgId: 1}
|
||||||
|
alertQuery := m.GetAlertsQuery{DashboardIDs: []int64{testDash.Id}, PanelId: 1, OrgId: 1, User: viewerUser}
|
||||||
err2 := HandleAlertsQuery(&alertQuery)
|
err2 := HandleAlertsQuery(&alertQuery)
|
||||||
|
|
||||||
So(err2, ShouldBeNil)
|
So(err2, ShouldBeNil)
|
||||||
So(alertQuery.Result, ShouldHaveLength, 0)
|
So(alertQuery.Result, ShouldHaveLength, 1)
|
||||||
})
|
})
|
||||||
|
|
||||||
Convey("Alerts with same dashboard id and panel id should update", func() {
|
Convey("Alerts with same dashboard id and panel id should update", func() {
|
||||||
|
Loading…
Reference in New Issue
Block a user