Skip to content

Commit 72583d1

Browse files
committed
resolve conflict
1 parent bc7f064 commit 72583d1

File tree

3 files changed

+16
-12
lines changed

3 files changed

+16
-12
lines changed

articles/defender-for-iot/organizations/how-to-manage-cloud-alerts.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Microsoft Defender for IoT alerts enhance your network security and operations w
1313

1414
- [Integrate with Microsoft Sentinel](iot-solution.md) to view Defender for IoT alerts in Microsoft Sentinel and manage them together with security incidents.
1515

16-
- If you have an [Enterprise IoT plan](eiot-defender-for-endpoint.md) with Microsoft Defender for Endpoint, alerts for Enterprise IoT devices detected by Microsoft Defender for Endpoint are available in Defender for Endpoint only.
16+
- If you have an [Enterprise IoT plan](eiot-defender-for-endpoint.md) with Microsoft Defender for Endpoint, alerts for Enterprise IoT devices detected by Microsoft Defender for Endpoint are available in Defender for Endpoint only.
1717

1818
For more information, see [Securing IoT devices in the enterprise](concept-enterprise.md) and the [Alerts queue in Microsoft 365 Defender](/microsoft-365/security/defender-endpoint/alerts-queue-endpoint-detection-response).
1919

@@ -115,8 +115,8 @@ For more information, see [Alert statuses and triaging options](alerts.md#alert-
115115

116116
In Defender for IoT in the Azure portal, select the **Alerts** page on the left, and then do one of the following:
117117

118-
- Select one or more learnable alerts in the grid and then select :::image type="icon" source="media/how-to-manage-sensors-on-the-cloud/learn-icon.png" border="false"::: **Learn** in the toolbar.
119-
- On an alert details page for a learnable alert, in the **Take Action** tab, select **Learn**.
118+
- Select one or more learnable alerts in the grid and then select :::image type="icon" source="media/how-to-manage-sensors-on-the-cloud/learn-icon.png" border="false"::: **Learn** in the toolbar.
119+
- On an alert details page for a learnable alert, in the **Take Action** tab, select **Learn**.
120120

121121
## Access alert PCAP data
122122

@@ -144,7 +144,6 @@ You may want to export a selection of alerts to a CSV file for offline sharing a
144144

145145
The file is generated, and you're prompted to save it locally.
146146

147-
148147
## Next steps
149148

150149
> [!div class="nextstepaction"]
@@ -155,3 +154,6 @@ The file is generated, and you're prompted to save it locally.
155154
156155
> [!div class="nextstepaction"]
157156
> [Microsoft Defender for IoT alerts](alerts.md)
157+
158+
> [!div class="nextstepaction"]
159+
> [Data retention across Microsoft Defender for IoT](references-data-retention.md)

articles/defender-for-iot/organizations/how-to-view-alerts.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ For more information, see [Alert statuses and triaging options](alerts.md#alert-
107107

108108
Sign into your OT sensor console and select the **Alerts** page on the left, and then do one of the following:
109109

110-
- Select one or more learnable alerts in the grid and then select :::image type="icon" source="media/how-to-manage-sensors-on-the-cloud/learn-icon.png" border="false"::: **Learn** in the toolbar.
111-
- On an alert details page, in the **Take Action** tab, select **Learn**.
110+
- Select one or more learnable alerts in the grid and then select :::image type="icon" source="media/how-to-manage-sensors-on-the-cloud/learn-icon.png" border="false"::: **Learn** in the toolbar.
111+
- On an alert details page, in the **Take Action** tab, select **Learn**.
112112

113113
- **To mute an alert**:
114114

@@ -124,7 +124,6 @@ For more information, see [Alert statuses and triaging options](alerts.md#alert-
124124

125125
After you unlearn or unmute an alert, alerts are re-triggered whenever the sensor senses the selected traffic combination.
126126

127-
128127
## Access alert PCAP data
129128

130129
You might want to access raw traffic files, also known as *packet capture files* or *PCAP* files as part of your investigation.
@@ -179,7 +178,6 @@ If your admin has [created custom comments](how-to-accelerate-alert-incident-res
179178

180179
For more information, see [Accelerating OT alert workflows](alerts.md#accelerating-ot-alert-workflows).
181180

182-
183181
## Next steps
184182

185183
> [!div class="nextstepaction"]
@@ -198,4 +196,7 @@ For more information, see [Accelerating OT alert workflows](alerts.md#accelerati
198196
> [OT monitoring alert types and descriptions](alert-engine-messages.md)
199197
200198
> [!div class="nextstepaction"]
201-
> [Microsoft Defender for IoT alerts](alerts.md)
199+
> [Microsoft Defender for IoT alerts](alerts.md)
200+
201+
> [!div class="nextstepaction"]
202+
> [Data retention across Microsoft Defender for IoT](references-data-retention.md)

articles/defender-for-iot/organizations/how-to-work-with-alerts-on-premises-management-console.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,6 @@ You may want to export a selection of alerts to a CSV file for offline sharing a
7070

7171
The CSV file is generated, and you're prompted to save it locally.
7272

73-
74-
7573
## Next steps
7674

7775
> [!div class="nextstepaction"]
@@ -87,4 +85,7 @@ The CSV file is generated, and you're prompted to save it locally.
8785
> [Forward alert information](how-to-forward-alert-information-to-partners.md)
8886
8987
> [!div class="nextstepaction"]
90-
> [Microsoft Defender for IoT alerts](alerts.md)
88+
> [Microsoft Defender for IoT alerts](alerts.md)
89+
90+
> [!div class="nextstepaction"]
91+
> [Data retention across Microsoft Defender for IoT](references-data-retention.md)

0 commit comments

Comments
 (0)