Skip to content

Commit aee0d5c

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into retirementnote
2 parents 6a0dbb9 + 4d7aafb commit aee0d5c

File tree

4 files changed

+17
-183
lines changed

4 files changed

+17
-183
lines changed

articles/ai-services/.openpublishing.redirection.applied-ai-services.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,11 @@
180180
"redirect_url": "/azure/ai-services/computer-vision/intro-to-spatial-analysis-public-preview",
181181
"redirect_document_id": false
182182
},
183+
{
184+
"source_path_from_root": "/articles/ai-services/luis/luis-migration-api-v1-to-v2.md",
185+
"redirect_url": "/azure/ai-services/language-service/conversational-language-understanding/how-to/migrate-from-luis",
186+
"redirect_document_id": false
187+
},
183188
{
184189
"source_path_from_root": "/articles/ai-services/custom-vision-service/update-application-to-3.0-sdk.md",
185190
"redirect_url": "/azure/ai-services/custom-vision-service/overview",

articles/ai-services/LUIS/luis-migration-api-v1-to-v2.md

Lines changed: 0 additions & 171 deletions
This file was deleted.

articles/ai-services/LUIS/role-based-access-control.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ A user that should only be validating and reviewing LUIS applications, typically
7979
* [LUIS Programmatic v2.0 APIs](https://westus.dev.cognitive.microsoft.com/docs/services/5890b47c39e2bb17b84a55ff/operations/5890b47c39e2bb052c5b9c2f)
8080

8181
All the APIs under:
82-
* [LUIS Endpoint APIs v2.0](./luis-migration-api-v1-to-v2.md)
82+
* LUIS Endpoint APIs v2.0
8383
* [LUIS Endpoint APIs v3.0](https://westcentralus.dev.cognitive.microsoft.com/docs/services/luis-endpoint-api-v3-0/operations/5cb0a9459a1fe8fa44c28dd8)
8484
* [LUIS Endpoint APIs v3.0-preview](https://westcentralus.dev.cognitive.microsoft.com/docs/services/luis-endpoint-api-v3-0-preview/operations/5cb0a9459a1fe8fa44c28dd8)
8585

articles/cost-management-billing/costs/tutorial-acm-create-budgets.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@ title: Tutorial - Create and manage budgets
33
description: This tutorial helps you plan and account for the costs of Azure services that you consume.
44
author: bandersmsft
55
ms.author: banders
6-
ms.date: 06/07/2023
6+
ms.date: 02/09/2024
77
ms.topic: tutorial
88
ms.service: cost-management-billing
99
ms.subservice: cost-management
10-
ms.reviewer: adwise
10+
ms.reviewer: jojo
1111
ms.custom: devx-track-arm-template, devx-track-azurepowershell
1212
---
1313

1414
# Tutorial: Create and manage budgets
1515

1616
Budgets in Cost Management help you plan for and drive organizational accountability. They help you proactively inform others about their spending to manage costs and monitor how spending progresses over time.
1717

18-
You can configure alerts based on your actual cost or forecasted cost to ensure that your spending is within your organizational spending limit. Notifications are triggered when the budget thresholds you've created are exceeded. Resources are not affected, and your consumption isn't stopped. You can use budgets to compare and track spending as you analyze costs.
18+
You can configure alerts based on your actual cost or forecasted cost to ensure that your spending is within your organizational spending limit. Notifications are triggered when the budget thresholds are exceeded. Resources aren't affected, and your consumption isn't stopped. You can use budgets to compare and track spending as you analyze costs.
1919

2020
Cost and usage data is typically available within 8-24 hours and budgets are evaluated against these costs every 24 hours. Be sure to get familiar with [Cost and usage data updates](./understand-cost-mgt-data.md#cost-and-usage-data-updates-and-retention) specifics. When a budget threshold is met, email notifications are normally sent within an hour of the evaluation.
2121

22-
Budgets reset automatically at the end of a period (monthly, quarterly, or annually) for the same budget amount when you select an expiration date in the future. Because they reset with the same budget amount, you need to create separate budgets when budgeted currency amounts differ for future periods. When a budget expires, it's automatically deleted.
22+
Budgets reset automatically at the end of a period (monthly, quarterly, or annually) for the same budget amount when you select an expiration date in the future. Because they reset with the same budget amount, you need to create separate budgets when budgeted currency amounts differ for future periods. When a budget expires, it automatically gets deleted.
2323

2424
The examples in this tutorial walk you through creating and editing a budget for an Azure Enterprise Agreement (EA) subscription.
2525

@@ -48,7 +48,7 @@ Budgets are supported for the following types of Azure account types and scopes:
4848
- Individual agreements
4949
- Billing account
5050
- Microsoft Customer Agreement scopes
51-
- Billing account
51+
- Billing account - Budget evaluation only supports USD currency, not the billing currency. An exception is that customers in the China 21V cloud have their budgets evaluated in CNY currency.
5252
- Billing profile
5353
- Invoice section
5454
- Customer
@@ -60,7 +60,7 @@ To view budgets, you need at least read access for your Azure account.
6060

6161
If you have a new subscription, you can't immediately create a budget or use other Cost Management features. It might take up to 48 hours before you can use all Cost Management features.
6262

63-
For Azure EA subscriptions, you must have read access to view budgets. To create and manage budgets, you must have contributor permission.
63+
You must have read access to view budgets for Azure EA subscriptions. To create and manage budgets, you must have contributor permission.
6464

6565
The following Azure permissions, or scopes, are supported per subscription for budgets by user and group.
6666

@@ -88,9 +88,9 @@ Select **Add**.
8888

8989
In the **Create budget** window, make sure that the scope shown is correct. Choose any filters that you want to add. Filters allow you to create budgets on specific costs, such as resource groups in a subscription or a service like virtual machines. For more information about the common filter properties that you can use in budgets and cost analysis, see [Group and filter properties](group-filter.md#group-and-filter-properties).
9090

91-
After you identify your scope and filters, type a budget name. Then, choose a monthly, quarterly, or annual budget reset period. The reset period determines the time window that's analyzed by the budget. The cost evaluated by the budget starts at zero at the beginning of each new period. When you create a quarterly budget, it works in the same way as a monthly budget. The difference is that the budget amount for the quarter is evenly divided among the three months of the quarter. An annual budget amount is evenly divided among all 12 months of the calendar year.
91+
After you identify your scope and filters, type a budget name. Then, choose a monthly, quarterly, or annual budget reset period. The reset period determines the time window that gets analyzed by the budget. The cost evaluated by the budget starts at zero at the beginning of each new period. When you create a quarterly budget, it works in the same way as a monthly budget. The difference is that the budget amount for the quarter is evenly divided among the three months of the quarter. An annual budget amount is evenly divided among all 12 months of the calendar year.
9292

93-
If you have a Pay-As-You-Go, MSDN, or Visual Studio subscription, your invoice billing period might not align to the calendar month. For those subscription types and resource groups, you can create a budget that's aligned to your invoice period or to calendar months. To create a budget aligned to your invoice period, select a reset period of **Billing month**, **Billing quarter**, or **Billing year**. To create a budget aligned to the calendar month, select a reset period of **Monthly**, **Quarterly**, or **Annually**.
93+
If you have a pay-as-you-go, MSDN, or Visual Studio subscription, your invoice billing period might not align to the calendar month. For those subscription types and resource groups, you can create a budget aligned to your invoice period or to calendar months. To create a budget aligned to your invoice period, select a reset period of **Billing month**, **Billing quarter**, or **Billing year**. To create a budget aligned to the calendar month, select a reset period of **Monthly**, **Quarterly**, or **Annually**.
9494

9595
Next, identify the expiration date when the budget becomes invalid and stops evaluating your costs.
9696

@@ -102,7 +102,7 @@ After you configure the budget amount, select **Next** to configure budget alert
102102

103103
## Configure actual costs budget alerts
104104

105-
Budgets require at least one cost threshold (% of budget) and a corresponding email address. You can optionally include up to five thresholds and five email addresses in a single budget. When a budget threshold is met, email notifications are normally sent within an hour of the evaluation. Actual costs budget alerts are generated for the actual cost you've accrued in relation to the budget thresholds configured.
105+
Budgets require at least one cost threshold (% of budget) and a corresponding email address. You can optionally include up to five thresholds and five email addresses in a single budget. When a budget threshold is met, email notifications are normally sent within an hour of the evaluation. Actual costs budget alerts are generated for the actual cost accrued in relation to the budget thresholds configured.
106106

107107
## Configure forecasted budget alerts
108108

@@ -114,11 +114,11 @@ If you want to receive emails, add [email protected] to your approved
114114

115115
In the following example, an email alert gets generated when 90% of the budget is reached. If you create a budget with the Budgets API, you can also assign roles to people to receive alerts. Assigning roles to people isn't supported in the Azure portal. For more about the Budgets API, see [Budgets API](/rest/api/consumption/budgets). If you want to have an email alert sent in a different language, see [Supported locales for budget alert emails](../automate/automate-budget-creation.md#supported-locales-for-budget-alert-emails).
116116

117-
Alert limits support a range of 0.01% to 1000% of the budget threshold that you've provided.
117+
Alert limits support a range of 0.01% to 1000% of the budget threshold.
118118

119119
:::image type="content" source="./media/tutorial-acm-create-budgets/budget-set-alert.png" alt-text="Screenshot showing alert conditions." lightbox="./media/tutorial-acm-create-budgets/budget-set-alert.png" :::
120120

121-
After you create a budget, it's shown in cost analysis. Viewing your budget against your spending trend is one of the first steps when you start to [analyze your costs and spending](./quick-acm-cost-analysis.md).
121+
After you create a budget, it appears in cost analysis. Viewing your budget against your spending trend is one of the first steps when you start to [analyze your costs and spending](./quick-acm-cost-analysis.md).
122122

123123
:::image type="content" source="./media/tutorial-acm-create-budgets/cost-analysis.png" alt-text="Screenshot showing an example budget with spending shown in cost analysis." lightbox="./media/tutorial-acm-create-budgets/cost-analysis.png" :::
124124

0 commit comments

Comments
 (0)