Skip to content

Commit 1befe82

Browse files
committed
merge conflicts
1 parent 2395335 commit 1befe82

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

articles/sentinel/automation/create-playbooks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ Do the following to create your playbook:
9494

9595
:::image type="content" source="../media/tutorial-respond-threats-playbook/logic-app-blank.png" alt-text="Screenshot of logic app designer screen with opening trigger." lightbox="../media/tutorial-respond-threats-playbook/logic-app-blank.png":::
9696

97-
1. If you chose the **Microsoft Sentinel entity (Preview)** trigger, select the type of entity you want this playbook to receive as an input.
97+
1. If you chose the **Microsoft Sentinel entity** trigger, select the type of entity you want this playbook to receive as an input.
9898

9999
:::image type="content" source="../media/tutorial-respond-threats-playbook/entity-trigger-types.png" alt-text="Screenshot of drop-down list of entity types to choose from to set playbook schema.":::
100100

articles/sentinel/automation/playbook-triggers-actions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ For more information, see [Roles and permissions in Microsoft Sentinel](../roles
3535

3636
The Microsoft Sentinel connector, and therefore Microsoft Sentinel playbooks, support the following triggers:
3737

38-
- **Microsoft Sentinel incident (Preview)**. Recommended for most incident automation scenarios.
38+
- **Microsoft Sentinel incident**. Recommended for most incident automation scenarios.
3939

4040
The playbook receives incident objects, including both entities and alerts. This trigger allows you to attach a playbook to an automation rule that can be triggered whenever an incident is created or updated in Microsoft Sentinel, applying all the [benefits of automation rules](../automate-incident-handling-with-automation-rules.md) to the incident.
4141

@@ -44,7 +44,7 @@ The Microsoft Sentinel connector, and therefore Microsoft Sentinel playbooks, su
4444
- This trigger can't be used to automate responses for alerts generated by *Microsoft security* analytics rules.
4545
- Playbooks using this trigger can't be called by automation rules.
4646

47-
- **Microsoft Sentinel entity (Preview)**. Recommended for playbooks that must be run manually on specific entities from an investigation or threat hunting context. Playbooks using this trigger can't be called by automation rules.
47+
- **Microsoft Sentinel entity**. Recommended for playbooks that must be run manually on specific entities from an investigation or threat hunting context. Playbooks using this trigger can't be called by automation rules.
4848

4949
The schemas used by these flows aren't identical. We recommend using the **Microsoft Sentinel incident trigger** flow for most scenarios.
5050

0 commit comments

Comments
 (0)