Skip to content

Commit 78121a2

Browse files
authored
Merge branch 'MicrosoftDocs:main' into meganbradley/docutune-autopr-20241020-030949-3865179-ignore-build
2 parents 1dcfdb4 + f4d5833 commit 78121a2

11 files changed

+46
-26
lines changed

articles/azure-maps/how-to-use-image-templates-web-sdk.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ For the source code for this sample, see [Symbol layer with built-in icon templa
6060

6161
## Use an image template along a lines path
6262

63-
Once an image template is loaded into the map image sprite, it can be rendered along the path of a line by adding a LineString to a data source and using a symbol layer with a `lineSpacing`option and by referencing the ID of the image resource in the `image` option of th `iconOptions`.
63+
Once an image template is loaded into the map image sprite, it can be rendered along the path of a line by adding a LineString to a data source and using a symbol layer with a `lineSpacing`option and by referencing the ID of the image resource in the `image` option of the `iconOptions`.
6464

6565
The [Line layer with built-in icon template] demonstrates how to do this. As show in the following screenshot, it renders a red line on the map and uses a symbol layer using the `car` image template with a dodger blue primary color and a white secondary color. For the source code for this sample, see [Line layer with built-in icon template sample code].
6666

articles/container-apps/samples.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,6 @@ Refer to the following samples to learn how to use Azure Container Apps in diffe
2323
| [ASP.NET Core front-end with two back-end APIs on Azure Container Apps (with Dapr)](https://github.com/Azure-Samples/dotNET-FrontEnd-to-BackEnd-with-DAPR-on-Azure-Container-Apps)<br /> | Demonstrates how ASP.NET Core 6.0 is used to build a cloud-native application hosted in Azure Container Apps using Dapr. |
2424
| [Deploy Drupal on Azure Container Apps](https://github.com/Azure-Samples/drupal-on-azure-container-apps) | Demonstrates how to deploy a Drupal site to Azure Container Apps, with Azure Database for MariaDB, and Azure Files to store static assets.|
2525
| [Launch your first Java app on Azure Container Apps](https://github.com/Azure-Samples/azure-container-apps-java-samples/tree/main/spring-petclinic) |A monolithic Java application called PetClinic built with Spring Framework. PetClinic is a well-known sample application provided by the Spring Framework community. |
26-
| [Launch your first Java microservice app on Azure Container Apps](https://github.com/Azure-Samples/azure-container-apps-java-samples/tree/main/spring-petclinic-microservices) |A microservices-based version of PetClinic with Spring , built with Spring Framework, showcasing configuration management, service discovery, and health/metrics monitoring on Azure Container Apps.|
26+
| [Launch your first Java microservice app on Azure Container Apps](https://github.com/Azure-Samples/azure-container-apps-java-samples/tree/main/spring-petclinic-microservices) |A microservices-based version of PetClinic with Spring, built with Spring Framework, showcasing configuration management, service discovery, and health/metrics monitoring on Azure Container Apps.|
2727
| [Launch Your first Java Spring Batch app on Azure Container Apps](https://github.com/Azure-Samples/azure-container-apps-java-samples/tree/main/spring-batch-football) |A Java Spring Batch application showcasing an ephemeral statistics loading job, adapted from the Spring Batch Football Job sample, and deployable to Azure Container Apps. |
28+
| [Launch Your first Java AI application on Azure Container Apps](https://github.com/Azure-Samples/spring-petclinic-ai) |A Java AI application built with the Spring-AI Framework, demonstrating how to integrate with Azure OpenAI capabilities to enhance PetClinic application with an intelligent Chatbot, and deploy it to Azure Container Apps. |
63.4 KB
Loading

articles/event-grid/scripts/powershell-webhook-secure-delivery-microsoft-entra-app.md

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,25 @@ Here are the high level steps from the script:
1919
1. Add service principal of event subscription writer Microsoft Entra app to the AzureEventGridSecureWebhookSubscriber role
2020
1. Add service principal of Microsoft.EventGrid to the AzureEventGridSecureWebhookSubscriber role as well
2121

22+
## Get Microsoft.EventGrid application ID
23+
24+
1. Navigate to [Azure portal](https://portal.azure.com).
25+
1. In the search bar, type `Microsoft.EventGrid`, and then select **Microsoft.EventGrid (Service Principal)** in the drop-down list.
26+
27+
:::image type="content" source="../media/event-grid-app-id/select-microsoft-event-grid.png" alt-text="Screenshot that shows the selection of Microsoft Event Grid from the drop-down list.":::
28+
1. On the **Microsoft.EventGrid** page, note down or copy the **Application ID** to the clipboard.
29+
1. In the following script, set the `$eventGridAppId` variable to this value before running it.
30+
2231
## Sample script - stable
2332

2433
```azurepowershell
2534
# NOTE: Before run this script ensure you are logged in Azure by using "az login" command.
2635
36+
$eventGridAppId = "[REPLACE_WITH_EVENT_GRID_APP_ID]"
2737
$webhookAppObjectId = "[REPLACE_WITH_YOUR_ID]"
2838
$eventSubscriptionWriterAppId = "[REPLACE_WITH_YOUR_ID]"
2939
40+
3041
# Start execution
3142
try {
3243
@@ -51,8 +62,6 @@ try {
5162
# You don't need to modify this id
5263
# But Azure Event Grid Entra Application Id is different for different clouds
5364
54-
$eventGridAppId = "4962773b-9cdb-44cf-a8bf-237846a00ab7" # Azure Public Cloud
55-
# $eventGridAppId = "54316b56-3481-47f9-8f30-0300f5542a7b" # Azure Government Cloud
5665
$eventGridSP = Get-MgServicePrincipal -Filter ("appId eq '" + $eventGridAppId + "'")
5766
if ($eventGridSP.DisplayName -match "Microsoft.EventGrid")
5867
{

articles/event-grid/scripts/powershell-webhook-secure-delivery-microsoft-entra-user.md

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,22 @@ Here are the high level steps from the script:
1818
1. Add service principal of user who is creating the subscription to the AzureEventGridSecureWebhookSubscriber role.
1919
1. Add service principal of Microsoft.EventGrid to the AzureEventGridSecureWebhookSubscriber.
2020

21+
## Get Microsoft.EventGrid application ID
22+
23+
1. Navigate to [Azure portal](https://portal.azure.com).
24+
1. In the search bar, type `Microsoft.EventGrid`, and then select **Microsoft.EventGrid (Service Principal)** in the drop-down list.
25+
26+
:::image type="content" source="../media/event-grid-app-id/select-microsoft-event-grid.png" alt-text="Screenshot that shows the selection of Microsoft Event Grid from the drop-down list.":::
27+
1. On the **Microsoft.EventGrid** page, note down or copy the **Application ID** to the clipboard.
28+
1. In the following script, set the `$eventGridAppId` variable to this value before running it.
29+
30+
2131
## Sample script
2232

2333
```azurepowershell
2434
# NOTE: Before run this script ensure you are logged in Azure by using "az login" command.
2535
36+
$eventGridAppId = "[REPLACE_WITH_EVENT_GRID_APP_ID]"
2637
$webhookAppObjectId = "[REPLACE_WITH_YOUR_ID]"
2738
$eventSubscriptionWriterUserPrincipalName = "[REPLACE_WITH_USER_PRINCIPAL_NAME_OF_THE_USER_WHO_WILL_CREATE_THE_SUBSCRIPTION]"
2839
@@ -50,8 +61,6 @@ try {
5061
# You don't need to modify this id
5162
# But Azure Event Grid Microsoft Entra Application Id is different for different clouds
5263
53-
$eventGridAppId = "4962773b-9cdb-44cf-a8bf-237846a00ab7" # Azure Public Cloud
54-
# $eventGridAppId = "54316b56-3481-47f9-8f30-0300f5542a7b" # Azure Government Cloud
5564
$eventGridSP = Get-MgServicePrincipal -Filter ("appId eq '" + $eventGridAppId + "'")
5665
if ($eventGridSP.DisplayName -match "Microsoft.EventGrid")
5766
{

articles/hdinsight/domain-joined/domain-joined-authentication-issues.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Use [Hybrid Identity Administrator](/entra/identity/role-based-access-control/pe
4141
Sign in fails with error code 50034. Error message is similar to:
4242

4343
```
44-
{"error":"invalid_grant","error_description":"AADSTS50034: The user account Microsoft.AzureAD.Telemetry.Diagnostics.PII doesn't exist in the 0c349e3f-1ac3-4610-8599-9db831cbaf62 directory. To sign into this application, the account must be added to the directory.\r\nTrace ID: 2222cccc-33dd-eeee-ff44-aaaaaa555555\r\nCorrelation ID: cccc2222-dd33-4444-55ee-666666ffffff\r\nTimestamp: 2019-04-29 15:52:16Z", "error_codes":[50034],"timestamp":"2019-04-29 15:52:16Z","trace_id":"2222cccc-33dd-eeee-ff44-aaaaaa555555", "correlation_id":"cccc2222-dd33-4444-55ee-666666ffffff"}
44+
{"error":"invalid_grant","error_description":"AADSTS50034: The user account Microsoft.AzureAD.Telemetry.Diagnostics.PII doesn't exist in the aaaabbbb-0000-cccc-1111-dddd2222eeee directory. To sign into this application, the account must be added to the directory.\r\nTrace ID: 2222cccc-33dd-eeee-ff44-aaaaaa555555\r\nCorrelation ID: cccc2222-dd33-4444-55ee-666666ffffff\r\nTimestamp: 2019-04-29 15:52:16Z", "error_codes":[50034],"timestamp":"2019-04-29 15:52:16Z","trace_id":"2222cccc-33dd-eeee-ff44-aaaaaa555555", "correlation_id":"cccc2222-dd33-4444-55ee-666666ffffff"}
4545
```
4646

4747
### Cause

articles/hdinsight/hadoop/hdinsight-troubleshoot-data-lake-files.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ The certificate provided for Service principal access might have expired.
7575
1. If the service principal certificate has expired, the output will look something like this:
7676
7777
```
78-
Exception in OAuthTokenController.GetOAuthToken: 'System.InvalidOperationException: Error while getting the OAuth token from AAD for AppPrincipalId 23abe517-2ffd-4124-aa2d-7c224672cae2, ResourceUri https://management.core.windows.net/, AADTenantId https://login.windows.net/80abc8bf-86f1-41af-91ab-2d7cd011db47, ClientCertificateThumbprint C49C25705D60569884EDC91986CEF8A01A495783 ---> Microsoft.IdentityModel.Clients.ActiveDirectory.AdalServiceException: AADSTS70002: Error validating credentials. AADSTS50012: Client assertion contains an invalid signature. **[Reason - The key used is expired.**, Thumbprint of key used by client: 'C49C25705D60569884EDC91986CEF8A01A495783', Found key 'Start=08/03/2016, End=08/03/2017, Thumbprint=C39C25705D60569884EDC91986CEF8A01A4956D1', Configured keys: [Key0:Start=08/03/2016, End=08/03/2017, Thumbprint=C39C25705D60569884EDC91986CEF8A01A4956D1;]]
78+
Exception in OAuthTokenController.GetOAuthToken: 'System.InvalidOperationException: Error while getting the OAuth token from AAD for AppPrincipalId aaaaaaaa-bbbb-cccc-1111-222222222222, ResourceUri https://management.core.windows.net/, AADTenantId https://login.windows.net/80abc8bf-86f1-41af-91ab-2d7cd011db47, ClientCertificateThumbprint C49C25705D60569884EDC91986CEF8A01A495783 ---> Microsoft.IdentityModel.Clients.ActiveDirectory.AdalServiceException: AADSTS70002: Error validating credentials. AADSTS50012: Client assertion contains an invalid signature. **[Reason - The key used is expired.**, Thumbprint of key used by client: 'C49C25705D60569884EDC91986CEF8A01A495783', Found key 'Start=08/03/2016, End=08/03/2017, Thumbprint=C39C25705D60569884EDC91986CEF8A01A4956D1', Configured keys: [Key0:Start=08/03/2016, End=08/03/2017, Thumbprint=C39C25705D60569884EDC91986CEF8A01A4956D1;]]
7979
Trace ID: 0000aaaa-11bb-cccc-dd22-eeeeee333333
8080
Correlation ID: aaaa0000-bb11-2222-33cc-444444dddddd
8181
Timestamp: 2017-10-06 20:44:56Z ---> System.Net.WebException: The remote server returned an error: (401) Unauthorized.

articles/oracle/oracle-db/database-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.service: oracle-on-azure
66
ms.collection: linux
77
ms.topic: overview
88
ms.date: 10/01/2024
9-
ms.custom: engagement-fy23, references_regions
9+
ms.custom: engagement-fy23
1010
ms.author: jacobjaygbay
1111
---
1212

@@ -79,4 +79,4 @@ See [Contact Microsoft Azure Support](https://support.microsoft.com/topic/contac
7979
- [Provision and manage Oracle Database@Azure](provision-oracle-database.md)
8080
- [Oracle Database@Azure support information](oracle-database-support.md)
8181
- [Network planning for Oracle Database@Azure](oracle-database-network-plan.md)
82-
- [Groups and roles for Oracle Database@Azure](oracle-database-groups-roles.md)
82+
- [Groups and roles for Oracle Database@Azure](oracle-database-groups-roles.md)

articles/oracle/oracle-db/oracle-database-regions.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ The following table lists Azure regions and corresponding OCI regions that suppo
2626

2727
| Azure region | OCI region | Oracle Exadata Database@Azure | Oracle Autonomous Database@Azure |
2828
|----------------|--------------------------|-------------------|-------------------|
29-
| Brazil South | Brazil Southeast (Vinhedo) || |
29+
| Brazil South | Brazil Southeast (Vinhedo) || |
3030

3131
## Europe, Middle East, Africa (EMEA)
3232

@@ -37,6 +37,7 @@ The following table lists Azure regions and corresponding OCI regions that suppo
3737
| France Central |France central (Paris) |||
3838
| Germany West Central |Germany Central (Frankfurt) |||
3939
| UK South | UK South (London) |||
40+
| UK West | UK West (Cardiff) |||
4041
| Italy North | Italy North (Milan) || |
4142

4243
## North America (NA)
@@ -54,7 +55,7 @@ The following table lists Azure regions and corresponding OCI regions that offer
5455

5556
| Azure region | OCI region | Oracle Exadata Database@Azure | Oracle Autonomous Database@Azure |
5657
|----------------|--------------------------|-------------------|-------------------|
57-
| West US | US West (Phoenix) |||
58+
| West US | US West (San Jose) |||
5859

5960
> [!NOTE]
6061
> To provision Oracle Database@Azure resources in a supported region, your tenancy must be subscribed to the target region. Learn how to [manage regions](https://docs.oracle.com/iaas/Content/Identity/regions/managingregions.htm#Managing_Regions) and [subscribe to an infrastructure region](https://docs.oracle.com/iaas/Content/Identity/regions/To_subscribe_to_an_infrastructure_region.htm#subscribe).

articles/virtual-network/virtual-network-tcpip-performance-tuning.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ This article discusses common TCP/IP performance tuning techniques and some thin
2121

2222
#### MTU
2323

24-
The maximum transmission unit (MTU) is the largest size frame (packet), specified in bytes, that can be sent over a network interface. The MTU is a configurable setting. The default MTU used on Azure VMs, and the default setting on most network devices globally, is 1,500 bytes.
24+
The maximum transmission unit (MTU) is the largest size frame (packet plus network access headers), specified in bytes, that can be sent over a network interface. The MTU is a configurable setting. The default MTU used on Azure VMs, and the default setting on most network devices globally, is 1,500 bytes.
2525

2626
#### Fragmentation
2727

@@ -258,7 +258,7 @@ For more information, see [Virtual machine network bandwidth](./virtual-machine-
258258

259259
As discussed throughout this article, factors on the internet and outside the control of Azure can affect network performance. Here are some of those factors:
260260

261-
- **Latency**: The round-trip time between two destinations can be affected by issues on intermediate networks, by traffic that doesn't take the "shortest" distance path, and by suboptimal peering paths.
261+
- **Latency**: The round-trip time between two endpoints can be affected by issues on intermediate networks, by traffic that doesn't take the "shortest" distance path, and by suboptimal peering paths.
262262

263263
- **Packet loss**: Packet loss can be caused by network congestion, physical path issues, and underperforming network devices.
264264

@@ -270,15 +270,15 @@ Traceroute is a good tool for measuring network performance characteristics (lik
270270

271271
Along with the considerations discussed earlier in this article, the topology of a virtual network can affect the network's performance. For example, a hub-and-spoke design that backhauls traffic globally to a single-hub virtual network will introduce network latency, which will affect overall network performance.
272272

273-
The number of network devices that network traffic passes through can also affect overall latency. For example, in a hub-and-spoke design, if traffic passes through a spoke network virtual appliance and a hub virtual appliance before transiting to the internet, the network virtual appliances can introduce latency.
273+
The number of network devices that network traffic passes through can also affect overall latency. For example, in a hub-and-spoke design, if traffic passes through a spoke network virtual appliance and a hub virtual appliance before transiting to the internet, the network virtual appliances will introduce some latency.
274274

275275
### Azure regions, virtual networks, and latency
276276

277277
Azure regions are made up of multiple datacenters that exist within a general geographic area. These datacenters might not be physically next to each other. In some cases they're separated by as much as 10 kilometers. The virtual network is a logical overlay on top of the Azure physical datacenter network. A virtual network doesn't imply any specific network topology within the datacenter.
278278

279279
For example, two VMs that are in the same virtual network and subnet might be in different racks, rows, or even datacenters. They could be separated by feet of fiber optic cable or by kilometers of fiber optic cable. This variation could introduce variable latency (a few milliseconds difference) between different VMs.
280280

281-
The geographic placement of VMs, and the potential resulting latency between two VMs, can be influenced by the configuration of availability sets and Availability Zones. But the distance between datacenters in a region is region-specific and primarily influenced by datacenter topology in the region.
281+
The geographic placement of VMs, and the potential resulting latency between two VMs, can be influenced by the configuration of availability sets, proximity placement groups, and availability zones. But the distance between datacenters in a region is region-specific and primarily influenced by datacenter topology in the region.
282282

283283
### Source NAT port exhaustion
284284

@@ -296,6 +296,8 @@ A number of the performance maximums in this article are related to the network
296296

297297
TCP performance relies heavily on RTT and packet Loss. The PING utility available in Windows and Linux provides the easiest way to measure RTT and packet loss. The output of PING will show the minimum/maximum/average latency between a source and destination. It will also show packet loss. PING uses the ICMP protocol by default. You can use PsPing to test TCP RTT. For more information, see [PsPing](/sysinternals/downloads/psping).
298298

299+
Neither ICMP nor TCP pings measure the accelerated networking datapath. To measure this, please read about Latte and SockPerf in [this article](./virtual-network-test-latency.md).
300+
299301
### Measure actual bandwidth of a virtual machine
300302

301303
To accurately measure the bandwidth of Azure VMs, follow [this guidance](./virtual-network-bandwidth-testing.md).
@@ -308,7 +310,7 @@ For more details on testing other scenarios, see these articles:
308310

309311
### Detect inefficient TCP behaviors
310312

311-
In packet captures, Azure customers might see TCP packets with TCP flags (SACK, DUP ACK, RETRANSMIT, and FAST RETRANSMIT) that could indicate network performance problems. These packets specifically indicate network inefficiencies that result from packet loss. But packet loss isn't necessarily caused by Azure performance problems. Performance problems could be the result of application problems, operating system problems, or other problems that might not be directly related to the Azure platform.
313+
In packet captures, Azure customers might see TCP packets with TCP flags (SACK, DUP ACK, RETRANSMIT, and FAST RETRANSMIT) that could indicate network performance problems. These packets specifically indicate network inefficiencies that result from packet loss. But packet loss isn't necessarily caused by Azure performance problems. Performance issues could be the result of application, operating system, or other problems that might not be directly related to the Azure platform.
312314

313315
Also, keep in mind that some retransmission and duplicate ACKs are normal on a network. TCP protocols were built to be reliable. Evidence of these TCP packets in a packet capture doesn't necessarily indicate a systemic network problem, unless they're excessive.
314316

0 commit comments

Comments
 (0)