Merge pull request #252136 from MicrosoftDocs/repo_sync_working_branch

Taojunshen · web-flow · commit 7a50d125b566 · 2023-09-21T00:39:16.000+08:00
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
diff --git a/articles/azure-arc/servers/prepare-extended-security-updates.md b/articles/azure-arc/servers/prepare-extended-security-updates.md
@@ -43,12 +43,12 @@ To prepare for this new offer, you need to plan and prepare to onboard your mach
 We recommend you deploy your machines to Azure Arc in preparation for when the related Azure services deliver supported functionality to manage ESU. Once these machines are onboarded to Azure Arc-enabled servers, you'll have visibility into their ESU coverage and enroll through the Azure portal or using Azure Policy one month before Windows Server 2012 end of support. Billing for this service starts from October 2023, after Windows Server 2012 end of support.
 
 > [!NOTE]
-> In order to purchase ESUs, you must have Software Assurance through Volume Licensing Programs such as an Enterprise Agreement (EA), Enterprise Agreement Subscription (EAS), Enrollment for Education Solutions (EES), or Server and Cloud Enrollment (SCE).
+> In order to purchase ESUs, you must have Software Assurance through Volume Licensing Programs such as an Enterprise Agreement (EA), Enterprise Agreement Subscription (EAS), Enrollment for Education Solutions (EES), or Server and Cloud Enrollment (SCE). Alternatively, if your Windows Server 2012/2012 R2 machines are licensed through SPLA or with a Server Subscription, Software Assurance is not required to purchase ESUs.
 > 
 ## Next steps
 
 * Find out more about [planning for Windows Server and SQL Server end of support](https://www.microsoft.com/en-us/windows-server/extended-security-updates) and [getting Extended Security Updates](/windows-server/get-started/extended-security-updates-deploy).
 
 * Learn about best practices and design patterns through the [Azure Arc landing zone accelerator for hybrid and multicloud](/azure/cloud-adoption-framework/scenarios/hybrid/arc-enabled-servers/eslz-identity-and-access-management).
 * Learn more about [Arc-enabled servers](overview.md) and how they work with Azure through the Azure Connected Machine agent.
-* Explore options for [onboarding your machines](plan-at-scale-deployment.md) to Azure Arc-enabled servers.
+* Explore options for [onboarding your machines](plan-at-scale-deployment.md) to Azure Arc-enabled servers.
diff --git a/articles/azure-monitor/agents/azure-monitor-agent-windows-client.md b/articles/azure-monitor/agents/azure-monitor-agent-windows-client.md
@@ -391,30 +391,46 @@ $requestURL = "https://management.azure.com$RespondId/providers/microsoft.insigh
 
 
 ```
+## Verify successful setup
+Check the ‘Heartbeat’ table (and other tables you configured in the rules) in the Log Analytics workspace that you specified as a destination in the data collection rule(s).
+The `SourceComputerId`, `Computer`, `ComputerIP` columns should all reflect the client device information respectively, and the `Category` column should say 'Azure Monitor Agent'. See example below:
+
+[![Diagram shows agent heartbeat logs on Azure portal.](media/azure-monitor-agent-windows-client/azure-monitor-agent-heartbeat-logs.png)](media/azure-monitor-agent-windows-client/azure-monitor-agent-heartbeat-logs.png)
 
 ### Using PowerShell for offboarding
 ```PowerShell
 #This will remove the monitor object
-$TenantID = "xxxxxxxxx-xxxx-xxx"  #Your Tenant ID
-$SubscriptionID = "xxxxxx-xxxx-xxxxx" #Your Subscription ID
-$ResourceGroup = "rg-yourResourseGroup" #Your resroucegroup
+$TenantID = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"  #Your Tenant ID
 
 Connect-AzAccount -Tenant $TenantID
 
-#Select the subscription
-Select-AzSubscription -SubscriptionId $SubscriptionID
+#Create Auth Token
+$auth = Get-AzAccessToken
 
-#Delete monitored object
+$AuthenticationHeader = @{
+    "Content-Type" = "application/json"
+    "Authorization" = "Bearer " + $auth.Token
+}
+
+#Get Monitored Object
 $requestURL = "https://management.azure.com/providers/Microsoft.Insights/monitoredObjects/$TenantID`?api-version=2021-09-01-preview"
-#Invoke-RestMethod -Uri $requestURL -Headers $AuthenticationHeader -Method Delete
+$MonitoredObject =  Invoke-RestMethod -Uri $requestURL -Headers $AuthenticationHeader -Method Get
 
-```
+#Get Monitored Object Data Collection Rule Associations
+$requestURL = "https://management.azure.com$($MonitoredObject.id)/providers/microsoft.insights/datacollectionruleassociations?api-version=2021-09-01-preview"
+$MonitoredObjectAssociations = Invoke-RestMethod -Uri $requestURL -Headers $AuthenticationHeader -Method Get
 
-## Verify successful setup
-Check the ‘Heartbeat’ table (and other tables you configured in the rules) in the Log Analytics workspace that you specified as a destination in the data collection rule(s).
-The `SourceComputerId`, `Computer`, `ComputerIP` columns should all reflect the client device information respectively, and the `Category` column should say 'Azure Monitor Agent'. See example below:
+#Disassociate from all Data Collection Rule
+foreach ($Association in $MonitoredObjectAssociations.value){
+    $requestURL = "https://management.azure.com$($Association.id)?api-version=2022-06-01"
+    Invoke-RestMethod -Uri $requestURL -Headers $AuthenticationHeader -Method Delete
+}
 
-[![Diagram shows agent heartbeat logs on Azure portal.](media/azure-monitor-agent-windows-client/azure-monitor-agent-heartbeat-logs.png)](media/azure-monitor-agent-windows-client/azure-monitor-agent-heartbeat-logs.png)
+#Delete monitored object
+$requestURL = "https://management.azure.com/providers/Microsoft.Insights/monitoredObjects/$TenantID`?api-version=2021-09-01-preview"
+Invoke-AzRestMethod -Uri $requestURL -Method Delete
+
+```
 
 
 ## Manage the agent
diff --git a/articles/cloud-services/cloud-services-dotnet-install-dotnet.md b/articles/cloud-services/cloud-services-dotnet-install-dotnet.md
@@ -88,18 +88,18 @@ You can use startup tasks to perform operations before a role starts. Installing
    
    ```cmd
    REM Set the value of netfx to install appropriate .NET Framework. 
-   REM ***** To install .NET 4.5.2 set the variable netfx to "NDP452" *****
-   REM ***** To install .NET 4.6 set the variable netfx to "NDP46" *****
+   REM ***** To install .NET 4.5.2 set the variable netfx to "NDP452" ***** https://go.microsoft.com/fwlink/?LinkId=397707
+   REM ***** To install .NET 4.6 set the variable netfx to "NDP46" ***** https://go.microsoft.com/fwlink/?LinkId=528222
    REM ***** To install .NET 4.6.1 set the variable netfx to "NDP461" ***** https://go.microsoft.com/fwlink/?LinkId=671729
-   REM ***** To install .NET 4.6.2 set the variable netfx to "NDP462" ***** https://dotnet.microsoft.com/download/dotnet-framework/net462
-   REM ***** To install .NET 4.7 set the variable netfx to "NDP47" ***** 
+   REM ***** To install .NET 4.6.2 set the variable netfx to "NDP462" ***** https://go.microsoft.com/fwlink/?linkid=780596
+   REM ***** To install .NET 4.7 set the variable netfx to "NDP47" ***** https://go.microsoft.com/fwlink/?LinkId=825298
    REM ***** To install .NET 4.7.1 set the variable netfx to "NDP471" ***** https://go.microsoft.com/fwlink/?LinkId=852095
    REM ***** To install .NET 4.7.2 set the variable netfx to "NDP472" ***** https://go.microsoft.com/fwlink/?LinkId=863262
    REM ***** To install .NET 4.8 set the variable netfx to "NDP48" ***** https://dotnet.microsoft.com/download/thank-you/net48
    REM ***** To install .NET 4.8.1 set the variable netfx to "NDP481" ***** https://go.microsoft.com/fwlink/?linkid=2215256 
-   set netfx="NDP48"
+   set netfx="NDP481"
          
-   REM ***** Set script start timestamp *****
+   REM ***** Set script start timestamp ****
    set timehour=%time:~0,2%
    set timestamp=%date:~-4,4%%date:~-10,2%%date:~-7,2%-%timehour: =0%%time:~3,2%
    set "log=install.cmd started %timestamp%."
@@ -123,46 +123,55 @@ You can use startup tasks to perform operations before a role starts. Installing
    
    set "netfxinstallfile=NDP452-KB2901954-Web.exe"
    set netfxregkey="0x5cbf5"
+   set netfxUrl="https://go.microsoft.com/fwlink/?LinkId=397707"
    goto logtimestamp
    
    :NDP46
    set "netfxinstallfile=NDP46-KB3045560-Web.exe"
    set netfxregkey="0x6004f"
+   set netfxUrl="https://go.microsoft.com/fwlink/?LinkId=528222"
    goto logtimestamp
    
    :NDP461
    set "netfxinstallfile=NDP461-KB3102438-Web.exe"
    set netfxregkey="0x6040e"
+   set netfxUrl="https://go.microsoft.com/fwlink/?LinkId=671729"
    goto logtimestamp
    
    :NDP462
    set "netfxinstallfile=NDP462-KB3151802-Web.exe"
    set netfxregkey="0x60632"
+   set netfxUrl="https://go.microsoft.com/fwlink/?linkid=780596"
    goto logtimestamp
    
    :NDP47
    set "netfxinstallfile=NDP47-KB3186500-Web.exe"
    set netfxregkey="0x707FE"
+   set netfxUrl="https://go.microsoft.com/fwlink/?LinkId=825298"
    goto logtimestamp
    
    :NDP471
    set "netfxinstallfile=NDP471-KB4033344-Web.exe"
    set netfxregkey="0x709fc"
+   set netfxUrl="https://go.microsoft.com/fwlink/?LinkId=852095"
    goto logtimestamp
    
    :NDP472
    set "netfxinstallfile=NDP472-KB4054531-Web.exe"
    set netfxregkey="0x70BF0"
+   set netfxUrl="https://go.microsoft.com/fwlink/?LinkId=863262"
    goto logtimestamp
 
    :NDP48
    set "netfxinstallfile=NDP48-Web.exe"
    set netfxregkey="0x80EA8"
+   set netfxUrl="https://dotnet.microsoft.com/download/thank-you/net48"
    goto logtimestamp
    
    :NDP481
    set "netfxinstallfile=NDP481-Web.exe"
    set netfxregkey="0x82348"
+   set netfxUrl="https://go.microsoft.com/fwlink/?linkid=2215256"
    goto logtimestamp
    
    :logtimestamp
@@ -182,7 +191,26 @@ You can use startup tasks to perform operations before a role starts. Installing
    FOR /F "usebackq skip=2 tokens=1,2*" %%A in (`reg query "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" /v Release 2^>nul`) do @set /A foundkey=%%C
    echo Minimum required key: %netfxregkeydecimal% -- found key: %foundkey% >> %startuptasklog%
    if %foundkey% GEQ %netfxregkeydecimal% goto installed
-   
+
+   REM ***** Downloading .NET Framework Setup *****
+   set retryCount=0
+   set maxRetry=3
+   set delayInSeconds=60
+   echo Downloading .NET Framework %netfx% setup with commandline: powershell -Command "Invoke-WebRequest %netfxUrl% -OutFile %~dp0%netfxinstallfile%" >> %startuptasklog%
+   goto loop
+
+   :loop
+   if %retryCount% NEQ 0 echo %date% %time% : Waiting %delayInSeconds% seconds to retry >> %startuptasklog%
+   if %retryCount% NEQ 0 (powershell -Command "Start-Sleep -Seconds %delayInSeconds%")
+   set /a retryCount=%retryCount%+1
+   echo %date% %time% : Try downloading... [%retryCount% of %maxRetry%] >> %startuptasklog%
+   powershell -Command "Invoke-WebRequest %netfxUrl% -OutFile %~dp0%netfxinstallfile%"
+   if %ERRORLEVEL% NEQ 0 if %retryCount% NEQ %maxRetry% goto loop
+   if %ERRORLEVEL% NEQ 0 if %retryCount%== %maxRetry% echo Taking existing file to install since error occurred while downloading .NET framework %netfx% setup from  %netfxUrl%. >> %startuptasklog%
+   if %ERRORLEVEL%== 0 echo %date% %time% : Successfully downloaded .NET framework %netfx% setup file. >> %startuptasklog%
+   goto install
+
+   install:
    REM ***** Installing .NET *****
    echo Installing .NET with commandline: start /wait %~dp0%netfxinstallfile% /q /serialdownload /log %netfxinstallerlog%  /chainingpackage "CloudService Startup Task" >> %startuptasklog%
    start /wait %~dp0%netfxinstallfile% /q /serialdownload /log %netfxinstallerlog% /chainingpackage "CloudService Startup Task" >> %startuptasklog% 2>>&1
diff --git a/articles/container-registry/container-registry-private-link.md b/articles/container-registry/container-registry-private-link.md
@@ -10,7 +10,7 @@ ms.date: 10/11/2022
 
 # Connect privately to an Azure container registry using Azure Private Link
 
-Limit access to a registry by assigning virtual network private IP addresses to the registry endpoints and using [Azure Private Link](../private-link/private-link-overview.md). Network traffic between the clients on the virtual network and the registry's private endpoints traverses the virtual network and a private link on the Microsoft backbone network, eliminating exposure from the public internet. Private Link also enables private registry access from on-premises through [Azure ExpressRoute](../expressroute/expressroute-introduction.MD) private peering or a [VPN gateway](../vpn-gateway/vpn-gateway-about-vpngateways.md).
+Limit access to a registry by assigning virtual network private IP addresses to the registry endpoints and using [Azure Private Link](../private-link/private-link-overview.md). Network traffic between the clients on the virtual network and the registry's private endpoints traverses the virtual network and a private link on the Microsoft backbone network, eliminating exposure from the public internet. Private Link also enables private registry access from on-premises through [Azure ExpressRoute](../expressroute/expressroute-introduction.md), private peering, or a [VPN gateway](../vpn-gateway/vpn-gateway-about-vpngateways.md).
 
 You can [configure DNS settings](../private-link/private-endpoint-overview.md#dns-configuration) for the registry's private endpoints, so that the settings resolve to the registry's allocated private IP address. With DNS configuration, clients and services in the network can continue to access the registry at the registry's fully qualified domain name, such as *myregistry.azurecr.io*. 
 
diff --git a/articles/databox-online/azure-stack-edge-gpu-configure-tls-settings.md b/articles/databox-online/azure-stack-edge-gpu-configure-tls-settings.md
@@ -27,7 +27,7 @@ Use the following steps to configure TLS 1.2 on your client.
 2. To set TLS 1.2 for the current PowerShell session, type:
   
     ```azurepowershell
-    [System.Net.ServicePointManager]::SecurityProtocol = 'TLS12'
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
     ```
 
 ## Configure TLS 1.2 on client
diff --git a/articles/machine-learning/how-to-debug-pipeline-reuse-issues.md b/articles/machine-learning/how-to-debug-pipeline-reuse-issues.md
@@ -36,8 +36,8 @@ Azure Machine Learning pipeline has holistic logic to calculate whether a compon
 
 Reuse criteria:
 
-- Compenet defintion `is_determinstic` = true
-- Popeline runtime setting `FocceReRun` = false
+- Component definition `is_determinstic` = true
+- Pipeline runtime setting `ForceReRun` = false
 - Component code, environment definition, inputs and parameters, output settings, and run settings are all the same.
 
 If a component meets the reuse criteria, the pipeline service skips execution for the component, copies original component's status, displays original component's output/logs/metrics for the reused component. In the pipeline UI, the reused component shows a little recycle icon to indicate this component has been reused.  
@@ -100,4 +100,4 @@ You can compare the input data, parameters, output settings, run settings of the
 
 ### Step 6: Contact Microsoft for support
 
-If you follow all above steps, and you still can't find the root cause of unexpected rerun, you can [file a support case ticket](https://ms.portal.azure.com/#view/Microsoft_Azure_Support/HelpAndSupportBlade/~/overview) to Microsoft to get help.
+If you follow all above steps, and you still can't find the root cause of unexpected rerun, you can [file a support case ticket](https://ms.portal.azure.com/#view/Microsoft_Azure_Support/HelpAndSupportBlade/~/overview) to Microsoft to get help.
diff --git a/articles/open-datasets/dataset-genomics-data-lake.md b/articles/open-datasets/dataset-genomics-data-lake.md
@@ -28,7 +28,7 @@ The Genomics Data Lake is hosted in the West US 2 and West Central US Azure regi
 | [OpenCravat](dataset-open-cravat.md) | OpenCravat: Open Custom Ranked Analysis of Variants Toolkit |
 | [ENCODE](dataset-encode.md) | ENCODE: Encyclopedia of DNA Elements |
 | [GATK Resource Bundle](dataset-gatk-resource-bundle.md) | GATK Resource bundle |
-| [TCGA Open Data](dataset-encode.md) | TCGA Open Data |
+| [TCGA Open Data](dataset-the-cancer-genome-atlas.md) | TCGA Open Data |
 | [Pan UK-Biobank](dataset-panancestry-uk-bio-bank.md) | Pan UK-Biobank |
 
 ## Next steps
diff --git a/articles/service-connector/quickstart-portal-spring-cloud-connection.md b/articles/service-connector/quickstart-portal-spring-cloud-connection.md
@@ -56,7 +56,7 @@ You'll use Service Connector to create a new service connection in Azure Spring
     | **Subscription**    | *my-subscription*    | The subscription that contains your target service (the service you want to connect to). The default value is the subscription that contains the app deployed to Azure Spring Apps. |
     | **Connection name** | *storageblob_17d38*  | The connection name that identifies the connection between your app and target service. Use the connection name provided by Service Connector or enter your own connection name.   |
     | **Storage account** | *my-storage-account* | The target storage account you want to connect to. If you choose a different service type, select the corresponding target service instance.                                        |
-    | **Client type**     | *SpringBoot*         | The application stack that works with the target service you selected. Choose between SpringBoot and Java.                                                                          |
+    | **Client type**     | *SpringBoot*         | The application stack that works with the target service you selected. Besides SpringBoot and Java, other stacks are also supported.                                                |
 
     :::image type="content" source="./media/azure-spring-apps-quickstart/basics.png" alt-text="Screenshot of the Azure portal, filling out the Basics tab.":::
 
