Skip to content

Commit 98b995e

Browse files
committed
DOCSP-14865 update list table header rows for NextGen
1 parent e32c378 commit 98b995e

File tree

8 files changed

+178
-156
lines changed

8 files changed

+178
-156
lines changed

source/administration/security-checklist.txt

Lines changed: 28 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ Pre-production Checklist/Considerations
2626
requires that all clients and servers provide valid credentials
2727
before they can connect to the system.
2828

29-
.. see::
29+
See also:
3030

31-
- :doc:`/core/authentication`
32-
- :doc:`/tutorial/enable-authentication`
31+
- :doc:`/core/authentication`
32+
- :doc:`/tutorial/enable-authentication`
3333

3434
.. _security-checklist-role-based-access-control:
3535

@@ -45,18 +45,16 @@ Configure Role-Based Access Control
4545
users and assign them only the roles they need to perform their
4646
operations. A user can be a person or a client application.
4747

48-
.. tip::
48+
Note that a user can have privileges across different databases. If a
49+
user requires privileges on multiple databases, create a
50+
single user with roles that grant applicable database
51+
privileges instead of creating the user multiple times in
52+
different databases.
4953

50-
A user can have privileges across different databases. If a
51-
user requires privileges on multiple databases, create a
52-
single user with roles that grant applicable database
53-
privileges instead of creating the user multiple times in
54-
different databases.
54+
See also:
5555

56-
.. see::
57-
58-
- :doc:`/core/authorization`
59-
- :doc:`/tutorial/manage-users-and-roles`
56+
- :doc:`/core/authorization`
57+
- :doc:`/tutorial/manage-users-and-roles`
6058

6159
|arrow| Encrypt Communication (TLS/SSL)
6260
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -73,9 +71,7 @@ Configure Role-Based Access Control
7371

7472
.. include:: /includes/fact-tls-1.0.rst
7573

76-
.. see::
77-
78-
- :doc:`/tutorial/configure-ssl`.
74+
See also: :doc:`/tutorial/configure-ssl`.
7975

8076
.. |binary| replace:: MongoDB
8177

@@ -112,19 +108,19 @@ Configure Role-Based Access Control
112108

113109
.. include:: /includes/fact-default-bind-ip-change.rst
114110

115-
.. see::
116-
117-
- :doc:`/core/security-hardening`
111+
See also:
112+
113+
- :doc:`/core/security-hardening`
118114

119-
- the :setting:`net.bindIp` configuration setting
115+
- the :setting:`net.bindIp` configuration setting
120116

121-
- the :setting:`security.clusterIpSourceWhitelist` configuration
122-
setting
117+
- the :setting:`security.clusterIpSourceWhitelist` configuration
118+
setting
123119

124-
- the :ref:`authenticationRestrictions
125-
<db-createUser-authenticationRestrictions>` field to the
126-
:dbcommand:`db.createUser()` command to specify a per-user IP
127-
whitelist.
120+
- the :ref:`authenticationRestrictions
121+
<db-createUser-authenticationRestrictions>` field to the
122+
:dbcommand:`db.createUser()` command to specify a per-user IP
123+
whitelist.
128124

129125

130126
|arrow| Audit System Activity
@@ -140,10 +136,11 @@ Configure Role-Based Access Control
140136
up filters to record specific events, such as authentication
141137
events.
142138

143-
.. see::
139+
See also:
144140

145-
- :doc:`/core/auditing`
146-
- :doc:`/tutorial/configure-auditing`
141+
- :doc:`/core/auditing`
142+
143+
- :doc:`/tutorial/configure-auditing`
147144

148145
|arrow| Run MongoDB with a Dedicated User
149146
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -152,9 +149,7 @@ Configure Role-Based Access Control
152149
account. Ensure that the account has permissions to access data
153150
but no unnecessary permissions.
154151

155-
.. see::
156-
157-
- :doc:`/installation`
152+
See also: :doc:`/installation`
158153

159154
.. _security-checklist-javascript:
160155

@@ -173,9 +168,7 @@ Configure Role-Based Access Control
173168
This ensures that all documents stored by the
174169
:binary:`~bin.mongod` instance are valid :term:`BSON`.
175170

176-
.. see::
177-
178-
- :doc:`/core/security-hardening`
171+
See also: :doc:`/core/security-hardening`
179172

180173
|arrow| Request a Security Technical Implementation Guide (where applicable)
181174
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

source/core/security-client-side-encryption-key-management.txt

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -126,23 +126,30 @@ encrypted using a Customer Master Key (CMK) managed through a supported
126126
The :binary:`~bin.mongo` shell provides helper methods for data
127127
encryption key management:
128128

129-
Retrieving data encryption keys
130-
- :method:`KeyVault.getKey()`
131-
- :method:`KeyVault.getKeys()`
132-
- :method:`KeyVault.getKeyByAltName()`
133-
134-
Creating or Modifying data encryption keys
135-
- :method:`KeyVault.createKey()`
136-
- :method:`KeyVault.addKeyAlternateName()`
137-
- :method:`KeyVault.removeKeyAlternateName()`
138-
139-
Removing data encryption keys
140-
- :method:`KeyVault.deleteKey()`
141-
142-
.. important::
143-
144-
Removing a data encryption key renders all fields encrypted
145-
using that data encryption key as permanently unreadable.
129+
.. list-table::
130+
:header-rows: 1
131+
:widths: 60 40
132+
133+
* - Use Case
134+
- Helper Methods
135+
136+
* - Retrieving data encryption keys
137+
- | :method:`KeyVault.getKey()`
138+
| :method:`KeyVault.getKeys()`
139+
| :method:`KeyVault.getKeyByAltName()`
140+
141+
* - Creating or Modifying data encryption keys
142+
- | :method:`KeyVault.createKey()`
143+
| :method:`KeyVault.addKeyAlternateName()`
144+
| :method:`KeyVault.removeKeyAlternateName()`
145+
146+
* - Removing data encryption keys
147+
- :method:`KeyVault.deleteKey()`
148+
149+
.. important::
150+
151+
Removing a data encryption key renders all fields encrypted
152+
using that data encryption key as permanently unreadable.
146153

147154

148155
Applications with :authrole:`read` access to the key vault collection

source/core/transactions.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -749,7 +749,7 @@ MongoDB provides various transactions metrics:
749749
:widths: 40 60
750750
:header-rows: 1
751751

752-
* - Via
752+
* - Source
753753
- Returns
754754

755755
* - | :method:`db.serverStatus()` method

source/faq/concurrency.txt

Lines changed: 102 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -206,15 +206,16 @@ use for document level locking storage engines:
206206

207207
.. _faq-concurrency-database-lock:
208208

209-
Which administrative commands lock the database?
210-
------------------------------------------------
209+
Which administrative commands lock a database?
210+
----------------------------------------------
211211

212-
Certain administrative commands can exclusively lock the database for
213-
extended periods of time. In some deployments, for large databases,
214-
you may consider taking the :binary:`~bin.mongod` instance offline so that
215-
clients are not affected. For example, if a :binary:`~bin.mongod` is part
216-
of a :term:`replica set`, take the :binary:`~bin.mongod` offline and let
217-
other members of the set service load while maintenance is in progress.
212+
Some administrative commands can exclusively lock a database for
213+
extended time periods. For large database deployments, you may consider
214+
taking the :binary:`~bin.mongod` instance offline so that clients are
215+
not affected. For example, if a :binary:`~bin.mongod` is part of a
216+
:term:`replica set`, take the :binary:`~bin.mongod` offline and let
217+
other members of the replica set process requests while maintenance is
218+
performed.
218219

219220
Administrative Commands Taking Extended Locks
220221
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -226,33 +227,66 @@ database level for extended periods:
226227
- :dbcommand:`collMod` command
227228
- :dbcommand:`compact` command
228229
- :dbcommand:`convertToCapped` command
229-
- :dbcommand:`renameCollection` command and corresponding
230-
:method:`db.collection.renameCollection()` shell method (see below).
231-
232-
.. versionchanged:: 4.2
233230

234-
If renaming a collection within the same database, the operation
235-
takes an exclusive (W) lock on the source and target collections.
236-
Prior to MongoDB 4.2, the operation takes an exclusive (W) lock on
237-
the database when renaming within the same database.
231+
In addition, the :dbcommand:`renameCollection` command and corresponding
232+
:method:`db.collection.renameCollection()` shell method take the
233+
following locks depending on the version of MongoDB:
234+
235+
.. list-table::
236+
:header-rows: 1
237+
238+
* - Command
239+
240+
- MongoDB 4.2.2 or later
238241

239-
(For :dbcommand:`renameCollection` *only*) If the target namespace
240-
is in a different database as the source collection, the locking
241-
behavior is version dependent:
242+
- MongoDB 4.2.0 - 4.2.1
242243

243-
- *(MongoDB 4.2.2 and later)* The operation takes an exclusive
244-
(W) lock on the target database when renaming a collection
245-
across databases and blocks other operations on that database
246-
until it finishes.
244+
- MongoDB 4.0.X and previous
247245

248-
- *(MongoDB 4.2.1 and earlier)* The operation takes a global
249-
exclusive (W) lock when renaming a collection across
246+
247+
* - :dbcommand:`renameCollection`
248+
249+
- If renaming a collection within the same database, the
250+
:dbcommand:`renameCollection` command takes an exclusive (W) lock
251+
on the source and target collections.
252+
253+
If the target namespace is in a different database as the source
254+
collection, The :dbcommand:`renameCollection` command takes an
255+
exclusive (W) lock on the target database when renaming a
256+
collection across databases and blocks other operations on that
257+
database until it finishes.
258+
259+
- If renaming a collection within the same database, the
260+
:dbcommand:`renameCollection` command takes an exclusive (W) lock
261+
on the source and target collections.
262+
263+
If the target namespace is in a different database as the source
264+
collection, The :dbcommand:`renameCollection` command takes a
265+
global exclusive (W) lock when renaming a collection across
250266
databases and blocks other operations until it finishes.
251267

268+
- Prior to MongoDB 4.2, the :dbcommand:`renameCollection` command
269+
takes an exclusive (W) lock on the database when renaming within
270+
the same database.
271+
272+
273+
* - :method:`~db.collection.renameCollection()`
274+
275+
- If renaming a collection within the same database, the
276+
:method:`~db.collection.renameCollection()` method takes an
277+
exclusive (W) lock on the source and target collections.
278+
279+
- (same behavior as MongoDB 4.2.2 or later)
280+
281+
- Prior to MongoDB 4.2, the
282+
:method:`~db.collection.renameCollection()` method takes an
283+
exclusive (W) lock on the database when renaming within the same
284+
database.
285+
252286
Administrative Commands Taking Brief Locks
253287
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
254288

255-
The following administrative operations lock the database but only hold
289+
These administrative operations lock a database but only hold
256290
the lock for a very short time:
257291

258292
- :dbcommand:`authenticate` command and corresponding
@@ -261,9 +295,7 @@ the lock for a very short time:
261295
- :dbcommand:`createUser` command and corresponding
262296
:method:`db.createUser()` shell method
263297

264-
.. seealso::
265-
266-
:ref:`faq-concurrency-lock-multiple-dbs`
298+
:ref:`faq-concurrency-lock-multiple-dbs`
267299

268300
.. _faq-concurrency-collection-lock:
269301

@@ -290,54 +322,52 @@ the collection level:
290322
:method:`db.collection.dropIndex()` and
291323
:method:`db.collection.dropIndexes()` shell methods
292324

293-
- :dbcommand:`renameCollection` command and corresponding
294-
:method:`db.collection.renameCollection()` shell method (see below)
295-
296-
.. versionchanged:: 4.2
325+
- the :dbcommand:`renameCollection` command and corresponding
326+
:method:`db.collection.renameCollection()` shell method take the
327+
following locks, depending on version:
297328

298-
If renaming a collection within the same database, the operation
299-
takes an exclusive (W) lock on the source and target collections.
300-
Prior to MongoDB 4.2, the operation takes an exclusive (W) lock
301-
on the database when renaming within the same database.
302-
303-
(:dbcommand:`renameCollection` *only*) If the target namespace is
304-
in a different database as the source collection, the locking
305-
behavior is version dependent:
306-
307-
- *MongoDB 4.2.2 and later* The operation takes an exclusive
308-
(W) lock on the target database when renaming a collection
309-
across databases and blocks other operations on that database
310-
until it finishes.
311-
312-
- *MongoDB 4.2.1 and earlier* The operation takes a global
313-
exclusive (W) lock when renaming a collection across
314-
databases and blocks other operations until it finishes.
315-
316-
- :dbcommand:`reIndex` command and corresponding
317-
:method:`db.collection.reIndex()` shell method (see below)
318-
319-
.. versionchanged:: 4.2
320-
321-
- For MongoDB 4.2.2 and later, these operations obtain an
322-
exclusive
323-
(W) lock on the collection and block other operations on the
324-
collection until finished.
329+
- For :dbcommand:`renameCollection` and
330+
:method:`db.collection.renameCollection()`: If renaming a
331+
collection within the same database, the operation takes an
332+
exclusive (W) lock on the source and target collections.
333+
Prior to MongoDB 4.2, the operation takes an exclusive (W) lock
334+
on the database when renaming within the same database.
335+
336+
- For :dbcommand:`renameCollection` *only*:: If the target namespace
337+
is in a different database as the source collection, the locking
338+
behavior is version dependent:
339+
340+
- *MongoDB 4.2.2 and later* The operation takes an exclusive
341+
(W) lock on the target database when renaming a collection
342+
across databases and blocks other operations on that database
343+
until it finishes.
344+
345+
- *MongoDB 4.2.1 and earlier* The operation takes a global
346+
exclusive (W) lock when renaming a collection across
347+
databases and blocks other operations until it finishes.
348+
349+
- the :dbcommand:`reIndex` command and corresponding
350+
:method:`db.collection.reIndex()` shell method take the following
351+
locks, depending on version:
352+
353+
- For MongoDB 4.2.2 and later, these operations obtain an exclusive
354+
(W) lock on the collection and block other operations on the
355+
collection until finished.
325356

326-
- For MongoDB 4.0.0 through 4.2.1, these operations take a
327-
global exclusive (W) lock and block other operations until
328-
finished.
357+
- For MongoDB 4.0.0 through 4.2.1, these operations take a
358+
global exclusive (W) lock and block other operations until
359+
finished.
329360

330-
- :dbcommand:`replSetResizeOplog` command (see below)
361+
- the :dbcommand:`replSetResizeOplog` command takes the following locks,
362+
depending on version:
331363

332-
.. versionchanged:: 4.2
333-
334-
- For MongoDB 4.2.2 and later, this operation takes an exclusive
335-
(W) lock on the :data:`oplog <local.oplog.rs>` collection and
336-
blocks other operations on the collection until it finishes.
364+
- For MongoDB 4.2.2 and later, this operation takes an exclusive
365+
(W) lock on the :data:`oplog <local.oplog.rs>` collection and
366+
blocks other operations on the collection until it finishes.
337367

338-
- For MongoDB 4.2.1 and earlier, this operation takes a global
339-
exclusive (W) lock and blocks other operations until it
340-
finishes.
368+
- For MongoDB 4.2.1 and earlier, this operation takes a global
369+
exclusive (W) lock and blocks other operations until it
370+
finishes.
341371

342372
Prior to MongoDB 4.2, these operations took an exclusive lock on the
343373
database, blocking all operations on the database *and* its collections

0 commit comments

Comments
 (0)