Skip to content

Commit cb0a6e4

Browse files
authored
Merge pull request #222346 from MicrosoftDocs/main
12/23/2022 PM Publish
2 parents 42de612 + 5cc7103 commit cb0a6e4

File tree

12 files changed

+96
-64
lines changed

12 files changed

+96
-64
lines changed

articles/api-management/api-management-howto-deploy-multi-region.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,13 @@ To take advantage of geographical distribution of your system, you should have b
100100
</policies>
101101
```
102102

103-
> [!TIP]
104-
> You may also front your backend services with [Azure Traffic Manager](https://azure.microsoft.com/services/traffic-manager/), direct the API calls to the Traffic Manager, and let it resolve the routing automatically.
103+
### Use Traffic Manager for routing to regional backends
104+
105+
You may also front your backend services with [Azure Traffic Manager](https://azure.microsoft.com/services/traffic-manager/), direct the API calls to the Traffic Manager, and let it resolve the routing automatically.
106+
107+
* For traffic distribution and failover, we recommend using Traffic Manager with the [**Geographic**](../traffic-manager/traffic-manager-routing-methods.md#geographic-traffic-routing-method) routing method. We don't recommend using Traffic Manager with the Weighted routing method with API Management backends.
108+
109+
* For traffic control during maintenance operations, we recommend using the Priority routing method.
105110

106111
## <a name="custom-routing"> </a>Use custom routing to API Management regional gateways
107112

articles/azure-monitor/faq.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,7 @@ sections:
737737
738738
### Querying the telemetry
739739
740-
Use the [REST API](https://dev.applicationinsights.io/) to run [Analytics](./logs/log-query-overview.md) queries.
740+
Use the [REST API](/rest/api/application-insights/) to run [Analytics](./logs/log-query-overview.md) queries.
741741
742742
- question: |
743743
How can I set an alert on an event?

articles/azure-netapp-files/azure-netapp-files-network-topologies.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.service: azure-netapp-files
1212
ms.workload: storage
1313
ms.tgt_pltfrm: na
1414
ms.topic: conceptual
15-
ms.date: 12/14/2022
15+
ms.date: 12/23/2022
1616
ms.author: ramakk
1717
ms.custom: references_regions
1818
---
@@ -55,6 +55,7 @@ Azure NetApp Files Standard network features are supported for the following reg
5555
* North Central US
5656
* North Europe
5757
* Norway East
58+
* South Africa North
5859
* South Central US
5960
* South India
6061
* Southeast Asia

articles/cognitive-services/Translator/reference/v3-0-break-sentence.md

Lines changed: 27 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: nitinme
99
ms.service: cognitive-services
1010
ms.subservice: translator-text
1111
ms.topic: reference
12-
ms.date: 08/06/2020
12+
ms.date: 12/23/2022
1313
ms.author: lajanuar
1414
---
1515

@@ -32,8 +32,8 @@ Request parameters passed on the query string are:
3232
| Query Parameter | Description |
3333
| -------| ----------- |
3434
| api-version <img width=200/> | **Required query parameter**.<br/>Version of the API requested by the client. Value must be `3.0`. |
35-
| language | **Optional query parameter**.<br/>Language tag identifying the language of the input text. If a code is not specified, automatic language detection will be applied. |
36-
| script | **Optional query parameter**.<br/>Script tag identifying the script used by the input text. If a script is not specified, the default script of the language will be assumed. |
35+
| language | **Optional query parameter**.<br/>Language tag identifying the language of the input text. If a code isn't specified, automatic language detection will be applied. |
36+
| script | **Optional query parameter**.<br/>Script tag identifying the script used by the input text. If a script isn't specified, the default script of the language will be assumed. |
3737

3838
Request headers include:
3939

@@ -42,7 +42,7 @@ Request headers include:
4242
| Authentication header(s) <img width=200/> | **Required request header**.<br/>See <a href="/azure/cognitive-services/translator/reference/v3-0-reference#authentication">available options for authentication</a>. |
4343
| Content-Type | **Required request header**.<br/>Specifies the content type of the payload. Possible values are: `application/json`. |
4444
| Content-Length | **Required request header**.<br/>The length of the request body. |
45-
| X-ClientTraceId | **Optional**.<br/>A client-generated GUID to uniquely identify the request. Note that you can omit this header if you include the trace ID in the query string using a query parameter named `ClientTraceId`. |
45+
| X-ClientTraceId | **Optional**.<br/>A client-generated GUID to uniquely identify the request. You can omit this header if you include the trace ID in the query string using a query parameter named `ClientTraceId`. |
4646

4747
## Request body
4848

@@ -57,35 +57,39 @@ The body of the request is a JSON array. Each array element is a JSON object wit
5757
The following limitations apply:
5858

5959
* The array can have at most 100 elements.
60-
* The text value of an array element cannot exceed 50,000 characters including spaces.
61-
* The entire text included in the request cannot exceed 50,000 characters including spaces.
60+
* The text value of an array element can't exceed 50,000 characters including spaces.
61+
* The entire text included in the request can't exceed 50,000 characters including spaces.
6262
* If the `language` query parameter is specified, then all array elements must be in the same language. Otherwise, language auto-detection is applied to each array element independently.
6363

6464
## Response body
6565

6666
A successful response is a JSON array with one result for each string in the input array. A result object includes the following properties:
6767

68-
* `sentLen`: An array of integers representing the lengths of the sentences in the text element. The length of the array is the number of sentences, and the values are the length of each sentence.
68+
* `sentLen`: An array of integers representing the lengths of the sentences in the text element. The length of the array is the number of sentences, and the values are the length of each sentence.
6969

70-
* `detectedLanguage`: An object describing the detected language through the following properties:
70+
* `detectedLanguage`: An object describing the detected language through the following properties:
7171

72-
* `language`: Code of the detected language.
72+
* `language`: Code of the detected language.
7373

74-
* `score`: A float value indicating the confidence in the result. The score is between zero and one and a low score indicates a low confidence.
75-
76-
Note that the `detectedLanguage` property is only present in the result object when language auto-detection is requested.
74+
* `score`: A float value indicating the confidence in the result. The score is between zero and one and a low score indicates a low confidence.
75+
76+
The `detectedLanguage` property is only present in the result object when language auto-detection is requested.
7777

7878
An example JSON response is:
7979

8080
```json
8181
[
82-
{
83-
"sentLen": [ 13, 11, 22 ]
84-
"detectedLanguage": {
85-
"language": "en",
86-
"score": 401
87-
},
88-
}
82+
{
83+
"detectedLanguage": {
84+
"language": "en",
85+
"score": 1.0
86+
},
87+
"sentLen": [
88+
13,
89+
11,
90+
22
91+
]
92+
}
8993
]
9094
```
9195

@@ -96,7 +100,7 @@ An example JSON response is:
96100
<th>Description</th>
97101
<tr>
98102
<td>X-RequestId</td>
99-
<td>Value generated by the service to identify the request. It is used for troubleshooting purposes.</td>
103+
<td>Value generated by the service to identify the request. It's used for troubleshooting purposes.</td>
100104
</tr>
101105
</table>
102106

@@ -117,11 +121,11 @@ The following are the possible HTTP status codes that a request returns.
117121
</tr>
118122
<tr>
119123
<td>401</td>
120-
<td>The request could not be authenticated. Check that credentials are specified and valid.</td>
124+
<td>The request couldn't be authenticated. Check that credentials are specified and valid.</td>
121125
</tr>
122126
<tr>
123127
<td>403</td>
124-
<td>The request is not authorized. Check the details error message. This often indicates that all free translations provided with a trial subscription have been used up.</td>
128+
<td>The request isn't authorized. Check the details error message. This response code often indicates that all free translations provided with a trial subscription have been used up.</td>
125129
</tr>
126130
<tr>
127131
<td>429</td>
@@ -145,4 +149,4 @@ The following example shows how to obtain sentence boundaries for a single sente
145149

146150
```curl
147151
curl -X POST "https://api.cognitive.microsofttranslator.com/breaksentence?api-version=3.0" -H "Ocp-Apim-Subscription-Key: <client-secret>" -H "Content-Type: application/json" -d "[{'Text':'How are you? I am fine. What did you do today?'}]"
148-
```
152+
```

articles/event-hubs/event-hubs-dotnet-standard-getstarted-send.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@ Here are the important steps from the code:
138138
In the code sample below, replace the `<CONNECTION_STRING>` and `<HUB_NAME>` placeholder values for the `EventHubProducerClient` parameters.
139139

140140
```csharp
141-
using Azure.Identity;
142141
using Azure.Messaging.EventHubs;
143142
using Azure.Messaging.EventHubs.Producer;
144143
using System.Text;

articles/governance/blueprints/index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,6 @@ landingContent:
106106
- text: Azure PowerShell
107107
url: /powershell/module/az.blueprint/#blueprint
108108
- text: Azure SDK for .NET
109-
url: /dotnet/api/overview/azure/blueprints/management
109+
url: /dotnet/api/overview/azure/blueprint/management/management-blueprint
110110
- text: REST
111111
url: /rest/api/blueprints/

articles/governance/management-groups/index.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ landingContent:
6666
- text: Azure PowerShell
6767
url: /powershell/module/az.resources/#resources
6868
- text: Azure SDK for .NET
69-
url: /dotnet/api/overview/azure/managementgroups
69+
url: /dotnet/api/overview/azure/management-groups
7070
- text: Azure SDK for Go
7171
url: https://pkg.go.dev/github.com/Azure/azure-sdk-for-go/services/preview/resources/mgmt/2018-03-01-preview/managementgroups
7272
- text: Azure SDK for JavaScript
@@ -76,4 +76,4 @@ landingContent:
7676
- text: REST
7777
url: /rest/api/managementgroups
7878
- text: Resource Manager templates
79-
url: /azure/templates/microsoft.management/managementgroups
79+
url: /azure/templates/microsoft.management/managementgroups

articles/marketplace/customer-dashboard.md

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ description: Learn how to access information about your customers, including gro
44
ms.service: marketplace
55
ms.subservice: partnercenter-marketplace-publisher
66
ms.topic: article
7-
author: smannepalle
8-
ms.author: smannepalle
7+
author: saurabhsharmaa
8+
ms.author: saurasharma
99
ms.reviewer: sroy
10-
ms.date: 05/05/2022
10+
ms.date: 12/23/2022
1111
---
1212

1313
# Customers dashboard in commercial marketplace analytics
@@ -99,7 +99,7 @@ These filters are applied at the Customers page level. Select multiple filters t
9999
The page has dashboard-level filters for the following:
100100

101101
- Sales Channel
102-
- Marketplace Subscription Id
102+
- Marketplace Subscription ID
103103
- Customer Id
104104
- Customer Name
105105
- Customer Company Name
@@ -142,14 +142,14 @@ This chart has tabs for Orders, Normalized usage, and Raw usage. Select **Orders
142142
![Screenshot showing the Orders tab on the Insights screen of the Customers dashboard.](./media/customer-dashboard/customers-by-orders-usage.png)
143143

144144
- The Leader board presents details of the customers ranked by order count. After selecting a customer, the customer details are presented in the adjoining “Details”, “Orders by SKUs” and “SKUs by Seats” sections.
145-
- The Customer profile details are displayed in this space when publishers are signed in with an owner role. If publishers are signed in with a contributor role, the details in this section will not be available.
145+
- The Customer profile details are displayed in this space when publishers are signed in with an owner role. If publishers are signed in with a contributor role, the details in this section won't be available.
146146
- The **Orders by SKUs** donut chart displays the breakdown of orders purchased for plans. The top five plans with the highest order count are displayed, while the rest of the orders are grouped under **Rest all**.
147147
- The **SKUs by Seats** donut chart displays the breakdown of seats ordered for plans. The top five plans with the highest seats are displayed, while the rest of the orders are grouped under **Rest All**.
148148

149149
Select **Normalized usage** or **Raw usage** for those views.
150150

151151
- The Leader board presents details of the customers ranked by usage hours count. After selecting a customer, the details of the customer are presented in the adjoining “Details”, “Normalized Usage by offers” and “Normalized Usage by virtual machine (VM) Size(s)” section.
152-
- The Customer profile details are displayed in this space when publishers are logged in with an owner role. If publishers are logged in with a contributor role, the details in this section will not be available.
152+
- The Customer profile details are displayed in this space when publishers are logged in with an owner role. If publishers are logged in with a contributor role, the details in this section won't be available.
153153
- The **Normalized usage by Offers** donut chart displays the breakdown of usage consumed by the offers. The top five plans with the highest usage count are displayed, while the rest of the offers are grouped under **Rest All**.
154154
- The **Normalized usage by VM Size(s)** donut chart displays the breakdown of usage consumed by different VM Size(s). The top five VM Sizes with the highest normalized usage are displayed, while the rest of the usage is grouped under **Rest All**.
155155

@@ -195,11 +195,11 @@ The **Customer details** table displays a numbered list of the top 1,000 custome
195195

196196
![Screenshot showing the Customer Details table on the Insights screen of the Customers dashboard.](./media/customer-dashboard/customer-details-table.png)
197197

198-
- Customer personal information will only be available if the customer has provided consent. You can only view this information if you have signed in with an owner role level of permissions.
198+
- Customer personal information will only be available if the customer has provided consent. You can only view this information if you've signed in with an owner role level of permissions.
199199
- Each column in the grid is sortable.
200200
- The data can be extracted to a .CSV or .TSV file if the count of the records is less than 1,000.
201201
- If records number is more than 1,000, exported data will be asynchronously placed in a downloads page for the next 30 days.
202-
- Apply filters to the table to display only the data you are interested in. Filter data by Company name, Customer ID, Marketplace Subscription ID, Azure License Type, Date Acquired, Date Lost, Customer Email, Customer Country/Region/State/City/Zip, Customer Language, and so on.
202+
- Apply filters to the table to display only the data you're interested in. Filter data by Company name, Customer ID, Marketplace Subscription ID, Azure License Type, Date Acquired, Date Lost, Customer Email, Customer Country/Region/State/City/Zip, Customer Language, and so on.
203203
- When an offer is purchased by a protected customer, information in **Customer Detailed Data** will be masked (************).
204204
- Customer dimension details such as Company Name, Customer Name, and Customer Email are at an organization ID level, not at Azure Marketplace or Microsoft AppSource transaction level.
205205

@@ -209,7 +209,7 @@ _**Table 1: Dictionary of data terms**_
209209

210210
| Column name in<br>user interface | Attribute name | Definition | Column name in programmatic<br>access reports |
211211
| ------------ | ------------- | ------------- | ------------- |
212-
| Marketplace Subscription ID | Marketplace Subscription ID | The unique identifier associated with the Azure subscription the customer used to purchase your commercial marketplace offer. For infrastructure offers, this is the customer's Azure subscription GUID. For SaaS offers, this is shown as zeros since SaaS purchases do not require an Azure subscription. | MarketplaceSubscriptionId |
212+
| Marketplace Subscription ID | Marketplace Subscription ID | The unique identifier associated with the Azure subscription the customer used to purchase your commercial marketplace offer. For infrastructure offers, this is the customer's Azure subscription GUID. For SaaS offers, this is shown as zeros since SaaS purchases don't require an Azure subscription. | MarketplaceSubscriptionId |
213213
| DateAcquired | Date Acquired | The first date the customer purchased any offer you published. | DateAcquired |
214214
| DateLost | Date Lost | The last date the customer canceled the last of all previously purchased offers. | DateLost |
215215
| Provider Name | Provider Name | The name of the provider involved in the relationship between Microsoft and the customer. If the customer is an Enterprise through Reseller, this will be the reseller. If a Cloud Solution Provider (CSP) is involved, this will be the CSP. | ProviderName |
@@ -223,7 +223,7 @@ _**Table 1: Dictionary of data terms**_
223223
| CustomerCommunicationCulture | Customer Communication Language | The language preferred by the customer for communication. | CustomerCommunicationCulture |
224224
| CustomerCountryRegion | Customer Country/Region | The country/region name provided by the customer. Country/region could be different than the country/region in a customer's Azure subscription. | CustomerCountryRegion |
225225
| AzureLicenseType | Azure License Type | The type of licensing agreement used by customers to purchase Azure. Also known as the _channel_. The possible values are:<br>- Cloud Solution Provider<br>- Enterprise<br>- Enterprise through Reseller<br>- Pay as You Go | AzureLicenseType |
226-
| PromotionalCustomers | Is Promotional Contact Opt In | The value will let you know if the customer proactively opted in for promotional contact from publishers. At this time, we are not presenting the option to customers, so we have indicated "No" across the board. After this feature is deployed, we will start updating accordingly. | PromotionalCustomers |
226+
| PromotionalCustomers | Is Promotional Contact Opt In | The value will let you know if the customer proactively opted in for promotional contact from publishers. At this time, we aren't presenting the option to customers, so we've indicated "No" across the board. After this feature is deployed, we'll start updating accordingly. | PromotionalCustomers |
227227
| CustomerState | Customer State | The state of residence provided by the customer. State could be different than the state provided in a customer's Azure subscription. | CustomerState |
228228
| CommerceRootCustomer | Commerce Root Customer | One Billing Account ID can be associated with multiple Customer IDs.<br>One combination of a Billing Account ID and a Customer ID can be associated with multiple commercial marketplace subscriptions.<br>The Commerce Root Customer signifies the name of the subscription’s customer. | CommerceRootCustomer |
229229
| Customer ID | Customer ID | The unique identifier assigned to a customer. A customer may have zero or more Azure Marketplace subscriptions. | CustomerId |
@@ -233,6 +233,14 @@ _**Table 1: Dictionary of data terms**_
233233
| PlanID | PlanID | The display name of the plan entered when the offer was created in Partner Center | PlanID |
234234
| SKU | SKU | The plan associated with the offer | SKU |
235235
| N/A | lastModifiedAt | The latest timestamp for customer purchases. Use this field, via programmatic API access, to pull the latest snapshot of all customer purchase transactions since a specific date | lastModifiedAt |
236+
| N/A | AddressLine1 | The Address Line 1 section of customer’s street address | AddressLine1 |
237+
| N/A | Billing Id | The Billing Id of the enterprise customer | Billing Id |
238+
| N/A | Private Offer Id | The Id to identify a private marketplace offer | Private Offer Id |
239+
| N/A | Private Offer Name | The name provided during private offer creation | Private Offer Name |
240+
| N/A | Purchaser Email | Email of the entity purchasing or provisioning an offer. This could be same or different than the email of “bill-to” entity | Purchaser Email |
241+
| N/A | ReferenceId | A unique identifier to indicate provisioned instances or purchased offers by the customer. This key can be used to link with Orders and Usage report | ReferenceId |
242+
| Offer Id | Offer Id | The Id to identify a marketplace offer | OfferId |
243+
| Is Private Plan | Is Private Plan | Indicates whether a marketplace offer is private plan. <li> 0 value indicates false </li> <li> 1 value indicates true </li> | IsPrivatePlan |
236244

237245
## Next steps
238246

0 commit comments

Comments
 (0)