From cb3019b35408dadff96272ab9636474e72a62aeb Mon Sep 17 00:00:00 2001 From: Amy Blais <29708087+amyblais@users.noreply.github.com> Date: Thu, 16 Apr 2026 09:19:33 +0300 Subject: [PATCH 1/3] Update conf.py --- source/conf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/conf.py b/source/conf.py index 5ab87f200be..daac07ee0c6 100644 --- a/source/conf.py +++ b/source/conf.py @@ -526,9 +526,9 @@ def setup(app: Sphinx): # built documents. # # The short X.Y version. -# version = '11.6' +# version = '11.7' # The full version, including alpha/beta/rc tags. -# release = '11.6' +# release = '11.7' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. From b19d6333451576cb676277832a2ab7b55f7e909f Mon Sep 17 00:00:00 2001 From: Amy Blais <29708087+amyblais@users.noreply.github.com> Date: Mon, 20 Apr 2026 14:02:07 +0300 Subject: [PATCH 2/3] Update ESR docs (#8912) * Update ESR docs to reflect v10.11 end-of-life on August 15, 2026 Update placeholder ESR notices across docs to indicate that Mattermost Server v10.11 ESR is coming to end of life on August 15, 2026, and that upgrading to v11.7 or later is recommended. Also update upgrade path examples to include v11.7 ESR. Co-authored-by: Amy Blais * Update common-esr-support-upgrade.md * Update release-policy.md --------- Co-authored-by: claude[bot] <41898282+claude[bot]@users.noreply.github.com> Co-authored-by: Amy Blais --- .../upgrade/prepare-to-upgrade-mattermost.rst | 2 +- source/product-overview/common-esr-support-rst.rst | 2 +- source/product-overview/common-esr-support-upgrade.md | 6 +++--- source/product-overview/common-esr-support.md | 2 +- source/product-overview/release-policy.md | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/source/administration-guide/upgrade/prepare-to-upgrade-mattermost.rst b/source/administration-guide/upgrade/prepare-to-upgrade-mattermost.rst index a016138c88d..37eddc87485 100644 --- a/source/administration-guide/upgrade/prepare-to-upgrade-mattermost.rst +++ b/source/administration-guide/upgrade/prepare-to-upgrade-mattermost.rst @@ -58,7 +58,7 @@ We strongly recommend that you: - Upgrade your instance of Mattermost to the latest :doc:`Extended Support Release (ESR) ` first before attempting to run the Mattermost v6.0 upgrade. .. important:: - Support for Mattermost Server v10.5 :doc:`Extended Support Release ` has come to the end of its life cycle on November 15, 2025. Upgrading to Mattermost Server v10.11 Extended Support Release or later is required. Upgrading from the previous Extended Support Release to the latest Extended Support Release is supported. Review the :doc:`important-upgrade-notes` for all intermediate versions in between to ensure you’re aware of the possible migrations that could affect your upgrade. + Support for Mattermost Server v10.11 :doc:`Extended Support Release ` is coming to the end of its life cycle on August 15, 2026. Upgrading to Mattermost Server v11.7 Extended Support Release or later is recommended. Upgrading from the previous Extended Support Release to the latest Extended Support Release is supported. Review the :doc:`important-upgrade-notes` for all intermediate versions in between to ensure you’re aware of the possible migrations that could affect your upgrade. v6.0 database schema migrations ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/source/product-overview/common-esr-support-rst.rst b/source/product-overview/common-esr-support-rst.rst index cd0b79d968c..dd9efb1dbcb 100644 --- a/source/product-overview/common-esr-support-rst.rst +++ b/source/product-overview/common-esr-support-rst.rst @@ -1,3 +1,3 @@ .. important:: - Support for Mattermost Server v10.5 :ref:`Extended Support Release ` has come to the end of its life cycle on November 15, 2025. Upgrading to :doc:`Mattermost Server v10.11 or later ` is required. + Support for Mattermost Server v10.11 :ref:`Extended Support Release ` is coming to the end of its life cycle on August 15, 2026. Upgrading to :doc:`Mattermost Server v11.7 or later ` is recommended. diff --git a/source/product-overview/common-esr-support-upgrade.md b/source/product-overview/common-esr-support-upgrade.md index b914a80e0be..ca29711085c 100644 --- a/source/product-overview/common-esr-support-upgrade.md +++ b/source/product-overview/common-esr-support-upgrade.md @@ -1,7 +1,7 @@ -- Support for Mattermost Server v10.5 [Extended Support Release](https://docs.mattermost.com/product-overview/release-policy.html#extended-support-releases) has come to the end of its life cycle on November 15, 2025. Upgrading to Mattermost Server v10.11 or later is required. -- Upgrading from one Extended Support Release (ESR) to the next ESR (``major`` -> ``major_next``) is fully supported and tested. However, upgrading across multiple ESR versions (``major`` to ``major+2``) is supported, but not tested. If you plan to skip versions, we strongly recommend upgrading only between ESR releases. For example, if you're upgrading from v8.1 ESR, upgrade to the v9.5 ESR or the v9.11 ESR before attempting to upgrade to the [v10.5 ESR](https://docs.mattermost.com/product-overview/mattermost-v10-changelog.html#release-v10-5-extended-support-release) or the [v10.11 ESR](https://docs.mattermost.com/product-overview/mattermost-v10-changelog.html#release-v10-11-extended-support-release). +- Support for Mattermost Server v10.11 [Extended Support Release](https://docs.mattermost.com/product-overview/release-policy.html#extended-support-releases) is coming to the end of its life cycle on August 15, 2026. Upgrading to Mattermost Server v11.7 or later is recommended. +- Upgrading from one Extended Support Release (ESR) to the next ESR (``major`` -> ``major_next``) is fully supported and tested. However, upgrading across multiple ESR versions (``major`` to ``major+2``) is supported, but not tested. If you plan to skip versions, we strongly recommend upgrading only between ESR releases. For example, if you're upgrading from v8.1 ESR, upgrade to the v9.5 ESR or the v9.11 ESR before attempting to upgrade to the [v10.11 ESR](https://docs.mattermost.com/product-overview/mattermost-v10-changelog.html#release-v10-11-extended-support-release) or the [v11.7 ESR](https://docs.mattermost.com/product-overview/mattermost-server-releases.html). - See the [Important Upgrade Notes](https://docs.mattermost.com/upgrade/important-upgrade-notes.html) documentation for details on upgrading to a newer release. - See the [changelog in progress](https://bit.ly/2nK3cVf) for details about the upcoming release. -- All Mattermost users must accept Mattermost's [Acceptable Use Policy](https://mattermost.com/terms-of-use/#acceptable-use-policy) and [Privacy Policy](https://mattermost.com/privacy-policy/) when creating an account or accessing Mattermost. For customers with a Mattermost subscription, including self-hosted deployments, organizations may replace or override the Acceptable Use Policy in the [Mattermost System Console](https://docs.mattermost.com/administration-guide/configure/site-configuration-settings.html#terms-of-use-link) with their own acceptable use or conduct policies, based on contractual terms with Mattermost, so long as your own terms either incorporate the Acceptable Use Policy or include equivalent terms. If you change the default link to add your own terms for using the service you provide, your new terms must include a link to the default terms so end users are aware of the Mattermost Acceptable Use Policy for Mattermost software. \ No newline at end of file +- All Mattermost users must accept Mattermost's [Acceptable Use Policy](https://mattermost.com/terms-of-use/#acceptable-use-policy) and [Privacy Policy](https://mattermost.com/privacy-policy/) when creating an account or accessing Mattermost. For customers with a Mattermost subscription, including self-hosted deployments, organizations may replace or override the Acceptable Use Policy in the [Mattermost System Console](https://docs.mattermost.com/administration-guide/configure/site-configuration-settings.html#terms-of-use-link) with their own acceptable use or conduct policies, based on contractual terms with Mattermost, so long as your own terms either incorporate the Acceptable Use Policy or include equivalent terms. If you change the default link to add your own terms for using the service you provide, your new terms must include a link to the default terms so end users are aware of the Mattermost Acceptable Use Policy for Mattermost software. diff --git a/source/product-overview/common-esr-support.md b/source/product-overview/common-esr-support.md index 1701b5493f8..f04561abba2 100644 --- a/source/product-overview/common-esr-support.md +++ b/source/product-overview/common-esr-support.md @@ -1,4 +1,4 @@ -- Support for Mattermost Server v10.5 [Extended Support Release](https://docs.mattermost.com/product-overview/release-policy.html#extended-support-releases) has come to the end of its life cycle on November 15, 2025. Upgrading to [Mattermost Server v10.11](https://docs.mattermost.com/product-overview/mattermost-v10-changelog.html#release-v10-11-extended-support-release) or later is required. +- Support for Mattermost Server v10.11 [Extended Support Release](https://docs.mattermost.com/product-overview/release-policy.html#extended-support-releases) is coming to the end of its life cycle on August 15, 2026. Upgrading to [Mattermost Server v11.7](https://docs.mattermost.com/product-overview/mattermost-server-releases.html) or later is recommended. - All Mattermost users must accept Mattermost's [Acceptable Use Policy](https://mattermost.com/terms-of-use/#acceptable-use-policy) and [Privacy Policy](https://mattermost.com/privacy-policy/) when creating an account or accessing Mattermost. For customers with a Mattermost subscription, including self-hosted deployments, organizations may replace or override the Acceptable Use Policy in the [Mattermost System Console](https://docs.mattermost.com/administration-guide/configure/site-configuration-settings.html#terms-of-use-link) with their own acceptable use or conduct policies, based on contractual terms with Mattermost, so long as your own terms either incorporate the Acceptable Use Policy or include equivalent terms. If you change the default link to add your own terms for using the service you provide, your new terms must include a link to the default terms so end users are aware of the Mattermost Acceptable Use Policy for Mattermost software. \ No newline at end of file diff --git a/source/product-overview/release-policy.md b/source/product-overview/release-policy.md index a25819b2f17..011246f1d33 100644 --- a/source/product-overview/release-policy.md +++ b/source/product-overview/release-policy.md @@ -58,7 +58,7 @@ gantt v11.4 :active, 2026-02-16, 2026-05-15 v11.5 :active, 2026-03-16, 2026-06-15 v11.6 :active, 2026-04-16, 2026-07-15 - v11.7 & Desktop App v6.2 Extended Support :crit, 2026-05-16, 2027-05-15 + v11.7 & Desktop App v6.2 Extended Support :crit, 2026-05-15, 2027-05-15 ``` **Timeline Legend:** @@ -83,7 +83,7 @@ The following table lists all releases across Mattermost v7.0, v8.0, and v9.0, i ```{Important} - If you're on a legacy Mattermost release prior to v7.1, in order to take advantage of newer Mattermost releases, you must upgrade to [v7.1 ESR](https://docs.mattermost.com/product-overview/unsupported-legacy-releases.html#release-v7-1-extended-support-release) at a minimum. -- Upgrading from one Extended Support Release (ESR) to the next ESR (``major`` -> ``major_next``) is fully supported and tested. However, upgrading across multiple ESR versions (``major`` to ``major+2``) is supported, but not tested. If you plan to skip versions, we strongly recommend upgrading only between ESR releases. For example, if you're upgrading from v8.1 ESR, upgrade to the v9.5 ESR or the v9.11 ESR before attempting to upgrade to the [v10.5 ESR](https://docs.mattermost.com/product-overview/mattermost-v10-changelog.html#release-v10-5-extended-support-release) or the [v10.11 ESR](https://docs.mattermost.com/product-overview/mattermost-v10-changelog.html#release-v10-11-extended-support-release). +- Upgrading from one Extended Support Release (ESR) to the next ESR (``major`` -> ``major_next``) is fully supported and tested. However, upgrading across multiple ESR versions (``major`` to ``major+2``) is supported, but not tested. If you plan to skip versions, we strongly recommend upgrading only between ESR releases. For example, if you're upgrading from v8.1 ESR, upgrade to the v9.5 ESR or the v9.11 ESR before attempting to upgrade to the [v10.11 ESR](https://docs.mattermost.com/product-overview/mattermost-v10-changelog.html#release-v10-11-extended-support-release) or the [v11.7 ESR](https://docs.mattermost.com/product-overview/mattermost-server-releases.html). ``` | **Release** | **Release Type** | **Support ended** | From 032c883262e601db57c2810e7e44d6966f809ebd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Garc=C3=ADa=20Montoro?= Date: Fri, 24 Apr 2026 17:45:24 +0200 Subject: [PATCH 3/3] MM-67433, MM-66612, MM-67291: Add new ES/OS changes (#8882) * Add new ES/OS behaviour on outages * Document new fast-fail behaviour and health metric --- ...igure-mattermost-for-enterprise-search.rst | 2 +- .../scale/enterprise-search.rst | 43 +++++++++++++++++++ .../scale/performance-monitoring-metrics.rst | 1 + 3 files changed, 45 insertions(+), 1 deletion(-) diff --git a/source/administration-guide/scale/common-configure-mattermost-for-enterprise-search.rst b/source/administration-guide/scale/common-configure-mattermost-for-enterprise-search.rst index 7222c77b90f..0cf16c7d63d 100644 --- a/source/administration-guide/scale/common-configure-mattermost-for-enterprise-search.rst +++ b/source/administration-guide/scale/common-configure-mattermost-for-enterprise-search.rst @@ -40,7 +40,7 @@ Set **Enable Elasticsearch for search queries** to ``true``, and setting **Enabl .. warning:: - For high post volume deployments, we also strongly recommend *disabling* Database Search once Elasticsearch or AWS OpenSearch is fully configured and running. The Mattermost Server will fall back on Database search if ElasticSearch or OpenSearch are unavailable which can lead to performance degradation on high post volume deployments. + For high post volume deployments, we also strongly recommend *disabling* Database Search once Elasticsearch or AWS OpenSearch is fully configured and running. The Mattermost Server will fall back on Database search if Elasticsearch or OpenSearch are unavailable, which can lead to performance degradation on high post volume deployments. From Mattermost v11.7, the server proactively detects outages through periodic health checks and falls back to database search on the first health check failure, rather than waiting for requests to time out. See the :ref:`outage handling FAQ ` for details. Once the configuration is saved, new posts made to the database are automatically indexed on the Elasticsearch or AWS OpenSearch server. diff --git a/source/administration-guide/scale/enterprise-search.rst b/source/administration-guide/scale/enterprise-search.rst index b239b2cfff4..49109a638f8 100644 --- a/source/administration-guide/scale/enterprise-search.rst +++ b/source/administration-guide/scale/enterprise-search.rst @@ -129,6 +129,49 @@ From Mattermost v11, :doc:`Support Packet generation ` for search engine outages. See :doc:`performance monitoring metrics ` for details. + +During an outage, you may see the following log messages: + +.. list-table:: + :widths: 15 45 40 + :header-rows: 1 + + * - Level + - Log message + - Meaning + * - Error + - ``Search engine health check failed repeatedly; stopping engine`` + - The failure threshold was reached and the engine has been stopped. Search falls back to the database. + * - Warn + - ``Search engine health check failed`` + - An individual health check failed. Includes a ``consecutive_failures`` count. + * - Warn + - ``Search engine health check failed: it is now marked as unhealthy`` + - A previously healthy engine failed a health check and has been marked unhealthy. Search requests will fall back to the database immediately. + * - Warn + - ``Search engine watcher: Start() failed, will retry`` + - A reconnection attempt failed. Includes a ``next_backoff`` field indicating the time until the next retry. + * - Info + - ``Search engine health check succeeded: it is now marked as healthy`` + - The engine passed a health check after being unhealthy and is now handling search requests again. + * - Info + - ``Search engine watcher: engine started successfully`` + - The engine has recovered and is active again. + * - Info + - ``Search engine watcher: engine disabled, parking`` + - The health monitor is idle because the search engine is disabled in configuration. + My search indexes won't complete, what should I do? ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/source/administration-guide/scale/performance-monitoring-metrics.rst b/source/administration-guide/scale/performance-monitoring-metrics.rst index dda3ceb64f2..14e89995d2a 100644 --- a/source/administration-guide/scale/performance-monitoring-metrics.rst +++ b/source/administration-guide/scale/performance-monitoring-metrics.rst @@ -118,6 +118,7 @@ Search metrics - ``mattermost_search_post_index_total``: The total number of posts indexes carried out. - ``mattermost_search_posts_searches_total``: The total number of post searches carried out. - ``mattermost_search_user_index_total``: The total number of user indexes carried out. +- ``mattermost_search_engine_status``: Status of the configured search engine: ``1`` = healthy or not configured, ``0`` = configured but unavailable. Use this metric to set up alerts for search engine outages. WebSocket metrics ~~~~~~~~~~~~~~~~~