Skip to content

Commit b9c2383

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into pl-how-to
2 parents 06c8e64 + 329f8c4 commit b9c2383

File tree

114 files changed

+1986
-953
lines changed

Some content is hidden

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

114 files changed

+1986
-953
lines changed

.openpublishing.redirection.azure-monitor.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6573,7 +6573,11 @@
65736573
"source_path_from_root": "/articles/azure-monitor/logs/data-collection-rule-sample-custom-logs.md",
65746574
"redirect_url": "/azure/azure-monitor/essentials/data-collection-rule-samples",
65756575
"redirect_document_id": false
6576-
}
6577-
6576+
},
6577+
{
6578+
"source_path_from_root": "/articles/azure-monitor/agents/data-collection-rule-sample-agent.md",
6579+
"redirect_url": "/azure/azure-monitor/essentials/data-collection-rule-samples",
6580+
"redirect_document_id": false
6581+
}
65786582
]
65796583
}

.openpublishing.redirection.virtual-desktop.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,11 @@
369369
"source_path_from_root": "/articles/virtual-desktop/publish-applications.md",
370370
"redirect_url": "/azure/virtual-desktop/publish-applications-stream-remoteapp",
371371
"redirect_document_id": false
372+
},
373+
{
374+
"source_path_from_root": "/articles/virtual-desktop/autoscale-new-existing-host-pool.md",
375+
"redirect_url": "/azure/virtual-desktop/autoscale-scaling-plan",
376+
"redirect_document_id": true
372377
}
373378
]
374379
}

articles/ai-services/computer-vision/how-to/video-retrieval.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Azure AI Spatial Analysis Video Retrieval APIs are part of Azure AI Vision and e
2020
## Prerequisites
2121

2222
- Azure subscription - [Create one for free](https://azure.microsoft.com/free/cognitive-services).
23-
- Once you have your Azure subscription, [create a Vision resource using the portal](/azure/cognitive-services/cognitive-services-apis-create-account). For this preview, you must create your resource in the East US region.
23+
- Once you have your Azure subscription, [create a Vision resource using the portal](/azure/cognitive-services/cognitive-services-apis-create-account). For this preview, you must create your resource in the one of the following regions - Australia East, Switzerland North, Sweden Central, or East US.
2424
- An Azure Storage resource - [Create one](/azure/storage/common/storage-account-create?tabs=azure-portal)
2525

2626
## Input requirements

articles/ai-services/speech-service/batch-transcription-audio-data.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ The batch transcription API supports a number of different formats and codecs, s
3333
- OPUS/OGG
3434
- FLAC
3535
- WMA
36+
- AAC
3637
- ALAW in WAV container
3738
- MULAW in WAV container
3839
- AMR

articles/ai-services/speech-service/includes/language-support/tts.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ ms.author: eur
5151
| `en-PH` | English (Philippines) | `en-PH-RosaNeural` (Female)<br/>`en-PH-JamesNeural` (Male) |
5252
| `en-SG` | English (Singapore) | `en-SG-LunaNeural` (Female)<br/>`en-SG-WayneNeural` (Male) |
5353
| `en-TZ` | English (Tanzania) | `en-TZ-ImaniNeural` (Female)<br/>`en-TZ-ElimuNeural` (Male) |
54-
| `en-US` | English (United States) | `en-US-JennyMultilingualNeural`<sup>3</sup> (Female)<br/>`en-US-JennyMultilingualV2Neural`<sup>3</sup> (Female)<br/>`en-US-RyanMultilingualNeural`<sup>3</sup> (Male)<br/>`en-US-JennyNeural` (Female)<br/>`en-US-GuyNeural` (Male)<br/>`en-US-AriaNeural` (Female)<br/>`en-US-DavisNeural` (Male)<br/>`en-US-AmberNeural` (Female)<br/>`en-US-AnaNeural` (Female, Child)<br/>`en-US-AndrewNeural` (Male)<br/>`en-US-AshleyNeural` (Female)<br/>`en-US-BrandonNeural` (Male)<br/>`en-US-BrianNeural` (Male)<br/>`en-US-ChristopherNeural` (Male)<br/>`en-US-CoraNeural` (Female)<br/>`en-US-ElizabethNeural` (Female)<br/>`en-US-EmmaNeural` (Female)<br/>`en-US-EricNeural` (Male)<br/>`en-US-JacobNeural` (Male)<br/>`en-US-JaneNeural` (Female)<br/>`en-US-JasonNeural` (Male)<br/>`en-US-MichelleNeural` (Female)<br/>`en-US-MonicaNeural` (Female)<br/>`en-US-NancyNeural` (Female)<br/>`en-US-RogerNeural` (Male)<br/>`en-US-SaraNeural` (Female)<br/>`en-US-SteffanNeural` (Male)<br/>`en-US-TonyNeural` (Male)<br/>`en-US-AIGenerate1Neural`<sup>1</sup> (Male)<br/>`en-US-AIGenerate2Neural`<sup>1</sup> (Female)<br/>`en-US-AndrewMultilingualNeural`<sup>1,3</sup> (Male)<br/>`en-US-AvaMultilingualNeural`<sup>1,3</sup> (Female)<br/>`en-US-AvaNeural`<sup>1</sup> (Female)<br/>`en-US-BlueNeural`<sup>1</sup> (Neutral)<br/>`en-US-BrianMultilingualNeural`<sup>1,3</sup> (Male)<br/>`en-US-EmmaMultilingualNeural`<sup>1,3</sup> (Female) |
54+
| `en-US` | English (United States) | `en-US-AvaNeural` (Female)<br/>`en-US-AndrewNeural` (Male)<br/>`en-US-EmmaNeural` (Female)<br/>`en-US-BrianNeural` (Male)<br/>`en-US-JennyNeural` (Female)<br/>`en-US-GuyNeural` (Male)<br/>`en-US-AriaNeural` (Female)<br/>`en-US-DavisNeural` (Male)<br/>`en-US-JaneNeural` (Female)<br/>`en-US-JasonNeural` (Male)<br/>`en-US-SaraNeural` (Female)<br/>`en-US-TonyNeural` (Male)<br/>`en-US-NancyNeural` (Female)<br/>`en-US-AmberNeural` (Female)<br/>`en-US-AnaNeural` (Female, Child)<br/>`en-US-AshleyNeural` (Female)<br/>`en-US-BrandonNeural` (Male)<br/>`en-US-ChristopherNeural` (Male)<br/>`en-US-CoraNeural` (Female)<br/>`en-US-ElizabethNeural` (Female)<br/>`en-US-EricNeural` (Male)<br/>`en-US-JacobNeural` (Male)<br/>`en-US-JennyMultilingualNeural`<sup>3</sup> (Female)<br/>`en-US-JennyMultilingualV2Neural`<sup>3</sup> (Female)<br/>`en-US-MichelleNeural` (Female)<br/>`en-US-MonicaNeural` (Female)<br/>`en-US-RogerNeural` (Male)<br/>`en-US-RyanMultilingualNeural`<sup>3</sup> (Male)<br/>`en-US-SteffanNeural` (Male)<br/>`en-US-AIGenerate1Neural`<sup>1</sup> (Male)<br/>`en-US-AIGenerate2Neural`<sup>1</sup> (Female)<br/>`en-US-BlueNeural`<sup>1</sup> (Neutral)<br/>`en-US-AndrewMultilingualNeural`<sup>1,3</sup> (Male)<br/>`en-US-AvaMultilingualNeural`<sup>1,3</sup> (Female)<br/>`en-US-BrianMultilingualNeural`<sup>1,3</sup> (Male)<br/>`en-US-EmmaMultilingualNeural`<sup>1,3</sup> (Female) |
5555
| `en-ZA` | English (South Africa) | `en-ZA-LeahNeural` (Female)<br/>`en-ZA-LukeNeural` (Male) |
5656
| `es-AR` | Spanish (Argentina) | `es-AR-ElenaNeural` (Female)<br/>`es-AR-TomasNeural` (Male) |
5757
| `es-BO` | Spanish (Bolivia) | `es-BO-SofiaNeural` (Female)<br/>`es-BO-MarceloNeural` (Male) |
@@ -147,7 +147,7 @@ ms.author: eur
147147
| `vi-VN` | Vietnamese (Vietnam) | `vi-VN-HoaiMyNeural` (Female)<br/>`vi-VN-NamMinhNeural` (Male) |
148148
| `wuu-CN` | Chinese (Wu, Simplified) | `wuu-CN-XiaotongNeural`<sup>2</sup> (Female)<br/>`wuu-CN-YunzheNeural`<sup>2</sup> (Male) |
149149
| `yue-CN` | Chinese (Cantonese, Simplified) | `yue-CN-XiaoMinNeural`<sup>1,2</sup> (Female)<br/>`yue-CN-YunSongNeural`<sup>1,2</sup> (Male) |
150-
| `zh-CN` | Chinese (Mandarin, Simplified) | `zh-CN-XiaoxiaoNeural` (Female)<br/>`zh-CN-YunxiNeural` (Male)<br/>`zh-CN-YunjianNeural` (Male)<br/>`zh-CN-XiaoyiNeural` (Female)<br/>`zh-CN-YunyangNeural` (Male)<br/>`zh-CN-XiaochenNeural` (Female)<br/>`zh-CN-XiaohanNeural` (Female)<br/>`zh-CN-XiaomengNeural` (Female)<br/>`zh-CN-XiaomoNeural` (Female)<br/>`zh-CN-XiaoqiuNeural` (Female)<br/>`zh-CN-XiaoruiNeural` (Female)<br/>`zh-CN-XiaoshuangNeural` (Female, Child)<br/>`zh-CN-XiaoxuanNeural` (Female)<br/>`zh-CN-XiaoyanNeural` (Female)<br/>`zh-CN-XiaoyouNeural` (Female, Child)<br/>`zh-CN-XiaozhenNeural` (Female)<br/>`zh-CN-YunfengNeural` (Male)<br/>`zh-CN-YunhaoNeural` (Male)<br/>`zh-CN-YunxiaNeural` (Male)<br/>`zh-CN-YunyeNeural` (Male)<br/>`zh-CN-YunzeNeural` (Male)<br/>`zh-CN-XiaochenMultilingualNeural`<sup>1</sup> (Female)<br/>`zh-CN-XiaorouNeural`<sup>1</sup> (Female)<br/>`zh-CN-XiaoxiaoDialectsNeural`<sup>1</sup> (Female)<br/>`zh-CN-YunjieNeural`<sup>1</sup> (Male)<br/>`zh-CN-YunyiMultilingualNeural`<sup>1</sup> (Male) |
150+
| `zh-CN` | Chinese (Mandarin, Simplified) | `zh-CN-XiaoxiaoNeural` (Female)<br/>`zh-CN-YunxiNeural` (Male)<br/>`zh-CN-YunjianNeural` (Male)<br/>`zh-CN-XiaoyiNeural` (Female)<br/>`zh-CN-YunyangNeural` (Male)<br/>`zh-CN-XiaochenNeural` (Female)<br/>`zh-CN-XiaohanNeural` (Female)<br/>`zh-CN-XiaomengNeural` (Female)<br/>`zh-CN-XiaomoNeural` (Female)<br/>`zh-CN-XiaoqiuNeural` (Female)<br/>`zh-CN-XiaoruiNeural` (Female)<br/>`zh-CN-XiaoshuangNeural` (Female, Child)<br/>`zh-CN-XiaoxuanNeural` (Female)<br/>`zh-CN-XiaoyanNeural` (Female)<br/>`zh-CN-XiaoyouNeural` (Female, Child)<br/>`zh-CN-XiaozhenNeural` (Female)<br/>`zh-CN-YunfengNeural` (Male)<br/>`zh-CN-YunhaoNeural` (Male)<br/>`zh-CN-YunxiaNeural` (Male)<br/>`zh-CN-YunyeNeural` (Male)<br/>`zh-CN-YunzeNeural` (Male)<br/>`zh-CN-XiaochenMultilingualNeural`<sup>1</sup> (Female)<br/>`zh-CN-XiaorouNeural`<sup>1</sup> (Female)<br/>`zh-CN-XiaoxiaoDialectsNeural`<sup>1</sup> (Female)<br/>`zh-CN-XiaoxiaoMultilingualNeural`<sup>1</sup> (Female)<br/>`zh-CN-YunjieNeural`<sup>1</sup> (Male)<br/>`zh-CN-YunyiMultilingualNeural`<sup>1</sup> (Male) |
151151
| `zh-CN-GUANGXI` | Chinese (Guangxi Accent Mandarin, Simplified) | `zh-CN-guangxi-YunqiNeural`<sup>1,2</sup> (Male) |
152152
| `zh-CN-henan` | Chinese (Zhongyuan Mandarin Henan, Simplified) | `zh-CN-henan-YundengNeural`<sup>2</sup> (Male) |
153153
| `zh-CN-liaoning` | Chinese (Northeastern Mandarin, Simplified) | `zh-CN-liaoning-XiaobeiNeural`<sup>1,2</sup> (Female)<br/>`zh-CN-liaoning-YunbiaoNeural`<sup>1,2</sup> (Male) |

articles/aks/resize-node-pool.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -241,9 +241,6 @@ By default, your cluster has AKS_managed pod disruption budgets (such as `coredn
241241

242242
To delete the existing node pool, use the Azure portal or the [az aks nodepool delete][az-aks-nodepool-delete] command:
243243

244-
> [!IMPORTANT]
245-
> When you delete a node pool, AKS doesn't perform cordon and drain. To minimize the disruption of rescheduling pods currently running on the node pool you are going to delete, perform a cordon and drain on all nodes in the node pool before deleting.
246-
247244
```azurecli-interactive
248245
az aks nodepool delete \
249246
--resource-group myResourceGroup \

articles/api-management/self-hosted-gateway-settings-reference.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,12 @@ This guidance helps you provide the required information to define how to authen
114114

115115
## Sovereign clouds
116116

117-
Here is an overview of settings that need to be configured to be able to work with sovereign clouds
117+
Here is an overview of settings that need to be configured to be able to work with sovereign clouds:
118118

119119
| Name | Public | Azure China | US Government |
120120
|-----------------------------------|------------------------------------------------|--------------------------------------|----------------|
121121
| config.service.auth.tokenAudience | `https://azure-api.net/configuration` (Default) | `https://azure-api.cn/configuration` | `https://azure-api.us/configuration` |
122+
| logs.applicationinsights.endpoint | `https://dc.services.visualstudio.com/v2/track` (Default) | `https://dc.applicationinsights.azure.cn/v2/track` | `https://dc.applicationinsights.us/v2/track` |
122123

123124
## How to configure settings
124125

articles/azure-app-configuration/enable-dynamic-configuration-java-spring-app.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ Then, open the *pom.xml* file in a text editor and add a `<dependency>` for `spr
123123
<dependency>
124124
<groupId>com.azure.spring</groupId>
125125
<artifactId>spring-cloud-azure-appconfiguration-config-web</artifactId>
126-
<version>5.4.0</version>
126+
<version>5.8.0</version>
127127
</dependency>
128128
```
129129
@@ -133,7 +133,7 @@ Then, open the *pom.xml* file in a text editor and add a `<dependency>` for `spr
133133
<dependency>
134134
<groupId>com.azure.spring</groupId>
135135
<artifactId>spring-cloud-azure-appconfiguration-config-web</artifactId>
136-
<version>4.10.0</version>
136+
<version>4.14.0</version>
137137
</dependency>
138138
```
139139

articles/azure-app-configuration/enable-dynamic-configuration-java-spring-push-refresh.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ In this tutorial, you learn how to:
7070
<dependency>
7171
<groupId>com.azure.spring</groupId>
7272
<artifactId>spring-cloud-azure-dependencies</artifactId>
73-
<version>5.5.0</version>
73+
<version>5.8.0</version>
7474
<type>pom</type>
7575
<scope>import</scope>
7676
</dependency>
@@ -84,7 +84,6 @@ In this tutorial, you learn how to:
8484
<dependency>
8585
<groupId>com.azure.spring</groupId>
8686
<artifactId>spring-cloud-azure-appconfiguration-config-web</artifactId>
87-
<version>4.10.0</version>
8887
</dependency>
8988

9089
<!-- Adds the Ability to Push Refresh -->
@@ -98,7 +97,7 @@ In this tutorial, you learn how to:
9897
<dependency>
9998
<groupId>com.azure.spring</groupId>
10099
<artifactId>spring-cloud-azure-dependencies</artifactId>
101-
<version>4.11.0</version>
100+
<version>4.14.0</version>
102101
<type>pom</type>
103102
<scope>import</scope>
104103
</dependency>
@@ -115,7 +114,7 @@ In this tutorial, you learn how to:
115114
mvn com.microsoft.azure:azure-webapp-maven-plugin:2.5.0:config
116115
```
117116

118-
1. Open bootstrap.properties and configure Azure App Configuration Push Refresh and Azure Service Bus
117+
1. Open bootstrap.properties and configure Azure App Configuration Push Refresh.
119118

120119
```properties
121120
# Azure App Configuration Properties
@@ -201,7 +200,10 @@ Event Grid Web Hooks require validation on creation. You can validate by followi
201200
:::image type="content" source="./media/event-subscription-view-webhook.png" alt-text="Web Hook shows up in a table on the bottom of the page." :::
202201
203202
> [!NOTE]
204-
> When subscribing for configuration changes, one or more filters can be used to reduce the number of events sent to your application. These can be configured either as [Event Grid subscription filters](../event-grid/event-filtering.md) or [Service Bus subscription filters](../service-bus-messaging/topic-filters.md). For example, a subscription filter can be used to only subscribe to events for changes in a key that starts with a specific string.
203+
> When subscribing for configuration changes, one or more filters can be used to reduce the number of events sent to your application. These can be configured either as [Event Grid subscription filters](../event-grid/event-filtering.md). For example, a subscription filter can be used to only subscribe to events for changes in a key that starts with a specific string.
204+
205+
> [!NOTE]
206+
> If you have multiple instances of your application running, you can use the `appconfiguration-refresh-bus` endpoint which requires setting up Azure Service Bus, which is used to send a message to all instances of your application to refresh their configuration. This is useful if you have multiple instances of your application running and want to ensure that all instances are updated with the latest configuration. This endpoint isn't available unless you have `spring-cloud-bus` as a dependency with it configured. See the [Azure Service Bus Spring Cloud Bus documentation](/azure/developer/java/spring-framework/using-service-bus-in-spring-applications) for more information. The service bus connection only needs to be set up and the Azure App Configuration library will handle sending and receiving the messages.
205207
206208
## Verify and test application
207209

articles/azure-app-configuration/howto-convert-to-the-new-spring-boot.md

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ All of the group and artifact IDs in the Azure libraries for Spring Boot have be
4545
<dependency>
4646
<groupId>com.azure.spring</groupId>
4747
<artifactId>spring-cloud-azure-dependencies</artifactId>
48-
<version>5.5.0</version>
48+
<version>5.8.0</version>
4949
<type>pom</type>
5050
<scope>import</scope>
5151
</dependency>
@@ -78,7 +78,7 @@ All of the group and artifact IDs in the Azure libraries for Spring Boot have be
7878
<dependency>
7979
<groupId>com.azure.spring</groupId>
8080
<artifactId>spring-cloud-azure-dependencies</artifactId>
81-
<version>4.11.0</version>
81+
<version>4.14.0</version>
8282
<type>pom</type>
8383
<scope>import</scope>
8484
</dependency>
@@ -120,6 +120,37 @@ spring.cloud.azure.appconfiguration.stores[0].monitoring.feature-flag-refresh-in
120120

121121
The property `spring.cloud.azure.appconfiguration.stores[0].feature-flags.label` has been removed. Instead, you can use `spring.cloud.azure.appconfiguration.stores[0].feature-flags.selects[0].label-filter` to specify a label filter.
122122

123+
## Using Client Customizers
124+
125+
`ConfigurationClientCustomizer` and `SecretClientCustomizer` are used to customize the `ConfigurationClient` and `SecretClient` instances. You can use them to modify the clients before they're used to connect to App Configuration. This allows for using any credential type supported by the [Azure Identity library](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/identity/azure-identity/README.md#credential-classes). You can also modify the clients to set a custom `HttpClient` or `HttpPipeline`.
126+
127+
```java
128+
import com.azure.core.credential.TokenCredential;
129+
import com.azure.data.appconfiguration.ConfigurationClientBuilder;
130+
import com.azure.identity.AzureCliCredential;
131+
import com.azure.identity.AzureCliCredentialBuilder;
132+
import com.azure.identity.ChainedTokenCredential;
133+
import com.azure.identity.ChainedTokenCredentialBuilder;
134+
import com.azure.identity.EnvironmentCredentialBuilder;
135+
import com.azure.identity.ManagedIdentityCredential;
136+
import com.azure.identity.ManagedIdentityCredentialBuilder;
137+
import com.azure.spring.cloud.appconfiguration.config.ConfigurationClientCustomizer;
138+
139+
public class ConfigurationClientCustomizerImpl implements ConfigurationClientCustomizer {
140+
141+
@Override
142+
public void customize(ConfigurationClientBuilder builder, String endpoint) {
143+
AzureCliCredential cliCredential = new AzureCliCredentialBuilder().build();
144+
String managedIdentityClientId = System.getenv("MANAGED_IDENTITY_CLIENT_ID");
145+
ManagedIdentityCredential managedIdentityCredential = new ManagedIdentityCredentialBuilder()
146+
.clientId(managedIdentityClientId).build();
147+
ChainedTokenCredential credential = new ChainedTokenCredentialBuilder().addLast(cliCredential)
148+
.addLast(managedIdentityCredential).build();
149+
builder.credential(credential);
150+
}
151+
}
152+
```
153+
123154
## Possible conflicts with Spring Cloud Azure global properties
124155

125156
[Spring Cloud Azure common configuration properties](/azure/developer/java/spring-framework/configuration) enable you to customize your connections to Azure services. The new App Configuration library will pick up any global or App Configuration setting that's configured with Spring Cloud Azure common configuration properties. Your connection to App Configuration will change if the configurations are set for another Spring Cloud Azure library.

0 commit comments

Comments
 (0)