Skip to content

Commit e9c5eca

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into app-articles-batch-14
2 parents 01d6df1 + 9f1ae84 commit e9c5eca

File tree

157 files changed

+1402
-1539
lines changed

Some content is hidden

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

157 files changed

+1402
-1539
lines changed

.openpublishing.redirection.healthcare-apis.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -625,6 +625,14 @@
625625
"redirect_url": "/azure/healthcare-apis/iot/git-projects",
626626
"redirect_document_id": false
627627
},
628+
{ "source_path_from_root": "/articles/healthcare-apis/iot/how-to-use-calculated-functions-mappings.md",
629+
"redirect_url": "/azure/healthcare-apis/iot/how-to-use-calculatedcontenttemplate-mappings",
630+
"redirect_document_id": false
631+
},
632+
{ "source_path_from_root": "/articles/healthcare-apis/iot/how-to-use-iot-jsonpath-content-mappings.md",
633+
"redirect_url": "/azure/healthcare-apis/iot/how-to-use-iotjsonpathcontenttemplate-mappings",
634+
"redirect_document_id": false
635+
},
628636
{ "source_path_from_root": "/articles/healthcare-apis/events/events-display-metrics.md",
629637
"redirect_url": "/azure/healthcare-apis/events/events-use-metrics",
630638
"redirect_document_id": false

.openpublishing.redirection.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27752,7 +27752,12 @@
2775227752
"source_path_from_root": "/articles/virtual-machines/workloads/sap/sap-high-availability-multi-sid.md",
2775327753
"redirect_url": "/azure/virtual-machines/workloads/sap/sap-ascs-ha-multi-sid-wsfc-shared-disk",
2775427754
"redirect_document_id": false
27755-
},
27755+
},
27756+
{
27757+
"source_path_from_root": "/articles/virtual-machines/workloads/sap/dbms_guide_sapase.md",
27758+
"redirect_url": "/azure/virtual-machines/workloads/sap/dbms-guide-sapase",
27759+
"redirect_document_id": false
27760+
},
2775627761
{
2775727762
"source_path_from_root": "/articles/migrate/how-to-scale-assessment.md",
2775827763
"redirect_url": "scale-hyper-v-assessment",

articles/active-directory-b2c/add-api-connector.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: active-directory-b2c
55
ms.service: active-directory
66
ms.subservice: B2C
77
ms.topic: how-to
8-
ms.date: 11/09/2021
8+
ms.date: 12/20/2022
99

1010
ms.author: kengaderdus
1111
author: kengaderdus
@@ -16,6 +16,8 @@ zone_pivot_groups: b2c-policy-type
1616

1717
# Add an API connector to a sign-up user flow
1818

19+
[!INCLUDE [active-directory-b2c-choose-user-flow-or-custom-policy](../../includes/active-directory-b2c-choose-user-flow-or-custom-policy.md)]
20+
1921
As a developer or IT administrator, you can use API connectors to integrate your sign-up user flows with REST APIs to customize the sign-up experience and integrate with external systems. At the end of this walkthrough, you'll be able to create an Azure AD B2C user flow that interacts with [REST API services](api-connectors-overview.md) to modify your sign-up experiences.
2022

2123
::: zone pivot="b2c-user-flow"

articles/active-directory-b2c/configure-user-input.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: CelesteDG
99
ms.service: active-directory
1010
ms.workload: identity
1111
ms.topic: how-to
12-
ms.date: 10/22/2021
12+
ms.date: 12/28/2022
1313
ms.custom: project-no-code
1414
ms.author: kengaderdus
1515
ms.subservice: B2C

articles/active-directory-b2c/identity-provider-generic-openid-connect.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,17 @@ manager: CelesteDG
99
ms.service: active-directory
1010
ms.workload: identity
1111
ms.topic: how-to
12-
ms.date: 10/15/2021
12+
ms.date: 12/28/2022
1313
ms.author: kengaderdus
1414
ms.subservice: B2C
1515
zone_pivot_groups: b2c-policy-type
1616
---
1717

1818
# Set up sign-up and sign-in with generic OpenID Connect using Azure Active Directory B2C
1919

20+
[!INCLUDE [active-directory-b2c-choose-user-flow-or-custom-policy](../../includes/active-directory-b2c-choose-user-flow-or-custom-policy.md)]
21+
22+
2023
[OpenID Connect](openid-connect.md) is an authentication protocol built on top of OAuth 2.0 that can be used for secure user sign-in. Most identity providers that use this protocol are supported in Azure AD B2C.
2124

2225
This article explains how you can add custom OpenID Connect identity providers into your user flows.

articles/active-directory-b2c/language-customization.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: CelesteDG
88
ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: how-to
11-
ms.date: 09/16/2021
11+
ms.date: 12/28/2022
1212
ms.custom: project-no-code
1313
ms.author: kengaderdus
1414
ms.subservice: B2C

articles/active-directory-b2c/user-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: CelesteDG
88
ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: conceptual
11-
ms.date: 10/22/2021
11+
ms.date: 12/28/2022
1212
ms.author: kengaderdus
1313
ms.subservice: B2C
1414
ms.custom: b2c-support

articles/app-service/tutorial-dotnetcore-sqldb-app.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,7 @@ Pricing for the create resources is as follows:
344344

345345
Take the autogenerated workflow file from App Service as an example, each `git push` kicks off a new build and deployment run. From a local clone of the GitHub repository, you make the desired updates push it to GitHub. For example:
346346

347+
347348
```terminal
348349
git add .
349350
git commit -m "<some-message>"

articles/azure-arc/data/validation-program.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ To see how all Azure Arc-enabled components are validated, see [Validation progr
4545
|Solution and version | Kubernetes version | Azure Arc-enabled data services version | SQL engine version | PostgreSQL server version
4646
|-----|-----|-----|-----|-----|
4747
|HPE Superdome Flex 280|1.20.0|1.8.0_2022-06-14|16.0.41.7339|12.3 (Ubuntu 12.3-1)
48+
|HPE Apollo 4200 Gen10 Plus|1.22.6|1.11.0_2022-09-13|12.3 (Ubuntu 12.3-1)|
4849

4950
### Kublr
5051

articles/azure-monitor/alerts/alerts-create-new-alert-rule.md

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ author: AbbyMSFT
55
ms.author: abbyweisberg
66
ms.topic: conceptual
77
ms.custom: ignite-2022
8-
ms.date: 08/23/2022
8+
ms.date: 12/27/2022
99
ms.reviewer: harelbr
1010
---
1111
# Create a new alert rule
1212

13-
This article shows you how to create an alert rule. To learn more about alerts, see [What are Azure Monitor alerts?](alerts-overview.md).
13+
This article shows you how to create an alert rule. To learn more about alerts, see the [alerts overview](alerts-overview.md).
1414

1515
You create an alert rule by combining:
1616
- The resources to be monitored.
@@ -28,9 +28,12 @@ Then you define these elements for the resulting alert actions by using:
2828

2929
:::image type="content" source="media/alerts-create-new-alert-rule/alerts-create-new-alert-rule.png" alt-text="Screenshot that shows steps to create a new alert rule.":::
3030

31-
1. On the **Select a resource** pane, set the scope for your alert rule. You can filter by **subscription**, **resource type**, or **resource location**. You can also do a search.
31+
1. On the **Select a resource** pane, set the scope for your alert rule. You can filter by **subscription**, **resource type**, or **resource location**.
3232

33-
**Available signal types** for your selected resources are at the bottom right of the pane.
33+
The **Available signal types** for your selected resources are at the bottom right of the pane.
34+
35+
> [!NOTE]
36+
> If you select a Log analytics workspace resource, keep in mind that if the workspace receives telemetry from resources in more than one subscription, alerts are sent about those resources from different subscriptions.
3437
3538
:::image type="content" source="media/alerts-create-new-alert-rule/alerts-select-resource.png" alt-text="Screenshot that shows the select resource pane for creating a new alert rule.":::
3639

@@ -150,7 +153,7 @@ Then you define these elements for the resulting alert actions by using:
150153
|---------|---------|
151154
|Operator| The query results are transformed into a number. In this field, select the operator to use to compare the number against the threshold.|
152155
|Threshold value| A number value for the threshold. |
153-
|Frequency of evaluation|The interval in which the query is run. Can be set from a minute to a day. |
156+
|Frequency of evaluation|How often the query is run. Can be set from a minute to a day.|
154157

155158
:::image type="content" source="media/alerts-create-new-alert-rule/alerts-create-log-rule-logic.png" alt-text="Screenshot that shows the Alert logic section of a new log alert rule.":::
156159

@@ -243,7 +246,7 @@ Then you define these elements for the resulting alert actions by using:
243246
|Field |Description |
244247
|---------|---------|
245248
|Enable upon creation| Select for the alert rule to start running as soon as you're done creating it.|
246-
|Automatically resolve alerts (preview) |Select to make the alert stateful. The alert is resolved when the condition isn't met anymore.|
249+
|Automatically resolve alerts (preview) |Select to make the alert stateful. When an alert is stateful, the alert is resolved when the condition is no longer met.<br> If you don't select this checkbox, metric alerts are stateless. Stateless alerts fire each time the condition is met, even if alert already fired.<br> The frequency of notifications for stateless metric alerts differs based on the alert rule's configured frequency:<br>**Alert frequency of less than 5 minutes**: While the condition continues to be met, a notification is sent somewhere between one and six minutes.<br>**Alert frequency of more than 5 minutes**: While the condition continues to be met, a notification is sent between the configured frequency and double the frequency. For example, for an alert rule with a frequency of 15 minutes, a notification is sent somewhere between 15 to 30 minutes.|
247250
1. (Optional) If you've configured action groups for this alert rule, you can add custom properties to the alert payload to add more information to the payload. In the **Custom properties** section, add the property **Name** and **Value** for the custom property you want included in the payload.
248251

249252
:::image type="content" source="media/alerts-create-new-alert-rule/alerts-metric-rule-details-tab.png" alt-text="Screenshot that shows the Details tab when creating a new alert rule.":::
@@ -258,7 +261,7 @@ Then you define these elements for the resulting alert actions by using:
258261
|Field |Description |
259262
|---------|---------|
260263
|Enable upon creation| Select for the alert rule to start running as soon as you're done creating it.|
261-
|Automatically resolve alerts (preview) |Select to make the alert stateful. The alert is resolved when the condition isn't met anymore.|
264+
|Automatically resolve alerts (preview) |Select to make the alert stateful. When an alert is stateful, the alert is resolved when the condition is no longer met for a specific time range. The time range differs based on the frequency of the alert:<br>**1 minute**: The alert condition isn't met for 10 minutes.<br>**5-15 minutes**: The alert condition isn't met for three frequency periods.<br>**15 minutes - 11 hours**: The alert condition isn't met for two frequency periods.<br>**11 to 12 hours**: The alert condition isn't met for one frequency period.|
262265
|Mute actions |Select to set a period of time to wait before alert actions are triggered again. If you select this checkbox, the **Mute actions for** field appears to select the amount of time to wait after an alert is fired before triggering actions again.|
263266
|Check workspace linked storage|Select if logs workspace linked storage for alerts is configured. If no linked storage is configured, the rule isn't created.|
264267

0 commit comments

Comments
 (0)