Skip to content

Commit 057dbe2

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into ropc3
2 parents 749ff43 + ff1ecbc commit 057dbe2

37 files changed

+497
-1859
lines changed

articles/app-service/configure-ssl-certificate.md

Lines changed: 46 additions & 46 deletions
Large diffs are not rendered by default.

articles/azure-app-configuration/integrate-ci-cd-pipeline.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ This article explains how to use data from Azure App Configuration in a continuo
1818

1919
## Use App Configuration in your Azure DevOps Pipeline
2020

21-
If you have an Azure DevOps Pipeline, you can fetch key-values from App Configuration and set them as task variables. The [Azure App Configuration DevOps extension](https://go.microsoft.com/fwlink/?linkid=2091063) is an add-on module that provides this functionality. Follow its instructions to use the extension in a build or release task sequence.
21+
If you have an Azure DevOps Pipeline, you can fetch key-values from App Configuration and set them as task variables. The Azure App Configuration DevOps extension is an add-on module that provides this functionality. [Get this module](https://go.microsoft.com/fwlink/?linkid=2091063) and refer to [Pull settings from App Configuration with Azure Pipelines](./pull-key-value-devops-pipeline.md) for instructions to use it in your Azure Pipelines.
2222

2323
## Deploy App Configuration data with your application
2424

articles/azure-app-configuration/quickstart-feature-flag-aspnet-core.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ Follow the documents to create an ASP.NET Core app with dynamic configuration.
2828

2929
## Create a feature flag
3030

31-
Add a feature flag called *Beta* to the App Configuration store and leave **Label** and **Description** with their default values. For more information about how to add feature flags to a store using the Azure portal or the CLI, go to [Create a feature flag](./manage-feature-flags.md#create-a-feature-flag).
31+
Add a feature flag called *Beta* to the App Configuration store (created in the [Prerequisites](./quickstart-feature-flag-aspnet-core.md#prerequisites) steps), and leave **Label** and **Description** with their default values. For more information about how to add feature flags to a store using the Azure portal or the CLI, go to [Create a feature flag](./manage-feature-flags.md#create-a-feature-flag).
3232

3333
> [!div class="mx-imgBorder"]
3434
> ![Enable feature flag named Beta](./media/add-beta-feature-flag.png)
3535
3636
## Use a feature flag
3737

38-
1. Navigate into the project's directory, and run the following command to add a reference to the [Microsoft.FeatureManagement.AspNetCore](https://www.nuget.org/packages/Microsoft.FeatureManagement.AspNetCore) NuGet package.
38+
1. Navigate into the project's directory (created in the [Prerequisites](./quickstart-feature-flag-aspnet-core.md#prerequisites) steps), and run the following command to add a reference to the [Microsoft.FeatureManagement.AspNetCore](https://www.nuget.org/packages/Microsoft.FeatureManagement.AspNetCore) NuGet package.
3939

4040
```dotnetcli
4141
dotnet add package Microsoft.FeatureManagement.AspNetCore
Lines changed: 63 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,71 @@
11
---
2-
title: include file
3-
description: include file
4-
author: mattmcinnes
5-
ms.author: mattmcinnes
6-
ms.service: virtual-machines
7-
ms.topic: include
8-
ms.date: 11/07/2023
2+
title: include file
3+
description: include file
4+
author: mattmcinnes
5+
ms.author: mattmcinnes
6+
ms.service: virtual-machines
7+
ms.topic: include
8+
ms.date: 11/07/2023
99
ms.custom:
1010
- include file
1111
- ignite-2023
1212
---
1313

1414
| Size Series | Series Type | Deployment Status |
1515
|:-:|:-:|:-:|
16-
| [Msv3/Mdsv3](/azure/virtual-machines/msv3-mdsv3-medium-series)| Medium Memory | Production |
17-
| [Mbsv3/Mbdsv3](/azure/virtual-machines/sizes/memory-optimized/mbsv3-mbdsv3-series)| Medium Memory| Preview|
18-
| Msv3/Mdsv3| High Memory | Preview|
19-
| Msv3/Mdsv3| Very High Memory | Preview|
20-
| [Dlsv6/Dldsv6](/azure/virtual-machines/dlsv6-dldsv6-series) | General Purpose | Preview |
21-
| [Dsv6/Ddsv6](/azure/virtual-machines/dsv6-ddsv6-series) | General Purpose | Preview |
22-
| [Esv6/Edsv6](/azure/virtual-machines/esv6-edsv6-series) | Memory Optimized | Preview |
23-
| [Edv5/Edsv5](/azure/virtual-machines/edv5-edsv5-series) | Memory Optimized | Production |
24-
| [Dalsv6/Daldsv6](/azure/virtual-machines/dalsv6-daldsv6-series) | General Purpose | Preview |
25-
| [Easv6/Eadsv6](/azure/virtual-machines/easv6-eadsv6-series) | Memory Optimized | Preview |
26-
| [DCesv5](/azure/virtual-machines/dcesv5-dcedsv5-series) | General Purpose | Preview |
27-
| [ECesv5](/azure/virtual-machines/ecesv5-ecedsv5-series) | Memory Optimized | Preview |
28-
| [Mv3 Medium Memory](/azure/virtual-machines/msv3-mdsv3-medium-series)| High Memory to CPU Optimized | Production |
29-
| [Falsv6/Famsv6](/azure/virtual-machines/fasv6-falsv6-series) | Compute Optimized | Preview |
30-
| [Dlsv5/Dldsv5](/azure/virtual-machines/dlsv5-dldsv5-series) | General Purpose | Production |
31-
| [Ddsv5](/azure/virtual-machines/sizes/general-purpose/ddsv5-series)| General Purpose | Production |
32-
| [Ddv5](/azure/virtual-machines/sizes/general-purpose/ddv5-series)| General Purpose | Production |
33-
| [Dv5/Dsv5](/azure/virtual-machines/dv5-dsv5-series) | General Purpose | Production |
34-
| [Ev5/Esv5](/azure/virtual-machines/ev5-esv5-series) | Memory Optimized | Production |
35-
| [Ebsv5](/azure/virtual-machines/ebdsv5-ebsv5-series) | Managed disks optimized | Production |
36-
| [Lsv3](/azure/virtual-machines/lsv3-series) | Local storage optimized | Production |
37-
| [Dplsv5](/azure/virtual-machines/dplsv5-dpldsv5-series) | General Purpose | Production |
38-
| [Dpsv5](/azure/virtual-machines/dpsv5-dpdsv5-series) | General Purpose | Production |
39-
| [Epsv5](/azure/virtual-machines/epsv5-epdsv5-series) | Memory Optimized | Production |
40-
| [Nvadsv5](/azure/virtual-machines/nva10v5-series) | GPU/AI workload optimized | Production |
41-
| [HBv4](/azure/virtual-machines/hbv4-series) | High Performance Compute (HPC) | Production |
42-
| [HX](/azure/virtual-machines/hx-series) | High Performance Compute (HPC) | Production |
16+
| [Dadsv6](/azure/virtual-machines/dadsv6-series) | General Purpose | Preview |
17+
| [Daldsv6](/azure/virtual-machines/daldsv6-series) | General Purpose | Preview |
18+
| [Dalsv6](/azure/virtual-machines/dalsv6-series) | General Purpose | Preview |
19+
| [Dasv6](/azure/virtual-machines/dasv6-series) | General Purpose | Preview |
20+
| [DCedsv5](/azure/virtual-machines/dcesv5-dcedsv5-series) | General Purpose | Preview |
21+
| [DCesv5](/azure/virtual-machines/dcesv5-dcedsv5-series) | General Purpose | Preview |
22+
| [Ddsv6](/azure/virtual-machines/ddsv6-series) | General Purpose | Preview |
23+
| [Dldsv6](/azure/virtual-machines/dldsv6-series) | General Purpose | Preview |
24+
| [Dlsv6](/azure/virtual-machines/dlsv6-dldsv6-series) | General Purpose | Preview |
25+
| [Dpdsv6](/azure/virtual-machines/dpdsv6-series) | General Purpose | Preview |
26+
| [Dpldsv6](/azure/virtual-machines/dpldsv6-series) | General Purpose | Preview |
27+
| [Dplsv6](/azure/virtual-machines/dplsv6-dpldsv6-series) | General Purpose | Preview |
28+
| [Dpsv6](/azure/virtual-machines/dpsv6-series) | General Purpose | Preview |
29+
| [Dsv6](/azure/virtual-machines/dsv6-ddsv6-series) | General Purpose | Preview |
30+
| [Eadsv6](/azure/virtual-machines/eadsv6-series) | Memory Optimized | Preview |
31+
| [Easv6](/azure/virtual-machines/easv6-eadsv6-series) | Memory Optimized | Preview |
32+
| [ECedsv5](/azure/virtual-machines/ecesv5-ecedsv5-series) | Memory Optimized | Preview |
33+
| [ECesv5](/azure/virtual-machines/ecesv5-ecedsv5-series) | Memory Optimized | Preview |
34+
| [Epdsv6](/azure/virtual-machines/epdsv6-series) | Memory Optimized | Preview |
35+
| [Epsv6](/azure/virtual-machines/epsv6-series) | Memory Optimized | Preview |
36+
| [Bpsv2](/azure/virtual-machines/bpsv2-series) | General Purpose | Production |
37+
| [Bsv2](/azure/virtual-machines/bsv2-series) | General Purpose | Production |
38+
| [DCdsv3](/azure/virtual-machines/dcdsv3-series) | General Purpose | Production |
39+
| [Ddsv5](/azure/virtual-machines/ddsv5-series) | General Purpose | Production|
40+
| [Ddv5](/azure/virtual-machines/sizes/general-purpose/ddv5-series) | General Purpose | Production |
41+
| [Dldsv5](/azure/virtual-machines/dlsv5-dldsv5-series) | General Purpose | Production |
42+
| [Dlsv5](/azure/virtual-machines/dlsv5-dldsv5-series) | General Purpose | Production |
43+
| [Dpdsv5](/azure/virtual-machines/dpdsv5-series) | General Purpose | Production |
44+
| [Dpldsv5](/azure/virtual-machines/dpldsv5-series) | General Purpose | Production |
45+
| [Dplsv5](/azure/virtual-machines/dplsv5-dpldsv5-series) | General Purpose | Production |
46+
| [Dpsv5](/azure/virtual-machines/dpsv5-dpdsv5-series) | General Purpose | Production |
47+
| [Dsv5](/azure/virtual-machines/dsv5-ddsv6-series) | General Purpose | Production |
48+
| [Dv5](/azure/virtual-machines/dv5-series) | General Purpose | Production |
49+
| [Ebdsv5](/azure/virtual-machines/ebdsv5-ebsv5-series) | Memory Optimized | Production |
50+
| [Ebsv5](/azure/virtual-machines/ebsv5-series) | Memory Optimized | Production |
51+
| [Edsv5](/azure/virtual-machines/edv5-edsv5-series) | Memory Optimized | Production |
52+
| [Edsv6](/azure/virtual-machines/edv6-edsv6-series) | Memory Optimized | Production |
53+
| [Edv5](/azure/virtual-machines/edv5-edsv5-series) | Memory Optimized | Production |
54+
| [Epdsv5](/azure/virtual-machines/epdsv5-series) | General Purpose | Production |
55+
| [Epsv5](/azure/virtual-machines/epsv5-series) | General Purpose | Production |
56+
| [Esv5](/azure/virtual-machines/ev5-esv5-series) | Memory Optimized | Production |
57+
| [Esv6](/azure/virtual-machines/esv6-edsv6-series) | Memory Optimized | Production |
58+
| [Ev5](/azure/virtual-machines/ev5-esv5-series) | Memory Optimized | Production |
59+
| [Falsv6](/azure/virtual-machines/fasv6-falsv6-series) | Compute Optimized | Production |
60+
| [Famsv6](/azure/virtual-machines/fasv6-falsv6-series) | Compute Optimized | Production |
61+
| [Fasv6](/azure/virtual-machines/fasv6-falsv6-series) | Compute Optimized | Production |
62+
| [HBv4](/azure/virtual-machines/hbv4-series) | High Performance Compute | Production |
63+
| [HX](/azure/virtual-machines/hx-series) | High Performance Compute | Production |
64+
| [Lsv3](/azure/virtual-machines/lsv3-series) | Storage Optimized | Production |
65+
| [Mbsv3](/azure/virtual-machines/sizes/memory-optimized/mbsv3-mbdsv3-series) | Memory Optimized | Production |
66+
| [Mdsv3](/azure/virtual-machines/msv3-mdsv3-medium-series) | High Memory Optimized | Production |
67+
| [Msv3](/azure/virtual-machines/msv3-mdsv3-medium-series) | High Memory Optimized | Production |
68+
| [Mdsv3](/azure/virtual-machines/msv3-mdsv3-medium-series) | Memory Optimized | Production |
69+
| [Msv2](/azure/virtual-machines/msv2-series) | Memory Optimized | Production |
70+
| [Msv3](/azure/virtual-machines/msv3-mdsv3-medium-series) | Memory Optimized | Production |
71+
| [Nvadsv5](/azure/virtual-machines/nva10v5-series) | GPU/AI workload optimized | Production |

articles/cost-management-billing/costs/reservation-utilization-alerts.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ The following table explains the fields in the alert rule form.
4949
| --- | --- | --- | --- |
5050
| Alert type|Mandatory | The type of alert that you want to create. | Reservation utilization |
5151
| Services | Optional | Select if you want to filter the alert rule for any specific reservation type. **Note**: If you haven’t applied a filter, then the alert rule monitors all available services by default. |Virtual machine, SQL Database, and so on. |
52-
| Reservations | Optional | Select if you want to filter the alert rule for any specific reservations. **Note**: If you haven’t applied a filter, then the alert rule monitors all available reservations by default. | Contoso\_Sub\_alias-SQL\_Server\_Standard\_Edition. |
52+
| Reservations | Optional | Select if you want to filter the alert rule for any specific reservations. **Note**: If you haven’t applied a filter, then the alert rule monitors all available reservations by default. | Contoso\_Sub\_alias-SQL\_Server\_Standard\_Edition. |
5353
| Utilization percentage | Mandatory | When any of the reservations have a utilization that is less than the target percentage, then the alert notification is sent. | Utilization is less than 95% |
5454
| Time grain | Mandatory | Choose the time over which reservation utilization value should be averaged. For example, if you choose Last 7-days, then the alert rule evaluates the last 7-day average reservation utilization of all reservations. **Note**: Last day reservation utilization is subject to change because the usage data refreshes. So, Cost Management relies on the last 7-day or 30-day averaged utilization, which is more accurate. | Last 7-days, Last 30-days|
5555
| Start on | Mandatory | The start date for the alert rule. | Current or any future date |
@@ -98,6 +98,9 @@ The following information provides more detail.
9898

9999
**Permissions needed to view reservations** - For partners to review reservations in the customer tenant, partners require foreign principal access to the customer subscription. The default permissions required for managing reservations are explained at [Who can manage a reservation by default](../reservations/view-reservations.md#who-can-manage-a-reservation-by-default).
100100

101+
> [!NOTE]
102+
> Filtering options to monitor specific reservation categories or individual reservations aren't supported within this scope. As a result, the alert rule evaluates the utilization of all available reservations by default.
103+
101104
## Next steps
102105

103-
If you haven’t already set up cost alerts for budgets, credits, or department spending quotas, see [Use cost alerts to monitor usage and spending](cost-mgt-alerts-monitor-usage-spending.md).
106+
If you haven’t already set up cost alerts for budgets, credits, or department spending quotas, see [Use cost alerts to monitor usage and spending](cost-mgt-alerts-monitor-usage-spending.md).
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
---
2+
title: Manage a Microsoft Azure Consumption Commitment resource
3+
description: Learn how to manage your Microsoft Azure Consumption Commitment (MACC) resource, including moving it across resource groups or subscriptions.
4+
author: bandersmsft
5+
ms.reviewer: sornaks
6+
ms.service: cost-management-billing
7+
ms.subservice: billing
8+
ms.topic: how-to
9+
ms.date: 09/18/2024
10+
ms.author: banders
11+
#customer intent: As a Microsoft Customer Agreement billing owner, I want learn about managing a MACC so that I move it when needed.
12+
---
13+
14+
# Manage a Microsoft Azure Consumption Commitment resource under a subscription
15+
16+
When you accept a Microsoft Azure Consumption Commitment (MACC) in a Microsoft Customer Agreement, the MACC resource gets placed in a subscription and resource group. The resource contains the metadata related to the MACC. Including: status of the MACC, commitment amount, start date, end date, and System ID. You can view the metadata in the Azure portal.
17+
18+
:::image type="content" source="./media/manage-consumption-commitment/consumption-commitment-overview.png" border="true" alt-text="Screenshot showing the MACC overview page." lightbox="./media/manage-consumption-commitment/consumption-commitment-overview.png" :::
19+
20+
## Move MACC across resource groups or subscriptions
21+
22+
You can move the MACC resource to another resource group or subscription. Moving it works the same way as moving other Azure resources.
23+
24+
Moving a MACC resource to another subscription or resource group is a metadata change. The move doesn't affect the commitment. The destination resource group or subscription must be within the same billing profile where the MACC is currently located.
25+
26+
### To move a MACC
27+
28+
Here are the high-level steps to move a MACC resource. For more information about moving an Azure resource, see [Move Azure resources to a new resource group or subscription](../../azure-resource-manager/management/move-resource-group-and-subscription.md).
29+
30+
1. In the [Azure portal](https://portal.azure.com), navigate to **Resource groups**.
31+
2. Select the resource group that contains the MACC resource.
32+
3. Select the MACC resource.
33+
4. At top of the page select **Move** and then select **Move to another subscription** or **Move to another resource group**.
34+
5. Follow the instructions to move the MACC resource.
35+
6. After the move is complete, verify that the MACC resource is in the new resource group or subscription.
36+
37+
After a MACC moves, its resource URI changes because of the move.
38+
39+
### To view the MACC resource URI
40+
41+
1. In the [Azure portal](https://portal.azure.com), search for **Microsoft Azure Consumption Commitments**.
42+
2. Select the MACC resource.
43+
3. On the Overview page, in the left navigation menu, expand **Settings**, and then select **Properties**.
44+
4. The MACC resource URI is the **ID** value.
45+
46+
Here's an example image:
47+
48+
:::image type="content" source="./media/manage-consumption-commitment/consumption-commitment-uri.png" border="true" alt-text="Screenshot showing the MACC properties page URI." lightbox="./media/manage-consumption-commitment/consumption-commitment-uri.png" :::
49+
50+
51+
## Delete MACC
52+
53+
You can't delete an active MACC resource. The MACC must be **Expired** or **Canceled** before you can delete it.
54+
55+
## Related content
56+
57+
- [Move Azure resources to a new resource group or subscription](../../azure-resource-manager/management/move-resource-group-and-subscription.md)
83.1 KB
Loading
68.2 KB
Loading

articles/cost-management-billing/toc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,8 @@
9393
href: manage/spending-limit.md
9494
- name: Track credits for Microsoft Customer Agreement
9595
href: manage/mca-check-azure-credits-balance.md
96+
- name: Manage a Microsoft Azure Consumption Commitment
97+
href: manage/manage-consumption-commitment.md
9698
- name: Track your Microsoft Azure Consumption Commitment
9799
href: manage/track-consumption-commitment.md
98100
- name: Markup - China
10.4 KB
Loading

0 commit comments

Comments
 (0)