Merge branch 'Azure:main' into DeploymentStacks

Author: Xynoclafe

.azure-pipelines/daily-build.yml

@@ -1,8 +1,8 @@
 # Please don't use ADO UI defined scheduled triggers because it takes precedence over YAML scheduled triggers.
 # https://docs.microsoft.com/en-us/azure/devops/pipelines/process/scheduled-triggers
 schedules:
-- cron: "0 0 * * *"
-  displayName: Daily Midnight Build
+- cron: "0 18 * * *"
+  displayName: 2:00 AM (UTC + 8:00) China Daily Build
   branches:
     include:
     - main
@@ -153,4 +153,4 @@ jobs:
     inputs:
       artifactName: artifacts
       targetPath: artifacts
-    condition: succeededOrFailed()
+    condition: succeededOrFailed()

src/Compute/Compute/help/Add-AzVMSecret.md

@@ -19,35 +19,19 @@ Add-AzVMSecret [-VM] <PSVirtualMachine> [[-SourceVaultId] <String>] [[-Certifica
 ```
 
 ## DESCRIPTION
+
 The **Add-AzVMSecret** cmdlet adds a secret to a virtual machine.
 This value lets you add a certificate to the virtual machine.
 The secret must be stored in a Key Vault.
 For more information about Key Vault, see [What is Azure Key Vault?](https://azure.microsoft.com/en-us/documentation/articles/key-vault-whatis/).
 For more information about the cmdlets, see [Azure Key Vault Cmdlets](/powershell/module/az.keyvault) or the [Set-AzKeyVaultSecret](/powershell/module/az.keyvault/set-azkeyvaultsecret) cmdlet.
 
-## EXAMPLES
-
-### Example 1: Add a secret to a virtual machine using the Azure Key Vault virtul machine extension
-To install certificates on a virtual machine it is recommended to use the [Azure Key Vault virtual machine extension for Linux](https://docs.microsoft.com/azure/virtual-machines/extensions/key-vault-linux) or the [Azure Key Vault virtual machine extension for Windows](https://docs.microsoft.com/azure/virtual-machines/extensions/key-vault-windows).
+> [!NOTE] 
+> To install certificates on a virtual machine it is recommended to use the [Azure Key Vault virtual machine extension for Linux](https://docs.microsoft.com/azure/virtual-machines/extensions/key-vault-linux) or the [Azure Key Vault virtual machine extension for Windows](https://docs.microsoft.com/azure/virtual-machines/extensions/key-vault-windows) instead of `Add-AzVMSecret`.
 
-```powershell
-# Build settings
-PS C:\> $settings = @{
-    secretsManagementSettings = @{
-        pollingIntervalInS       = "<pollingInterval>"
-        certificateStoreName     = "<certStoreName>"
-        certificateStoreLocation = "<certStoreLoc>"
-        observedCertificates     = @("<observedCert1>", "<observedCert2>")
-    } 
-} | ConvertTo-Json
-PS C:\> $extName =  "KeyVaultForLinux"
-PS C:\> $extPublisher = "Microsoft.Azure.KeyVault"
-PS C:\> $extType = "KeyVaultForLinux"
-# Start the deployment
-PS C:\> Set-AzVmExtension -TypeHandlerVersion "2.0" -ResourceGroupName <ResourceGroupName> -Location <Location> -VMName <VMName> -Name $extName -Publisher $extPublisher -Type $extType -SettingString $settings
-```
+## EXAMPLES
 
-### Example 2: Add a secret to a virtual machine using Add-AzVMSecret
+### Example: Add a secret to a virtual machine using Add-AzVMSecret
 ```powershell
 PS C:\> $VirtualMachine = New-AzVMConfig -VMName "VirtualMachine07" -VMSize "Standard_A1" -AvailabilitySetID $AvailabilitySet.Id
 PS C:\> $Credential = Get-Credential

src/DataFactory/DataFactoryV2.Test/DataFactoryV2.Test.csproj

@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.DataFactory" Version="4.20.0" />
+    <PackageReference Include="Microsoft.Azure.Management.DataFactory" Version="4.21.0" />
     <PackageReference Include="Microsoft.DataTransfer.Gateway.Encryption" Version="4.14.7587.7" />
   </ItemGroup>
 

src/DataFactory/DataFactoryV2/Changelog.md

@@ -18,7 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
-* Updated ADF .Net SDK version to 4.20.0
+* Updated ADF .Net SDK version to 4.21.0
 
 ## Version 1.13.0
 * Added Customer Managed Key Encryption to DataFactory

src/DataFactory/DataFactoryV2/DataFactoryV2.csproj

@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.DataFactory" Version="4.20.0" />
+    <PackageReference Include="Microsoft.Azure.Management.DataFactory" Version="4.21.0" />
     <PackageReference Include="Microsoft.DataTransfer.Gateway.Encryption" Version="4.14.7587.7" />
   </ItemGroup>
 

src/HDInsight/HDInsight/help/Az.HDInsight.md

@@ -36,13 +36,13 @@ Adds an Azure Storage key to a cluster configuration object.
 Disables Azure Monitor in a specified HDInsight cluster.
 
 ### [Disable-AzHDInsightMonitoring](Disable-AzHDInsightMonitoring.md)
-Disables monitoring in a HDInsight cluster and relevant logs will stop flowing to the monitoring workspace specified during enable.
+Disables the Classic Azure Monitor logs integration on an HDInsight cluster and relevant logs will stop flowing to the monitoring workspace specified during enable.
 
 ### [Enable-AzHDInsightAzureMonitor](Enable-AzHDInsightAzureMonitor.md)
 Enables Azure Monitor in a specified HDInsight cluster.
 
 ### [Enable-AzHDInsightMonitoring](Enable-AzHDInsightMonitoring.md)
-Enables monitoring in a HDInsight cluster and relevant logs will be sent to the monitoring workspace specified during enable.
+Enables the Classic Azure Monitor logs integration on an HDInsight cluster and relevant logs will be sent to the monitoring workspace specified during enable.
 
 ### [Get-AzHDInsightAzureMonitor](Get-AzHDInsightAzureMonitor.md)
 Gets the azure monitor status of a specified HDInsight cluster.
@@ -63,7 +63,7 @@ Gets the list of jobs from a cluster and lists them in reverse chronological ord
 Gets the log output for a job from the storage account associated with a specified cluster.
 
 ### [Get-AzHDInsightMonitoring](Get-AzHDInsightMonitoring.md)
-Gets the status of monitoring installation on the cluster.
+Gets the status of the Classic Azure Monitor logs integration on an HDInsight cluster.
 
 ### [Get-AzHDInsightPersistedScriptAction](Get-AzHDInsightPersistedScriptAction.md)
 Gets the persisted script actions for a cluster and lists them in chronological order, or gets details for a specified persisted script action.

src/HDInsight/HDInsight/help/Disable-AzHDInsightMonitoring.md

@@ -8,7 +8,7 @@ schema: 2.0.0
 # Disable-AzHDInsightMonitoring
 
 ## SYNOPSIS
-Disables monitoring in a HDInsight cluster and relevant logs will stop flowing to the monitoring workspace specified during enable.
+Disables the Classic Azure Monitor logs integration on an HDInsight cluster and relevant logs will stop flowing to the monitoring workspace specified during enable.
 
 ## SYNTAX
 
@@ -18,7 +18,7 @@ Disable-AzHDInsightMonitoring [-Name] <String> [-ResourceGroupName <String>]
 ```
 
 ## DESCRIPTION
-The **Disable-AzHDInsightMonitoring** cmdlet disables monitoring in a Azure HDInsight cluster.
+The **Disable-AzHDInsightMonitoring** cmdlet disables the Classic Azure Monitor logs integration on an HDInsight cluster.
 
 ## EXAMPLES
 

src/HDInsight/HDInsight/help/Enable-AzHDInsightMonitoring.md

@@ -8,7 +8,7 @@ schema: 2.0.0
 # Enable-AzHDInsightMonitoring
 
 ## SYNOPSIS
-Enables monitoring in a HDInsight cluster and relevant logs will be sent to the monitoring workspace specified during enable.
+Enables the Classic Azure Monitor logs integration on an HDInsight cluster and relevant logs will be sent to the monitoring workspace specified during enable.
 
 ## SYNTAX
 
@@ -19,7 +19,7 @@ Enable-AzHDInsightMonitoring [-Name] <String> [-WorkspaceId] <String> [-PrimaryK
 ```
 
 ## DESCRIPTION
-The **Enable-AzHDInsightMonitoring** cmdlet enables monitoring in a Azure HDInsight cluster.
+The **Enable-AzHDInsightMonitoring** cmdlet enables the Classic Azure Monitor logs integration on an HDInsight cluster.
 
 ## EXAMPLES
 

src/HDInsight/HDInsight/help/Get-AzHDInsightMonitoring.md

@@ -8,7 +8,7 @@ schema: 2.0.0
 # Get-AzHDInsightMonitoring
 
 ## SYNOPSIS
-Gets the status of monitoring installation on the cluster.
+Gets the status of the Classic Azure Monitor logs integration on an HDInsight cluster.
 
 ## SYNTAX
 
@@ -18,7 +18,7 @@ Get-AzHDInsightMonitoring [-Name] <String> [-ResourceGroupName <String>]
 ```
 
 ## DESCRIPTION
-The **Get-AzHDInsightMonitoring** cmdlet gets the status of monitoring installation in an Azure HDInsight cluster. If monitoring is enabled then it will also return the log analytics workspace id.
+The **Get-AzHDInsightMonitoring** cmdlet gets the status of the Classic Azure Monitor logs integration on an HDInsight cluster. If monitoring is enabled then it will also return the log analytics workspace id.
 
 ## EXAMPLES