diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2018-01-23 15:07:31 -0500 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2018-01-23 15:07:31 -0500 |
commit | 195ad5620402f1a3239e75ef140e64c3731abf29 (patch) | |
tree | 611c43ec55391747333c0bf62e67090861f2a183 /app/diagnostics.go | |
parent | 3dad6320432c1cbeb032b57619ba78f29433dce3 (diff) | |
parent | 2bdd44cce9dc922959dcf51d329a0039eba8debd (diff) | |
download | chat-195ad5620402f1a3239e75ef140e64c3731abf29.tar.gz chat-195ad5620402f1a3239e75ef140e64c3731abf29.tar.bz2 chat-195ad5620402f1a3239e75ef140e64c3731abf29.zip |
Merge branch 'release-4.6'
Diffstat (limited to 'app/diagnostics.go')
-rw-r--r-- | app/diagnostics.go | 67 |
1 files changed, 40 insertions, 27 deletions
diff --git a/app/diagnostics.go b/app/diagnostics.go index 2ef608ee3..135875de6 100644 --- a/app/diagnostics.go +++ b/app/diagnostics.go @@ -237,6 +237,8 @@ func (a *App) trackConfig() { "enable_post_search": *cfg.ServiceSettings.EnablePostSearch, "enable_user_statuses": *cfg.ServiceSettings.EnableUserStatuses, "close_unused_direct_messages": *cfg.ServiceSettings.CloseUnusedDirectMessages, + "enable_preview_features": *cfg.ServiceSettings.EnablePreviewFeatures, + "enable_tutorial": *cfg.ServiceSettings.EnableTutorial, "experimental_enable_default_channel_leave_join_messages": *cfg.ServiceSettings.ExperimentalEnableDefaultChannelLeaveJoinMessages, }) @@ -265,6 +267,7 @@ func (a *App) trackConfig() { "restrict_private_channel_manage_members": *cfg.TeamSettings.RestrictPrivateChannelManageMembers, "enable_X_to_leave_channels_from_LHS": *cfg.TeamSettings.EnableXToLeaveChannelsFromLHS, "experimental_town_square_is_read_only": *cfg.TeamSettings.ExperimentalTownSquareIsReadOnly, + "experimental_primary_team": isDefault(*cfg.TeamSettings.ExperimentalPrimaryTeam, ""), }) a.SendDiagnostic(TRACK_CONFIG_CLIENT_REQ, map[string]interface{}{ @@ -323,6 +326,7 @@ func (a *App) trackConfig() { "enable_sign_in_with_username": *cfg.EmailSettings.EnableSignInWithUsername, "require_email_verification": cfg.EmailSettings.RequireEmailVerification, "send_email_notifications": cfg.EmailSettings.SendEmailNotifications, + "use_channel_in_email_notifications": *cfg.EmailSettings.UseChannelInEmailNotifications, "email_notification_contents_type": *cfg.EmailSettings.EmailNotificationContentsType, "enable_smtp_auth": *cfg.EmailSettings.EnableSMTPAuth, "connection_security": cfg.EmailSettings.ConnectionSecurity, @@ -335,6 +339,9 @@ func (a *App) trackConfig() { "isdefault_feedback_email": isDefault(cfg.EmailSettings.FeedbackEmail, ""), "isdefault_feedback_organization": isDefault(*cfg.EmailSettings.FeedbackOrganization, model.EMAIL_SETTINGS_DEFAULT_FEEDBACK_ORGANIZATION), "skip_server_certificate_verification": *cfg.EmailSettings.SkipServerCertificateVerification, + "isdefault_login_button_color": isDefault(*cfg.EmailSettings.LoginButtonColor, ""), + "isdefault_login_button_border_color": isDefault(*cfg.EmailSettings.LoginButtonBorderColor, ""), + "isdefault_login_button_text_color": isDefault(*cfg.EmailSettings.LoginButtonTextColor, ""), }) a.SendDiagnostic(TRACK_CONFIG_RATE, map[string]interface{}{ @@ -374,21 +381,24 @@ func (a *App) trackConfig() { }) a.SendDiagnostic(TRACK_CONFIG_LDAP, map[string]interface{}{ - "enable": *cfg.LdapSettings.Enable, - "enable_sync": *cfg.LdapSettings.EnableSync, - "connection_security": *cfg.LdapSettings.ConnectionSecurity, - "skip_certificate_verification": *cfg.LdapSettings.SkipCertificateVerification, - "sync_interval_minutes": *cfg.LdapSettings.SyncIntervalMinutes, - "query_timeout": *cfg.LdapSettings.QueryTimeout, - "max_page_size": *cfg.LdapSettings.MaxPageSize, - "isdefault_first_name_attribute": isDefault(*cfg.LdapSettings.FirstNameAttribute, model.LDAP_SETTINGS_DEFAULT_FIRST_NAME_ATTRIBUTE), - "isdefault_last_name_attribute": isDefault(*cfg.LdapSettings.LastNameAttribute, model.LDAP_SETTINGS_DEFAULT_LAST_NAME_ATTRIBUTE), - "isdefault_email_attribute": isDefault(*cfg.LdapSettings.EmailAttribute, model.LDAP_SETTINGS_DEFAULT_EMAIL_ATTRIBUTE), - "isdefault_username_attribute": isDefault(*cfg.LdapSettings.UsernameAttribute, model.LDAP_SETTINGS_DEFAULT_USERNAME_ATTRIBUTE), - "isdefault_nickname_attribute": isDefault(*cfg.LdapSettings.NicknameAttribute, model.LDAP_SETTINGS_DEFAULT_NICKNAME_ATTRIBUTE), - "isdefault_id_attribute": isDefault(*cfg.LdapSettings.IdAttribute, model.LDAP_SETTINGS_DEFAULT_ID_ATTRIBUTE), - "isdefault_position_attribute": isDefault(*cfg.LdapSettings.PositionAttribute, model.LDAP_SETTINGS_DEFAULT_POSITION_ATTRIBUTE), - "isdefault_login_field_name": isDefault(*cfg.LdapSettings.LoginFieldName, model.LDAP_SETTINGS_DEFAULT_LOGIN_FIELD_NAME), + "enable": *cfg.LdapSettings.Enable, + "enable_sync": *cfg.LdapSettings.EnableSync, + "connection_security": *cfg.LdapSettings.ConnectionSecurity, + "skip_certificate_verification": *cfg.LdapSettings.SkipCertificateVerification, + "sync_interval_minutes": *cfg.LdapSettings.SyncIntervalMinutes, + "query_timeout": *cfg.LdapSettings.QueryTimeout, + "max_page_size": *cfg.LdapSettings.MaxPageSize, + "isdefault_first_name_attribute": isDefault(*cfg.LdapSettings.FirstNameAttribute, model.LDAP_SETTINGS_DEFAULT_FIRST_NAME_ATTRIBUTE), + "isdefault_last_name_attribute": isDefault(*cfg.LdapSettings.LastNameAttribute, model.LDAP_SETTINGS_DEFAULT_LAST_NAME_ATTRIBUTE), + "isdefault_email_attribute": isDefault(*cfg.LdapSettings.EmailAttribute, model.LDAP_SETTINGS_DEFAULT_EMAIL_ATTRIBUTE), + "isdefault_username_attribute": isDefault(*cfg.LdapSettings.UsernameAttribute, model.LDAP_SETTINGS_DEFAULT_USERNAME_ATTRIBUTE), + "isdefault_nickname_attribute": isDefault(*cfg.LdapSettings.NicknameAttribute, model.LDAP_SETTINGS_DEFAULT_NICKNAME_ATTRIBUTE), + "isdefault_id_attribute": isDefault(*cfg.LdapSettings.IdAttribute, model.LDAP_SETTINGS_DEFAULT_ID_ATTRIBUTE), + "isdefault_position_attribute": isDefault(*cfg.LdapSettings.PositionAttribute, model.LDAP_SETTINGS_DEFAULT_POSITION_ATTRIBUTE), + "isdefault_login_field_name": isDefault(*cfg.LdapSettings.LoginFieldName, model.LDAP_SETTINGS_DEFAULT_LOGIN_FIELD_NAME), + "isdefault_login_button_color": isDefault(*cfg.LdapSettings.LoginButtonColor, ""), + "isdefault_login_button_border_color": isDefault(*cfg.LdapSettings.LoginButtonBorderColor, ""), + "isdefault_login_button_text_color": isDefault(*cfg.LdapSettings.LoginButtonTextColor, ""), }) a.SendDiagnostic(TRACK_CONFIG_COMPLIANCE, map[string]interface{}{ @@ -403,18 +413,21 @@ func (a *App) trackConfig() { }) a.SendDiagnostic(TRACK_CONFIG_SAML, map[string]interface{}{ - "enable": *cfg.SamlSettings.Enable, - "enable_sync_with_ldap": *cfg.SamlSettings.EnableSyncWithLdap, - "verify": *cfg.SamlSettings.Verify, - "encrypt": *cfg.SamlSettings.Encrypt, - "isdefault_first_name_attribute": isDefault(*cfg.SamlSettings.FirstNameAttribute, model.SAML_SETTINGS_DEFAULT_FIRST_NAME_ATTRIBUTE), - "isdefault_last_name_attribute": isDefault(*cfg.SamlSettings.LastNameAttribute, model.SAML_SETTINGS_DEFAULT_LAST_NAME_ATTRIBUTE), - "isdefault_email_attribute": isDefault(*cfg.SamlSettings.EmailAttribute, model.SAML_SETTINGS_DEFAULT_EMAIL_ATTRIBUTE), - "isdefault_username_attribute": isDefault(*cfg.SamlSettings.UsernameAttribute, model.SAML_SETTINGS_DEFAULT_USERNAME_ATTRIBUTE), - "isdefault_nickname_attribute": isDefault(*cfg.SamlSettings.NicknameAttribute, model.SAML_SETTINGS_DEFAULT_NICKNAME_ATTRIBUTE), - "isdefault_locale_attribute": isDefault(*cfg.SamlSettings.LocaleAttribute, model.SAML_SETTINGS_DEFAULT_LOCALE_ATTRIBUTE), - "isdefault_position_attribute": isDefault(*cfg.SamlSettings.PositionAttribute, model.SAML_SETTINGS_DEFAULT_POSITION_ATTRIBUTE), - "isdefault_login_button_text": isDefault(*cfg.SamlSettings.LoginButtonText, model.USER_AUTH_SERVICE_SAML_TEXT), + "enable": *cfg.SamlSettings.Enable, + "enable_sync_with_ldap": *cfg.SamlSettings.EnableSyncWithLdap, + "verify": *cfg.SamlSettings.Verify, + "encrypt": *cfg.SamlSettings.Encrypt, + "isdefault_first_name_attribute": isDefault(*cfg.SamlSettings.FirstNameAttribute, model.SAML_SETTINGS_DEFAULT_FIRST_NAME_ATTRIBUTE), + "isdefault_last_name_attribute": isDefault(*cfg.SamlSettings.LastNameAttribute, model.SAML_SETTINGS_DEFAULT_LAST_NAME_ATTRIBUTE), + "isdefault_email_attribute": isDefault(*cfg.SamlSettings.EmailAttribute, model.SAML_SETTINGS_DEFAULT_EMAIL_ATTRIBUTE), + "isdefault_username_attribute": isDefault(*cfg.SamlSettings.UsernameAttribute, model.SAML_SETTINGS_DEFAULT_USERNAME_ATTRIBUTE), + "isdefault_nickname_attribute": isDefault(*cfg.SamlSettings.NicknameAttribute, model.SAML_SETTINGS_DEFAULT_NICKNAME_ATTRIBUTE), + "isdefault_locale_attribute": isDefault(*cfg.SamlSettings.LocaleAttribute, model.SAML_SETTINGS_DEFAULT_LOCALE_ATTRIBUTE), + "isdefault_position_attribute": isDefault(*cfg.SamlSettings.PositionAttribute, model.SAML_SETTINGS_DEFAULT_POSITION_ATTRIBUTE), + "isdefault_login_button_text": isDefault(*cfg.SamlSettings.LoginButtonText, model.USER_AUTH_SERVICE_SAML_TEXT), + "isdefault_login_button_color": isDefault(*cfg.SamlSettings.LoginButtonColor, ""), + "isdefault_login_button_border_color": isDefault(*cfg.SamlSettings.LoginButtonBorderColor, ""), + "isdefault_login_button_text_color": isDefault(*cfg.SamlSettings.LoginButtonTextColor, ""), }) a.SendDiagnostic(TRACK_CONFIG_CLUSTER, map[string]interface{}{ |