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

Author: duongau

articles/active-directory-b2c/oauth2-error-technical-profile.md

@@ -9,7 +9,7 @@ manager: CelesteDG
 ms.service: active-directory
 
 ms.topic: reference
-ms.date: 01/11/2024
+ms.date: 05/07/2024
 ms.author: kengaderdus
 ms.subservice: B2C
 
@@ -73,6 +73,43 @@ The following example shows a technical profile for `ReturnOAuth2Error`:
 </ClaimsProviders> -->
 ```
 
+## Define claims transformation to generate custom values of error code and error message
+
+Use these steps to generate custom values of error code and error message:
+
+1. Locate the `ClaimsTransformations` element, then add the following code inside it
+
+    ```xml
+    <!--
+     <ClaimsTransformations> -->
+    <ClaimsTransformation Id="GenerateErrorCode" TransformationMethod="CreateStringClaim">
+            <InputParameters>
+              <InputParameter Id="value" DataType="string" Value="Error_001" />
+            </InputParameters>
+            <OutputClaims>
+              <OutputClaim ClaimTypeReferenceId="errorCode" TransformationClaimType="createdClaim" />
+            </OutputClaims>
+          </ClaimsTransformation>
+          <ClaimsTransformation Id="GenerateErrorMessage" TransformationMethod="CreateStringClaim">
+            <InputParameters>
+              <InputParameter Id="value" DataType="string" Value="Insert error description." />
+            </InputParameters>
+            <OutputClaims>
+              <OutputClaim ClaimTypeReferenceId="errorMessage" TransformationClaimType="createdClaim" />
+            </OutputClaims>
+          </ClaimsTransformation>
+    <!--
+    </ClaimsTransformations> -->
+    ```
+
+1. Add the two claims transformations in the `OutputClaimsTransformations` element of any technical profile before Oauth2 technical that you define:
+
+    ```xml
+        <OutputClaimsTransformations>
+          <OutputClaimsTransformation ReferenceId="generateErrorCode" />
+          <OutputClaimsTransformation ReferenceId="generateErrorMessage" />
+        </OutputClaimsTransformations>
+    ```
 ## Input claims
 
 The **InputClaims** element contains a list of claims required to return OAuth2 error. 
@@ -123,6 +160,20 @@ In the following example:
 </UserJourney>
 ```
 
+Optionally, you can use preconditions to manipulate the Oauth2 error technical profile. For example, if there is no email claim, you can set to call Oauth2 error technical profile:
+
+```xml
+<OrchestrationStep Order="3" Type="SendClaims" CpimIssuerTechnicalProfileReferenceId="ReturnOAuth2Error">
+      <Preconditions>
+        <Precondition Type="ClaimsExist" ExecuteActionsIf="false">
+          <Value>email</Value>
+          <Action>SkipThisOrchestrationStep</Action>
+        </Precondition>
+      </Preconditions>
+    </OrchestrationStep>
+```
+
+
 ## Next steps
 
 Learn about [UserJourneys](userjourneys.md)

articles/ai-services/openai/concepts/model-retirements.md

@@ -66,9 +66,9 @@ These models are currently available for use in Azure OpenAI Service.
 | `gpt-35-turbo` | 0125 | No earlier than Feb 22, 2025 |
 | `gpt-4`<br>`gpt-4-32k` | 0314 | No earlier than July 13, 2024 |
 | `gpt-4`<br>`gpt-4-32k` | 0613 | No earlier than Sep 30, 2024 |
-| `gpt-4` | 1106-preview | To be upgraded to `gpt-4` Version: `turbo-2024-04-09`, starting on June 10, 2024, or later **<sup>1</sup>** |
-| `gpt-4` | 0125-preview |To be upgraded to `gpt-4` Version: `turbo-2024-04-09`, starting on June 10, 2024, or later  **<sup>1</sup>**  |
-| `gpt-4` | vision-preview | To be upgraded to `gpt-4` Version: `turbo-2024-04-09`, starting on June 10, 2024, or later  **<sup>1</sup>** |
+| `gpt-4` | 1106-preview | To be upgraded to `gpt-4` Version: `turbo-2024-04-09`, starting on July 15, 2024, or later **<sup>1</sup>** |
+| `gpt-4` | 0125-preview |To be upgraded to `gpt-4` Version: `turbo-2024-04-09`, starting on July 15, 2024, or later  **<sup>1</sup>**  |
+| `gpt-4` | vision-preview | To be upgraded to `gpt-4` Version: `turbo-2024-04-09`, starting on July 15, 2024, or later  **<sup>1</sup>** |
 | `gpt-3.5-turbo-instruct` | 0914 | No earlier than Sep 14, 2025 |
 | `text-embedding-ada-002` | 2 | No earlier than April 3, 2025 |
 | `text-embedding-ada-002` | 1 | No earlier than April 3, 2025 |

articles/ai-services/openai/faq.yml

@@ -265,6 +265,7 @@ sections:
         answer: |
           * Inference cost (input and output) of the base model you're using for each Assistant (for example gpt-4-0125). If you've created multiple Assistants, you will be charged for the base model attached to each Assistant.
           * If you've enabled the Code Interpreter tool. For example if your assistant calls Code Interpreter simultaneously in two different threads, this would create two Code Interpreter sessions, each of which would be charged. Each session is active by default for one hour, which means that you would only pay this fee once if your user keeps giving instructions to Code Interpreter in the same thread for up to one hour.
+          * File search is currently not billed. 
 
           For more information, see the [pricing page](https://azure.microsoft.com/pricing/details/cognitive-services/openai-service/).
       - question: |

articles/azure-app-configuration/media/azure-app-configuration-create/azure-portal-find-app-configuration.png

@@ -68,6 +68,7 @@ The first release of the 1.40 agent may impact SQL Server enabled by Azure Arc w
 ### New features
 
 - Oracle Linux 9 is now a [supported operating system](prerequisites.md#supported-operating-systems)
+- Customers no longer need to download an intermediate CA certificate for delivery of WS2012/R2 ESUs (Requires April 2024 SSU update)
 
 ### Fixed
 

articles/azure-arc/servers/agent-release-notes.md

@@ -430,6 +430,29 @@ Starting from verion 3.3.1, you can capture spans for a method in your applicati
 }
 ```
 
+## Locally disabling ingestion sampling (preview)
+
+By default, when the effective sampling percentage in the Java agent is 100%
+and [ingestion sampling](./sampling-classic-api.md#ingestion-sampling) has been configured on your Application Insights resource,
+then the ingestion sampling percentage will be applied.
+
+Note that this behavior applies to both fixed-rate sampling of 100% and also applies to rate-limited sampling when the
+request rate doesn't exceed the rate limit (effectively capturing 100% during the continuously sliding time window).
+
+Starting from 3.5.3, you can disable this behavior
+(and keep 100% of telemetry in these cases even when ingestion sampling has been configured
+on your Application Insights resource):
+
+```json
+{
+  "preview": {
+    "sampling": {
+      "ingestionSamplingEnabled": false
+    }
+  }
+}
+```
+
 ## Autocollected logging
 
 Log4j, Logback, JBoss Logging, and java.util.logging are autoinstrumented. Logging performed via these logging frameworks is autocollected.

articles/azure-monitor/app/java-standalone-config.md

@@ -24,6 +24,7 @@ Specific configuration you can perform with the DCR includes:
 > Complete configuration of data collection in Container insights may require editing of both the DCR and the ConfigMap for the cluster since each method allows configuration of a different set of settings. 
 > 
 > See [Configure data collection in Container insights using ConfigMap](./container-insights-data-collection-configmap.md) for a list of settings and the process to configure data collection using ConfigMap.
+> Customers should not delete or manually edit their DCR resource. 
 
 ## Prerequisites
 

articles/azure-monitor/containers/container-insights-data-collection-dcr.md

@@ -1,7 +1,7 @@
 ---
 title: What is the Azure mobile app?
 description: The Azure mobile app is a tool that allows you to monitor and manage your Azure resources and services from your mobile device. 
-ms.date: 05/29/2024
+ms.date: 06/06/2024
 ms.topic: conceptual
 ---
 
@@ -36,7 +36,7 @@ For more information, see [Azure mobile app Home](home.md).
 
 ## Hamburger menu
 
-The hamburger menu lets you select the environment, account, and directory you want to manage. The hamburger menu also houses several other settings and features, including:
+The hamburger menu lets you select the environment, account, and directory (Azure tenant) you want to work in. The hamburger menu also houses several other settings and features, including:
 
 - Billing/Cost management
 - Settings

articles/azure-portal/mobile-app/overview.md

@@ -1,7 +1,7 @@
 ---
 title: Manage Azure portal settings and preferences
 description: Change Azure portal settings such as default subscription/directory, timeouts, menu mode, contrast, theme, notifications, language/region and more.
-ms.date: 04/12/2024
+ms.date: 06/06/2024
 ms.topic: how-to
 ---
 
@@ -17,11 +17,11 @@ Within **Portal settings**, you'll see different sections. This article describe
 
 ## Directories + subscriptions
 
-**Directories + subscriptions** lets you manage directories and set subscription filters.
+**Directories + subscriptions** lets you manage directories (Azure tenants) and set subscription filters.
 
 ### Switch and manage directories
 
-In the **Directories** section, you'll see your **Current directory** (the directory that you're currently signed in to).
+In the **Directories** section, you'll see your **Current directory** (the directory, or Azure tenant, that you're currently signed in to).
 
 The **Startup directory** shows the default directory when you sign in to the Azure portal (or **Last visited** if you've chosen that option). To choose a different startup directory, select **change** to open [Appearance + startup views](#appearance--startup-views), where you can change your selection.
 
@@ -116,7 +116,7 @@ Choose one of the following options for **Startup page**. This setting determine
 
 ### Manage startup directory options
 
-Choose one of the following options for the directory to work in when you first sign in to the Azure portal.
+Choose one of the following options to control which directory (Azure tenant) to work in when you first sign in to the Azure portal.
 
 - **Last visited**: When you sign in to the Azure portal, you'll start in the same directory from your previous visit.
 - **Select a directory**: Choose this option to select a specific directory. You'll start in that directory every time you sign in to the Azure portal, even if you had been working in a different directory last time.
@@ -218,7 +218,7 @@ If your admin has enabled an inactivity timeout policy, you can still set your o
 
 ### Change the directory timeout setting (admin)
 
-Users with the [Global Administrator role](../active-directory/roles/permissions-reference.md#global-administrator) can enforce the maximum idle time before a session is signed out. This inactivity timeout setting applies to all users in the directory. Once it's set, all new sessions will comply with the new timeout settings. The change won't apply to signed-in users until their next sessions.
+Users with the [Global Administrator role](../active-directory/roles/permissions-reference.md#global-administrator) can enforce the maximum idle time before a session is signed out. This inactivity timeout setting applies to all users in the Azure tenant. Once it's set, all new sessions will comply with the new timeout settings. The change won't apply to signed-in users until their next sessions.
 
 Global Administrators can't specify different settings for individual users in the tenant. However, each user has the option to set a shorter timeout interval for themselves. Users can't change their individual timeout setting to a longer interval than the current option set by a Global Administrator.
 
@@ -228,7 +228,7 @@ To enforce an idle timeout setting for all users of the Azure portal, sign in wi
 
 To confirm that the inactivity timeout policy is set correctly, select **Notifications** from the global page header and verify that a success notification is listed.
 
-To change a previously selected directory timeout, any Global Administrator can follow these steps again to apply a new timeout interval. If a Global Administrator unchecks the box for **Enable directory level idle timeout**, the previous setting will remain in place by default for all users; however, each user can change their individual setting to whatever they prefer.
+To change a previously selected timeout, any Global Administrator can follow these steps again to apply a new timeout interval. If a Global Administrator unchecks the box for **Enable directory level idle timeout**, the previous setting will remain in place by default for all users; however, each user can change their individual setting to whatever they prefer.
 
 ### Enable or disable pop-up notifications
 

articles/azure-portal/set-preferences.md

@@ -8,7 +8,7 @@ ms.service: data-factory
 ms.subservice: data-movement
 ms.topic: conceptual
 ms.custom: synapse
-ms.date: 05/15/2024
+ms.date: 06/03/2024
 ---
 
 # Copy data to or from Azure Data Lake Storage Gen1 using Azure Data Factory or Azure Synapse Analytics
@@ -17,6 +17,9 @@ ms.date: 05/15/2024
 
 This article outlines how to copy data to and from Azure Data Lake Storage Gen1. To learn more, read the introductory article for [Azure Data Factory](introduction.md) or [Azure Synapse Analytics](../synapse-analytics/overview-what-is.md).
 
+>[!Note]
+>Azure Data Lake Storage Gen1 was retired on **February 29, 2024**. Please migrate to [Azure Data Lake Storage Gen2 connector](connector-azure-data-lake-storage.md). See this [article](https://azure.microsoft.com/updates/action-required-switch-to-azure-data-lake-storage-gen2-by-29-february-2024/) for the Azure Data Lake Storage Gen1 migration guidance.
+
 ## Supported capabilities
 
 This Azure Data Lake Storage Gen1 connector is supported for the following capabilities: