Skip to content

Commit 0e54a0d

Browse files
authored
Merge pull request #285720 from MicrosoftDocs/main
8/28/2024 AM Publish
2 parents 8744de2 + 08e040e commit 0e54a0d

File tree

60 files changed

+2582
-546
lines changed

Some content is hidden

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

60 files changed

+2582
-546
lines changed

.openpublishing.redirection.sentinel.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/sentinel/best-practices-workspace-architecture.md",
5+
"redirect_url": "/azure/azure-monitor/logs/workspace-design",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "articles/sentinel/design-your-workspace-architecture.md",
10+
"redirect_url": "/azure/azure-monitor/logs/workspace-design",
11+
"redirect_document_id": false
12+
},
313
{
414
"source_path": "articles/sentinel/notebooks-troubleshoot.md",
515
"redirect_url": "/azure/sentinel/notebooks-hunt",

articles/automation/automation-create-alert-triggered-runbook.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Use an alert to trigger an Azure Automation runbook
33
description: This article tells how to trigger a runbook to run when an Azure alert is raised.
44
services: automation
55
ms.subservice: process-automation
6-
ms.date: 12/15/2022
6+
ms.date: 08/28/2024
77
ms.topic: how-to
88
ms.custom: devx-track-azurepowershell
99
#Customer intent: As a developer, I want to trigger a runbook so that VMs can be stopped under certain conditions.
@@ -102,7 +102,7 @@ To use Automation with alerts, you need a runbook that manages the alert JSON pa
102102

103103
As described in the preceding section, each type of alert has a different schema. The script takes the webhook data from an alert in the `WebhookData` runbook input parameter. Then, the script evaluates the JSON payload to determine which alert type is being used.
104104

105-
This example uses an alert from an Azure virtual machine (VM). It retrieves the VM data from the payload, and then uses that information to stop the VM. The connection must be set up in the Automation account where the runbook is run. When using alerts to trigger runbooks, it's important to check the alert status in the runbook that is triggered. The runbook triggers each time the alert changes state. Alerts have multiple states, with the two most common being Activated and Resolved. Check for state in your runbook logic to ensure the runbook doesn't run more than once. The example in this article shows how to look for alerts with state Activated only.
105+
This example utilizes an alert from an Azure virtual machine (VM). It extracts the VM data from the payload, specifically from the target resource of the triggered alert, and then utilizes that information to stop the VM. The connection must be set up in the Automation account where the runbook is run. When using alerts to trigger runbooks, it's important to check the alert status in the runbook that is triggered. The runbook triggers each time the alert changes state. Alerts have multiple states, with the two most common being Activated and Resolved. Check for state in your runbook logic to ensure the runbook doesn't run more than once. The example in this article shows how to look for alerts with state Activated only.
106106

107107
The runbook uses the Automation account [system-assigned managed identity](./automation-security-overview.md#managed-identities) to authenticate with Azure to perform the management action against the VM. The runbook can be easily modified to use a user-assigned managed identity.
108108

articles/azure-maps/map-add-custom-html.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Add an HTML Marker to map | Microsoft Azure Maps
33
description: Learn how to add HTML markers to maps. See how to use the Azure Maps Web SDK to customize markers and add popups and mouse events to a marker.
44
author: sinnypan
55
ms.author: sipa
6-
ms.date: 05/17/2023
6+
ms.date: 08/27/2024
77
ms.topic: how-to
88
ms.service: azure-maps
99
ms.subservice: web-sdk
@@ -47,7 +47,7 @@ map.events.add('click',marker, () => {
4747

4848
For a complete working sample of how to add an HTML marker, see [Simple HTML Marker] in the [Azure Maps Samples]. For the source code for this sample, see [Simple HTML Marker source code].
4949

50-
:::image type="content" source="./media/map-add-custom-html/simple-html-marker.png" alt-text="Screenshot showing a map of the world with a simple HtmlMarker.":::
50+
:::image type="content" source="./media/map-add-custom-html/simple-html-marker.png" lightbox="./media/map-add-custom-html/simple-html-marker.png" alt-text="Screenshot showing a map of the world with a simple HtmlMarker.":::
5151

5252
<!-------------------------------------------------------------------
5353
> [!VIDEO //codepen.io/azuremaps/embed/MVoeVw/?height=500&theme-id=0&default-tab=js,result&embed-version=2&editable=true]
@@ -59,7 +59,7 @@ The default `htmlContent` of an Html marker is an SVG template with place folder
5959

6060
For a complete working sample of how to create a custom SVG template and use it with the HtmlMarker class, see [HTML Marker with Custom SVG Template] in the [Azure Maps Samples]. When running this sample, select the button in the upper left hand side of the window labeled **Update Marker Options** to change the `color` and `text` options from the SVG template used in the HtmlMarker. For the source code for this sample, see [HTML Marker with Custom SVG Template source code].
6161

62-
:::image type="content" source="./media/map-add-custom-html/html-marker-with-custom-svg-template.png" alt-text="Screenshot showing a map of the world with a custom SVG template used with the HtmlMarker class. It includes a button labeled update marker options, that when selected changes the color and text options from the SVG template used in the HtmlMarker. ":::
62+
:::image type="content" source="./media/map-add-custom-html/html-marker-with-custom-svg-template.png" lightbox="./media/map-add-custom-html/html-marker-with-custom-svg-template.png" alt-text="Screenshot showing a map of the world with a custom SVG template used with the HtmlMarker class. It includes a button labeled update marker options, that when selected changes the color and text options from the SVG template used in the HtmlMarker. ":::
6363

6464
<!-------------------------------------------------------------------
6565
> [!VIDEO //codepen.io/azuremaps/embed/LXqMWx/?height=500&theme-id=0&default-tab=js,result&embed-version=2&editable=true]
@@ -183,7 +183,7 @@ The CSS:
183183

184184
For a complete working sample of how to use CSS and HTML to create a marker on the map, see [CSS Styled HTML Marker] in the [Azure Maps Samples]. For the source code for this sample, see [CSS Styled HTML Marker source code].
185185

186-
:::image type="content" source="./media/map-add-custom-html/css-styled-html-marker.gif" alt-text="Screenshot showing a CSS styled HTML marker. ":::
186+
:::image type="content" source="./media/map-add-custom-html/css-styled-html-marker.gif" lightbox="./media/map-add-custom-html/css-styled-html-marker.gif" alt-text="Screenshot showing a CSS styled HTML marker. ":::
187187

188188
<!-------------------------------------------------------------------
189189
> [!VIDEO //codepen.io/azuremaps/embed/qJVgMx/?height=500&theme-id=0&default-tab=js,result&embed-version=2&editable=true]
@@ -195,7 +195,7 @@ This sample shows how to make an HTML marker draggable. HTML markers support `dr
195195

196196
For a complete working sample of how to use CSS and HTML to create a marker on the map, see [Draggable HTML Marker] in the [Azure Maps Samples]. For the source code for this sample, see [Draggable HTML Marker source code].
197197

198-
:::image type="content" source="./media/map-add-custom-html/draggable-html-marker.gif" alt-text="Screenshot showing a map of the United States with a yellow thumb tack being dragged to demonstrate a draggable HTML marker. ":::
198+
:::image type="content" source="./media/map-add-custom-html/draggable-html-marker.gif" lightbox="./media/map-add-custom-html/draggable-html-marker.gif" alt-text="Screenshot showing a map of the United States with a yellow thumb tack being dragged to demonstrate a draggable HTML marker. ":::
199199

200200
<!------------------------------------------------------------------U-
201201
> [!VIDEO //codepen.io/azuremaps/embed/wQZoEV/?height=500&theme-id=0&default-tab=js,result&embed-version=2&editable=true]
@@ -205,7 +205,7 @@ For a complete working sample of how to use CSS and HTML to create a marker on t
205205

206206
For a complete working sample of how to add mouse and drag events to an HTML marker, see [HTML Marker events] in the [Azure Maps Samples]. For the source code for this sample, see [HTML Marker events source code].
207207

208-
:::image type="content" source="./media/map-add-custom-html/html-marker-events.gif" alt-text="Screenshot showing a map of the world with an HtmlMarker and a list of HtmlMarker events that become highlighted in green when that event fires.":::
208+
:::image type="content" source="./media/map-add-custom-html/html-marker-events.gif" lightbox="./media/map-add-custom-html/html-marker-events.gif" alt-text="Screenshot showing a map of the world with an HtmlMarker and a list of HtmlMarker events that become highlighted in green when that event fires.":::
209209

210210
<!-------------------------------------------------------------------
211211
<br/>
-890 KB
Loading
-89.7 KB
Loading
42.5 KB
Loading
146 KB
Loading
137 KB
Loading
21.8 KB
Loading
101 KB
Loading

0 commit comments

Comments
 (0)