Upgrading Agent Docs Changes

content/en/agent/guide/upgrade_between_minor_versions.md

@@ -1,17 +1,38 @@
 ---
-title: Upgrade Between Datadog Agent Minor Versions
+title: Upgrade your Datadog Agent
 aliases:
   - /agent/faq/upgrade-between-agent-minor-versions
   - /agent/guide/upgrade-between-agent-minor-versions
   - /agent/versions/upgrade_between_agent_minor_versions/
+  - /agent/guide/upgrade
+further_reading:
+  - link: "/agent/troubleshooting/"
+    tag: "Documentation"
+    text: "Agent Troubleshooting"
+  - link: "/agent/basic_agent_usage/"
+    tag: "Documentation"
+    text: "Basic Agent Usage"
 ---
 
+## Overview
+Datadog recommends you update your Datadog Agent with every [minor and patch][6] release. This guide walks you through how to roll out a new Agent version across your hosts in a few clicks.
+
+
+## Upgrade between minor versions of the Agent
+### Upgrade remotely with fleet automation
+
+Fleet Automation allows you to upgrade Datadog Agents across non-containerized Linux and Windows environments remotely. In a few clicks you can deploy the latest Agent release, keeping your fleet current with new features and security patches. To get setup, follow the [Fleet Automation Agent Upgrade guide][7].
+
+### Upgrade with script or configuration management tooling
+Follow the [in-app instructions][4] to upgrade Datadog Agents across container, host-based, and Infrastructure as Code (IaC) tool-managed environments. The guided flow generates an Agent installation command tailored to your platform for upgrading the Agent. By default, the command installs the latest version of the Agent. To upgrade to a specific minor version, set `DD_AGENT_MINOR_VERSION=<TARGET_MINOR>` before running the script. 
+
+
 ## Upgrade between minor versions of the Agent
 
 {{< tabs >}}
 {{% tab "Linux" %}}
 
-The recommended way to upgrade between minor versions of the Agent is to use the `install_script_agent7.sh` script. The following commands work on all supported Linux distributions.
+To upgrade between minor versions of the Agent is to use the `install_script_agent7.sh` script. The following commands work on all supported Linux distributions.
 
 Upgrading to a given Agent minor version:
 
@@ -33,7 +54,7 @@ URL to download a specific Agent minor version
 {{% /tab %}}
 {{% tab "MacOS" %}}
 
-The recommended way to upgrade between minor version of the Agent is to use the `install_mac_os.sh` script. The following commands work on all supported MacOS versions.
+To upgrade between minor version of the Agent is to use the `install_mac_os.sh` script. The following commands work on all supported MacOS versions.
 
 Upgrading to a given Agent minor version:
 
@@ -45,3 +66,89 @@ Upgrading to the latest Agent minor version:
 
 {{% /tab %}}
 {{< /tabs >}}
+
+
+## Upgrade between major versions of the Agent
+### Upgrade to Datadog Agent 7 
+
+<div class="alert alert-info">
+Agent 7 only supports Python 3 custom checks. <a href="/agent/guide/python-3">Check if your custom checks are Python 3 compatible</a> before upgrading to Agent 7.
+</div>
+
+### From Agent 6
+
+{{< tabs >}}
+{{% tab "Linux" %}}
+
+Run the following Agent installation command to upgrade your Agent from version 6 to version 7:
+
+The following command works on Amazon Linux, CentOS, Debian, Fedora, Red Hat, Ubuntu, and SUSE:
+: `DD_API_KEY="<DATADOG_API_KEY>" bash -c "$(curl -L https://install.datadoghq.com/scripts/install_script_agent7.sh)"`
+
+{{% /tab %}}
+{{% tab "Windows" %}}
+
+1. [Download the Datadog Agent installer][1].
+2. Run the installer (as **Administrator**) by opening `datadog-agent-7-latest.amd64.msi`.
+3. Follow the prompts, accept the license agreement, and enter your [Datadog API key][2].
+4. When the install finishes, you are given the option to launch the Datadog Agent Manager.
+
+**Note**: Links to all available versions of the Windows Installer are [provided in JSON format][3].
+
+[1]: https://ddagent-windows-stable.s3.amazonaws.com/datadog-agent-7-latest.amd64.msi
+[2]: https://app.datadoghq.com/organization-settings/api-keys
+[3]: https://ddagent-windows-stable.s3.amazonaws.com/installers_v2.json
+{{% /tab %}}
+{{% tab "MacOS" %}}
+
+Run the Agent installation command with the environment variable `DD_AGENT_MAJOR_VERSION=7` to upgrade your Agent from version 6 to version 7:
+
+```shell
+DD_AGENT_MAJOR_VERSION=7 DD_API_KEY="<DATADOG_API_KEY>" bash -c "$(curl -L https://install.datadoghq.com/scripts/install_mac_os.sh)"
+```
+
+{{% /tab %}}
+{{< /tabs >}}
+
+### From Agent 5
+
+{{< tabs >}}
+{{% tab "Linux" %}}
+
+Run the Agent installation command with the environment variable `DD_UPGRADE="true"` to upgrade your Agent from version 5 to version 7. The Agent v7 installer can automatically convert v5 configurations during the upgrade:
+
+The following command works on Amazon Linux, CentOS, Debian, Fedora, Red Hat, Ubuntu, and SUSE:
+: `DD_UPGRADE="true" bash -c "$(curl -L https://install.datadoghq.com/scripts/install_script_agent7.sh)"`
+
+{{% /tab %}}
+{{% tab "Windows" %}}
+
+1. Upgrade your Agent to version 6 following the [manual upgrade process][1].
+2. Follow the [From Agent v6 to Agent v7](#from-agent-v6-to-agent-v7) upgrade instructions.
+
+[1]: /agent/versions/upgrade_to_agent_v6/?tab=windows#manual-upgrade
+{{% /tab %}}
+{{% tab "MacOS" %}}
+
+Run the Agent installation command with the environment variable `DD_AGENT_MAJOR_VERSION=7` and `DD_UPGRADE="true"` to upgrade your Agent from version 5 to version 7. The Agent v7 installer can automatically convert v5 configurations during the upgrade:
+
+```shell
+DD_UPGRADE="true" DD_AGENT_MAJOR_VERSION=7 bash -c "$(curl -L https://install.datadoghq.com/scripts/install_mac_os.sh)"
+```
+
+{{% /tab %}}
+{{< /tabs >}}
+
+**Note:** The upgrade process does not automatically move **custom** Agent checks. This is by design as Datadog cannot guarantee full backwards compatibility out of the box. See the [Python 3 Custom Check Migration][1] guide to discover how to migrate your custom check from Python 2 to Python 3.
+
+## Further reading
+
+{{< partial name="whats-next/whats-next.html" >}}
+
+[1]: /agent/guide/python-3/
+[2]: /agent/fleet_automation/remote_management
+[3]: /agent/fleet_automation/remote_management/#setup
+[4]: https://app.datadoghq.com/fleet/agent-upgrades
+[5]: /agent/remote_config/?tab=configurationyamlfile#enabling-remote-configuration
+[6]: https://github.com/DataDog/datadog-agent/releases?page=1
+[7]: https://docs.datadoghq.com/agent/fleet_automation/remote_management/#upgrade-your-agents