DOCS-11897 add total number of committed, aborted, and started transa…

Makefile

@@ -129,3 +129,6 @@ examples:
 
 # c
 	curl -SfL https://raw.githubusercontent.com/mongodb/mongo-c-driver/master/src/libmongoc/tests/test-mongoc-sample-commands.c -o ${DRIVERS_PATH}/test-mongoc-sample-commands.c 
+
+# c++
+	curl -SfL https://raw.githubusercontent.com/mongodb/mongo-cxx-driver/master/src/mongocxx/test/transactions.cpp -o ${DRIVERS_PATH}/cpp-transactions.cpp 

conf.py

@@ -32,6 +32,8 @@ def has(self, *args):
 
 needs_sphinx = '1.0'
 
+#--- the following is a list of python files 
+
 extensions = [
     'sphinx.ext.extlinks',
     'sphinx.ext.todo',

config/build_conf.yaml

@@ -10,7 +10,7 @@ project:
   branched: true
   siteroot: true
 version:
-  release: '4.0.1'
+  release: '4.0.2'
   branch: '4.0'
 system:
   files:

config/redirects

@@ -1406,6 +1406,11 @@ raw: /master/release-notes/3.0-general-improvements -> ${base}/release-notes/3.0
 
 # Redirects for 3.6 or earlier (i.e. before 4.0)
 
+[v3.0-v3.6]: /${version}/appendix/security -> ${base}/${version}/security
+[v3.0-v3.6]: /${version}/appendix/security/appendixA-openssl-ca -> ${base}/${version}/security
+[v3.0-v3.6]: /${version}/appendix/security/appendixB-openssl-server -> ${base}/${version}/security
+[v3.0-v3.6]: /${version}/appendix/security/appendixC-openssl-client -> ${base}/${version}/security
+
 [*-v3.6]: /${version}/release-notes/4.0 -> ${base}/${version}/release-notes
 [*-v3.6]: /${version}/release-notes/4.0-compatibility -> ${base}/${version}/release-notes
 [*-v3.6]: /${version}/release-notes/4.0-upgrade-standalone -> ${base}/${version}/release-notes
@@ -1415,11 +1420,21 @@ raw: /master/release-notes/3.0-general-improvements -> ${base}/release-notes/3.0
 [*-v3.6]: /${version}/release-notes/4.0-downgrade-replica-set -> ${base}/${version}/release-notes
 [*-v3.6]: /${version}/release-notes/4.0-downgrade-sharded-cluster -> ${base}/${version}/release-notes
 [*-v3.6]: /${version}/reference/configuration-file-settings-command-line-options-mapping -> ${base}/${version}/reference/configuration-options
+[v3.0-v3.6]: /${version}/administration/upgrade-community-to-enterprise -> ${base}/${version}/installation
+[v3.0-v3.6]: /${version}/tutorial/upgrade-to-enterprise-standalone -> ${base}/${version}/installation
+[v3.0-v3.6]: /${version}/tutorial/upgrade-to-enterprise-replica-set -> ${base}/${version}/installation
+[v3.0-v3.6]: /${version}/tutorial/upgrade-to-enterprise-sharded-cluster -> ${base}/${version}/installation
+
 
 
 [*-v3.6]: /${version}/reference/method/db.watch -> ${base}/${version}/changeStreams
 [*-v3.6]: /${version}/reference/method/Mongo.watch -> ${base}/${version}/changeStreams
 
+[*-v3.4]: /${version}/reference/read-concern-linearizable -> ${base}/${version}/reference/read-concern
+[*-v3.4]: /${version}/reference/read-concern-local -> ${base}/${version}/reference/read-concern
+[*-v3.4]: /${version}/reference/read-concern-available -> ${base}/${version}/reference/read-concern
+[*-v3.4]: /${version}/reference/read-concern-majority -> ${base}/${version}/reference/read-concern
+
 [*-v3.6]: /${version}/reference/read-concern-snapshot -> ${base}/${version}/reference/read-concern
 [*-v3.6]: /${version}/core/transactions -> ${base}/${version}/core/write-operations-atomicity
 [*-v3.6]: /${version}/reference/method/Session.abortTransaction -> ${base}/${version}/core/write-operations-atomicity
@@ -1437,6 +1452,9 @@ raw: /master/release-notes/3.0-general-improvements -> ${base}/release-notes/3.0
 [*-v3.6]: /${version}/reference/method/js-free-monitoring. -> ${base}/${version}/administration/monitoring
 
 
+[*-v3.4]: /${version}/core/causal-consistency-read-write-concerns  -> ${base}/${version}/core/read-isolation-consistency-recency
+[*-v3.4]: /${version}/core/security-encryption -> ${base}/${version}/security
+
 # 2.8 compatibility
 # 
 # [*]: /${version}/release-notes/2.8-downgrade -> ${base}/${version}/release-notes

config/sphinx_local.yaml

@@ -25,6 +25,7 @@ theme:
     - /core/authentication
     - /core/authorization
     - /core/backups
+    - /core/read-isolation-consistency-recency
     - /core/databases-and-collections
     - /core/geohaystack
     - /core/index-single

source/administration/monitoring.txt

@@ -10,6 +10,14 @@ Monitoring for MongoDB
    :depth: 1
    :class: singlecol
 
+.. note::
+
+   For a MongoDB-specific monitoring, you can try the monitoring within MongoDB
+   Atlas, our fully-managed database-as-a-service. It automatically collects
+   and displays metrics on the state of your cluster’s databases and on server
+   usage. `Set up a free cluster to try it out
+   <https://www.mongodb.com/cloud/atlas/lp/general?utm_source=monitoring&utm_campaign=20-docs-in-20-days&utm_medium=docs>`_.
+
 Monitoring is a critical component of all database administration. A
 firm grasp of MongoDB's reporting will allow you to assess the state
 of your database and maintain your deployment without crisis.
@@ -417,7 +425,8 @@ performing the same insert operation produces the following log event:
       }
 
 Use :setting:`~security.redactClientLogData` in conjunction with
-:doc:`encryption </core/security-encryption>` to assist compliance with
+:doc:`/core/security-encryption-at-rest` and
+:doc:`/core/security-transport-encryption` to assist compliance with
 regulatory requirements.
 
 Diagnosing Performance Issues
@@ -570,13 +579,13 @@ Storage Node Watchdog
 
 .. note:: Available only in MongoDB Enterprise. Not available on macOS.
 
-The :ref:`Storage Node Watchdog <storage-node-watchdog>` monitors the
+The Storage Node Watchdog monitors the
 filesystems used by MongoDB to detect unresponsive conditions.
 
-The :ref:`Storage Node Watchdog <storage-node-watchdog>` can be enabled with
+The Storage Node Watchdog can be enabled with
 the :parameter:`watchdogPeriodSeconds` parameter on a :binary:`~bin.mongod`.
 
-When enabled, the :ref:`Storage Node Watchdog <storage-node-watchdog>`
+When enabled, the Storage Node Watchdog
 monitors the following directories:
 
 * The :option:`--dbpath <mongod --dbpath>` directory
@@ -586,15 +595,15 @@ monitors the following directories:
 * The directory of :option:`--auditPath <mongod --auditPath>` file
 
 If any of the filesystems containing these directories become unresponsive,
-the :ref:`Storage Node Watchdog <storage-node-watchdog>` terminates the
+the Storage Node Watchdog terminates the
 :binary:`~bin.mongod` and exits with a status code of 61. If the
 :binary:`~bin.mongod` is serving as the :term:`primary`, terminating initiates
 :term:`failover` allowing another member to become primary.
 
 Once a :binary:`~bin.mongod` has terminated, it may not be possible to cleanly
 restart it on the *same* machine.
 
-The maximum time the :ref:`Storage Node Watchdog <storage-node-watchdog>` can
+The maximum time the Storage Node Watchdog can
 take to detect an unresponsive filesystem and terminate is nearly *twice* the
 value of :parameter:`watchdogPeriodSeconds`.
 

source/administration/upgrade-community-to-enterprise.txt

@@ -0,0 +1,27 @@
+===============================================
+Upgrade MongoDB Community to MongoDB Enterprise
+===============================================
+
+.. default-domain:: mongodb
+
+.. contents:: On this page
+   :local:
+   :backlinks: none
+   :depth: 1
+   :class: singlecol
+
+.. include:: /includes/extracts/enterprise-additional-features.rst
+
+The documents in this section provide instructions to upgrade from
+MongoDB Community Edition to MongoDB Enterprise Edition.
+
+.. important::
+
+   .. include:: /includes/extracts/enterprise-upgrade-edition-only.rst
+
+.. toctree::
+   :titlesonly:
+
+   /tutorial/upgrade-to-enterprise-standalone
+   /tutorial/upgrade-to-enterprise-replica-set
+   /tutorial/upgrade-to-enterprise-sharded-cluster

source/appendix/security.txt

@@ -0,0 +1,13 @@
+========
+Appendix
+========
+
+.. default-domain:: mongodb
+
+
+.. toctree::
+   :titlesonly:
+
+   /appendix/security/appendixA-openssl-ca
+   /appendix/security/appendixB-openssl-server
+   /appendix/security/appendixC-openssl-client

source/appendix/security/appendixA-openssl-ca.txt

@@ -0,0 +1,170 @@
+.. _appendix-ca-certificate:
+
+===============================================
+Appendix A - OpenSSL CA Certificate for Testing
+===============================================
+
+.. default-domain:: mongodb
+
+.. admonition:: Testing Purposes Only
+   :class: warning
+
+   The following tutorial provides some guidelines for creating 
+   test x.509 certificates:
+
+   - Do not use these certificates for production. Instead, follow your
+     security policies.
+
+   - For information on OpenSSL, refer to the official OpenSSL docs.
+     Although this tutorial uses OpenSSL, the material should not be
+     taken as an authoritative reference on OpenSSL.
+
+Procedures
+----------
+
+The following procedures outlines the steps to create a test CA PEM
+file. The procedure creates both the CA PEM file and an intermediate
+authority certificate and key files to sign server/client test
+certificates.
+
+A. Create the OpenSSL Configuration File
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+#. Create a configuration file ``openssl-test-ca.cnf`` with the
+   following content:
+
+   .. code-block:: cfg
+      :emphasize-lines: 29,34,38,42,46
+
+      # NOT FOR PRODUCTION USE. OpenSSL configuration file for testing. 
+
+      # For the CA policy
+      [ policy_match ]
+      countryName = match
+      stateOrProvinceName = match
+      organizationName = match
+      organizationalUnitName = optional
+      commonName = supplied
+      emailAddress = optional
+
+      [ req ]
+      default_bits = 4096
+      default_keyfile = myTestCertificateKey.pem    ## The default private key file name. 
+      default_md = sha256                           ## Use SHA-256 for Signatures
+      distinguished_name = req_dn
+      req_extensions = v3_req
+      x509_extensions = v3_ca # The extentions to add to the self signed cert
+
+      [ v3_req ]
+      subjectKeyIdentifier  = hash
+      basicConstraints = CA:FALSE
+      keyUsage = critical, digitalSignature, keyEncipherment
+      nsComment = "OpenSSL Generated Certificate for TESTING only.  NOT FOR PRODUCTION USE."
+      extendedKeyUsage  = serverAuth, clientAuth
+
+      [ req_dn ]
+      countryName = Country Name (2 letter code)
+      countryName_default = 
+      countryName_min = 2
+      countryName_max = 2
+
+      stateOrProvinceName = State or Province Name (full name)
+      stateOrProvinceName_default = TestCertificateStateName 
+      stateOrProvinceName_max = 64
+
+      localityName = Locality Name (eg, city)
+      localityName_default = TestCertificateLocalityName
+      localityName_max = 64
+
+      organizationName = Organization Name (eg, company)
+      organizationName_default = TestCertificateOrgName
+      organizationName_max = 64
+
+      organizationalUnitName = Organizational Unit Name (eg, section)
+      organizationalUnitName_default = TestCertificateOrgUnitName 
+      organizationalUnitName_max = 64
+
+      commonName = Common Name (eg, YOUR name)
+      commonName_max = 64
+
+      [ v3_ca ]
+      # Extensions for a typical CA
+
+      subjectKeyIdentifier=hash
+      basicConstraints = critical,CA:true
+      authorityKeyIdentifier=keyid:always,issuer:always
+
+#. *Optional*. You can update the default Distinguished Name (DN)
+   values.
+
+B. Generate the Test CA PEM File
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+#. Create the CA key file :file:`mongodb-test-ca.key`. 
+
+   .. code-block:: sh
+
+      openssl genrsa -out mongodb-test-ca.key 4096
+
+   .. tip::
+
+      This private key is used to generate valid certificates for the
+      CA. Although this private key, like all files in this appendix,
+      is intended for testing purposes only, you should engage in good
+      security practices and secure this key file.
+
+#. Create the CA certificate :file:`mongod-test-ca.crt` using the
+   generated key file. When asked for Distinguished Name values, enter
+   the appropriate values for your test CA certificate.
+
+   .. code-block:: sh
+
+      openssl req -new -x509 -days 1826 -key mongodb-test-ca.key -out mongodb-test-ca.crt -config openssl-test-ca.cnf
+
+#. Create the private key for the intermediate certificate.
+
+   .. code-block:: sh
+
+      openssl genrsa -out mongodb-test-ia.key 4096
+
+   .. tip::
+
+      This private key is used to generate valid certificates for the
+      intermediate authority. Although this private key, like all files
+      in this appendix, is intended for testing purposes only, you
+      should engage in good security practices and secure this key file.
+
+#. Create the certificate signing request for the intermediate
+   certificate. When asked for Distinguished Name values, enter the
+   appropriate values for your test Intermediate Authority certificate.
+
+   .. code-block:: sh
+
+      openssl req -new -key mongodb-test-ia.key -out mongodb-test-ia.csr -config openssl-test-ca.cnf
+
+#. Create the intermediate certificate :file:`mongodb-test-ia.crt`.
+
+   .. code-block:: sh
+
+      openssl x509 -sha256 -req -days 730 -in mongodb-test-ia.csr -CA mongodb-test-ca.crt -CAkey mongodb-test-ca.key -set_serial 01 -out mongodb-test-ia.crt -extfile openssl-test-ca.cnf -extensions v3_ca
+
+#. Create the test CA PEM file from the test CA certificate  :file:`mongod-test-ca.crt` and
+   test intermediate certificate :file:`mongodb-test-ia.crt`.
+
+   .. code-block:: sh
+
+      cat mongodb-test-ca.crt mongodb-test-ia.crt  > test-ca.pem
+
+You can use the test PEM file when configuring :binary:`~bin.mongod`,
+:binary:`~bin.mongod`, or :binary:`~bin.mongo` for TLS/SSL testing.
+
+You can use the test intermediate authority to sign the test
+certificates for both the server(s) and client(s). A single authority
+must issue the certificates for both the client and the server.
+
+
+
+.. seealso::
+
+   - :ref:`appendix-server-certificate`
+   - :ref:`appendix-client-certificate`