Merge pull request #224052 from MicrosoftDocs/main

1/16 AM Publish

Author: huypub

articles/azure-monitor/essentials/metrics-store-custom-rest-api.md

@@ -50,7 +50,7 @@ curl -X POST 'https://login.microsoftonline.com/<tennant ID>/oauth2/token' \
 --data-urlencode 'grant_type=client_credentials' \
 --data-urlencode 'client_id=<your apps client ID>' \
 --data-urlencode 'client_secret=<your apps client secret' \
---data-urlencode 'resource=https://management.azure.com'
+--data-urlencode 'resource=https://monitor.azure.com'
 ```
 
 The response body appears as follows:  
@@ -144,4 +144,4 @@ If you receive an error message with some part of the process, consider the foll
 
 ## Next steps
 
-- Learn more about [custom metrics](./metrics-custom-overview.md).
+- Learn more about [custom metrics](./metrics-custom-overview.md).

articles/azure-monitor/essentials/prometheus-metrics-enable.md

@@ -76,7 +76,7 @@ The output for each command will look similar to the following:
     "metrics": {
         "enabled": true,
         "kubeStateMetrics": {
-            "metrican'tationsAllowList": "",
+            "metricAnnotationsAllowList": "",
             "metricLabelsAllowlist": ""
         }
     }
@@ -102,7 +102,7 @@ The output will be similar to the following:
         "metrics": {
           "enabled": true,
           "kubeStateMetrics": {
-            "metrican'tationsAllowList": "pods=[k8s-annotation-1,k8s-annotation-n]",
+            "metricAnnotationsAllowList": "pods=[k8s-annotation-1,k8s-annotation-n]",
             "metricLabelsAllowlist": "namespaces=[k8s-label-1,k8s-label-n]"
           }
         }

articles/databox-online/azure-stack-edge-gpu-kubernetes-overview.md

@@ -7,7 +7,7 @@ author: alkohli
 ms.service: databox
 ms.subservice: edge
 ms.topic: conceptual
-ms.date: 11/07/2021
+ms.date: 01/13/2023
 ms.author: alkohli
 ---
 
@@ -57,8 +57,8 @@ The Kubernetes master and the worker nodes are virtual machines that consume CPU
 
 |Kubernetes VM type|CPU and memory requirement|
 |---------|---------|
-|Master VM|4 cores, 4-GB RAM|
-|Worker VM|12 cores, 32-GB RAM|
+|Master VM|CPU: 4 cores, RAM: 4-GB|
+|Worker VM|CPU: 30% of available physical cores, RAM: 25% of device specification|
 
 <!--The Kubernetes cluster control plane components make global decisions about the cluster. The control plane has:
 

articles/defender-for-cloud/alerts-reference.md

@@ -58,7 +58,7 @@ sections:
       - question: |
           Do I need to enable Defender for Servers on the subscription and on the workspace?
         answer: |
-          When you enable a Defender for Servers plan at the subscription level, Defender for Cloud automatically enables the plan on your default workspaces. If you use a custom workspace, select the workspace to enable the plan. Here's more information:
+          Defender for Servers Plan 1 does not depend on Log Analytics. When you enable Defender for Servers Plan 2 at the subscription level, Defender for Cloud automatically enables the plan on your default Log Analytics workspaces. If you use a custom workspace, make sure you enable the plan on the workspace. Here's more information:
           
           - If you turn on Defender for Servers for a subscription and for a connected custom workspace, you aren't charged for both. The system identifies unique VMs.
           - If you enable Defender for Servers on cross-subscription workspaces:

articles/defender-for-cloud/faq-defender-for-servers.yml

@@ -2,7 +2,8 @@
 title: Important changes coming to Microsoft Defender for Cloud
 description: Upcoming changes to Microsoft Defender for Cloud that you might need to be aware of and for which you might need to plan 
 ms.topic: overview
-ms.date: 12/28/2022
+ms.date: 01/16/2023
+
 ---
 
 # Important upcoming changes to Microsoft Defender for Cloud
@@ -22,6 +23,7 @@ If you're looking for the latest release notes, you'll find them in the [What's
 | [Recommendation to enable diagnostic logs for Virtual Machine Scale Sets to be deprecated](#recommendation-to-enable-diagnostic-logs-for-virtual-machine-scale-sets-to-be-deprecated) | January 2023 |
 | [The policy Vulnerability Assessment settings for SQL server should contain an email address to receive scan reports is set to be deprecated](#the-policy-vulnerability-assessment-settings-for-sql-server-should-contain-an-email-address-to-receive-scan-reports-is-set-to-be-deprecated) | January 2023 |
 | [The name of the Secure score control Protect your applications with Azure advanced networking solutions will be changed](#the-name-of-the-secure-score-control-protect-your-applications-with-azure-advanced-networking-solutions-will-be-changed) | January 2023 |
+| [Deprecation and improvement of selected alerts for Windows and Linux Servers](#deprecation-and-improvement-of-selected-alerts-for-windows-and-linux-servers) | April 2023 |
 
 ### Recommendation to enable diagnostic logs for Virtual Machine Scale Sets to be deprecated
 
@@ -33,7 +35,7 @@ The related [policy definition](https://portal.azure.com/#view/Microsoft_Azure_P
 
 | Recommendation | Description | Severity |
 |--|--|--|
-| Diagnostic logs in Virtual Machine Scale Sets should be enabled | Enable logs and retain them for up to a year. This enables you to recreate activity trails for investigation purposes when a security incident occurs or your network is compromised. | Low |
+| Diagnostic logs in Virtual Machine Scale Sets should be enabled | Enable logs and retain them for up to a year, enabling you to recreate activity trails for investigation purposes when a security incident occurs or your network is compromised. | Low |
 
 ### The policy Vulnerability Assessment settings for SQL server should contain an email address to receive scan reports is set to be deprecated 
 
@@ -67,6 +69,23 @@ The secure score control `Protect your applications with Azure advanced networki
 
 The updated name will be reflected on Azure Resource Graph (ARG), Secure Score Controls API and the `Download CSV report`.
 
+### Deprecation and improvement of selected alerts for Windows and Linux Servers
+
+**Estimated date for change: April 2023**
+
+The security alert quality improvement process for Defender for Servers includes the deprecation of some alerts for both Windows and Linux servers. The deprecated alerts will now be sourced from and covered by Defender for Endpoint threat alerts.  
+
+If you already have the Defender for Endpoint integration enabled, no further action is required. You may experience a decrease in your alerts volume in April 2023.
+
+If you don't have the Defender for Endpoint integration enabled in Defender for Servers, you'll need to enable the Defender for Endpoint integration to maintain and improve your alert coverage. 
+
+All Defender for Server customers, have full access to the Defender for Endpoint’s integration as a part of the [Defender for Servers plan](plan-defender-for-servers-select-plan.md#plan-features).  
+
+You can learn more about [Microsoft Defender for Endpoint onboarding options](integration-defender-for-endpoint.md#enable-the-microsoft-defender-for-endpoint-integration).
+
+You can also view the [full list of alerts](alerts-reference.md#defender-for-servers-alerts-to-be-deprecated) that are set to be deprecated.
+
+
 ## Next steps
 
 For all recent changes to Defender for Cloud, see [What's new in Microsoft Defender for Cloud?](release-notes.md).

articles/defender-for-cloud/upcoming-changes.md

@@ -8,7 +8,7 @@ ms.custom: devdivchpfy22
 
 # Lab account setup guide
 
-[!INCLUDE [preview note](./includes/lab-services-labaccount-focused-article.md)]
+[!INCLUDE [lab account focused article](./includes/lab-services-labaccount-focused-article.md)]
 
 If you're an administrator, before you set up your Azure Lab Services environment, you first need to create a *lab account* within your Azure subscription. A lab account is a container for one or more labs, and it takes only a few minutes to set up.
 

articles/lab-services/account-setup-guide.md

@@ -7,7 +7,7 @@ ms.date: 10/20/2020
 
 # Azure Lab Services - Administrator guide when using lab accounts
 
-[!INCLUDE [preview note](./includes/lab-services-new-update-note.md)]
+[!INCLUDE [lab account focused article](./includes/lab-services-labaccount-focused-article.md)]
 
 Information technology (IT) administrators who manage a university's cloud resources are ordinarily responsible for setting up the lab account for their school. After they've set up a lab account, administrators or educators create the labs that are contained within the account. This article provides a high-level overview of the Azure resources that are involved and the guidance for creating them.
 

articles/lab-services/administrator-guide-1.md

@@ -9,7 +9,7 @@ ms.service: lab-services
 
 # Architecture Fundamentals in Azure Lab Services when using lab accounts
 
-[!INCLUDE [preview note](./includes/lab-services-new-update-note.md)]
+[!INCLUDE [lab account focused article](./includes/lab-services-labaccount-focused-article.md)]
 
 Azure Lab Services is a SaaS (software as a service) solution, which means that the resources needed by Lab Services are handled for you. This article will cover the fundamental resources used by Lab Services and basic architecture of a lab.
 

articles/lab-services/classroom-labs-fundamentals-1.md

@@ -9,7 +9,7 @@ ms.service: lab-services
 
 # Set up GPU virtual machines in labs contained within lab accounts
 
-[!INCLUDE [preview note](./includes/lab-services-new-update-note.md)]
+[!INCLUDE [lab account focused article](./includes/lab-services-labaccount-focused-article.md)]
 
 This article shows you how to do the following tasks: