(DOCSP-30437)-fix: Corrected PR for the abandoned #1423: AppDB and Database backup to S2 for multicluster resources, S3 oplog config options (#1448)

* (DOCSP-30437) Appdb S3 and blockstore config
* Final edit

Author: JuliaMongo

conf.py

@@ -149,8 +149,8 @@
     '.. |k8s-custom-resources| replace:: `custom resources <https://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/custom-resources/>`__',
     '.. |k8s-crds| replace:: `CustomResourceDefinitions <https://kubernetes.io/docs/tasks/access-kubernetes-api/extend-api-custom-resource-definitions/>`__',
     '.. |k8s-crd| replace:: `CustomResourceDefinition <https://kubernetes.io/docs/tasks/access-kubernetes-api/extend-api-custom-resource-definitions/>`__',
-    '.. |k8s-mdbrscs| replace:: MongoDB Kubernetes resources',
-    '.. |k8s-mdbrsc| replace:: MongoDB Kubernetes resource',
+    '.. |k8s-mdbrscs| replace:: ``MongoDB`` resources',
+    '.. |k8s-mdbrsc| replace:: ``MongoDB`` resource',
     '.. |mongodb-multi| replace:: ``MongoDBMultiCluster`` resource',
     '.. |mongodb-multis| replace:: ``MongoDBMultiCluster`` resources',
     '.. |k8s-nodes| replace:: `nodes <https://kubernetes.io/docs/concepts/architecture/nodes/>`__',

snooty.toml

@@ -16,4 +16,5 @@ mdbtools-version = "100.1.0"
 mdbagent = "MongoDB Agent"
 appdb-agent-version = "10.2.15.5958-1_4.2.11-ent"
 mdb-ent-db = "MongoDB Enterprise Database"
-mdb-ent-db-version = "2.0.0"
+mdb-ent-db-version = "2.0.0"
+mdb-support = "`MongoDB Support <https://support.mongodb.com/welcome>`__"

source/faq.txt

@@ -72,4 +72,4 @@ Can I deploy MongoDB Server across multiple |k8s| clusters?
 -----------------------------------------------------------
 
 Yes. To learn more, see :ref:`Deploy MongoDB Resources on Multiple Kubernetes Clusters <multi-cluster>`.
-For help, contact `MongoDB Support <https://support.mongodb.com/welcome>`__
+For help, contact |mdb-support|.

source/includes/admonitions/k8s-persistent-volumes-om.rst

@@ -11,5 +11,4 @@
    :k8sdocs:`discussion 
    </tasks/configure-pod-container/security-context/#discussion>` in 
    the |k8s| documentation. If redeploying the resource doesn't fix
-   issues with your Persistent Volume, contact `MongoDB Support
-   <https://support.mongodb.com/welcome>`__.
+   issues with your Persistent Volume, contact |mdb-support|.

source/includes/facts/fact-migrating-to-multi-clusters.rst

@@ -1,5 +1,4 @@
-You can create a new |multi-cluster| and contact
-`MongoDB Support <https://support.mongodb.com/welcome>`__ to help you
+You can create a new |multi-cluster| and contact |mdb-support| to help you
 migrate data from your existing |k8s| deployment to a |multi-cluster|.
 You can't extend an existing single-Kubernetes cluster deployment to
 new |k8s| clusters.

source/includes/steps-deploy-k8s-opsmgr-http.yaml

@@ -179,8 +179,17 @@ optional: true
 ref: configure-backup-settings
 content: |
 
-  If you want to enable backup, you must configure all of the following 
-  settings:
+  To configure backup, you must enable it, and then:
+  
+  - Choose to configure an :term:`S3 snapshot store <s3 snapshot store>` 
+    or a :term:`blockstore <Backup Blockstore Database>`. If you deploy
+    both an |s3| :term:`snapshot store <s3 snapshot store>` and a
+    :term:`blockstore <Backup Blockstore Database>`, |onprem| 
+    randomly choses one to use for backup.
+  
+  - Choose to configure an oplog store or an |s3| oplog store.
+    If you deploy both an oplog store and an |s3| oplog store, |onprem|
+    randomly choses one of them to use for the oplog backup.
 
   .. list-table::
     :widths: 30 10 40 20
@@ -197,7 +206,7 @@ content: |
       - boolean
       - Flag that indicates that backup is enabled. You must specify 
         ``spec.backup.enabled: true`` to configure settings
-        for the head database, oplog store, and snapshot store.
+        for the head database, oplog store, |s3| oplog store, and snapshot store.
       - ``true``
 
     * - | ``spec``
@@ -218,6 +227,14 @@ content: |
       - Name of the oplog store.
       - ``oplog1``
 
+    * - | ``spec``
+        | ``.backup``
+        | ``.s3opLogStores``
+        | ``.``:opsmgrkube:`~spec.backup.s3opLogStores.name`
+      - string
+      - Name of the |s3| oplog store.
+      - ``my-s3-oplog-store``
+
     * - | ``spec``
         | ``.backup``
         | ``.opLogStores``
@@ -229,6 +246,15 @@ content: |
         
       - ``my-oplog-db``
 
+    * - | ``spec``
+        | ``.backup``
+        | ``.s3opLogStores``
+        | ``.mongodbResourceRef``
+        | ``.``:opsmgrkube:`~spec.backup.s3opLogStores.mongodbResourceRef.name`
+      - string
+      - Name of the MongoDB database resource for the |s3| oplog store.
+      - ``my-s3-oplog-db``
+
   You must also configure an :term:`S3 snapshot store <s3 snapshot store>` 
   or a :term:`blockstore <Backup Blockstore Database>`.
 
@@ -318,6 +344,7 @@ content: |
       - Name of the blockstore.
       - ``blockStore1``
 
+
     * - | ``spec``
         | ``.backup``
         | ``.blockStores``
@@ -328,6 +355,7 @@ content: |
         You must deploy this database resource in the same namespace as
         the |onprem| resource. The resource's ``metadata.name`` must match this name.
       - ``my-mongodb-blockstore``
+
 ---
 title: "Configure any additional settings for an |onprem| backup."
 stepnum: 6
@@ -384,14 +412,13 @@ level: 4
 ref: track-k8s-instance
 content: |
 
-  To check the status of your |onprem| resource, invoke the following
-  command:
+  To check the status of your |onprem| resource, invoke the following command:
 
   .. code-block:: sh
 
      kubectl get om -o yaml -w
 
-  The command returns the following output under the ``status`` field
+  The command returns output similar to the following, under the ``status`` field
   while the resource deploys:
 
   .. code-block:: yaml
@@ -419,8 +446,8 @@ content: |
   one enters the ``Running`` phase.
 
   After the |onprem| resource completes the ``Reconciling`` phase, the 
-  command returns the following output under the ``status`` field if you
-  enabled backup:
+  command returns the output similar to the following under the ``status``
+  field if you enabled backup:
 
   .. code-block:: yaml
      :copyable: false