From efbe578d54a955c6d6fb333d7ba0b95da85555fe Mon Sep 17 00:00:00 2001
From: Amy Blais <29708087+amyblais@users.noreply.github.com>
Date: Wed, 18 Dec 2024 08:31:47 +0200
Subject: [PATCH 01/11] Update conf.py (#7666)

---
 source/conf.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/conf.py b/source/conf.py
index 7dee1fe57ce..7f40c24f77a 100644
--- a/source/conf.py
+++ b/source/conf.py
@@ -3758,9 +3758,9 @@ def setup(_: Sphinx):
 # built documents.
 #
 # The short X.Y version.
-# version = '10.3'
+# version = '10.4'
 # The full version, including alpha/beta/rc tags.
-# release = '10.3'
+# release = '10.4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

From e38d5fcc6cc0659eac130a0f90d7dc7d21a17b75 Mon Sep 17 00:00:00 2001
From: "Carrie Warner (Mattermost)"
 <74422101+cwarnermm@users.noreply.github.com>
Date: Tue, 7 Jan 2025 10:44:04 -0500
Subject: [PATCH 02/11] Added testing note

---
 source/scale/scaling-for-enterprise.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/source/scale/scaling-for-enterprise.rst b/source/scale/scaling-for-enterprise.rst
index c84984ea8d9..b3a3372a915 100644
--- a/source/scale/scaling-for-enterprise.rst
+++ b/source/scale/scaling-for-enterprise.rst
@@ -23,6 +23,10 @@ The following reference architectures are available as recommended starting poin
 * :doc:`Scale up to 90000 users </scale/scale-to-90000-users>` - Learn how to scale Mattermost to up to 90000 users.
 * :doc:`Scale up to 100000 users </scale/scale-to-100000-users>` - Learn how to scale Mattermost to up to 100000 users.
 
+.. important::
+
+    Due to constraints in testing, both the proxy instance and the Elasticsearch cluster specifications were fixed for all the tests from which we derived these reference architectures. This was done to avoid a combinatorial explosion of variables in tests, but it resulted in minor gaps in our understandings of certain aspects of the reference architectures. In particular, the proxy instance is overspecified for the smaller user counts, while the Elasticsearch cluster is underspecified for user counts of 30k users or more.
+
 Testing methodology and updates
 --------------------------------
 

From 648c8b47f9f7675370f6e9b6279d3655f66b5d1f Mon Sep 17 00:00:00 2001
From: "Carrie Warner (Mattermost)"
 <74422101+cwarnermm@users.noreply.github.com>
Date: Fri, 24 Jan 2025 13:53:22 -0500
Subject: [PATCH 03/11] Incorporated reviewer feedback

---
 source/scale/scale-to-100000-users.rst | 29 ++++++++++++-----------
 source/scale/scale-to-30000-users.rst  | 32 ++++++++++++++------------
 source/scale/scale-to-50000-users.rst  | 32 ++++++++++++++------------
 source/scale/scale-to-80000-users.rst  | 32 ++++++++++++++------------
 source/scale/scale-to-90000-users.rst  | 32 ++++++++++++++------------
 5 files changed, 83 insertions(+), 74 deletions(-)

diff --git a/source/scale/scale-to-100000-users.rst b/source/scale/scale-to-100000-users.rst
index 2a968a00700..ebbf483efe9 100644
--- a/source/scale/scale-to-100000-users.rst
+++ b/source/scale/scale-to-100000-users.rst
@@ -12,24 +12,25 @@ This page describes the Mattermost reference architecture designed for the load
 .. note::
   - Usage of CPU, RAM, and storage space can vary significantly based on user behavior. These hardware recommendations are based on traditional deployments and may grow or shrink depending on how active your users are.
   - From Mattermost v10.4, Mattermost Enterprise customers can configure `Redis <https://redis.io/>`_ (Remote Dictionary Server) as an alternative cache backend. Using Redis can help ensure that Mattermost remains performant and efficient, even under heavy usage. See the :ref:`Redis cache backend <configure/environment-configuration-settings:redis cache backend>` configuration settings documentation for details.
+  - While the following specifications may be more than sufficient for some use cases, we have not extensively tested configurations with lower resource allocations for this user scale. If cost optimization is a priority, admins may choose to experiment with smaller configurations, but we recommend starting with the tested specifications to ensure system stability and performance. Keep in mind that under-provisioning can lead to degraded user experience and additional troubleshooting effort.
 
 Requirements
 ------------
 
-+------------------------+-----------+----------------+-------------------+
-| **Resource Type**      | **Nodes** | **vCPU/        | **AWS Instance**  |
-|                        |           | Memory (GiB)** |                   |
-+========================+===========+================+===================+
-| Mattermost Application | 6         | 16/32          | c7i.4xlarge       |
-+------------------------+-----------+----------------+-------------------+
-| RDS Writer             | 1         | 16/128         | db.r7g.4xlarge    |
-+------------------------+-----------+----------------+-------------------+
-| RDS Reader             | 5         | 16/128         | db.r7g.4xlarge    |
-+------------------------+-----------+----------------+-------------------+
-| Elasticsearch Node     | 2         | 4/32           | r6g.xlarge.search |
-+------------------------+-----------+----------------+-------------------+
-| Proxy                  | 1         | 16/64          | m7i.4xlarge       |
-+------------------------+-----------+----------------+-------------------+
++------------------------+-----------+----------------+-----------------------+
+| **Resource Type**      | **Nodes** | **vCPU/        | **AWS Instance**      |
+|                        |           | Memory (GiB)** |                       |
++========================+===========+================+=======================+
+| Mattermost Application | 6         | 16/32          | c7i.4xlarge           |
++------------------------+-----------+----------------+-----------------------+
+| RDS Writer             | 1         | 16/128         | db.r7g.4xlarge        |
++------------------------+-----------+----------------+-----------------------+
+| RDS Reader             | 5         | 16/128         | db.r7g.4xlarge        |
++------------------------+-----------+----------------+-----------------------+
+| Elasticsearch Node     | 2         | 4/32           | 4 x r6g.xlarge.search |
++------------------------+-----------+----------------+-----------------------+
+| Proxy                  | 1         | 16/64          | m7i.4xlarge           |
++------------------------+-----------+----------------+-----------------------+
 
 Lifetime storage
 ----------------
diff --git a/source/scale/scale-to-30000-users.rst b/source/scale/scale-to-30000-users.rst
index 8332988c5e4..1f8589af8d1 100644
--- a/source/scale/scale-to-30000-users.rst
+++ b/source/scale/scale-to-30000-users.rst
@@ -10,25 +10,27 @@ This page describes the Mattermost reference architecture designed for the load
 - **Database Configuration**: writer, multiple readers
 
 .. note::
-    Usage of CPU, RAM, and storage space can vary significantly based on user behavior. These hardware recommendations are based on traditional deployments and may grow or shrink depending on how active your users are.
+
+  - Usage of CPU, RAM, and storage space can vary significantly based on user behavior. These hardware recommendations are based on traditional deployments and may grow or shrink depending on how active your users are.
+  - While the following specifications may be more than sufficient for some use cases, we have not extensively tested configurations with lower resource allocations for this user scale. If cost optimization is a priority, admins may choose to experiment with smaller configurations, but we recommend starting with the tested specifications to ensure system stability and performance. Keep in mind that under-provisioning can lead to degraded user experience and additional troubleshooting effort.
 
 Requirements
 ------------
 
-+------------------------+-----------+----------------+-------------------+
-| **Resource Type**      | **Nodes** | **vCPU/        | **AWS Instance**  |
-|                        |           | Memory (GiB)** |                   |
-+========================+===========+================+===================+
-| Mattermost Application | 2         | 8/16           | c7i.2xlarge       |
-+------------------------+-----------+----------------+-------------------+
-| RDS Writer             | 1         | 8/64           | db.r7g.2xlarge    |
-+------------------------+-----------+----------------+-------------------+
-| RDS Reader             | 1         | 8/64           | db.r7g.2xlarge    |
-+------------------------+-----------+----------------+-------------------+
-| Elasticsearch Node     | 2         | 4/32           | r6g.xlarge.search |
-+------------------------+-----------+----------------+-------------------+
-| Proxy                  | 1         | 16/64          | m7i.4xlarge       |
-+------------------------+-----------+----------------+-------------------+
++------------------------+-----------+----------------+-----------------------+
+| **Resource Type**      | **Nodes** | **vCPU/        | **AWS Instance**      |
+|                        |           | Memory (GiB)** |                       |
++========================+===========+================+=======================+
+| Mattermost Application | 2         | 8/16           | c7i.2xlarge           |
++------------------------+-----------+----------------+-----------------------+
+| RDS Writer             | 1         | 8/64           | db.r7g.2xlarge        |
++------------------------+-----------+----------------+-----------------------+
+| RDS Reader             | 1         | 8/64           | db.r7g.2xlarge        |
++------------------------+-----------+----------------+-----------------------+
+| Elasticsearch Node     | 2         | 4/32           | 4 x r6g.xlarge.search |
++------------------------+-----------+----------------+-----------------------+
+| Proxy                  | 1         | 16/64          | m7i.4xlarge           |
++------------------------+-----------+----------------+-----------------------+
 
 Lifetime storage
 ----------------
diff --git a/source/scale/scale-to-50000-users.rst b/source/scale/scale-to-50000-users.rst
index 3c9fc62fa64..e50872a5d29 100644
--- a/source/scale/scale-to-50000-users.rst
+++ b/source/scale/scale-to-50000-users.rst
@@ -10,25 +10,27 @@ This page describes the Mattermost reference architecture designed for the load
 - **Database Configuration**: writer, multiple readers
 
 .. note::
-    Usage of CPU, RAM, and storage space can vary significantly based on user behavior. These hardware recommendations are based on traditional deployments and may grow or shrink depending on how active your users are.
+
+  - Usage of CPU, RAM, and storage space can vary significantly based on user behavior. These hardware recommendations are based on traditional deployments and may grow or shrink depending on how active your users are.
+  - While the following specifications may be more than sufficient for some use cases, we have not extensively tested configurations with lower resource allocations for this user scale. If cost optimization is a priority, admins may choose to experiment with smaller configurations, but we recommend starting with the tested specifications to ensure system stability and performance. Keep in mind that under-provisioning can lead to degraded user experience and additional troubleshooting effort.
 
 Requirements
 ------------
 
-+------------------------+-----------+----------------+-------------------+
-| **Resource Type**      | **Nodes** | **vCPU/        | **AWS Instance**  |
-|                        |           | Memory (GiB)** |                   |
-+========================+===========+================+===================+
-| Mattermost Application | 5         | 8/16           | c7i.2xlarge       |
-+------------------------+-----------+----------------+-------------------+
-| RDS Writer             | 1         | 8/64           | db.r7g.2xlarge    |
-+------------------------+-----------+----------------+-------------------+
-| RDS Reader             | 4         | 8/64           | db.r7g.2xlarge    |
-+------------------------+-----------+----------------+-------------------+
-| Elasticsearch Node     | 2         | 4/32           | r6g.xlarge.search |
-+------------------------+-----------+----------------+-------------------+
-| Proxy                  | 1         | 16/64          | m7i.4xlarge       |
-+------------------------+-----------+----------------+-------------------+
++------------------------+-----------+----------------+-----------------------+
+| **Resource Type**      | **Nodes** | **vCPU/        | **AWS Instance**      |
+|                        |           | Memory (GiB)** |                       |
++========================+===========+================+=======================+
+| Mattermost Application | 5         | 8/16           | c7i.2xlarge           |
++------------------------+-----------+----------------+-----------------------+
+| RDS Writer             | 1         | 8/64           | db.r7g.2xlarge        |
++------------------------+-----------+----------------+-----------------------+
+| RDS Reader             | 4         | 8/64           | db.r7g.2xlarge        |
++------------------------+-----------+----------------+-----------------------+
+| Elasticsearch Node     | 2         | 4/32           | 4 x r6g.xlarge.search |
++------------------------+-----------+----------------+-----------------------+
+| Proxy                  | 1         | 16/64          | m7i.4xlarge           |
++------------------------+-----------+----------------+-----------------------+
 
 Lifetime storage
 ----------------
diff --git a/source/scale/scale-to-80000-users.rst b/source/scale/scale-to-80000-users.rst
index 3420865ff71..d93fd8a1418 100644
--- a/source/scale/scale-to-80000-users.rst
+++ b/source/scale/scale-to-80000-users.rst
@@ -10,25 +10,27 @@ This page describes the Mattermost reference architecture designed for the load
 - **Database Configuration**: writer, multiple readers
 
 .. note::
-    Usage of CPU, RAM, and storage space can vary significantly based on user behavior. These hardware recommendations are based on traditional deployments and may grow or shrink depending on how active your users are.
+
+  - Usage of CPU, RAM, and storage space can vary significantly based on user behavior. These hardware recommendations are based on traditional deployments and may grow or shrink depending on how active your users are.
+  - While the following specifications may be more than sufficient for some use cases, we have not extensively tested configurations with lower resource allocations for this user scale. If cost optimization is a priority, admins may choose to experiment with smaller configurations, but we recommend starting with the tested specifications to ensure system stability and performance. Keep in mind that under-provisioning can lead to degraded user experience and additional troubleshooting effort.
 
 Requirements
 ------------
 
-+------------------------+-----------+----------------+-------------------+
-| **Resource Type**      | **Nodes** | **vCPU/        | **AWS Instance**  |
-|                        |           | Memory (GiB)** |                   |
-+========================+===========+================+===================+
-| Mattermost Application | 4         | 16/32          | c7i.4xlarge       |
-+------------------------+-----------+----------------+-------------------+
-| RDS Writer             | 1         | 16/128         | db.r7g.4xlarge    |
-+------------------------+-----------+----------------+-------------------+
-| RDS Reader             | 3         | 16/128         | db.r7g.4xlarge    |
-+------------------------+-----------+----------------+-------------------+
-| Elasticsearch Node     | 2         | 4/32           | r6g.xlarge.search |
-+------------------------+-----------+----------------+-------------------+
-| Proxy                  | 1         | 16/64          | m7i.4xlarge       |
-+------------------------+-----------+----------------+-------------------+
++------------------------+-----------+----------------+-----------------------+
+| **Resource Type**      | **Nodes** | **vCPU/        | **AWS Instance**      |
+|                        |           | Memory (GiB)** |                       |
++========================+===========+================+=======================+
+| Mattermost Application | 4         | 16/32          | c7i.4xlarge           |
++------------------------+-----------+----------------+-----------------------+
+| RDS Writer             | 1         | 16/128         | db.r7g.4xlarge        |
++------------------------+-----------+----------------+-----------------------+
+| RDS Reader             | 3         | 16/128         | db.r7g.4xlarge        |
++------------------------+-----------+----------------+-----------------------+
+| Elasticsearch Node     | 2         | 4/32           | 4 x r6g.xlarge.search |
++------------------------+-----------+----------------+-----------------------+
+| Proxy                  | 1         | 16/64          | m7i.4xlarge           |
++------------------------+-----------+----------------+-----------------------+
 
 Lifetime storage
 ----------------
diff --git a/source/scale/scale-to-90000-users.rst b/source/scale/scale-to-90000-users.rst
index a5c24f6ed54..3389e96548e 100644
--- a/source/scale/scale-to-90000-users.rst
+++ b/source/scale/scale-to-90000-users.rst
@@ -10,25 +10,27 @@ This page describes the Mattermost reference architecture designed for the load
 - **Database Configuration**: writer, multiple readers
 
 .. note::
-    Usage of CPU, RAM, and storage space can vary significantly based on user behavior. These hardware recommendations are based on traditional deployments and may grow or shrink depending on how active your users are.
+
+  - Usage of CPU, RAM, and storage space can vary significantly based on user behavior. These hardware recommendations are based on traditional deployments and may grow or shrink depending on how active your users are.
+  - While the following specifications may be more than sufficient for some use cases, we have not extensively tested configurations with lower resource allocations for this user scale. If cost optimization is a priority, admins may choose to experiment with smaller configurations, but we recommend starting with the tested specifications to ensure system stability and performance. Keep in mind that under-provisioning can lead to degraded user experience and additional troubleshooting effort.
 
 Requirements
 ------------
 
-+------------------------+-----------+----------------+-------------------+
-| **Resource Type**      | **Nodes** | **vCPU/        | **AWS Instance**  |
-|                        |           | Memory (GiB)** |                   |
-+========================+===========+================+===================+
-| Mattermost Application | 5         | 16/32          | c7i.4xlarge       |
-+------------------------+-----------+----------------+-------------------+
-| RDS Writer             | 1         | 16/128         | db.r7g.4xlarge    |
-+------------------------+-----------+----------------+-------------------+
-| RDS Reader             | 4         | 16/128         | db.r7g.4xlarge    |
-+------------------------+-----------+----------------+-------------------+
-| Elasticsearch Node     | 2         | 4/32           | r6g.xlarge.search |
-+------------------------+-----------+----------------+-------------------+
-| Proxy                  | 1         | 16/64          | m7i.4xlarge       |
-+------------------------+-----------+----------------+-------------------+
++------------------------+-----------+----------------+-----------------------+
+| **Resource Type**      | **Nodes** | **vCPU/        | **AWS Instance**      |
+|                        |           | Memory (GiB)** |                       |
++========================+===========+================+=======================+
+| Mattermost Application | 5         | 16/32          | c7i.4xlarge           |
++------------------------+-----------+----------------+-----------------------+
+| RDS Writer             | 1         | 16/128         | db.r7g.4xlarge        |
++------------------------+-----------+----------------+-----------------------+
+| RDS Reader             | 4         | 16/128         | db.r7g.4xlarge        |
++------------------------+-----------+----------------+-----------------------+
+| Elasticsearch Node     | 2         | 4/32           | 4 x r6g.xlarge.search |
++------------------------+-----------+----------------+-----------------------+
+| Proxy                  | 1         | 16/64          | m7i.4xlarge           |
++------------------------+-----------+----------------+-----------------------+
 
 Lifetime storage
 ----------------

From 9b3977bd427efd70f125750e65a79c847cfef4ee Mon Sep 17 00:00:00 2001
From: "Carrie Warner (Mattermost)"
 <74422101+cwarnermm@users.noreply.github.com>
Date: Fri, 24 Jan 2025 14:36:39 -0500
Subject: [PATCH 04/11] Update source/scale/scaling-for-enterprise.rst
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Alejandro García Montoro <alejandro.garciamontoro@gmail.com>
---
 source/scale/scaling-for-enterprise.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/scale/scaling-for-enterprise.rst b/source/scale/scaling-for-enterprise.rst
index b3a3372a915..bf5209a26b2 100644
--- a/source/scale/scaling-for-enterprise.rst
+++ b/source/scale/scaling-for-enterprise.rst
@@ -25,7 +25,7 @@ The following reference architectures are available as recommended starting poin
 
 .. important::
 
-    Due to constraints in testing, both the proxy instance and the Elasticsearch cluster specifications were fixed for all the tests from which we derived these reference architectures. This was done to avoid a combinatorial explosion of variables in tests, but it resulted in minor gaps in our understandings of certain aspects of the reference architectures. In particular, the proxy instance is overspecified for the smaller user counts, while the Elasticsearch cluster is underspecified for user counts of 30k users or more.
+    Due to constraints in testing, the proxy instance specifications were fixed for all the tests from which we derived these reference architectures. This was done to avoid a combinatorial explosion of variables in tests, but it resulted in minor gaps in our understandings of certain aspects of the reference architectures. In particular, the proxy instance is overspecified for the smaller user counts.
 
 Testing methodology and updates
 --------------------------------

From a60d6221f814a229a48d6bbe4ec4e8fc5c9686dc Mon Sep 17 00:00:00 2001
From: "Carrie Warner (Mattermost)"
 <74422101+cwarnermm@users.noreply.github.com>
Date: Fri, 24 Jan 2025 14:41:35 -0500
Subject: [PATCH 05/11] Incorporated reviewer corrections

---
 source/scale/scale-to-100000-users.rst | 2 +-
 source/scale/scale-to-30000-users.rst  | 2 +-
 source/scale/scale-to-50000-users.rst  | 2 +-
 source/scale/scale-to-80000-users.rst  | 2 +-
 source/scale/scale-to-90000-users.rst  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/source/scale/scale-to-100000-users.rst b/source/scale/scale-to-100000-users.rst
index ebbf483efe9..ba959af5e3e 100644
--- a/source/scale/scale-to-100000-users.rst
+++ b/source/scale/scale-to-100000-users.rst
@@ -27,7 +27,7 @@ Requirements
 +------------------------+-----------+----------------+-----------------------+
 | RDS Reader             | 5         | 16/128         | db.r7g.4xlarge        |
 +------------------------+-----------+----------------+-----------------------+
-| Elasticsearch Node     | 2         | 4/32           | 4 x r6g.xlarge.search |
+| Elasticsearch cluster  | 4         | 8/64           | r6g.2xlarge.search    |
 +------------------------+-----------+----------------+-----------------------+
 | Proxy                  | 1         | 16/64          | m7i.4xlarge           |
 +------------------------+-----------+----------------+-----------------------+
diff --git a/source/scale/scale-to-30000-users.rst b/source/scale/scale-to-30000-users.rst
index 1f8589af8d1..8efb8d91643 100644
--- a/source/scale/scale-to-30000-users.rst
+++ b/source/scale/scale-to-30000-users.rst
@@ -27,7 +27,7 @@ Requirements
 +------------------------+-----------+----------------+-----------------------+
 | RDS Reader             | 1         | 8/64           | db.r7g.2xlarge        |
 +------------------------+-----------+----------------+-----------------------+
-| Elasticsearch Node     | 2         | 4/32           | 4 x r6g.xlarge.search |
+| Elasticsearch cluster  | 4         | 8/64           | r6g.2xlarge.search    |
 +------------------------+-----------+----------------+-----------------------+
 | Proxy                  | 1         | 16/64          | m7i.4xlarge           |
 +------------------------+-----------+----------------+-----------------------+
diff --git a/source/scale/scale-to-50000-users.rst b/source/scale/scale-to-50000-users.rst
index e50872a5d29..f4c42e4c8f8 100644
--- a/source/scale/scale-to-50000-users.rst
+++ b/source/scale/scale-to-50000-users.rst
@@ -27,7 +27,7 @@ Requirements
 +------------------------+-----------+----------------+-----------------------+
 | RDS Reader             | 4         | 8/64           | db.r7g.2xlarge        |
 +------------------------+-----------+----------------+-----------------------+
-| Elasticsearch Node     | 2         | 4/32           | 4 x r6g.xlarge.search |
+| Elasticsearch cluster  | 4         | 8/64           | r6g.2xlarge.search    |
 +------------------------+-----------+----------------+-----------------------+
 | Proxy                  | 1         | 16/64          | m7i.4xlarge           |
 +------------------------+-----------+----------------+-----------------------+
diff --git a/source/scale/scale-to-80000-users.rst b/source/scale/scale-to-80000-users.rst
index d93fd8a1418..78ee054a9dd 100644
--- a/source/scale/scale-to-80000-users.rst
+++ b/source/scale/scale-to-80000-users.rst
@@ -27,7 +27,7 @@ Requirements
 +------------------------+-----------+----------------+-----------------------+
 | RDS Reader             | 3         | 16/128         | db.r7g.4xlarge        |
 +------------------------+-----------+----------------+-----------------------+
-| Elasticsearch Node     | 2         | 4/32           | 4 x r6g.xlarge.search |
+| Elasticsearch cluster  | 4         | 8/64           | r6g.xlarge.search     |
 +------------------------+-----------+----------------+-----------------------+
 | Proxy                  | 1         | 16/64          | m7i.4xlarge           |
 +------------------------+-----------+----------------+-----------------------+
diff --git a/source/scale/scale-to-90000-users.rst b/source/scale/scale-to-90000-users.rst
index 3389e96548e..ad17aca670d 100644
--- a/source/scale/scale-to-90000-users.rst
+++ b/source/scale/scale-to-90000-users.rst
@@ -27,7 +27,7 @@ Requirements
 +------------------------+-----------+----------------+-----------------------+
 | RDS Reader             | 4         | 16/128         | db.r7g.4xlarge        |
 +------------------------+-----------+----------------+-----------------------+
-| Elasticsearch Node     | 2         | 4/32           | 4 x r6g.xlarge.search |
+| Elasticsearch cluster  | 4         | 8/64           | r6g.2xlarge.search    |
 +------------------------+-----------+----------------+-----------------------+
 | Proxy                  | 1         | 16/64          | m7i.4xlarge           |
 +------------------------+-----------+----------------+-----------------------+

From ab9840d906b729c3098d150e188857e607021c74 Mon Sep 17 00:00:00 2001
From: "Carrie Warner (Mattermost)"
 <74422101+cwarnermm@users.noreply.github.com>
Date: Fri, 24 Jan 2025 14:42:15 -0500
Subject: [PATCH 06/11] Update source/scale/scale-to-100000-users.rst

---
 source/scale/scale-to-100000-users.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/scale/scale-to-100000-users.rst b/source/scale/scale-to-100000-users.rst
index ba959af5e3e..2d5a4f8fb22 100644
--- a/source/scale/scale-to-100000-users.rst
+++ b/source/scale/scale-to-100000-users.rst
@@ -12,7 +12,7 @@ This page describes the Mattermost reference architecture designed for the load
 .. note::
   - Usage of CPU, RAM, and storage space can vary significantly based on user behavior. These hardware recommendations are based on traditional deployments and may grow or shrink depending on how active your users are.
   - From Mattermost v10.4, Mattermost Enterprise customers can configure `Redis <https://redis.io/>`_ (Remote Dictionary Server) as an alternative cache backend. Using Redis can help ensure that Mattermost remains performant and efficient, even under heavy usage. See the :ref:`Redis cache backend <configure/environment-configuration-settings:redis cache backend>` configuration settings documentation for details.
-  - While the following specifications may be more than sufficient for some use cases, we have not extensively tested configurations with lower resource allocations for this user scale. If cost optimization is a priority, admins may choose to experiment with smaller configurations, but we recommend starting with the tested specifications to ensure system stability and performance. Keep in mind that under-provisioning can lead to degraded user experience and additional troubleshooting effort.
+  - While the following Elasticsearch specifications may be more than sufficient for some use cases, we have not extensively tested configurations with lower resource allocations for this user scale. If cost optimization is a priority, admins may choose to experiment with smaller configurations, but we recommend starting with the tested specifications to ensure system stability and performance. Keep in mind that under-provisioning can lead to degraded user experience and additional troubleshooting effort.
 
 Requirements
 ------------

From ffe967eb1e641fc9b75bc18f4ff5688cafd86cb6 Mon Sep 17 00:00:00 2001
From: "Carrie Warner (Mattermost)"
 <74422101+cwarnermm@users.noreply.github.com>
Date: Fri, 24 Jan 2025 14:42:24 -0500
Subject: [PATCH 07/11] Update source/scale/scale-to-30000-users.rst

---
 source/scale/scale-to-30000-users.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/scale/scale-to-30000-users.rst b/source/scale/scale-to-30000-users.rst
index 8efb8d91643..6ceb62711ed 100644
--- a/source/scale/scale-to-30000-users.rst
+++ b/source/scale/scale-to-30000-users.rst
@@ -12,7 +12,7 @@ This page describes the Mattermost reference architecture designed for the load
 .. note::
 
   - Usage of CPU, RAM, and storage space can vary significantly based on user behavior. These hardware recommendations are based on traditional deployments and may grow or shrink depending on how active your users are.
-  - While the following specifications may be more than sufficient for some use cases, we have not extensively tested configurations with lower resource allocations for this user scale. If cost optimization is a priority, admins may choose to experiment with smaller configurations, but we recommend starting with the tested specifications to ensure system stability and performance. Keep in mind that under-provisioning can lead to degraded user experience and additional troubleshooting effort.
+  - While the following Elasticsearch specifications may be more than sufficient for some use cases, we have not extensively tested configurations with lower resource allocations for this user scale. If cost optimization is a priority, admins may choose to experiment with smaller configurations, but we recommend starting with the tested specifications to ensure system stability and performance. Keep in mind that under-provisioning can lead to degraded user experience and additional troubleshooting effort.
 
 Requirements
 ------------

From 9c7c66de328b572398ce7641b65e2a837f5f7ac7 Mon Sep 17 00:00:00 2001
From: "Carrie Warner (Mattermost)"
 <74422101+cwarnermm@users.noreply.github.com>
Date: Fri, 24 Jan 2025 14:42:36 -0500
Subject: [PATCH 08/11] Update source/scale/scale-to-50000-users.rst

---
 source/scale/scale-to-50000-users.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/scale/scale-to-50000-users.rst b/source/scale/scale-to-50000-users.rst
index f4c42e4c8f8..dbae7d6bb2b 100644
--- a/source/scale/scale-to-50000-users.rst
+++ b/source/scale/scale-to-50000-users.rst
@@ -12,7 +12,7 @@ This page describes the Mattermost reference architecture designed for the load
 .. note::
 
   - Usage of CPU, RAM, and storage space can vary significantly based on user behavior. These hardware recommendations are based on traditional deployments and may grow or shrink depending on how active your users are.
-  - While the following specifications may be more than sufficient for some use cases, we have not extensively tested configurations with lower resource allocations for this user scale. If cost optimization is a priority, admins may choose to experiment with smaller configurations, but we recommend starting with the tested specifications to ensure system stability and performance. Keep in mind that under-provisioning can lead to degraded user experience and additional troubleshooting effort.
+  - While the following Elasticsearch specifications may be more than sufficient for some use cases, we have not extensively tested configurations with lower resource allocations for this user scale. If cost optimization is a priority, admins may choose to experiment with smaller configurations, but we recommend starting with the tested specifications to ensure system stability and performance. Keep in mind that under-provisioning can lead to degraded user experience and additional troubleshooting effort.
 
 Requirements
 ------------

From 11707e793d9304d756697c7ecc03446027834355 Mon Sep 17 00:00:00 2001
From: "Carrie Warner (Mattermost)"
 <74422101+cwarnermm@users.noreply.github.com>
Date: Fri, 24 Jan 2025 14:42:52 -0500
Subject: [PATCH 09/11] Update source/scale/scale-to-80000-users.rst

---
 source/scale/scale-to-80000-users.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/scale/scale-to-80000-users.rst b/source/scale/scale-to-80000-users.rst
index 78ee054a9dd..a4050b1f1aa 100644
--- a/source/scale/scale-to-80000-users.rst
+++ b/source/scale/scale-to-80000-users.rst
@@ -12,7 +12,7 @@ This page describes the Mattermost reference architecture designed for the load
 .. note::
 
   - Usage of CPU, RAM, and storage space can vary significantly based on user behavior. These hardware recommendations are based on traditional deployments and may grow or shrink depending on how active your users are.
-  - While the following specifications may be more than sufficient for some use cases, we have not extensively tested configurations with lower resource allocations for this user scale. If cost optimization is a priority, admins may choose to experiment with smaller configurations, but we recommend starting with the tested specifications to ensure system stability and performance. Keep in mind that under-provisioning can lead to degraded user experience and additional troubleshooting effort.
+  - While the following Elasticsearch specifications may be more than sufficient for some use cases, we have not extensively tested configurations with lower resource allocations for this user scale. If cost optimization is a priority, admins may choose to experiment with smaller configurations, but we recommend starting with the tested specifications to ensure system stability and performance. Keep in mind that under-provisioning can lead to degraded user experience and additional troubleshooting effort.
 
 Requirements
 ------------

From 62030a38118e1910fb3442915113542387850c7d Mon Sep 17 00:00:00 2001
From: "Carrie Warner (Mattermost)"
 <74422101+cwarnermm@users.noreply.github.com>
Date: Fri, 24 Jan 2025 14:43:03 -0500
Subject: [PATCH 10/11] Update source/scale/scale-to-90000-users.rst

---
 source/scale/scale-to-90000-users.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/scale/scale-to-90000-users.rst b/source/scale/scale-to-90000-users.rst
index ad17aca670d..2d8d783c1bf 100644
--- a/source/scale/scale-to-90000-users.rst
+++ b/source/scale/scale-to-90000-users.rst
@@ -12,7 +12,7 @@ This page describes the Mattermost reference architecture designed for the load
 .. note::
 
   - Usage of CPU, RAM, and storage space can vary significantly based on user behavior. These hardware recommendations are based on traditional deployments and may grow or shrink depending on how active your users are.
-  - While the following specifications may be more than sufficient for some use cases, we have not extensively tested configurations with lower resource allocations for this user scale. If cost optimization is a priority, admins may choose to experiment with smaller configurations, but we recommend starting with the tested specifications to ensure system stability and performance. Keep in mind that under-provisioning can lead to degraded user experience and additional troubleshooting effort.
+  - While the following Elasticsearch specifications may be more than sufficient for some use cases, we have not extensively tested configurations with lower resource allocations for this user scale. If cost optimization is a priority, admins may choose to experiment with smaller configurations, but we recommend starting with the tested specifications to ensure system stability and performance. Keep in mind that under-provisioning can lead to degraded user experience and additional troubleshooting effort.
 
 Requirements
 ------------

From a998186b6c774628260bad10684ac46c16ace889 Mon Sep 17 00:00:00 2001
From: "Carrie Warner (Mattermost)"
 <74422101+cwarnermm@users.noreply.github.com>
Date: Fri, 24 Jan 2025 14:44:21 -0500
Subject: [PATCH 11/11] Update source/scale/scale-to-80000-users.rst

---
 source/scale/scale-to-80000-users.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/scale/scale-to-80000-users.rst b/source/scale/scale-to-80000-users.rst
index a4050b1f1aa..1050b49a4ba 100644
--- a/source/scale/scale-to-80000-users.rst
+++ b/source/scale/scale-to-80000-users.rst
@@ -27,7 +27,7 @@ Requirements
 +------------------------+-----------+----------------+-----------------------+
 | RDS Reader             | 3         | 16/128         | db.r7g.4xlarge        |
 +------------------------+-----------+----------------+-----------------------+
-| Elasticsearch cluster  | 4         | 8/64           | r6g.xlarge.search     |
+| Elasticsearch cluster  | 4         | 8/64           | r6g.2xlarge.search    |
 +------------------------+-----------+----------------+-----------------------+
 | Proxy                  | 1         | 16/64          | m7i.4xlarge           |
 +------------------------+-----------+----------------+-----------------------+