Skip to content

Commit e1acbfb

Browse files
authored
Merge pull request #301961 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 2747429 + 02c0684 commit e1acbfb

File tree

13 files changed

+22
-15
lines changed

13 files changed

+22
-15
lines changed

articles/automation/shared-resources/certificates.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,9 @@ Use the function in the following table to access certificates in a Python 2 and
5656
5757
## Create a new certificate
5858

59-
When you create a new certificate, you upload a .cer or .pfx file to Automation. If you mark the certificate as exportable, then you can transfer it out of the Automation certificate store. If it isn't exportable, then it can only be used for signing within the runbook or DSC configuration. Automation requires the certificate to have the provider **Microsoft Enhanced RSA and AES Cryptographic Provider**.
59+
When you create a new certificate, you upload a .cer or .pfx file to Automation. If you mark the certificate as exportable, then you can transfer it out of the Automation certificate store. If it isn't exportable, then it can only be used for signing within the runbook or DSC configuration.
60+
> [!NOTE]
61+
> Azure Automation requires the certificate to have the provider **Microsoft Enhanced RSA and AES Cryptographic Provider**.
6062
6163
### Create a new certificate with the Azure portal
6264

articles/automation/shared-resources/modules.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,12 @@ The default modules are also known as global modules. In the Azure portal, the *
9696

9797
## Internal cmdlets
9898

99-
Azure Automation supports internal cmdlets that are only available when you execute runbooks in the Azure sandbox environment or on a Windows Hybrid Runbook Worker. The internal module `Orchestrator.AssetManagement.Cmdlets` is installed by default in your Automation account and when the Windows Hybrid Runbook Worker role is installed on the machine.
99+
Azure Automation provides internal cmdlets that are exclusively available when runbooks are executed in the Azure sandbox environment or on a Windows Hybrid Runbook Worker. The `Orchestrator.AssetManagement.Cmdlets` module, containing these internal cmdlets, is installed by default in your Automation account and specifically when the Windows Hybrid Runbook Worker role is installed on a Windows machine.
100+
101+
> [!NOTE]
102+
> This functionality is not available on Linux Hybrid Runbook Workers.
103+
104+
100105

101106
The following table defines the internal cmdlets. These cmdlets are designed to be used instead of Azure PowerShell cmdlets to interact with your Automation account resources. They can retrieve secrets from encrypted variables, credentials, and encrypted connections.
102107

articles/azure-app-configuration/rest-api-key-value.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ Content-Type: application/problem+json; charset="utf-8"
412412
```json
413413
{
414414
"type": "https://azconfig.io/errors/key-locked",
415-
"title": "Modifing key '{key}' is not allowed",
415+
"title": "Modifying key '{key}' is not allowed",
416416
"name": "{key}",
417417
"detail": "The key is read-only. To allow modification unlock it first.",
418418
"status": 409

articles/azure-functions/functions-bindings-mongodb-vcore.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Using the Azure Cosmos DB for MongoDB (vCore) extension, you can build functions
2424
| Query the database | [Azure Cosmos DB for MongoDB (vCore) input binding](functions-bindings-mongodb-vcore-input.md) |
2525

2626
Considerations for the Azure Cosmos DB for MongoDB (vCore) extension:
27-
+ Only [C# apps that run in-proces with the host](./functions-dotnet-class-library.md) are currently supported in preview.
27+
+ Only [C# apps that run in-process with the host](./functions-dotnet-class-library.md) are currently supported in preview.
2828
+ The Azure Cosmos DB for MongoDB (vCore) binding extension doesn't currently support Microsoft Entra authentication and managed identities.
2929
+ Your app must be using version 4.x of the Azure Functions runtime.
3030

articles/backup/backup-azure-monitoring-alerts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ The following table lists the differences between classic backup alerts and buil
4444
| Actions | Classic alerts | Built-in Azure Monitor alerts |
4545
| --- | --- | --- |
4646
| **Setting up notifications** | - You must enable the configure notifications feature for each Recovery Services vault, along with the email id(s) to which the notifications should be sent. <br><br> - For certain destructive operations, email notifications are sent to the subscription owner, admin and co-admin irrespective of the notification settings of the vault.| - Notifications are configured by creating an alert processing rule. <br><br> - While *alerts* are generated by default and can't be turned off for destructive operations, the notifications are in the control of the user, allowing you to clearly specify which set of email address (or other notification endpoints) you wish to route alerts to. |
47-
| **Notification suppression for database backup scenarios** | When there are multiple failures for the same database due to the same error code, a single alert is generated (with the occurrence count updated for each failure type) and a new alert is only generated when the original alert is inactivated. | The behavior is currently different. Here, a separate alert is generated for every backup failure. If there's a window of time when backups will fail for a certain known item (for example, during a maintenance window), you can create a suppression rule to suppress email noise for that backup item during the given period. |
47+
| **Notification suppression for database backup scenarios** | When there are multiple failures for the same database due to the same error code, a single alert is generated (with the occurrence count updated for each failure type) and a new alert is only generated when the original alert is deactivated. | The behavior is currently different. Here, a separate alert is generated for every backup failure. If there's a window of time when backups will fail for a certain known item (for example, during a maintenance window), you can create a suppression rule to suppress email noise for that backup item during the given period. |
4848
| **Pricing** | There are no additional charges for this solution. | Alerts for critical operations/failures generate by default (that you can view in the Azure portal or via non-portal interfaces) at no additional charge. However, to route these alerts to a notification channel (such as email), it incurs a minor charge for notifications beyond the *free tier* (of 1000 emails per month). Learn more about [Azure Monitor pricing](https://azure.microsoft.com/pricing/details/monitor/). |
4949

5050
> [!NOTE]

articles/backup/move-to-azure-monitor-alerts.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ The following are alerts from Azure Backup solutions are:
5252

5353
For Azure workload backup solutions, such as SQL and SAP HANA, log backups can be generated frequently (up to every 15 minutes according to the policy). So, you might encounter frequent log backup failures (up to every 15 minutes). In this scenario, the end user will be overwhelmed if an alert is raised for each failure occurrence.
5454

55-
So, an alert is sent for the first occurrence, and if the later failures are because of the same root cause, then further alerts aren't generated. The first alert is updated with the failure count. But if you've inactivated the alert, the next occurrence will trigger another alert and this will be treated as the first alert for that occurrence. This is how Azure Backup performs alert consolidation for SQL and SAP HANA backups.
55+
So, an alert is sent for the first occurrence, and if the later failures are because of the same root cause, then further alerts aren't generated. The first alert is updated with the failure count. But if you've deactivated the alert, the next occurrence will trigger another alert and this will be treated as the first alert for that occurrence. This is how Azure Backup performs alert consolidation for SQL and SAP HANA backups.
5656

5757
On-demand backup jobs aren't consolidated.
5858

@@ -94,9 +94,9 @@ If the frequency was set to an hourly digest, and an alert was raised and resolv
9494
9595
## Inactivating alerts
9696

97-
To inactivate/resolve an active alert, you can select the list item corresponding to the alert you wish to inactivate. This opens up a screen that shows detailed information about the alert, with an **Inactivate** button at the top. Selecting this button will change the status of the alert to **Inactive**. You may also inactivate an alert by right-clicking the list item corresponding to that alert and selecting **Inactivate**.
97+
To deactivate/resolve an active alert, you can select the list item corresponding to the alert you wish to deactivate. This opens up a screen that shows detailed information about the alert, with an **Inactivate** button at the top. Selecting this button will change the status of the alert to **Inactive**. You may also deactivate an alert by right-clicking the list item corresponding to that alert and selecting **Inactivate**.
9898

99-
:::image type="content" source="./media/backup-azure-monitoring-laworkspace/vault-alert-inactivate.png" alt-text="Screenshot showing how to inactivate alerts via Backup center.":::
99+
:::image type="content" source="./media/backup-azure-monitoring-laworkspace/vault-alert-inactivate.png" alt-text="Screenshot showing how to deactivate alerts via Backup center.":::
100100

101101

102102

articles/communication-services/concepts/interop/enable-closed-captions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ In this document, we're going to be looking at specifically Teams interoperabili
2727
| Enable captions in Teams meeting | ✔︎ | ✔︎ | ✔︎ |
2828
| Enable captions in Teams call | ✔︎ | ✔︎ | ✔︎ |
2929

30-
*✕ = not supprted in current release.*
30+
*✕ = not supported in current release.*
3131

3232
### Translated Captions
3333

articles/communication-services/samples/integrate-azure-communication-services-with-copilot-studio.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ app.MapPost("/api/incomingCall", async (
134134
}
135135
catch (Exception ex)
136136
{
137-
logger.LogError($"Answer call exeception : {ex.StackTrace}");
137+
logger.LogError($"Answer call exception : {ex.StackTrace}");
138138
}
139139
}
140140
return Results.Ok();

articles/databox-online/azure-stack-edge-gpu-troubleshoot-activation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ The following table summarizes the errors related to device activation and the c
4040
| Error message| Recommended resolution |
4141
|------------------------------------------------------|--------------------------------------|
4242
| If the Channel Integrity Key in the Azure Key Vault was deleted, and you try to perform any operations that involve encryption - for example, **Add User**, **Add Share**, or **Configure Compute** - then you will receive this error. |If the Channel Integrity Key in the key vault was deleted, but the key is still within the purge duration, follow the steps in [Undo Key vault key removal](/powershell/module/az.keyvault/undo-azkeyvaultkeyremoval). <br>If the purge protection duration has elapsed, and if you've backed up the key, you can restore the key from the backup. Otherwise, you can't recover the key. Contact Microsoft Support for next steps. |
43-
<!--|Remove this after checking with Noopur - customer doesnt need to do anything - If the Channel Integrity Key in the Azure Key Vault was deleted before the activation of the device, and the activation key is regenerated, you'll receive this error. <br> ![Key vault error 3](./media/azure-stack-edge-gpu-activation-key-vault/placeholder.png) | The Channel Integrity Key will be recreated, and the metadata is updated.
43+
<!--|Remove this after checking with Noopur - customer doesn't need to do anything - If the Channel Integrity Key in the Azure Key Vault was deleted before the activation of the device, and the activation key is regenerated, you'll receive this error. <br> ![Key vault error 3](./media/azure-stack-edge-gpu-activation-key-vault/placeholder.png) | The Channel Integrity Key will be recreated, and the metadata is updated.
4444
|-->
4545

4646
## Audit logging errors

articles/defender-for-iot/organizations/api/sensor-inventory-apis.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,7 @@ This section lists the supported values for the [type](#type) response field.
609609
- `Backup Server`
610610
- `Meter`
611611
- `Barcode Scanner`
612-
- `Uninterruptable Power Supply`
612+
- `Uninterruptible Power Supply`
613613
:::column-end:::
614614
:::column span="":::
615615
- `Variable Frequency Drive`

0 commit comments

Comments
 (0)