Merge branch 'main' into release-usx-pub-preview

Author: v-alje

.openpublishing.redirection.container-service.json

@@ -1,5 +1,10 @@
 {
     "redirections": [
+        {
+            "source_path_from_root": "/articles/container-service/container-registry-auth-aci.md",
+            "redirect_url": "/azure/container-service/container-registry-authentication",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/container-service/dcos-swarm/container-service-application-specific-marathon.md",
             "redirect_url": "/previous-versions/azure/container-service/dcos-swarm/container-service-application-specific-marathon",

.openpublishing.redirection.json

@@ -3909,6 +3909,11 @@
             "redirect_url": "/azure/batch/monitor-batch",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/container-registry/container-registry-auth-aci.md",
+            "redirect_url": "/azure/container-registry/container-registry-authentication",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/event-hubs/move-cluster-across-regions.md",
             "redirect_url": "/azure/operational-excellence/relocation-event-hub-cluster",
@@ -3923,6 +3928,27 @@
             "source_path_from_root": "/articles/defender-for-iot/organizations/update-legacy-ot-software.md",
             "redirect_url": "/azure/defender-for-iot/organizations/update-ot-software?tabs=portal",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root":"/articles/virtual-network-manager/concept-user-defined-route-management.md",
+            "redirect_url":"/azure/virtual-network-manager/overview",
+            "redirect_document_id":false
+
+        },
+        {
+            "source_path_from_root":"/articles/virtual-network-manager/how-to-create-user-defined-routes.md",
+            "redirect_url":"/azure/virtual-network-manager/overview",
+            "redirect_document_id":false
+        },
+        {
+            "source_path_from_root":"/articles/virtual-network-manager/how-to-create-security-admin-rule-network-groups.md",
+            "redirect_url":"/azure/virtual-network-manager/overview",
+            "redirect_document_id":false
+        },
+        {
+            "source_path_from_root":"/articles/virtual-network-manager/concept-security-admin-rules-network-groups.md",
+            "redirect_url":"/azure/virtual-network-manager/overview",
+            "redirect_document_id":false 
         }
     ]
 }

articles/ai-services/openai/toc.yml

@@ -70,10 +70,6 @@ items:
       displayName: PTU, provisioned, provisioned throughput units
     - name: System message templates
       href: ./concepts/system-message.md
-    - name: Using your data - text
-      href: ./concepts/use-your-data.md
-    - name: Using your data - image (preview)
-      href: ./concepts/use-your-image-data.md
     - name: Legacy models
       href: ./concepts/legacy-models.md
 - name: How-to 
@@ -133,6 +129,16 @@ items:
       - name: Function calling
         href: ./how-to/fine-tuning-functions.md
         displayName: fine-tuning, finetuning
+  - name: Use your data
+    items:
+      - name: Text data
+        href: ./concepts/use-your-data.md
+      - name: Image data (preview)
+        href: ./concepts/use-your-image-data.md
+      - name: Use Azure OpenAI On Your Data securely
+        href: ./how-to/use-your-data-securely.md
+      - name: Deploy and use web apps
+        href: ./how-to/use-web-app.md
   - name: Migrate to OpenAI Python v1.x
     href: ./how-to/migration.md
   - name: Models
@@ -201,14 +207,27 @@ items:
   items:
     - name: Assistants API Reference
       items:
-       - name: Assistants
-         href: ./assistants-reference.md
-       - name: Threads
-         href: ./assistants-reference-threads.md
-       - name: Messages
-         href: ./assistants-reference-messages.md
-       - name: Runs
-         href: ./assistants-reference-runs.md     
+        - name: Python/REST
+          items:
+          - name: Assistants
+            href: ./assistants-reference.md
+          - name: Threads
+            href: ./assistants-reference-threads.md
+          - name: Messages
+            href: ./assistants-reference-messages.md
+          - name: Runs
+            href: ./assistants-reference-runs.md 
+        - name: SDK 
+          items:
+          - name: C#
+            href: /dotnet/api/overview/azure/ai.openai.assistants-readme?context=/azure/ai-services/openai/context/context
+          - name: Go
+            href: https://pkg.go.dev/github.com/Azure/azure-sdk-for-go/sdk/ai/azopenai
+          - name: Java
+            href: /java/api/overview/azure/ai-openai-assistants-readme?context=/azure/ai-services/openai/context/context
+          - name: JavaScript
+            href: /javascript/api/overview/azure/openai-assistants-readme?context=/azure/ai-services/openai/context/context
+          
     - name: Azure OpenAI On Your Data API Reference
       items:
         - name: Azure OpenAI On Your Data

articles/aks/TOC.yml

@@ -849,7 +849,7 @@
 - name: Resources
   items:
     - name: Build your skills with Microsoft Learn training
-      href: /training/browse/?products=azure-container-instances&azure-container-registry
+      href: /training/browse/?products=azure-kubernetes-service
     - name: Region availability
       href: https://azure.microsoft.com/global-infrastructure/services/
     - name: Pricing

articles/aks/howto-deploy-java-liberty-app.md

@@ -5,7 +5,7 @@ description: Deploy a Java application with Open Liberty/WebSphere Liberty on an
 author: KarlErickson
 ms.author: edburns
 ms.topic: how-to
-ms.date: 01/16/2024
+ms.date: 04/02/2024
 ms.subservice: aks-developer
 keywords: java, jakartaee, javaee, microprofile, open-liberty, websphere-liberty, aks, kubernetes
 ms.custom: devx-track-java, devx-track-javaee, devx-track-javaee-liberty, devx-track-javaee-liberty-aks, devx-track-javaee-websphere, build-2023, devx-track-extended-java, devx-track-azurecli
@@ -23,28 +23,24 @@ The Open Liberty Operator simplifies the deployment and management of applicatio
 
 For more information on Open Liberty, see [the Open Liberty project page](https://openliberty.io/). For more information on IBM WebSphere Liberty, see [the WebSphere Liberty product page](https://www.ibm.com/cloud/websphere-liberty).
 
-This article uses the Azure Marketplace offer for Open/WebSphere Liberty to accelerate your journey to AKS. The offer automatically provisions a number of Azure resources including an Azure Container Registry (ACR) instance, an AKS cluster, an Azure App Gateway Ingress Controller (AGIC) instance, the Liberty Operator, and optionally a container image including Liberty and your application. To see the offer, visit the [Azure portal](https://aka.ms/liberty-aks). If you prefer manual step-by-step guidance for running Liberty on AKS that doesn't utilize the automation enabled by the offer, see [Manually deploy a Java application with Open Liberty or WebSphere Liberty on an Azure Kubernetes Service (AKS) cluster](/azure/developer/java/ee/howto-deploy-java-liberty-app-manual).
+This article uses the Azure Marketplace offer for Open/WebSphere Liberty to accelerate your journey to AKS. The offer automatically provisions a number of Azure resources including an Azure Container Registry (ACR) instance, an AKS cluster, an Azure App Gateway Ingress Controller (AGIC) instance, the Liberty Operators, and optionally a container image including Liberty and your application. To see the offer, visit the [Azure portal](https://aka.ms/liberty-aks). If you prefer manual step-by-step guidance for running Liberty on AKS that doesn't utilize the automation enabled by the offer, see [Manually deploy a Java application with Open Liberty or WebSphere Liberty on an Azure Kubernetes Service (AKS) cluster](/azure/developer/java/ee/howto-deploy-java-liberty-app-manual).
 
 This article is intended to help you quickly get to deployment. Before going to production, you should explore [Tuning Liberty](https://www.ibm.com/docs/was-liberty/base?topic=tuning-liberty).
 
 [!INCLUDE [quickstarts-free-trial-note](../../includes/quickstarts-free-trial-note.md)]
 
-* You can use Azure Cloud Shell or a local terminal.
-
 [!INCLUDE [azure-cli-prepare-your-environment.md](~/reusable-content/azure-cli/azure-cli-prepare-your-environment.md)]
 
-* This article requires at least version 2.31.0 of Azure CLI. If using Azure Cloud Shell, the latest version is already installed.
-
 > [!NOTE]
 > You can also execute this guidance from the [Azure Cloud Shell](/azure/cloud-shell/quickstart). This approach has all the prerequisite tools pre-installed, with the exception of Docker.
 >
 > :::image type="icon" source="~/reusable-content/ce-skilling/azure/media/cloud-shell/launch-cloud-shell-button.png" alt-text="Button to launch the Azure Cloud Shell." border="false" link="https://shell.azure.com":::
 
-* If running the commands in this guide locally (instead of Azure Cloud Shell):
-  * Prepare a local machine with Unix-like operating system installed (for example, Ubuntu, Azure Linux, macOS, Windows Subsystem for Linux).
-  * Install a Java SE implementation, version 17 or later. (for example, [Eclipse Open J9](https://www.eclipse.org/openj9/)).
-  * Install [Maven](https://maven.apache.org/download.cgi) 3.5.0 or higher.
-  * Install [Docker](https://docs.docker.com/get-docker/) for your OS.
+* Prepare a local machine with a Unix-like operating system installed (for example, Ubuntu, macOS, Windows Subsystem for Linux).
+* This article requires at least version 2.31.0 of Azure CLI.
+* Install a Java SE implementation, version 17 or later. (for example, [Eclipse Open J9](https://www.eclipse.org/openj9/)).
+* Install [Maven](https://maven.apache.org/download.cgi) 3.5.0 or higher.
+* Install [Docker](https://docs.docker.com/get-docker/) for your OS.
 * Make sure you're assigned either the `Owner` role or the `Contributor` and `User Access Administrator` roles in the subscription. You can verify it by following steps in [List role assignments for a user or group](../role-based-access-control/role-assignments-list-portal.md#list-role-assignments-for-a-user-or-group).
 
 ## Create a Liberty on AKS deployment using the portal

articles/aks/limit-egress-traffic.md

@@ -5,7 +5,7 @@ ms.subservice: aks-networking
 ms.custom: devx-track-azurecli
 ms.topic: how-to
 ms.author: allensu
-ms.date: 12/05/2023
+ms.date: 04/02/2024
 author: asudbring
 #Customer intent: As a cluster operator, I want to restrict egress traffic for nodes to only access defined ports and addresses and improve cluster security.
 ---
@@ -178,8 +178,7 @@ For information on how to override Azure's default system routes or add addition
 This section covers three network rules and an application rule you can use to configure on your firewall. You may need to adapt these rules based on your deployment.
 
 * The first network rule allows access to port 9000 via TCP.
-* The second network rule allows access to port 1194 and 123 via UDP. If you're deploying to Microsoft Azure operated by 21Vianet, see the [Azure operated by 21Vianet required network rules](./outbound-rules-control-egress.md#microsoft-azure-operated-by-21vianet-required-network-rules). Both these rules will only allow traffic destined to the Azure Region CIDR in this article, which is East US.
-* The third network rule opens port 123 to `ntp.ubuntu.com` FQDN via UDP. Adding an FQDN as a network rule is one of the specific features of Azure Firewall, so you'll need to adapt it when using your own options.
+* The second network rule allows access to port 1194 via UDP. If you're deploying to Microsoft Azure operated by 21Vianet, see the [Azure operated by 21Vianet required network rules](./outbound-rules-control-egress.md#microsoft-azure-operated-by-21vianet-required-network-rules). Both these rules will only allow traffic destined to the Azure Region CIDR in this article, which is East US.
 * The fourth and fifth network rules allow access to pull containers from GitHub Container Registry (ghcr.io) and Docker Hub (docker.io).
 
 1. Create the network rules using the [`az network firewall network-rule create`][az-network-firewall-network-rule-create] command.
@@ -189,8 +188,6 @@ This section covers three network rules and an application rule you can use to c
 
     az network firewall network-rule create -g $RG -f $FWNAME --collection-name 'aksfwnr' -n 'apitcp' --protocols 'TCP' --source-addresses '*' --destination-addresses "AzureCloud.$LOC" --destination-ports 9000
 
-    az network firewall network-rule create -g $RG -f $FWNAME --collection-name 'aksfwnr' -n 'time' --protocols 'UDP' --source-addresses '*' --destination-fqdns 'ntp.ubuntu.com' --destination-ports 123
-
     az network firewall network-rule create -g $RG -f $FWNAME --collection-name 'aksfwnr' -n 'ghcr' --protocols 'TCP' --source-addresses '*' --destination-fqdns ghcr.io pkg-containers.githubusercontent.com --destination-ports '443'
 
     az network firewall network-rule create -g $RG -f $FWNAME --collection-name 'aksfwnr' -n 'docker' --protocols 'TCP' --source-addresses '*' --destination-fqdns docker.io registry-1.docker.io production.cloudflare.docker.com --destination-ports '443'

articles/api-management/configure-custom-domain.md

@@ -105,6 +105,7 @@ API Management offers a free, managed TLS certificate for your domain, if you do
 * Not supported in the following Azure regions: France South and South Africa West
 * Currently available only in the Azure cloud
 * Does not support root domain names (for example, `contoso.com`). Requires a fully qualified name such as `api.contoso.com`.
+* Supports only public domain names
 * Can only be configured when updating an existing API Management instance, not when creating an instance
 
 

articles/app-service/quickstart-python.md

@@ -59,6 +59,66 @@ To run the application locally:
     pip install -r requirements.txt
     ```
 
+1. Integrate a database:
+
+    ```Python
+    
+    from azure.cosmos.aio import CosmosClient
+    from azure.cosmos import exceptions
+    from azure.cosmos.partition_key import PartitionKey
+
+    from configs.credential import HOST, MASTER_KEY, DATABASE_ID
+
+
+    def get_database_client():
+         # Initialize the Cosmos client
+         client = CosmosClient(HOST, MASTER_KEY)
+
+         # Create or get a reference to a database
+         try:
+             database = client.create_database_if_not_exists(id=DATABASE_ID)
+             print(f'Database "{DATABASE_ID}" created or retrieved successfully.')
+
+         except exceptions.CosmosResourceExistsError:
+             database = client.get_database_client(DATABASE_ID)
+             print('Database with id \'{0}\' was found'.format(DATABASE_ID))
+
+         return database
+
+
+    def get_container_client(container_id):
+         database = get_database_client()
+         # Create or get a reference to a container
+         try:
+             container = database.create_container(id=container_id, partition_key=PartitionKey(path='/partitionKey'))
+             print('Container with id \'{0}\' created'.format(container_id))
+
+         except exceptions.CosmosResourceExistsError:
+             container = database.get_container_client(container_id)
+             print('Container with id \'{0}\' was found'.format(container_id))
+
+         return container
+
+    async def create_item(container_id, item):
+        async with CosmosClient(HOST, credential=MASTER_KEY) as client:
+            database = client.get_database_client(DATABASE_ID)
+            container = database.get_container_client(container_id)
+            await container.upsert_item(body=item)
+
+    async def get_items(container_id):
+        items = []
+        try:
+            async with CosmosClient(HOST, credential=MASTER_KEY) as client:
+                database = client.get_database_client(DATABASE_ID)
+                container = database.get_container_client(container_id)
+                async for item in container.read_all_items():
+                    items.append(item)
+        except Exception as e:
+            print(f"An error occurred: {e}")
+
+        return items
+    ```
+
 1. Run the app:
 
     ```Console

articles/azure-functions/TOC.yml

@@ -451,10 +451,10 @@
                   href: functions-create-maven-kotlin-intellij.md
                 - name: Linux App Service plan
                   href: create-function-app-linux-app-service-plan.md
-                - name: Linux Consumption plan
-                  href: create-first-function-cli-python.md
+                - name: Consumption plan
+                  href: ./scripts/functions-cli-create-app-service-plan.md
                 - name: Premium plan
-                  href: create-premium-plan-function-app-portal.md
+                  href: ./scripts/functions-cli-create-premium-plan.md
                 - name: Linux container (Premium)
                   href: functions-deploy-container.md
                   displayName: container, Docker, custom

articles/azure-functions/durable/quickstart-js-vscode.md

@@ -289,10 +289,10 @@ After you've verified that the function runs correctly on your local computer, i
 ::: zone-end
 
 ::: zone pivot="nodejs-model-v3"
-1. Copy the URL of the HTTP trigger from the **Output** panel. The URL that calls your HTTP-triggered function should be in this format: `http://<functionappname>.azurewebsites.net/api/orchestrators/HelloOrchestrator`
+1. Copy the URL of the HTTP trigger from the **Output** panel. The URL that calls your HTTP-triggered function should be in this format: `https://<functionappname>.azurewebsites.net/api/orchestrators/HelloOrchestrator`
 ::: zone-end
 ::: zone pivot="nodejs-model-v4"
-1. Copy the URL of the HTTP trigger from the **Output** panel. The URL that calls your HTTP-triggered function should be in this format: `http://<functionappname>.azurewebsites.net/api/orchestrators/helloOrchestrator`
+1. Copy the URL of the HTTP trigger from the **Output** panel. The URL that calls your HTTP-triggered function should be in this format: `https://<functionappname>.azurewebsites.net/api/orchestrators/helloOrchestrator`
 ::: zone-end
 
 2. Paste this new URL for the HTTP request into your browser's address bar. You should get the same status response as before when using the published app.