From ed11c32c1dbeb7da9f9d525ebe2f7a0501dd9899 Mon Sep 17 00:00:00 2001 From: Ieva Date: Thu, 9 Mar 2023 16:43:18 +0000 Subject: [PATCH] Support bundles: fix user collector permissions and format collector output (#64531) * fix user collector permissions and format collector output * lint --- pkg/infra/usagestats/service/service.go | 2 +- .../supportbundles/supportbundlesimpl/service_bundle.go | 2 +- pkg/services/user/userimpl/user.go | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkg/infra/usagestats/service/service.go b/pkg/infra/usagestats/service/service.go index 9c024b253cb..4097eb20da1 100644 --- a/pkg/infra/usagestats/service/service.go +++ b/pkg/infra/usagestats/service/service.go @@ -137,7 +137,7 @@ func (uss *UsageStats) supportBundleCollector() supportbundles.Collector { return nil, err } - data, err := json.Marshal(report) + data, err := json.MarshalIndent(report, "", " ") if err != nil { return nil, err } diff --git a/pkg/services/supportbundles/supportbundlesimpl/service_bundle.go b/pkg/services/supportbundles/supportbundlesimpl/service_bundle.go index 903b7bc6097..fa98f1a3f43 100644 --- a/pkg/services/supportbundles/supportbundlesimpl/service_bundle.go +++ b/pkg/services/supportbundles/supportbundlesimpl/service_bundle.go @@ -79,7 +79,7 @@ func (s *Service) bundle(ctx context.Context, collectors []string, uid string) ( } item, err := collector.Fn(ctx) if err != nil { - s.log.Warn("Failed to collect support bundle item", "error", err) + s.log.Warn("Failed to collect support bundle item", "error", err, "collector", collector.UID) } // write item to file diff --git a/pkg/services/user/userimpl/user.go b/pkg/services/user/userimpl/user.go index c4146c6c8c0..9be2516aa7b 100644 --- a/pkg/services/user/userimpl/user.go +++ b/pkg/services/user/userimpl/user.go @@ -419,7 +419,9 @@ func (s *Service) supportBundleCollector() supportbundles.Collector { Login: "sa-supportbundle", OrgRole: "Admin", IsGrafanaAdmin: true, - IsServiceAccount: true}, + IsServiceAccount: true, + Permissions: map[int64]map[string][]string{ac.GlobalOrgID: {ac.ActionUsersRead: {ac.ScopeGlobalUsersAll}}}, + }, OrgID: 0, Query: "", Page: 0, @@ -433,7 +435,7 @@ func (s *Service) supportBundleCollector() supportbundles.Collector { return nil, err } - userBytes, err := json.Marshal(res.Users) + userBytes, err := json.MarshalIndent(res.Users, "", " ") if err != nil { return nil, err }