Merge pull request #202319 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/azure-sql-edge/deploy-onnx.md

@@ -180,6 +180,9 @@ onnx_model_path = 'boston1.model.onnx'
 onnxmltools.utils.save_model(onnx_model, onnx_model_path)
 ```
 
+> [!NOTE]
+> You may need to set the `target_opset` parameter for the skl2onnx.convert_sklearn function if there is a mismatch between ONNX runtime version in SQL Edge and skl2onnx packge. For more information, see the [SQL Edge Release notes](release-notes.md) to get the ONNX runtime version corresponding for the release, and pick the `target_opset` for the ONNX runtime based on the [ONNX backward compatibility matrix](https://github.com/microsoft/onnxruntime/blob/master/docs/Versioning.md#version-matrix).
+
 ## Test the ONNX model
 
 After converting the model to ONNX format, score the model to show little to no degradation in performance.

articles/azure-sql-edge/release-notes.md

@@ -9,12 +9,20 @@ ms.subservice:
 author: kendalvandyke
 ms.author: kendalv 
 ms.reviewer: jroth
-ms.date: 11/24/2020
+ms.date: 6/21/2022
 ---
 # Azure SQL Edge release notes 
 
 This article describes what's new and what has changed with every new build of Azure SQL Edge.
 
+## Azure SQL Edge 1.0.6
+
+SQL engine build 15.0.2000.1565
+
+### What's new?
+
+- Security bug fixes
+
 ## Azure SQL Edge 1.0.5
 
 SQL engine build 15.0.2000.1562

articles/virtual-machines/windows/tutorial-config-management.md

@@ -69,8 +69,8 @@ For pricing information, see [Automation pricing for Update management](https://
 To enable Update Management for your VM:
 
 1. Navigate to your VM in the Azure portal (search for **Virtual machines** in the search bar, then choose a VM from the list).
-1. Select **Guest + host updates** under Operations.
-1. Click on **Go to Update management**.
+1. Select **Updates** under Operations.
+1. Click on **Go to Updates using automation**.
 1. The **Enable Update Management** window opens.
 
 Validation is done to determine if Update Management is enabled for this VM. Validation includes checks for a Log Analytics workspace, for a linked Automation account, and for whether the solution is in the workspace.

includes/azure-monitor-limits-workspaces.md

@@ -13,20 +13,21 @@ ms.custom: "include file"
 
 **Data collection volume and retention** 
 
-| Tier | Limit per day | Data retention | Comment |
+| Pricing tier | Limit per day | Data retention | Comment |
 |:---|:---|:---|:---|
-| Current Per GB pricing tier<br>(introduced April 2018) | No limit | 30 - 730 days | Data retention beyond 31 days is available for additional charges. Learn more about [Azure Monitor pricing](https://azure.microsoft.com/pricing/details/monitor). |
-| Legacy Free tiers<br>(introduced April 2016) | 500 MB | 7 days | When your workspace reaches the 500 MB per day limit, data ingestion stops and resumes at the start of the next day. A day is based on UTC. Data collected by Microsoft Defender for Cloud isn't included in this 500 MB per day limit and will continue to be collected above this limit.  |
-| Legacy Standalone Per GB tier<br>(introduced April 2016) | No limit | 30 to 730 days | Data retention beyond 31 days is available for additional charges. Learn more about [Azure Monitor pricing](https://azure.microsoft.com/pricing/details/monitor). |
-| Legacy Per Node (OMS)<br>(introduced April 2016) | No limit | 30 to 730 days | Data retention beyond 31 days is available for additional charges. Learn more about [Azure Monitor pricing](https://azure.microsoft.com/pricing/details/monitor). |
-| Legacy Standard tier | No limit | 30 days  | Retention can't be adjusted |
-| Legacy Premium tier | No limit | 365 days  | Retention can't be adjusted |
+| [Pay-as-you-go](https://docs.microsoft.com/azure/azure-monitor/logs/cost-logs#pricing-model)<br>(introduced April 2018) | No limit | up to 730 days interactive retention /<br> up to 7 years [data archive](https://docs.microsoft.com/azure/azure-monitor/logs/data-retention-archive) | Data retention beyond 31 days is available for additional charges. Learn more about [Azure Monitor pricing](https://azure.microsoft.com/pricing/details/monitor). |
+| [Commitment tiers](https://docs.microsoft.com/azure/azure-monitor/logs/cost-logs#commitment-tiers)<br>(introduced November 2019) | No limit | up to 730 days interactive retention /<br> up to 7 years [data archive](https://docs.microsoft.com/azure/azure-monitor/logs/data-retention-archive) | Data retention beyond 31 days is available for additional charges. Learn more about [Azure Monitor pricing](https://azure.microsoft.com/pricing/details/monitor). |
+| [Legacy Per Node (OMS)](https://docs.microsoft.com/azure/azure-monitor/logs/cost-logs#per-node-pricing-tier)<br>(introduced April 2016) | No limit | 30 to 730 days | Data retention beyond 31 days is available for additional charges. Learn more about [Azure Monitor pricing](https://azure.microsoft.com/pricing/details/monitor). Access to use tier is limited to subscriptions that contained a Log Analytics workspace or Application Insights resource on April 2, 2018, or are linked to an Enterprise Agreement that started before February 1, 2019 and is still active.  |
+| [Legacy Standalone tier](https://docs.microsoft.com/azure/azure-monitor/logs/cost-logs#standalone-pricing-tier)<br>(introduced April 2016) | No limit | 30 to 730 days | Data retention beyond 31 days is available for additional charges. Learn more about [Azure Monitor pricing](https://azure.microsoft.com/pricing/details/monitor). Access to use tier is limited to subscriptions that contained a Log Analytics workspace or Application Insights resource on April 2, 2018, or are linked to an Enterprise Agreement that started before February 1, 2019 and is still active.|
+| [Legacy Free tier](https://docs.microsoft.com/azure/azure-monitor/logs/cost-logs#free-trial-pricing-tier)<br>(introduced April 2016) | 500 MB | 7 days | When your workspace reaches the 500 MB per day limit, data ingestion stops and resumes at the start of the next day. A day is based on UTC. Data collected by Microsoft Defender for Cloud isn't included in this 500 MB per day limit and will continue to be collected above this limit. Creating new workspaces in, or moving existing workspaces into, the legacy Free Trial pricing tier is possible only until July 1, 2022.  |
+| [Legacy Standard tier](https://docs.microsoft.com/azure/azure-monitor/logs/cost-logs#standard-and-premium-pricing-tiers) | No limit | 30 days  | Retention can't be adjusted. This tier has not been available to any new workspaces since October 1, 2016.|
+| [Legacy Premium tier](https://docs.microsoft.com/azure/azure-monitor/logs/cost-logs#standard-and-premium-pricing-tiers) | No limit | 365 days  | Retention can't be adjusted. This tier has not been available to any new workspaces since October 1, 2016.|
 
 **Number of workspaces per subscription.**
 
 | Pricing tier    | Workspace limit | Comments
 |:---|:---|:---|
-| Free tier  | 10 | This limit can't be increased. |
+| Legacy Free tier  | 10 | This limit can't be increased. Creating new workspaces in, or moving existing workspaces into, the legacy Free Trial pricing tier is possible only until July 1, 2022. |
 | All other tiers | No limit | You're limited by the number of resources within a resource group and the number of resource groups per subscription. |
 
 **Azure portal**