Merge pull request #198283 from MicrosoftDocs/main

Merge main to live Sunday 5/15 4 pm

Author: hmacgregor1

articles/azure-monitor/logs/basic-logs-configure.md

@@ -2,7 +2,7 @@
 title: Configure Basic Logs in Azure Monitor (Preview)
 description: Configure a table for Basic Logs in Azure Monitor.
 ms.topic: conceptual
-ms.date: 01/13/2022
+ms.date: 05/15/2022
 
 ---
 
@@ -11,7 +11,7 @@ ms.date: 01/13/2022
 Setting a table's [log data plan](log-analytics-workspace-overview.md#log-data-plans-preview) to *Basic Logs* lets you save on the cost of storing high-volume verbose logs you use for debugging, troubleshooting and auditing, but not for analytics and alerts. This article describes how to configure Basic Logs for a particular table in your Log Analytics workspace.
 
 > [!IMPORTANT]
-> You can switch plans once a week.
+> You can switch a table's plan once a week. The Basic Logs feature is not available for workspaces in [legacy pricing tiers](cost-logs.md#legacy-pricing-tiers).
 
 ## Which tables support Basic Logs?
 All tables in your Log Analytics are Analytics tables, by default. You can configure particular tables to use Basic Logs. You can't configure a table for Basic Logs if Azure Monitor relies on that table for specific features.
@@ -195,4 +195,4 @@ Basic Logs tables retain data for eight days. When you change an existing table'
 ## Next steps
 
 - [Learn more about the different log plans.](log-analytics-workspace-overview.md#log-data-plans-preview)
-- [Query data in Basic Logs.](basic-logs-query.md)
+- [Query data in Basic Logs.](basic-logs-query.md)

articles/azure-monitor/logs/log-analytics-workspace-overview.md

@@ -3,7 +3,7 @@ title: Log Analytics workspace overview
 description: Overview of Log Analytics workspace which store data for Azure Monitor Logs.
 ms.topic: conceptual
 ms.tgt_pltfrm: na
-ms.date: 02/18/2022
+ms.date: 05/15/2022
 ---
 
 # Log Analytics workspace overview
@@ -34,7 +34,7 @@ By default, all tables in a workspace are **Analytics** tables, which are availa
 The following table gives a brief summary of the two plans. See [Configure Basic Logs in Azure Monitor (Preview)](basic-logs-configure.md) for more details on Basic Logs and how to configure them.
 
 > [!NOTE]
-> Basic Logs are currently in public preview. You can currently work with Basic Logs tables in the Azure Portal and using a limited number of other components.
+> Basic Logs are currently in public preview. You can currently work with Basic Logs tables in the Azure Portal and using a limited number of other components. The Basic Logs feature is not available for workspaces in [legacy pricing tiers](cost-logs.md#legacy-pricing-tiers).
 
 The following table summarizes the differences between the plans.
 

articles/defender-for-cloud/defender-for-cloud-introduction.md

@@ -1,17 +1,19 @@
 ---
-title: Microsoft Defender for Cloud - an introduction
+title: What is Microsoft Defender for Cloud?
 description: Use Microsoft Defender for Cloud to protect your Azure, hybrid, and multi-cloud resources and workloads.
 ms.topic: overview
-ms.author: elkrieger
-author: ElazarK
+ms.author: benmansheim
+author: bmansheim
 ms.custom: mvc
-ms.date: 03/31/2022
+ms.date: 05/11/2022
 ---
 # What is Microsoft Defender for Cloud?
 
-Defender for Cloud is a tool for security posture management and threat protection. It strengthens the security posture of your cloud resources, and with its integrated Microsoft Defender plans, Defender for Cloud protects workloads running in Azure, hybrid, and other cloud platforms.
+Microsoft Defender for Cloud is a Cloud Workload Protection Platform (CWPP) that also delivers Cloud Security Posture Management (CSPM) for all of your Azure, on-premises, and multi-cloud (Amazon AWS and Google GCP) resources.
 
-Defender for Cloud provides the tools needed to harden your resources, track your security posture, protect against cyber attacks, and streamline security management. Because it's natively integrated, deployment of Defender for Cloud is easy, providing you with simple auto provisioning to secure your resources by default.
+- [**Defender for Cloud recommendations**](security-policy-concept.md) identify cloud workloads that require security actions and provide you with steps to protect your workloads from security risks.
+- [**Defender for Cloud secure score**](secure-score-security-controls.md) gives you a clear view of your security posture based on the implementation of the security recommendations so you can track new security opportunities and precisely report on the progress of your security efforts.
+- [**Defender for Cloud alerts**](alerts-overview.md) warn you about security events in your workloads in real-time, including the indicators that led to the event.
 
 Defender for Cloud fills three vital needs as you manage the security of your resources and workloads in the cloud and on-premises:
 

articles/defender-for-cloud/defender-for-containers-introduction.md

@@ -1,10 +1,8 @@
 ---
 title: Container security with Microsoft Defender for Cloud
 description: Learn about Microsoft Defender for Containers
-author: bmansheim
-ms.author: benmansheim
 ms.topic: overview
-ms.date: 05/08/2022
+ms.date: 05/15/2022
 ---
 
 # Overview of Microsoft Defender for Containers
@@ -95,17 +93,14 @@ The architecture of the various elements involved in the full range of protectio
 
 Defender for Containers protects your clusters whether they're running in:
 
-- **Azure Kubernetes Service (AKS)** - Microsoft's managed service for developing, deploying, and managing containerized applications.
+- **Azure Kubernetes Service (AKS) (Preview)** - Microsoft's managed service for developing, deploying, and managing containerized applications.
 
-- **Amazon Elastic Kubernetes Service (EKS) in a connected Amazon Web Services (AWS) account** - Amazon's managed service for running Kubernetes on AWS without needing to install, operate, and maintain your own Kubernetes control plane or nodes.
+- **Amazon Elastic Kubernetes Service (EKS) in a connected Amazon Web Services (AWS) account (Preview)** - Amazon's managed service for running Kubernetes on AWS without needing to install, operate, and maintain your own Kubernetes control plane or nodes.
 
-- **Google Kubernetes Engine (GKE) in a connected Google Cloud Platform (GCP) project** - Google’s managed environment for deploying, managing, and scaling applications using GCP infrastructure.
+- **Google Kubernetes Engine (GKE) in a connected Google Cloud Platform (GCP) project (Preview)** - Google’s managed environment for deploying, managing, and scaling applications using GCP infrastructure.
 
 - **An unmanaged Kubernetes distribution** (using Azure Arc-enabled Kubernetes) - Cloud Native Computing Foundation (CNCF) certified Kubernetes clusters hosted on-premises or on IaaS.
 
-> [!NOTE]
-> Defender for Containers' support for Arc-enabled Kubernetes clusters (AWS EKS and GCP GKE clusters) is a preview feature.
-
 For high-level diagrams of each scenario, see the relevant tabs below. 
 
 In the diagrams you'll see that the items received and analyzed by Defender for Cloud include: