Skip to content

Commit e2c64e1

Browse files
authored
Merge branch 'master' into dcr-config
2 parents 110ffc7 + d7eca88 commit e2c64e1

File tree

71 files changed

+1156
-296
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+1156
-296
lines changed

source/administration-guide/comply/compliance-export.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Compliance export
44
.. include:: ../../_static/badges/ent-plus.rst
55
:start-after: :nosearch:
66

7-
Mattermost Enterprise customers can archive history or transfer message data to third-party systems for auditing and compliance purposes with compliance exports. Supported integrations include `Actiance Vantage <#actiance-xml>`__, `Global Relay <#global-relay-eml>`__, and `Proofpoint <#proofpoint>`__.
7+
Mattermost Enterprise customers can archive history or transfer message data to third-party systems for auditing and compliance purposes with compliance exports. Supported integrations include `Smarsh (Actiance) Vantage <#actiance-xml>`__, `Global Relay <#global-relay-eml>`__, and `Proofpoint <#proofpoint>`__.
88

99
From Mattermost v10.5, compliance exports include performance improvements for large daily data sets with changes affecting output formats, system performance, and logic. Compliance exports provide compliance teams complete information to reconstruct the state of a channel, and to determine who had visibility on an initial message, or when the message was edited or deleted. Compliance teams can track a message by its MessageId as it is edited or deleted, and across batches and exports periods.
1010

@@ -23,7 +23,7 @@ Exports include information on channel member history at the time the message wa
2323
Set up guide
2424
------------
2525

26-
Use the following guides to configure exports for `CSV <#csv>`__, `Actiance XML <#actiance-xml>`__, `Global Relay EML <#global-relay-eml>`__, or `Proofpoint <#proofpoint>`__.
26+
Use the following guides to configure exports for `CSV <#csv>`__, `Smarsh / Actiance XML <#actiance-xml>`__, `Global Relay EML <#global-relay-eml>`__, or `Proofpoint <#proofpoint>`__.
2727

2828
.. note::
2929

@@ -85,8 +85,9 @@ CSV
8585

8686
For a sample CSV output, `download a CSV export file here <https://github.com/mattermost/docs/blob/master/source/samples/csv_export.zip>`__.
8787

88-
Actiance XML
88+
Actiance XML
8989
~~~~~~~~~~~~
90+
Actiance XML is the supported format for the 'Smarsh Vantage product <https://central.smarsh.com/s/product/vantage>`_.
9091

9192
1. Go to **System Console > Compliance > Compliance Export**.
9293
2. Set **Enable Compliance Exports** to **true**.

source/administration-guide/configure/site-configuration-settings.rst

Lines changed: 199 additions & 5 deletions
Large diffs are not rendered by default.
Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
Enable Content Flagging
2+
========================
3+
4+
.. include:: ../../../_static/badges/entry-adv.rst
5+
:start-after: :nosearch:
6+
7+
Content flagging helps prevent accidental data spillage and helps system administrators respond quickly to potential leaks without disrupting collaboration. Enabling this feature empowers Mattermost users to report messages that may contain sensitive, regulated, or inappropriate information, and enables designated content reviewers to assess and take appropriate action by removing or dismissing flagged messages.
8+
9+
By making every team member a first line of defense against sensitive-data exposure, content flagging strengthens mission-critical, secure deployments and supports compliance with organizational and regulatory data-handling standards.
10+
11+
Before you begin
12+
----------------
13+
14+
You must be a System Admin in Mattermost. You need to identify who will be content reviewers for flagged messages, and you need to decide whether flagged messages should be hidden from users in Mattermost while under review.
15+
16+
Enable
17+
-------
18+
19+
Content flagging isn't enabled by default. To enable content flagging:
20+
21+
1. Go to **System Console > Site Configuration > Content Flagging**.
22+
2. Set **Enable content flagging** to **True**.
23+
24+
Alternatively, you can configure content flagging via the :ref:`config.json file or through environment variables <administration-guide/configure/site-configuration-settings:content flagging>`.
25+
26+
Configure
27+
---------
28+
29+
1. Under **Content Reviewers**, define who should review flagged content:
30+
31+
- **Same reviewers for all teams**: Set to **True** to apply one global reviewer list across all teams, or **False** to configure reviewers per team.
32+
- **Reviewers**: Start typing to search for users to assign as content reviewers.
33+
34+
.. important::
35+
36+
Choose reviewers carefully. Assigning reviewer roles grants access to potentially sensitive information and may expose data from private channels.
37+
38+
- A global reviewer can view flagged messages from all teams and channels, including private channels they’re not a member of.
39+
- Team-specific reviewers can view flagged messages from their assigned teams, including private channels within those teams they're not members of.
40+
41+
- **Additional reviewers**: Optionally include:
42+
43+
- **System Administrators**: System admins receive flagged messages for all teams they are part of.
44+
- **Team Administrators**: Team admins receive flagged messages for their respective teams.
45+
46+
2. Under **Notification Settings**, specify who receives updates at each stage of the flagging workflow when content is flagged or reviewed:
47+
48+
- **Notify when content is flagged**: Reviewer(s), Author.
49+
- **Notify when a reviewer is assigned**: Reviewer(s).
50+
- **Notify when content is removed**: Reviewer(s), Author, Reporter.
51+
- **Notify on dismissal**: Reviewer(s), Author, Reporter.
52+
53+
All notifications are sent via the **content-review** bot as direct messages.
54+
55+
3. Under **Additional Settings**, configure how the flagging workflow behaves:
56+
57+
- **Reasons for flagging**: Define the preset categories that appear in the flagging dialog for users (for example: **Inappropriate content**, **Sensitive data**, **Security concern**, **Harassment or abuse**, **Spam or phishing**).
58+
- **Require reporters to add comment**: Set to **True** to require users to add a short explanation when flagging a message.
59+
- **Require reviewers to add comment**: Set to **True** to require reviewers to add a comment when resolving a flag.
60+
- **Hide message from channel while it is being reviewed**: Set to **True** to automatically hide flagged messages from the channel until reviews are complete. If a root post is flagged, the entire thread is hidden.
61+
62+
.. tip::
63+
We recommend enabling **Hide message from channel while it is being reviewed** and require comments from both reporters and reviewers to maintain transparency, accountability, and an auditable record of actions.
64+
65+
Monitor flagged messages
66+
------------------------
67+
68+
When :doc:`a user flags a message </end-user-guide/collaborate/flag-messages>`, the **content-review** bot sends a direct message to all content reviewers.
69+
70+
Direct messages from the **content-review** bot is a centralized moderation queue, where reviewers can view, assign, and act on flagged messages without leaving Mattermost. Reviewers can use it to monitor potential data spills, coordinate response, and maintain an auditable record of review activity.
71+
72+
Each flagged message appears as a card-formatted message that includes:
73+
74+
- **Flagged by**: The user who reported the message.
75+
- **Status**: The current state of the review. All flagged content starts in **Pending** status.
76+
- **Reason**: The reason selected by the reporter (for example, **Sensitive data**, **Inappropriate content**).
77+
- **Message preview**: A snippet of the flagged message, including the author, timestamp, and original channel.
78+
- **Reviewer**: The user currently assigned to review the message (initially **Unassigned**).
79+
- **Channel**: The name of the channel where the message was originally posted.
80+
- **Team**: The team context for the flagged message.
81+
- **Comment**: Any reporter-provided context.
82+
- **Post ID**: The system identifier for the original message for auditing purposes.
83+
84+
Reviewers can select **View details** to take action as follows:
85+
86+
- Assign a **Reviewer** responsible for reviewing the flagged message.
87+
- **Remove message**: Permanently delete the flagged message from its original channel for all users. The status of the flagged message changes to **Removed**.
88+
- **Keep message**: Dismiss the flag and restore the message if it was hidden. The status of the flagged message changes to **Retained**.
89+
- **Add a comment**: Record the reason for the decision when required.
90+
91+
Once an action is taken, the **Status** field updates automatically. The **content-review** bot sends follow-up notifications to the reporter, author, and other reviewers based on how content flagging is configured.
92+
93+
Deleted messages
94+
~~~~~~~~~~~~~~~~
95+
96+
When a reviewer permanently removes a flagged message, the message and all associated data are deleted from the database and can't be recovered, including:
97+
98+
- Message content and properties: The text of the message and any associated post properties.
99+
- File metadata: Information about files attached to the message (e.g., file names, IDs, and links to storage).
100+
- File metadata from edit history: Information about files attached to earlier versions of the message.
101+
- Edit history: All previous versions of the message and their timestamps.
102+
- Uploaded files: The actual files stored in Mattermost’s file storage (local, S3, etc.).
103+
- Priority data: Any message priority or importance settings.
104+
- Acknowledgements: Records of users who acknowledged the message.
105+
- Reminders: Any reminders created for the message.
106+
107+
Best practice recommendations
108+
-----------------------------
109+
110+
Before rolling out content flagging organization-wide, we recommend communicating that the feature protects both users and the organization from accidental data spillage. Start with a pilot team to validate reviewer notifications and workflows, integrate the process with existing data-handling or incident-response playbooks, and require reporter and reviewer comments to ensure every decision is transparent and auditable.

source/administration-guide/manage/admin/error-codes.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ This error occurs when:
3434
To resolve this error, system administrators can:
3535

3636
- :ref:`Deactivate users <administration-guide/configure/user-management-configuration-settings:deactivate users>` to reduce the active user count below the license limit.
37-
- Contact `Mattermost Sales <https://mattermost.com/contact-sales/>`_ to discuss license options.
37+
- Contact `Mattermost Sales <https://mattermost.com/contact-sales/>`_ to request an updated license that increases the number of licensed users.
3838

3939
`Book a live demo <https://mattermost.com/request-demo/>`_ or `talk to a Mattermost expert <https://mattermost.com/contact-sales/>`_ to explore tailored solutions for your organization's secure collaboration needs. Or try Mattermost yourself with a `1-hour preview <https://mattermost.com/sign-up/>`_ for instant access to a live sandbox environment.

source/administration-guide/manage/admin/server-configuration.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ Whether you’re setting up email notifications, optimizing search capabilities,
1616
Set up Mattermost Agents </administration-guide/configure/agents-admin-guide>
1717
Install Mattermost Boards </administration-guide/configure/install-boards>
1818
Manage user attributes </administration-guide/manage/admin/user-attributes>
19+
Enable content flagging </administration-guide/manage/admin/content-flagging>
1920
Environment variables </administration-guide/configure/environment-variables>
2021
Customize the server </administration-guide/manage/admin/customize-branding>
2122
SMTP email setup </administration-guide/configure/smtp-email>

source/administration-guide/onboard/sso-entraid.rst

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Step 1: Register an application in Azure Portal
1919

2020
1. Log in to the `Azure Portal <https://portal.azure.com/>`_ with the account that relates to the Azure Active Directory tenant where you want to register the application. You can confirm the tenant in the top right corner of the portal.
2121

22-
2. In the left-hand navigation pane, select the **Azure Active Directory service**, then select **App registrations > New registration**.
22+
2. In the left-hand navigation pane, select the **Microsoft EntraID**, then toward the bottom select **Add application registrations**.
2323

2424
3. Give your new registration a **Name**.
2525

@@ -36,19 +36,27 @@ Once the App Registration has been created, you can configure it further. See th
3636
Step 2: Generate a new client secret in Azure Portal
3737
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3838

39-
1. In the Azure Portal, select **Certificates and Secrets** from the menu, then select the button to generate a **New Client secret**.
39+
1. From the overview page of the newly created **Registered App**, select **Certificates and Secrets** from the menu, then select the button to generate a **New Client secret**.
4040

41-
2. Provide a description, define the expiry for the token, then select **Add**.
41+
.. image:: /images/AzureApp_Client_Secret_Setup.png
4242

43-
3. In Azure Portal, select **Overview** from the menu, then copy and paste both the Application (client) ID and the Directory (tenant) ID to a temporary location. You will enter these values as an **Application ID** and as part of an **Auth Endpoint** and **Token Endpoint** URL in the Mattermost System Console.
43+
2. Provide a description, define the expiry for the token, then select **Add**.
4444

4545
.. image:: /images/AzureApp_Client_Secret_Expiry.png
4646

47+
3. Store the **value** of the new secret somewhere secure.
48+
49+
4. In Azure Portal, select **Overview** from the menu, then copy and paste both the Application (client) ID and the Directory (tenant) ID to a temporary location. You will enter these values as an **Application ID** and as part of an **Auth Endpoint** and **Token Endpoint** URL in the Mattermost System Console.
50+
4751
.. image:: /images/AzureApp_App_Directory_IDsv2.png
4852

53+
5. Grant admin concent for the configured permissions under **App Registrations > <Your App> > Manage > API Permissions**
54+
55+
.. image:: /images/AzureApp_App_Directory_Grant_Admin_Consent.png
56+
57+
4958
Step 3: Configure Mattermost for Entra ID SSO
5059
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
51-
5260
1. Log in to Mattermost, then go to **System Console > Authentication > OpenID Connect**.
5361

5462
2. Select **Entra ID** as the service provider.

source/administration-guide/onboard/sso-saml-entraid.rst

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
Configure SAML with Microsoft Entra ID
22
========================================
33

4-
.. note::
4+
.. include:: ../../_static/badges/all-commercial.rst
5+
:start-after: :nosearch:
56

6-
This documentation covers configuring Entra ID for **SAML** authentication. If you need to configure Entra ID for **OpenID Connect** authentication instead, see the :doc:`Entra ID Single Sign-On </administration-guide/onboard/sso-entraid>` documentation.
7+
This page provides guidance on configuring SAML with Microsoft Entra ID for Mattermost.
78

8-
The following process provides steps to configure SAML with Microsoft Entra ID for Mattermost.
9-
10-
See the encryption options documentation for details on what :ref:`encryption methods <deployment-guide/encryption-options:saml encryption support>` Mattermost supports for SAML.
9+
.. tip::
10+
11+
- Need to configure Entra ID for **OpenID Connect** authentication instead? See the :doc:`Entra ID Single Sign-On </administration-guide/onboard/sso-entraid>` documentation for details.
12+
- See the encryption options documentation for details on what :ref:`encryption methods <deployment-guide/encryption-options:saml encryption support>` Mattermost supports for SAML.
1113

1214
.. include:: sso-saml-before-you-begin.rst
1315
:start-after: :nosearch:

0 commit comments

Comments
 (0)