Skip to content

Commit 3a5b362

Browse files
kay-kimschmalliso
authored andcommitted
DOCS-4308 DOCS-4433 reverts the reverted auditing changes
Conflicts: source/includes/options-mongod.yaml source/reference/audit-message.txt source/tutorial/configure-auditing.txt
1 parent fe8ed39 commit 3a5b362

8 files changed

+236
-169
lines changed

source/core/auditing.txt

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,29 +13,27 @@ MongoDB Enterprise includes an auditing capability for
1313
facility allows administrators and users to track system activity for
1414
deployments with multiple users and applications. The auditing facility
1515
can write audit events to the console, the :term:`syslog`, a JSON file,
16-
or a BSON file. For details on the audit log messages, see
17-
:doc:`/reference/audit-message`.
16+
or a BSON file.
1817

1918
Audit Events and Filter
2019
-----------------------
2120

22-
The auditing system can record the following operations:
21+
To enable auditing for MongoDB Enterprise, see
22+
:doc:`/tutorial/configure-auditing`.
23+
24+
Once enabled, the auditing system can record the following operations:
2325

2426
- schema (DDL),
2527
- replica set,
2628
- authentication and authorization, and
2729
- general operations.
2830

29-
See :ref:`audit-action-details-results` for the specific actions
30-
recorded.
31+
For details on the audit log messages, see
32+
:doc:`/reference/audit-message`.
3133

3234
By default, the auditing system records all these operations; however,
33-
you can configure the :option:`--auditFilter` option to restrict the
34-
events captured.
35-
36-
See :doc:`/tutorial/configure-auditing` to enable and configure
37-
auditing for MongoDB Enterprise. To set up filters, see
38-
:ref:`audit-filter`.
35+
you can :ref:`set up filters <audit-filter>` to restrict the events
36+
captured. To set up filters, see :ref:`audit-filter`.
3937

4038
Audit Guarantee
4139
---------------
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
To specify an audit filter, enclose the filter document in single
2+
quotes to pass the document as a string.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
To specify the audit filter in a :doc:`configuration file
2+
</reference/configuration-options>`, you must use the YAML format of
3+
the configuration file.

source/includes/options-mongod.yaml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1451,12 +1451,17 @@ description: |
14511451
14521452
.. code-block:: javascript
14531453
1454-
{ atype: <expression> }
1454+
{ <field1>: <expression1>, ... }
14551455
1456-
For authentication operations, the option can also take a document of
1457-
the form:
1456+
The ``<field>`` can be :doc:`any field in the audit message
1457+
</reference/audit-message>`, including fields returned in the
1458+
:ref:`param <audit-action-details-results>` document. The
1459+
``<expression>`` is a :ref:`query condition expression
1460+
<query-selectors>`.
14581461
1459-
.. code-block:: javascript
1462+
.. include:: /includes/fact-audit-filter-single-quotes.rst
1463+
1464+
.. include:: /includes/fact-audit-filter-yaml-configuration.rst
14601465
14611466
{ atype: <expression>, "param.db": <database> }
14621467

0 commit comments

Comments
 (0)