From 9c9d510a73085f0d210e789402d58075fa23149f Mon Sep 17 00:00:00 2001
From: Jason Blais <13119842+jasonblais@users.noreply.github.com>
Date: Mon, 3 Jun 2019 18:40:25 -0400
Subject: [PATCH] MM-15833 Add new pre-packaged plugins to telemetry
 diagnostics (#11026)

Re-submitting from #10956

#### Summary
Add pre-packaged plugins to telemetry diagnostics

This includes the following plugins:
- Jira 2.0
- Zoom
- GitHub
- Autolink
- WelcomeBot
- Custom attributes
- Amazon SNS Alerts

#### Ticket Link

https://mattermost.atlassian.net/browse/MM-15833

#### Note

Blocked by https://mattermost.atlassian.net/browse/MM-15824, which transfers the AWS SNS plugin to Mattermost org, and changes the plugin ID to reference mattermost instead of cpanato.

Not queuing for review until the plugin ID has changed in the repository. In the event it's not, I will revert the plugin ID back to `com.cpanato.aws-sns` for telemetry diagnostics.
---
 app/diagnostics.go | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/diagnostics.go b/app/diagnostics.go
index 0b437d6ec2..73583bcf57 100644
--- a/app/diagnostics.go
+++ b/app/diagnostics.go
@@ -575,13 +575,18 @@ func (a *App) trackConfig() {
 	})
 
 	a.SendDiagnostic(TRACK_CONFIG_PLUGIN, map[string]interface{}{
-		"enable_jira":         pluginActivated(cfg.PluginSettings.PluginStates, "jira"),
-		"enable_nps":          pluginActivated(cfg.PluginSettings.PluginStates, "com.mattermost.nps"),
-		"enable_nps_survey":   pluginSetting(&cfg.PluginSettings, "com.mattermost.nps", "enablesurvey", false),
-		"enable_zoom":         pluginActivated(cfg.PluginSettings.PluginStates, "zoom"),
-		"enable":              *cfg.PluginSettings.Enable,
-		"enable_uploads":      *cfg.PluginSettings.EnableUploads,
-		"enable_health_check": *cfg.PluginSettings.EnableHealthCheck,
+		"enable_autolink":               pluginActivated(cfg.PluginSettings.PluginStates, "mattermost-autolink"),
+		"enable_aws_sns":                pluginActivated(cfg.PluginSettings.PluginStates, "com.mattermost.aws-sns"),
+		"enable_custom_user_attributes": pluginActivated(cfg.PluginSettings.PluginStates, "com.mattermost.custom-attributes"),
+		"enable_github":                 pluginActivated(cfg.PluginSettings.PluginStates, "github"),
+		"enable_jira":                   pluginActivated(cfg.PluginSettings.PluginStates, "jira"),
+		"enable_nps":                    pluginActivated(cfg.PluginSettings.PluginStates, "com.mattermost.nps"),
+		"enable_nps_survey":             pluginSetting(&cfg.PluginSettings, "com.mattermost.nps", "enablesurvey", false),
+		"enable_welcome_bot":            pluginActivated(cfg.PluginSettings.PluginStates, "com.mattermost.welcomebot"),
+		"enable_zoom":                   pluginActivated(cfg.PluginSettings.PluginStates, "zoom"),
+		"enable":                        *cfg.PluginSettings.Enable,
+		"enable_uploads":                *cfg.PluginSettings.EnableUploads,
+		"enable_health_check":           *cfg.PluginSettings.EnableHealthCheck,
 	})
 
 	a.SendDiagnostic(TRACK_CONFIG_DATA_RETENTION, map[string]interface{}{