From 7a9793ec0e56bda2a161af3d8660d204c0b0bec3 Mon Sep 17 00:00:00 2001
From: Jo <joao.guerreiro@grafana.com>
Date: Fri, 20 Jan 2023 16:33:29 +0000
Subject: [PATCH] SupportBundles: Fix collector typos and change defaults
 (#61850)

fix collector typos and change defaults
---
 .../supportbundles/supportbundlesimpl/collectors.go         | 6 +++---
 .../supportbundles/supportbundlesimpl/db_collector.go       | 2 +-
 .../supportbundles/supportbundlesimpl/user_collector.go     | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkg/services/supportbundles/supportbundlesimpl/collectors.go b/pkg/services/supportbundles/supportbundlesimpl/collectors.go
index ce384e73154..fa39c0e0352 100644
--- a/pkg/services/supportbundles/supportbundlesimpl/collectors.go
+++ b/pkg/services/supportbundles/supportbundlesimpl/collectors.go
@@ -86,7 +86,7 @@ func settingsCollector(settings setting.Provider) supportbundles.Collector {
 	return supportbundles.Collector{
 		UID:               "settings",
 		DisplayName:       "Settings",
-		Description:       "Settings for grafana instance",
+		Description:       "Settings of the Grafana instance",
 		IncludedByDefault: false,
 		Default:           true,
 		Fn: func(ctx context.Context) (*supportbundles.SupportItem, error) {
@@ -108,7 +108,7 @@ func usageStatesCollector(stats usagestats.Service) supportbundles.Collector {
 	return supportbundles.Collector{
 		UID:               "usage-stats",
 		DisplayName:       "Usage statistics",
-		Description:       "Usage statistic for grafana instance",
+		Description:       "Usage statistics of the Grafana instance",
 		IncludedByDefault: false,
 		Default:           true,
 		Fn: func(ctx context.Context) (*supportbundles.SupportItem, error) {
@@ -133,7 +133,7 @@ func pluginInfoCollector(pluginStore plugins.Store, pluginSettings pluginsetting
 	return supportbundles.Collector{
 		UID:               "plugins",
 		DisplayName:       "Plugin information",
-		Description:       "Plugin information for grafana instance",
+		Description:       "Plugin information for the Grafana instance",
 		IncludedByDefault: false,
 		Default:           true,
 		Fn: func(ctx context.Context) (*supportbundles.SupportItem, error) {
diff --git a/pkg/services/supportbundles/supportbundlesimpl/db_collector.go b/pkg/services/supportbundles/supportbundlesimpl/db_collector.go
index f4caa6e799d..5eb56faa715 100644
--- a/pkg/services/supportbundles/supportbundlesimpl/db_collector.go
+++ b/pkg/services/supportbundles/supportbundlesimpl/db_collector.go
@@ -67,7 +67,7 @@ func dbCollector(sql db.DB) supportbundles.Collector {
 	return supportbundles.Collector{
 		UID:               "db",
 		Description:       "Database information and migration log",
-		DisplayName:       "Database and Migration information",
+		DisplayName:       "Database and migration information",
 		IncludedByDefault: false,
 		Default:           true,
 		Fn:                collectorFn,
diff --git a/pkg/services/supportbundles/supportbundlesimpl/user_collector.go b/pkg/services/supportbundles/supportbundlesimpl/user_collector.go
index 5fd22a7f9f6..84309b0ba35 100644
--- a/pkg/services/supportbundles/supportbundlesimpl/user_collector.go
+++ b/pkg/services/supportbundles/supportbundlesimpl/user_collector.go
@@ -38,10 +38,10 @@ func userCollector(users user.Service) supportbundles.Collector {
 
 	return supportbundles.Collector{
 		UID:               "users",
-		Description:       "User information",
-		DisplayName:       "A list of users of the Grafana instance",
+		DisplayName:       "User information",
+		Description:       "List users belonging to the Grafana instance",
 		IncludedByDefault: false,
-		Default:           true,
+		Default:           false,
 		Fn:                collectorFn,
 	}
 }