Merge pull request #209852 from MicrosoftDocs/repo_sync_working_branch

Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)

Author: huypub

articles/active-directory-b2c/enable-authentication-web-api.md

@@ -443,7 +443,7 @@ Under the project root folder, create a *config.json* file, and then add to it t
 ```json
 {
     "credentials": {
-        "tenantName": "<your-tenant-name>",
+        "tenantName": "<your-tenant-name>.onmicrosoft.com",
         "clientID": "<your-webapi-application-ID>",
         "issuer": "https://<your-tenant-name>.b2clogin.com/<your-tenant-ID>/v2.0/"
     },
@@ -470,7 +470,7 @@ In the *config.json* file, update the following properties:
 
 |Section  |Key  |Value  |
 |---------|---------|---------|
-| credentials | tenantName | The first part of your Azure AD B2C [tenant name](tenant-management.md#get-your-tenant-name) (for example, `contoso`).|
+| credentials | tenantName | Your Azure AD B2C [tenant name/domain name](tenant-management.md#get-your-tenant-name) (for example, `contoso.onmicrosoft.com`).|
 | credentials |clientID | The web API application ID. In the [preceding diagram](#app-registration-overview), it's the application with *App ID: 2*. To learn how to get your web API application registration ID, see [Prerequisites](#prerequisites). |
 | credentials | issuer| The token issuer `iss` claim value. By default, Azure AD B2C returns the token in the following format: `https://<your-tenant-name>.b2clogin.com/<your-tenant-ID>/v2.0/`. Replace `<your-tenant-name>` with the first part of your Azure AD B2C [tenant name](tenant-management.md#get-your-tenant-name). Replace `<your-tenant-ID>` with your [Azure AD B2C tenant ID](tenant-management.md#get-your-tenant-id). |
 | policies | policyName | The user flows, or custom policy. To learn how to get your user flow or policy, see [Prerequisites](#prerequisites).|

articles/automanage/tutorial-create-assignment-python.md

@@ -130,7 +130,7 @@ client.configuration_profile_assignments.create_or_update(
     "default", rg, vm, assignment)
 ```
 
-Run the python file: 
+Run the Python file: 
 
 `python app.py`
 

articles/azure-cache-for-redis/cache-troubleshoot-timeouts.md

@@ -50,7 +50,7 @@ Monitor how your `ThreadPool` statistics change over time using [an example `Thr
 In the preceding exception, there are several issues that are interesting:
 
 - Notice that in the `IOCP` section and the `WORKER` section you have a `Busy` value that is greater than the `Min` value. This difference means your `ThreadPool` settings need adjusting.
-- You can also see `in: 64221`. This value indicates that 64,211 bytes have been received at the client's kernel socket layer but haven't been read by the application. This difference typically means that your application (for example, StackExchange.Redis) isn't reading data from the network as quickly as the server is sending it to you.
+- You can also see `in: 64221`. This value indicates that 64,221 bytes have been received at the client's kernel socket layer but haven't been read by the application. This difference typically means that your application (for example, StackExchange.Redis) isn't reading data from the network as quickly as the server is sending it to you.
 
 You can [configure your `ThreadPool` Settings](cache-management-faq.yml#important-details-about-threadpool-growth) to make sure that your thread pool scales up quickly under burst scenarios.
 

articles/azure-resource-manager/bicep/deploy-what-if.md

@@ -407,7 +407,7 @@ You can use the what-if operation through the Azure SDKs.
 
 * For Python, use [what-if](/python/api/azure-mgmt-resource/azure.mgmt.resource.resources.v2019_10_01.operations.deploymentsoperations#what-if-resource-group-name--deployment-name--properties--location-none--custom-headers-none--raw-false--polling-true----operation-config-).
 
-* For Java, use [DeploymentWhatIf Class](/java/api/com.microsoft.azure.management.resources.deploymentwhatif).
+* For Java, use [DeploymentWhatIf Class](/java/api/com.azure.resourcemanager.resources.models.deploymentwhatif).
 
 * For .NET, use [DeploymentWhatIf Class](/dotnet/api/microsoft.azure.management.resourcemanager.models.deploymentwhatif).
 

articles/container-instances/container-instances-managed-identity.md

@@ -102,7 +102,7 @@ spID=$(az identity show \
 resourceID=$(az identity show \
   --resource-group myResourceGroup \
   --name myACIId \
-  --query id --output none)
+  --query id --output tsv)
 ```
 
 ### Grant user-assigned identity access to the key vault
@@ -172,7 +172,7 @@ az container exec \
 Run the following commands in the bash shell in the container. To get an access token to use Azure Active Directory to authenticate to key vault, run the following command:
 
 ```bash
-client_id="CLIENT ID (xxxxxxxx-5523-45fc-9f49-xxxxxxxxxxxx)"
+client_id="xxxxxxxx-5523-45fc-9f49-xxxxxxxxxxxx"
 curl "http://169.254.169.254/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https%3A%2F%2Fvault.azure.net&client_id=$client_id" -H Metadata:true -s
 ```
 

articles/hdinsight/hdinsight-hadoop-customize-cluster-bootstrap.md

@@ -54,22 +54,22 @@ The following PowerShell code customizes an [Apache Hive](https://hive.apache.or
 $hiveConfigValues = @{ "hive.metastore.client.socket.timeout"="90s" }
 
 $config = New-AzHDInsightClusterConfig `
+         -ClusterType "Spark"  `
     | Set-AzHDInsightDefaultStorage `
-        -StorageAccountName "$defaultStorageAccountName.blob.core.windows.net" `
+        -StorageAccountResourceId "$storageAccountResourceId" `
         -StorageAccountKey $defaultStorageAccountKey `
     | Add-AzHDInsightConfigValue `
         -HiveSite $hiveConfigValues `
         -Spark2Defaults @{}
 
 New-AzHDInsightCluster `
-    -ResourceGroupName $existingResourceGroupName `
-    -ClusterName $clusterName `
+    -ResourceGroupName $resourceGroupName `
+    -ClusterName $hdinsightClusterName `
     -Location $location `
-    -ClusterSizeInNodes $clusterSizeInNodes `
-    -ClusterType Hadoop `
-    -OSType Linux `
-    -Version "3.6" `
+    -ClusterSizeInNodes 2 `
+    -Version "4.0" `
     -HttpCredential $httpCredential `
+    -SshCredential $sshCredential `
     -Config $config
 ```
 
@@ -143,60 +143,45 @@ This PowerShell script creates an HDInsight cluster and customizes a Hive settin
 
 ```powershell
 ####################################
-# Set these variables
+# Service names and variables
 ####################################
-#region - used for creating Azure service names
-$nameToken = "<ENTER AN ALIAS>"
-#endregion
-
-#region - cluster user accounts
-$httpUserName = "admin"  #HDInsight cluster username
-$httpPassword = '<ENTER A PASSWORD>'
-
-$sshUserName = "sshuser" #HDInsight ssh user name
-$sshPassword = '<ENTER A PASSWORD>'
-#endregion
 
-####################################
-# Service names and varialbes
-####################################
-#region - service names
+$nameToken = "<ENTER AN ALIAS>"
 $namePrefix = $nameToken.ToLower() + (Get-Date -Format "MMdd")
-
 $resourceGroupName = $namePrefix + "rg"
 $hdinsightClusterName = $namePrefix + "hdi"
 $defaultStorageAccountName = $namePrefix + "store"
 $defaultBlobContainerName = $hdinsightClusterName
-
 $location = "East US"
-#endregion
-
 
 ####################################
 # Connect to Azure
 ####################################
-#region - Connect to Azure subscription
-Write-Host "`nConnecting to your Azure subscription ..." -ForegroundColor Green
+
+Write-Host "Connecting to your Azure subscription ..." -ForegroundColor Green
 $sub = Get-AzSubscription -ErrorAction SilentlyContinue
 if(-not($sub))
 {
     Connect-AzAccount
 }
 
 # If you have multiple subscriptions, set the one to use
-# Select-AzSubscription -SubscriptionId "<SUBSCRIPTIONID>"
-
-#endregion
+#$context = Get-AzSubscription -SubscriptionId "<subscriptionID>"
+#Set-AzContext $context
 
-#region - Create an HDInsight cluster
 ####################################
-# Create dependent components
+# Create a resource group
 ####################################
+
 Write-Host "Creating a resource group ..." -ForegroundColor Green
 New-AzResourceGroup `
     -Name  $resourceGroupName `
     -Location $location
 
+####################################
+# Create a storage account and container
+####################################
+	
 Write-Host "Creating the default storage account and default blob container ..."  -ForegroundColor Green
 New-AzStorageAccount `
     -ResourceGroupName $resourceGroupName `
@@ -205,60 +190,74 @@ New-AzStorageAccount `
     -SkuName Standard_LRS `
     -Kind StorageV2 `
     -EnableHttpsTrafficOnly 1
-
-# Note: Storage account kind BlobStorage cannot be used as primary storage.
-
+	
 $defaultStorageAccountKey = (Get-AzStorageAccountKey `
                                 -ResourceGroupName $resourceGroupName `
                                 -Name $defaultStorageAccountName)[0].Value
 
 $defaultStorageContext = New-AzStorageContext `
                                 -StorageAccountName $defaultStorageAccountName `
                                 -StorageAccountKey $defaultStorageAccountKey
-
+								
 New-AzStorageContainer `
     -Name $defaultBlobContainerName `
     -Context $defaultStorageContext #use the cluster name as the container name
 
 ####################################
 # Create a configuration object
 ####################################
+
 $hiveConfigValues = @{"hive.metastore.client.socket.timeout"="90s"}
+$storageAccountResourceId = (Get-AzStorageAccount -ResourceGroupName $resourceGroupName ` -Name $defaultStorageAccountName).Id
 
 $config = New-AzHDInsightClusterConfig `
+          -ClusterType "Spark"  `
     | Set-AzHDInsightDefaultStorage `
-        -StorageAccountName "$defaultStorageAccountName.blob.core.windows.net" `
+        -StorageAccountResourceId "$storageAccountResourceId" `
         -StorageAccountKey $defaultStorageAccountKey `
     | Add-AzHDInsightConfigValue `
         -HiveSite $hiveConfigValues `
-        -Spark2Defaults @{}
-
+		-Spark2Defaults @{}
+		
 ####################################
-# Create an HDInsight cluster
+# Set Ambari admin username/password
 ####################################
+
+$httpUserName = "admin"  #HDInsight cluster username
+$httpPassword = '<ENTER A PASSWORD>'
+
 $httpPW = ConvertTo-SecureString -String $httpPassword -AsPlainText -Force
 $httpCredential = New-Object System.Management.Automation.PSCredential($httpUserName,$httpPW)
 
+####################################
+# Set ssh username/password
+####################################
+
+$sshUserName = "sshuser" #HDInsight ssh user name
+$sshPassword = '<ENTER A PASSWORD>'
+
 $sshPW = ConvertTo-SecureString -String $sshPassword -AsPlainText -Force
 $sshCredential = New-Object System.Management.Automation.PSCredential($sshUserName,$sshPW)
 
+####################################
+# Create an HDInsight cluster
+####################################
+
 New-AzHDInsightCluster `
     -ResourceGroupName $resourceGroupName `
     -ClusterName $hdinsightClusterName `
     -Location $location `
-    -ClusterSizeInNodes 1 `
-    -ClusterType Hadoop `
-    -OSType Linux `
-    -Version "3.6" `
+    -ClusterSizeInNodes 2 `
+    -Version "4.0" `
     -HttpCredential $httpCredential `
     -SshCredential $sshCredential `
     -Config $config
-
+	
 ####################################
 # Verify the cluster
 ####################################
+
 Get-AzHDInsightCluster `
     -ClusterName $hdinsightClusterName
-
-#endregion
+    
 ```

articles/key-vault/general/client-libraries.md

@@ -26,7 +26,7 @@ Each SDK has separate client libraries for key vault, secrets, keys, and certifi
 |--|--|--|--|--|
 | .NET | - [API Reference](/dotnet/api/azure.security.keyvault.secrets)<br>- [NuGet package](https://www.nuget.org/packages/Azure.Security.KeyVault.Secrets/)<br>- [Library source code](https://github.com/Azure/azure-sdk-for-net/tree/master/sdk/keyvault/Azure.Security.KeyVault.Secrets)<br>- [Quickstart](../secrets/quick-create-net.md) | - [API Reference](/dotnet/api/azure.security.keyvault.keys)<br>- [NuGet package](https://www.nuget.org/packages/Azure.Security.KeyVault.Keys/)<br>- [Library source code](https://github.com/Azure/azure-sdk-for-net/tree/master/sdk/keyvault/Azure.Security.KeyVault.Keys)<br>- [Quickstart](../keys/quick-create-net.md) | - [API Reference](/dotnet/api/azure.security.keyvault.certificates)<br>- [NuGet package](https://www.nuget.org/packages/Azure.Security.KeyVault.Certificates/)<br>- [Library source code](https://github.com/Azure/azure-sdk-for-net/tree/master/sdk/keyvault/Azure.Security.KeyVault.Certificates)<br>- [Quickstart](../certificates/quick-create-net.md) | - [API Reference](/dotnet/api/microsoft.azure.management.keyvault)<br>- [NuGet Package](https://www.nuget.org/packages/Microsoft.Azure.Management.KeyVault/)<br> - [Library source code](https://github.com/Azure/azure-sdk-for-net/tree/master/sdk/keyvault/Microsoft.Azure.Management.KeyVault)|
 | Python| - [API Reference](/python/api/overview/azure/keyvault-secrets-readme)<br>- [PyPi package](https://pypi.org/project/azure-keyvault-secrets/)<br>- [Library source code](https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/keyvault/azure-keyvault-secrets)<br>- [Quickstart](../secrets/quick-create-python.md) |- [API Reference](/python/api/overview/azure/keyvault-keys-readme)<br>- [PyPi package](https://pypi.org/project/azure-keyvault-keys/)<br>- [Library source code](https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/keyvault/azure-keyvault-keys)<br>- [Quickstart](../keys/quick-create-python.md) | - [API Reference](/python/api/overview/azure/keyvault-certificates-readme)<br>- [PyPi package](https://pypi.org/project/azure-keyvault-certificates/)<br>- [Library source code](https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/keyvault/azure-keyvault-certificates)<br>- [Quickstart](../certificates/quick-create-python.md) | - [API Reference](/python/api/azure-mgmt-keyvault/azure.mgmt.keyvault)<br> - [PyPi package](https://pypi.org/project/azure-mgmt-keyvault/)<br> - [Library source code](https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/keyvault/azure-mgmt-keyvault)|
-| Java | - [API Reference](https://azuresdkdocs.blob.core.windows.net/$web/java/azure-security-keyvault-secrets/4.2.0/index.html)<br>- [Library source code](https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/keyvault/azure-security-keyvault-secrets)<br>- [Quickstart](../secrets/quick-create-java.md) |- [API Reference](https://azuresdkdocs.blob.core.windows.net/$web/java/azure-security-keyvault-keys/4.2.0/index.html)<br>- [Library source code](https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/keyvault/azure-security-keyvault-keys)<br>- [Quickstart](../keys/quick-create-java.md) | - [API Reference](https://azuresdkdocs.blob.core.windows.net/$web/java/azure-security-keyvault-certificates/4.1.0/index.html)<br>- [Library source code](https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/keyvault/azure-security-keyvault-certificates)<br>- [Quickstart](../certificates/quick-create-java.md) |- [API Reference](/java/api/com.microsoft.azure.management.keyvault)<br>- [Library source code](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/keyvault/microsoft-azure-keyvault)|
+| Java | - [API Reference](https://azuresdkdocs.blob.core.windows.net/$web/java/azure-security-keyvault-secrets/4.2.0/index.html)<br>- [Library source code](https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/keyvault/azure-security-keyvault-secrets)<br>- [Quickstart](../secrets/quick-create-java.md) |- [API Reference](https://azuresdkdocs.blob.core.windows.net/$web/java/azure-security-keyvault-keys/4.2.0/index.html)<br>- [Library source code](https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/keyvault/azure-security-keyvault-keys)<br>- [Quickstart](../keys/quick-create-java.md) | - [API Reference](https://azuresdkdocs.blob.core.windows.net/$web/java/azure-security-keyvault-certificates/4.1.0/index.html)<br>- [Library source code](https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/keyvault/azure-security-keyvault-certificates)<br>- [Quickstart](../certificates/quick-create-java.md) |- [API Reference](/java/api/overview/azure/resourcemanager-keyvault-readme?view=azure-java-stable)<br>- [Library source code](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/resourcemanager/azure-resourcemanager-keyvault)|
 | Spring | - [Reference](/azure/developer/java/spring-framework/spring-cloud-azure?tabs=maven#secret-management)<br>- [Library source code](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/spring)<br>- [Quickstart](/azure/developer/java/spring-framework/configure-spring-boot-starter-java-app-with-azure-key-vault) | | - [Reference](/azure/developer/java/spring-framework/spring-cloud-azure-appendix#azure-key-vault-certificates-properties)<br>- [Library source code](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/spring)<br>- [Quickstart](/azure/developer/java/spring-framework/configure-spring-boot-starter-java-app-with-azure-key-vault-certificates) | |
 | Node.js | - [API Reference](/javascript/api/@azure/keyvault-secrets/)<br>- [npm package](https://www.npmjs.com/package/@azure/keyvault-secrets)<br>- [Library source code](https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/keyvault/keyvault-secrets)<br>- [Quickstart](../secrets/quick-create-node.md) |- [API Reference](/javascript/api/@azure/keyvault-keys/)<br>- [npm package](https://www.npmjs.com/package/@azure/keyvault-keys)<br>- [Library source code](https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/keyvault/keyvault-keys)<br>- [Quickstart](../keys/quick-create-node.md)| - [API Reference](/javascript/api/@azure/keyvault-certificates/)<br>- [npm package](https://www.npmjs.com/package/@azure/keyvault-certificates)<br>- [Library source code](https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/keyvault/keyvault-certificates)<br>- [Quickstart](../certificates/quick-create-node.md) |  - [API Reference](/javascript/api/@azure/arm-keyvault/)<br>- [npm package](https://www.npmjs.com/package/@azure/arm-keyvault)<br>- [Library source code](https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/keyvault/arm-keyvault)
 

articles/key-vault/general/developers-guide.md

@@ -37,7 +37,7 @@ You can use the predefined Key Vault Contributor role to grant management access
 
 | Azure CLI | PowerShell | REST API | Resource Manager | .NET | Python | Java | JavaScript |  
 |--|--|--|--|--|--|--|--|
-|[Reference](/cli/azure/keyvault)<br>[Quickstart](quick-create-cli.md)|[Reference](/powershell/module/az.keyvault)<br>[Quickstart](quick-create-powershell.md)|[Reference](/rest/api/keyvault/)|[Reference](/azure/templates/microsoft.keyvault/vaults)<br>[Quickstart](./vault-create-template.md)|[Reference](/dotnet/api/microsoft.azure.management.keyvault)|[Reference](/python/api/azure-mgmt-keyvault/azure.mgmt.keyvault)|[Reference](/java/api/com.microsoft.azure.management.keyvault)|[Reference](/javascript/api/@azure/arm-keyvault)|
+|[Reference](/cli/azure/keyvault)<br>[Quickstart](quick-create-cli.md)|[Reference](/powershell/module/az.keyvault)<br>[Quickstart](quick-create-powershell.md)|[Reference](/rest/api/keyvault/)|[Reference](/azure/templates/microsoft.keyvault/vaults)<br>[Quickstart](./vault-create-template.md)|[Reference](/dotnet/api/microsoft.azure.management.keyvault)|[Reference](/python/api/azure-mgmt-keyvault/azure.mgmt.keyvault)|[Reference](/java/api/overview/azure/resourcemanager-keyvault-readme?view=azure-java-stable)|[Reference](/javascript/api/@azure/arm-keyvault)|
 
 For installation packages and source code, see [Client libraries](client-libraries.md).
 

articles/key-vault/general/monitor-key-vault.md

@@ -168,7 +168,7 @@ Here are some queries that you can enter into the **Log search** bar to help you
     AzureDiagnostics
     | where TimeGenerated > ago(30d) // Time range specified in the query. Overrides time picker in portal.
     | where ResourceProvider =="MICROSOFT.KEYVAULT" 
-    | where OperationName == "VaultPut" or OperationName = "VaultPatch"
+    | where OperationName == "VaultPut" or OperationName == "VaultPatch"
     | sort by TimeGenerated desc
     ```