Merge branch 'MicrosoftDocs:main' into same-port-preview

jaesoni · web-flow · commit c7681daaee1e · 2023-02-27T15:42:17.000+05:30
diff --git a/articles/automation/automation-runbook-graphical-error-handling.md b/articles/automation/automation-runbook-graphical-error-handling.md
@@ -3,7 +3,7 @@ title: Handle errors in Azure Automation graphical runbooks
 description: This article tells how to implement error handling logic in graphical runbooks.
 services: automation
 ms.subservice: process-automation
-ms.date: 03/16/2018
+ms.date: 02/27/2022
 ms.topic: conceptual 
 ms.custom: devx-track-azurepowershell
 ---
diff --git a/articles/automation/change-tracking/overview.md b/articles/automation/change-tracking/overview.md
@@ -3,7 +3,7 @@ title: Azure Automation Change Tracking and Inventory overview
 description: This article describes the Change Tracking and Inventory feature, which helps you identify software and Microsoft service changes in your environment.
 services: automation
 ms.subservice: change-inventory-management
-ms.date: 01/18/2023
+ms.date: 02/27/2023
 ms.topic: conceptual
 ---
 
diff --git a/articles/automation/how-to/region-mappings.md b/articles/automation/how-to/region-mappings.md
@@ -1,7 +1,7 @@
 ---
 title: Supported regions for linked Log Analytics workspace
 description: This article describes the supported region mappings between an Automation account and a Log Analytics workspace as it relates to certain features of Azure Automation.
-ms.date: 01/04/2023
+ms.date: 02/27/2023
 services: automation
 ms.topic: conceptual
 ms.custom: references_regions
diff --git a/articles/automation/media/automation-runbook-graphical-error-handling/runbook-example-error-handling-code.png b/articles/automation/media/automation-runbook-graphical-error-handling/runbook-example-error-handling-code.png
diff --git a/articles/key-vault/certificates/tutorial-rotate-certificates.md b/articles/key-vault/certificates/tutorial-rotate-certificates.md
@@ -58,8 +58,8 @@ A certificate created in Key Vault can be:
 
 The following CAs are currently partnered providers with Key Vault:
 
-- DigiCert: Key Vault offers OV TLS/SSL certificates.
-- GlobalSign: Key Vault offers OV TLS/SSL certificates.
+- DigiCert: Key Vault offers OV or EV TLS/SSL certificates.
+- GlobalSign: Key Vault offers OV or EV TLS/SSL certificates.
 
 Key Vault auto-rotates certificates through established partnerships with CAs. Because Key Vault automatically requests and renews certificates through the partnership, auto-rotation capability isn't applicable for certificates created with CAs that aren't partnered with Key Vault.
 
diff --git a/articles/migrate/concepts-migration-planning.md b/articles/migrate/concepts-migration-planning.md
@@ -5,7 +5,7 @@ author: rashi-ms
 ms.author: rajosh
 ms.manager: abhemraj
 ms.topic: conceptual
-ms.date: 12/12/2022
+ms.date: 02/27/2023
 ms.custom: engagement-fy23
 ---
 
@@ -35,7 +35,7 @@ Start by identifying your on-premises infrastructure, applications, and dependen
 
 ### Workloads in use
 
-Azure Migrate uses a lightweight Azure Migrate appliance to perform agentless discovery of on-premises VMware VMs, Hyper-V VMs, other virtualized servers, and physical servers. Continuous discovery collects server configuration information, and performance metadata, as well as application data. Here's what the appliance collects from on-premises servers:
+Azure Migrate uses a lightweight Azure Migrate appliance to perform agentless discovery of on-premises VMware VMs, Hyper-V VMs, other virtualized servers, and physical servers. Continuous discovery collects server configuration information, and performance metadata, and application data. Here's what the appliance collects from on-premises servers:
 
 - Server, disk, and NIC metadata.
 
@@ -100,7 +100,7 @@ You can view Discovery and assessment reports (with Azure readiness information,
 
 ### Evaluate gaps/blockers
 
-As you figure out the apps and workloads you want to migrate, identify downtime constraints for them, and look for any operational dependencies between your apps and the underlying infrastructure. This analysis helps you to plan migrations that meet your recovery time objective (RTO), and ensure minimal to zero data loss. Before you migrate, we recommend that you review and mitigate any compatibility issues, or unsupported features, that may block server/SQL database migration. The Azure Migrate Discovery and assessment report, and Azure Migrate Database Assessment, can help with this.
+As you figure out the apps and workloads you want to migrate, identify downtime constraints for them, and look for any operational dependencies between your apps and the underlying infrastructure. This analysis helps you to plan migrations that meet your recovery time objective (RTO), and ensure minimal to zero data loss. Before you migrate, we recommend that you review and mitigate any compatibility issues, or unsupported features that may block server/SQL database migration. The Azure Migrate Discovery and assessment report, and Azure Migrate Database Assessment, can help with this.
 
 ### Prioritize workloads
 
@@ -115,7 +115,7 @@ A few recommendations:
     **State** | **Action**
     --- | ---
     **Azure ready VMs** | Export the assessment report, and filter all servers with state *Ready for Azure*. This might be the first group of servers that you lift and shift to Azure, using the [Migration and modernization](migrate-services-overview.md#migration-and-modernization-tool) tool.
-    **End-of-support operating systems** | Export the assessment report, and filter all servers running Windows Server 2008 R2/Windows Server 2008. These operating systems are at the end of support, and only Azure provides a free three years of security updates when you migrate them to Azure. If you combine Azure Hybrid Benefit, and use RIs, the savings could be much higher.
+    **End-of-support operating systems** | Export the assessment report, and filter all servers running Windows Server 2008 R2/Windows Server 2008. These operating systems are at the end of support, and only Azure provides a free three years of security updates when you migrate them to Azure. If you combine Azure Hybrid Benefit, and use RIs, the savings could be higher.
     **SQL Server migration** | Use the database assessment recommendations to migrate databases that are ready for Azure SQL Database, using the Azure Migrate: Database Migration tool. Migrate the databases ready for Azure SQL VM using the Migration and modernization tool.
     **End-of-support software** | Export your application inventory, and filter for any software/extensions that might be reaching end-of-support. Prioritize these applications for migration.
     **Under-provisioned servers** | Export the assessment report, and filter for servers with low CPU utilization (%) and memory utilization (%).  Migrate to a right-sized Azure VM, and save on costs for underutilized resources.
@@ -131,11 +131,11 @@ Before finalizing your migration plan, make sure you consider and mitigate other
 - **Network requirements**: Evaluate network bandwidth and latency constraints, which might cause unforeseen delays and disruptions to migration replication speed.
 - **Testing/post-migration tweaks**: Allow a time buffer to conduct performance and user acceptance testing for migrated apps, or to configure/tweak apps post-migration, such as updating database connection strings, configuring web servers, performing cut-overs/cleanup etc.
 - **Permissions**: Review recommended Azure permissions, and server/database access roles and permissions needed for migration.
-- **Training**: Prepare your organization for the digital transformation. A solid training foundation is important for successful organizational change. Check out free [Microsoft Learn training](/training/azure/?ocid=CM_Discovery_Checklist_PDF), including courses on Azure fundamentals, solution architectures, and security. Encourage your team to explore [Azure certifications](https://www.microsoft.com/learning/certification-overview.aspx?ocid=CM_Discovery_Checklist_PDF). 
+- **Training**: Prepare your organization for the digital transformation. A solid training foundation is important for successful organizational change. Check out free [Microsoft Learn training](/training/azure/?ocid=CM_Discovery_Checklist_PDF), including courses on Azure fundamentals, solution architectures, and security. Encourage your team to explore [Azure certifications](https://learn.microsoft.com/certifications). 
 - **Implementation support**: Get support for your implementation if you need it. Many organizations opt for outside help to support their cloud migration. To move to Azure quickly and confidently with personalized assistance, consider an [Azure Expert Managed Service Provider](https://www.microsoft.com/solution-providers/search?cacheId=9c2fed4f-f9e2-42fb-8966-4c565f08f11e&ocid=CM_Discovery_Checklist_PDF), or [FastTrack for Azure](https://azure.microsoft.com/programs/azure-fasttrack/?ocid=CM_Discovery_Checklist_PDF). 
 
 
-Create an effective cloud migration plan that includes detailed information about the apps you want to migrate, app/database availability, downtime constraints, and migration milestones. The plan considers how long the data copy will take, and include a realistic buffer for post-migration testing, and cut-over activities.
+Create an effective cloud migration plan that includes detailed information about the apps you want to migrate, app/database availability, downtime constraints, and migration milestones. The plan considers how long the data copy takes, and include a realistic buffer for post-migration testing, and cut-over activities.
 
 A post-migration testing plan should include functional, integration, security, and performance testing and use cases, to ensure that migrated apps work as expected, and that all database objects, and data relationships, are transferred successfully to the cloud.
 
diff --git a/articles/migrate/concepts-vmware-agentless-migration.md b/articles/migrate/concepts-vmware-agentless-migration.md
@@ -1,9 +1,9 @@
 ---
 title: Agentless replication of VMware virtual machines concepts 
 description: Describes concepts related to agentless migration of VMware VMs in Azure Migrate.
-author: anvar-ms
-ms.author: anvar
-ms.manager: bsiva
+author: piyushdhore-microsoft 
+ms.author: piyushdhore
+ms.manager: vijain
 ms.topic: conceptual
 ms.date: 12/12/2022
 ms.custom: engagement-fy23
diff --git a/articles/migrate/how-to-migrate-at-scale.md b/articles/migrate/how-to-migrate-at-scale.md
@@ -1,9 +1,9 @@
 ---
 title: Automate migration of machines in Azure Migrate
 description: Describes how to use scripts to migrate a large number of machines in Azure Migrate
-author: anvar-ms 
-ms.author: anvar
-ms.manager: bsiva
+author: sunishvohra-ms 
+ms.author: sunishvohra
+ms.manager: vijain
 ms.topic: how-to
 ms.date: 5/02/2022
 ---
diff --git a/articles/migrate/how-to-migrate.md b/articles/migrate/how-to-migrate.md
@@ -1,9 +1,9 @@
 ---
 title: Add migration tools in Azure Migrate 
 description: Learn how to add migration tools in Azure Migrate. 
-author: anvar-ms 
-ms.author: anvar
-ms.manager: bsiva
+author: sunishvohra-ms 
+ms.author: sunishvohra
+ms.manager: vijain
 ms.topic: how-to
 ms.date: 12/12/2022
 ms.custom: engagement-fy23
diff --git a/articles/migrate/how-to-scale-out-for-migration.md b/articles/migrate/how-to-scale-out-for-migration.md
@@ -1,9 +1,9 @@
 ---
 title: Set up an Azure Migrate scale-out appliance for agentless VMware migration
 description: Learn how to set up an Azure Migrate scale-out appliance to migrate Hyper-V VMs.
-author: anvar-ms 
-ms.author: anvar
-ms.manager: bsiva
+author: ajaypartha95
+ms.author: ajaypar
+ms.manager: roopesh.nair
 ms.topic: how-to
 ms.date: 02/16/2023
 ms.custom: engagement-fy23
diff --git a/articles/migrate/migrate-replication-appliance.md b/articles/migrate/migrate-replication-appliance.md
@@ -1,9 +1,9 @@
 ---
 title: Azure Migrate replication appliance 
 description: Learn about the Azure Migrate replication appliance for agent-based VMware migration.
-author: anvar-ms
-ms.author: anvar
-ms.manager: bsiva
+author: piyushdhore-microsoft 
+ms.author: piyushdhore
+ms.manager: vijain
 ms.topic: conceptual
 ms.date: 10/28/2022
 ms.custom: engagement-fy23
diff --git a/articles/migrate/prepare-for-migration.md b/articles/migrate/prepare-for-migration.md
@@ -1,9 +1,9 @@
 ---
 title: Prepare machines for migration with Azure Migrate
 description: Learn how to prepare on-premises machines for migration with Azure Migrate.
-author: anvar-ms
-ms.author: anvar
-ms.manager: bsiva
+author: sunishvohra-ms 
+ms.author: sunishvohra
+ms.manager: vijain
 ms.topic: how-to
 ms.date: 12/12/2022
 ms.custom: engagement-fy23
diff --git a/articles/migrate/server-migrate-overview.md b/articles/migrate/server-migrate-overview.md
@@ -1,9 +1,9 @@
 ---
 title: Select a VMware migration option with the Migration and modernization tool
 description: Provides an overview of options for migrating VMware VMs to Azure with the Migration and modernization tool
-author: anvar-ms
-ms.author: anvar
-ms.manager: bsiva
+author: piyushdhore-microsoft 
+ms.author: piyushdhore
+ms.manager: vijain
 ms.topic: conceptual
 ms.date: 12/12/2022
 ms.custom: engagement-fy23
diff --git a/articles/migrate/tutorial-discover-import.md b/articles/migrate/tutorial-discover-import.md
@@ -1,11 +1,11 @@
 ---
 title: Assess on-premises servers using an imported CSV file with Azure Migrate Server Assessment
 description: Describes how to discover on-premises servers for migration to Azure using an imported CSV file in Azure Migrate Server Assessment
-author: vineetvikram
-ms.author: vivikram
+author: vikram1988
+ms.author: vibansa
 ms.manager: abhemraj
 ms.topic: tutorial
-ms.date: 04/20/2022
+ms.date: 02/27/2023
 ms.custom: subject-rbac-steps, engagement-fy23
 #Customer intent: As a server admin, I want to discover servers using an imported CSV file. 
 ---
@@ -117,7 +117,7 @@ Download the CSV template and add server information to it.
 Gather server data and add it to the CSV file.
 
 - To gather data, you can export it from tools you use for on-premises server management, such as VMware vSphere or your configuration-management database (CMDB).
-- To review sample data, download our [example file](https://go.microsoft.com/fwlink/?linkid=2108405).
+- To review sample data, download our [example file](https://go.microsoft.com/fwlink/?linkid=2109031).
 
 The following table summarizes the file fields to fill in:
 
diff --git a/articles/sentinel/TOC.yml b/articles/sentinel/TOC.yml
@@ -250,6 +250,9 @@
       items:
       - name: Amazon Web Services logs
         href: connect-aws.md
+        items:
+        - name: Send CloudWatch events via Lambda function
+          href: cloudwatch-lambda-function.md
       - name: Azure Active Directory
         href: connect-azure-active-directory.md
       - name: Microsoft Defender for Cloud
diff --git a/articles/sentinel/cloudwatch-lambda-function.md b/articles/sentinel/cloudwatch-lambda-function.md
@@ -0,0 +1,58 @@
+---
+title: Ingest CloudWatch logs to Microsoft Sentinel - create a Lambda function to send CloudWatch events to S3 bucket
+description: In this article, you create a Lambda function to send CloudWatch events to an S3 bucket.
+author: limwainstein
+ms.author: lwainstein
+ms.service: microsoft-sentinel
+ms.topic: how-to
+ms.date: 02/09/2023
+#Customer intent: As a security operator, I want to create a Lambda function to send CloudWatch events to S3 bucket so I can convert the format to the format accepted by Microsoft Sentinel.  
+---
+
+# Create a Lambda function to send CloudWatch events to an S3 bucket
+
+In some cases, your CloudWatch logs may not match the format accepted by Microsoft Sentinel - .csv file in a GZIP format without a header. In this article, you use a [lambda function](https://github.com/Azure/Azure-Sentinel/blob/master/DataConnectors/AWS-S3/CloudWatchLanbdaFunction.py) within the Amazon Web Services (AWS) environment to send [CloudWatch events to an S3 bucket](connect-aws.md), and convert the format to the accepted format. 
+
+## Create the lambda function 
+
+The lambda function uses Python 3.9 runtime and x86_64 architecture. 
+
+1. In the AWS Management Console, select the lambda service.
+1. Select **Create function**. 
+
+    :::image type="content" source="media/cloudwatch-lambda-function/lambda-basic-information.png" alt-text="Screenshot of the AWS Management Console Basic information screen." lightbox="media/cloudwatch-lambda-function/lambda-basic-information.png":::
+
+1. Type a name for the function and select **Python 3.9** as the runtime and **x86_64** as the architecture. 
+1. Select **Create function**. 
+1. Under **Choose a layer**, select a layer and select **Add**.
+
+    :::image type="content" source="media/cloudwatch-lambda-function/lambda-add-layer.png" alt-text="Screenshot of the AWS Management Console Add layer screen." lightbox="media/cloudwatch-lambda-function/lambda-add-layer.png":::
+
+1. Select **Permissions**, and under **Execution role**, select **Role name**.
+1. Under **Permissions policies**, select **Add permissions** > **Attach policies**. 
+
+    :::image type="content" source="media/cloudwatch-lambda-function/lambda-permissions.png" alt-text="Screenshot of the AWS Management Console Permissions tab." lightbox="media/cloudwatch-lambda-function/lambda-permissions.png":::
+
+1. Search for the *AmazonS3FullAccess* and *CloudWatchLogsReadOnlyAccess* policies and attach them.
+
+    :::image type="content" source="media/cloudwatch-lambda-function/lambda-other-permissions-policies.png" alt-text="Screenshot of the AWS Management Console Add permissions policies screen." lightbox="media/cloudwatch-lambda-function/lambda-other-permissions-policies.png":::
+
+1. Copy the code link from the [source file](https://github.com/Azure/Azure-Sentinel/blob/master/DataConnectors/AWS-S3/CloudWatchLanbdaFunction.py). 
+1. Return to the function, select **Code**, and paste the code link under **Code source**.
+
+    :::image type="content" source="media/cloudwatch-lambda-function/lambda-code-source.png" alt-text="Screenshot of the AWS Management Console Code source screen." lightbox="media/cloudwatch-lambda-function/lambda-code-source.png":::
+ 
+1. Fill the parameters as required. 
+1. Select **Deploy**, and then select **Test**.
+1. Create an event by filling in the required fields.
+
+    :::image type="content" source="media/cloudwatch-lambda-function/lambda-configure-test-event.png" alt-text="Screenshot of the AWS Management Configure test event screen." lightbox="media/cloudwatch-lambda-function/lambda-configure-test-event.png":::
+
+1. Select **Test** to see how the event appears in the S3 bucket. 
+
+## Next steps
+
+In this document, you learned how to create a Lambda function to send CloudWatch events to an S3 bucket. To learn more about Microsoft Sentinel, see the following articles:
+- Learn how to [get visibility into your data, and potential threats](get-visibility.md).
+- Get started [detecting threats with Microsoft Sentinel](detect-threats-built-in.md).
+- [Use workbooks](monitor-your-data.md) to monitor your data.
diff --git a/articles/sentinel/connect-aws.md b/articles/sentinel/connect-aws.md
@@ -7,8 +7,6 @@ ms.date: 12/12/2022
 ms.author: yelevin
 ---
 
----
-
 # Connect Microsoft Sentinel to Amazon Web Services to ingest AWS service log data
 
 Use the Amazon Web Services (AWS) connectors to pull AWS service logs into Microsoft Sentinel. These connectors work by granting Microsoft Sentinel access to your AWS resource logs. Setting up the connector establishes a trust relationship between Amazon Web Services and Microsoft Sentinel. This is accomplished on AWS by creating a role that gives permission to Microsoft Sentinel to access your AWS logs.
@@ -26,7 +24,18 @@ This connector is available in two versions: the legacy connector for CloudTrail
 
 # [S3 connector (new)](#tab/s3)
 
-This document explains how to configure the new AWS S3 connector. The process of setting it up has two parts: the AWS side and the Microsoft Sentinel side.
+This article explains how to configure the new AWS S3 connector. The process of setting it up has two parts: the AWS side and the Microsoft Sentinel side.
+
+## Prerequisites
+
+Make sure that the logs from your selected AWS service use the format accepted by Microsoft Sentinel:
+
+- **Amazon VPC**: .csv file in GZIP format with headers; delimiter: space.
+- **Amazon GuardDuty**: json-line and GZIP formats.
+- **AWS CloudTrail**: .json file in a GZIP format.
+- **CloudWatch**: .csv file in a GZIP format without a header. If you need to convert your logs to this format, you can use this [CloudWatch lambda function](cloudwatch-lambda-function.md).
+
+## Connect the S3 connector
 
 - In your AWS environment:
 
diff --git a/articles/sentinel/media/cloudwatch-lambda-function/lambda-add-layer.png b/articles/sentinel/media/cloudwatch-lambda-function/lambda-add-layer.png
diff --git a/articles/sentinel/media/cloudwatch-lambda-function/lambda-basic-information.png b/articles/sentinel/media/cloudwatch-lambda-function/lambda-basic-information.png
diff --git a/articles/sentinel/media/cloudwatch-lambda-function/lambda-code-source.png b/articles/sentinel/media/cloudwatch-lambda-function/lambda-code-source.png
diff --git a/articles/sentinel/media/cloudwatch-lambda-function/lambda-configure-test-event.png b/articles/sentinel/media/cloudwatch-lambda-function/lambda-configure-test-event.png
diff --git a/articles/sentinel/media/cloudwatch-lambda-function/lambda-other-permissions-policies.png b/articles/sentinel/media/cloudwatch-lambda-function/lambda-other-permissions-policies.png
diff --git a/articles/sentinel/media/cloudwatch-lambda-function/lambda-permissions.png b/articles/sentinel/media/cloudwatch-lambda-function/lambda-permissions.png
