Skip to content

Commit d8d5ee4

Browse files
authored
Merge pull request #259319 from MicrosoftDocs/main
Publish to Live Wednesday 4AM PST, 11/22
2 parents 93a661c + 3e59cbd commit d8d5ee4

40 files changed

+130
-107
lines changed

articles/automation/extension-based-hybrid-runbook-worker-install.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1015,7 +1015,7 @@ Follow the steps mentioned below as an example:
10151015
```powershell-interactive
10161016
New-AzAutomationHybridRunbookWorkerGroup -AutomationAccountName "Contoso17" -Name "RunbookWorkerGroupName" -ResourceGroupName "ResourceGroup01"
10171017
```
1018-
1. Create an Azure VM or Arc-enabled server and add it to the above created Hybrid Worker Group. Use the below command to add an existing Azure VM or Arc-enabled Server to the Hybrid Worker Group. Generate a new GUID and pass it as `hybridRunbookWorkerGroupName`. To fetch `vmResourceId`, go to the **Properties** tab of the VM on Azure portal.
1018+
1. Create an Azure VM or Arc-enabled server and add it to the above created Hybrid Worker Group. Use the below command to add an existing Azure VM or Arc-enabled Server to the Hybrid Worker Group. Generate a new GUID and pass it as the name of the Hybrid Worker. To fetch `vmResourceId`, go to the **Properties** tab of the VM on Azure portal.
10191019

10201020
```azurepowershell
10211021
New-AzAutomationHybridRunbookWorker -AutomationAccountName "Contoso17" -Name "RunbookWorkerName" -HybridRunbookWorkerGroupName "RunbookWorkerGroupName" -VmResourceId "VmResourceId" -ResourceGroupName "ResourceGroup01"

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,8 @@ To edit an existing alert rule:
275275
276276
1. On the **Actions** tab, select or create the required [action groups](./action-groups.md).
277277
278+
:::image type="content" source="media/alerts-create-new-alert-rule/alerts-rule-actions-tab.png" alt-text="Screenshot that shows the Actions tab when creating a new alert rule.":::
279+
278280
### Set the alert rule details
279281
280282
1. On the **Details** tab, define the **Project details**.
@@ -302,7 +304,7 @@ To edit an existing alert rule:
302304
|Field |Description |
303305
|---------|---------|
304306
|Enable upon creation| Select for the alert rule to start running as soon as you're done creating it.|
305-
|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 value of the frequency. For example, for an alert rule with a frequency of 15 minutes, a notification is sent somewhere between 15 to 30 minutes.|
307+
|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 doubles the value of the frequency. For example, for an alert rule with a frequency of 15 minutes, a notification is sent somewhere between 15 to 30 minutes.|
306308
307309
#### [Log alert](#tab/log)
308310
@@ -321,7 +323,7 @@ To edit an existing alert rule:
321323
322324
The identity associated with the rule must have these roles:
323325
- If the query is accessing a Log Analytics workspace, the identity must be assigned a **Reader role** for all workspaces accessed by the query. If you're creating resource-centric log alerts, the alert rule may access multiple workspaces, and the identity must have a reader role on all of them.
324-
- If the you are querying an ADX or ARG cluster you must add **Reader role** for all data sources accessed by the query. For example, if the query is resource centric, it needs a reader role on that resources.
326+
- If you are querying an ADX or ARG cluster you must add **Reader role** for all data sources accessed by the query. For example, if the query is resource centric, it needs a reader role on that resources.
325327
- If the query is [accessing a remote Azure Data Explorer cluster](../logs/azure-monitor-data-explorer-proxy.md), the identity must be assigned:
326328
- **Reader role** for all data sources accessed by the query. For example, if the query is calling a remote Azure Data Explorer cluster using the adx() function, it needs a reader role on that ADX cluster.
327329
- **Database viewer** for all databases the query is accessing.
@@ -366,15 +368,15 @@ To edit an existing alert rule:
366368
1. Select **Enable upon creation** for the alert rule to start running as soon as you're done creating it.
367369
---
368370
369-
1. <a name="custom-props"></a>(Optional) In the **Custom properties**, if you've configured action groups for this alert rule, you can add your own properties to include in the alert notification payload. You can use these properties in the actions called by the action group, such as webhook, Azure function or logic app actions.
371+
1. <a name="custom-props"></a>(Optional) In the **Custom properties** section, if you've configured action groups for this alert rule, you can add your own properties to include in the alert notification payload. You can use these properties in the actions called by the action group, such as webhook, Azure function or logic app actions.
370372
371373
The custom properties are specified as key:value pairs, using either static text, a dynamic value extracted from the alert payload, or a combination of both.
372374
373375
The format for extracting a dynamic value from the alert payload is: `${<path to schema field>}`. For example: ${data.essentials.monitorCondition}.
374376
375377
Use the [common alert schema](alerts-common-schema.md) format to specify the field in the payload, whether or not the action groups configured for the alert rule use the common schema.
376378
377-
:::image type="content" source="media/alerts-create-new-alert-rule/alerts-rule-actions-tab.png" alt-text="Screenshot that shows the Actions tab when creating a new alert rule.":::
379+
:::image type="content" source="media/alerts-create-new-alert-rule/alerts-rule-custom-props.png" alt-text="Screenshot that shows the custom properties section of creating a new alert rule.":::
378380
379381
In the following examples, values in the **custom properties** are used to utilize data from a payload that uses the common alert schema:
380382
-14.1 KB
Loading
40.6 KB
Loading

articles/backup/backup-azure-troubleshoot-blob-backup.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,14 @@ This article provides troubleshooting information to address issues you encounte
9696

9797
**Recommendation**: Ensure that the restore point ID is correct and the restore point didn't get deleted based on the backup retention settings. For a recent recovery point, ensure that the corresponding backup job is complete. We recommend you triggering the operation again using a valid restore point. If the issue persists, contact Microsoft support.
9898

99+
### UserErrorContainerNotFoundForPointInTimeRestore
100+
101+
**Error code**: `UserErrorContainerNotFoundForPointInTimeRestore`
102+
103+
**Error message**: A container selected for the restore was not found in the storage account for the selected point in time.
104+
105+
**Recommendation**: Use specific container restore or prefix match restore for containers that are present in the account. We also recommend enabling vaulted backup for your storage account to get comprehensive protection against deletion of containers. If you already have it configured, you can use a recovery point for performing recovery of deleted containers.
106+
99107
### UserErrorTargetContainersExistOnAccount
100108

101109
**Error code**: `UserErrorTargetContainersExistOnAccount`

articles/communication-services/concepts/privacy.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@ Use [Chat APIs](/rest/api/communication/chat/chatthread) to get, list, update, a
8686
- `Delete Thread`
8787
- `Delete Message`
8888

89+
For customers that use Virtual appointments, refer to our Teams Interoperability [user privacy](interop/guest/privacy.md#chat-storage) for storage of chat messages in Teams meetings.
90+
8991
### SMS
9092

9193
Sent and received SMS messages are ephemerally processed by the service and not retained.

articles/cost-management-billing/manage/ea-portal-enrollment-invoices.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ To view credits:
193193

194194
To apply your Azure Prepayment to overages, you must meet the following criteria:
195195

196-
- You've incurred overage charges that haven't been paid and are within one year of the billed service's end date.
196+
- You've incurred overage charges that haven't been paid and are within 3 months of the invoice bill date.
197197
- Your available Azure Prepayment amount covers the full number of incurred charges, including all past unpaid Azure invoices.
198198
- The billing term that you want to complete must be fully closed. Billing fully closes after the fifth day of each month.
199199
- The billing period that you want to offset must be fully closed.

0 commit comments

Comments
 (0)