Compare commits

...

2 Commits

Author SHA1 Message Date
Bruno
c47b921ef4 Cloud migrations: disable flaky test (#93921)
* Cloud migrations: disable flaky test

* Update pkg/services/cloudmigration/cloudmigrationimpl/xorm_store_test.go

Co-authored-by: Kevin Minehart <5140827+kminehart@users.noreply.github.com>

---------

Co-authored-by: Kevin Minehart <5140827+kminehart@users.noreply.github.com>
2024-09-27 10:40:42 -06:00
github-actions[bot]
279333860f apply security patch: v11.2.x/0001-Alerting-Fix-permission-on-external-rule-write-endpo.patch
commit a2c5ee91899ce8934453e5f8b933a9ad4fa8f7f1
Author: Alex Weaver <weaver.alex.d@gmail.com>
Date:   Thu Aug 22 11:52:43 2024 -0500

    Alerting: Fix permission on external rule write endpoint
2024-09-27 09:42:47 +00:00
2 changed files with 2 additions and 2 deletions

View File

@@ -283,7 +283,7 @@ func Test_SnapshotResources(t *testing.T) {
}
func TestGetSnapshotList(t *testing.T) {
t.Parallel()
t.Skip("FLAKY test: disabled until fixed")
_, s := setUpTest(t)
// Taken from setUpTest

View File

@@ -112,7 +112,7 @@ func (api *API) authorize(method, path string) web.Handler {
case http.MethodGet + "/api/ruler/{DatasourceUID}/api/v1/rules":
eval = ac.EvalPermission(ac.ActionAlertingRuleExternalRead, datasources.ScopeProvider.GetResourceScopeUID(ac.Parameter(":DatasourceUID")))
case http.MethodPost + "/api/ruler/{DatasourceUID}/api/v1/rules/{Namespace}":
eval = ac.EvalPermission(ac.ActionAlertingInstancesExternalWrite, datasources.ScopeProvider.GetResourceScopeUID(ac.Parameter(":DatasourceUID")))
eval = ac.EvalPermission(ac.ActionAlertingRuleExternalWrite, datasources.ScopeProvider.GetResourceScopeUID(ac.Parameter(":DatasourceUID")))
// Lotex Prometheus-compatible Paths
case http.MethodGet + "/api/prometheus/{DatasourceUID}/api/v1/rules":