Merge branch 'MicrosoftDocs:main' into Monthly-broken-links-fix-sunaray

Author: Albertyang0

.openpublishing.redirection.azure-resource-manager.json

@@ -1649,6 +1649,11 @@
             "source_path_from_root": "/articles/dns/dns-getstarted-create-recordset.md",
             "redirect_url": "/azure/dns/dns-getstarted-powershell",
             "redirect_document_id": false
+        },
+		{
+            "source_path_from_root": "/articles/time-series-insights/migration-to-adx.md",
+            "redirect_url": "/azure/time-series-insights/migration-to-fabric.md",
+            "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/dns/dns-operations-dnszones-cli-nodejs.md",

.openpublishing.redirection.json

@@ -532,7 +532,7 @@ The following IDs are used for an [Microsoft Entra ID multifactor authentication
 | `UserMessageIfMaxAllowedCodeRetryReached` | Wrong code entered too many times, please try again later.|
 | `UserMessageIfServerError` | Cannot use MFA service, please try again later.|
 | `UserMessageIfThrottled` | Your request has been throttled, please try again later.|
-| `UserMessageIfWrongCodeEntered` |Wrong code entered, please try again.|
+| `UserMessageIfIncorrectOTPCodeEntered` |Wrong code entered, please try again.|
 
 <a name='azure-ad-mfa-example'></a>
 
@@ -684,4 +684,4 @@ This example shows localized messages for CAPTCHA display control.
 See the following articles for localization examples:
 
 - [Language customization with custom policy in Azure AD B2C](language-customization.md)
-- [Language customization with user flows in Azure AD B2C](language-customization.md)
+- [Language customization with user flows in Azure AD B2C](language-customization.md)

articles/active-directory-b2c/localization-string-ids.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/active-directory-b2c/oauth2-error-technical-profile.md

@@ -17,9 +17,6 @@ ms.subservice: B2C
 
 # Tutorial to configure Azure Active Directory B2C with Strata
 
-> [!CAUTION]
-> This article references CentOS, a Linux distribution that is nearing End Of Life (EOL) status. Please consider your use and planning accordingly. For more information, see the [CentOS End Of Life guidance](~/articles/virtual-machines/workloads/centos/centos-end-of-life.md).
-
 In this tutorial, learn how to integrate Azure Active Directory B2C (Azure AD B2C) with Strata [Maverics Identity Orchestrator](https://www.strata.io/), which helps protect on-premises applications. It connects to identity systems, migrates users and credentials, synchronizes policies and configurations, and abstracts authentication and session management. Use Strata to transition from legacy, to Azure AD B2C, without rewriting applications. 
 
 The solution has the following benefits:
@@ -98,7 +95,7 @@ Use the instructions in the following sections to configure an Orchestrator inst
 
 You can run your Orchestrator instance on any server, whether on-premises or in a public cloud infrastructure by provider such as Azure, AWS, or GCP.
 
-- **Operating System**: REHL 7.7 or higher, CentOS 7+
+- **Operating System**: RHEL 7.7 or higher
 - **Disk**: 10 GB (small)
 - **Memory**: 16 GB
 - **Ports**: 22 (SSH/SCP), 443, 80

articles/active-directory-b2c/partner-strata.md

@@ -1,5 +1,5 @@
 ---
-title: Get started with Azure Advisor
+title: Azure Advisor portal basics
 description: Get started with Azure Advisor.
 author: mabrahms
 ms.author: v-mabrahms
@@ -9,7 +9,7 @@ ms.date: 03/07/2024
 
 ---
 
-# Get started with Azure Advisor
+# Azure Advisor portal basics
 
 Learn how to access Advisor through the Azure portal, get and manage recommendations, and configure Advisor settings.
 

articles/advisor/advisor-get-started.md

@@ -1,12 +1,12 @@
 ---
-title: Optimize Azure workloads by using Advisor score
+title: Use Advisor score
 description: Use Azure Advisor score to get the most out of Azure.
 ms.topic: article
 ms.date: 09/09/2020
 
 ---
 
-# Optimize Azure workloads by using Advisor score
+# Use Advisor score
 
 ## Introduction to Advisor score
 

articles/advisor/azure-advisor-score.md

@@ -0,0 +1,50 @@
+---
+ms.service: advisor
+ms.topic: include
+ms.date: 07/07/2022
+author: ikhapova
+ms.author: ikhapova
+---
+
+### Get cost savings summary from Azure Advisor
+
+This query summarizes the cost savings of each [Azure Advisor](../advisor-overview.md) recommendation.
+
+```kusto
+AdvisorResources
+| where type == 'microsoft.advisor/recommendations'
+| where properties.category == 'Cost'
+| extend
+  resources = tostring(properties.resourceMetadata.resourceId),
+  savings = todouble(properties.extendedProperties.savingsAmount),
+  solution = tostring(properties.shortDescription.solution),
+  currency = tostring(properties.extendedProperties.savingsCurrency)
+| summarize
+  dcount(resources),
+  bin(sum(savings), 0.01)
+  by solution, currency
+| project solution, dcount_resources, sum_savings, currency
+| order by sum_savings desc
+```
+
+# [Azure CLI](#tab/azure-cli)
+
+```azurecli-interactive
+az graph query -q "AdvisorResources | where type == 'microsoft.advisor/recommendations' | where properties.category == 'Cost' | extend resources = tostring(properties.resourceMetadata.resourceId), savings = todouble(properties.extendedProperties.savingsAmount), solution = tostring(properties.shortDescription.solution), currency = tostring(properties.extendedProperties.savingsCurrency) | summarize dcount(resources), bin(sum(savings), 0.01) by solution, currency | project solution, dcount_resources, sum_savings, currency | order by sum_savings desc"
+```
+
+# [Azure PowerShell](#tab/azure-powershell)
+
+```azurepowershell-interactive
+Search-AzGraph -Query "AdvisorResources | where type == 'microsoft.advisor/recommendations' | where properties.category == 'Cost' | extend resources = tostring(properties.resourceMetadata.resourceId), savings = todouble(properties.extendedProperties.savingsAmount), solution = tostring(properties.shortDescription.solution), currency = tostring(properties.extendedProperties.savingsCurrency) | summarize dcount(resources), bin(sum(savings), 0.01) by solution, currency | project solution, dcount_resources, sum_savings, currency | order by sum_savings desc"
+```
+
+# [Portal](#tab/azure-portal)
+
+
+
+- Azure portal: <a href="https://portal.azure.com/?feature.customportal=false#blade/HubsExtension/ArgQueryBlade/query/AdvisorResources%0a%7c%20where%20type%20%3d%3d%20%27microsoft.advisor%2frecommendations%27%0a%7c%20where%20properties.category%20%3d%3d%20%27Cost%27%0a%7c%20extend%0a%09resources%20%3d%20tostring(properties.resourceMetadata.resourceId)%2c%0a%09savings%20%3d%20todouble(properties.extendedProperties.savingsAmount)%2c%0a%09solution%20%3d%20tostring(properties.shortDescription.solution)%2c%0a%09currency%20%3d%20tostring(properties.extendedProperties.savingsCurrency)%0a%7c%20summarize%0a%09dcount(resources)%2c%0a%09bin(sum(savings)%2c%200.01)%0a%09by%20solution%2c%20currency%0a%7c%20project%20solution%2c%20dcount_resources%2c%20sum_savings%2c%20currency%0a%7c%20order%20by%20sum_savings%20desc" target="_blank">portal.azure.com</a>
+- Azure Government portal: <a href="https://portal.azure.us/?feature.customportal=false#blade/HubsExtension/ArgQueryBlade/query/AdvisorResources%0a%7c%20where%20type%20%3d%3d%20%27microsoft.advisor%2frecommendations%27%0a%7c%20where%20properties.category%20%3d%3d%20%27Cost%27%0a%7c%20extend%0a%09resources%20%3d%20tostring(properties.resourceMetadata.resourceId)%2c%0a%09savings%20%3d%20todouble(properties.extendedProperties.savingsAmount)%2c%0a%09solution%20%3d%20tostring(properties.shortDescription.solution)%2c%0a%09currency%20%3d%20tostring(properties.extendedProperties.savingsCurrency)%0a%7c%20summarize%0a%09dcount(resources)%2c%0a%09bin(sum(savings)%2c%200.01)%0a%09by%20solution%2c%20currency%0a%7c%20project%20solution%2c%20dcount_resources%2c%20sum_savings%2c%20currency%0a%7c%20order%20by%20sum_savings%20desc" target="_blank">portal.azure.us</a>
+- Microsoft Azure operated by 21Vianet portal: <a href="https://portal.azure.cn/?feature.customportal=false#blade/HubsExtension/ArgQueryBlade/query/AdvisorResources%0a%7c%20where%20type%20%3d%3d%20%27microsoft.advisor%2frecommendations%27%0a%7c%20where%20properties.category%20%3d%3d%20%27Cost%27%0a%7c%20extend%0a%09resources%20%3d%20tostring(properties.resourceMetadata.resourceId)%2c%0a%09savings%20%3d%20todouble(properties.extendedProperties.savingsAmount)%2c%0a%09solution%20%3d%20tostring(properties.shortDescription.solution)%2c%0a%09currency%20%3d%20tostring(properties.extendedProperties.savingsCurrency)%0a%7c%20summarize%0a%09dcount(resources)%2c%0a%09bin(sum(savings)%2c%200.01)%0a%09by%20solution%2c%20currency%0a%7c%20project%20solution%2c%20dcount_resources%2c%20sum_savings%2c%20currency%0a%7c%20order%20by%20sum_savings%20desc" target="_blank">portal.azure.cn</a>
+
+---

articles/advisor/includes/azure-advisor.md

@@ -1,11 +1,11 @@
 ---
-title: Permissions in Azure Advisor 
+title: Roles and permissions 
 description: Advisor permissions and how they may block your ability to configure subscriptions or postpone or dismiss recommendations.
 ms.topic: article
-ms.date: 04/03/2019
+ms.date: 05/03/2024
 ---
 
-# Permissions in Azure Advisor
+# Roles and permissions
 
 Azure Advisor provides recommendations based on the usage and configuration of your Azure resources and subscriptions. Advisor uses the [built-in roles](../role-based-access-control/built-in-roles.md) provided by [Azure role-based access control (Azure RBAC)](../role-based-access-control/overview.md) to manage your access to recommendations and Advisor features. 
 

articles/advisor/permissions.md

@@ -7,15 +7,13 @@ ms.custom: subject-resourcegraph-sample
 ---
 # Azure Resource Graph sample queries for Azure Advisor
 
-This page is a collection of [Azure Resource Graph](../governance/resource-graph/overview.md) sample queries for Azure Advisor. For a complete list of Azure Resource Graph samples, see [Resource Graph samples by Category](../governance/resource-graph/samples/samples-by-category.md) and [Resource Graph samples by Table](../governance/resource-graph/samples/samples-by-table.md).
+This page is a collection of [Azure Resource Graph](../governance/resource-graph/overview.md) sample queries for Azure Advisor. 
 
 ## Sample queries
 
-[!INCLUDE [azure-resource-graph-samples-cat-advisor](../../includes/resource-graph/samples/bycat/azure-advisor.md)]
+[!INCLUDE [azure-resource-graph-samples-cat-advisor](./includes/azure-advisor.md)]
 
 ## Next steps
 
 - Learn more about the [query language](../governance/resource-graph/concepts/query-language.md).
 - Learn more about how to [explore resources](../governance/resource-graph/concepts/explore-resources.md).
-- See samples of [Starter language queries](../governance/resource-graph/samples/starter.md).
-- See samples of [Advanced language queries](../governance/resource-graph/samples/advanced.md).