Merge pull request #229834 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)

Author: huypub

articles/active-directory/develop/reply-url.md

@@ -116,7 +116,7 @@ To add a redirect URI that uses the `http` scheme with the `127.0.0.1` loopback
 
 ## Restrictions on wildcards in redirect URIs
 
-Wildcard URIs like `https://*.contoso.com` may seem convenient, but should be avoided due to security implications. According to the OAuth 2.0 specification ([section 3.1.2 of RFC 6749](https://tools.ietf.org/html/rfc6749#section-3.1.2)), a redirection endpoint URI must be an absolute URI.
+Wildcard URIs like `https://*.contoso.com` may seem convenient, but should be avoided due to security implications. According to the OAuth 2.0 specification ([section 3.1.2 of RFC 6749](https://tools.ietf.org/html/rfc6749#section-3.1.2)), a redirection endpoint URI must be an absolute URI. As such, when a configured wildcard URI matches a redirect URI, query strings and fragments in the redirect URI are stripped.
 
 Wildcard URIs are currently unsupported in app registrations configured to sign in personal Microsoft accounts and work or school accounts. Wildcard URIs are allowed, however, for apps that are configured to sign in only work or school accounts in an organization's Azure AD tenant.
 

articles/azure-maps/how-to-creator-wfs.md

@@ -108,12 +108,14 @@ After the response returns, copy the feature `id` for one of the `unit` features
 }
 ```
 
+## Next steps
+
 > [!div class="nextstepaction"]
 > [How to create a feature stateset]
 
 [datasets]: /rest/api/maps/v2/dataset
 [WFS API]: /rest/api/maps/v2/wfs
- [Web Feature Service (WFS)]: /rest/api/maps/v2/wfs
+[Web Feature Service (WFS)]: /rest/api/maps/v2/wfs
 [Tutorial: Use Creator to create indoor maps]: tutorial-creator-indoor-maps.md
 [Check dataset creation status]: tutorial-creator-indoor-maps.md#check-the-dataset-creation-status
 [Access to Creator Services]: how-to-manage-creator.md#access-to-creator-services

articles/azure-maps/tutorial-creator-indoor-maps.md

@@ -23,27 +23,27 @@ This tutorial describes how to create indoor maps for use in Microsoft Azure Map
 > * Get the default map configuration ID from your tileset.
 
 > [!TIP]
-> You can also create a dataset from a GeoJSON package. For more information, see [Create a dataset using a GeoJson package (Preview)](how-to-dataset-geojson.md).
+> You can also create a dataset from a GeoJSON package. For more information, see [Create a dataset using a GeoJson package (Preview)].
 
 ## Prerequisites
 
-1. [Make an Azure Maps account](quick-demo-map-app.md#create-an-azure-maps-account).
-2. [Obtain a primary subscription key](quick-demo-map-app.md#get-the-primary-key-for-your-account), also known as the primary key or the subscription key.
-3. [Create a Creator resource](how-to-manage-creator.md).
-4. Download the [Sample drawing package](https://github.com/Azure-Samples/am-creator-indoor-data-examples/blob/master/Sample%20-%20Contoso%20Drawing%20Package.zip).
+1. An [Azure Maps account]
+2. A [subscription key]
+3. A [Creator resource]
+4. Download the [Sample drawing package]
 
-This tutorial uses the [Postman](https://www.postman.com/) application, but you can use a different API development environment.
+This tutorial uses the [Postman] application, but you can use a different API development environment.
 
 >[!IMPORTANT]
 >
-> * This article uses the `us.atlas.microsoft.com` geographical URL. If your Creator service wasn't created in the United States, you must use a different geographical URL.  For more information, see [Access to Creator services](how-to-manage-creator.md#access-to-creator-services).
+> * This article uses the `us.atlas.microsoft.com` geographical URL. If your Creator service wasn't created in the United States, you must use a different geographical URL.  For more information, see [Access to Creator services].
 > * In the URL examples in this article you will need to replace `{Your-Azure-Maps-Subscription-key}` with your Azure Maps subscription key.
 
 ## Upload a drawing package
 
-Use the [Data Upload API](/rest/api/maps/data-v2/upload) to upload the drawing package to Azure Maps resources.
+Use the [Data Upload API] to upload the drawing package to Azure Maps resources.
 
-The Data Upload API is a long running transaction that implements the pattern defined in [Creator Long-Running Operation API V2](creator-long-running-operation-v2.md).
+The Data Upload API is a long running transaction that implements the pattern defined in [Creator Long-Running Operation API V2].
 
 To upload the drawing package:
 
@@ -55,7 +55,7 @@ To upload the drawing package:
 
 4. Select the **POST** HTTP method.
 
-5. Enter the following URL to the [Data Upload API](/rest/api/maps/data-v2/upload) The request should look like the following URL:
+5. Enter the following URL to the [Data Upload API] The request should look like the following URL:
 
     ```http
     https://us.atlas.microsoft.com/mapData?api-version=2.0&dataFormat=dwgzippackage&subscription-key={Your-Azure-Maps-Subscription-key}
@@ -148,7 +148,7 @@ To retrieve content metadata:
 
 ## Convert a drawing package
 
-Now that the drawing package is uploaded, you'll use the `udid` for the uploaded package to convert the package into map data. The [Conversion API](/rest/api/maps/v2/conversion) uses a long-running transaction that implements the pattern defined in the [Creator Long-Running Operation](creator-long-running-operation-v2.md) article.
+Now that the drawing package is uploaded, you'll use the `udid` for the uploaded package to convert the package into map data. The [Conversion API] uses a long-running transaction that implements the pattern defined in the [Creator Long-Running Operation] article.
 
 To convert a drawing package:
 
@@ -160,7 +160,7 @@ To convert a drawing package:
 
 4. Select the **POST** HTTP method.
 
-5. Enter the following URL to the [Conversion service](/rest/api/maps/v2/conversion/convert) (replace `{Your-Azure-Maps-Subscription-key}` with your Azure Maps subscription key and `udid` with the `udid` of the uploaded package):
+5. Enter the following URL to the [Conversion service] (replace `{Your-Azure-Maps-Subscription-key}` with your Azure Maps subscription key and `udid` with the `udid` of the uploaded package):
 
     ```http
     https://us.atlas.microsoft.com/conversions?subscription-key={Your-Azure-Maps-Subscription-key}&api-version=2.0&udid={udid}&inputType=DWG&outputOntology=facility-2.0
@@ -202,7 +202,7 @@ To check the status of the conversion process and retrieve the `conversionId`:
 
       :::image type="content" source="./media/tutorial-creator-indoor-maps/data-conversion-id.png" alt-text="A screenshot of Postman highlighting the conversion ID value that appears in the resource location key in the responses header.":::
 
-The sample drawing package should be converted without errors or warnings. However, if you receive errors or warnings from your own drawing package, the JSON response includes a link to the [Drawing error visualizer](drawing-error-visualizer.md). You can use the Drawing Error visualizer to inspect the details of errors and warnings. To receive recommendations to resolve conversion errors and warnings, see [Drawing conversion errors and warnings](drawing-conversion-error-codes.md).
+The sample drawing package should be converted without errors or warnings. However, if you receive errors or warnings from your own drawing package, the JSON response includes a link to the [Drawing error visualizer]. You can use the Drawing Error visualizer to inspect the details of errors and warnings. To receive recommendations to resolve conversion errors and warnings, see [Drawing conversion errors and warnings].
 
 The following JSON fragment displays a sample conversion warning:
 
@@ -233,7 +233,7 @@ The following JSON fragment displays a sample conversion warning:
 
 ## Create a dataset
 
-A dataset is a collection of map features, such as buildings, levels, and rooms. To create a dataset, use the [Dataset Create API](/rest/api/maps/v2/dataset/create). The Dataset Create API takes the `conversionId` for the converted drawing package and returns a `datasetId` of the created dataset.
+A dataset is a collection of map features, such as buildings, levels, and rooms. To create a dataset, use the [Dataset Create API]. The Dataset Create API takes the `conversionId` for the converted drawing package and returns a `datasetId` of the created dataset.
 
 To create a dataset:
 
@@ -245,7 +245,7 @@ To create a dataset:
 
 4. Select the **POST** HTTP method.
 
-5. Enter the following URL to the [Dataset API](/rest/api/maps/v2/dataset). The request should look like the following URL (replace `{conversionId`} with the `conversionId` obtained in [Check drawing package conversion status](#check-the-drawing-package-conversion-status)):
+5. Enter the following URL to the [Dataset service]. The request should look like the following URL (replace `{conversionId`} with the `conversionId` obtained in [Check drawing package conversion status](#check-the-drawing-package-conversion-status)):
 
     ```http
     https://us.atlas.microsoft.com/datasets?api-version=2.0&conversionId={conversionId}&subscription-key={Your-Azure-Maps-Subscription-key}
@@ -299,7 +299,7 @@ To create a tileset:
 
 4. Select the **POST** HTTP method.
 
-5. Enter the following URL to the [Tileset API](/rest/api/maps/v2/tileset). The request should look like the following URL (replace `{datasetId`} with the `datasetId` obtained in the [Check the dataset creation status](#check-the-dataset-creation-status) section above:
+5. Enter the following URL to the [Tileset service]. The request should look like the following URL (replace `{datasetId`} with the `datasetId` obtained in the [Check the dataset creation status](#check-the-dataset-creation-status) section above:
 
     ```http
     https://us.atlas.microsoft.com/tilesets?api-version=2022-09-01-preview&datasetID={datasetId}&subscription-key={Your-Azure-Maps-Primary-Subscription-key}
@@ -339,7 +339,7 @@ To check the status of the tileset creation process and retrieve the `tilesetId`
 
 ## The map configuration (preview)
 
-Once your tileset creation completes, you can get the `mapConfigurationId` using the [tileset get](/rest/api/maps/v20220901preview/tileset/get) HTTP request:
+Once your tileset creation completes, you can get the `mapConfigurationId` using the [tileset get] HTTP request:
 
 1. In the Postman app, select **New**.
 
@@ -349,7 +349,7 @@ Once your tileset creation completes, you can get the `mapConfigurationId` using
 
 4. Select the **GET** HTTP method.
 
-5. Enter the following URL to the [Tileset API](/rest/api/maps/v20220901preview/tileset), passing in the tileset ID you obtained in the previous step.
+5. Enter the following URL to the [Tileset service], passing in the tileset ID you obtained in the previous step.
 
     ```http
     https://us.atlas.microsoft.com/tilesets/{tilesetId}?api-version=2022-09-01-preview&subscription-key={Your-Azure-Maps-Subscription-key}
@@ -363,9 +363,29 @@ Once your tileset creation completes, you can get the `mapConfigurationId` using
     "defaultMapConfigurationId": "5906cd57-2dba-389b-3313-ce6b549d4396"
     ```
 
-For more information, see [Map configuration](creator-indoor-maps.md#map-configuration) in the indoor maps concepts article.
+For more information, see [Map configuration] in the indoor maps concepts article.
 
 ## Next steps
 
 > [!div class="nextstepaction"]
 > [Use the Azure Maps Indoor Maps module with custom styles](how-to-use-indoor-module.md)
+
+[Azure Maps account]: quick-demo-map-app.md#create-an-azure-maps-account
+[subscription key]: quick-demo-map-app.md#get-the-primary-key-for-your-account
+[Creator resource]: how-to-manage-creator.md
+[Sample drawing package]: https://github.com/Azure-Samples/am-creator-indoor-data-examples/blob/master/Sample%20-%20Contoso%20Drawing%20Package.zip
+[Postman]: https://www.postman.com
+[Access to Creator services]: how-to-manage-creator.md#access-to-creator-services
+[Create a dataset using a GeoJson package (Preview)]: how-to-dataset-geojson.md
+[Data Upload API]: /rest/api/maps/data-v2/upload
+[Creator Long-Running Operation API V2]: creator-long-running-operation-v2.md
+[Conversion API]: /rest/api/maps/v2/conversion
+[Conversion service]: /rest/api/maps/v2/conversion/convert
+[Creator Long-Running Operation]: creator-long-running-operation-v2.md
+[Drawing error visualizer]: drawing-error-visualizer.md
+[Drawing conversion errors and warnings]: drawing-conversion-error-codes.md
+[Dataset Create API]: /rest/api/maps/v2/dataset/create
+[Dataset service]: /rest/api/maps/v2/dataset
+[Tileset service]: /rest/api/maps/v20220901preview/tileset
+[tileset get]: /rest/api/maps/v20220901preview/tileset/get
+[Map configuration]: creator-indoor-maps.md#map-configuration

articles/cost-management-billing/savings-plan/choose-commitment-amount.md

@@ -36,6 +36,26 @@ Note the following points:
 
 Savings plan purchases are calculated by the recommendations engine for the selected term and scope, based on last 30 days of usage. Recommendations are provided through [Azure Advisor](https://portal.azure.com/#view/Microsoft_Azure_Expert/AdvisorMenuBlade/~/Cost), the savings plan purchase experience in [Azure portal](https://portal.azure.com/), and through the [savings plan benefit recommendations API](/rest/api/cost-management/benefit-recommendations/list).
 
+## Savings plan purchase recommendations for customers using Management groups
+Currently Azure portal doesn't provide Savings plan recommendations for Management groups, but customers can calculate their own per-hour commitment for Management groups by using the following steps until Azure portal provides Management group-level recommendations.
+1. Download Usage Detail report from EA portal or Azure portal to get the accurate usage and cost.
+    - From EA portal - By logging into ea.azure.com, navigating to Reports section, and downloading Usage Details report for the current month and the past 2 months.
+    - From Azure portal - By logging into Azure portal and searching for cost management and billing. Under Billing, click on Usage + charges and click on download against the month to download current and past 2 months.
+1. Open the downloaded file in Excel. If the file size is huge open it in Power BI.
+1. Create cost column by multiplying PayG Price * Quantity (i.e. calculated cost).
+1. Filter Charge Type = "Usage".
+1. Filter Meter Category = "Virtual Machines", "App Service", "Functions", "Container Instance" - As the SP is applied on only these services.
+1. Filter ProductOrderName = Blank 
+1. Filter Quantity >= 23 to consider only items which ran 24 hours as SP is per hour commitment, and we have the granularity of per day and not per hour. This will avoid any sparse compute.
+1. Filter Months for current and previous 2 months. 
+1. If you are doing this in Power BI export the data to .csv file and copy into Excel. 
+1. Now copy the subscription names that belong to the management group on which you want to apply Savings plan on in Excel sheet.
+1. Do a Vlookup against the internal subscriptions against the filter data. 
+1. Divide calculated cost with 24 hours to get per hour cost.
+1. Create pivot to group the data by subscription by month and day, and copy this pivot data into new sheet.
+1. Multiply per hour cost with .4. Reason for this is you will get a discount on the usage. For example, you have committed 100 rupees you will be charged based on 1 or 3 year Savings plan discount applicable for SKU hence your cost per hour will be less than 100 hours and hence you will be needing more cost of compute to get the value of 100. 40% is the safe limit. 
+1. Now see the range of cost per hour per day and per month to get view of the sage commitment you can make.
+
 ## Need help? Contact us
 
 If you have Azure savings plan for compute questions, contact your account team, or [create a support request](https://portal.azure.com/#blade/Microsoft_Azure_Support/HelpAndSupportBlade/newsupportrequest). Temporarily, Microsoft will only provide Azure savings plan for compute expert support requests in English.
@@ -44,4 +64,4 @@ If you have Azure savings plan for compute questions, contact your account team,
 
 - [Manage Azure savings plans](manage-savings-plan.md)
 - [View Azure savings plan cost and usage details](utilization-cost-reports.md)
-- [Software costs not included in saving plan](software-costs-not-included.md)
+- [Software costs not included in saving plan](software-costs-not-included.md)

articles/cost-management-billing/savings-plan/utilization-cost-reports.md

@@ -126,13 +126,13 @@ Get the Amortized costs data and filter the data for a `PricingModel` = `Savings
 2. Get the savings plan costs. Sum the `Cost` values to get the monetary value of what you paid for the savings plan. It includes the used and unused costs of the savings plan.
 3. Subtract estimated pay-as-you-go costs from savings plan costs to get the estimated savings.
 
-To know the Savings made out of public list price:
-Get public or list price cost.  Multiply the `PayGPrice` value with `Quantity` values to get public-list-price costs.
-Get Savings made out of savings plan against public list price. Subtract estimated public-list-price costs from `Cost`.
+- To know the Savings made out of public list price:
+   - Get public or list price cost.  Multiply the `PayGPrice` value with `Quantity` values to get public-list-price costs.
+   - Get Savings made out of savings plan against public list price. Subtract estimated public-list-price costs from `Cost`.
 
-To know the % savings made out of discounted price for customer:
-Get Savings made out of savings plan against discounts given to customer. Subtract estimated pay-as-you-go from `Cost`.
-Get % discount applied on each line item. Divide `Cost` with public-list-price and then divide by 100.
++ To know the % savings made out of discounted price for customer:
+   + Get Savings made out of savings plan against discounts given to customer. Subtract estimated pay-as-you-go from `Cost`.
+   + Get % discount applied on each line item. Divide `Cost` with public-list-price and then divide by 100.
 
 Keep in mind that if you have an underutilized savings plan, the `UnusedBenefit` entry for `ChargeType` becomes a factor to consider. When you have a fully utilized savings plan, you receive the maximum savings possible. Any `UnusedBenefit` quantity reduces savings.