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

Author: roygara

.openpublishing.redirection.virtual-desktop.json

@@ -369,6 +369,11 @@
             "source_path_from_root": "/articles/virtual-desktop/publish-applications.md",
             "redirect_url": "/azure/virtual-desktop/publish-applications-stream-remoteapp",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/autoscale-new-existing-host-pool.md",
+            "redirect_url": "/azure/virtual-desktop/autoscale-scaling-plan",
+            "redirect_document_id": true
         }
     ]
 }

articles/aks/resize-node-pool.md

@@ -241,9 +241,6 @@ By default, your cluster has AKS_managed pod disruption budgets (such as `coredn
 
 To delete the existing node pool, use the Azure portal or the [az aks nodepool delete][az-aks-nodepool-delete] command:
 
-> [!IMPORTANT]
-> When you delete a node pool, AKS doesn't perform cordon and drain. To minimize the disruption of rescheduling pods currently running on the node pool you are going to delete, perform a cordon and drain on all nodes in the node pool before deleting.
-
 ```azurecli-interactive
 az aks nodepool delete \
     --resource-group myResourceGroup \

articles/azure-app-configuration/enable-dynamic-configuration-java-spring-app.md

@@ -123,7 +123,7 @@ Then, open the *pom.xml* file in a text editor and add a `<dependency>` for `spr
 <dependency>
     <groupId>com.azure.spring</groupId>
     <artifactId>spring-cloud-azure-appconfiguration-config-web</artifactId>
-    <version>5.4.0</version>
+    <version>5.8.0</version>
 </dependency>
 ```
 
@@ -133,7 +133,7 @@ Then, open the *pom.xml* file in a text editor and add a `<dependency>` for `spr
 <dependency>
     <groupId>com.azure.spring</groupId>
     <artifactId>spring-cloud-azure-appconfiguration-config-web</artifactId>
-    <version>4.10.0</version>
+    <version>4.14.0</version>
 </dependency>
 ```
 

articles/azure-app-configuration/enable-dynamic-configuration-java-spring-push-refresh.md

@@ -70,7 +70,7 @@ In this tutorial, you learn how to:
             <dependency>
             <groupId>com.azure.spring</groupId>
             <artifactId>spring-cloud-azure-dependencies</artifactId>
-            <version>5.5.0</version>
+            <version>5.8.0</version>
             <type>pom</type>
             <scope>import</scope>
             </dependency>
@@ -84,7 +84,6 @@ In this tutorial, you learn how to:
     <dependency>
         <groupId>com.azure.spring</groupId>
         <artifactId>spring-cloud-azure-appconfiguration-config-web</artifactId>
-        <version>4.10.0</version>
     </dependency>
 
     <!-- Adds the Ability to Push Refresh -->
@@ -98,7 +97,7 @@ In this tutorial, you learn how to:
             <dependency>
             <groupId>com.azure.spring</groupId>
             <artifactId>spring-cloud-azure-dependencies</artifactId>
-            <version>4.11.0</version>
+            <version>4.14.0</version>
             <type>pom</type>
             <scope>import</scope>
             </dependency>
@@ -115,7 +114,7 @@ In this tutorial, you learn how to:
    mvn com.microsoft.azure:azure-webapp-maven-plugin:2.5.0:config
    ```
 
-1. Open bootstrap.properties and configure Azure App Configuration Push Refresh and Azure Service Bus
+1. Open bootstrap.properties and configure Azure App Configuration Push Refresh.
 
    ```properties
    # Azure App Configuration Properties
@@ -201,7 +200,10 @@ Event Grid Web Hooks require validation on creation. You can validate by followi
     :::image type="content" source="./media/event-subscription-view-webhook.png" alt-text="Web Hook shows up in a table on the bottom of the page." :::
 
 > [!NOTE]
-> When subscribing for configuration changes, one or more filters can be used to reduce the number of events sent to your application. These can be configured either as [Event Grid subscription filters](../event-grid/event-filtering.md) or [Service Bus subscription filters](../service-bus-messaging/topic-filters.md). For example, a subscription filter can be used to only subscribe to events for changes in a key that starts with a specific string.
+> When subscribing for configuration changes, one or more filters can be used to reduce the number of events sent to your application. These can be configured either as [Event Grid subscription filters](../event-grid/event-filtering.md). For example, a subscription filter can be used to only subscribe to events for changes in a key that starts with a specific string.
+
+> [!NOTE]
+> If you have multiple instances of your application running, you can use the `appconfiguration-refresh-bus` endpoint which requires setting up Azure Service Bus, which is used to send a message to all instances of your application to refresh their configuration. This is useful if you have multiple instances of your application running and want to ensure that all instances are updated with the latest configuration. This endpoint isn't available unless you have `spring-cloud-bus` as a dependency with it configured. See the [Azure Service Bus Spring Cloud Bus documentation](/azure/developer/java/spring-framework/using-service-bus-in-spring-applications) for more information. The service bus connection only needs to be set up and the Azure App Configuration library will handle sending and receiving the messages.
 
 ## Verify and test application
 

articles/azure-app-configuration/howto-convert-to-the-new-spring-boot.md

@@ -45,7 +45,7 @@ All of the group and artifact IDs in the Azure libraries for Spring Boot have be
         <dependency>
         <groupId>com.azure.spring</groupId>
         <artifactId>spring-cloud-azure-dependencies</artifactId>
-        <version>5.5.0</version>
+        <version>5.8.0</version>
         <type>pom</type>
         <scope>import</scope>
         </dependency>
@@ -78,7 +78,7 @@ All of the group and artifact IDs in the Azure libraries for Spring Boot have be
         <dependency>
         <groupId>com.azure.spring</groupId>
         <artifactId>spring-cloud-azure-dependencies</artifactId>
-        <version>4.11.0</version>
+        <version>4.14.0</version>
         <type>pom</type>
         <scope>import</scope>
         </dependency>
@@ -120,6 +120,37 @@ spring.cloud.azure.appconfiguration.stores[0].monitoring.feature-flag-refresh-in
 
 The property `spring.cloud.azure.appconfiguration.stores[0].feature-flags.label` has been removed. Instead, you can use `spring.cloud.azure.appconfiguration.stores[0].feature-flags.selects[0].label-filter` to specify a label filter.
 
+## Using Client Customizers
+
+`ConfigurationClientCustomizer` and `SecretClientCustomizer` are used to customize the `ConfigurationClient` and `SecretClient` instances. You can use them to modify the clients before they're used to connect to App Configuration. This allows for using any credential type supported by the [Azure Identity library](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/identity/azure-identity/README.md#credential-classes). You can also modify the clients to set a custom `HttpClient` or `HttpPipeline`.
+
+```java
+import com.azure.core.credential.TokenCredential;
+import com.azure.data.appconfiguration.ConfigurationClientBuilder;
+import com.azure.identity.AzureCliCredential;
+import com.azure.identity.AzureCliCredentialBuilder;
+import com.azure.identity.ChainedTokenCredential;
+import com.azure.identity.ChainedTokenCredentialBuilder;
+import com.azure.identity.EnvironmentCredentialBuilder;
+import com.azure.identity.ManagedIdentityCredential;
+import com.azure.identity.ManagedIdentityCredentialBuilder;
+import com.azure.spring.cloud.appconfiguration.config.ConfigurationClientCustomizer;
+
+public class ConfigurationClientCustomizerImpl implements ConfigurationClientCustomizer {
+
+    @Override
+    public void customize(ConfigurationClientBuilder builder, String endpoint) {
+        AzureCliCredential cliCredential = new AzureCliCredentialBuilder().build();
+        String managedIdentityClientId = System.getenv("MANAGED_IDENTITY_CLIENT_ID");
+        ManagedIdentityCredential managedIdentityCredential = new ManagedIdentityCredentialBuilder()
+            .clientId(managedIdentityClientId).build();
+        ChainedTokenCredential credential = new ChainedTokenCredentialBuilder().addLast(cliCredential)
+            .addLast(managedIdentityCredential).build();
+        builder.credential(credential);
+    }
+}
+```
+
 ## Possible conflicts with Spring Cloud Azure global properties
 
 [Spring Cloud Azure common configuration properties](/azure/developer/java/spring-framework/configuration) enable you to customize your connections to Azure services. The new App Configuration library will pick up any global or App Configuration setting that's configured with Spring Cloud Azure common configuration properties. Your connection to App Configuration will change if the configurations are set for another Spring Cloud Azure library.

articles/azure-app-configuration/quickstart-feature-flag-spring-boot.md

@@ -73,7 +73,7 @@ To create a new Spring Boot project:
             <dependency>
             <groupId>com.azure.spring</groupId>
             <artifactId>spring-cloud-azure-dependencies</artifactId>
-            <version>5.5.0</version>
+            <version>5.8.0</version>
             <type>pom</type>
             <scope>import</scope>
             </dependency>
@@ -102,7 +102,7 @@ To create a new Spring Boot project:
             <dependency>
             <groupId>com.azure.spring</groupId>
             <artifactId>spring-cloud-azure-dependencies</artifactId>
-            <version>4.11.0</version>
+            <version>4.14.0</version>
             <type>pom</type>
             <scope>import</scope>
             </dependency>

articles/azure-app-configuration/quickstart-java-spring-app.md

@@ -51,7 +51,7 @@ To install the Spring Cloud Azure Config starter module, add the following depen
         <dependency>
         <groupId>com.azure.spring</groupId>
         <artifactId>spring-cloud-azure-dependencies</artifactId>
-        <version>5.5.0</version>
+        <version>5.8.0</version>
         <type>pom</type>
         <scope>import</scope>
         </dependency>
@@ -72,7 +72,7 @@ To install the Spring Cloud Azure Config starter module, add the following depen
         <dependency>
         <groupId>com.azure.spring</groupId>
         <artifactId>spring-cloud-azure-dependencies</artifactId>
-        <version>4.11.0</version>
+        <version>4.14.0</version>
         <type>pom</type>
         <scope>import</scope>
         </dependency>

articles/azure-app-configuration/use-feature-flags-spring-boot.md

@@ -62,7 +62,7 @@ The easiest way to connect your Spring Boot application to App Configuration is
         <dependency>
         <groupId>com.azure.spring</groupId>
         <artifactId>spring-cloud-azure-dependencies</artifactId>
-        <version>5.5.0</version>
+        <version>5.8.0</version>
         <type>pom</type>
         <scope>import</scope>
         </dependency>
@@ -83,7 +83,7 @@ The easiest way to connect your Spring Boot application to App Configuration is
         <dependency>
         <groupId>com.azure.spring</groupId>
         <artifactId>spring-cloud-azure-dependencies</artifactId>
-        <version>4.11.0</version>
+        <version>4.14.0</version>
         <type>pom</type>
         <scope>import</scope>
         </dependency>

articles/azure-arc/data/validation-program.md

@@ -32,12 +32,11 @@ To see how all Azure Arc-enabled components are validated, see [Validation progr
 
 ### Dell
 
-|Solution and version | Kubernetes version | Azure Arc-enabled data services version | SQL engine version | PostgreSQL server version
+|Solution and version | Kubernetes version | Azure Arc-enabled data services version | SQL engine version | PostgreSQL server version|
 |-----|-----|-----|-----|-----|
-| [Unity XT](https://www.dell.com/en-us/dt/storage/unity.htm) |1.24.3|1.15.0_2023-01-10|16.0.816.19223 |Not validated|
-| [PowerStore T](https://www.dell.com/en-us/dt/storage/powerstore-storage-appliance.htm) |1.24.3|1.15.0_2023-01-10|16.0.816.19223 |Not validated|
-| [PowerFlex](https://www.dell.com/en-us/dt/storage/powerflex.htm) |1.25.0 | 1.21.0_2023-07-11 | 16.0.5100.7242 | 14.5 (Ubuntu 20.04) |
-| [PowerStore X](https://www.dell.com/en-us/dt/storage/powerstore-storage-appliance/powerstore-x-series.htm)|1.20.6|1.0.0_2021-07-30|15.0.2148.140 | 12.3 (Ubuntu 12.3-1) |
+|[PowerStore](https://www.dell.com/en-us/shop/powerstore/sf/power-store)|1.25.15|1.25.0_2023-11-14|16.0.5100.7246|Not validated|
+|[Unity XT](https://www.dell.com/en-us/dt/storage/unity.htm) |1.24.3|1.15.0_2023-01-10|16.0.816.19223 |Not validated|
+|[PowerFlex](https://www.dell.com/en-us/dt/storage/powerflex.htm) |1.25.0 |1.21.0_2023-07-11 |16.0.5100.7242 |14.5 (Ubuntu 20.04) |
 
 ### Hitachi
 |Solution and version |Kubernetes version |Azure Arc-enabled data services version |SQL engine version |PostgreSQL server version|

articles/azure-functions/functions-bindings-dapr.md

@@ -260,6 +260,73 @@ Learn how to use the Dapr Extension for Azure Functions via the provided samples
 
 ::: zone-end
 
+## Troubleshooting
+
+This section describes how to troubleshoot issues that can occur when using the Dapr extension for Azure Functions.
+
+### Ensure Dapr is enabled in your environment
+
+If you're using Dapr bindings and triggers in Azure Functions, and Dapr isn't enabled in your environment, you might receive the error message: `Dapr sidecar isn't present. Please see (https://aka.ms/azure-functions-dapr-sidecar-missing) for more information.` To enable Dapr in your environment:
+
+- If your Azure Function is deployed in Azure Container Apps, refer to [Dapr enablement instructions for the Dapr extension for Azure Functions](../azure-functions/functions-bindings-dapr.md#dapr-enablement).
+
+- If your Azure Function is deployed in Kubernetes, verify that your [deployment's YAML configuration](https://github.com/azure/azure-functions-dapr-extension/blob/master/deploy/kubernetes/kubernetes-deployment.md#sample-kubernetes-deployment) has the following annotations: 
+
+    ```YAML
+    annotations:
+      ...
+      dapr.io/enabled: "true"
+      dapr.io/app-id: "functionapp"
+      # You should only set app-port if you are using a Dapr trigger in your code.
+      dapr.io/app-port: "<DAPR_APP_PORT>"
+      ...
+    ```
+
+- If you're running your Azure Function locally, run the following command to ensure you're [running the function app with Dapr](https://github.com/azure/azure-functions-dapr-extension/tree/master/samples/python-v2-azurefunction#step-2---run-function-app-with-dapr):
+
+    ```bash
+    dapr run --app-id functionapp --app-port <DAPR_APP_PORT>  --components-path <COMPONENTS_PATH> -- func host start 
+    ```
+
+### Verify app-port value in Dapr configuration
+
+The Dapr extension for Azure Functions starts an HTTP server on port `3001` by default. You can configure this port using the [`DAPR_APP_PORT` environment variable](https://docs.dapr.io/reference/environment/).
+
+If you provide an incorrect app port value when running an Azure Functions app, you might receive the error message: `The Dapr sidecar is configured to listen on port {portInt}, but the app server is running on port {appPort}. This may cause unexpected behavior. For more information, visit [this link](https://aka.ms/azfunc-dapr-app-config-error).` To resolve this error message:
+
+1. In your container app's Dapr settings:
+
+   - If you're using a Dapr trigger in your code, verify that the app port is set to `3001` or to the value of the `DAPR_APP_PORT` environment variable.
+
+   - If you're _not_ using a Dapr trigger in your code, verify that the app port is _not_ set. It should be empty.
+
+1. Verify that you provide the correct app port value in the Dapr configuration.
+
+   - If you're using Azure Container Apps, specify the app port in Bicep:
+
+      ```bash
+      DaprConfig: {
+        ...
+        appPort: <DAPR_APP_PORT>
+        ...
+      }
+      ```
+
+   - If you're using a Kubernetes environment, set the `dapr.io/app-port` annotation:
+
+      ```
+      annotations:
+        ...
+        dapr.io/app-port: "<DAPR_APP_PORT>"
+        ...
+      ```
+
+   - If you're developing locally, verify you set `--app-port` when running the function app with Dapr:
+
+      ```
+      dapr run --app-id functionapp --app-port <DAPR_APP_PORT> --components-path <COMPONENTS_PATH> -- func host start 
+      ```
+
 ## Next steps
 
 [Learn more about Dapr.](https://docs.dapr.io/)