Skip to content

Commit dd0dadc

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into serviceinteractive
2 parents c876269 + 5786362 commit dd0dadc

25 files changed

+368
-230
lines changed

articles/active-directory/hybrid/reference-connect-version-history.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,9 @@ You can use these cmdlets to retrieve the TLS 1.2 enablement status or set it as
434434
- We added the following new user properties to sync from on-premises Active Directory to Azure AD:
435435
- employeeType
436436
- employeeHireDate
437+
>[!NOTE]
438+
> There's no corresponding EmployeeHireDate or EmployeeLeaveDateTime attribute in Active Directory. If you're importing from on-premises AD, you'll need to identify an attribute in AD that can be used. This attribute must be a string. For more information see, [Synchronizing lifecycle workflow attributes](../governance/how-to-lifecycle-workflow-sync-attributes.md)
439+
437440
- This release requires PowerShell version 5.0 or newer to be installed on the Windows server. This version is part of Windows Server 2016 and newer.
438441
- We increased the group sync membership limits to 250,000 with the new V2 endpoint.
439442
- We updated the Generic LDAP Connector and the Generic SQL Connector to the latest versions. To learn more about these connectors, see the reference documentation for:

articles/api-management/api-management-capacity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ To follow the steps in this article, you must have:
3131

3232
+ An API Management instance. For more information, see [Create an Azure API Management instance](get-started-create-service-instance.md).
3333

34-
[!INCLUDE [premium-dev-standard-basic.md](../../includes/api-management-availability-premium-dev-standard-basic.md)]
34+
[!INCLUDE [availability-capacity.md](../../includes/api-management-availability-capacity.md)]
3535

3636
## What is capacity
3737

articles/azure-arc/kubernetes/diagnose-connection-issues.md

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,24 @@ When you [create your support request](../../azure-portal/supportability/how-to-
7676

7777
If you are using a proxy server on at least one machine, complete the first five steps of the non-proxy flowchart (through resource provider registration) for basic troubleshooting steps. Then, if you are still encountering issues, review the next flowchart for additional troubleshooting steps. More details about each step are provided below.
7878

79-
:::image type="content" source="media/diagnose-connection-issues/proxy-flowchart.png" alt-text="Flowchart showing a visual representation of checking for connection issues when using a proxy." lightbox="media/diagnose-connection-issues/proxy-flowchart.png":::
79+
:::image type="content" source="media/diagnose-connection-issues/proxy-flowchart-2.png" alt-text="Flowchart showing a visual representation of checking for connection issues when using a proxy." lightbox="media/diagnose-connection-issues/proxy-flowchart-2.png":::
8080

8181
### Is the machine executing commands behind a proxy server?
8282

83+
If the machine is executing commands behind a proxy server, you'll need to set any necessary environment variables, [explained below](#set-environment-variables).
84+
85+
### Set environment variables
86+
8387
Be sure you have set all of the necessary environment variables. For more information, see [Connect using an outbound proxy server](quickstart-connect-cluster.md#connect-using-an-outbound-proxy-server).
8488

89+
For example:
90+
91+
```bash
92+
export HTTP_PROXY=“http://<proxyIP>:<proxyPort>
93+
export HTTPS_PROXY=“https://<proxyIP>:<proxyPort>
94+
export NO_PROXY=“<service CIDR>,Kubernetes.default.svc,.svc.cluster.local,.svc”
95+
```
96+
8597
### Does the proxy server only accept trusted certificates?
8698

8799
Be sure to include the certificate file path by including `--proxy-cert <path-to-cert-file>` when running the `az connectedk8s connect` command.
@@ -128,7 +140,6 @@ az connectedk8s troubleshoot -g <myResourceGroup> -n <myK8sCluster>
128140

129141
When you [create your support request](../../azure-portal/supportability/how-to-create-azure-support-request.md), in the **Additional details** section, use the **File upload** option to upload the generated log file.
130142

131-
132143
## Next steps
133144

134145
- View more [troubleshooting tips for using Azure Arc-enabled Kubernetes](troubleshooting.md).
1.84 MB
Loading

articles/azure-monitor/agents/agent-linux.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ The OMS Agent has limited customization and hardening support for Linux.
7373
7474
The following are currently supported:
7575
- SELinux (Marketplace images for CentOS and RHEL with their default settings)
76+
- FIPS (Marketplace images for CentOS and RHEL 6/7 with their default settings)
7677
7778
The following aren't supported:
7879
- CIS

articles/azure-monitor/agents/diagnostics-extension-windows-install.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ The protected settings are defined in the [PrivateConfig element](diagnostics-ex
9595
{
9696
"storageAccountName": "mystorageaccount",
9797
"storageAccountKey": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
98-
"storageAccountEndPoint": "https://mystorageaccount.blob.core.windows.net"
98+
"storageAccountEndPoint": "https://core.windows.net"
9999
}
100100
```
101101

@@ -179,7 +179,7 @@ The following minimal example of a configuration file enables collection of diag
179179
"PrivateConfig": {
180180
"storageAccountName": "mystorageaccount",
181181
"storageAccountKey": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
182-
"storageAccountEndPoint": "https://mystorageaccount.blob.core.windows.net"
182+
"storageAccountEndPoint": "https://core.windows.net"
183183
}
184184
}
185185
```

articles/communication-services/concepts/voice-video-calling/call-recording.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ Call Recording supports multiple media outputs and content types to address your
4242

4343
### Audio
4444

45-
> [!NOTE]
46-
> **Unmixed audio** is in **Private Preview**.
47-
4845
| Channel Type | Content Format | Sampling Rate | Output | Description |
4946
| :----------- | :------------- | :----------- | :---- | :---------------- |
5047
| mixed | mp3 & wav | 16 kHz | single file, single channel | mixed audio of all participants |

articles/communication-services/quickstarts/voice-video-calling/get-started-call-recording.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ If you want to clean up and remove a Communication Services subscription, you ca
3434

3535
For more information, see the following articles:
3636

37+
- Download our [Java](https://github.com/Azure-Samples/communication-services-java-quickstarts/tree/main/ServerRecording) and [.NET](https://github.com/Azure-Samples/communication-services-dotnet-quickstarts/tree/main/ServerRecording) call recording sample apps
3738
- Learn more about [Call Recording](../../concepts/voice-video-calling/call-recording.md)
3839
- Learn more about [Call Automation](https://learn.microsoft.com/azure/communication-services/concepts/voice-video-calling/call-automation)
39-
- Check out our [calling hero sample](../../samples/calling-hero-sample.md)
40-
- Learn about [Calling SDK capabilities](./getting-started-with-calling.md)
41-
- Learn more about [how calling works](../../concepts/voice-video-calling/about-call-types.md)
40+

articles/cost-management-billing/manage/direct-ea-azure-usage-charges-invoices.md

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: View your Azure usage summary details and download reports for direct EA
33
description: This article explains how enterprise administrators of direct Enterprise Agreement (EA) enrollments can view a summary of their usage data, Azure Prepayment consumed, and charges associated with other usage in the Azure portal.
44
author: bandersmsft
55
ms.author: banders
6-
ms.date: 08/29/2022
6+
ms.date: 11/14/2022
77
ms.topic: how-to
88
ms.service: cost-management-billing
99
ms.subservice: enterprise
@@ -97,17 +97,19 @@ Your invoice displays Azure usage charges with costs associated to them first, f
9797

9898
### Download your Azure invoices (.pdf)
9999

100-
For most subscriptions, you can download your invoice in the Azure portal.
100+
For EA enrollments, you can download your invoice in the Azure portal.
101101

102102
1. Sign in to the [Azure portal](https://portal.azure.com).
103103
1. Search for **Cost Management + Billing** and select it.
104104
1. Select **Billing scopes** from the navigation menu and then select the billing account that you want to work with.
105105
1. In the navigation menu, select **Invoices**. The Invoices page shows all the invoices and credit memos generated for the last 12 months.
106106
:::image type="content" source="./media/direct-ea-azure-usage-charges-invoices/invoices-page.png" alt-text="Screenshot showing the Invoices page." lightbox="./media/direct-ea-azure-usage-charges-invoices/invoices-page.png" :::
107-
108-
1. On the invoice page, find the row of the invoice that you want to download. To the right of the row, select the ellipsis (****) symbol.
107+
1. On the Invoices page, find the row of the invoice that you want to download. To the right of the row, select the ellipsis (****) symbol.
109108
1. In the context menu, select **Download**.
110109
:::image type="content" source="./media/direct-ea-azure-usage-charges-invoices/download-context-menu.png" alt-text="Screenshot showing the Download context menu." :::
110+
1. Select **Prepare document** to prepare the document that you want to download.
111+
:::image type="content" source="./media/direct-ea-azure-usage-charges-invoices/prepare-document.png" alt-text="Screenshot showing the Prepare document page when you prepare the invoice." lightbox="./media/direct-ea-azure-usage-charges-invoices/prepare-document.png" :::
112+
1. When the document is prepared, select **Download**.
111113

112114
You can select a Timespan to view up to the last three years of invoice details.
113115

@@ -123,6 +125,18 @@ The following table lists the terms and descriptions shown on the Invoices page:
123125
| PO number | PO number for the invoice or credit memo. |
124126
| Total Amount | Total amount of the invoice or credit. |
125127

128+
## Updated direct EA billing invoice documents
129+
130+
Azure is enhancing its invoicing experience. The enhanced experience includes an improved invoice PDF file, a summary PDF, and a transactions file.
131+
132+
There are no changes to invoices generated before November 18, 2022.
133+
134+
The invoice notification email address is changing from `[email protected]` to `[email protected]` for customers and partners under the enhanced invoicing experience.
135+
136+
We recommend that you add the new email address to your address book or safe sender list to ensure that you receive the emails.
137+
138+
For more information about invoice documents, see [Direct EA billing invoice documents](direct-ea-billing-invoice-documents.md).
139+
126140
## Update a PO number for an upcoming overage invoice
127141

128142
In the Azure portal, a direct enterprise administrator can update the purchase order (PO) for upcoming invoices. The PO number can get updated anytime before the invoice is created during the current billing period.
@@ -146,7 +160,7 @@ To update the PO number for a billing account:
146160
1. Select  **Update PO number**.
147161
1. Enter a PO number and then select  **Update**.
148162

149-
Or you can update the PO number from Invoice blade for the upcoming invoice:
163+
Or you can update the PO number in the Invoice area for the upcoming invoice:
150164

151165
1. Sign in to the  [Azure portal](https://portal.azure.com).
152166
1. Search for  **Cost Management + Billing** and then select  **Billing scopes**.
@@ -243,7 +257,7 @@ The following table lists the terms and descriptions shown on the Reservation tr
243257
| Amount (USD) | Reservation cost |
244258

245259
> [!NOTE]
246-
> The newly added column Purchase Month will help identify in which month the refunds are updated and helps to reconcile the RI refunds.
260+
> The newly added column Purchase Month will help identify in which month the refunds are updated and helps to reconcile reservation refunds.
247261
248262
## CSV report formatting issues
249263

Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
---
2+
title: Direct EA billing invoice documents
3+
description: Learn how to understand the invoice files associated with your direct enterprise agreement.
4+
author: bandersmsft
5+
ms.reviewer: sahilkhurana
6+
tags: billing
7+
ms.service: cost-management-billing
8+
ms.subservice: enterprise
9+
ms.topic: conceptual
10+
ms.date: 11/14/2021
11+
ms.author: banders
12+
---
13+
14+
# Direct EA billing invoice documents
15+
16+
This article helps you understand the invoice files associated with your direct enterprise agreement. For information about downloading the files, see [View your Azure usage summary details and download reports for direct EA enrollments](direct-ea-azure-usage-charges-invoices.md).
17+
18+
All documents are available between the 12th- 15th day of each month. However, when an invoice is unusually large, availability might be delayed.
19+
20+
## Understand the invoice file
21+
22+
Your invoice is a PDF file that contains at least two pages.
23+
24+
The first page is the billing summary. It contains general information about the invoice, amount due, and payment instructions, if applicable. It also contains address information for your organization and high-level details about your order.
25+
26+
The second page lists the individual products in your order.
27+
28+
### Invoice terms
29+
30+
On the top of page one, you'll find the summary with the following fields:
31+
32+
**Invoice** – The number is a unique number generated by Microsoft that identifies your spending for the corresponding billing period.
33+
34+
**Invoice Date** - The date Microsoft created the invoice.
35+
36+
**PO Number** - The purchase order (PO) number that you specify. The PO number can't be updated on an invoice that's already generated.
37+
38+
**PO Date** – It's generally the date when the order was entered into Microsoft systems.
39+
40+
**Billing Period** - The date range covered by the invoice.
41+
42+
**Payment Terms** – They explain the arrangement for when the invoice payment is due.
43+
> [!IMPORTANT]
44+
> Pay using wire transfer or ACH using the instructions provided on the invoice. Don't mail a physical check to a Microsoft address shown on your invoice.
45+
46+
**Due Date** - The date when the invoice payment is due to Microsoft.
47+
48+
#### Addresses
49+
50+
The following addresses differ, depending on the size and configuration of your organization.
51+
52+
- The Sold-To address is the name and address of the organization that bought the subscription.
53+
- The Bill-To address is the address of your billing department.
54+
- The Ship-To address are details of the location to which the products are shipped or used for tax exemption (for India).
55+
- The End Customer Address is the address where the service is used.
56+
57+
#### Billing summary
58+
59+
Billing summary gives the breakdown of the total amount due. Total = Charges – Commitment usage (if applicable) + Sales Tax.
60+
61+
#### Billing details by product
62+
63+
Page two lists billing details by product, including unit price, quantity, commitment usage (if applicable), net charge, tax rate, tax amount, and total corresponding to each usage charge.
64+
65+
Here's an example of the first page of the invoice file.
66+
67+
:::image type="content" source="./media/direct-ea-billing-invoice-documents/invoice-page-01.png" alt-text="Example screenshot of the first page of the invoice file." lightbox="./media/direct-ea-billing-invoice-documents/invoice-page-01.png" :::
68+
69+
Here's an example of the last page of the invoice file.
70+
71+
:::image type="content" source="./media/direct-ea-billing-invoice-documents/invoice-page-02.png" alt-text="Example screenshot of the second page of the invoice file." lightbox="./media/direct-ea-billing-invoice-documents/invoice-page-02.png" :::
72+
73+
_Prices shown on the invoice are for informational purposes only._
74+
75+
## Understand the summary invoice file
76+
77+
The summary invoice file is a concise version of the detailed PDF file with a broad categorization of purchases at product family level. The first page is the same as the invoice PDF. The second page contains a billing summary by product family covering usages charges and corresponding amount incurred.
78+
79+
Here's an example of the first page of the summary invoice file.
80+
81+
:::image type="content" source="./media/direct-ea-billing-invoice-documents/invoice-summary-page-01.png" alt-text="Example screenshot of the first page of the summary invoice file." lightbox="./media/direct-ea-billing-invoice-documents/invoice-summary-page-01.png" :::
82+
83+
Here's an example of the last page of the summary invoice file.
84+
85+
:::image type="content" source="./media/direct-ea-billing-invoice-documents/invoice-summary-page-02.png" alt-text="Example screenshot of the second page of the summary invoice file." lightbox="./media/direct-ea-billing-invoice-documents/invoice-summary-page-02.png" :::
86+
87+
88+
## Understand the transactions file
89+
90+
The transactions file is a CSV file that includes the same information as the invoice in a format that helps you quickly reconcile charges. It contains the following line-item details:
91+
92+
| Invoice item | Description |
93+
| --- | --- |
94+
| Invoice Number | A Microsoft generated unique number that identifies your spending for the corresponding billing period. |
95+
| Invoice Date | The date Microsoft created the invoice. |
96+
| Document Type | Determines whether it's an invoice or credit note. |
97+
| Agreement Number | The Licensing ID # / enrollment # / contract number. |
98+
| Bill To | Customer Number, Bill To Customer Name, and Bill To Customer Country are details of the billing department. |
99+
| Sold To | Customer Number, Sold To Customer Name, and Sold To Customer Country are details of the organization that bought the subscription. |
100+
| Ship To | Customer Number, Ship To Customer Name, and Ship To Customer Country are details of the location where the products are shipped or used for tax exemption (for India). |
101+
| End Customer Name and End Customer Country | Details of the final consumer where the service is used. |
102+
| Purchase Order Number | The purchase order (PO) number that you specify. |
103+
| Billing Currency | Shows the currency that was chosen by the end customer in terms of payment. |
104+
| Transaction Type | Reflects whether it's a debit invoice or a credit memo. |
105+
| Line Item Number | The line ID for internal reference. |
106+
| Usage Country | The location where the product is used. |
107+
| Delivery | Shows how the invoice is being delivered. |
108+
| MS Part Number | A reference number for the product. |
109+
| Item Name | The description of the purchased product. |
110+
| Product Family | The logical categorization of products. |
111+
| License Type | Reflects the terms of buying the product. |
112+
| Price Level | The price categorization of product. |
113+
| Billing Option | The mode of payment. |
114+
| Taxable | Indicates whether the product is taxable. |
115+
| Pool | The classification of the product into a system, server, or application. |
116+
| Service Period Start Date, Service Period End Date | Indicates the eligible service period. |
117+
| Reason Code | Used at the time of return. |
118+
| Description | The explanation of the reason code. |
119+
| Quantity | The number of units bought or used. |
120+
| Unit Price | The price per unit product. |
121+
| Extended Amount | The quantity multiplied by the unit price. |
122+
| Commitment Usage | The amount of monetary commitment that has been used. |
123+
| Net Amount | The extended amount minus the commitment usage. |
124+
| Tax Rate | The tax rate applicable to the product based on the country of billing. |
125+
| Tax Amount | The net amount multiplied by tax rate. |
126+
| Total | The sum of the net amount and tax amount. |
127+
| Is Third Party | Indicates whether the product or service is a third-party product. |
128+
129+
## Next steps
130+
131+
- Learn how to download your Direct EA billing invoice documents at [View your Azure usage summary details and download reports for direct EA enrollments](direct-ea-azure-usage-charges-invoices.md).

0 commit comments

Comments
 (0)