Skip to content

Commit ddef0e6

Browse files
Merge pull request #265936 from bandersmsft/misc-fixes-02092024
MCM - Misc fixes for 404 and acrolinx
2 parents 403190e + eb564ea commit ddef0e6

File tree

3 files changed

+27
-27
lines changed

3 files changed

+27
-27
lines changed

articles/cost-management-billing/manage/azurestudents-subscription-disabled.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ ms.author: banders
1212

1313
# Why is my Azure for Students subscription disabled and how do I reactivate it?
1414

15-
Your Azure for Students subscription might get disabled because you've used all of your credit, your credit has expired, or you've accidentally canceled your subscription. See what issue applies to you and learn how you can get your subscription reactivated.
15+
Your Azure for Students subscription might get disabled because you used all of your credit. It might also get disabled if your credit is expired or you accidentally canceled your subscription. See what issue applies to you and learn how you can get your subscription reactivated.
1616

17-
## You've used all of your credit
17+
## You used all of your credit
1818

19-
Azure for Students account gives you $100 in credit and a limited quantity of free services for 12 months. Any usage beyond the free services and quantities is deducted from your credit. Once your credit runs out, Azure disables your services and subscription. To continue using Azure services, you must upgrade your subscription to a pay-as-you-go subscription by contacting [Azure support](https://portal.azure.com/?#blade/Microsoft_Azure_Support/HelpAndSupportBlade). After you upgrade, your subscription still has access to free services for 12 months from your sign-up date. You only get charged for usage beyond the free services and quantities.
19+
Azure for Students account gives you $100 in credit and a limited quantity of free services for 12 months. Any usage beyond the free services and quantities is deducted from your credit. Once your credit runs out, Azure disables your services and subscription. To continue using Azure services, you must upgrade your subscription to a pay-as-you-go subscription by contacting [Azure support](https://portal.azure.com/?#blade/Microsoft_Azure_Support/HelpAndSupportBlade). After upgrade, your subscription still has access to free services for 12 months from your sign-up date. You only get charged for usage beyond the free services and quantities.
2020

21-
You can check your remaining credit on the [Microsoft Azure Sponsorships portal](https://www.microsoftazuresponsorships.com/balance)
21+
You can check your remaining credit on the [Microsoft Azure Sponsorships portal](https://www.microsoftazuresponsorships.com/balance).
2222

2323
1. Sign in using your Azure for Students account credentials.
2424
2. The balance page gives information about used and remaining credit. You can find your credit expiration date below the credit chart.
@@ -35,13 +35,13 @@ The table contains the following columns:
3535
* **Service Resource:** Unit of measurement for the service being consumed.
3636
* **Spend:** Amount of credit in USD($) spent on the service.
3737

38-
## Your credit has expired
38+
## Your credit expired
3939

40-
Your Azure for Students credit expires at the end of 12 months. Once your credit expires, Azure disables your subscription. To continue using Azure services, you must upgrade your subscription to a Pay-As-You-Go subscription by contacting [Azure support](https://portal.azure.com/?#blade/Microsoft_Azure_Support/HelpAndSupportBlade). After you upgrade, Azure charges you pay-as-you-go rates for any services you're using.
40+
Your Azure for Students credit expires at the end of 12 months. Once your credit expires, Azure disables your subscription. To continue using Azure services, you must upgrade your subscription to a pay-as-you-go subscription by contacting [Azure support](https://portal.azure.com/?#blade/Microsoft_Azure_Support/HelpAndSupportBlade). After upgrade, Azure charges you pay-as-you-go rates for any services you're using.
4141

42-
## You've accidentally canceled your subscription
42+
## You accidentally canceled your subscription
4343

44-
If you've accidentally canceled your Azure for Students subscription, you can reactivate it by contacting [Azure support](https://portal.azure.com/?#blade/Microsoft_Azure_Support/HelpAndSupportBlade). Once you reactivate, you still have access to the remaining credit and free services for 12 months from your sign-up date.
44+
If you accidentally canceled your Azure for Students subscription, you can reactivate it by contacting [Azure support](https://portal.azure.com/?#blade/Microsoft_Azure_Support/HelpAndSupportBlade). Once you reactivate, you still have access to the remaining credit and free services for 12 months from your sign-up date.
4545

4646
## Need help? Contact us.
4747

articles/cost-management-billing/manage/cost-management-budget-scenario.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Azure billing and cost management budget scenario
3-
description: Learn how to use Azure automation to shut down VMs based on specific budget thresholds.
3+
description: Learn how to use Azure Automation to shut down VMs based on specific budget thresholds.
44
author: bandersmsft
55
ms.reviewer: adwise
66
ms.service: cost-management-billing
@@ -16,20 +16,20 @@ Cost control is a critical component to maximizing the value of your investment
1616

1717
Budgets are commonly used as part of cost control. Budgets can be scoped in Azure. For instance, you could narrow your budget view based on subscription, resource groups, or a collection of resources. In addition to using the budgets API to notify you via email when a budget threshold is reached, you can use [Azure Monitor action groups](../../azure-monitor/alerts/action-groups.md) to trigger an orchestrated set of actions resulting from a budget event.
1818

19-
A common budgets scenario for a customer running a non-critical workload could occur when they want to manage against a budget and also get to a predictable cost when looking at the monthly invoice. This scenario requires some cost-based orchestration of resources that are part of the Azure environment. In this scenario, a monthly budget of $1000 for the subscription is set. Also, notification thresholds are set to trigger a few orchestrations. This scenario starts with an 80% cost threshold, which will stop all VMs in the resource group **Optional**. Then, at the 100% cost threshold, all VM instances will be stopped.
19+
A common budgets scenario for a customer running a noncritical workload could occur when they want to manage against a budget and also get to a predictable cost when looking at the monthly invoice. This scenario requires some cost-based orchestration of resources that are part of the Azure environment. In this scenario, a monthly budget of $1,000 for the subscription is set. Also, notification thresholds are set to trigger a few orchestrations. This scenario starts with an 80% cost threshold, which will stop all virtual machines (VM) in the resource group **Optional**. Then, at the 100% cost threshold, all VM instances are stopped.
2020

2121
To configure this scenario, you'll complete the following actions by using the steps provided in each section of this tutorial.
2222

2323
These actions included in this tutorial allow you to:
2424

2525
- Create an Azure Automation Runbook to stop VMs by using webhooks.
2626
- Create an Azure Logic App to be triggered based on the budget threshold value and call the runbook with the right parameters.
27-
- Create an Azure Monitor Action Group that will be configured to trigger the Azure Logic App when the budget threshold is met.
27+
- Create an Azure Monitor Action Group that is configured to trigger the Azure Logic App when the budget threshold is met.
2828
- Create the budget with the wanted thresholds and wire it to the action group.
2929

3030
## Create an Azure Automation Runbook
3131

32-
[Azure Automation](../../automation/automation-intro.md) is a service that enables you to script most of your resource management tasks and run those tasks as either scheduled or on-demand. As part of this scenario, you'll create an [Azure Automation runbook](../../automation/automation-runbook-types.md) that will be used to stop VMs. You'll use the [Stop Azure V2 VMs](https://gallery.technet.microsoft.com/scriptcenter/Stop-Azure-ARM-VMs-1ba96d5b) graphical runbook from the [gallery](../../automation/automation-runbook-gallery.md) to build this scenario. By importing this runbook into your Azure account and publishing it, you can stop VMs when a budget threshold is reached.
32+
[Azure Automation](../../automation/automation-intro.md) is a service that enables you to script most of your resource management tasks and run those tasks as either scheduled or on-demand. As part of this scenario, you'll create an [Azure Automation runbook](../../automation/automation-runbook-types.md) that will be used to stop VMs. You'll use the [Stop Azure V2 VMs](https://github.com/azureautomation/stop-azure-v2-vms) graphical runbook from the [Azure Automation gallery](https://github.com/azureautomation) to build this scenario. By importing this runbook into your Azure account and publishing it, you can stop VMs when a budget threshold is reached.
3333

3434
### Create an Azure Automation account
3535

@@ -43,13 +43,13 @@ These actions included in this tutorial allow you to:
4343

4444
### Import the Stop Azure V2 VMs runbook
4545

46-
Using an [Azure Automation runbook](../../automation/automation-runbook-types.md), import the [Stop Azure V2 VMs](https://gallery.technet.microsoft.com/scriptcenter/Stop-Azure-ARM-VMs-1ba96d5b) graphical runbook from the gallery.
46+
Using an [Azure Automation runbook](../../automation/automation-runbook-types.md), import the [Stop Azure V2 VMs](https://github.com/azureautomation/stop-azure-v2-vms) graphical runbook from the gallery.
4747

4848
1. Sign in to the [Azure portal](https://portal.azure.com/) with your Azure account credentials.
4949
1. Open your Automation account by selecting **All services** > **Automation Accounts**. Then, select your Automation Account.
5050
1. Select **Runbooks gallery** from the **Process Automation** section.
5151
1. Set the **Gallery Source** to **Script Center** and select **OK**.
52-
1. Locate and select the [Stop Azure V2 VMs](https://gallery.technet.microsoft.com/scriptcenter/Stop-Azure-ARM-VMs-1ba96d5b) gallery item within the Azure portal.
52+
1. Locate and select the [Stop Azure V2 VMs](https://github.com/azureautomation/stop-azure-v2-vms) gallery item within the Azure portal.
5353
1. Select **Import** to display the **Import** area and select **OK**. The runbook overview area will be displayed.
5454
1. Once the runbook has completed the import process, select **Edit** to display the graphical runbook editor and publishing option.
5555
![Azure - Edit graphical runbook](./media/cost-management-budget-scenario/billing-cost-management-budget-scenario-01.png)
@@ -58,7 +58,7 @@ Using an [Azure Automation runbook](../../automation/automation-runbook-types.md
5858

5959
## Create webhooks for the runbook
6060

61-
Using the [Stop Azure V2 VMs](https://gallery.technet.microsoft.com/scriptcenter/Stop-Azure-ARM-VMs-1ba96d5b) graphical runbook, you create two Webhooks to start the runbook in Azure Automation through a single HTTP request. The first webhook invokes the runbook at an 80% budget threshold with the resource group name as a parameter, allowing the optional VMs to be stopped. Then, the second webhook invokes the runbook with no parameters (at 100%), which stops all remaining VM instances.
61+
Using the [Stop Azure V2 VMs](https://github.com/azureautomation/stop-azure-v2-vms) graphical runbook, you create two Webhooks to start the runbook in Azure Automation through a single HTTP request. The first webhook invokes the runbook at an 80% budget threshold with the resource group name as a parameter, allowing the optional VMs to be stopped. Then, the second webhook invokes the runbook with no parameters (at 100%), which stops all remaining VM instances.
6262

6363
1. From the **Runbooks** page in the [Azure portal](https://portal.azure.com/), select the **StopAzureV2Vm** runbook that displays the runbook's overview area.
6464
1. Select **Webhook** at the top of the page to open the **Add Webhook** area.
@@ -149,7 +149,7 @@ Use a conditional statement to check whether the threshold amount has reached 80
149149
1. Select **is greater than or equal to** in the dropdown box of the **Condition**.
150150
1. In the **Choose a value** box of the condition, enter `.8`.
151151
![Screenshot shows the Condition dialog box with values selected.](./media/cost-management-budget-scenario/billing-cost-management-budget-scenario-12.png)
152-
1. Select **Add** > **Add row** within the Condition box to add an additional part of the condition.
152+
1. Select **Add** > **Add row** within the Condition box to add another part of the condition.
153153
1. In the **Condition** box, select the textbox containing `Choose a value`.
154154
1. Select **Expression** at the top of the list and enter the following expression in the expression editor:
155155
`float()`
@@ -310,9 +310,9 @@ Next, you'll configure **Postman** to create a budget by calling the Azure Consu
310310
```
311311
1. Press **Send** to send the request.
312312
313-
You now have all the pieces you need to call the [budgets API](/rest/api/consumption/budgets). The budgets API reference has additional details on the specific requests, including:
313+
You now have all the pieces you need to call the [budgets API](/rest/api/consumption/budgets). The budgets API reference has more details on the specific requests, including:
314314
315-
- **budgetName** - Multiple budgets are supported. Budget names must be unique.
315+
- **budgetName** - Multiple budgets are supported. Budget names must be unique.
316316
- **category** - Must be either **Cost** or **Usage**. The API supports both cost and usage budgets.
317317
- **timeGrain** - A monthly, quarterly, or yearly budget. The amount resets at the end of the period.
318318
- **filters** - Filters allow you to narrow the budget to a specific set of resources within the selected scope. For example, a filter could be a collection of resource groups for a subscription level budget.

articles/cost-management-billing/manage/enterprise-api.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,36 +12,36 @@ ms.author: banders
1212
---
1313
# Overview of the Azure Enterprise Reporting APIs
1414

15-
> [!Note]
15+
> [!NOTE]
1616
> Microsoft no longer updates the Azure Enterprise Reporting APIs. Instead, you should use Cost Management APIs. To learn more, see [Migrate from Azure Enterprise Reporting to Microsoft Cost Management APIs overview](../automate/migrate-ea-reporting-arm-apis-overview.md).
1717
18-
The Azure Enterprise Reporting APIs enable Enterprise Azure customers to programmatically pull consumption and billing data into preferred data analysis tools. Enterprise customers have signed an [Enterprise Agreement (EA)](https://azure.microsoft.com/pricing/enterprise-agreement/) with Azure to make negotiated Azure Prepayment (previously called monetary commitment) and gain access to custom pricing for Azure resources.
18+
The Azure Enterprise Reporting APIs enable Enterprise Azure customers to programmatically pull consumption and billing data into preferred data analysis tools. Enterprise customers signed an [Enterprise Agreement (EA)](https://azure.microsoft.com/pricing/enterprise-agreement/) with Azure to make negotiated Azure Prepayment (previously called monetary commitment) and gain access to custom pricing for Azure resources.
1919

2020
All date and time parameters required for APIs must be represented as combined Coordinated Universal Time (UTC) values. Values returned by APIs are shown in UTC format.
2121

2222
## Enabling data access to the API
23-
* **Generate or retrieve the API key** - Log in to the Enterprise portal, and navigate to Reports > Download Usage > API Access Key to generate or retrieve the API key.
24-
* **Passing keys in the API** - The API key needs to be passed for each call for Authentication and Authorization. The following property needs to be to the HTTP headers
23+
* **Generate or retrieve the API key** - Sign in to the Enterprise portal, and navigate to Reports > Download Usage > API Access Key to generate or retrieve the API key.
24+
* **Passing keys in the API** - The API key needs to be passed for each call for Authentication and Authorization. The following property needs to be to the HTTP headers.
2525

2626
|Request Header Key | Value|
2727
|-|-|
2828
|Authorization| Specify the value in this format: **bearer {API_KEY}** <br/> Example: bearer eyr....09|
2929

3030
## Consumption-based APIs
31-
A Swagger endpoint is available [here](https://consumption.azure.com/swagger/ui/index) for the APIs described below which should enable easy introspection of the API and the ability to generate client SDKs using [AutoRest](https://github.com/Azure/AutoRest) or [Swagger CodeGen](https://swagger.io/swagger-codegen/). Data beginning May 1, 2014 is available through this API.
31+
A Swagger endpoint is available [here](https://consumption.azure.com/swagger/ui/index) for the following APIs. They should enable easy introspection of the API and the ability to generate client software development kits (SDK)s using [AutoRest](https://github.com/Azure/AutoRest) or [Swagger CodeGen](https://swagger.io/swagger-codegen/). Data beginning May 1, 2014 is available through this API.
3232

33-
* **Balance and Summary** - The [Balance and Summary API](/rest/api/billing/enterprise/billing-enterprise-api-balance-summary) offers a monthly summary of information on balances, new purchases, Azure Marketplace service charges, adjustments and overage charges.
33+
* **Balance and Summary** - The [Balance and Summary API](/rest/api/billing/enterprise/billing-enterprise-api-balance-summary) offers a monthly summary of information on balances, new purchases, Azure Marketplace service charges, adjustments, and overage charges.
3434

35-
* **Usage Details** - The [Usage Detail API](/rest/api/billing/enterprise/billing-enterprise-api-usage-detail) offers a daily breakdown of consumed quantities and estimated charges by an Enrollment. The result also includes information on instances, meters and departments. The API can be queried by Billing period or by a specified start and end date.
35+
* **Usage Details** - The [Usage Detail API](/rest/api/billing/enterprise/billing-enterprise-api-usage-detail) offers a daily breakdown of consumed quantities and estimated charges by an Enrollment. The result also includes information on instances, meters, and departments. Query the API by Billing period or by a specified start and end date.
3636

37-
* **Marketplace Store Charge** - The [Marketplace Store Charge API](/rest/api/billing/enterprise/billing-enterprise-api-marketplace-storecharge) returns the usage-based marketplace charges breakdown by day for the specified Billing Period or start and end dates (one time fees are not included).
37+
* **Marketplace Store Charge** - The [Marketplace Store Charge API](/rest/api/billing/enterprise/billing-enterprise-api-marketplace-storecharge) returns the usage-based marketplace charges breakdown by day for the specified Billing Period or start and end dates (one time fees aren't included).
3838

3939
* **Price Sheet** - The [Price Sheet API](/rest/api/billing/enterprise/billing-enterprise-api-pricesheet) provides the applicable rate for each Meter for the given Enrollment and Billing Period.
4040

4141
* **Reserved Instance Details** - The [Reserved Instance usage API](/rest/api/billing/enterprise/billing-enterprise-api-reserved-instance-usage) returns the usage of the Reserved Instance purchases. The [Reserved Instance charges API](/rest/api/billing/enterprise/billing-enterprise-api-reserved-instance-usage) shows the billing transactions made.
4242

4343
## Data Freshness
44-
Etags will be returned in the response of all the above API. A change in Etag indicates the data has been refreshed. In subsequent calls to the same API using the same parameters, pass the captured Etag with the key "If-None-Match" in the header of http request. The response status code would be "NotModified" if the data has not been refreshed any further and no data will be returned. API will return the full dataset for the required period whenever there is an etag change.
44+
Etags are returned in the response of all the above API. A change in Etag indicates the data was refreshed. In subsequent calls to the same API using the same parameters, pass the captured Etag with the key "If-None-Match" in the header of http request. The response status code is `NotModified` if the data isn't refreshed further and no data is returned. API returns the full dataset for the required period whenever there's an etag change.
4545

4646
## Helper APIs
4747
**List Billing Periods** - The [Billing Periods API](/rest/api/billing/enterprise/billing-enterprise-api-billing-periods) returns a list of billing periods that have consumption data for the specified Enrollment in reverse chronological order. Each Period contains a property pointing to the API route for the four sets of data - BalanceSummary, UsageDetails, Marketplace Charges, and Price Sheet.

0 commit comments

Comments
 (0)