Skip to content

Commit 4268504

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into vandhana
2 parents 6c73ad9 + 0954a87 commit 4268504

File tree

1,479 files changed

+16872
-11716
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,479 files changed

+16872
-11716
lines changed

.openpublishing.redirection.azure-monitor.json

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6664,6 +6664,21 @@
66646664
"redirect_url": "/azure/azure-monitor/monitor-azure-monitor-reference",
66656665
"redirect_document_id": false
66666666
},
6667+
{
6668+
"source_path_from_root": "/articles/azure-monitor/ai-ops/responsible-ai-faq.md",
6669+
"redirect_url": "/azure/copilot/overview",
6670+
"redirect_document_id": false
6671+
},
6672+
{
6673+
"source_path_from_root": "/articles/azure-monitor/ai-ops/investigator-overview.md",
6674+
"redirect_url": "/azure/copilot/overview",
6675+
"redirect_document_id": false
6676+
},
6677+
{
6678+
"source_path_from_root": "/articles/azure-monitor/ai-ops/investigate-alert-instance.md",
6679+
"redirect_url": "/azure/copilot/overview",
6680+
"redirect_document_id": false
6681+
},
66676682
{
66686683
"source_path_from_root": "/articles/azure-monitor/azure-monitor-monitoring-reference.md",
66696684
"redirect_url": "/azure/azure-monitor/monitor-azure-monitor-reference",
@@ -6688,7 +6703,18 @@
66886703
"source_path_from_root": "/articles/azure-monitor/agents/resource-manager-data-collection-rules.md",
66896704
"redirect_url": "/azure/azure-monitor/essentials/data-collection-rule-create-edit?tabs=arm#manually-create-a-dcr",
66906705
"redirect_document_id": false
6706+
},
6707+
{
6708+
"source_path_from_root": "/articles/azure-monitor/essentials/remote-write-prometheus.md",
6709+
"redirect_url": "/azure/azure-monitor/essentials/prometheus-remote-write-virtual-machines",
6710+
"redirect_document_id": false
6711+
},
6712+
{
6713+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-get-started.md",
6714+
"redirect_url": "/azure/azure-monitor/essentials/prometheus-metrics-overview",
6715+
"redirect_document_id": false
66916716
}
6717+
66926718

66936719
]
66946720
}

.openpublishing.redirection.defender-for-iot.json

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,35 @@
11
{
2-
"redirections": [
2+
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/defender-for-iot/device-builders/how-to-azure-rtos-security-module.md",
5+
"redirect_url": "/azure/defender-for-iot/device-builders/how-to-threadx-security-module",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/defender-for-iot/device-builders/iot-security-azure-rtos.md",
10+
"redirect_url": "/azure/defender-for-iot/device-builders/iot-security-threadx",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path_from_root": "/articles/defender-for-iot/device-builders/azure-rtos-security-module-api.md",
15+
"redirect_url": "/azure/defender-for-iot/device-builders/threadx-security-module-api",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path_from_root": "/articles/defender-for-iot/device-builders/concept-rtos-security-alerts-recommendations.md",
20+
"redirect_url": "/azure/defender-for-iot/device-builders/concept-threadx-security-alerts-recommendations",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path_from_root": "/articles/defender-for-iot/device-builders/concept-rtos-security-module.md",
25+
"redirect_url": "/azure/defender-for-iot/device-builders/concept-threadx-security-module",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path_from_root": "/articles/defender-for-iot/device-builders/how-to-rtos-security-module.md",
30+
"redirect_url": "/azure/defender-for-iot/device-builders/how-to-threadx-security-module",
31+
"redirect_document_id": false
32+
},
333
{
434
"source_path_from_root": "/articles/defender-for-iot/organizations/resources-manage-proprietary-protocols.md",
535
"redirect_url": "/azure/defender-for-iot/organizations/how-to-manage-individual-sensors#manage-custom-plugins-legacy",

.openpublishing.redirection.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3851,12 +3851,17 @@
38513851
},
38523852
{
38533853
"source_path_from_root": "/articles/aks/cluster-configuration.md",
3854-
"redirect_url": "/azure/aks/concepts-clusters-workloads.md",
3854+
"redirect_url": "/azure/aks/concepts-clusters-workloads",
38553855
"redirect_document_id": false
38563856
},
38573857
{
38583858
"source_path_from_root": "/articles/orbital/overview-analytics.md",
38593859
"redirect_url": "/azure/orbital/overview",
3860+
"redirect_document_id": false
3861+
},
3862+
{
3863+
"source_path_from_root": "/articles/aks/intro-kubernetes.md",
3864+
"redirect_url": "/azure/aks/what-is-aks",
38603865
"redirect_document_id": false
38613866
},
38623867
{

articles/advisor/advisor-how-to-calculate-total-cost-savings.md

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
---
2-
title: Export cost savings in Azure Advisor
2+
title: Calculate cost savings in Azure Advisor
33
ms.topic: article
44
ms.date: 02/06/2024
55
description: Export cost savings in Azure Advisor and calculate the aggregated potential yearly savings by using the cost savings amount for each recommendation.
66
---
77

8-
# Export cost savings
8+
# Calculate cost savings
9+
10+
This article provides guidance on how to calculate total cost savings in Azure Advisor.
11+
12+
## Export cost savings for recommendations
913

1014
To calculate aggregated potential yearly savings, follow these steps:
1115

@@ -21,5 +25,14 @@ The Advisor **Overview** page opens.
2125
[![Screenshot of the Azure Advisor cost recommendations page that shows download option.](./media/advisor-how-to-calculate-total-cost-savings.png)](./media/advisor-how-to-calculate-total-cost-savings.png#lightbox)
2226

2327
> [!NOTE]
24-
> Recommendations show savings individually, and may overlap with the savings shown in other recommendations, for example – you can only benefit from savings plans for compute or reservations for virtual machines, but not from both.
28+
> Different types of cost savings recommendations are generated using overlapping datasets (for example, VM rightsizing/shutdown, VM reservations and savings plan recommendations all consider on-demand VM usage). As a result, resource changes (e.g., VM shutdowns) or reservation/savings plan purchases will impact on-demand usage, and the resulting recommendations and associated savings forecast.
29+
30+
## Understand cost savings
31+
32+
Azure Advisor provides recommendations for resizing/shutting down underutilized resources, purchasing compute reserved instances, and savings plans for compute.
33+
34+
These recommendations contain one or more calls-to-action and forecasted savings from following the recommendations. Recommendations should be followed in a specific order: rightsizing/shutdown, followed by reservation purchases, and finally, the savings plan purchase. This sequence allows each step to impact the subsequent ones positively.
35+
36+
For example, rightsizing or shutting down resources reduces on-demand costs immediately. This change in your usage pattern essentially invalidates your existing reservation and savings plan recommendations, as they were based on your pre-rightsizing usage and costs. Updated reservation and savings plan recommendations (and their forecasted savings) should appear within three days.
2537

38+
The forecasted savings from reservations and savings plans are based on actual rates and usage, while the forecasted savings from rightsizing/shutdown are based on retail rates. The actual savings may vary depending on the usage patterns and rates. Assuming there are no material changes to your usage patterns, your actual savings from reservations and savings plan should be in line with the forecasts. Savings from rightsizing/shutdown vary based on your actual rates. This is important if you intend to track cost savings forecasts from Azure Advisor.

articles/advisor/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
href: advisor-azure-resource-graph.md
7575
- name: Consume Advisor score
7676
href: azure-advisor-score.md
77-
- name: Export cost savings
77+
- name: Calculate total cost savings
7878
href: advisor-how-to-calculate-total-cost-savings.md
7979
- name: Reference
8080
items:

articles/ai-services/document-intelligence/concept-invoice.md

Lines changed: 51 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: laujan
66
manager: nitinme
77
ms.service: azure-ai-document-intelligence
88
ms.topic: conceptual
9-
ms.date: 02/29/2024
9+
ms.date: 04/18/2024
1010
ms.author: lajanuar
1111
ms.custom: references_regions
1212
---
@@ -188,63 +188,62 @@ See how data, including customer information, vendor details, and line items, is
188188
## Field extraction
189189

190190
|Name| Type | Description | Standardized output |
191-
|:-----|:----|:----|:---:|
192-
| CustomerName | String | Invoiced customer| |
193-
| CustomerId | String | Customer reference ID | |
194-
| PurchaseOrder | String | Purchase order reference number | |
195-
| InvoiceId | String | ID for this specific invoice (often "Invoice Number") | |
196-
| InvoiceDate | Date | Date the invoice was issued | yyyy-mm-dd|
197-
| DueDate | Date | Date payment for this invoice is due | yyyy-mm-dd|
198-
| VendorName | String | Vendor name | |
199-
| VendorTaxId | String | The taxpayer number associated with the vendor | |
200-
| VendorAddress | String | Vendor mailing address| |
201-
| VendorAddressRecipient | String | Name associated with the VendorAddress | |
202-
| CustomerAddress | String | Mailing address for the Customer | |
203-
| CustomerTaxId | String | The taxpayer number associated with the customer | |
204-
| CustomerAddressRecipient | String | Name associated with the CustomerAddress | |
205-
| BillingAddress | String | Explicit billing address for the customer | |
206-
| BillingAddressRecipient | String | Name associated with the BillingAddress | |
207-
| ShippingAddress | String | Explicit shipping address for the customer | |
208-
| ShippingAddressRecipient | String | Name associated with the ShippingAddress | |
209-
| PaymentTerm | String | The terms of payment for the invoice | |
210-
|Sub​Total| Number | Subtotal field identified on this invoice | Integer |
211-
| TotalTax | Number | Total tax field identified on this invoice | Integer |
212-
| InvoiceTotal | Number (USD) | Total new charges associated with this invoice | Integer |
213-
| AmountDue | Number (USD) | Total Amount Due to the vendor | Integer |
214-
| ServiceAddress | String | Explicit service address or property address for the customer | |
215-
| ServiceAddressRecipient | String | Name associated with the ServiceAddress | |
216-
| RemittanceAddress | String | Explicit remittance or payment address for the customer | |
217-
| RemittanceAddressRecipient | String | Name associated with the RemittanceAddress | |
218-
| ServiceStartDate | Date | First date for the service period (for example, a utility bill service period) | yyyy-mm-dd |
219-
| ServiceEndDate | Date | End date for the service period (for example, a utility bill service period) | yyyy-mm-dd|
220-
| PreviousUnpaidBalance | Number | Explicit previously unpaid balance | Integer |
221-
| CurrencyCode | String | The currency code associated with the extracted amount | |
222-
| KVKNumber(NL-only) | String | A unique identifier for businesses registered in the Netherlands|12345678|
223-
| PaymentDetails | Array | An array that holds Payment Option details such as `IBAN`,`SWIFT`, `BPay(AU)` | |
224-
| TotalDiscount | Number | The total discount applied to an invoice | Integer |
225-
| TaxItems | Array | AN array that holds added tax information such as `CGST`, `IGST`, and `SGST`. This line item is currently only available for the Germany (`de`), Spain (`es`), Portugal (`pt`), and English Canada (`en-CA`) locales| |
226-
227-
### Line items
191+
|:-----|:----|:----|:----|
192+
| CustomerName |string | Invoiced customer|Microsoft Corp|
193+
| CustomerId |string | Customer reference ID |CID-12345 |
194+
| PurchaseOrder |string | Purchase order reference number |PO-3333 |
195+
| InvoiceId |string | ID for this specific invoice (often Invoice Number) |INV-100 |
196+
| InvoiceDate |date |date the invoice was issued | mm-dd-yyyy|
197+
| DueDate |date |date payment for this invoice is due |mm-dd-yyyy|
198+
| VendorName |string | Vendor who created this invoice |CONTOSO LTD.|
199+
| VendorAddress |address| Vendor mailing address| 123 456th St, New York, NY 10001 |
200+
| VendorAddressRecipient |string | Name associated with the VendorAddress |Contoso Headquarters |
201+
| CustomerAddress |address | Mailing address for the Customer | 123 Other St, Redmond WA, 98052|
202+
| CustomerAddressRecipient |string | Name associated with the CustomerAddress |Microsoft Corp |
203+
| BillingAddress |address | Explicit billing address for the customer | 123 Bill St, Redmond WA, 98052 |
204+
| BillingAddressRecipient |string | Name associated with the BillingAddress |Microsoft Services |
205+
| ShippingAddress |address | Explicit shipping address for the customer | 123 Ship St, Redmond WA, 98052|
206+
| ShippingAddressRecipient |string | Name associated with the ShippingAddress |Microsoft Delivery |
207+
|Sub​Total| currency| Subtotal field identified on this invoice | $100.00 |
208+
| TotalDiscount | currency | The total discount applied to an invoice | $5.00 |
209+
| TotalTax | currency| Total tax field identified on this invoice | $10.00 |
210+
| InvoiceTotal | currency | Total new charges associated with this invoice | $10.00 |
211+
| AmountDue | currency | Total Amount Due to the vendor | $610 |
212+
| PreviousUnpaidBalance | currency| Explicit previously unpaid balance | $500.00 |
213+
| RemittanceAddress |address| Explicit remittance or payment address for the customer |123 Remit St New York, NY, 10001 |
214+
| RemittanceAddressRecipient |string | Name associated with the RemittanceAddress |Contoso Billing |
215+
| ServiceAddress |address | Explicit service address or property address for the customer |123 Service St, Redmond WA, 98052 |
216+
| ServiceAddressRecipient |string | Name associated with the ServiceAddress |Microsoft Services |
217+
| ServiceStartDate |date | First date for the service period (for example, a utility bill service period) | mm-dd-yyyy |
218+
| ServiceEndDate |date | End date for the service period (for example, a utility bill service period) | mm-dd-yyyy|
219+
| VendorTaxId |string | The taxpayer number associated with the vendor |123456-7 |
220+
|CustomerTaxId|string|The taxpayer number associated with the customer|765432-1|
221+
| PaymentTerm |string | The terms of payment for the invoice |Net90 |
222+
| KVKNumber |string | A unique identifier for businesses registered in the Netherlands (NL-only)|12345678|
223+
| CurrencyCode |string | The currency code associated with the extracted amount | |
224+
| PaymentDetails | array | An array that holds Payment Option details such as `IBAN`,`SWIFT`, `BPayBillerCode(AU)`, `BPayReference(AU)` | |
225+
|TaxDetails|array|An array that holds tax details like amount and rate||
226+
| TaxDetails | array | AN array that holds added tax information such as `CGST`, `IGST`, and `SGST`. This line item is currently only available for the Germany (`de`), Spain (`es`), Portugal (`pt`), and English Canada (`en-CA`) locales| |
227+
228+
### Line items array
228229

229230
Following are the line items extracted from an invoice in the JSON output response (the following output uses this [sample invoice](media/sample-invoice.jpg):
230231

231-
|Name| Type | Description | Text (line item #1) | Value (standardized output) |
232-
|:-----|:----|:----|:----| :----|
233-
| Items | String | Full string text line of the line item | 3/4/2021 A123 Consulting Services 2 hours $30.00 10% $60.00 | |
234-
| Amount | Number | The amount of the line item | $60.00 | 100 |
235-
| Description | String | The text description for the invoice line item | Consulting service | Consulting service |
236-
| Quantity | Number | The quantity for this invoice line item | 2 | 2 |
237-
| OrderQuantity | Number | The ordered quantity for this line item. May differ from the quantity shipped and invoiced | 3 | 3 |
238-
| UnitPrice | Number | The net or gross price (depending on the gross invoice setting of the invoice) of one unit of this item | $30.00 | 30 |
239-
| ProductCode | String| Product code, product number, or SKU associated with the specific line item | A123 | |
240-
| Unit | String| The unit of the line item, e.g, kg, lb etc. | Hours | |
241-
| Date | Date| Date corresponding to each line item. Often it's a date the line item was shipped | 3/4/2021| 2021-03-04 |
242-
| Tax | Number | Tax associated with each line item. Possible values include tax amount and tax Y/N | 10.00 | |
243-
| TaxRate | Number | Tax Rate associated with each line item. | 10% | |
232+
|Name| Type | Description | Value (standardized output) |
233+
|:-----|:----|:----|:----|
234+
| Amount | currency | The amount of the line item | $60.00 |
235+
| Date | date| Date corresponding to each line item. Often it's a date the line item was shipped | 3/4/2021|
236+
| Description | string | The text description for the invoice line item | Consulting service|
237+
| Quantity | number | The quantity for this invoice line item | 2 |
238+
| ProductCode | string| Product code, product number, or SKU associated with the specific line item | A123|
239+
| Tax | currency | Tax associated with each line item. Possible values include tax amount and tax Y/N | $6.00 |
240+
| TaxRate | string | Tax Rate associated with each line item. | 18%|
241+
| Unit | string| The unit of the line item, e.g, kg, lb etc. | Hours|
242+
| UnitPrice | number | The net or gross price (depending on the gross invoice setting of the invoice) of one unit of this item | $30.00 |
244243

245244
The invoice key-value pairs and line items extracted are in the `documentResults` section of the JSON output.
246245

247-
:::moniker range="<=doc-intel-3.1.0"
246+
:::moniker range=">=doc-intel-3.1.0"
248247

249248
### Key-value pairs
250249

0 commit comments

Comments
 (0)