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

asudbring · asudbring · commit 12f3cab0b433 · 2024-02-22T12:26:38.000-08:00
diff --git a/articles/aks/index.yml b/articles/aks/index.yml
@@ -27,6 +27,8 @@ landingContent:
             url: /azure/architecture/reference-architectures/containers/aks-start-here
       - linkListType: whats-new
         links:
+          - text: Upgrade multiple AKS clusters using Azure Kubernetes Fleet Manager
+            url: /azure/kubernetes-fleet/update-orchestration
           - text: Reduce image pull time with Artifact Streaming on AKS (Preview)
             url: artifact-streaming.md
           - text: Secure your cluster using pod security policies (Deprecated)
@@ -41,8 +43,6 @@ landingContent:
             url: use-cvm.md
           - text: AKS GitHub Actions
             url: kubernetes-action.md
-          - text: Enable Azure resources to access AKS clusters using Trusted Access (Preview)
-            url: trusted-access-feature.md
 
   # Card (optional)
   - title: Evaluate Linux-based AKS cluster
diff --git a/articles/aks/supported-kubernetes-versions.md b/articles/aks/supported-kubernetes-versions.md
@@ -327,7 +327,9 @@ Patches have a two month minimum lifecycle. To keep up to date when new patches
 
 ## Next steps
 
-For information on how to upgrade your cluster, see [Upgrade an Azure Kubernetes Service (AKS) cluster][aks-upgrade].
+For information on how to upgrade your cluster, see:
+- [Upgrade an Azure Kubernetes Service (AKS) cluster][aks-upgrade]
+- [Upgrade multiple AKS clusters via Azure Kubernetes Fleet Manager][fleet-multi-cluster-upgrade]
 
 <!-- LINKS - External -->
 [azure-update-channel]: https://azure.microsoft.com/updates/?product=kubernetes-service
@@ -343,3 +345,4 @@ For information on how to upgrade your cluster, see [Upgrade an Azure Kubernetes
 [preview-terms]: https://azure.microsoft.com/support/legal/preview-supplemental-terms/
 [get-azaksversion]: /powershell/module/az.aks/get-azaksversion
 [aks-tracker]: release-tracker.md
+[fleet-multi-cluster-upgrade]: /azure/kubernetes-fleet/update-orchestration
diff --git a/articles/aks/upgrade-cluster.md b/articles/aks/upgrade-cluster.md
@@ -21,6 +21,7 @@ To perform manual upgrades, see the following articles:
 * [Upgrade the node image](./node-image-upgrade.md)
 * [Customize node surge upgrade](./upgrade-aks-cluster.md#customize-node-surge-upgrade)
 * [Process node OS updates](./node-updates-kured.md)
+* [Upgrade multiple AKS clusters via Azure Kubernetes Fleet Manager](/azure/kubernetes-fleet/update-orchestration)
 
 ## Configure automatic upgrades
 
diff --git a/articles/load-balancer/upgrade-basic-standard-with-powershell.md b/articles/load-balancer/upgrade-basic-standard-with-powershell.md
@@ -50,6 +50,7 @@ The PowerShell module performs the following functions:
 ### Unsupported Scenarios
 
 - Basic Load Balancers with IPv6 frontend IP configurations
+- Basic Load Balancers for [Azure Kubernetes Services (AKS) clusters](../aks/load-balancer-standard.md#moving-from-a-basic-sku-load-balancer-to-standard-sku)
 - Basic Load Balancers with a Virtual Machine Scale Set backend pool member where one or more Virtual Machine Scale Set instances have ProtectFromScaleSetActions Instance Protection policies enabled
 - Migrating a Basic Load Balancer to an existing Standard Load Balancer
 
diff --git a/articles/storage/common/storage-introduction.md b/articles/storage/common/storage-introduction.md
@@ -56,13 +56,13 @@ The following table compares Azure Storage services and shows example scenarios
 | Feature | Description | When to use |
 |--------------|-------------|-------------|
 | **Azure Files** |Offers fully managed cloud file shares that you can access from anywhere via the industry standard [Server Message Block (SMB) protocol](/windows/win32/fileio/microsoft-smb-protocol-and-cifs-protocol-overview), [Network File System (NFS) protocol](https://en.wikipedia.org/wiki/Network_File_System), and [Azure Files REST API](/rest/api/storageservices/file-service-rest-api).<br><br>You can mount Azure file shares from cloud or on-premises deployments of Windows, Linux, and macOS. | You want to "lift and shift" an application to the cloud that already uses the native file system APIs to share data between it and other applications running in Azure.<br/><br/>You want to replace or supplement on-premises file servers or NAS devices.<br><br> You want to store development and debugging tools that need to be accessed from many virtual machines. |
+| **Azure NetApp Files** | Offers a fully managed, highly available, enterprise-grade NAS service that can handle the most demanding, high-performance, low-latency workloads requiring advanced data management capabilities. | You have a difficult-to-migrate workload such as POSIX-compliant Linux and Windows applications, SAP HANA, databases, high-performance compute (HPC) infrastructure and apps, and enterprise web applications. <br></br> You require support for multiple file-storage protocols in a single service, including NFSv3, NFSv4.1, and SMB3.1.x, enables a wide range of application lift-and-shift scenarios, with no need for code changes. |
 | **Azure Blobs** | Allows unstructured data to be stored and accessed at a massive scale in block blobs.<br/><br/>Also supports [Azure Data Lake Storage Gen2](../blobs/data-lake-storage-introduction.md) for enterprise big data analytics solutions. | You want your application to support streaming and random access scenarios.<br/><br/>You want to be able to access application data from anywhere.<br/><br/>You want to build an enterprise data lake on Azure and perform big data analytics. |
 | **Azure Elastic SAN** | Azure Elastic SAN is a fully integrated solution that simplifies deploying, scaling, managing, and configuring a SAN, while also offering built-in cloud capabilities like high availability. | You want large scale storage that is interoperable with multiple types of compute resources (such as SQL, MariaDB, Azure virtual machines, and Azure Kubernetes Services) accessed via the [internet Small Computer Systems Interface](https://en.wikipedia.org/wiki/ISCSI) (iSCSI) protocol.|
 | **Azure Disks** | Allows data to be persistently stored and accessed from an attached virtual hard disk. | You want to "lift and shift" applications that use native file system APIs to read and write data to persistent disks.<br/><br/>You want to store data that isn't required to be accessed from outside the virtual machine to which the disk is attached. |
 | **Azure Container Storage** (preview) | Azure Container Storage (preview) is a volume management, deployment, and orchestration service that integrates with Kubernetes and is built natively for containers. | You want to dynamically and automatically provision persistent volumes to store data for stateful applications running on Kubernetes clusters. |
 | **Azure Queues** | Allows for asynchronous message queueing between application components. | You want to decouple application components and use asynchronous messaging to communicate between them.<br><br>For guidance around when to use Queue Storage versus Service Bus queues, see [Storage queues and Service Bus queues - compared and contrasted](../../service-bus-messaging/service-bus-azure-and-service-bus-queues-compared-contrasted.md). |
 | **Azure Tables** | Allows you to store structured NoSQL data in the cloud, providing a key/attribute store with a schemaless design. | You want to store flexible datasets like user data for web applications, address books, device information, or other types of metadata your service requires. <br/><br/>For guidance around when to use Table Storage versus Azure Cosmos DB for Table, see [Developing with Azure Cosmos DB for Table and Azure Table Storage](../../cosmos-db/table-support.md). |
-| **Azure NetApp Files** | Offers a fully managed, highly available, enterprise-grade NAS service that can handle the most demanding, high-performance, low-latency workloads requiring advanced data management capabilities. | You have a difficult-to-migrate workload such as POSIX-compliant Linux and Windows applications, SAP HANA, databases, high-performance compute (HPC) infrastructure and apps, and enterprise web applications. <br></br> You require support for multiple file-storage protocols in a single service, including NFSv3, NFSv4.1, and SMB3.1.x, enables a wide range of application lift-and-shift scenarios, with no need for code changes. |
 
 ## Blob Storage
 
diff --git a/articles/virtual-machines/workloads/oracle/oracle-database-backup-strategies.md b/articles/virtual-machines/workloads/oracle/oracle-database-backup-strategies.md
@@ -47,6 +47,8 @@ The Azure Storage platform includes the following data services that are suitabl
 
 - **Azure Blob Storage**: An object store for text and binary data. It also includes support for big data analytics through Azure Data Lake Storage Gen2.
 
+- **Azure NetApp Files**: Complete networked storage solution including advanced data management capabilities for taking snapshots, cloning, and replicating database volumes.
+
 - **Azure Files**: Managed file shares for cloud or on-premises deployments.
 
 - **Azure Disk Storage**: Block-level storage volumes for Azure VMs.
diff --git a/articles/virtual-machines/workloads/oracle/oracle-overview.md b/articles/virtual-machines/workloads/oracle/oracle-overview.md
@@ -84,10 +84,13 @@ With Oracle Active Data Guard, you can achieve high availability with a primary
 
 To walk through the basic setup procedure on Azure, see [Implement Oracle Golden Gate on an Azure Linux VM](configure-oracle-golden-gate.md).
 
+You can effectively achieve high availability for your Oracle databases by using the storage-based replication functionality of Azure NetApp Files, which is one of the added data management values of this service. Azure NetApp Files volumes can be replicated to another region using [cross-region replication](../../../azure-netapp-files/cross-region-replication-introduction.md) or to another zone within the region using [cross-zone replication](../../../azure-netapp-files/cross-zone-replication-introduction.md).
+
 In addition to having a high availability and disaster recovery solution architected in Azure, you should have a backup strategy in place to restore your database. 
 ## Backup Oracle workloads
 Different [backup strategies](oracle-database-backup-strategies.md) are available for Oracle on Azure VMs, the following backups are other options:
 - Using [Azure files](oracle-database-backup-azure-storage.md)
+- Using [Azure NetApp Files](oracle-database-backup-strategies.md#azure-netapp-files)
 - Using [Azure backup](oracle-database-backup-azure-backup.md) 
 - Using [Oracle RMAN Streaming data](oracle-rman-streaming-backup.md) backup
 ## Deploy Oracle applications on Azure
diff --git a/articles/virtual-machines/workloads/oracle/oracle-reference-architecture.md b/articles/virtual-machines/workloads/oracle/oracle-reference-architecture.md
@@ -233,6 +233,7 @@ Patching your virtual machine operating system can be automated using [Azure Aut
 - Consider using ultra disks when available or premium disks for your Oracle database.
 - Consider setting up a standby Oracle database in another Azure region using Oracle Data Guard.
 - Consider using [proximity placement groups](../../co-location.md#proximity-placement-groups) to reduce the latency between your application and database tier.
+- Azure VMs throttle network bandwidth at higher throughput levels than managed disk. You can achieve higher throughput on the same VM SKU or use a smaller VM SKU for the same throughput using networked storage for the database such as [Azure NetApp Files](../../../azure-netapp-files/azure-netapp-files-introduction.md).
 - Set up [Oracle Enterprise Manager](https://docs.oracle.com/en/enterprise-manager/) for management, monitoring, and logging.
 - Consider using Oracle Automatic Storage Management for streamlined storage management for your database.
 - Use [Azure Pipelines](/azure/devops/pipelines/get-started/what-is-azure-pipelines) to manage patching and updates to your database without any downtime.
