Skip to content

Commit 228d954

Browse files
authored
Merge pull request #206950 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 99c2112 + a9b0433 commit 228d954

File tree

4 files changed

+24
-23
lines changed

4 files changed

+24
-23
lines changed

articles/aks/openfaas.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ gateway ClusterIP 10.0.156.194 <none> 8080/TCP
105105
gateway-external LoadBalancer 10.0.28.18 52.186.64.52 8080:30800/TCP 7m
106106
```
107107

108-
To test the OpenFaaS system, browse to the external IP address on port 8080, `http://52.186.64.52:8080` in this example. You will be prompted to log in. To fetch your password, enter `echo $PASSWORD`.
108+
To test the OpenFaaS system, browse to the external IP address on port 8080, `http://52.186.64.52:8080` in this example. You will be prompted to log in. The default user is `admin` and your password can be retrieved by using `echo $PASSWORD`.
109109

110110
![OpenFaaS UI](media/container-service-serverless/openfaas.png)
111111

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2-
title: Migrate from EA Reporting to Azure Resource Manager APIs overview
2+
title: Migrate from Azure Enterprise Reporting to Microsoft Cost Management APIs overview
33
titleSuffix: Microsoft Cost Management
4-
description: This article provides an overview about migrating from EA Reporting to Azure Resource Manager APIs.
4+
description: This article provides an overview about migrating from Azure Enterprise Reporting to Microsoft Cost Management APIs.
55
author: bandersmsft
66
ms.author: banders
77
ms.date: 07/15/2022
@@ -11,15 +11,15 @@ ms.subservice: cost-management
1111
ms.reviewer: adwise
1212
---
1313

14-
# Migrate from EA Reporting to Azure Resource Manager APIs overview
14+
# Migrate from Azure Enterprise Reporting to Microsoft Cost Management APIs overview
1515

16-
This article helps developers that have built custom solutions using the [Azure Reporting APIs for Enterprise Customers](../manage/enterprise-api.md) to migrate to Azure Resource Manager APIs for Cost Management. Service principal support for the newer Azure Resource Manager APIs. Azure Resource Manager APIs are still in active development. Consider migrating to them instead of using the older Azure Reporting APIs for Enterprise customers. The older APIs are being deprecated. This article helps you understand the differences between the Reporting APIs and the Azure Resource Manager APIs, what to expect when you migrate to the Azure Resource Manager APIs, and the new capabilities that are available with the new Azure Resource Manager APIs.
16+
This article helps developers that have built custom solutions using the [Azure Enterprise Reporting APIs](../manage/enterprise-api.md) to migrate to Microsoft Cost Management APIs. Service principal support is available in the newer Cost Management APIs and they are still actively being developed. Consider migrating to them instead of using the older Azure Enterprise Reporting APIs. The older APIs are being deprecated. This article helps you understand the differences between the Azure Enterprise Reporting APIs and the Cost Management APIs, what to expect when you migrate to the Cost Management APIs, and the new capabilities that are available with the Cost Management APIs.
1717

1818
## API differences
1919

20-
The following information describes the differences between the older Reporting APIs for Enterprise Customers and the newer Azure Resource Manager APIs.
20+
The following information describes the differences between the older Azure Enterprise Reporting APIs and the newer Cost Management APIs.
2121

22-
| Use | Enterprise Agreement APIs | Azure Resource Manager APIs |
22+
| Use | Azure Enterprise Reporting APIs | Microsoft Cost Management APIs |
2323
| --- | --- | --- |
2424
| Authentication | API key provisioned in the Enterprise Agreement (EA) portal | Azure Active Directory (Azure AD) Authentication using user tokens or service principals. Service principals take the place of API keys. |
2525
| Scopes and permissions | All requests are at the enrollment scope. API Key permission assignments will determine whether data for the entire enrollment, a department, or a specific account is returned. No user authentication. | Users or service principals are assigned access to the enrollment, department, or account scope. |
@@ -30,19 +30,19 @@ The following information describes the differences between the older Reporting
3030
## Migration checklist
3131

3232
- Familiarize yourself with the [Azure Resource Manager REST APIs](/rest/api/azure).
33-
- Determine which EA APIs you use and see which Azure Resource Manager APIs to move to at [EA API mapping to new Azure Resource Manager APIs](../costs/migrate-from-enterprise-reporting-to-azure-resource-manager-apis.md#ea-api-mapping-to-new-azure-resource-manager-apis).
34-
- Configure service authorization and authentication for the Azure Resource Manager APIs. For more information, see [Assign permission to ACM APIs](cost-management-api-permissions.md).
35-
- Test the APIs and then update any programming code to replace EA API calls with Azure Resource Manager API calls.
33+
- Determine which Enterprise Reporting APIs you use and see which Cost Management APIs to move to at [Enterprise Reporting API mapping to new Cost Management APIs](../costs/migrate-from-enterprise-reporting-to-azure-resource-manager-apis.md#ea-api-mapping-to-new-azure-resource-manager-apis).
34+
- Configure service authorization and authentication for the Cost Management APIs. For more information, see [Assign permission to ACM APIs](cost-management-api-permissions.md).
35+
- Test the APIs and then update any programming code to replace Enterprise Reporting API calls with Cost Management API calls.
3636
- Update error handling to use new error codes. Some considerations include:
37-
- Azure Resource Manager APIs have a timeout period of 60 seconds.
38-
- Azure Resource Manager APIs have rate limiting in place. This results in a `429 throttling error` if rates are exceeded. Build your solutions so that you don't make too many API calls in a short time period.
37+
- Cost Management APIs have a timeout period of 60 seconds.
38+
- Cost Management APIs have rate limiting in place. This results in a `429 throttling error` if rates are exceeded. Build your solutions so that you don't make too many API calls in a short time period.
3939
- Review the other Cost Management APIs available through Azure Resource Manager and assess for use later. For more information, see [Use additional Cost Management APIs](../costs/migrate-from-enterprise-reporting-to-azure-resource-manager-apis.md#use-additional-cost-management-apis).
4040

41-
## EA API mapping to new Azure Resource Manager APIs
41+
## Enterprise Reporting API mapping to new Cost Management APIs
4242

43-
Use the following information to identify the EA APIs that you currently use and the replacement Azure Resource Manager API to use instead.
43+
Use the following information to identify the Enterprise Reporting APIs that you currently use and the replacement Cost Management API to use instead.
4444

45-
| Scenario | EA APIs | Azure Resource Manager APIs |
45+
| Scenario | Enterprise Reporting APIs | Cost Management APIs |
4646
| --- | --- | --- |
4747
| [Migrate from EA Usage Details APIs](migrate-ea-usage-details-api.md) | [/usagedetails/download](/rest/api/billing/enterprise/billing-enterprise-api-usage-detail)<br>[/usagedetails/submit](/rest/api/billing/enterprise/billing-enterprise-api-usage-detail)<br>[/usagedetails](/rest/api/billing/enterprise/billing-enterprise-api-usage-detail)<br>[/usagedetailsbycustomdate](/rest/api/billing/enterprise/billing-enterprise-api-usage-detail) | Use [Microsoft.CostManagement/Exports](/rest/api/cost-management/exports/create-or-update) for all recurring data ingestion workloads. <br>Use the [Cost Details](/rest/api/cost-management/generate-cost-details-report) report for small on-demand datasets. |
4848
| [Migrate from EA Balance Summary APIs](migrate-ea-balance-summary-api.md) | [/balancesummary](/rest/api/billing/enterprise/billing-enterprise-api-balance-summary) | [Microsoft.Consumption/balances](/rest/api/consumption/balances/getbybillingaccount) |
@@ -54,7 +54,7 @@ Use the following information to identify the EA APIs that you currently use and
5454

5555
## Use additional Cost Management APIs
5656

57-
After you've migrated to Azure Resource Manager APIs for your existing reporting scenarios, you can use many other APIs, too. The APIs are also available through Azure Resource Manager and can be automated using service principal-based authentication. Here's a quick summary of the new capabilities that you can use.
57+
After you've migrated to the Cost Management APIs for your existing reporting scenarios, you can use many other APIs, too. The APIs are also available through Azure Resource Manager and can be automated using service principal-based authentication. Here's a quick summary of the new capabilities that you can use.
5858

5959
- [Budgets](/rest/api/consumption/budgets/createorupdate) - Use to set thresholds to proactively monitor your costs, alert relevant stakeholders, and automate actions in response to threshold breaches.
6060
- [Alerts](/rest/api/cost-management/alerts) - Use to view alert information including, but not limited to, budget alerts, invoice alerts, credit alerts, and quota alerts.
@@ -63,6 +63,6 @@ After you've migrated to Azure Resource Manager APIs for your existing reporting
6363
## Next steps
6464

6565
- Familiarize yourself with the [Azure Resource Manager REST APIs](/rest/api/azure).
66-
- If needed, determine which EA APIs you use and see which Azure Resource Manager APIs to move to at [EA API mapping to new Azure Resource Manager APIs](../costs/migrate-from-enterprise-reporting-to-azure-resource-manager-apis.md#ea-api-mapping-to-new-azure-resource-manager-apis).
66+
- If needed, determine which Enterprise Reporting APIs you use and see which Cost Management APIs to move to at [Enterprise Reporting API mapping to new Cost Management APIs](../costs/migrate-from-enterprise-reporting-to-azure-resource-manager-apis.md#ea-api-mapping-to-new-azure-resource-manager-apis).
6767
- If you're not already using Azure Resource Manager APIs, [register your client app with Azure AD](/rest/api/azure/#register-your-client-application-with-azure-ad).
68-
- If needed, update any of your programming code to use [Azure AD authentication](/rest/api/azure/#create-the-request) with your service principal.
68+
- If needed, update any of your programming code to use [Azure AD authentication](/rest/api/azure/#create-the-request) with your service principal.

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: Azure Billing Enterprise APIs
3-
description: Learn about the Reporting APIs that enable Enterprise Azure customers to pull consumption data programmatically.
2+
title: Azure Enterprise Reporting APIs
3+
description: Learn about the Azure Enterprise Reporting APIs that enable customers to pull consumption data programmatically.
44
author: bandersmsft
55
ms.reviewer: adwise
66
tags: billing
@@ -11,12 +11,12 @@ ms.date: 09/15/2021
1111
ms.author: banders
1212

1313
---
14-
# Overview of Reporting APIs for Enterprise customers
14+
# Overview of the Azure Enterprise Reporting APIs
1515

1616
> [!Note]
17-
> Microsoft no longer updates the Azure Billing - Enterprise Reporting APIs. Instead, you should use [Azure Consumption](/rest/api/consumption) APIs.
17+
> 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).
1818
19-
The 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.
19+
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.
2020

2121
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.
2222

articles/web-application-firewall/ag/application-gateway-crs-rulegroups-rules.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ The following rule groups and rules are available when using Web Application Fir
185185
|920274|Invalid character in request headers (outside of very strict set)|
186186
|920280|Request Missing a Host Header|
187187
|920290|Empty Host Header|
188+
|920300|Request Missing an Accept Header|
188189
|920310|Request Has an Empty Accept Header|
189190
|920311|Request Has an Empty Accept Header|
190191
|920320|Missing User Agent Header|

0 commit comments

Comments
 (0)