Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into cdncert

duongau · duongau · commit 41e29906bacd · 2023-03-07T16:25:30.000-08:00
diff --git a/articles/aks/quotas-skus-regions.md b/articles/aks/quotas-skus-regions.md
@@ -1,9 +1,9 @@
 ---
-title: Limits for resources, SKUs, regions
+title: Limits for resources, SKUs, and regions in Azure Kubernetes Service (AKS)
 titleSuffix: Azure Kubernetes Service
 description: Learn about the default quotas, restricted node VM SKU sizes, and region availability of the Azure Kubernetes Service (AKS).
 ms.topic: conceptual
-ms.date: 03/25/2021
+ms.date: 03/07/2023
 
 ---
 # Quotas, virtual machine size restrictions, and region availability in Azure Kubernetes Service (AKS)
@@ -21,7 +21,7 @@ This article details the default resource limits for Azure Kubernetes Service (A
 All other network, compute, and storage limitations apply to the provisioned infrastructure. For the relevant limits, see [Azure subscription and service limits](../azure-resource-manager/management/azure-subscription-service-limits.md).
 
 > [!IMPORTANT]
-> When you upgrade an AKS cluster, extra resources are temporarily consumed. These resources include available IP addresses in a virtual network subnet or virtual machine vCPU quota. 
+> When you upgrade an AKS cluster, extra resources are temporarily consumed. These resources include available IP addresses in a virtual network subnet or virtual machine vCPU quota.
 >
 > For Windows Server containers, you can perform an upgrade operation to apply the latest node updates. If you don't have the available IP address space or vCPU quota to handle these temporary resources, the cluster upgrade process will fail. For more information on the Windows Server node upgrade process, see [Upgrade a node pool in AKS][nodepool-upgrade].
 
@@ -31,9 +31,9 @@ The list of supported VM sizes in AKS is evolving with the release of new VM SKU
 
 ## Restricted VM sizes
 
-VM sizes with less than 2 CPUs may not be used with AKS.
+VM sizes with less than two CPUs may not be used with AKS.
 
-Each node in an AKS cluster contains a fixed amount of compute resources such as vCPU and memory. If an AKS node contains insufficient compute resources, pods might fail to run correctly. To ensure the required *kube-system* pods and your applications can be reliably scheduled, AKS requires nodes use VM sizes with at least 2 CPUs.
+Each node in an AKS cluster contains a fixed amount of compute resources such as vCPU and memory. If an AKS node contains insufficient compute resources, pods might fail to run correctly. To ensure the required *kube-system* pods and your applications can be reliably scheduled, AKS requires nodes use VM sizes with at least two CPUs.
 
 For more information on VM types and their compute resources, see [Sizes for virtual machines in Azure][vm-skus].
 
diff --git a/articles/reliability/TOC.yml b/articles/reliability/TOC.yml
@@ -175,6 +175,8 @@
         href: ../mysql/flexible-server/concepts-high-availability.md?toc=/azure/reliability/toc.json&bc=/azure/reliability/breadcrumb/toc.json
       - name: Azure Database for PostgreSQL - Flexible Server
         href: ../postgresql/single-server/concepts-high-availability.md?toc=/azure/reliability/toc.json&bc=/azure/reliability/breadcrumb/toc.json
+      - name: Azure Data Manager for Energy
+        href: reliability-energy-data-services.md
       - name: Azure DDoS Protection
         href: ../ddos-protection/ddos-faq.yml?toc=/azure/reliability/toc.json&bc=/azure/reliability/breadcrumb/toc.json
       - name: Azure Disk Encryption 
diff --git a/articles/reliability/reliability-energy-data-services.md b/articles/reliability/reliability-energy-data-services.md
@@ -1,6 +1,7 @@
 ---
-title: Reliability in Microsoft Azure Data Manager for Energy Preview
-description: Find out about reliability in Azure Data Manager for Energy Preview
+
+title: Reliability in Azure Data Manager for Energy
+description: Find out about reliability in Azure Data Manager for Energy
 author: bharathim 
 ms.author: anaharris
 ms.topic: conceptual
@@ -10,20 +11,25 @@ ms.date: 01/13/2023
 ---
 
 
-# What is reliability in Azure Data Manager for Energy Preview?
+# Reliability in Azure Data Manager for Energy (Preview)
+
+This article describes reliability support in Azure Data Manager for Energy, and covers intra-regional resiliency with [availability zones](#availability-zone-support). For a more detailed overview of reliability in Azure, see [Azure reliability](../reliability/overview.md).
+
+[!INCLUDE [preview features callout](../energy-data-services/includes/preview/preview-callout.md)]
+
 
-This article describes reliability support in Azure Data Manager for Energy Preview, and covers intra-regional resiliency with [availability zones](#availability-zone-support). For a more detailed overview of reliability in Azure, see [Azure reliability](../reliability/overview.md).
 
 ## Availability zone support
 
 Azure availability zones are at least three physically separate groups of datacenters within each Azure region. Datacenters within each zone are equipped with independent power, cooling, and networking infrastructure. If there's a local zone failure, availability zones are designed so that if the one zone is affected, regional services, capacity, and high availability are supported by the remaining two zones.  Failures can range from software and hardware failures to events such as earthquakes, floods, and fires. Tolerance to failures is achieved with redundancy and logical isolation of Azure services. For more detailed information on availability zones in Azure, see [Regions and availability zones](availability-zones-overview.md).
 
-Azure Data Manager for Energy Preview supports zone-redundant instance by default and there's no setup required by the Customer.
+Azure Data Manager for Energy Preview supports zone-redundant instance by default and there's no setup required.
 
 ### Prerequisites
 
 The Azure Data Manager for Energy Preview supports availability zones in the following regions:
 
+
 | Americas         | Europe               | Middle East   | Africa             | Asia Pacific   |
 |------------------|----------------------|---------------|--------------------|----------------|
 | South Central US | North Europe         |               |                    |                |
diff --git a/articles/reliability/reliability-guidance-overview.md b/articles/reliability/reliability-guidance-overview.md
@@ -56,6 +56,7 @@ Azure reliability guidance is a collection of service-specific reliability guide
 [Azure Data Factory](../data-factory/concepts-data-redundancy.md?bc=%2fazure%2freliability%2fbreadcrumb%2ftoc.json&toc=%2fazure%2freliability%2ftoc.json)|
 [Azure Database for MySQL - Flexible Server](../mysql/flexible-server/concepts-high-availability.md?toc=/azure/reliability/toc.json&bc=/azure/reliability/breadcrumb/toc.json)|
 [Azure Database for PostgreSQL - Flexible Server](../postgresql/single-server/concepts-high-availability.md?toc=/azure/reliability/toc.json&bc=/azure/reliability/breadcrumb/toc.json)|
+[Azure Data Manager for Energy](reliability-energy-data-services.md)
 [Azure DDoS Protection](../ddos-protection/ddos-faq.yml?toc=/azure/reliability/toc.json&bc=/azure/reliability/breadcrumb/toc.json)|
 [Azure Disk Encryption](../virtual-machines/disks-redundancy.md?toc=/azure/reliability/toc.json&bc=/azure/reliability/breadcrumb/toc.json)|
 [Azure DNS - Azure DNS Private Zones](../dns/private-dns-getstarted-portal.md?toc=/azure/reliability/toc.json&bc=/azure/reliability/breadcrumb/toc.json)|
