Skip to content

Commit e37c4fe

Browse files
committed
Merge branch 'main' into diannegali-xdriotalert
2 parents 1f2f8e9 + af5828d commit e37c4fe

File tree

40 files changed

+605
-513
lines changed

40 files changed

+605
-513
lines changed

defender-endpoint/enable-controlled-folders.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.collection:
1515
- tier3
1616
- mde-asr
1717
search.appverid: met150
18-
ms.date: 06/11/2024
18+
ms.date: 07/17/2024
1919
---
2020

2121
# Enable controlled folder access
@@ -47,10 +47,10 @@ You can enable controlled folder access by using any of these methods:
4747
> [!TIP]
4848
> Try using [audit mode](evaluate-controlled-folder-access.md) at first so you can see how the feature works and review events without impacting normal device usage in your organization.
4949
50-
Group Policy settings that disable local administrator list merging will override controlled folder access settings. They also override protected folders and allowed apps set by the local administrator through controlled folder access. These policies include:
51-
52-
- Microsoft Defender Antivirus **Configure local administrator merge behavior for lists**
53-
- System Center Endpoint Protection **Allow users to add exclusions and overrides**
50+
> [!NOTE]
51+
> If you add Microsoft Defender Antivirus exclusions (process or path) for the binary in question, controlled folder access trusts it, and doesn't block the process or path. Group Policy settings that disable local administrator list merging override controlled folder access settings. They also override protected folders and allowed apps set by the local administrator through controlled folder access. These policies include:
52+
> - Microsoft Defender Antivirus **Configure local administrator merge behavior for lists**
53+
> - System Center Endpoint Protection **Allow users to add exclusions and overrides**
5454
5555
For more information about disabling local list merging, see [Prevent or allow users to locally modify Microsoft Defender Antivirus policy settings](/windows/security/threat-protection/microsoft-defender-antivirus/configure-local-policy-overrides-microsoft-defender-antivirus).
5656

defender-endpoint/ios-configure-features.md

Lines changed: 242 additions & 185 deletions
Large diffs are not rendered by default.

defender-endpoint/linux-install-with-ansible.md

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,13 @@ ms.collection:
1515
ms.topic: conceptual
1616
ms.subservice: linux
1717
search.appverid: met150
18-
ms.date: 05/01/2024
18+
ms.date: 07/10/2024
1919
---
2020

2121
# Deploy Microsoft Defender for Endpoint on Linux with Ansible
2222

2323
[!INCLUDE [Microsoft Defender XDR rebranding](../includes/microsoft-defender.md)]
2424

25-
2625
**Applies to:**
2726

2827
- [Microsoft Defender for Endpoint Plan 1](microsoft-defender-endpoint.md)
@@ -129,11 +128,17 @@ Create a subtask or role files that contribute to a playbook or task.
129128

130129
- Add the Defender for Endpoint repository and key, `add_apt_repo.yml`:
131130

132-
Defender for Endpoint on Linux can be deployed from one of the following channels (denoted below as *[channel]*): *insiders-fast*, *insiders-slow*, or *prod*. Each of these channels corresponds to a Linux software repository.
131+
Defender for Endpoint on Linux can be deployed from one of the following channels:
132+
- *insiders-fast*, denoted as `[channel]`
133+
- *insiders-slow*, denoted as `[channel]`
134+
- *prod*, denoted as `[channel]` using the version name (see [Linux Software Repository for Microsoft Products](/linux/packages))
135+
136+
Each channel corresponds to a Linux software repository.
137+
138+
The choice of the channel determines the type and frequency of updates that are offered to your device. Devices in *insiders-fast* are the first ones to receive updates and new features, followed later by *insiders-slow*, and lastly by *prod*.
133139

134-
The choice of the channel determines the type and frequency of updates that are offered to your device. Devices in *insiders-fast* are the first ones to receive updates and new features, followed later by *insiders-slow* and lastly by *prod*.
135140

136-
In order to preview new features and provide early feedback, it is recommended that you configure some devices in your enterprise to use either *insiders-fast* or *insiders-slow*.
141+
In order to preview new features and provide early feedback, it's recommended that you configure some devices in your enterprise to use either *insiders-fast* or *insiders-slow*.
137142
138143
> [!WARNING]
139144
> Switching the channel after the initial installation requires the product to be reinstalled. To switch the product channel: uninstall the existing package, re-configure your device to use the new channel, and follow the steps in this document to install the package from the new location.

defender-endpoint/linux-install-with-puppet.md

Lines changed: 45 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.collection:
1515
ms.topic: conceptual
1616
ms.subservice: linux
1717
search.appverid: met150
18-
ms.date: 05/01/2024
18+
ms.date: 07/15/2024
1919
---
2020

2121
# Deploy Microsoft Defender for Endpoint on Linux with Puppet
@@ -53,9 +53,11 @@ Download the onboarding package from Microsoft Defender portal.
5353

5454
[!INCLUDE [Defender for Endpoint repackaging warning](../includes/repackaging-warning.md)]
5555

56-
1. In Microsoft Defender portal, go to **Settings > Endpoints > Device management > Onboarding**.
56+
1. In Microsoft Defender portal, go to **Settings** > **Endpoints** > **Device management** > **Onboarding**.
57+
5758
2. In the first drop-down menu, select **Linux Server** as the operating system. In the second drop-down menu, select **Your preferred Linux configuration management tool** as the deployment method.
58-
3. Select **Download onboarding package**. Save the file as WindowsDefenderATPOnboardingPackage.zip.
59+
60+
3. Select **Download onboarding package**. Save the file as `WindowsDefenderATPOnboardingPackage.zip`.
5961

6062
:::image type="content" source="media/portal-onboarding-linux-2.png" alt-text="The option to download the onboarded package" lightbox="media/portal-onboarding-linux-2.png":::
6163

@@ -83,37 +85,47 @@ Download the onboarding package from Microsoft Defender portal.
8385

8486
## Create a Puppet manifest
8587

86-
You need to create a Puppet manifest for deploying Defender for Endpoint on Linux to devices managed by a Puppet server. This example makes use of the *apt* and *yumrepo* modules available from puppetlabs, and assumes that the modules have been installed on your Puppet server.
87-
88-
Create the folders *install_mdatp/files* and *install_mdatp/manifests* under the modules folder of your Puppet installation. This folder is typically located in */etc/puppetlabs/code/environments/production/modules* on your Puppet server. Copy the mdatp_onboard.json file created above to the *install_mdatp/files* folder. Create an *init.pp* file that contains the deployment instructions:
89-
90-
```bash
91-
pwd
92-
```
93-
94-
```Output
95-
/etc/puppetlabs/code/environments/production/modules
96-
```
88+
You need to create a Puppet manifest for deploying Defender for Endpoint on Linux to devices managed by a Puppet server. This example makes use of the `apt` and `yumrepo` modules available from puppetlabs, and assumes that the modules have been installed on your Puppet server.
89+
90+
1. Create the folders `install_mdatp/files` and `install_mdatp/manifests` under the modules folder of your Puppet installation. This folder is typically located in `/etc/puppetlabs/code/environments/production/modules` on your Puppet server.
91+
92+
2. Copy the `mdatp_onboard.json` file created earlier to the `install_mdatp/files` folder.
93+
94+
3. Create an `init.pp` file that contains the deployment instructions:
95+
96+
```bash
97+
pwd
98+
```
99+
100+
```Output
101+
/etc/puppetlabs/code/environments/production/modules
102+
```
103+
104+
```bash
105+
tree install_mdatp
106+
```
107+
108+
```Output
109+
install_mdatp
110+
├── files
111+
│ └── mdatp_onboard.json
112+
└── manifests
113+
└── init.pp
114+
```
97115

98-
```bash
99-
tree install_mdatp
100-
```
116+
### Contents of `install_mdatp/manifests/init.pp`
101117

102-
```Output
103-
install_mdatp
104-
├── files
105-
│ └── mdatp_onboard.json
106-
└── manifests
107-
└── init.pp
108-
```
118+
Defender for Endpoint on Linux can be deployed from one of the following channels:
109119

110-
### Contents of `install_mdatp/manifests/init.pp`
120+
- *insiders-fast*, denoted as `[channel]`
121+
- *insiders-slow*, denoted as `[channel]`
122+
- *prod*, denoted as `[channel]` using the version name (see [Linux Software Repository for Microsoft Products](/linux/packages))
111123

112-
Defender for Endpoint on Linux can be deployed from one of the following channels (denoted below as *[channel]*): *insiders-fast*, *insiders-slow*, or *prod*. Each of these channels corresponds to a Linux software repository.
124+
Each channel corresponds to a Linux software repository.
113125

114-
The choice of the channel determines the type and frequency of updates that are offered to your device. Devices in *insiders-fast* are the first ones to receive updates and new features, followed later by *insiders-slow* and lastly by *prod*.
126+
The choice of the channel determines the type and frequency of updates that are offered to your device. Devices in *insiders-fast* are the first ones to receive updates and new features, followed later by *insiders-slow*, and lastly by *prod*.
115127

116-
In order to preview new features and provide early feedback, it is recommended that you configure some devices in your enterprise to use either *insiders-fast* or *insiders-slow*.
128+
In order to preview new features and provide early feedback, it's recommended that you configure some devices in your enterprise to use either *insiders-fast* or *insiders-slow*.
117129
118130
> [!WARNING]
119131
> Switching the channel after the initial installation requires the product to be reinstalled. To switch the product channel: uninstall the existing package, re-configure your device to use the new channel, and follow the steps in this document to install the package from the new location.
@@ -194,7 +206,7 @@ class install_mdatp (
194206
195207
## Deployment
196208
197-
Include the above manifest in your site.pp file:
209+
Include the above manifest in your `site.pp` file:
198210
199211
```bash
200212
cat /etc/puppetlabs/code/environments/production/manifests/site.pp
@@ -242,8 +254,8 @@ The above command prints `1` if the product is onboarded and functioning as expe
242254
243255
If the product is not healthy, the exit code (which can be checked through `echo $?`) indicates the problem:
244256
245-
- 1 if the device isn't onboarded yet.
246-
- 3 if the connection to the daemon cannot be established.
257+
- `1` if the device isn't onboarded yet.
258+
- `3` if the connection to the daemon cannot be established.
247259
248260
## Log installation issues
249261
@@ -255,7 +267,7 @@ When upgrading your operating system to a new major version, you must first unin
255267
256268
## Uninstallation
257269
258-
Create a module *remove_mdatp* similar to *install_mdatp* with the following contents in *init.pp* file:
270+
Create a module `remove_mdatp` similar to `install_mdatp` with the following contents in `init.pp` file:
259271
260272
```bash
261273
class remove_mdatp {
@@ -264,4 +276,5 @@ class remove_mdatp {
264276
}
265277
}
266278
```
279+
267280
[!INCLUDE [Microsoft Defender for Endpoint Tech Community](../includes/defender-mde-techcommunity.md)]

0 commit comments

Comments
 (0)