Skip to content

Commit dc87baf

Browse files
authored
New SKU badges (#8049)
* New SKU badges * Enterprise Advanced labels & plan overview
1 parent a115ed1 commit dc87baf

11 files changed

+57
-21
lines changed
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
:orphan:
2+
:nosearch:
3+
4+
.. raw:: html
5+
6+
<div class="mm-plans-badge">
7+
8+
|plans-img| Available on `Enterprise Advanced plans <https://mattermost.com/pricing/>`__
9+
10+
|deployment-img| `self-hosted <https://mattermost.com/download/>`__ deployments
11+
12+
.. raw:: html
13+
14+
</div>

source/about/editions-and-offerings.rst

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ For customers using our service in a self-hosted deployment, the `Mattermost Fre
1919
Mattermost Enterprise Edition
2020
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2121

22-
Our commercial, self-hosted software is called Mattermost Enterprise Edition, and it's available as a Linux binary that deploys identically to our open source version - including upgrading in an identical fashion - with two key differences: It contains code for advanced commercial features and it's offered under a commercial license (https://mattermost.com/enterprise-edition-license/). The commercial license prohibits reverse engineering and tampering with our license key mechanism unlocking paid features so that we can run a compliant and fair commercial business.
22+
Our commercial, self-hosted software is called Mattermost Enterprise Edition, and it's available as a Linux binary that deploys identically to our open source version - including upgrading in an identical fashion - with 2 key differences: It contains code for advanced commercial features and it's offered under a commercial license (https://mattermost.com/enterprise-edition-license/). The commercial license prohibits reverse engineering and tampering with our license key mechanism unlocking paid features so that we can run a compliant and fair commercial business.
2323

2424
Once you’ve downloaded and installed Mattermost Enterprise Edition within your preferred environment, you have the option to use it as-is in a "free" mode, or you can access Mattermost's commercial features by starting a trial or by purchasing a subscription. You can start a 30-day free Enterprise trial via **System Console > Edition and License > Start trial**, or request a trial online at https://mattermost.com/trial/.
2525

@@ -39,6 +39,23 @@ Mattermost plans consist of features and entitlements available either a paid su
3939

4040
The Mattermost Professional, Enterprise, or Enterprise Advanced editions are only available after deploying our Mattermost Enterprise Edition binary, and then applying a valid license key that comes with a subscription purchase. Alternatively, you can start a 30-day free trial that can be activated either in-product (**System Console > Edition and License > Start trial**) or online at https://mattermost.com/trial/.
4141

42+
Mattermost Enterprise Advanced
43+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
44+
45+
.. include:: ../_static/badges/cloud-selfhosted.rst
46+
:start-after: :nosearch:
47+
48+
Mattermost Enterprise Advanced is the :doc:`Intelligent Mission Environment </about/product>` for Cyber Defense and Mission Operations that features:
49+
50+
- :doc:`Classified and Sensitive Information Controls </collaborate/display-channel-banners>`
51+
- :doc:`Zero Trust Security </manage/admin/zero-trust-security>` with dynamic attribute-based policy controls, environmental atributes, and User Authoritative Source integration
52+
- :doc:`Mobile security </about/security/mobile-security>` controls
53+
- :doc:`Air-gapped deployment workflows </deploy/server/air-gapped-deployment>`
54+
55+
Visit the :doc:`Mattermost Plans </about/plans>` page to learn more about the capabilities and features available in Enterprise Advanced.
56+
57+
A 30-day free trial to preview the features in this subscription can be activated either in-product (**System Console > Edition and License > Start trial**) or via an online request at https://mattermost.com/trial/.
58+
4259
Mattermost Enterprise
4360
~~~~~~~~~~~~~~~~~~~~~
4461

source/about/plans.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@
6666
<tr class="section"><td colspan="7"><strong>Channel-based messaging</strong></td></tr>
6767
<tr class="subsection"><td colspan="7"><strong>1-1, group messaging, public and private channels, file sharing, link and media previews across web, PC, Mac, iOS and Android devices, with 1-1 audio calls and screen share, threaded discussions, search, custom branding themes and emojis, and availability in 20 languages.</strong></td></tr>
6868
<tr>
69-
<td><strong>Messaging, file sharing, and link and file previews across device platforms</strong>: Channels-based messaging including 1-1, group messaging, public and private channels, file sharing, link and media previews across web, PC, Mac, iOS, and Android devices.</td>
69+
<td><strong>Messaging, file sharing, and link and file previews across device platforms</strong>: :doc:`Channels-based messaging <collaborate/collaborate-within-channels>` including 1-1, group messaging, public and private channels, :doc:`file sharing <collaborate/share-files-in-messages>`, link and media :ref:`previews <collaborate/share-files-in-messages:preview file attachments>` across web, PC, Mac, iOS, and Android devices.</td>
7070
<td><img src="../_static/images/check-circle-green.svg"></td><td><img src="../_static/images/check-circle-green.svg"></td><td><img src="../_static/images/check-circle-green.svg"></td><td><img src="../_static/images/check-circle-green.svg"></td><td><img src="../_static/images/check-circle-green.svg"></td><td>v9.11+</td>
7171
</tr>
7272
<tr>
73-
<td><strong>1:1 audio calls and screen sharing</strong>: Call another user to start a 1-1 audio discussion in web, desktop, and mobile experiences with optional screen sharing.</td>
73+
<td><strong>1:1 audio calls and screen sharing</strong>: :doc:`Call another user <collaborate/make-calls>` to start a 1-1 audio discussion in web, desktop, and mobile experiences with optional :ref:`screen sharing <collaborate/make-calls:share your screen>`.</td>
7474
<td><img src="../_static/images/check-circle-green.svg"></td><td><img src="../_static/images/check-circle-green.svg"></td><td><img src="../_static/images/check-circle-green.svg"></td><td><img src="../_static/images/check-circle-green.svg"></td><td><img src="../_static/images/check-circle-green.svg"></td><td>v9.11+</td>
7575
</tr>
7676
<tr>
@@ -310,4 +310,9 @@
310310
</tbody>
311311
</table>
312312

313-
See a [complete list of features](https://mattermost.com/pricing) on the Mattermost website.
313+
See a [complete list of features](https://mattermost.com/pricing) on the Mattermost website.
314+
315+
.. note::
316+
317+
- Mattermost Enterprise Advanced requires a Mattermost Server running v10.9 or later and a PostgreSQL database.
318+
- Enterprise plugins must be updated to support the new license (most of which are pre-packaged from v10.9)

source/about/product.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ See the :doc:`Use Case Guide </about/use-cases>` to learn how operational teams
3535
Secure collaborative workflow
3636
-----------------------------
3737

38-
Built on an extensible open-core architecture, Mattermost offers an array of collaborative tools across :doc:`managed Windows, Mac, or Linux desktop applications </deploy/desktop/desktop-app-deployment>`, secure web browsers with or without internet access, :doc:`Bring your own device (BYOD) or mobile device management (MDM)-managed mobile </about/security/mobile-security>`, and :doc:`embedded Microsoft 365 </integrate/mattermost-mission-collaboration-for-m365>` user experiences.
38+
Built on an extensible open-core architecture, Mattermost offers an array of collaborative tools across :doc:`managed Windows, Mac, or Linux desktop applications </deploy/desktop/desktop-app-deployment>`, secure web browsers with or without internet access, bring your own device (BYOD) or :doc:`mobile device management (MDM)-managed mobile </about/security/mobile-security>`, and :doc:`embedded Microsoft 365 </integrate/mattermost-mission-collaboration-for-m365>` user experiences.
3939

4040
Messaging collaboration
4141
~~~~~~~~~~~~~~~~~~~~~~~~

source/configure/environment-configuration-settings.rst

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3665,9 +3665,6 @@ Allow untrusted internal connections
36653665
Mobile security
36663666
---------------
36673667

3668-
.. include:: ../_static/badges/ent-only.rst
3669-
:start-after: :nosearch:
3670-
36713668
From Mattermost v10.7 and mobile app v2.27, you can configure biometric authentication, prevent Mattermost use on jailbroken or rooted devices, and can block screen captures without relying on an EMM Provider. Configure these options by going to **System Console > Environment > Mobile Security**, or by editing the ``config.json`` file as described in the following tables. Changes to configuration settings in this section require a server restart before taking effect.
36723669

36733670
.. config:setting:: enable-biometric-authentication
@@ -3683,6 +3680,9 @@ From Mattermost v10.7 and mobile app v2.27, you can configure biometric authenti
36833680
Enable biometric authentication
36843681
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
36853682

3683+
.. include:: ../_static/badges/ent-adv-only.rst
3684+
:start-after: :nosearch:
3685+
36863686
+-----------------------------------------------+-------------------------------------------------------------------------------------+
36873687
| Enforce biometric authentication, with | - System Config path: **Environment > Mobile Security** |
36883688
| PIN/passcode fallback, before accessing | - ``config.json setting``: ``".NativeAppSettings.MobileEnableBiometrics": false",`` |
@@ -3717,6 +3717,9 @@ Enable biometric authentication
37173717
Enable jailbreak/root protection
37183718
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
37193719

3720+
.. include:: ../_static/badges/ent-adv-only.rst
3721+
:start-after: :nosearch:
3722+
37203723
+-----------------------------------------------+----------------------------------------------------------------------------------------+
37213724
| Prevent access to the app on devices | - System Config path: **Environment > Mobile Security** |
37223725
| detected as jailbroken or rooted. If a | - ``config.json setting``: ``".NativeAppSettings.MobileJailbreakProtection": false",`` |
@@ -3747,6 +3750,9 @@ Enable jailbreak/root protection
37473750
Prevent screen capture
37483751
~~~~~~~~~~~~~~~~~~~~~~~
37493752

3753+
.. include:: ../_static/badges/ent-adv-only.rst
3754+
:start-after: :nosearch:
3755+
37503756
+-----------------------------------------------+-----------------------------------------------------------------------------------------+
37513757
| Block screenshots and screen recordings when | - System Config path: **Environment > Mobile Security** |
37523758
| using the mobile app. Screenshots will | - ``config.json setting``: ``".NativeAppSettings.MobilePreventScreenCapture": false",`` |
@@ -3880,7 +3886,7 @@ This setting isn't available in the System Console and can only be enabled in ``
38803886
Redis cache backend
38813887
~~~~~~~~~~~~~~~~~~~
38823888

3883-
.. include:: ../_static/badges/ent-selfhosted.rst
3889+
.. include:: ../_static/badges/ent-adv-selfhosted.rst
38843890
:start-after: :nosearch:
38853891

38863892
From Mattermost v10.4, Mattermost Enterprise customers can configure `Redis <https://redis.io/>`_ (Remote Dictionary Server) as an alternative cache backend. Redis is an open-source, in-memory data structure store that can be used as a database, cache, and message broker. It supports various data structures and is a top choice for its performance because its able to store data in memory and provide very quick data access.

source/configure/site-configuration-settings.rst

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1779,9 +1779,6 @@ Allow file sharing
17791779
Allow file uploads on mobile
17801780
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17811781

1782-
.. include:: ../_static/badges/ent-only.rst
1783-
:start-after: :nosearch:
1784-
17851782
+---------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------+
17861783
| - **true**: **(Default)** Allows users to attach files to messages from mobile apps. | - System Config path: **Site Configuration > File Sharing and Downloads** |
17871784
| - **false**: Prevents users from attaching files (including images) to messages from mobile apps. | - ``config.json`` setting: ``FileSettings`` > ``EnableMobileUpload`` > ``true`` |
@@ -1800,9 +1797,6 @@ Allow file uploads on mobile
18001797
Allow file downloads on mobile
18011798
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
18021799

1803-
.. include:: ../_static/badges/ent-only.rst
1804-
:start-after: :nosearch:
1805-
18061800
+----------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------+
18071801
| - **true**: **(Default)** Enables file downloads on mobile apps. | - System Config path: **Site Configuration > File sharing and downloads** |
18081802
| - **false**: Disables file downloads on mobile apps. Users can still download files from a mobile web browser. | - ``config.json`` setting: ``FileSettings`` > ``EnableMobileDownload`` > ``true`` |
@@ -1905,7 +1899,7 @@ Enable end user notices
19051899
Connected workspaces
19061900
---------------------------
19071901

1908-
.. include:: ../_static/badges/ent-cloud-selfhosted.rst
1902+
.. include:: ../_static/badges/ent-adv-cloud-selfhosted.rst
19091903
:start-after: :nosearch:
19101904

19111905
The following settings aren't available in the System Console and can only be set in ``config.json``.

source/deploy/mobile/mobile-security-features.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Mobile security features
22
========================
33

4-
.. include:: ../../_static/badges/ent-cloud-selfhosted.rst
4+
.. include:: ../../_static/badges/ent-adv-cloud-selfhosted.rst
55
:start-after: :nosearch:
66

77
This document outlines the key security features implemented in the mobile application, explains the significance of each control, and details our continuous security practices to maintain an up-to-date security posture.

source/integrate/mattermost-mission-collaboration-for-m365.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Connect Microsoft 365, Teams, and Outlook with Mattermost
22
==========================================================
33

4-
.. include:: ../_static/badges/ent-cloud-selfhosted.rst
4+
.. include:: ../_static/badges/ent-adv-cloud-selfhosted.rst
55
:start-after: :nosearch:
66

77
Mattermost Mission Collaboration for Microsoft extends Microsoft for mission-critical coordination, command and control, incident response, and DevSecOps workflows in demanding environments, including air-gapped and classified networks. Use data-sovereign tools like secure chat, Playbooks, and Calls directly within M365, Teams, and Outlook.

source/onboard/connected-workspaces.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Connected workspaces
22
====================
33

4-
.. include:: ../_static/badges/ent-cloud-selfhosted.rst
4+
.. include:: ../_static/badges/ent-adv-cloud-selfhosted.rst
55
:start-after: :nosearch:
66

77
Communicate across organizations, as well as external partners and vendors using Mattermost by synchronizing messages, emoji reactions, and file sharing in real-time through secured, connected Mattermost workspaces.

source/scale/redis.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Redis
22
=====
33

4-
.. include:: ../_static/badges/ent-cloud-selfhosted.rst
4+
.. include:: ../_static/badges/ent-adv-cloud-selfhosted.rst
55
:start-after: :nosearch:
66

77
Redis is an open-source, in-memory data structure store used as a database, cache, message broker, and streaming engine. Mattermost uses Redis as an external cache to improve performance at scale. When properly configured, Redis can help support Mattermost installations with more than 100,000 users by providing improved performance through efficient caching.

0 commit comments

Comments
 (0)