Merge branch 'main' into release-scommi

Author: v-alje

.openpublishing.redirection.azure-kubernetes-service.json

@@ -456,11 +456,6 @@
             "redirect_url": "/azure/aks/create-node-pools",
             "redirect_document_id": false
         },
-        {
-            "source_path_from_root": "/articles/copilot/limited-access.md",
-            "redirect_url": "/azure/copilot/manage-access",
-            "redirect_document_id": false
-        },
         {
             "source_path_from_root": "/articles/aks/command-invoke.md",
             "redirect_url": "/azure/aks/access-private-cluster",

.openpublishing.redirection.container-registry.json

@@ -1,10 +1,22 @@
 {
     "redirections": [
+        
+        {
+            "source_path_from_root": "/articles/container-registry/container-registry-oci-artifacts.md",
+            "redirect_url": "/azure/container-registry/container-registry-manage-artifact",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/container-registry/container-registry-oras-artifacts.md",
+            "redirect_url": "/azure/container-registry/container-registry-manage-artifact",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/container-registry/tutorial-enable-registry-cache-auth.md",
             "redirect_url": "/azure/container-registry/container-registry-artifact-cache",
             "redirect_document_id": false
         },
+        
         {
             "source_path_from_root": "/articles/container-registry/tutorial-enable-registry-cache-auth-cli.md",
             "redirect_url": "/azure/container-registry/container-registry-artifact-cache",

.openpublishing.redirection.json

@@ -4063,6 +4063,16 @@
             "redirect_url":"/azure/reliability/reliability-cosmos-db-nosql",
             "redirect_document_id":false
         },
+        {
+            "source_path_from_root": "/articles/copilot/limited-access.md",
+            "redirect_url": "/azure/copilot/manage-access",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-portal/mobile-app/microsoft-copilot-for-azure.md",
+            "redirect_url": "/azure/azure-portal/mobile-app/microsoft-copilot-in-azure",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root":"/articles/migrate/how-to-assess.md",
             "redirect_url":"/azure/migrate/whats-new#update-april-2024",

articles/ai-services/openai/concepts/use-your-data.md

@@ -581,24 +581,22 @@ Each user message can translate to multiple search queries, all of which get sen
 
 ## Regional availability and model support
 
-| Region | `gpt-35-turbo-16k (0613)` | `gpt-35-turbo (1106)` | `gpt-4-32k (0613)` | `gpt-4 (1106-preview)` | `gpt-4 (0125-preview)` | `gpt-4-32k (0314)`** | `gpt-4 (0613)` | `gpt-4 (0314)`** | `gpt-4o`   | `gpt-turbo (409)` |
-|------|---|---|---|---|---|----|----|----|----|---|
-| Australia East | ✅ | ✅ | ✅ |✅ |   | ✅ | ✅ | ✅ | | |
-| Canada East | ✅ | ✅ | ✅ |✅ |   | ✅ | ✅ | ✅ | | |
-| East US | ✅ |   |   |  |✅  | ✅ |   | ✅ | ✅| |
-| East US 2 | ✅ |   |   |✅ |    | ✅ |   | ✅ |✅ | ✅|
-| France Central | ✅ | ✅ | ✅ |✅ |    | ✅ | ✅ | ✅ | | |
-| Japan East | ✅ |   |   |  |   | ✅ |   | ✅ | | |
-| North Central US | ✅ |   |   | |✅  | ✅ |   | ✅ |✅ | |
-| Norway East | ✅ |   |   |✅ |   | ✅ |  | ✅ | | |
-| South Central US |  |   |   | | ✅ | ✅|   | ✅ | ✅ | |
-| South India |  | ✅ |   |✅ |   | ✅ |   | ✅ | |  |
-| Sweden Central | ✅ | ✅ | ✅ |✅ |   | ✅ | ✅ | ✅ | | ✅ |
-| Switzerland North | ✅ |   | ✅ |  |  | ✅ | ✅ | ✅ | | |
-| UK South | ✅ | ✅ | |✅ |✅  | ✅ |  | ✅ | | |
-| West US  |  |✅ | |✅|   | ✅ |  | ✅ |✅ | |
-
-** Models are being retired no sooner than 31 July 2024
+| Region | `gpt-35-turbo-16k (0613)` | `gpt-35-turbo (1106)` | `gpt-4-32k (0613)` | `gpt-4 (1106-preview)` | `gpt-4 (0125-preview)` | `gpt-4 (0613)`  | `gpt-4o`   | `gpt-turbo (409)` |
+|------|---|---|---|---|---|----|----|----|
+| Australia East | ✅ | ✅ | ✅ |✅ |   | ✅ | | | 
+| Canada East | ✅ | ✅ | ✅ |✅ |   | ✅ |  | | 
+| East US | ✅ |   |   |  |✅  |  | ✅ |  |
+| East US 2 | ✅ |  |  |✅ |  |  |✅ | ✅|
+| France Central | ✅ | ✅ | ✅ |✅ |   | ✅ |  | | 
+| Japan East | ✅ |   |   |  |   |   |  | | 
+| North Central US | ✅ |   |   | |✅  |   |✅  | |
+| Norway East | ✅ |   |   |✅ |   |  |  | | 
+| South Central US |  |   |   | | ✅ |   | ✅ |  |
+| South India |  | ✅ |   |✅ |   |    |  | |  
+| Sweden Central | ✅ | ✅ | ✅ |✅ |    | ✅ | | ✅|
+| Switzerland North | ✅ |   | ✅ |  |  | ✅ |  | | 
+| UK South | ✅ | ✅ | |✅ |✅  |  |  | |
+| West US  |  |✅ | |✅|   |   | ✅ | |
 
 If your Azure OpenAI resource is in another region, you won't be able to use Azure OpenAI On Your Data.
 

articles/azure-arc/kubernetes/tutorial-use-gitops-flux2.md

@@ -1,7 +1,7 @@
 ---
 title: "Tutorial: Deploy applications using GitOps with Flux v2"
 description: "This tutorial shows how to use GitOps with Flux v2 to manage configuration and application deployment in Azure Arc and AKS clusters."
-ms.date: 04/30/2024
+ms.date: 05/29/2024
 ms.topic: tutorial
 ms.custom: template-tutorial, devx-track-azurecli, references_regions
 ---
@@ -396,7 +396,7 @@ az k8s-extension create --resource-group <resource-group> --cluster-name <cluste
 
 #### Red Hat OpenShift onboarding guidance
 
-Flux controllers require a **nonroot** [Security Context Constraint](https://access.redhat.com/documentation/en-us/openshift_container_platform/4.2/html/authentication/managing-pod-security-policies) to properly provision pods on the cluster. These constraints must be added to the cluster prior to onboarding of the `microsoft.flux` extension.
+Flux controllers require a **nonroot** [Security Context Constraint](https://access.redhat.com/documentation/en-us/openshift_container_platform/4.2/html/authentication/managing-pod-security-policies) to properly provision pods on the cluster. These constraints must be added to the cluster before deploying the `microsoft.flux` extension.
 
 ```console
 NS="flux-system"
@@ -487,7 +487,7 @@ To view detailed conditions for a configuration object, select its name.
 
 :::image type="content" source="media/tutorial-use-gitops-flux2/portal-configuration-object-conditions.png" alt-text="Screenshot showing condition details for a configuration object in the Azure portal." lightbox="media/tutorial-use-gitops-flux2/portal-configuration-object-conditions.png":::
 
-For more information, see [Monitor GitOps (Flux v2) status and activity](monitor-gitops-flux-2.md). 
+For more information, see [Monitor GitOps (Flux v2) status and activity](monitor-gitops-flux-2.md).
 
 ---
 
@@ -497,6 +497,12 @@ Flux supports many parameters to enable various scenarios. For a description of
 
 For information about available parameters and how to use them, see [GitOps (Flux v2) supported parameters](gitops-flux2-parameters.md).
 
+### Work with local secret authentication reference
+
+To use a local secret authentication reference, the secret must exist within the same namespace where the `fluxConfiguration` will be deployed. The secret must also contain all of the authentication parameters needed for the source.
+
+For information on creating secrets for various `fluxConfiguration` sources, see [Local secret for authentication with source](gitops-flux2-parameters.md#local-secret-for-authentication-with-source).
+
 ## Manage cluster configuration by using the Flux Kustomize controller
 
 The [Flux Kustomize controller](https://fluxcd.io/docs/components/kustomize/) is installed as part of the `microsoft.flux` cluster extension. It allows the declarative management of cluster configuration and application deployment by using Kubernetes manifests synced from a Git repository. These Kubernetes manifests can optionally include a *kustomize.yaml* file.

articles/azure-functions/flex-consumption-plan.md

@@ -3,7 +3,7 @@ title: Azure Functions Flex Consumption plan hosting
 description: Running your function code in the Azure Functions Flex Consumption plan provides virtual network integration, dynamic scale (to zero), and reduced cold starts.
 ms.service: azure-functions
 ms.topic: concept-article
-ms.date: 05/20/2024
+ms.date: 05/24/2024
 ms.custom: references_regions, build-2024
 # Customer intent: As a developer, I want to understand the benefits of using the Flex Consumption plan so I can get the scalability benefits of Azure Functions without having to pay for resources I don't need.
 ---
@@ -135,6 +135,7 @@ Keep these other considerations in mind when using Flex Consumption plan during
   + Continuous deployment using Azure DevOps Tasks (`AzureFunctionApp@2`)
   + Continuous deployment using GitHub Actions (`functions-action@v1`) 
 + **Scale**: The lowest maximum scale in preview is `40`. The highest currently supported value is `1000`.
++ **Authorization**: EasyAuth isn't currently supported. Unauthenticated callers currently aren't blocked when EasyAuth is enabled in a Flex Consumption plan app.  
 
 ## Related articles 
 

articles/azure-functions/functions-add-output-binding-azure-sql-vs-code.md

@@ -223,16 +223,16 @@ Update *HttpExample\\function_app.py* to match the following code. Add the `toDo
 import azure.functions as func
 import logging
 from azure.functions.decorators.core import DataType
+import uuid
 
 app = func.FunctionApp()
 
 @app.function_name(name="HttpTrigger1")
 @app.route(route="hello", auth_level=func.AuthLevel.ANONYMOUS)
-@app.generic_output_binding(arg_name="toDoItems", type="sql", CommandText="dbo.ToDo", ConnectionStringSetting="SqlConnectionString"
-    data_type=DataType.STRING)
+@app.generic_output_binding(arg_name="toDoItems", type="sql", CommandText="dbo.ToDo", ConnectionStringSetting="SqlConnectionString",data_type=DataType.STRING)
 def test_function(req: func.HttpRequest, toDoItems: func.Out[func.SqlRow]) -> func.HttpResponse:
      logging.info('Python HTTP trigger function processed a request.')
-     name = req.params.get('name')
+     name = req.get_json().get('name')
      if not name:
         try:
             req_body = req.get_json()
@@ -242,7 +242,7 @@ def test_function(req: func.HttpRequest, toDoItems: func.Out[func.SqlRow]) -> fu
             name = req_body.get('name')
 
      if name:
-        toDoItems.set(func.SqlRow({"id": uuid.uuid4(), "title": name, "completed": false, url: ""}))
+        toDoItems.set(func.SqlRow({"Id": str(uuid.uuid4()), "title": name, "completed": False, "url": ""}))
         return func.HttpResponse(f"Hello {name}!")
      else:
         return func.HttpResponse(

articles/azure-government/documentation-government-csp-list.md

@@ -381,6 +381,7 @@ Below you can find a list of all the authorized Cloud Solution Providers (CSPs),
 |[Saasplaza](https://www.intwo.cloud/)|
 |[Science Applications International Corporation](https://www.saic.com)|
 |[Secure-24](https://www.secure-24.com)|
+|[Sela Cloud](https://www.selacloud.com)|
 |[Selex Galileo Inc](http://www.selexgalileo.com/)|
 |[Sentinel Blue](https://www.sentinelblue.com/)|
 |[Sev1Tech](https://www.sev1tech.com/)|

articles/azure-monitor/alerts/alerts-metric-near-real-time.md

@@ -128,7 +128,6 @@ Here's the full list of Azure Monitor metric sources supported by metric alerts:
 |Microsoft.Synapse/workspaces/bigDataPools | Yes | No | [Azure Synapse Analytics Apache Spark pools](../essentials/metrics-supported.md#microsoftsynapseworkspacesbigdatapools) |
 |Microsoft.Synapse/workspaces/sqlPools | Yes | No | [Azure Synapse Analytics SQL pools](../essentials/metrics-supported.md#microsoftsynapseworkspacessqlpools) |
 |Microsoft.VMWareCloudSimple/virtualMachines | Yes | No | [CloudSimple virtual machines](../essentials/metrics-supported.md) |
-|Microsoft.Web/containerApps | Yes | No | Azure Container Apps |
 |Microsoft.Web/hostingEnvironments/multiRolePools | Yes | No | [Azure App Service environment multi-role pools](../essentials/metrics-supported.md#microsoftwebhostingenvironmentsmultirolepools)|
 |Microsoft.Web/hostingEnvironments/workerPools | Yes | No | [Azure App Service environment worker pools](../essentials/metrics-supported.md#microsoftwebhostingenvironmentsworkerpools)|
 |Microsoft.Web/serverfarms | Yes | No | [Azure App Service plans](../essentials/metrics-supported.md#microsoftwebserverfarms)|

articles/azure-monitor/alerts/alerts-troubleshoot.md

@@ -34,8 +34,8 @@ If you can see a fired alert in the Azure portal, but didn't receive the email t
 
 1. **Is the type of action "Email Azure Resource Manager Role"?**
 
-    This action only looks at Azure Resource Manager role assignments that are at the subscription scope, and of type *User*. Make sure that you assigned the role at the subscription level, and not at the resource level or resource group level.
-
+    This action only looks at Azure Resource Manager role assignments that are at the subscription scope, and of type *User* or *Group*. Make sure that you assigned the role at the subscription level, and not at the resource level or resource group level.
+   
 1. **Are your email server and mailbox accepting external emails?**
 
     Verify that emails from these three addresses aren't blocked: