Skip to content

Commit 0382688

Browse files
authored
Merge pull request #277693 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 6b34156 + 088feca commit 0382688

File tree

8 files changed

+10
-8
lines changed

8 files changed

+10
-8
lines changed

articles/app-service/environment/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ An App Service Environment can host your:
2323
- Linux web apps
2424
- Docker containers (Windows and Linux)
2525
- Functions
26-
- Logic apps (Standard)
26+
- Logic apps (Standard) - in [supported regions](https://azure.microsoft.com/explore/global-infrastructure/products-by-region/?products=logic-apps&regions=all)
2727

2828
App Service Environments are appropriate for application workloads that require:
2929

articles/azure-monitor/alerts/action-groups.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.custom: references_regions, devx-track-arm-template, has-azure-ad-ps-ref, azu
99
---
1010
# Action groups
1111

12-
When Azure Monitor data indicates that there might be a problem with your infrastructure or application, an alert is triggered. Alerts can contain action groups, which are a collection of notification preferences and actions which are performed when alert is triggered. Azure Monitor, Azure Service Health, and Azure Advisor use action groups to notify users about the alert and take an action.
12+
When Azure Monitor data indicates that there might be a problem with your infrastructure or application, an alert is triggered. You can use an action group to send a notification such as a voice call, SMS or email when the alert is triggered in addition to the alert itself. Action groups are a collection of notification preferences and actions. Azure Monitor, Azure Service Health, and Azure Advisor use action groups to notify users about the alert and take an action.
1313
This article shows you how to create and manage action groups.
1414

1515
Each action is made up of:
@@ -82,7 +82,7 @@ Global requests from clients can be processed by action group services in any re
8282

8383
|Action type|Details |
8484
|---------|---------|
85-
|Automation Runbook|For information about limits on Automation runbook payloads, see [Automation limits](../../azure-resource-manager/management/azure-subscription-service-limits.md#automation-limits). |
85+
|Automation Runbook|Use Automation Runbook to automate tasks based on metrics. For example, shut down resources when a certain threshold in the associated budget is met. For information about limits on Automation runbook payloads, see [Automation limits](../../azure-resource-manager/management/azure-subscription-service-limits.md#automation-limits). |
8686
|Event hubs |An Event Hubs action publishes notifications to Event Hubs. For more information about Event Hubs, see [Azure Event Hubs—A big data streaming platform and event ingestion service](../../event-hubs/event-hubs-about.md). You can subscribe to the alert notification stream from your event receiver. |
8787
|Functions |Calls an existing HTTP trigger endpoint in functions. For more information, see [Azure Functions](../../azure-functions/functions-get-started.md).<br>When you define the function action, the function's HTTP trigger endpoint and access key are saved in the action definition, for example, `https://azfunctionurl.azurewebsites.net/api/httptrigger?code=<access_key>`. If you change the access key for the function, you must remove and re-create the function action in the action group.<br>Your endpoint must support the HTTP POST method.<br>The function must have access to the storage account. If it doesn't have access, keys aren't available and the function URI isn't accessible.<br>[Learn about restoring access to the storage account](../../azure-functions/functions-recover-storage-account.md).|
8888
|ITSM |An ITSM action requires an ITSM connection. To learn how to create an ITSM connection, see [ITSM integration](./itsmc-overview.md). |

articles/azure-monitor/essentials/private-link-data-ingestion.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ The page displays all of the DCEs that are associated with the Azure Monitor wor
2929
Once this is done, navigate to the DCR resource which was created during managed prometheus enablement from the Azure portal and choose 'Resources' under Configuration menu.
3030
In the Data collection endpoint dropdown, pick a DCE in the same region as the AKS cluster. If the Azure Monitor Workspace is in the same region as the AKS cluster, you can reuse the DCE created during managed prometheus enablement. If not, create a DCE in the same region as the AKS cluster and pick that in the dropdown.
3131

32+
:::image type="content" source="media/private-link-data-ingestion/azure-monitor-workspace-data-collection-rule.png" alt-text="A screenshot show the data collection rules page for an Azure Monitor workspace." lightbox="media/private-link-data-ingestion/azure-monitor-workspace-data-collection-rule.png" :::
33+
3234
> [!NOTE]
3335
> Please refer to [Connect to a data source privately](../../../articles/managed-grafana/how-to-connect-to-data-source-privately.md) for details on how to configure private link for querying data from your Azure Monitor workspace using Grafana.
3436
>

articles/defender-for-cloud/faq-cspm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
metadata:
33
title: Common questions - cloud security posture management (CSPM)
44
description: Frequently asked questions about cloud security posture management (CSPM) for Microsoft Defender for Cloud.
5-
author: elkrieger
5+
author: ElazarK
66
ms.author: elkrieger
77
manager: raynew
88
ms.topic: faq

articles/defender-for-cloud/faq-regulatory-compliance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ metadata:
33
title: Common questions - regulatory compliance questions
44
description: Frequently asked general questions about regulatory compliance
55
services: defender-for-cloud
6-
author: elkrieger
6+
author: ElazarK
77
ms.author: elkrieger
88
manager: raynew
99
ms.topic: faq

articles/defender-for-cloud/faq-scanner-detection.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ metadata:
33
title: Common questions about the built-in Microsoft Defender Vulnerability Management solution
44
description: Frequently asked general questions about the built-in Microsoft Defender Vulnerability Management solution
55
services: defender-for-cloud
6-
author: elkrieger
6+
author: ElazarK
77
ms.author: elkrieger
88
manager: raynew
99
ms.topic: faq

articles/defender-for-cloud/index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ summary: Microsoft Defender for Cloud provides unified security management and a
66
metadata:
77
title: Microsoft Defender for Cloud documentation
88
description: Get started with Defender for Cloud, learn how to secure your workloads, limit risks, and detect and respond to attacks with our quickstarts & tutorials.
9-
author: elkrieger
9+
author: ElazarK
1010
ms.author: elkrieger
1111
manager: raynew
1212
ms.topic: landing-page

articles/iot-operations/process-data/concept-jq-expression.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ While this expression appears to change the input object, in jq it's producing a
7777
```json
7878
{
7979
"temperature": 21,
80-
"humidity": 65
80+
"humidity": 63
8181
}
8282
```
8383

0 commit comments

Comments
 (0)