-
Notifications
You must be signed in to change notification settings - Fork 609
Reorganize experimental configuration settings based on access tags #8728
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1712,6 +1712,47 @@ Login button text | |
| | String input. Default is **SAML**. | - Environment variable: ``MM_SAMLSETTINGS_LOGINBUTTONTEXT`` | | ||
| +---------------------------------------------------------------------------+-------------------------------------------------------------------+ | ||
|
|
||
| config.json-only settings | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
|
|
||
| The following SAML configuration settings are only available by editing the ``config.json`` file. | ||
|
|
||
| .. config:setting:: scoping-idp-provider-id | ||
| :displayname: Scoping IDP provider ID (SAML) | ||
| :systemconsole: N/A | ||
| :configjson: ScopingIDPProviderId | ||
| :environment: N/A | ||
| :description: Allows an authenticated user to skip the initial login page of their federated Azure AD server, and only require a password to log in. | ||
|
|
||
| Scoping IDP provider ID | ||
| ~~~~~~~~~~~~~~~~~~~~~~~~ | ||
|
|
||
| This setting isn't available in the System Console and can only be set in ``config.json``. | ||
|
|
||
| Allows an authenticated user to skip the initial login page of their federated Azure AD server, and only require a password to log in. | ||
|
|
||
| +---------------------------------------------------------------------------------------------+ | ||
| | This feature's ``config.json`` setting is ``"ScopingIDPProviderId": ""`` with string input. | | ||
| +---------------------------------------------------------------------------------------------+ | ||
|
|
||
| .. config:setting:: scoping-idp-provider-name | ||
| :displayname: Scoping IDP provider name (SAML) | ||
| :systemconsole: N/A | ||
| :configjson: ScopingIDPName | ||
| :environment: N/A | ||
| :description: Adds the name associated with a user's Scoping Identity Provider ID. | ||
|
|
||
| Scoping IDP provider name | ||
| ~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
|
|
||
| This setting isn't available in the System Console and can only be set in ``config.json``. | ||
|
|
||
| Adds the name associated with a user's Scoping Identity Provider ID. | ||
|
|
||
| +---------------------------------------------------------------------------------------+ | ||
| | This feature's ``config.json`` setting is ``"ScopingIDPName": ""`` with string input. | | ||
| +---------------------------------------------------------------------------------------+ | ||
|
|
||
| ---- | ||
|
|
||
| OAuth 2.0 | ||
|
|
@@ -1876,6 +1917,25 @@ GitLab OAuth 2.0 Token endpoint | |
| | String input. | | | ||
| +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------+ | ||
|
|
||
| .. config:setting:: oauth-gitlabscope | ||
| :displayname: GitLab scope (OAuth - GitLab) | ||
| :systemconsole: N/A | ||
| :configjson: .GitLabSettings.Scope | ||
| :environment: MM_GITLABSETTINGS_SCOPE | ||
| :description: Standard setting for OAuth to determine the scope of information shared with the OAuth client. Not currently supported by GitLab OAuth. | ||
|
|
||
| GitLab scope | ||
| '''''''''''' | ||
|
|
||
| This setting isn't available in the System Console and can only be set in ``config.json``. | ||
|
|
||
| +---------------------------------------------------------------+-------------------------------------------------------------+ | ||
| | Standard setting for OAuth to determine the scope of | - System Config path: N/A | | ||
| | information shared with the OAuth client. | - ``config.json`` setting: ``GitLabSettings`` > ``Scope`` | | ||
| | | - Environment variable: ``MM_GITLABSETTINGS_SCOPE`` | | ||
| | String input. Not currently supported by GitLab OAuth. | | | ||
|
Comment on lines
+1930
to
+1936
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. “config.json-only” wording contradicts documented environment variable support These blocks state settings can “only be set in Suggested minimal wording fix-This setting isn't available in the System Console and can only be set in ``config.json``.
+This setting isn't available in the System Console. Set it via ``config.json`` or the mapped environment variable.Based on learnings: “Describe Mattermost feature behavior, UI labels, and capability boundaries accurately”. Also applies to: 2053-2059, 2204-2210 🤖 Prompt for AI Agents |
||
| +---------------------------------------------------------------+-------------------------------------------------------------+ | ||
|
|
||
| Google OAuth 2.0 settings | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
|
|
||
|
|
@@ -1980,6 +2040,25 @@ Google OAuth 2.0 Token endpoint | |
| | String input. | - Environment variable: ``MM_GOOGLESETTINGS_TOKENENDPOINT`` | | ||
| +-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------+ | ||
|
|
||
| .. config:setting:: oauth-googlescope | ||
| :displayname: Google scope (OAuth - Google) | ||
| :systemconsole: N/A | ||
| :configjson: .GoogleSettings.Scope | ||
| :environment: MM_GOOGLESETTINGS_SCOPE | ||
| :description: Standard setting for OAuth to determine the scope of information shared with the OAuth client. Default value is **profile email**. | ||
|
|
||
| Google scope | ||
| '''''''''''' | ||
|
|
||
| This setting isn't available in the System Console and can only be set in ``config.json``. | ||
|
|
||
| +---------------------------------------------------------------+-------------------------------------------------------------+ | ||
| | Standard setting for OAuth to determine the scope of | - System Config path: N/A | | ||
| | information shared with the OAuth client. | - ``config.json`` setting: ``GoogleSettings`` > ``Scope`` | | ||
| | | - Environment variable: ``MM_GOOGLESETTINGS_SCOPE`` | | ||
| | String input. Recommended setting is ``profile email``. | | | ||
| +---------------------------------------------------------------+-------------------------------------------------------------+ | ||
|
|
||
| Entra ID OAuth 2.0 settings | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
|
|
||
|
|
@@ -2112,6 +2191,25 @@ Entra ID OAuth 2.0 Token endpoint | |
| | String input. | - Environment variable: ``MM_OFFICE365SETTINGS_TOKENENDPOINT`` | | ||
| +-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------------------+ | ||
|
|
||
| .. config:setting:: oauth-entra-id-scope | ||
| :displayname: Entra ID scope (OAuth - Entra ID) | ||
| :systemconsole: N/A | ||
| :configjson: .Office365Settings.Scope | ||
| :environment: MM_OFFICE365SETTINGS_SCOPE | ||
| :description: Standard setting for OAuth to determine the scope of information shared with the OAuth client. Recommended setting is **User.Read**. | ||
|
|
||
| Entra ID scope | ||
| '''''''''''''' | ||
|
|
||
| This setting isn't available in the System Console and can only be set in ``config.json``. | ||
|
|
||
| +---------------------------------------------------------------+---------------------------------------------------------------+ | ||
| | Standard setting for OAuth to determine the scope of | - System Config path: N/A | | ||
| | information shared with the OAuth client. | - ``config.json`` setting: ``Office365Settings`` > ``Scope`` | | ||
| | | - Environment variable: ``MM_OFFICE365SETTINGS_SCOPE`` | | ||
| | String input. Recommended setting is ``User.Read``. | | | ||
| +---------------------------------------------------------------+---------------------------------------------------------------+ | ||
|
|
||
| ---- | ||
|
|
||
| OpenID Connect | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -297,6 +297,25 @@ The SMTP server port that will receive your Global Relay EML file when a `custom | |
| | This feature's ``config.json`` setting is ``".MessageExportSettings.GlobalRelaySettings.CustomSMTPPort": "25"`` with string input. | | ||
| +------------------------------------------------------------------------------------------------------------------------------------+ | ||
|
|
||
| .. config:setting:: global-relay-smtp-server-timeout | ||
| :displayname: Global Relay SMTP server timeout (Compliance Export - Global Relay EML) | ||
| :systemconsole: N/A | ||
| :configjson: .MessageExportSettings.GlobalRelaySettings.SMTPServerTimeout | ||
| :environment: MM_MESSAGEEXPORTSETTINGS_GLOBALRELAYSETTINGS_SMTPSERVERTIMEOUT | ||
| :description: The number of seconds that can elapse before the connection attempt to the SMTP server is abandoned. Default is **1800** seconds. | ||
|
|
||
| Global Relay SMTP server timeout | ||
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
|
|
||
| This setting isn't available in the System Console and can only be set in ``config.json``. | ||
|
|
||
| +---------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------+ | ||
| | The number of seconds that can elapse before the connection | - System Config path: N/A | | ||
| | attempt to the SMTP server is abandoned. | - ``config.json`` setting: ``MessageExportSettings.GlobalRelaySettings.SMTPServerTimeout`` > ``1800`` | | ||
| | | - Environment variable: ``MM_MESSAGEEXPORTSETTINGS_GLOBALRELAYSETTINGS_SMTPSERVERTIMEOUT`` | | ||
| | Numeric value. Default is **1800** seconds. | | | ||
| +---------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------+ | ||
|
|
||
| .. config:setting:: message-export-batch-size | ||
| :displayname: Message export batch size (Compliance Export) | ||
| :systemconsole: N/A | ||
|
|
@@ -315,6 +334,49 @@ Determines how many new posts are batched together to a compliance export file. | |
| | This feature's ``config.json`` setting is ``"BatchSize": 10000`` with numerical input. | | ||
| +---------------------------------------------------------------------------------------------+ | ||
|
|
||
| .. config:setting:: export-from-timestamp | ||
| :displayname: Export from timestamp (Compliance Export) | ||
| :systemconsole: N/A | ||
| :configjson: .MessageExportSettings.ExportFromTimestamp | ||
| :environment: MM_MESSAGEEXPORTSETTINGS_EXPORTFROMTIMESTAMP | ||
| :description: Set the Unix timestamp (seconds since epoch, UTC) to export data from. Default is **0**. | ||
|
|
||
| Export from timestamp | ||
| ~~~~~~~~~~~~~~~~~~~~~ | ||
|
|
||
| .. include:: ../../_static/badges/ent-plus.rst | ||
| :start-after: :nosearch: | ||
|
|
||
| This setting isn't available in the System Console and can only be set in ``config.json``. | ||
|
|
||
| +---------------------------------------------------------------+--------------------------------------------------------------------------------------------+ | ||
| | Set the Unix timestamp (seconds since epoch, UTC) to export | - System Config path: N/A | | ||
| | data from. | - ``config.json`` setting: ``MessageExportSettings.ExportFromTimestamp`` > ``0`` | | ||
| | | - Environment variable: ``MM_MESSAGEEXPORTSETTINGS_EXPORTFROMTIMESTAMP`` | | ||
| | Numeric value. Default is **0**. | | | ||
| +---------------------------------------------------------------+--------------------------------------------------------------------------------------------+ | ||
|
|
||
| .. config:setting:: file-location | ||
| :displayname: File location (Compliance Export) | ||
| :systemconsole: N/A | ||
| :configjson: FileLocation | ||
| :environment: N/A | ||
| :description: Set the file location of the compliance exports. Default value is **export**. | ||
|
|
||
| File location | ||
| ~~~~~~~~~~~~~ | ||
|
|
||
| .. include:: ../../_static/badges/ent-plus.rst | ||
| :start-after: :nosearch: | ||
|
|
||
| This setting isn't available in the System Console and can only be set in ``config.json``. | ||
|
|
||
| Set the file location of the compliance exports. By default, they are written to the ``exports`` subdirectory of the configured :ref:`Local Storage directory <administration-guide/configure/environment-configuration-settings:local storage directory>`. | ||
|
|
||
| +-------------------------------------------------------------------------------------------+ | ||
| | This feature's ``config.json`` setting is ``"FileLocation": "export"`` with string input. | | ||
|
Comment on lines
+374
to
+377
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Line 374 says the default writes to the Based on learnings, “Describe Mattermost feature behavior, UI labels, and capability boundaries accurately.” 🤖 Prompt for AI Agents |
||
| +-------------------------------------------------------------------------------------------+ | ||
|
|
||
| Run compliance export job now | ||
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
|
|
||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🧩 Analysis chain
🏁 Script executed:
Repository: mattermost/docs
Length of output: 26427
Update
:configjson:paths for SAML scoping settings to match page conventionsLines 1723 and 1741 use bare keys (
ScopingIDPProviderId,ScopingIDPName), inconsistent with all other SAML settings on this page which use the.SamlSettings.*prefix. Update both to::configjson: .SamlSettings.ScopingIDPProviderId:configjson: .SamlSettings.ScopingIDPName🤖 Prompt for AI Agents