Merge branch 'main' into release-postgres-flexible

Author: v-alje

articles/azure-cache-for-redis/cache-private-link.md

@@ -7,7 +7,7 @@ ms.author: franlanglois
 ms.service: cache
 ms.custom: devx-track-azurecli, devx-track-azurepowershell
 ms.topic: conceptual
-ms.date: 12/15/2023
+ms.date: 01/12/2024
 
 ---
 
@@ -30,9 +30,9 @@ You can restrict public access to the private endpoint of your cache by disablin
 
 ## Scope of availability
 
-|Tier     | Basic, Standard, Premium  |Enterprise, Enterprise Flash  |
-|---------|---------|---------|
-|Available  | Yes    |  Yes  |
+|Tier      | Basic, Standard, Premium |Enterprise, Enterprise Flash  |
+|--------- |:------------------:|:---------:|
+|Available | Yes          |  Yes  |
 
 ## Prerequisites
 
@@ -44,7 +44,7 @@ You can restrict public access to the private endpoint of your cache by disablin
 
 > [!IMPORTANT]
 > When using private link, you cannot export or import data to a to a storage account that has firewall enabled unless you're using [managed identity to autenticate to the storage account](cache-managed-identity.md).
-> For more information, see [How to export if I have firewall enabled on my storage account?](cache-how-to-import-export-data.md#how-to-export-if-i-have-firewall-enabled-on-my-storage-account) 
+> For more information, see [How to export if I have firewall enabled on my storage account?](cache-how-to-import-export-data.md#how-to-export-if-i-have-firewall-enabled-on-my-storage-account)
 >
 
 ## Create a private endpoint with a new Azure Cache for Redis instance
@@ -349,23 +349,27 @@ az network private-endpoint delete --name MyPrivateEndpoint --resource-group MyR
 
 ### How do I connect to my cache with private endpoint?
 
-For **Basic, Standard, and Premium tier** caches, your application should connect to `<cachename>.redis.cache.windows.net` on port `6380`. A private DNS zone, named `*.privatelink.redis.cache.windows.net`, is automatically created in your subscription. The private DNS zone is vital for establishing the TLS connection with the private endpoint.  We recommend avoiding the use of `<cachename>.privatelink.redis.cache.windows.net` in configuration or connection string. 
+For **Basic, Standard, and Premium tier** caches, your application should connect to `<cachename>.redis.cache.windows.net` on port `6380`. A private DNS zone, named `*.privatelink.redis.cache.windows.net`, is automatically created in your subscription. The private DNS zone is vital for establishing the TLS connection with the private endpoint.  We recommend avoiding the use of `<cachename>.privatelink.redis.cache.windows.net` in configuration or connection string.
 
-For **Enterprise and Enterprise Flash** tier caches, your application should connect to `<cachename>.<region>.redisenterprise.cache.azure.net` on port `10000`. 
+For **Enterprise and Enterprise Flash** tier caches, your application should connect to `<cachename>.<region>.redisenterprise.cache.azure.net` on port `10000`.
 
 For more information, see [Azure services DNS zone configuration](../private-link/private-endpoint-dns.md).
 
 ### Why can't I connect to a private endpoint?
 
-- Private endpoints can't be used with your cache instance if your cache is already using the VNet injection network connection method.
-- You have a limit of one private link for clustered caches. For all other caches, your limit is 100 private links.
-- You try to [persist data to a storage account](cache-how-to-premium-persistence.md) with firewall rules and you're not using managed identity to connect to the storage account.
+- Private endpoints can't be used with your cache instance if your cache is already a VNet injected cache.
+
+- On Premium tier caches, you have a limit of one private link for clustered caches. Enterprise and Enterprise Flash tier caches do not have this limitation for clustered caches. For all other caches, your limit is 100 private links.
+
+- You try to [persist data to storage account](cache-how-to-premium-persistence.md) where firewall rules are applied might prevent you from creating the Private Link.
+
 - You might not connect to your private endpoint if your cache instance is using an [unsupported feature](#what-features-arent-supported-with-private-endpoints).
 
 ### What features aren't supported with private endpoints?
 
 - Trying to connect from the Azure portal console is an unsupported scenario where you see a connection failure.
-- Private links can't be added to Premium tier caches that are already geo-replicated. To add a private link to a cache using [passive geo-replication](cache-how-to-geo-replication.md): 1. Unlink the geo-replication. 2. Add a Private Link. 3. Last, relink the geo-replication.
+
+- Private links can't be added to caches that are already using [passive geo-replication](cache-how-to-geo-replication.md) in the Premium tier. To add a private link to a geo-replicated cache: 1. Unlink the geo-replication. 2. Add a Private Link. 3. Last, relink the geo-replication. (Enterprise tier caches using [active geo-replication](cache-how-to-active-geo-replication.md) do not have this restriction.)
 
 ### How do I verify if my private endpoint is configured correctly?
 
@@ -398,6 +402,7 @@ You can also change the value through a RESTful API PATCH request. For example,
   }
   
   ```
+
   For more information, see [Redis - Update](/rest/api/redis/Redis/Update?tabs=HTTP).
 
 ### How can I migrate my VNet injected cache to a Private Link cache?

articles/expressroute/provider-rate-limit.md

@@ -1,5 +1,5 @@
 ---
-title: About rating limiting for ExpressRoute circuits over service provider ports
+title: About rate limiting for ExpressRoute circuits over service provider ports
 titleSuffix: Azure ExpressRoute
 description: This document discusses how rate limiting works for ExpressRoute circuits over service provider ports. You'll also learn how to monitor the throughput and traffic drop due to rate limiting.
 services: expressroute
@@ -10,19 +10,19 @@ ms.date: 01/12/2024
 ms.author: duau
 ---
 
-# About rating limiting for ExpressRoute circuits over service provider ports
+# About rate limiting for ExpressRoute circuits over service provider ports
 
 This article discusses how rate limiting works for ExpressRoute circuits created over service provider ports. You'll also learn how to monitor the throughput and traffic drop due to rate limiting.
 
 ## How does rate limiting work over an ExpressRoute circuit?
 
-An ExpressRoute circuit consists of two links that connects the Customer/Provider edge to the Microsoft Enterprise Edge (MSEE) routers. If your circuit bandwidth is 1 Gbps and you distribute your traffic evenly across both links, you can achieve a maximum throughput of 2 Gbps (two links * 1 Gbps). Rate limiting restricts your throughput to the configured bandwidth if you exceed it on either link. The ExpressRoute circuit SLA is only guaranteed for the bandwidth that you configured. For example, if you purchased a 1-Gbps circuit, you're SLA is for a maximum throughput of 1 Gbps.
+An ExpressRoute circuit consists of two links that connects the Customer/Provider edge to the Microsoft Enterprise Edge (MSEE) routers. If your circuit bandwidth is 1 Gbps and you distribute your traffic evenly across both links, you can achieve a maximum throughput of 2 Gbps (two times 1 Gbps). Rate limiting restricts your throughput to the configured bandwidth if you exceed it on either link. The ExpressRoute circuit SLA is only guaranteed for the bandwidth that you configured. For example, if you purchased a 1-Gbps circuit, your SLA is for a maximum throughput of 1 Gbps.
 
 :::image type="content" source="./media/provider-rate-limit/circuit.png" alt-text="Diagram of rate limiting on an ExpressRoute circuit over provider ports.":::
 
 ## How can I determine what my circuit throughput is?
 
-You can monitor the ingress and egress throughput of your ExpressRoute circuit for both links through the Azure portal using ExpressRoute circuit metrics. For ingress, select `BitsInPerSecond` and for egress, select `BitsOutPerSecond`.  The following screenshot shows the ExpressRoute circuit metrics for ingress and egress throughput.
+You can monitor the ingress and egress throughput of your ExpressRoute circuit for both links through the Azure portal using ExpressRoute circuit metrics. For ingress, select `BitsInPerSecond` and for egress, select `BitsOutPerSecond`. The following screenshot shows the ExpressRoute circuit metrics for ingress and egress throughput.
 
 :::image type="content" source="./media/provider-rate-limit/throughput-metrics.png" alt-text="Screenshot of the throughput per seconds metrics for an ExpressRoute Direct circuit.":::
 
@@ -38,8 +38,8 @@ You can seamlessly increase your circuit bandwidth through the Azure portal. For
 
 ## What are the causes of traffic drop when the throughput is below the configured bandwidth?
 
-ExpressRoute circuit throughput is monitored at an aggregate level of every few minutes. While the rate-limiting is enforced at a granular level in milliseconds. Therefore, occasional traffic bursts exceeding the configured bandwidth might not get detected by the throughput monitoring. However, the rate-limiting is still be enforced and traffic gets dropped.
+ExpressRoute circuit throughput is monitored at an aggregate level of every few minutes, while the rate limiting is enforced at a granular level in milliseconds. Therefore, occasional traffic bursts exceeding the configured bandwidth might not get detected by the throughput monitoring. However, the rate limiting is still be enforced and traffic gets dropped.
 
 ## Next steps
 
-For more frequently asked questions, see [ExpressRoute FAQ](expressroute-faqs.md).
+For more frequently asked questions, see [ExpressRoute FAQ](expressroute-faqs.md).

articles/notification-hubs/export-modify-registrations-bulk.md

@@ -44,7 +44,7 @@ This section assumes you have the following entities:
 An input file contains a list of registrations serialized in XML, one per row. Using the Azure SDK, the following code example shows how to serialize the registrations and upload them to blob container:
 
 ```csharp
-private static void SerializeToBlob(BlobContainerClient container, RegistrationDescription[] descriptions)
+private static async Task SerializeToBlobAsync(BlobContainerClient container, RegistrationDescription[] descriptions)
 {
      StringBuilder builder = new StringBuilder();
      foreach (var registrationDescription in descriptions)
@@ -55,7 +55,7 @@ private static void SerializeToBlob(BlobContainerClient container, RegistrationD
      var inputBlob = container.GetBlobClient(INPUT_FILE_NAME);
      using (MemoryStream stream = new MemoryStream(Encoding.UTF8.GetBytes(builder.ToString())))
      {
-         inputBlob.UploadAsync(stream);
+         await inputBlob.UploadAsync(stream);
      }
 }
 ```
@@ -74,16 +74,12 @@ static Uri GetOutputDirectoryUrl(BlobContainerClient container)
       BlobSasBuilder builder = new BlobSasBuilder(BlobSasPermissions.All, DateTime.UtcNow.AddDays(1));
       return container.GenerateSasUri(builder);
 }
-        
-        
-        
 
 static Uri GetInputFileUrl(BlobContainerClient container, string filePath)
 {
       Console.WriteLine(container.CanGenerateSasUri);
       BlobSasBuilder builder = new BlobSasBuilder(BlobSasPermissions.Read, DateTime.UtcNow.AddDays(1));
       return container.GenerateSasUri(builder);
-
 }
 ```
 
@@ -93,23 +89,19 @@ With the two input and output URLs, you can now start the batch job.
 
 ```csharp
 NotificationHubClient client = NotificationHubClient.CreateClientFromConnectionString(CONNECTION_STRING, HUB_NAME);
-var createTask = client.SubmitNotificationHubJobAsync(
-new NotificationHubJob {
-        JobType = NotificationHubJobType.ImportCreateRegistrations,
-        OutputContainerUri = outputContainerSasUri,
-        ImportFileUri = inputFileSasUri
-    }
-);
-createTask.Wait();
+var job = await client.SubmitNotificationHubJobAsync(
+     new NotificationHubJob {
+             JobType = NotificationHubJobType.ImportCreateRegistrations,
+             OutputContainerUri = outputContainerSasUri,
+             ImportFileUri = inputFileSasUri
+         }
+     );
 
-var job = createTask.Result;
 long i = 10;
 while (i > 0 && job.Status != NotificationHubJobStatus.Completed)
 {
-    var getJobTask = client.GetNotificationHubJobAsync(job.JobId);
-    getJobTask.Wait();
-    job = getJobTask.Result;
-    Thread.Sleep(1000);
+    job = await client.GetNotificationHubJobAsync(job.JobId);
+    await Task.Delay(1000);
     i--;
 }
 ```
@@ -135,18 +127,9 @@ The following sample code imports registrations into a notification hub.
 
 ```csharp
 using Microsoft.Azure.NotificationHubs;
-using Microsoft.WindowsAzure.Storage;
-using Microsoft.WindowsAzure.Storage.Blob;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Runtime.Serialization;
+using Azure.Storage.Blobs;
+using Azure.Storage.Sas;
 using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Xml;
 
 namespace ConsoleApplication1
 {
@@ -158,7 +141,7 @@ namespace ConsoleApplication1
         private static string STORAGE_ACCOUNT_CONNECTIONSTRING = "connectionstring";
         private static string CONTAINER_NAME = "containername";
 
-        static void Main(string[] args)
+        static async Task Main(string[] args)
         {
             var descriptions = new[]
             {
@@ -168,45 +151,41 @@ namespace ConsoleApplication1
                 new MpnsRegistrationDescription(@"http://dm2.notify.live.net/throttledthirdparty/01.00/12G9Ed13dLb5RbCii5fWzpFpAgAAAAADAQAAAAQUZm52OkJCMjg1QTg1QkZDMdUxREQFBlVTTkMwMQ"),
             };
 
-// Get a reference to a container named "sample-container" and then create it
+            // Get a reference to a container named "sample-container" and then create it
             BlobContainerClient container = new BlobContainerClient(STORAGE_ACCOUNT_CONNECTIONSTRING, CONTAINER_NAME);
 
-            container.CreateIfNotExistsAsync();
+            await container.CreateIfNotExistsAsync();
 
-            SerializeToBlob(container, descriptions);
+            await SerializeToBlobAsync(container, descriptions);
 
             // TODO then create Sas
             var outputContainerSasUri = GetOutputDirectoryUrl(container);
 
-            BlobContainerClient inputfilecontainer = new BlobContainerClient(STORAGE_ACCOUNT_CONNECTIONSTRING, STORAGE_ACCOUNT_CONNECTIONSTRING + "/" +         INPUT_FILE_NAME);
+            BlobContainerClient inputcontainer = new BlobContainerClient(STORAGE_ACCOUNT_CONNECTIONSTRING, STORAGE_ACCOUNT_CONNECTIONSTRING + "/" +         INPUT_FILE_NAME);
 
             var inputFileSasUri = GetInputFileUrl(inputcontainer, INPUT_FILE_NAME);
 
 
             // Import this file
             NotificationHubClient client = NotificationHubClient.CreateClientFromConnectionString(CONNECTION_STRING, HUB_NAME);
-            var createTask = client.SubmitNotificationHubJobAsync(
+            var job = await client.SubmitNotificationHubJobAsync(
                 new NotificationHubJob {
                     JobType = NotificationHubJobType.ImportCreateRegistrations,
                     OutputContainerUri = outputContainerSasUri,
                     ImportFileUri = inputFileSasUri
                 }
             );
-            createTask.Wait();
 
-            var job = createTask.Result;
             long i = 10;
             while (i > 0 && job.Status != NotificationHubJobStatus.Completed)
             {
-                var getJobTask = client.GetNotificationHubJobAsync(job.JobId);
-                getJobTask.Wait();
-                job = getJobTask.Result;
-                Thread.Sleep(1000);
+                job = await client.GetNotificationHubJobAsync(job.JobId);
+                await Task.Delay(1000);
                 i--;
             }
         }
 
-        private static void SerializeToBlob(BlobContainerClient container, RegistrationDescription[] descriptions)
+        private static async Task SerializeToBlobAsync(BlobContainerClient container, RegistrationDescription[] descriptions)
         {
             StringBuilder builder = new StringBuilder();
             foreach (var registrationDescription in descriptions)
@@ -217,7 +196,7 @@ namespace ConsoleApplication1
             var inputBlob = container.GetBlobClient(INPUT_FILE_NAME);
             using (MemoryStream stream = new MemoryStream(Encoding.UTF8.GetBytes(builder.ToString())))
             {
-                inputBlob.UploadAsync(stream);
+                await inputBlob.UploadAsync(stream);
             }
         }