Merge branch 'MicrosoftDocs:main' into main

Author: tejaswikolli-web

articles/app-service/configure-ssl-bindings.md

@@ -45,7 +45,7 @@ In the <a href="https://portal.azure.com" target="_blank">Azure portal</a>:
 1. In **TLS/SSL type**, choose between **SNI SSL** and **IP based SSL**.
 
     - **[SNI SSL](https://en.wikipedia.org/wiki/Server_Name_Indication)**: Multiple SNI SSL bindings may be added. This option allows multiple TLS/SSL certificates to secure multiple domains on the same IP address. Most modern browsers (including Internet Explorer, Chrome, Firefox, and Opera) support SNI (for more information, see [Server Name Indication](https://wikipedia.org/wiki/Server_Name_Indication)).
-    - - **IP based SSL**: Only one IP SSL binding may be added. This option allows only one TLS/SSL certificate to secure a dedicated public IP address. After you configure the binding, follow the steps in [2. Remap records for IP based SSL](#2-remap-records-for-ip-based-ssl).<br/>IP SSL is supported only in **Basic** tier or higher.
+    - **IP based SSL**: Only one IP SSL binding may be added. This option allows only one TLS/SSL certificate to secure a dedicated public IP address. After you configure the binding, follow the steps in [2. Remap records for IP based SSL](#2-remap-records-for-ip-based-ssl).<br/>IP SSL is supported only in **Basic** tier or higher.
 
 1. When adding a new certificate, validate the new certificate by selecting **Validate**.
 

articles/azure-app-configuration/howto-geo-replication.md

@@ -88,11 +88,72 @@ To delete a replica in the portal, follow the steps below.
 
 --- -->
 
+## Automatic replica discovery
+
+The App Configuration providers can automatically discover any additional replicas from a given App Configuration endpoint and attempt to connect to them. This feature allows you to benefit from geo-replication without having to change your code or redeploy your application. This means you can enable geo-replication or add extra replicas even after your application has been deployed.
+
+Automatic replica discovery is enabled by default, but you can refer to the following sample code to disable it (not recommended).
+
+### [.NET](#tab/dotnet)
+
+Edit the call to the `AddAzureAppConfiguration` method, which is often found in the `program.cs` file of your application.
+
+```csharp
+configurationBuilder.AddAzureAppConfiguration(options =>
+{
+    // Disable automatic replica discovery
+    options.ReplicaDiscoveryEnabled = false;
+
+    // Other changes to options
+});
+```
+
+> [!NOTE]
+> The automatic replica discovery support is available if you use version **7.1.0** or later of any of the following packages.
+> - `Microsoft.Extensions.Configuration.AzureAppConfiguration`
+> - `Microsoft.Azure.AppConfiguration.AspNetCore`
+> - `Microsoft.Azure.AppConfiguration.Functions.Worker`
+
+### [Java Spring](#tab/spring)
+
+Specify the `replicaDiscoveryEnabled` property in the `bootstrap.properties` file of your application.
+
+```properties
+spring.cloud.azure.appconfiguration.stores[0].replica-discovery-enabled=false
+```
+
+> [!NOTE]
+> The automatic replica discovery support is available if you use version **5.11.0** or later of any of the following packages.
+> - `spring-cloud-azure-appconfiguration-config`
+> - `spring-cloud-azure-appconfiguration-config-web`
+> - `spring-cloud-azure-starter-appconfiguration-config`
+
+### [Kubernetes](#tab/kubernetes)
+
+Update the `AzureAppConfigurationProvider` resource of your Azure App Configuration Kubernetes Provider. Add a `replicaDiscoveryEnabled` property and set it to `false`.
+
+``` yaml
+apiVersion: azconfig.io/v1
+kind: AzureAppConfigurationProvider
+metadata:
+  name: appconfigurationprovider-sample
+spec:
+  endpoint: <your-app-configuration-store-endpoint>
+  replicaDiscoveryEnabled: false
+  target:
+    configMapName: configmap-created-by-appconfig-provider
+```
+
+> [!NOTE]
+> The automatic replica discovery and failover support is available if you use version **1.3.0** or later of [Azure App Configuration Kubernetes Provider](./quickstart-azure-kubernetes-service.md).
+
+---
+
 ## Scale and failover with replicas
 
 Each replica you create has its dedicated endpoint. If your application resides in multiple geo-locations, you can update each deployment of your application in a location to connect to the replica closer to that location, which helps minimize the network latency between your application and App Configuration. Since each replica has its separate request quota, this setup also helps the scalability of your application while it grows to a multi-region distributed service.
 
-When geo-replication is enabled, and if one replica isn't accessible, you can let your application failover to another replica for improved resiliency. App Configuration provider libraries have built-in failover support by accepting multiple replica endpoints. You can provide a list of your replica endpoints in the order of the most preferred to the least preferred endpoint. When the current endpoint isn't accessible, the provider library will fail over to a less preferred endpoint, but it will try to connect to the more preferred endpoints from time to time. When a more preferred endpoint becomes available, it will switch to it for future requests.
+When geo-replication is enabled, and if one replica isn't accessible, you can let your application failover to another replica for improved resiliency. App Configuration providers have built-in failover support through user provided replicas as well as additional automatically discovered replicas. You can provide a list of your replica endpoints in the order of the most preferred to the least preferred endpoint. When the current endpoint isn't accessible, the provider will fail over to a less preferred endpoint, but it will try to connect to the more preferred endpoints from time to time. If all user provided replicas are not accessible, the automatically discovered replicas will be randomly selected and used. When a more preferred endpoint becomes available, the provider will switch to it for future requests.
 
 Assuming you have an application using Azure App Configuration, you can update it as the following sample code to take advantage of the failover feature. You can either provide a list of endpoints for Microsoft Entra authentication or a list of connection strings for access key-based authentication.
 
@@ -159,14 +220,14 @@ spring.cloud.azure.appconfiguration.stores[0].connection-strings[1]="${SECOND_RE
 ```
 
 > [!NOTE]
-> The failover support is available if you use version of **4.7.0** or later of any of the following packages.
+> The failover support is available if you use version **4.7.0** or later of any of the following packages.
 > - `spring-cloud-azure-appconfiguration-config`
 > - `spring-cloud-azure-appconfiguration-config-web`
 > - `spring-cloud-azure-starter-appconfiguration-config`
 
 ### [Kubernetes](#tab/kubernetes)
 
-Not available.
+The Azure App Configuration Kubernetes Provider supports failover with automatically discovered replicas by default, as long as automatic replica discovery is not disabled. It does not support or require user-provided replicas.
 
 ---
 
@@ -177,11 +238,11 @@ The failover may occur if the App Configuration provider observes the following
 
 The failover won't happen for client errors like authentication failures.
 
-## Automatic replica discovery
+## Load balance with replicas
 
-You can specify one or more endpoints of a geo-replication-enabled App Configuration store that you want your application to connect or failover to. However, if none of these endpoints are accessible, the App Configuration provider libraries can automatically discover any additional replicas and attempt to connect to them. This feature allows you to benefit from geo-replication without having to change your code or redeploy your application. This means you can enable geo-replication or add extra replicas even after your application has been deployed.
+By default, your application always sends requests to the most preferred endpoint you provide, except in the event of a failover. However, in addition to failover, replicas can also be used to balance the load of requests. By proactively distributing requests across any available replicas over time, you can avoid exhausting the request quota of a single replica and improve the overall scalability of your application.
 
-The automatically discovered replicas will be selected and used randomly. If you have a preference for specific replicas, you can explicitly specify their endpoints. This feature is enabled by default, but you can refer to the following sample code to disable it.
+The App Configuration providers offer built-in support for load balancing across replicas, whether provided in code or discovered automatically. You can use the following code samples to enable this feature in your application (recommended).
 
 ### [.NET](#tab/dotnet)
 
@@ -190,51 +251,26 @@ Edit the call to the `AddAzureAppConfiguration` method, which is often found in
 ```csharp
 configurationBuilder.AddAzureAppConfiguration(options =>
 {
-    // Disable automatic replica discovery
-    options.ReplicaDiscoveryEnabled = false;
+    // Enable load balancing
+    options.LoadBalancingEnabled = true;
 
     // Other changes to options
 });
 ```
 
 > [!NOTE]
-> The automatic replica discovery support is available if you use version **7.1.0** or later of any of the following packages.
+> Load balancing support is available if you use version **8.0.0-preview.3** or later of any of the following packages.
 > - `Microsoft.Extensions.Configuration.AzureAppConfiguration`
 > - `Microsoft.Azure.AppConfiguration.AspNetCore`
 > - `Microsoft.Azure.AppConfiguration.Functions.Worker`
 
 ### [Java Spring](#tab/spring)
 
-Specify the `replicaDiscoveryEnabled` property in the `bootstrap.properties` file of your application.
-
-```properties
-spring.cloud.azure.appconfiguration.stores[0].replica-discovery-enabled=false
-```
-
-> [!NOTE]
-> The automatic replica discovery support is available if you use version **5.11.0** or later of any of the following packages.
-> - `spring-cloud-azure-appconfiguration-config`
-> - `spring-cloud-azure-appconfiguration-config-web`
-> - `spring-cloud-azure-starter-appconfiguration-config`
+This feature is not yet supported in the Azure App Configuration Java Spring Provider.
 
 ### [Kubernetes](#tab/kubernetes)
 
-Update the `AzureAppConfigurationProvider` resource of your Azure App Configuration Kubernetes Provider. Add a `replicaDiscoveryEnabled` property and set it to `false`.
-
-``` yaml
-apiVersion: azconfig.io/v1
-kind: AzureAppConfigurationProvider
-metadata:
-  name: appconfigurationprovider-sample
-spec:
-  endpoint: <your-app-configuration-store-endpoint>
-  replicaDiscoveryEnabled: false
-  target:
-    configMapName: configmap-created-by-appconfig-provider
-```
-
-> [!NOTE]
-> The automatic replica discovery and failover support is available if you use version **1.3.0** or later of [Azure App Configuration Kubernetes Provider](./quickstart-azure-kubernetes-service.md).
+This feature is not yet supported in the Azure App Configuration Kubernetes Provider.
 
 ---