Skip to content

Commit b203c9f

Browse files
cwarnermmcwarnermm
authored
Merge branch 'master' into claude/issue-8161-20250707_203621
2 parents a440944 + 4a2faff commit b203c9f

10 files changed

+830
-164
lines changed

‎source/onboard/guest-accounts.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Guests can:
2626
- Mute channels
2727
- Update their profile
2828
- Use different authentication methods than other users
29+
- Leave channels to which they were added (including Town Square).
2930

3031
Guests cannot:
3132

‎source/scale/scale-to-100000-users.rst‎

Lines changed: 85 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,91 @@ This page describes the Mattermost reference architecture designed for the load
1717
Requirements
1818
------------
1919

20-
.. tip::
21-
22-
Scroll horizontally to see additional columns in the table below.
23-
24-
+------------------------+-----------+----------------+--------------------+-------------------+
25-
| **Resource Type** | **Nodes** | **vCPU/ | **AWS Instance** | **Azure Instance**|
26-
| | | Memory (GiB)** | | |
27-
+========================+===========+================+====================+===================+
28-
| Mattermost Application | 6 | 16/32 | c7i.4xlarge | F16s v2 |
29-
+------------------------+-----------+----------------+--------------------+-------------------+
30-
| RDS Writer | 1 | 16/128 | db.r7g.4xlarge | E16as v6 |
31-
+------------------------+-----------+----------------+--------------------+-------------------+
32-
| RDS Reader | 5 | 16/128 | db.r7g.4xlarge | E16as v6 |
33-
+------------------------+-----------+----------------+--------------------+-------------------+
34-
| Elasticsearch cluster | 4 | 8/64 | r6g.2xlarge.search | E8ads v6 |
35-
+------------------------+-----------+----------------+--------------------+-------------------+
36-
| Proxy | 1 | 16/64 | m7i.4xlarge | D16s v6 |
37-
+------------------------+-----------+----------------+--------------------+-------------------+
20+
.. raw:: html
21+
22+
<style>
23+
.scale-requirements-table {
24+
width: 100% !important;
25+
table-layout: fixed !important;
26+
border-collapse: collapse;
27+
font-size: 0.9em;
28+
overflow-wrap: break-word !important;
29+
word-wrap: break-word !important;
30+
}
31+
.scale-requirements-table th, .scale-requirements-table td {
32+
border: 1px solid #ddd;
33+
padding: 8px;
34+
text-align: left;
35+
vertical-align: top;
36+
word-wrap: break-word;
37+
overflow-wrap: break-word;
38+
}
39+
.scale-requirements-table th {
40+
background-color: #f8f9fa;
41+
font-weight: bold;
42+
}
43+
.scale-requirements-table col:nth-child(1) { width: 25%; }
44+
.scale-requirements-table col:nth-child(2) { width: 10%; }
45+
.scale-requirements-table col:nth-child(3) { width: 18%; }
46+
.scale-requirements-table col:nth-child(4) { width: 23%; }
47+
.scale-requirements-table col:nth-child(5) { width: 24%; }
48+
</style>
49+
50+
<table class="scale-requirements-table">
51+
<colgroup>
52+
<col style="width: 25%">
53+
<col style="width: 10%">
54+
<col style="width: 18%">
55+
<col style="width: 23%">
56+
<col style="width: 24%">
57+
</colgroup>
58+
<thead>
59+
<tr>
60+
<th>Resource Type</th>
61+
<th>Nodes</th>
62+
<th>vCPU/Memory (GiB)</th>
63+
<th>AWS Instance</th>
64+
<th>Azure Instance</th>
65+
</tr>
66+
</thead>
67+
<tbody>
68+
<tr>
69+
<td>Mattermost Application</td>
70+
<td>6</td>
71+
<td>16/32</td>
72+
<td>c7i.4xlarge</td>
73+
<td>F16s v2</td>
74+
</tr>
75+
<tr>
76+
<td>RDS Writer</td>
77+
<td>1</td>
78+
<td>16/128</td>
79+
<td>db.r7g.4xlarge</td>
80+
<td>E16as v6</td>
81+
</tr>
82+
<tr>
83+
<td>RDS Reader</td>
84+
<td>5</td>
85+
<td>16/128</td>
86+
<td>db.r7g.4xlarge</td>
87+
<td>E16as v6</td>
88+
</tr>
89+
<tr>
90+
<td>Elasticsearch cluster</td>
91+
<td>4</td>
92+
<td>8/64</td>
93+
<td>r6g.2xlarge.search</td>
94+
<td>E8ads v6</td>
95+
</tr>
96+
<tr>
97+
<td>Proxy</td>
98+
<td>1</td>
99+
<td>16/64</td>
100+
<td>m7i.4xlarge</td>
101+
<td>D16s v6</td>
102+
</tr>
103+
</tbody>
104+
</table>
38105

39106
Lifetime storage
40107
----------------

‎source/scale/scale-to-15000-users.rst‎

Lines changed: 104 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,110 @@ This page describes the Mattermost reference architecture designed for the load
1515
Requirements
1616
------------
1717

18-
.. tip::
19-
20-
Scroll horizontally to see additional columns in the table below.
21-
22-
+------------------------+-----------+----------------+-------------------+-------------------+
23-
| **Resource Type** | **Nodes** | **vCPU/ | **AWS Instance** | **Azure Instance**|
24-
| | | Memory (GiB)** | | |
25-
+========================+===========+================+===================+===================+
26-
| Mattermost Application | 2 | 4/8 | c7i.xlarge | F4s v2 |
27-
+------------------------+-----------+----------------+-------------------+-------------------+
28-
| RDS Writer | 1 | 4/32 | db.r7g.xlarge | E4as v6 |
29-
+------------------------+-----------+----------------+-------------------+-------------------+
30-
| RDS Reader | 1 | 4/32 | db.r7g.xlarge | E4as v6 |
31-
+------------------------+-----------+----------------+-------------------+-------------------+
32-
| Elasticsearch Node | 2 | 4/32 | r6g.xlarge.search | E4ads v6 |
33-
+------------------------+-----------+----------------+-------------------+-------------------+
34-
| Proxy | 1 | 16/64 | m7i.4xlarge | D16s v6 |
35-
+------------------------+-----------+----------------+-------------------+-------------------+
18+
.. raw:: html
19+
20+
<style>
21+
.scale-requirements-table {
22+
width: 100% !important;
23+
table-layout: fixed !important;
24+
border-collapse: collapse;
25+
font-size: 0.9em;
26+
overflow-wrap: break-word !important;
27+
word-wrap: break-word !important;
28+
}
29+
.scale-requirements-table th,
30+
.scale-requirements-table td {
31+
border: 1px solid #ddd;
32+
padding: 8px;
33+
vertical-align: top;
34+
word-wrap: break-word !important;
35+
overflow-wrap: break-word !important;
36+
}
37+
.scale-requirements-table th {
38+
background-color: #f8f9fa;
39+
font-weight: bold;
40+
text-align: left;
41+
}
42+
.scale-requirements-table th:nth-child(1) { width: 25%; }
43+
.scale-requirements-table th:nth-child(2) { width: 10%; }
44+
.scale-requirements-table th:nth-child(3) { width: 18%; }
45+
.scale-requirements-table th:nth-child(4) { width: 23%; }
46+
.scale-requirements-table th:nth-child(5) { width: 24%; }
47+
48+
/* Dark mode support */
49+
body:not([data-custom-theme="light"]) .scale-requirements-table {
50+
background-color: #2d3748;
51+
}
52+
body:not([data-custom-theme="light"]) .scale-requirements-table th {
53+
background-color: #4a5568 !important;
54+
color: #fff;
55+
border-color: #718096 !important;
56+
}
57+
body:not([data-custom-theme="light"]) .scale-requirements-table td {
58+
color: #e2e8f0;
59+
border-color: #718096 !important;
60+
}
61+
62+
/* Mobile responsiveness */
63+
@media (max-width: 768px) {
64+
.scale-requirements-table {
65+
font-size: 0.8em;
66+
}
67+
.scale-requirements-table th,
68+
.scale-requirements-table td {
69+
padding: 6px 4px;
70+
}
71+
}
72+
</style>
73+
74+
<table class="scale-requirements-table">
75+
<thead>
76+
<tr>
77+
<th>Resource Type</th>
78+
<th>Nodes</th>
79+
<th>vCPU/ Memory (GiB)</th>
80+
<th>AWS Instance</th>
81+
<th>Azure Instance</th>
82+
</tr>
83+
</thead>
84+
<tbody>
85+
<tr>
86+
<td>Mattermost Application</td>
87+
<td>2</td>
88+
<td>4/8</td>
89+
<td>c7i.xlarge</td>
90+
<td>F4s v2</td>
91+
</tr>
92+
<tr>
93+
<td>RDS Writer</td>
94+
<td>1</td>
95+
<td>4/32</td>
96+
<td>db.r7g.xlarge</td>
97+
<td>E4as v6</td>
98+
</tr>
99+
<tr>
100+
<td>RDS Reader</td>
101+
<td>1</td>
102+
<td>4/32</td>
103+
<td>db.r7g.xlarge</td>
104+
<td>E4as v6</td>
105+
</tr>
106+
<tr>
107+
<td>Elasticsearch Node</td>
108+
<td>2</td>
109+
<td>4/32</td>
110+
<td>r6g.xlarge.search</td>
111+
<td>E4ads v6</td>
112+
</tr>
113+
<tr>
114+
<td>Proxy</td>
115+
<td>1</td>
116+
<td>16/64</td>
117+
<td>m7i.4xlarge</td>
118+
<td>D16s v6</td>
119+
</tr>
120+
</tbody>
121+
</table>
36122

37123
Lifetime storage
38124
----------------

‎source/scale/scale-to-200-users.rst‎

Lines changed: 104 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,110 @@ This page describes the Mattermost reference architecture designed for the load
1212
Requirements
1313
------------
1414

15-
.. tip::
16-
17-
Scroll horizontally to see additional columns in the table below.
18-
19-
+------------------------+-----------+----------------+-------------------+-------------------+
20-
| **Resource Type** | **Nodes** | **vCPU/ | **AWS Instance** | **Azure Instance**|
21-
| | | Memory (GiB)** | | |
22-
+========================+===========+================+===================+===================+
23-
| Mattermost Application | 1 | 2/4 | c7i.large | F2s v2 |
24-
+------------------------+-----------+----------------+-------------------+-------------------+
25-
| RDS Writer | 1 | 2/16 | db.r7g.large | E2as v6 |
26-
+------------------------+-----------+----------------+-------------------+-------------------+
27-
| RDS Reader | 0 | 2/16 | db.r7g.large | E2as v6 |
28-
+------------------------+-----------+----------------+-------------------+-------------------+
29-
| Elasticsearch Node | 0 | 4/32 | r6g.xlarge.search | E4ads v6 |
30-
+------------------------+-----------+----------------+-------------------+-------------------+
31-
| Proxy | 1 | 16/64 | m7i.4xlarge | D16s v6 |
32-
+------------------------+-----------+----------------+-------------------+-------------------+
15+
.. raw:: html
16+
17+
<style>
18+
.scale-requirements-table {
19+
width: 100% !important;
20+
table-layout: fixed !important;
21+
border-collapse: collapse;
22+
font-size: 0.9em;
23+
overflow-wrap: break-word !important;
24+
word-wrap: break-word !important;
25+
}
26+
.scale-requirements-table th,
27+
.scale-requirements-table td {
28+
border: 1px solid #ddd;
29+
padding: 8px;
30+
vertical-align: top;
31+
word-wrap: break-word !important;
32+
overflow-wrap: break-word !important;
33+
}
34+
.scale-requirements-table th {
35+
background-color: #f8f9fa;
36+
font-weight: bold;
37+
text-align: left;
38+
}
39+
.scale-requirements-table th:nth-child(1) { width: 25%; }
40+
.scale-requirements-table th:nth-child(2) { width: 10%; }
41+
.scale-requirements-table th:nth-child(3) { width: 18%; }
42+
.scale-requirements-table th:nth-child(4) { width: 23%; }
43+
.scale-requirements-table th:nth-child(5) { width: 24%; }
44+
45+
/* Dark mode support */
46+
body:not([data-custom-theme="light"]) .scale-requirements-table {
47+
background-color: #2d3748;
48+
}
49+
body:not([data-custom-theme="light"]) .scale-requirements-table th {
50+
background-color: #4a5568 !important;
51+
color: #fff;
52+
border-color: #718096 !important;
53+
}
54+
body:not([data-custom-theme="light"]) .scale-requirements-table td {
55+
color: #e2e8f0;
56+
border-color: #718096 !important;
57+
}
58+
59+
/* Mobile responsiveness */
60+
@media (max-width: 768px) {
61+
.scale-requirements-table {
62+
font-size: 0.8em;
63+
}
64+
.scale-requirements-table th,
65+
.scale-requirements-table td {
66+
padding: 6px 4px;
67+
}
68+
}
69+
</style>
70+
71+
<table class="scale-requirements-table">
72+
<thead>
73+
<tr>
74+
<th>Resource Type</th>
75+
<th>Nodes</th>
76+
<th>vCPU/ Memory (GiB)</th>
77+
<th>AWS Instance</th>
78+
<th>Azure Instance</th>
79+
</tr>
80+
</thead>
81+
<tbody>
82+
<tr>
83+
<td>Mattermost Application</td>
84+
<td>1</td>
85+
<td>2/4</td>
86+
<td>c7i.large</td>
87+
<td>F2s v2</td>
88+
</tr>
89+
<tr>
90+
<td>RDS Writer</td>
91+
<td>1</td>
92+
<td>2/16</td>
93+
<td>db.r7g.large</td>
94+
<td>E2as v6</td>
95+
</tr>
96+
<tr>
97+
<td>RDS Reader</td>
98+
<td>0</td>
99+
<td>2/16</td>
100+
<td>db.r7g.large</td>
101+
<td>E2as v6</td>
102+
</tr>
103+
<tr>
104+
<td>Elasticsearch Node</td>
105+
<td>0</td>
106+
<td>4/32</td>
107+
<td>r6g.xlarge.search</td>
108+
<td>E4ads v6</td>
109+
</tr>
110+
<tr>
111+
<td>Proxy</td>
112+
<td>1</td>
113+
<td>16/64</td>
114+
<td>m7i.4xlarge</td>
115+
<td>D16s v6</td>
116+
</tr>
117+
</tbody>
118+
</table>
33119

34120
Lifetime storage
35121
----------------

0 commit comments

Comments
 (0)