Skip to content

Commit 9db7829

Browse files
authored
Merge branch 'MicrosoftDocs:main' into master
2 parents 1ef5398 + 8294090 commit 9db7829

12 files changed

+198
-21
lines changed

articles/automation/automation-dsc-cd-chocolatey.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ For each package that you put into the package repository, you need a Nuspec tha
313313
must be compiled and stored on your NuGet server. For more information, see
314314
[[Create a NuGet package using nuget.exe CLI]][15].
315315

316-
You can use **MyGet.org** as a NuGet server. You can buy this service, but thee is a free starter
316+
You can use **MyGet.org** as a NuGet server. You can buy this service, but there is a free starter
317317
SKU. For instructions on installing your own NuGet server for your private packages, see the
318318
documentation on [Nuget.org][21].
319319

articles/backup/blob-backup-support-matrix.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Support matrix for Azure Blobs backup
33
description: Provides a summary of support settings and limitations when backing up Azure Blobs.
44
ms.topic: reference
5-
ms.date: 11/20/2024
5+
ms.date: 12/03/2024
66
ms.custom: references_regions, engagement-fy24
77
ms.service: azure-backup
88
author: AbhishekMallick-MS
@@ -64,6 +64,10 @@ Operational backup of blobs uses blob point-in-time restore, blob versioning, so
6464
- If you stop protection (vaulted backup) on a storage account, it doesn't delete the object replication policy created on the storage account. In these scenarios, you need to manually delete the *OR policies*.
6565
- Cool and archived blobs are currently not supported.
6666
- The backup operation isn't supported for blobs that are uploaded by using [Data Lake Storage APIs](/rest/api/storageservices/data-lake-storage-gen2).
67+
- When you delete and recreate a storage account with the same name, **Object Replication** doesn't recognize the change. As a result, future Recovery Points continue to include the older blobs and their versions.
68+
- Similarly, if you delete and recreate a container with the same name, **Object Replication** doesn't track the change, and future Recovery Points still include the previous blobs and versions.
69+
- If you suspend and resume protection or delete the **Object Replication policy** on the **source storage account**, the policy triggers a full backup.
70+
6771

6872
---
6973
## Next steps

articles/oracle/index.yml

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,20 @@ landingContent:
4141
url: oracle-db/database-overview.md
4242
- text: Onboard with Oracle Database@Azure
4343
url: oracle-db/onboard-oracle-database.md
44-
- text: Network planning for Oracle Database@Azure
44+
- text: Region availability
45+
url: oracle-db/oracle-database-regions.md
46+
- text: Network planning
4547
url: oracle-db/oracle-database-network-plan.md
46-
- text: Groups and roles for Oracle Database@Azure
47-
url: oracle-db/oracle-database-groups-roles.md
48-
- text: Overview of provisioning
49-
url: oracle-db/provision-oracle-database.md
50-
- text: Provision Oracle Autonomous databases
51-
url: oracle-db/provision-autonomous-oracle-databases.md
52-
- text: Link Oracle Database@Azure to multiple Azure subscriptions
53-
url: oracle-db/link-oracle-database-multiple-subscription.md
54-
- text: Support for Oracle Database@Azure
55-
url: oracle-db/oracle-database-support.md
48+
- text: Known issues
49+
url: oracle-db/oracle-database-known-issues.md
50+
- text: Group roles
51+
url: oracle-db/oracle-database-groups-roles.md
52+
- text: Plan IP address space
53+
url: oracle-db/oracle-database-plan-ip.md
54+
- text: Delegated subnet limits
55+
url: oracle-db/oracle-database-delegated-subnet-limits.md
5656
- text: FAQs
57-
url: oracle-db/faq-oracle-database-azure.md
57+
url: oracle-db/faq-oracle-database-azure.md
58+
59+
60+

articles/oracle/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ items:
3131
href: oracle-db/oracle-database-plan-ip.md
3232
- name: Delegated subnet limits
3333
href: oracle-db/oracle-database-delegated-subnet-limits.md
34-
- name: FAQ
34+
- name: FAQs
3535
href: oracle-db/faq-oracle-database-azure.md
3636
- name: References
3737
items:

articles/private-link/network-security-perimeter-concepts.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ author: mbender-ms
55
ms.author: mbender
66
ms.service: azure-private-link
77
ms.topic: overview
8-
ms.date: 11/04/2024
8+
ms.date: 12/3/2024
99
ms.custom: references_regions, ignite-2024
1010
#CustomerIntent: As a network security administrator, I want to understand how to use Network Security Perimeter to control network access to Azure PaaS resources.
1111
---
1212

1313
# What is Network Security Perimeter?
1414

15-
Network Security Perimeter allows organizations to define a logical network isolation boundary for PaaS resources (for example, Azure Storage account and SQL Database server) that are deployed outside your organization’s virtual networks. It restricts public network access to PaaS resources outside of the perimeter; access can be exempted by using explicit access rules for public inbound and outbound.
15+
Network Security Perimeter allows organizations to define a logical network isolation boundary for PaaS resources (for example, Azure Storage account and SQL Database server) that are deployed outside your organization’s virtual networks. It restricts public network access to PaaS resources within the perimeter; access can be exempted by using explicit access rules for public inbound and outbound.
1616

1717
For access patterns involving traffic from virtual networks to PaaS resources, see [What is Azure Private Link?](private-link-overview.md).
1818

articles/sentinel/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -707,6 +707,8 @@
707707
items:
708708
- name: Amazon Web Services logs
709709
href: connect-aws.md
710+
- name: AWS S3 WAF logs
711+
href: connect-aws-s3-waf.md
710712
- name: CloudWatch events via Lambda function
711713
href: cloudwatch-lambda-function.yml
712714
- name: Google Cloud Platform connectors
Lines changed: 160 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,160 @@
1+
---
2+
title: Connect Microsoft Sentinel to Amazon Web Services to ingest AWS WAF logs
3+
description: Use the Amazon Web Services (AWS) S3-based Web Application Firewall (WAF) connector to ingest AWS WAF logs, collected in AWS S3 buckets, to Microsoft Sentinel.
4+
author: yelevin
5+
ms.author: yelevin
6+
ms.topic: how-to
7+
ms.date: 11/26/2024
8+
appliesto:
9+
- Microsoft Sentinel in the Azure portal
10+
- Microsoft Sentinel in the Microsoft Defender portal
11+
ms.collection: usx-security
12+
#Customer intent: As a security operator, I want to ingest web application firewall (WAF) from my Amazon Web Services S3 bucket to my Microsoft Sentinel workspace, so that security analysts can monitor activity on these systems and detect security threats.
13+
---
14+
15+
# Connect Microsoft Sentinel to Amazon Web Services to ingest AWS WAF logs
16+
17+
Use the Amazon Web Services (AWS) S3-based Web Application Firewall (WAF) connector to ingest AWS WAF logs, collected in AWS S3 buckets, to Microsoft Sentinel. AWS WAF logs are detailed records of the web traffic analyzed by the AWS WAF against web access control lists (ACLs). These records contain information such as the time AWS WAF received the request, the specifics of the request, and the action taken by the rule that the request matched. These logs and this analysis are essential for maintaining the security and performance of web applications.
18+
19+
This connector features the debut of a new *AWS CloudFormation*-based onboarding script, to streamline the creation of the AWS resources used by the connector.
20+
21+
> [!IMPORTANT]
22+
> - The **Amazon Web Services S3 WAF** data connector is currently in preview. The [Azure Preview Supplemental Terms](https://azure.microsoft.com/support/legal/preview-supplemental-terms/) include additional legal terms that apply to Azure features that are in beta, preview, or otherwise not yet released into general availability.
23+
>
24+
> - [!INCLUDE [unified-soc-preview-no-alert](includes/unified-soc-preview-without-alert.md)]
25+
26+
## Overview
27+
28+
The **Amazon Web Services S3 WAF** data connector serves the following use cases:
29+
30+
- **Security monitoring and threat detection:** Analyze AWS WAF logs to help identify and respond to security threats such as SQL injection and cross-site scripting (XSS) attacks. By ingesting these logs into Microsoft Sentinel, you can use its advanced analytics and threat intelligence to detect and investigate malicious activities.
31+
32+
- **Compliance and auditing:** AWS WAF logs provide detailed records of web ACL traffic, which can be crucial for compliance reporting and auditing purposes. The connector ensures that these logs are available within Sentinel for easy access and analysis.
33+
34+
This article explains how to configure the Amazon Web Services S3 WAF connector. The process of setting it up has two parts: the AWS side and the Microsoft Sentinel side. Each side's process produces information used by the other side. This two-way authentication creates secure communication.
35+
36+
## Prerequisites
37+
38+
- You must have write permission on the Microsoft Sentinel workspace.
39+
40+
- Install the Amazon Web Services solution from the **Content Hub** in Microsoft Sentinel. If you have version 3.0.2 of the solution (or earlier) already installed, update the solution in the content hub to ensure you have the latest version that includes this connector. For more information, see [Discover and manage Microsoft Sentinel out-of-the-box content](sentinel-solutions-deploy.md).
41+
42+
## Enable and configure the Amazon Web Services S3 WAF connector
43+
44+
The process of enabling and configuring the connector consists of the following tasks:
45+
46+
- **In your AWS environment:**
47+
48+
The **Amazon Web Services S3 WAF** connector page in Microsoft Sentinel contains downloadable AWS CloudFormation stack templates that automate the following AWS tasks:
49+
50+
- Configure your AWS service(s) to send logs to an **S3 bucket**.
51+
52+
- Create a **Simple Queue Service (SQS) queue** to provide notification.
53+
54+
- Create a **web identity provider** to authenticate users to AWS through OpenID Connect (OIDC).
55+
56+
- Create an **assumed role** to grant permissions to users authenticated by the OIDC web identity provider to access your AWS resources.
57+
58+
- Attach the appropriate **IAM permissions policies** to grant the assumed role access to the appropriate resources (S3 bucket, SQS).
59+
60+
- **In Microsoft Sentinel:**
61+
62+
- Configure the **Amazon Web Services S3 WAF Connector** in the Microsoft Sentinel portal by adding **log collectors** that poll the queue and retrieve log data from the S3 bucket. [See the instructions below](#add-log-collectors).
63+
64+
## Set up the AWS environment
65+
66+
To simplify the onboarding process, the **Amazon Web Services S3 WAF** connector page in Microsoft Sentinel contains downloadable templates for you to use with the AWS CloudFormation service. The CloudFormation service uses these templates to automatically create resource stacks in AWS. These stacks include the resources themselves as described in this article, as well as credentials, permissions, and policies.
67+
68+
### Prepare the template files
69+
70+
To run the script to set up the AWS environment, use the following steps:
71+
72+
1. In the Azure portal, from the Microsoft Sentinel navigation menu, expand **Configuration** and select **Data connectors**.
73+
74+
In the Defender portal, from the quick launch menu, expand **Microsoft Sentinel > Configuration** and select **Data connectors**.
75+
76+
1. Select **Amazon Web Services S3 WAF** from the list of data connectors.
77+
78+
If you don't see the connector, install the Amazon Web Services solution from the **Content hub** under **Content management** in Microsoft Sentinel, or update the solution to the latest version.
79+
80+
1. In the details pane for the connector, select **Open connector page**.
81+
82+
:::image type="content" source="media/connect-aws-s3-waf/find-aws-waf-connector.png" alt-text="Screenshot of data connectors gallery.":::
83+
84+
1. In the **Configuration** section, under **1. AWS CloudFormation Deployment**, select the [AWS CloudFormation Stacks](https://aka.ms/awsCloudFormationLink#/stacks/create) link. This opens the AWS console in a new browser tab.
85+
86+
1. Return to the tab of the portal where you have Microsoft Sentinel open. Select **Download** under *Template 1: OpenID Connect authentication deployment* to download the template that creates the OIDC web identity provider. The template is downloaded as a JSON file to your designated downloads folder.
87+
88+
> [!NOTE]
89+
> If you have the older AWS S3 connector, and therefore you already have an OIDC web identity provider, you can skip this step.
90+
91+
1. Select **Download** under *Template 2: AWS WAF resources deployment* to download the template that creates the other AWS resources. The template is downloaded as a JSON file to your designated downloads folder.
92+
93+
:::image type="content" source="media/connect-aws-s3-waf/configure-connector.png" alt-text="Screenshot of AWS S3 WAF connector configuration page.":::
94+
95+
### Create AWS CloudFormation stacks
96+
97+
Return to the AWS Console browser tab, which is open to the AWS CloudFormation page for creating a stack.
98+
99+
If you're not already logged in to AWS, log in now, and you are redirected to the AWS CloudFormation page.
100+
101+
#### Create the OIDC web identity provider
102+
103+
Follow the instructions on the AWS Console page for creating a new stack.
104+
105+
(If you already have the OIDC web identity provider from the previous version of the AWS S3 connector, skip this step and proceed to [Create the remaining AWS resources](#create-the-remaining-aws-resources).)
106+
107+
1. Specify a template and upload a template file.
108+
109+
1. Select **Choose file** and locate the "*Template 1_ OpenID connect authentication deployment.json*" file you downloaded.
110+
111+
1. Choose a name for the stack.
112+
113+
1. Advance through the rest of the process and create the stack.
114+
115+
#### Create the remaining AWS resources
116+
117+
1. Return to the AWS CloudFormation stacks page and create a new stack.
118+
119+
1. Select **Choose file** and locate the "*Template 2_ AWS WAF resources deployment.json*" file you downloaded.
120+
121+
1. Choose a name for the stack.
122+
123+
1. Where prompted, enter your Microsoft Sentinel Workspace ID. To find your Workspace ID:
124+
125+
- In the Azure portal, in the Microsoft Sentinel navigation menu, expand **Configuration** and select **Settings**. Select the **Workspace settings** tab, and find the Workspace ID on the Log Analytics workspace page.
126+
127+
- In the Defender portal, in the quick launch menu, expand **System** and select **Settings**. Select **Microsoft Sentinel**, then select **Log Analytics settings** under **Settings for `[WORKSPACE_NAME]`**. Find the Workspace ID on the Log Analytics workspace page, which opens in a new browser tab.
128+
129+
1. Advance through the rest of the process and create the stack.
130+
131+
## Add log collectors
132+
133+
When the resource stacks are all created, return to the browser tab open to the data connector page in Microsoft Sentinel, and begin the second part of the configuration process.
134+
135+
1. In the **Configuration** section, under **2. Connect new collectors**, select **Add new collector**.
136+
137+
:::image type="content" source="media/connect-aws-s3-waf/add-new-collector.png" alt-text="Screenshot of second part of AWS connector configuration." lightbox="media/connect-aws-s3-waf/add-new-collector.png":::
138+
139+
1. Input the role ARN of the IAM role that was created. The default name for the role is **OIDC_MicrosoftSentinelRole**, so the role ARN would be <br>`arn:aws:iam::{AWS_ACCOUNT_ID}:role/OIDC_MicrosoftSentinelRole`.
140+
141+
1. Input the name of the SQS queue that was created. The default name for this queue is **SentinelSQSQueue**, so the URL would be <br>`https://sqs.{AWS_REGION}.amazonaws.com/{AWS_ACCOUNT_ID}/SentinelSQSQueue`.
142+
143+
1. Select **Connect** to add the collector. This creates a data collection rule for the Azure Monitor Agent to retrieve the logs and ingest them into the dedicated *AWSWAF* table in your Log Analytics workspace.
144+
145+
:::image type="content" source="media/connect-aws-s3-waf/enter-collector-details.png" alt-text="Screenshot of adding new collector for WAF logs.":::
146+
147+
## Manual setup
148+
149+
Now that the automatic setup process is more reliable, there aren't many good reasons to resort to manual setup. If you must, though, see the [Manual setup instructions](connect-aws.md#manual-setup) in the [Amazon Web Services S3 Connector documentation](connect-aws.md).
150+
151+
## Test and monitor the connector
152+
153+
1. After the connector is set up, go to the **Logs** page (or the **Advanced hunting** page in the Defender portal) and run the following query. If you get any results, the connector is working properly.
154+
155+
```kusto
156+
AWSWAF
157+
| take 10
158+
```
159+
160+
1. If you haven't already done so, we recommend that you implement **data connector health monitoring** so that you can know when connectors are not receiving data or any other issues with connectors. For more information, see [Monitor the health of your data connectors](monitor-data-connector-health.md).
77.1 KB
Loading
72.3 KB
Loading
14.9 KB
Loading

0 commit comments

Comments
 (0)