Merge pull request #297466 from shasulin/04012025awsretire

Updates for AWS retirement

Author: denrea

articles/cost-management-billing/.openpublishing.redirection.cost-management-billing.json

@@ -927,12 +927,12 @@
         },
         {
             "source_path_from_root": "/articles/cost-management/aws-integration-manage.md",
-            "redirect_url": "/azure/cost-management-billing/costs/aws-integration-manage",
+            "redirect_url": "/azure/cost-management-billing/costs/overview-cost-management",
             "redirect_document_id": true
         },
         {
             "source_path_from_root": "/articles/cost-management/aws-integration-set-up-configure.md",
-            "redirect_url": "/azure/cost-management-billing/aws-integration-set-up-configure",
+            "redirect_url": "/azure/cost-management-billing/costs/overview-cost-management",
             "redirect_document_id": false
         },
         {
@@ -1355,6 +1355,21 @@
             "redirect_url": "/azure/cost-management-billing/costs/tutorial-improved-exports",
             "redirect_document_id": true
         },
+        {
+            "source_path_from_root": "/articles/cost-management-billing/costs/retire-aws-connector.md",
+            "redirect_url": "/azure/cost-management-billing/costs/overview-cost-management",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/cost-management-billing/costs/aws-integration-set-up-configure.md",
+            "redirect_url": "/azure/cost-management-billing/costs/overview-cost-management",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/cost-management-billing/costs/aws-integration-manage.md",
+            "redirect_url": "/azure/cost-management-billing/costs/overview-cost-management",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/cost-management/use-reports.md",
             "redirect_url": "/azure/cost-management-billing/cloudyn/use-reports",

articles/cost-management-billing/automate/understand-usage-details-fields.md

@@ -38,7 +38,6 @@ MPA accounts have all MCA terms, in addition to the MPA terms, as described in t
 | AccountName | EA, pay-as-you-go | Display name of the EA enrollment account or pay-as-you-go billing account. |
 | AccountOwnerId¹ | EA, pay-as-you-go | The email ID of the EA enrollment account owner. |
 | AdditionalInfo¹  | All | Service-specific metadata. For example, an image type for a virtual machine. |
-| AvailabilityZone | External account | Valid only for cost data obtained from the cross-cloud connector. The field displays the availability zone in which the AWS service is deployed. |
 | BenefitId¹ | EA, MCA | Unique identifier for the purchased savings plan instance. |
 | BenefitName | EA, MCA | Unique identifier for the purchased savings plan instance. |
 | BillingAccountId¹ | All | Unique identifier for the root billing account. |
@@ -48,8 +47,8 @@ MPA accounts have all MCA terms, in addition to the MPA terms, as described in t
 | BillingPeriod | EA, pay-as-you-go | The billing period of the charge. |
 | BillingPeriodEndDate | All | The end date of the billing period. |
 | BillingPeriodStartDate | All | The start date of the billing period. |
-| BillingProfileId¹ | All | Unique identifier of the EA enrollment, pay-as-you-go subscription, MCA billing profile, or AWS⁴ consolidated account. |
-| BillingProfileName | All | Name of the EA enrollment, pay-as-you-go subscription, MCA billing profile, or AWS⁴ consolidated account. |
+| BillingProfileId¹ | All | Unique identifier of the EA enrollment, pay-as-you-go subscription or MCA billing profile. |
+| BillingProfileName | All | Name of the EA enrollment, pay-as-you-go subscription or MCA billing profile. |
 | ChargeType | All | Indicates whether the charge represents usage (**Usage**), a purchase (**Purchase**), or a refund (**Refund**). |
 | ConsumedService | All | Name of the service the charge is associated with. |
 | CostCenter¹ | EA, MCA | The cost center defined for the subscription for tracking costs (only available in open billing periods for MCA accounts). |
@@ -96,10 +95,10 @@ MPA accounts have all MCA terms, in addition to the MPA terms, as described in t
 | ProductId¹ | MCA | Unique identifier for the product. |
 | ProductOrderId | All | Unique identifier for the product order. |
 | ProductOrderName | All | Unique name for the product order. |
-| Provider | MCA | Identifier for product category or Line of Business. For example, Azure, Microsoft 365, and AWS⁴. |
+| Provider | MCA | Identifier for product category or Line of Business. For example, Azure and Microsoft 365. |
 | PublisherId | MCA | The ID of the publisher. It's only available after the invoice is generated. |
 | PublisherName | All | The name of the publisher. For first-party services, the value should be listed as `Microsoft` or `Microsoft Corporation`.  |
-| PublisherType | All |Supported values: **Microsoft**, **Azure**, **AWS**⁴, **Marketplace**. For MCA accounts, the value can be `Microsoft` for first party charges and `Marketplace` for third party charges. For EA and pay-as-you-go accounts, the value is `Azure`. |
+| PublisherType | All |Supported values: **Microsoft**, **Azure**, **Marketplace**. For MCA accounts, the value can be `Microsoft` for first party charges and `Marketplace` for third party charges. For EA and pay-as-you-go accounts, the value is `Azure`. |
 | Quantity³ | All | The number of units used by the given product or service for a given day. |
 | ResellerName | MPA | The name of the reseller associated with the subscription. |
 | ResellerMpnId | MPA | ID for the reseller associated with the subscription. |
@@ -134,8 +133,6 @@ MPA accounts have all MCA terms, in addition to the MPA terms, as described in t
 
 ³ For more information about pricing terms and definitions, see [Pricing behavior in cost details](automation-ingest-usage-details-overview.md#pricing-behavior-in-cost-and-usage-details).
 
-⁴ The Connector for AWS in the Cost Management service retires on March 31, 2025. Users should consider alternative solutions for AWS cost management reporting. On March 31, 2024, Azure will disable the ability to add new Connectors for AWS for all customers. For more information, see [Retire your Amazon Web Services (AWS) connector](../costs/retire-aws-connector.md).
-
 The cost details file itself doesn’t uniquely identify individual records with an ID. Instead, you can use fields in the file flagged with ¹ to create a unique ID yourself.
 
 Some fields might differ in casing and spacing between account types. Older versions of pay-as-you-go cost details files have separate sections for the statement and daily cost.

articles/cost-management-billing/cost-management-billing-faq.yml

@@ -72,11 +72,6 @@ sections:
       - question: How do I see costs for my EA enrollment?
         answer: |
           In the Azure portal, navigate to **Cost Management + Billing** > Overview. Select the **Breakdown** link.
-      - question: How can I view my Amazon Web Services (AWS) cost in Cost Management?
-        answer: |
-          See [Set up and configure AWS Cost and Usage report integration](costs/aws-integration-set-up-configure.md).  
-          >[!NOTE]
-          > The Connector for AWS in the Cost Management service retires on March 31, 2025. Users should consider alternative solutions for AWS cost management reporting. On March 31, 2024, Azure will disable the ability to add new Connectors for AWS for all customers. For more information, see [Retire your Amazon Web Services (AWS) connector](costs/retire-aws-connector.md).
       - question: How do I create a budget?
         answer: |
           See the [Create and manage budgets](costs/tutorial-acm-create-budgets.md) tutorial.

articles/cost-management-billing/cost-management-billing-overview.md

@@ -43,9 +43,6 @@ After discounts are applied, cost details then flow into Cost Management, where:
 
 - The [anomaly detection](./understand/analyze-unexpected-charges.md) model identifies anomalies daily based on normalized usage (not rated usage).
 - The cost allocation engine applies tag inheritance and [splits shared costs](./costs/allocate-costs.md).
-- AWS cost and usage reports are pulled based on any [connectors for AWS](./costs/aws-integration-manage.md) you may have configured.  
-    > [!NOTE]
-    > The Connector for AWS in the Cost Management service retires on March 31, 2025. Users should consider alternative solutions for AWS cost management reporting. On March 31, 2024, Azure will disable the ability to add new Connectors for AWS for all customers. For more information, see [Retire your Amazon Web Services (AWS) connector](./costs/retire-aws-connector.md).
 - Azure Advisor cost recommendations are pulled in to enable cost savings insights for subscriptions and resource groups.
 - Cost alerts are sent out for [budgets](./costs/tutorial-acm-create-budgets.md), [anomalies](./understand/analyze-unexpected-charges.md#create-an-anomaly-alert), [scheduled alerts](./costs/save-share-views.md#subscribe-to-scheduled-alerts), and more based on the configured settings.
 
@@ -87,16 +84,13 @@ Management for classic Cloud Solution Provider (CSP) and classic sponsorship sub
 
 ## Report on and analyze costs
 
-Cost Management and Billing include several tools to help you understand, report on, and analyze your invoiced Microsoft Cloud and AWS costs.
+Cost Management and Billing include several tools to help you understand, report on, and analyze your invoiced Microsoft Cloud costs.
 
 - [**Cost analysis**](./costs/quick-acm-cost-analysis.md) is a tool for ad-hoc cost exploration. Get quick answers with lightweight insights and analytics.
 **Power BI** is an advanced solution to build more extensive dashboards and complex reports or combine costs with other data. Power BI is available for billing accounts and billing profiles.
 - [**Exports and the Cost Details API**](./automate/usage-details-best-practices.md) enable you to integrate cost details into external systems or business processes.
 - The **Credits** page shows your available credit or prepaid commitment balance. They aren't included in cost analysis.
 - The **Invoices** page provides a list of all previously invoiced charges and their payment status for your billing account.
-- **Connectors for AWS** enable you to ingest your AWS cost details into Azure to facilitate managing Azure and AWS costs together. After configured, the connector also enables other capabilities, like budget and scheduled alerts.  
-    > [!NOTE]
-    > The Connector for AWS in the Cost Management service retires on March 31, 2025. Users should consider alternative solutions for AWS cost management reporting. On March 31, 2024, Azure will disable the ability to add new Connectors for AWS for all customers. For more information, see [Retire your Amazon Web Services (AWS) connector](./costs/retire-aws-connector.md).
 
 For more information, see [Get started with Cost Management and Billing reporting](./costs/reporting-get-started.md).