Merge branch 'main' into move-component-switcher

Author: rosieyohannan

antora-playbook.yml

@@ -4,6 +4,7 @@ site:
   robots: allow
   keys:
     cookiebot: a28b71f3-4d2e-4eac-93bc-34929948dd7d
+    google_analytics: 'GTM-W9HDVK'
 content:
   sources:
   - url: .

archive/server 4.1/server-admin/modules/operator/pages/upgrade-mongo.adoc

@@ -56,12 +56,12 @@ db.adminCommand( { setFeatureCompatibilityVersion: "4.0" } )
 
 === 2. Upgrade from MongoDB 4.0 to 4.2
 
-. Change the tag to `4.2.17-debian-10-r99`:
+. Change the tag to `4.2.21-debian-10-r8`:
 +
 ```yaml
 mongodb:
   image:
-    tag: 4.2.17-debian-10-r99
+    tag: 4.2.21-debian-10-r8
 ```
 
 . Run `helm upgrade` to update your installation.

docs/guides/modules/ROOT/images/deploy/deploys-timeline-fail-banner.png

@@ -7,7 +7,7 @@ This tutorial shows how to add a deploy marker step to your workflow config. Dep
 
 == Introduction
 
-Deploy markers provide a lightweight way to log your deployments without requiring a you to install the CircleCI release agent. If you install deploy markers, as described in this guide, you will also be able to use the xref:set-up-rollbacks.adoc[CircleCI rollback feature].
+Deploy markers provide a lightweight way to log your deployments. If you install deploy markers, as described in this guide, you will also be able to use the xref:set-up-rollbacks.adoc[CircleCI rollback feature].
 
 For a full guide to CircleCI's deploys features and functionality, refer to the xref:deployment-overview.adoc[Deployment and deploy management] guide.
 
@@ -16,6 +16,14 @@ You can configure deploy markers as follows:
 * To display updated statuses depending of the outcome of your deployments. Steps for this are provided in the <<deploy-markers-with-status-updates>> section.
 * Or, you can choose to configure deploy markers to log deployments without status updates. Steps for this are provided in the <<deploy-logs-without-status-updates>> section.
 
+Once you have deploy markers configured, you will see a timeline of deployments in the Deploys UI. From the timeline you can choose to rollback (image:guides:ROOT:icons/rebuild.svg[rollback icon, role="no-border"]) to a version, and you get notifications for failed deployments.
+
+.Deploys timeline with failed deployment
+image::guides:ROOT:deploy/deploys-timeline-fail-banner.png[Deploy timeline with failed deployment]
+
+.Deploys timeline with no deployments requiring troubleshooting
+image::guides:ROOT:releases/dashboard.png[Deploys timeline with no deployments requiring troubleshooting]
+
 == Prerequisites
 
 * A CircleCI account connected to your code. You can link:https://circleci.com/signup/[sign up for free].

docs/guides/modules/deploy/pages/configure-deploy-markers.adoc

@@ -57,12 +57,12 @@ db.adminCommand( { setFeatureCompatibilityVersion: "4.0" } )
 
 === 2. Upgrade from MongoDB 4.0 to 4.2
 
-. Change the tag to `4.2.17-debian-10-r99`:
+. Change the tag to `4.2.21-debian-10-r8`:
 +
 ```yaml
 mongodb:
   image:
-    tag: 4.2.17-debian-10-r99
+    tag: 4.2.21-debian-10-r8
 ```
 
 . Run `helm upgrade` to update your installation.

docs/server-admin-4.2/modules/operator/pages/upgrade-mongo.adoc

@@ -55,12 +55,12 @@ db.adminCommand( { setFeatureCompatibilityVersion: "4.0" } )
 
 === 2. Upgrade from MongoDB 4.0 to 4.2
 
-. Change the tag to `4.2.17-debian-10-r99`:
+. Change the tag to `4.2.21-debian-10-r8`:
 +
 ```yaml
 mongodb:
   image:
-    tag: 4.2.17-debian-10-r99
+    tag: 4.2.21-debian-10-r8
 ```
 
 . Run `helm upgrade` to update your installation.

docs/server-admin-4.3/modules/operator/pages/upgrade-mongo.adoc

@@ -57,12 +57,12 @@ db.adminCommand( { setFeatureCompatibilityVersion: "4.0" } )
 
 === 2. Upgrade from MongoDB 4.0 to 4.2
 
-. Change the tag to `4.2.17-debian-10-r99`:
+. Change the tag to `4.2.21-debian-10-r8`:
 +
 ```yaml
 mongodb:
   image:
-    tag: 4.2.17-debian-10-r99
+    tag: 4.2.21-debian-10-r8
 ```
 
 . Run `helm upgrade` to update your installation.

docs/server-admin-4.4/modules/operator/pages/upgrade-mongo.adoc

@@ -57,12 +57,12 @@ db.adminCommand( { setFeatureCompatibilityVersion: "4.0" } )
 
 === 2. Upgrade from MongoDB 4.0 to 4.2
 
-. Change the tag to `4.2.17-debian-10-r99`:
+. Change the tag to `4.2.21-debian-10-r8`:
 +
 ```yaml
 mongodb:
   image:
-    tag: 4.2.17-debian-10-r99
+    tag: 4.2.21-debian-10-r8
 ```
 
 . Run `helm upgrade` to update your installation.

docs/server-admin-4.5/modules/operator/pages/upgrade-mongo.adoc

@@ -57,12 +57,12 @@ db.adminCommand( { setFeatureCompatibilityVersion: "4.0" } )
 
 === 2. Upgrade from MongoDB 4.0 to 4.2
 
-. Change the tag to `4.2.17-debian-10-r99`:
+. Change the tag to `4.2.21-debian-10-r8`:
 +
 ```yaml
 mongodb:
   image:
-    tag: 4.2.17-debian-10-r99
+    tag: 4.2.21-debian-10-r8
 ```
 
 . Run `helm upgrade` to update your installation.

docs/server-admin-4.6/modules/operator/pages/upgrade-mongo.adoc

@@ -57,12 +57,12 @@ db.adminCommand( { setFeatureCompatibilityVersion: "4.0" } )
 
 === 2. Upgrade from MongoDB 4.0 to 4.2
 
-. Change the tag to `4.2.17-debian-10-r99`:
+. Change the tag to `4.2.21-debian-10-r8`:
 +
 ```yaml
 mongodb:
   image:
-    tag: 4.2.17-debian-10-r99
+    tag: 4.2.21-debian-10-r8
 ```
 
 . Run `helm upgrade` to update your installation.