Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)

Author: Learn Build Service GitHub App

articles/energy-data-services/how-to-manage-upgrade-settings.md

@@ -0,0 +1,113 @@
+---
+title: How to manage upgrade settings - Azure Data Manager for Energy
+description: Learn how to configure upgrade settings to control how milestone upgrades are applied to your Azure Data Manager for Energy instance.
+author: japicket
+ms.author: japicket
+ms.service: azure-data-manager-energy
+ms.topic: how-to
+ms.date: 01/27/2026
+ms.custom:
+  - template-how-to
+---
+
+# Manage upgrade settings in Azure Data Manager for Energy
+
+This article describes how to view and manage upgrade settings for your Azure Data Manager for Energy instance. Upgrade settings allow you to control how milestone upgrades are applied to your instance.
+
+## What are milestone upgrades?
+
+Milestone upgrades are major version upgrades to Azure Data Manager for Energy, such as moving from M25 to M26. These upgrades might include significant changes to functionality and features.
+
+## Upgrade policy options
+
+Azure Data Manager for Energy provides two upgrade policy options:
+
+| Policy | Description |
+|--------|-------------|
+| **Automatic** | Instance is upgraded automatically when a new milestone release is available. This option is the default setting for all instances. |
+| **Deferred** | Upgrades are deferred for up to 30 days before instance is upgraded. |
+
+If you have multiple Azure Data Manager for Energy instances, you can set different upgrade policies for each one. For example, you might set one instance to **Automatic** so it upgrades immediately when a new milestone is released, allowing you to test and validate the changes. Meanwhile, you can set your production instance to **Deferred** to delay the upgrade until you complete your testing. At any point during the 30-day window, you can mark your deferred instance as ready for upgrade. If you don't take action, the instance is automatically upgraded at the end of the 30-day window.
+
+## View upgrade settings
+
+1. Sign in to the [Azure portal](https://portal.azure.com) and navigate to your Azure Data Manager for Energy instance.
+
+1. In the left menu under **Advanced**, select **Upgrade Settings**.
+
+1. On the **Upgrade Settings** page, you can view:
+   - **Upgrade policy**: Whether your instance is set to **Automatic** or **Deferred** upgrades.
+   - **Automatic upgrade after**: If your upgrade policy is set to **Deferred** and a milestone upgrade is available, this field shows the date when your instance is automatically upgraded.
+
+> [!NOTE]
+> The current milestone version is displayed in the **Essentials** section on the **Overview** page for your Azure Data Manager for Energy instance.
+
+## Configure upgrade settings during instance creation
+
+You can configure upgrade settings when you create a new Azure Data Manager for Energy instance.
+
+1. When creating a new instance, navigate to the **Advanced Settings** tab.
+
+1. In the **Upgrade Settings** section, select either **Automatic** or **Deferred** for the **Upgrade Policy**.
+
+1. Complete the remaining tabs and select **Create** to create your instance with the configured upgrade settings.
+
+## Change the upgrade policy for an existing instance
+
+You can change the upgrade policy for an existing Azure Data Manager for Energy instance at any time.
+
+1. Sign in to the [Azure portal](https://portal.azure.com) and navigate to your Azure Data Manager for Energy instance.
+
+1. In the left menu under **Advanced**, select **Upgrade Settings**.
+
+1. Select either **Automatic** or **Deferred** to change your upgrade policy.
+
+1. Select **Save** to apply your changes.
+
+## Mark your instance as ready for upgrade
+
+If your upgrade policy is set to **Deferred** and a milestone upgrade is available, you can mark your instance as ready for upgrade at any time during the 30-day window.
+
+1. Sign in to the [Azure portal](https://portal.azure.com) and navigate to your Azure Data Manager for Energy instance.
+
+1. In the left menu under **Advanced**, select **Upgrade Settings**.
+
+1. Select the **Mark Ready for Upgrade** button.
+
+    > [!NOTE]
+    > The **Mark Ready for Upgrade** button is only available when:
+    > - Your upgrade policy is set to **Deferred**.
+    > - The **Automatic upgrade after** date is set by the Azure Data Manager for Energy team.
+
+1. Confirm that you want to mark your instance as ready for upgrade.
+
+> [!IMPORTANT]
+> Once you mark your instance as ready for upgrade, this action can't be undone. Your instance will be upgraded during the next upgrade cycle.
+
+## Understanding the 30-day upgrade window
+
+When a new milestone release is available and your upgrade policy is set to **Deferred**, the following apply:
+
+1. After all instances with the **Automatic** upgrade policy are upgraded, the Azure Data Manager for Energy team sets the **Automatic upgrade after** date, which is approximately 30 days from that point.
+
+1. The **Automatic upgrade after** date is displayed on the **Upgrade Settings** page in the Azure portal for instances with a **Deferred** upgrade policy.
+
+1. During this 30-day window, you can:
+   - Test the new milestone release in a nonproduction environment.
+   - Mark your instance as ready for upgrade when you're satisfied with your testing.
+   - Take no action and let your instance be automatically upgraded at the end of the window.
+
+1. After your instance is upgraded, the **Automatic upgrade after** date is cleared until the next milestone release.
+
+## Frequently asked questions
+
+### What happens if I find an issue with Azure Data Manager for Energy during the 30-day window?
+
+If you discover an issue during the 30-day window, contact Azure support. Depending on the severity of the issue, the Azure Data Manager for Energy team might deploy a hotfix. If a hotfix is required, the 30-day timer is paused when the issue is identified and resumes once the hotfix is deployed.
+
+## Next steps
+
+Learn more about each milestone release and Azure Data Manager for Energy:
+
+> [!div class="nextstepaction"]
+> [Release notes](release-notes.md)

articles/energy-data-services/media/quickstart-create-microsoft-energy-data-services-instance/advanced-settings-tab.png

@@ -91,7 +91,9 @@ OSDU® is a trademark of The Open Group.
 
    [![Screenshot of the tab for specifying tags in Azure Data Manager for Energy.](media/quickstart-create-microsoft-energy-data-services-instance/input-tags.png)](media/quickstart-create-microsoft-energy-data-services-instance/input-tags.png#lightbox)
 
-1. Move to the **Advanced Settings** tab to configure **cross-origin resource sharing** and **reference data values settings**. To learn more about cross-origin resource sharing (CORS), see [Use CORS for resource sharing in Azure Data Manager for Energy](../energy-data-services/how-to-enable-cors.md). To learn more about reference data values, see [Syncing Reference Data Values](../energy-data-services/concepts-reference-data-values.md).
+1. Move to the **Advanced Settings** tab to configure **cross-origin resource sharing**, **upgrade settings**, and, if available to you as a customer in the limited preview for the feature, **reference data values settings**. To learn more about cross-origin resource sharing (CORS), see [Use CORS for resource sharing in Azure Data Manager for Energy](../energy-data-services/how-to-enable-cors.md). To learn more about reference data values, see [Syncing Reference Data Values](../energy-data-services/concepts-reference-data-values.md). To learn more about upgrade settings, see [Manage upgrade settings](../energy-data-services/how-to-manage-upgrade-settings.md).
+
+   In the **Upgrade Settings** section, select either **Automatic** or **Deferred** for the **Upgrade Policy**. When set to **Deferred**, you have up to 30 days to validate new milestone releases before your instance is upgraded.
 
    [![Screenshot of the tab for configuring cross-origin resource sharing in Azure Data Manager for Energy.](media/quickstart-create-microsoft-energy-data-services-instance/advanced-settings-tab.png)](media/quickstart-create-microsoft-energy-data-services-instance/advanced-settings-tab.png#lightbox)
 

articles/energy-data-services/media/quickstart-create-microsoft-energy-data-services-instance/overview-energy-data-services-sku.png

@@ -125,6 +125,8 @@ items:
       href: how-to-generate-auth-token.md
     - name: Upload large files using file service
       href: how-to-upload-large-files-using-file-service.md
+    - name: Manage upgrade settings
+      href: how-to-manage-upgrade-settings.md
 - name: References
   items:
   - name: REST API

articles/energy-data-services/media/quickstart-create-microsoft-energy-data-services-instance/validation-check-after-entering-details-sku.png

@@ -1,8 +1,12 @@
 ---
-title: Azure Key Vault as Event Grid source
-description: This article describes the properties and schema provided for Azure Key Vault events with Azure Event Grid
+title: Azure Key Vault as Event Grid Source Overview
+description: "Azure Key Vault events: Discover how to use Azure Key Vault as an Event Grid source, including event types, schema details, and integration tips."
+#customer intent: As an architect, I want to understand which Azure Key Vault events are available in Event Grid so that I can design event-driven solutions.
 ms.topic: concept-article
-ms.date: 02/14/2025
+ms.date: 03/26/2026
+author: spelluru
+ms.author: spelluru
+ms.reviewer: spelluru
 # Customer intent: As an architect or a developer, I want to know whether I can use Azure Key Vault as an Event Grid source. 
 ---
 
@@ -33,7 +37,7 @@ An Azure Key Vault account generates the following event types:
 
 # [Cloud event schema](#tab/cloud-event-schema)
 
-The following example show schema for **Microsoft.KeyVault.SecretNewVersionCreated**:
+The following example shows the schema for **Microsoft.KeyVault.SecretNewVersionCreated**:
 
 ```JSON
 [
@@ -59,7 +63,7 @@ The following example show schema for **Microsoft.KeyVault.SecretNewVersionCreat
 
 # [Event Grid event schema](#tab/event-grid-event-schema)
 
-The following example show schema for **Microsoft.KeyVault.SecretNewVersionCreated**:
+The following example shows the schema for **Microsoft.KeyVault.SecretNewVersionCreated**:
 
 ```JSON
 [
@@ -95,7 +99,7 @@ An event has the following top-level data:
 
 | Property | Type | Description |
 | -------- | ---- | ----------- |
-| `source` | string | Full resource path to the event source. This field isn't writeable. Event Grid provides this value. |
+| `source` | string | Full resource path to the event source. This field isn't writable. Event Grid provides this value. |
 | `subject` | string | Publisher-defined path to the event subject. |
 | `type` | string | One of the registered event types for this event source. |
 | `time` | string | The time the event is generated based on the provider's UTC time. |
@@ -108,7 +112,7 @@ An event has the following top-level data:
 
 | Property | Type | Description |
 | -------- | ---- | ----------- |
-| `topic` | string | Full resource path to the event source. This field isn't writeable. Event Grid provides this value. |
+| `topic` | string | Full resource path to the event source. This field isn't writable. Event Grid provides this value. |
 | `subject` | string | Publisher-defined path to the event subject. |
 | `eventType` | string | One of the registered event types for this event source. |
 | `eventTime` | string | The time the event is generated based on the provider's UTC time. |