Merge branch 'master' into advanced-permissions-phase-1

app/diagnostics.go

@@ -502,11 +502,15 @@ func (a *App) trackConfig() {
 	})
 
 	a.SendDiagnostic(TRACK_CONFIG_MESSAGE_EXPORT, map[string]interface{}{
-		"enable_message_export":         *cfg.MessageExportSettings.EnableExport,
-		"export_format":                 *cfg.MessageExportSettings.ExportFormat,
-		"daily_run_time":                *cfg.MessageExportSettings.DailyRunTime,
-		"default_export_from_timestamp": *cfg.MessageExportSettings.ExportFromTimestamp,
-		"batch_size":                    *cfg.MessageExportSettings.BatchSize,
+		"enable_message_export":                 *cfg.MessageExportSettings.EnableExport,
+		"export_format":                         *cfg.MessageExportSettings.ExportFormat,
+		"daily_run_time":                        *cfg.MessageExportSettings.DailyRunTime,
+		"default_export_from_timestamp":         *cfg.MessageExportSettings.ExportFromTimestamp,
+		"batch_size":                            *cfg.MessageExportSettings.BatchSize,
+		"global_relay_customer_type":            *cfg.MessageExportSettings.GlobalRelaySettings.CustomerType,
+		"is_default_global_relay_smtp_username": isDefault(*cfg.MessageExportSettings.GlobalRelaySettings.SmtpUsername, ""),
+		"is_default_global_relay_smtp_password": isDefault(*cfg.MessageExportSettings.GlobalRelaySettings.SmtpPassword, ""),
+		"is_default_global_relay_email_address": isDefault(*cfg.MessageExportSettings.GlobalRelaySettings.EmailAddress, ""),
 	})
 }