Skip to content

Commit afb2950

Browse files
authored
Merge branch 'main' into docs-editor/microsoft-defender-antivirus-c-1737991884
2 parents 51a2396 + 127f021 commit afb2950

File tree

105 files changed

+771
-575
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+771
-575
lines changed

.acrolinx-config.edn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ For more information about the exception criteria and exception process, see [Mi
3939
4040
Select the total score link to review all feedback on clarity, consistency, tone, brand, terms, spelling, grammar, readability, and inclusive language. _You should fix all spelling errors regardless of your total score_. Fixing spelling errors helps maintain customer trust in overall content quality.
4141
42-
| Article | Total score<br>(Required: 80) | Words + phrases<br>(Brand, terms) | Correctness<br>(Spelling, grammar) | Clarity<br>(Readability) |
42+
| Article | Total score<br>(Required: 80) | Terminology | Spelling and Grammar| Clarity<br>(Readability) |
4343
|---------|:--------------:|:--------------------:|:------:|:---------:|
4444
"
4545

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: PR has no warnings or errors
2+
3+
permissions:
4+
pull-requests: write
5+
statuses: write
6+
7+
on:
8+
issue_comment:
9+
types: [created]
10+
11+
jobs:
12+
13+
build-status:
14+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-BuildValidation.yml@workflows-prod
15+
with:
16+
PayloadJson: ${{ toJSON(github) }}
17+
secrets:
18+
AccessToken: ${{ secrets.GITHUB_TOKEN }}
19+
20+
21+

ATADocs/index.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ metadata:
88
description: Protect your enterprise using information from multiple network data-sources to learn the behavior of users and entities in your organization.
99
services: service
1010
ms.service: advanced-threat-analytics
11-
ms.subservice: ms.subservice
1211
ms.topic: landing-page
1312
ms.collection: M365-security-compliance
1413
author: batamig

ATPDocs/index.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ metadata:
66
title: Microsoft Defender for Identity documentation
77
description: Microsoft Defender for Identity cloud service helps protect your enterprise hybrid environments from multiple types of advanced targeted cyber attacks and insider threats.
88
services: service
9-
ms.service: azure-advanced-threat-protection
10-
ms.subservice: subservice
9+
ms.service: microsoft-defender-for-identity
1110
ms.topic: landing-page
1211
ms.collection: M365-security-compliance
1312
author: batamig

CloudAppSecurityDocs/discovery-docker-ubuntu-azure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ If you require more than 10 data sources, we recommend that you split the data s
4646
To work with a network appliance that isn't listed, select **Other > Customer log format** or **Other (manual only)**. For more information, see [Working with the custom log parser](custom-log-parser.md).
4747

4848
>[!NOTE]
49-
>Integrating with secure transfer protocols (FTPS and Syslog – TLS) often requires additional settings or your firewall/proxy.
49+
>Integrating with secure transfer protocols (FTPS and Syslog – TLS) often requires additional settings on your firewall/proxy. For more information, see [Advanced log collector management](log-collector-advanced-management.md).
5050
5151
Repeat this process for each firewall and proxy whose logs can be used to detect traffic on your network.
5252

CloudAppSecurityDocs/index.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ metadata:
88
description: Microsoft Defender for Cloud Apps delivers full protection for SaaS applications, helping you monitor and protect your cloud app data, using fundamental cloud access security broker (CASB) functionality, SaaS Security Posture Management (SSPM) features, advanced threat protection, and app-to-app protection.
99
services: na
1010
ms.service: defender-for-cloud-apps
11-
ms.subservice: na
1211
ms.topic: landing-page
1312
ms.collection: na
1413
author: batamig
@@ -49,6 +48,8 @@ landingContent:
4948
links:
5049
- text: Basic setup
5150
url: general-setup.md
51+
- text: Connect cloud apps
52+
url: enable-instant-visibility-protection-and-governance-actions-for-your-apps.md
5253
- text: View and manage security posture
5354
url: security-saas.md
5455
- linkListType: concept
@@ -71,8 +72,6 @@ landingContent:
7172
links:
7273
- text: Calculate risk scores
7374
url: risk-score.md
74-
- text: Connect cloud apps
75-
url: enable-instant-visibility-protection-and-governance-actions-for-your-apps.md
7675
- text: Collect logs
7776
url: discovery-docker.md
7877
- text: Discover and manage shadow IT
@@ -138,4 +137,4 @@ landingContent:
138137
- text: Monitor and respond to unusual data usage
139138
url: app-governance-monitor-apps-unusual-data-usage.md
140139
- text: Secure apps with app hygiene
141-
url: app-governance-secure-apps-app-hygiene-features.md
140+
url: app-governance-secure-apps-app-hygiene-features.md

CloudAppSecurityDocs/log-collector-advanced-management.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ You should be able to view the following contents:
5050
- `ssl_update`
5151
- `config.json`
5252

53-
### Customize certificate files
53+
### Add certificate files
5454

55-
This procedure describes how to customize the certificate files used for secure connections to the cloud discovery Docker instance.
55+
This procedure describes how to add the required certificate files used for secure connections to the cloud discovery Docker instance.
5656

5757
1. Open an FTP client and connect to the log collector host.
5858

@@ -63,7 +63,7 @@ This procedure describes how to customize the certificate files used for secure
6363
| **FTP** |- **pure-ftpd.pem**: Includes the key and certificate data |
6464
| **Syslog** |- **ca.pem**: The certificate authority's certificate that was used to sign the client’s certificate. <br>- **server-key.pem** and **server-cert.pem**: The log collector's certificate and key <br><br>Syslog messages are sent over TLS to the log collector, which requires mutual TLS authentication, including authenticating both the client and server certificates. |
6565

66-
Filenames are mandatory. If any of the files are missing, the update fails.
66+
Files are mandatory. If any of the files for the receiver type are missing, the update fails.
6767

6868
1. In a terminal window, run:
6969

@@ -161,7 +161,7 @@ docker cp Proxy-CA.crt Ubuntu-LogCollector:/var/adallom/ftp/discovery
161161
162162
To secure the docker image and ensure that only one IP address is allowed to send the syslog messages to the log collector, create an IP table rule on the host machine to allow input traffic and drop the traffic coming over specific ports, such as TCP/601 or UDP/514, depending on the deployment.
163163
164-
The following command shows an example of how to create an IP table rule that can be added to the host machine. This table rule allows the IP address `1.2.3.4`` to connect to the log collector container over TCP port 601, and drop all other connections coming from other IP addresses over the same port.
164+
The following command shows an example of how to create an IP table rule that can be added to the host machine. This table rule allows the IP address `1.2.3.4` to connect to the log collector container over TCP port 601, and drop all other connections coming from other IP addresses over the same port.
165165
166166
```bash
167167
iptables -I DOCKER-USER \! --src 1.2.3.4 -m tcp -p tcp --dport 601 -j DROP
@@ -171,7 +171,7 @@ iptables -I DOCKER-USER \! --src 1.2.3.4 -m tcp -p tcp --dport 601 -j DROP
171171
172172
The container is now ready.
173173
174-
Run the **collector_config** command using the API token that you used during the creation of your log collector. For example:
174+
Run the `collector_config` command using the API token that you used during the creation of your log collector. For example:
175175
176176
:::image type="content" source="media/log-collector-advanced-tasks/docker-3.png" alt-text="Screenshot of the Create log collector dialog." border="false":::
177177
@@ -520,7 +520,7 @@ Compare the output file (`/tmp/log.log`) to the messages stored in the `/var/ada
520520
When updating your log collector:
521521
522522
- **Before installing the new version**, make sure to stop your log collector and remove the current image.
523-
- **After installing the new version**, [update your certificate files](#customize-certificate-files).
523+
- **After installing the new version**, [update your certificate files](#add-certificate-files).
524524
525525
## Next steps
526526

CloudAppSecurityDocs/mde-integration.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,12 @@ To enable Defender for Endpoint integration with Defender for Cloud Apps:
6565

6666
1. In the [Microsoft Defender portal](https://security.microsoft.com), from the navigation pane, select **Settings** > **Endpoints** > **General** > **Advanced features**.
6767
1. Toggle the **Microsoft Defender for Cloud Apps** to **On**.
68-
1. Select **Apply**.
68+
1. Select **Save preferences**.
6969

7070
>[!NOTE]
7171
> It takes up to two hours after you enable the integration for the data to show up in Defender for Cloud Apps.
7272
>
73-
74-
![Screenshot of the Defender for Endpoint settings.](media/mde-settings.png)
73+
![Screenshot of the Defender for Endpoint settings.](media\turn-on-advanced-features-for-microsoft-defender-for-cloud-apps.png)
7574

7675
To configure the severity for alerts sent to Microsoft Defender for Endpoint:
7776

-100 KB
Binary file not shown.
174 KB
Loading

0 commit comments

Comments
 (0)