Skip to content

Commit c009b9d

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into stateful-log-limit
2 parents 841efac + e22f1c0 commit c009b9d

File tree

8 files changed

+27
-6
lines changed

8 files changed

+27
-6
lines changed

articles/azure-monitor/alerts/alerts-manage-alerts-previous-version.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ The current alert rule wizard is different from the earlier experience:
2727
- Customers often use the custom email subject to indicate the resource on which the alert fired, instead of using the Log Analytics workspace. Use the [new API](/rest/api/monitor/scheduledqueryrule-2021-08-01/scheduled-query-rules/create-or-update#actions) to trigger an alert of the desired resource by using the resource ID column.
2828
- For more advanced customizations, [use Azure Logic Apps](alerts-logic-apps.md).
2929

30+
3031
## Manage alert rules created in previous versions in the Azure portal
3132
1. In the [Azure portal](https://portal.azure.com/), select the resource you want.
3233
1. Under **Monitoring**, select **Alerts**.
@@ -70,10 +71,7 @@ The current alert rule wizard is different from the earlier experience:
7071
<!-- convertborder later -->
7172
:::image type="content" source="media/alerts-log/AlertsPreviewSuppress.png" lightbox="media/alerts-log/AlertsPreviewSuppress.png" alt-text="Screenshot that shows the Alert Details pane." border="false":::
7273
1. To make alerts stateful, select **Automatically resolve alerts (preview)**.
73-
1. Specify if the alert rule should trigger one or more [action groups](./action-groups.md) when the alert condition is met.
74-
> [!NOTE]
75-
> * For limits on the actions that can be performed, see [Azure subscription service limits](../../azure-resource-manager/management/azure-subscription-service-limits.md).
76-
> * Search results were included in the payload of the triggered alert and its associated notifications. **Notice that**: The **email** included only **10 rows** from the unfiltered results while the **webhook payload** contained **1,000 unfiltered results**.
74+
1. Specify if the alert rule should trigger one or more [action groups](./action-groups.md) when the alert condition is met. For limits on the actions that can be performed, see [Azure Monitor service limits](../../azure-monitor/service-limits.md).
7775
1. (Optional) Customize actions in log alert rules:
7876
- **Custom email subject**: Overrides the *email subject* of email actions. You can't modify the body of the mail and this field *isn't for email addresses*.
7977
- **Include custom Json payload for webhook**: Overrides the webhook JSON used by action groups, assuming that the action group contains a webhook action. Learn more about [webhook actions for log alerts](./alerts-log-webhook.md).
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
author: tachou
3+
ms.service: confidential-ledger
4+
ms.topic: include
5+
ms.date: 11/28/2023
6+
ms.author: tachou
7+
8+
# Subscription owneer prerequisite that applies to all Confidential Ledger quickstarts
9+
---
10+
11+
- Subscription owner - A confidential ledger can only be created by users who have _Owner_ permissions on the Azure subscription. [Confirm that you have the appropriate access](../../role-based-access-control/check-access.md) before continuing with this quickstart.

articles/confidential-ledger/quickstart-cli.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ For more information on Azure confidential ledger, and for examples of what can
1919

2020
[!INCLUDE [azure-cli-prepare-your-environment.md](~/articles/reusable-content/azure-cli/azure-cli-prepare-your-environment.md)]
2121

22+
[!INCLUDE [Ensure subscription owner](./includes/ensure-subscription-owner.md)]
23+
2224
## Create a resource group
2325

2426
[!INCLUDE [Create resource group](../../includes/cli-rg-create.md)]

articles/confidential-ledger/quickstart-portal.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ Azure confidential ledger is a cloud service that provides a high integrity stor
1717

1818
In this quickstart, you create a confidential ledger with the [Azure portal](https://portal.azure.com).
1919

20+
## Prerequisites
21+
22+
[!INCLUDE [Ensure subscription owner](./includes/ensure-subscription-owner.md)]
23+
2024
## Sign in to Azure
2125

2226
Sign in to the [Azure portal](https://portal.azure.com).

articles/confidential-ledger/quickstart-powershell.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ If you don't have an Azure subscription, create a [free account](https://azure.m
1919

2020
In this quickstart, you create a confidential ledger with [Azure PowerShell](/powershell/azure/). If you choose to install and use PowerShell locally, this tutorial requires Azure PowerShell module version 1.0.0 or later. Type `$PSVersionTable.PSVersion` to find the version. If you need to upgrade, see [Install Azure PowerShell module](/powershell/azure/install-azure-powershell). If you are running PowerShell locally, you also need to run `Login-AzAccount` to create a connection with Azure.
2121

22+
## Prerequisites
23+
24+
[!INCLUDE [Ensure subscription owner](./includes/ensure-subscription-owner.md)]
25+
2226
## Create a resource group
2327

2428
[!INCLUDE [Create resource group](../../includes/powershell-rg-create.md)]

articles/confidential-ledger/quickstart-python.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ Microsoft Azure confidential ledger is a new and highly secure service for manag
2222
## Prerequisites
2323

2424
- An Azure subscription - [create one for free](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
25+
[!INCLUDE [Ensure subscription owner](./includes/ensure-subscription-owner.md)]
2526
- Python versions that are [supported by the Azure SDK for Python](https://github.com/Azure/azure-sdk-for-python#prerequisites).
2627
- [Azure CLI](/cli/azure/install-azure-cli) or [Azure PowerShell](/powershell/azure/install-azure-powershell).
2728

articles/confidential-ledger/quickstart-template.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ If your environment meets the prerequisites and you're familiar with using ARM t
2121
[![Deploy To Azure](../media/template-deployments/deploy-to-azure.svg)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2Fquickstarts%2Fmicrosoft.confidentialledger%2Fconfidential-ledger-create%2Fazuredeploy.json)
2222

2323
## Prerequisites
24+
[!INCLUDE [Ensure subscription owner](./includes/ensure-subscription-owner.md)]
2425

2526
### Azure subscription
2627

includes/expressroute-peering-comparison.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
2-
author: cherylmc
2+
author: duongau
33
ms.date: 12/13/2019
44
ms.service: expressroute
55
ms.topic: include
6-
ms.author: cherylmc
6+
ms.author: duau
77
---
88

99
| | **Private Peering** | **Microsoft Peering** | **Public Peering** (deprecated for new circuits, will be retired on March 31, 2024) |

0 commit comments

Comments
 (0)