Backports changes from 3 tickets to v6.0 (#353)

sarahsimpers · web-flow · commit 589ad033f2bd · 2024-09-05T08:03:46.000-04:00
Backports: - #343 - #345 - #347
diff --git a/source/includes/admonitions/available-mongodb-versions.rst b/source/includes/admonitions/available-mongodb-versions.rst
@@ -1,7 +1,5 @@
-.. note:: Available Versions
+|mms| lists only the MongoDB versions that are available for your 
+deployment.
 
-   |mms| lists only the MongoDB versions that are available for your 
-   deployment.
-
-   To disable this filtering, see 
-   :setting:`automation.versions.download.baseUrl.allowOnlyAvailableBuilds`.
+To disable this filtering, see 
+:setting:`automation.versions.download.baseUrl.allowOnlyAvailableBuilds`.
diff --git a/source/includes/backup/select-restore-point.rst b/source/includes/backup/select-restore-point.rst
@@ -20,18 +20,15 @@
        not including the selected time. By default, the Oplog Store
        stores 24 hours of data.
 
-       .. example::
+       .. include:: /includes/fact-restore-doesnt-include-selected-time.rst
 
-          If you select ``12:00``, the last operation in the restore is
-          ``11:59:59`` or earlier.
+       .. important::
 
-          .. important::
-
-             In FCV 4.0, you cannot perform a :abbr:`PIT (Point in Time)` restore
-             that covers any time prior to the latest backup resync. For the
-             conditions that cause a resync, see
-             :doc:`/tutorial/resync-backup`. This note does not apply to FCV 4.2
-             or later.
+          In FCV 4.0, you cannot perform a :abbr:`PIT (Point in Time)` restore
+          that covers any time prior to the latest backup resync. For the
+          conditions that cause a resync, see
+          :ref:`resync-backup`. This note does not apply to FCV 4.2
+          or later.
 
      - Select a :guilabel:`Date` and :guilabel:`Time`.
 
diff --git a/source/includes/extracts-admonitions.yaml b/source/includes/extracts-admonitions.yaml
@@ -9,15 +9,13 @@ content: ""
 ref: admonition-pii-user-role
 content: |
 
-   .. note::
+  To access this feature, you must either:
 
-      To access this feature, you must either:
+  - Belong to the project
 
-      - Belong to the project, or
-
-      - Have the :ref:`Global Monitoring Admin
-        <global-monitoring-admin-role>` role or the :ref:`Global Owner
-        <global-owner-role>` role.
+  - Have the :ref:`Global Monitoring Admin
+    <global-monitoring-admin-role>` role or the :ref:`Global Owner
+    <global-owner-role>` role
 
 ---
 ref: admonition-pii-log-role
diff --git a/source/includes/extracts-api-third-party-integrations.yaml b/source/includes/extracts-api-third-party-integrations.yaml
@@ -96,11 +96,9 @@ content: |
                - Indicates which |api| |url| to use, either ``US`` or
                  ``EU``. Opsgenie defaults to ``US``.
 
-          .. note::
-
-             To set ``region`` to ``EU``, you must :ref:`set a
-             customer setting <opsmgr-config-add-custom>` of
-             :setting:`opsgenie.api.url`.
+          To set ``region`` to ``EU``, you must :ref:`set a
+          customer setting <opsmgr-config-add-custom>` of
+          :setting:`opsgenie.api.url`.
 
       * - VictorOps
         - You must provide the following fields when you configure a
@@ -378,11 +376,9 @@ content: |
                - Indicates which API URL is used, either ``US`` or
                  ``EU``. Opsgenie will use ``US`` by default.
 
-          .. note::
-
-             To set ``region`` to ``EU``, you must :ref:`set a
-             customer setting <opsmgr-config-add-custom>` of
-             :setting:`opsgenie.api.url`.
+          To set ``region`` to ``EU``, you must :ref:`set a
+          customer setting <opsmgr-config-add-custom>` of
+          :setting:`opsgenie.api.url`.
 
       * - VictorOps
         - You must provide the following fields when you configure a
@@ -596,11 +592,9 @@ content: |
                - Indicates which |api| |url| to use, either ``US`` or
                  ``EU``. Opsgenie defaults to ``US``.
 
-          .. note::
-
-             To set ``region`` to ``EU``, you must :ref:`set a
-             customer setting <opsmgr-config-add-custom>` of
-             :setting:`opsgenie.api.url`.
+          To set ``region`` to ``EU``, you must :ref:`set a
+          customer setting <opsmgr-config-add-custom>` of
+          :setting:`opsgenie.api.url`.
 
       * - VictorOps
         - A returned VictorOps integration configuration object
@@ -859,11 +853,9 @@ content: |
                - Indicates which |api| |url| to use, either ``US`` or
                  ``EU``. Opsgenie defaults to ``US``.
 
-          .. note::
-
-             To set ``region`` to ``EU``, you must :ref:`set a
-             customer setting <opsmgr-config-add-custom>` of
-             :setting:`opsgenie.api.url`.
+          To set ``region`` to ``EU``, you must :ref:`set a
+          customer setting <opsmgr-config-add-custom>` of
+          :setting:`opsgenie.api.url`.
 
       * - VictorOps
         - A returned VictorOps integration configuration object
diff --git a/source/includes/fact-automation-removes-existing-data.rst b/source/includes/fact-automation-removes-existing-data.rst
@@ -0,0 +1,3 @@
+:red:`WARNING:` Automation removes all existing data from the cluster.
+It preserves all backup data and snapshots for the
+existing cluster.
diff --git a/source/includes/fact-restore-doesnt-include-selected-time.rst b/source/includes/fact-restore-doesnt-include-selected-time.rst
@@ -0,0 +1,2 @@
+For example, if you select ``12:00``, the last operation in the restore
+is ``11:59:59`` or earlier.
diff --git a/source/includes/fact-restore-manual-replica-set-cloud.rst b/source/includes/fact-restore-manual-replica-set-cloud.rst
@@ -31,10 +31,8 @@
        the "Last Oplog Applied" entry in the ``restoreInfo.txt`` file
        provided with the downloaded snapshot.
 
-       .. note::
-
-          This value must be less than or equal to the ``--opEnd``
-          value.
+       This value must be less than or equal to the ``--opEnd``
+       value.
 
      - :icon:`check-circle`
  
@@ -45,7 +43,7 @@
        for the last :manual:`oplog </reference/glossary/#std-term-oplog>` entry
        you want to include in the restore.
 
-       .. note:: This value cannot be greater than the end of the oplog.
+       This value cannot be greater than the end of the oplog.
 
      - :icon:`check-circle`
  
diff --git a/source/includes/fact-restore-manual-replica-set-onprem.rst b/source/includes/fact-restore-manual-replica-set-onprem.rst
@@ -31,10 +31,8 @@
        the "Last Oplog Applied" entry in the ``restoreInfo.txt`` file
        provided with the downloaded snapshot.
 
-       .. note::
-
-          This value must be less than or equal to the ``--opEnd``
-          value.
+       This value must be less than or equal to the ``--opEnd``
+       value.
 
      - :icon:`check-circle`
 
@@ -45,7 +43,7 @@
        for the last :opsmgr:`oplog  </reference/glossary/#std-term-Oplog-Store-Database>` entry
        you want to include in the restore.
 
-       .. note:: This value cannot be greater than the end of the oplog.
+       This value cannot be greater than the end of the oplog.
 
      - :icon:`check-circle`
 
diff --git a/source/includes/list-table-restore-select-restore-point.rst b/source/includes/list-table-restore-select-restore-point.rst
@@ -19,10 +19,7 @@
      - Creates a custom snapshot that includes all operations up to
        but not including the selected time.
 
-       .. example::
-
-          If you select ``12:00``, the last operation in the restore is
-          ``11:59:59`` or earlier.
+       .. include:: /includes/fact-restore-doesnt-include-selected-time.rst
 
      - Select a :guilabel:`Date` and :guilabel:`Time`.
 
diff --git a/source/includes/list-tables/third-party-integration-settings-ui.rst b/source/includes/list-tables/third-party-integration-settings-ui.rst
@@ -40,7 +40,7 @@
 
    * - Slack Settings
 
-       .. warning::
+       .. important::
 
           Before proceeding, you must complete the steps to 
           :ref:`integrate with Slack <integrate-with-slack>`.
diff --git a/source/includes/nav/list-processes.rst b/source/includes/nav/list-processes.rst
@@ -0,0 +1,4 @@
+Go to the :guilabel:`Processes` page.
+
+i. Click the :guilabel:`Processes` tab for your deployment.
+   
diff --git a/source/includes/nav/list-security.rst b/source/includes/nav/list-security.rst
@@ -0,0 +1,3 @@
+Go to the :guilabel:`Security` page.
+
+i. Click the :guilabel:`Security` tab for your deployment.
diff --git a/source/includes/prometheus-discovery.rst b/source/includes/prometheus-discovery.rst
@@ -24,11 +24,9 @@ the following tabs or create your own script in another language.
    .. tab:: Python Script
       :tabid: python-script
 
-      .. tip::
-
-         If you need to install the ``requests`` library,
-         see their
-         `Installation Guide <https://prometheus.io/docs/prometheus/latest/installation>`__.
+      If you need to install the ``requests`` library,
+      see their
+      `Installation Guide <https://prometheus.io/docs/prometheus/latest/installation>`__.
 
       .. code-block:: python
 
diff --git a/source/includes/steps-configure-prometheus-integration.yaml b/source/includes/steps-configure-prometheus-integration.yaml
@@ -64,12 +64,10 @@ content: |
        -  ``PEM`` file path that contains certificate and key required
           to spin up a ``https`` Prometheus scraping endpoint. 
 
-          .. note::
-
-             You are responsible for the following:
+          You are responsible for the following:
              
-             - TLS Certificate Key File issuance and renewal.
-             - Checking if the endpoint started correctly in the automation agent logs.
+          - TLS Certificate Key File issuance and renewal.
+          - Checking if the endpoint started correctly in the automation agent logs.
 
      * - TLS Certificate Key File Password
        - Required if the certificate key file is encrypted.
diff --git a/source/includes/steps-prepare-snapshot-replica-set.yaml b/source/includes/steps-prepare-snapshot-replica-set.yaml
@@ -47,11 +47,7 @@ action:
               - Select a :manual:`cluster </reference/glossary/#std-term-cluster>` to which you want to restore
                 the snapshot.
 
-                .. warning::
-                
-                   Automation removes all existing data from the
-                   cluster. All backup data and snapshots for the
-                   existing cluster are preserved.
+                .. include:: /includes/fact-automation-removes-existing-data.rst
 
       b. Click :guilabel:`Restore`.
 
diff --git a/source/includes/steps-prepare-snapshot-sharded-cluster.yaml b/source/includes/steps-prepare-snapshot-sharded-cluster.yaml
@@ -101,11 +101,7 @@ action:
               - Select a :manual:`cluster </reference/glossary/#std-term-cluster>` to which you want to restore
                 the snapshot.
 
-                .. warning::
-                
-                   Automation removes all existing data from the
-                   cluster. All backup data and snapshots for the
-                   existing cluster are preserved.
+                .. include:: /includes/fact-automation-removes-existing-data.rst
 
       b. Click :guilabel:`Restore`.
 
diff --git a/source/includes/steps-restore-automatic-replica-set-wt.yaml b/source/includes/steps-restore-automatic-replica-set-wt.yaml
@@ -50,11 +50,7 @@ content: |
 
             |mms| *must* manage the target replica set.
 
-            .. warning::
-            
-               Automation removes all existing data from the
-               cluster. All backup data and snapshots for the
-               existing cluster are preserved.
+            .. include:: /includes/fact-automation-removes-existing-data.rst
 
   b. Click :guilabel:`Restore`.
 
diff --git a/source/includes/steps-restore-automatic-replica-set.yaml b/source/includes/steps-restore-automatic-replica-set.yaml
@@ -52,11 +52,7 @@ content: |
 
             |mms| *must* manage the target replica set.
 
-            .. warning::
-            
-               Automation removes all existing data from the
-               cluster. All backup data and snapshots for the
-               existing cluster are preserved.
+            .. include:: /includes/fact-automation-removes-existing-data.rst
 
   b. Click :guilabel:`Restore`.
 
diff --git a/source/includes/steps-restore-automatic-sharded-cluster-wt.yaml b/source/includes/steps-restore-automatic-sharded-cluster-wt.yaml
@@ -50,11 +50,7 @@ content: |
 
             |mms| *must* manage the target sharded cluster.
 
-            .. warning::
-            
-               Automation removes all existing data from the
-               cluster. All backup data and snapshots for the
-               existing cluster are preserved.
+            .. include:: /includes/fact-automation-removes-existing-data.rst
 
   b. Click :guilabel:`Restore`.
 
diff --git a/source/includes/steps-restore-automatic-sharded-cluster.yaml b/source/includes/steps-restore-automatic-sharded-cluster.yaml
@@ -107,11 +107,7 @@ content: |
 
             |mms| *must* manage the target sharded cluster.
 
-            .. warning::
-            
-               Automation removes all existing data from the cluster.
-               All backup data and snapshots for the existing cluster
-               are preserved.
+            .. include:: /includes/fact-automation-removes-existing-data.rst
 
   b. Click :guilabel:`Restore`.
 
diff --git a/source/includes/steps-rotate-automation-password-api.yaml b/source/includes/steps-rotate-automation-password-api.yaml
@@ -29,12 +29,8 @@ content: |
        - Specify the new {+aagent+} password.
 
      * - ``<CURRENT_AUTOMATION_CONFIGURATION_VERSION>``
-       - Specify the current {+aagent+} version.
-
-         .. note::
-
-            To check your current {+aagent+} version, 
-            :ref:`get-auto-config`.
+       - Specify the current {+aagent+} version. To check your current
+         {+aagent+} version, see :ref:`get-auto-config`.
 
      * - ``<NEW_AUTOMATION_CONFIGURATION_VERSION>``
        - Specify the current {+aagent+} version incremented by 1. For   
diff --git a/source/includes/steps-source-prepare-restore-snapshot.yaml b/source/includes/steps-source-prepare-restore-snapshot.yaml
@@ -32,10 +32,7 @@ content: |
          but not including the selected time. By default, the
          Oplog Store stores 24 hours of data.
 
-         .. example::
-
-            If you select ``12:00``, the last operation in the restore
-            is ``11:59:59`` or earlier.
+         .. include:: /includes/fact-restore-doesnt-include-selected-time.rst
 
          .. important::
 
@@ -100,11 +97,7 @@ action:
               - Select a :manual:`cluster </reference/glossary/#std-term-cluster>` to which you want to restore
                 the snapshot.
 
-                .. warning::
-                
-                   Automation removes all existing data from the
-                   cluster. All backup data and snapshots for the
-                   existing cluster are preserved.
+                .. include:: /includes/fact-automation-removes-existing-data.rst
 
       b. Click :guilabel:`Restore`.
 
diff --git a/source/includes/steps-sync-mongodb-user.yaml b/source/includes/steps-sync-mongodb-user.yaml
@@ -43,30 +43,24 @@ content: |
 
        - |mms| now manages the user.
 
-         .. note:: 
-
-            If there are any potential conflicts with other discovered
-            users, you will be presented with the option to resolve
-            conflicts.
+         If there are any potential conflicts with other discovered
+         users, |mms| presents you with the option to resolve
+         conflicts.
 
      * - ``YES``
 
        - ``NO``
 
        - |mms| no longer manages the user.
 
-         .. warning::
-
-            If :guilabel:`Ensure Consistent Set` is ``YES``, the user
-            is deleted from all MongoDB databases |mms| currently
-            manages for this project.
+         :red:`WARNING:` If :guilabel:`Ensure Consistent Set` is
+         ``YES``, |mms| deletes the user from all MongoDB databases 
+         that |mms| currently manages for this project.
 
-         .. note::
-         
-            If :guilabel:`Ensure Consistent Set` is ``NO``, |mms| no
-            longer manages the users in that MongoDB database, but
-            these users can be managed through a direct connection to
-            that database.
+         If :guilabel:`Ensure Consistent Set` is ``NO``, |mms| no
+         longer manages the users in that MongoDB database, but
+         you can manage these users through a direct connection to
+         that database.
 ---
 level: 4
 stepnum: 4
diff --git a/source/includes/steps-update-mongodb-agent-all-agents.yaml b/source/includes/steps-update-mongodb-agent-all-agents.yaml
diff --git a/source/tutorial/resync-backup.txt b/source/tutorial/resync-backup.txt

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+:red:`WARNING:` Automation removes all existing data from the cluster.
	`2`	`+It preserves all backup data and snapshots for the`
	`3`	`+existing cluster.`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+For example, if you select ``12:00``, the last operation in the restore
	`2`	+is ``11:59:59`` or earlier.