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

Author: varun-dhawan

.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/ai-services/computer-vision/how-to/video-retrieval.md

@@ -20,7 +20,7 @@ Azure AI Spatial Analysis Video Retrieval APIs are part of Azure AI Vision and e
 ## Prerequisites
 
 - Azure subscription - [Create one for free](https://azure.microsoft.com/free/cognitive-services).
-- Once you have your Azure subscription, [create a Vision resource using the portal](/azure/cognitive-services/cognitive-services-apis-create-account). For this preview, you must create your resource in the East US region.
+- Once you have your Azure subscription, [create a Vision resource using the portal](/azure/cognitive-services/cognitive-services-apis-create-account). For this preview, you must create your resource in the one of the following regions - Australia East, Switzerland North, Sweden Central, or East US.
 - An Azure Storage resource - [Create one](/azure/storage/common/storage-account-create?tabs=azure-portal)
 
 ## Input requirements

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-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/)

articles/azure-netapp-files/backup-introduction.md

@@ -44,6 +44,7 @@ Azure NetApp Files backup is supported for the following regions:
 * Brazil Southeast 
 * Canada Central
 * Canada East
+* Central India
 * Central US
 * East Asia
 * East US

articles/azure-netapp-files/configure-customer-managed-keys.md

@@ -172,7 +172,7 @@ You can also use [Azure CLI commands](/cli/azure/feature) `az feature register`
 
 ### [Azure CLI](#tab/azure-cli)
 
-The process to configure a NetApp account with customer-managed keys using the Azure CLI depends on whether you are using a [system-assigned identity](#use-a-system-assigned-identity) or an [user-assigned identity](#use-a-new-user-assigned-identity).
+How you configure a NetApp account with customer-managed keys with the Azure CLI depends on whether you are using a [system-assigned identity](#use-a-system-assigned-identity) or an [user-assigned identity](#use-a-new-user-assigned-identity).
 
 #### Use a system-assigned identity
 

articles/azure-resource-manager/bicep/bicep-functions-array.md

@@ -1,11 +1,9 @@
 ---
 title: Bicep functions - arrays
 description: Describes the functions to use in a Bicep file for working with arrays.
-author: mumian
 ms.topic: conceptual
 ms.custom: devx-track-bicep
-ms.author: jgao
-ms.date: 12/09/2022
+ms.date: 01/11/2024
 ---
 
 # Array functions for Bicep
@@ -949,6 +947,8 @@ For arrays, the function iterates through each element in the first parameter an
 
 For objects, property names and values from the first parameter are added to the result. For later parameters, any new names are added to the result. If a later parameter has a property with the same name, that value overwrites the existing value. The order of the properties isn't guaranteed.
 
+The union function merges not only the top-level elements but also recursively merges any nested objects within them. Nested array values are not merged. See the second example in the following section.
+
 ### Example
 
 The following example shows how to use union with arrays and objects:
@@ -989,6 +989,63 @@ The output from the preceding example with the default values is:
 | objectOutput | Object | {"one": "a", "two": "b", "three": "c2", "four": "d", "five": "e"} |
 | arrayOutput | Array | ["one", "two", "three", "four"] |
 
+The following example shows the deep merge capability:
+
+```bicep
+var firstObject = {
+  property: {
+    one: 'a'
+    two: 'b'
+    three: 'c1'
+  }
+  nestedArray: [
+    1
+    2
+  ]
+}
+var secondObject = {
+  property: {
+    three: 'c2'
+    four: 'd'
+    five: 'e'
+  }
+  nestedArray: [
+    3
+    4
+  ]
+}
+var firstArray = [
+  [
+    'one'
+    'two'
+  ]
+  [
+    'three'
+  ]
+]
+var secondArray = [
+  [
+    'three'
+  ]
+  [
+    'four'
+    'two'
+  ]
+]
+
+output objectOutput object = union(firstObject, secondObject)
+output arrayOutput array = union(firstArray, secondArray)
+```
+
+The output from the preceding example is:
+
+| Name | Type | Value |
+| ---- | ---- | ----- |
+| objectOutput | Object |{"property":{"one":"a","two":"b","three":"c2","four":"d","five":"e"},"nestedArray":[3,4]}|
+| arrayOutput | Array |[["one","two"],["three"],["four","two"]]|
+
+If nested arrays were merged, then the value of **objectOutput.nestedArray** would be [1, 2, 3, 4], and the value of **arrayOutput** would be [["one", "two", "three"], ["three", "four", "two"]].
+
 ## Next steps
 
 * To get an array of string values delimited by a value, see [split](./bicep-functions-string.md#split).

articles/azure-resource-manager/bicep/bicep-functions-object.md

@@ -1,11 +1,9 @@
 ---
 title: Bicep functions - objects
 description: Describes the functions to use in a Bicep file for working with objects.
-author: mumian
-ms.author: jgao
 ms.topic: conceptual
 ms.custom: devx-track-bicep
-ms.date: 03/19/2023
+ms.date: 01/11/2024
 ---
 
 # Object functions for Bicep
@@ -415,6 +413,8 @@ For arrays, the function iterates through each element in the first parameter an
 
 For objects, property names and values from the first parameter are added to the result. For later parameters, any new names are added to the result. If a later parameter has a property with the same name, that value overwrites the existing value. The order of the properties isn't guaranteed.
 
+The union function merges not only the top-level elements but also recursively merges any nested objects within them. Nested array values are not merged. See the second example in the following section.
+
 ### Example
 
 The following example shows how to use union with arrays and objects:
@@ -455,6 +455,63 @@ The output from the preceding example with the default values is:
 | objectOutput | Object | {"one": "a", "two": "b", "three": "c2", "four": "d", "five": "e"} |
 | arrayOutput | Array | ["one", "two", "three", "four"] |
 
+The following example shows the deep merge capability:
+
+```bicep
+var firstObject = {
+  property: {
+    one: 'a'
+    two: 'b'
+    three: 'c1'
+  }
+  nestedArray: [
+    1
+    2
+  ]
+}
+var secondObject = {
+  property: {
+    three: 'c2'
+    four: 'd'
+    five: 'e'
+  }
+  nestedArray: [
+    3
+    4
+  ]
+}
+var firstArray = [
+  [
+    'one'
+    'two'
+  ]
+  [
+    'three'
+  ]
+]
+var secondArray = [
+  [
+    'three'
+  ]
+  [
+    'four'
+    'two'
+  ]
+]
+
+output objectOutput object = union(firstObject, secondObject)
+output arrayOutput array = union(firstArray, secondArray)
+```
+
+The output from the preceding example is:
+
+| Name | Type | Value |
+| ---- | ---- | ----- |
+| objectOutput | Object |{"property":{"one":"a","two":"b","three":"c2","four":"d","five":"e"},"nestedArray":[3,4]}|
+| arrayOutput | Array |[["one","two"],["three"],["four","two"]]|
+
+If nested arrays were merged, then the value of **objectOutput.nestedArray** would be [1, 2, 3, 4], and the value of **arrayOutput** would be [["one", "two", "three"], ["three", "four", "two"]].
+
 ## Next steps
 
 * For a description of the sections in a Bicep file, see [Understand the structure and syntax of Bicep files](./file.md).