Skip to content

Commit d4860fc

Browse files
authored
Merge pull request #268932 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 83d3f59 + 88aef27 commit d4860fc

File tree

9 files changed

+40
-22
lines changed

9 files changed

+40
-22
lines changed

articles/ai-services/openai/reference.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1013,6 +1013,7 @@ POST https://{your-resource-name}.openai.azure.com/openai/deployments/{deploymen
10131013
| `quality` | string | Optional | `standard` | The quality of the generated images. Must be `hd` or `standard`. |
10141014
| `response_format` | string | Optional | `url` | The format in which the generated images are returned Must be `url` (a URL pointing to the image) or `b64_json` (the base 64-byte code in JSON format). |
10151015
| `style` | string | Optional | `vivid` | The style of the generated images. Must be `natural` or `vivid` (for hyper-realistic / dramatic images). |
1016+
| `user` | string | Optional || A unique identifier representing your end-user, which can help to monitor and detect abuse. |
10161017

10171018

10181019
#### Example request

articles/ai-services/openai/whisper-quickstart.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ The file size limit for the Azure OpenAI Whisper model is 25 MB. If you need to
2424

2525
- An Azure subscription - [Create one for free](https://azure.microsoft.com/free/cognitive-services?azure-portal=true).
2626
- Access granted to Azure OpenAI Service in the desired Azure subscription.
27-
- An Azure OpenAI resource created in the North Central US or West Europe regions with the `whisper` model deployed. For more information, see [Create a resource and deploy a model with Azure OpenAI](how-to/create-resource.md).
27+
- An Azure OpenAI resource with a `whisper` model deployed in a supported region. [Whisper model regional availability](./concepts/models.md#whisper-models). For more information, see [Create a resource and deploy a model with Azure OpenAI](how-to/create-resource.md).
2828

2929
> [!NOTE]
3030
> Currently, you must submit an application to access Azure OpenAI Service. To apply for access, complete [this form](https://aka.ms/oai/access).

articles/azure-arc/servers/run-command.md

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,14 @@ New-AzMachineRunCommand -ResourceGroupName MyRG0 -MachineName MyMachine -RunComm
180180

181181
> [!NOTE]
182182
> SAS URL must provide read access to the blob. An expiry time of 24 hours is suggested for SAS URL. SAS URLs can be generated on Azure portal using blob options or SAS token using `New-AzStorageBlobSASToken`. If generating SAS token using `New-AzStorageBlobSASToken`, the SAS URL format is: base blob URL + "?" + the SAS token from `New-AzStorageBlobSASToken`.
183-
>
183+
184+
185+
### Create or update Run Command on a machine using ScriptLocalPath (local script file)
186+
Create or update Run Command on a machine using a local script file that is on the client machine where cmdlet is executed.
187+
188+
```powershell
189+
New-AzMachineRunCommand -ResourceGroupName MyRG0 -VMName MyMachine -RunCommandName MyRunCommand -Location EastUS2EUAP -ScriptLocalPath "C:\MyScriptsDir\MyScript.ps1"
190+
```
184191

185192
### Create or update Run Command on a machine instance using Parameter and ProtectedParameter parameters (Public and Protected Parameters to script)
186193

@@ -224,19 +231,21 @@ Start off by creating a Run Command script to provide endpoint access to the `ww
224231

225232
To directly provide the script in line, use the following operation:
226233

227-
```
234+
```rest
228235
PUT https://management.azure.com/subscriptions/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa/resourceGroups/ContosoRG/providers/Microsoft.HybridCompute/machines/2012DatacenterServer1/runCommands/EndpointAccessCommand?api-version=2023-10-03-preview
236+
```
229237

238+
```json
230239
{
231240
"location": "eastus2",
232241
"properties": {
233242
"source": {
234-
"script": " New-NetFirewallRule -DisplayName $ruleName -Direction Outbound -Action Allow -RemoteAddress $endpoint -RemotePort $port -Protocol $protocol
243+
"script": "New-NetFirewallRule -DisplayName $ruleName -Direction Outbound -Action Allow -RemoteAddress $endpoint -RemotePort $port -Protocol $protocol"
235244
},
236245
"parameters": [
237246
{
238247
"name": "ruleName",
239-
"value": " Allow access to www.microsoft.com/pkiops/certs"
248+
"value": "Allow access to www.microsoft.com/pkiops/certs"
240249
},
241250
{
242251
"name": "endpoint",
@@ -254,7 +263,7 @@ PUT https://management.azure.com/subscriptions/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaa
254263
],
255264
"asyncExecution": false,
256265
"runAsUser": "contoso-user1",
257-
"runAsPassword": "Contoso123!
266+
"runAsPassword": "Contoso123!"
258267
"timeoutInSeconds": 3600,
259268
"outputBlobUri": "https://mystorageaccount.blob.core.windows.net/myscriptoutputcontainer/MyScriptoutput.txt",
260269
"errorBlobUri": "https://mystorageaccount.blob.core.windows.net/mycontainer/MyScriptError.txt"
@@ -264,9 +273,11 @@ PUT https://management.azure.com/subscriptions/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaa
264273

265274
To instead link to the script file, you can use the Run Command operation’s ScriptURI option. For this it's assumed you have prepared a `newnetfirewallrule.ps1` file containing the in-line script and uploaded this script to blob storage.
266275

267-
```
276+
```rest
268277
PUT https://management.azure.com/subscriptions/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa/resourceGroups/ContosoRG/providers/Microsoft.HybridCompute/machines/2012DatacenterServer1/runCommands/EndpointAccessCommand?api-version=2023-10-03-preview
278+
```
269279

280+
```json
270281
{
271282
"location": "eastus2",
272283
"properties": {
@@ -294,7 +305,7 @@ PUT https://management.azure.com/subscriptions/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaa
294305
],
295306
"asyncExecution": false,
296307
"runAsUser": "contoso-user1",
297-
"runAsPassword": "Contoso123!
308+
"runAsPassword": "Contoso123!"
298309
"timeoutInSeconds": 3600,
299310
"outputBlobUri": "https://mystorageaccount.blob.core.windows.net/myscriptoutputcontainer/MyScriptoutput.txt",
300311
"errorBlobUri": "https://mystorageaccount.blob.core.windows.net/mycontainer/MyScriptError.txt"
@@ -304,13 +315,13 @@ PUT https://management.azure.com/subscriptions/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaa
304315

305316
SAS URL must provide read access to the blob. An expiry time of 24 hours is suggested for SAS URL. SAS URLs can be generated on Azure portal using blobs options or SAS token using `New-AzStorageBlobSASToken`. If generating SAS token using `New-AzStorageBlobSASToken`, the SAS URL format is: `base blob URL + "?"` + the SAS token from `New-AzStorageBlobSASToken`.
306317

307-
Output and error blobs must be the AppendBlob type and their SAS URLs must provide read, append, create, write access to the blob. An expiration time of 24 hours is suggested for SAS URL. SAS URLs can be generated on Azure portal using blob's options, or SAS token from using New-`AzStorageBlobSASToken`.
318+
Output and error blobs must be the AppendBlob type and their SAS URLs must provide read, append, create, write access to the blob. An expiration time of 24 hours is suggested for SAS URL. SAS URLs can be generated on Azure portal using blob's options, or SAS token from using `New-AzStorageBlobSASToken`.
308319

309320
### Example 2: Get Run Command details
310321

311322
To verify that you've correctly provisioned the Run Command, use the GET command to retrieve details on the provisioned Run Command:
312323

313-
```
324+
```rest
314325
GET https://management.azure.com/subscriptions/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa/resourceGroups/ContosoRG/providers/Microsoft.HybridCompute/machines/2012DatacenterServer1/runCommands/EndpointAccessCommand?api-version=2023-10-03-preview
315326
```
316327

@@ -319,23 +330,25 @@ GET https://management.azure.com/subscriptions/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaa
319330
Let’s suppose you want to open up access to an additional endpoint `*.waconazure.com` for connectivity to Windows Admin Center. You can update the existing Run Command with new parameters:
320331

321332

322-
```
333+
```rest
323334
PATCH https://management.azure.com/subscriptions/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa/resourceGroups/ContosoRG/providers/Microsoft.HybridCompute/machines/2012DatacenterServer1/runCommands/EndpointAccessCommand?api-version=2023-10-03-preview
335+
```
324336

337+
```json
325338
{
326339
"location": "eastus2",
327340
"properties": {
328341
"source": {
329-
"script": " New-NetFirewallRule -DisplayName $ruleName -Direction Outbound -Action Allow -RemoteAddress $endpoint -RemotePort $port -Protocol $protocol
342+
"script": "New-NetFirewallRule -DisplayName $ruleName -Direction Outbound -Action Allow -RemoteAddress $endpoint -RemotePort $port -Protocol $protocol"
330343
},
331344
"parameters": [
332345
{
333346
"name": "ruleName",
334-
"value": " Allow access to WAC endpoint"
347+
"value": "Allow access to WAC endpoint"
335348
},
336349
{
337350
"name": "endpoint",
338-
"value": *.waconazure.com
351+
"value": "*.waconazure.com"
339352
},
340353
{
341354
"name": "port",
@@ -361,15 +374,15 @@ PATCH https://management.azure.com/subscriptions/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaa
361374

362375
Ahead of deleting the Run Command for Endpoint Access, make sure there are no other Run Commands for the Arc-enabled server. You can use the list command to get all of the Run Commands:
363376

364-
```
377+
```rest
365378
LIST https://management.azure.com/subscriptions/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa/resourceGroups/ContosoRG/providers/Microsoft.HybridCompute/machines/2012DatacenterServer1/runCommands/
366379
```
367380

368381
### Example 5: Delete a Run Command
369382

370383
If you no longer need the Run Command extension, you can delete it using the following command:
371384

372-
```
385+
```rest
373386
DELETE https://management.azure.com/subscriptions/ aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa/resourceGroups/ContosoRG/providers/Microsoft.HybridCompute/machines/2012DatacenterServer1/runCommands/EndpointAccessCommand?api-version=2023-10-03-preview
374387
```
375388

articles/azure-functions/durable/durable-functions-dotnet-isolated-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public class MyActivity : TaskActivity<string, string>
6161
{
6262
private readonly ILogger logger;
6363

64-
public MyActivity(ILogger<SayHelloTyped> logger) // activites have access to DI.
64+
public MyActivity(ILogger<MyActivity> logger) // activites have access to DI.
6565
{
6666
this.logger = logger;
6767
}

articles/azure-monitor/app/standard-metrics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.reviewer: vitalyg
99

1010
# Application Insights standard metrics
1111

12-
Standard metrics are pre-aggregated during collection, they have better performance at query time. This makes them the best choice for dashboards and real-time alerting.
12+
Standard metrics are pre-aggregated during collection, which gives them better performance at query time. This makes them the best choice for dashboards and real-time alerting.
1313

1414
[!INCLUDE [azure-monitor-app-insights-otel-available-notification](../includes/azure-monitor-app-insights-otel-available-notification.md)]
1515

articles/communication-services/concepts/call-automation/play-action.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ As part of compliance requirements in various industries, vendors are expected t
4949

5050
## Known limitations
5151
- Text-to-Speech text prompts support a maximum of 400 characters, if your prompt is longer than this we suggest using SSML for Text-to-Speech based play actions.
52-
- For scenarios where you exceed your Speech service quota limit, you can request to increase this lilmit by following the steps outlined [here](../../../ai-services/speech-service/speech-services-quotas-and-limits.md).
52+
- For scenarios where you exceed your Speech service quota limit, you can request to increase this limit by following the steps outlined [here](../../../ai-services/speech-service/speech-services-quotas-and-limits.md).
5353

5454
## Next Steps
5555
- Check out our how-to guide to learn [how-to play custom voice prompts](../../how-tos/call-automation/play-action.md) to users.

articles/communication-services/concepts/call-automation/recognize-action.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ The recognize action can be used for many reasons, here are a few examples of ho
6767
## Known limitation
6868
- In-band DTMF is not supported, use RFC 2833 DTMF instead.
6969
- Text-to-Speech text prompts support a maximum of 400 characters, if your prompt is longer than this we suggest using SSML for Text-to-Speech based play actions.
70-
- For scenarios where you exceed your Speech service quota limit, you can request to increase this lilmit by following the steps outlined [here](../../../ai-services/speech-service/speech-services-quotas-and-limits.md).
70+
- For scenarios where you exceed your Speech service quota limit, you can request to increase this limit by following the steps outlined [here](../../../ai-services/speech-service/speech-services-quotas-and-limits.md).
7171

7272
## Next steps
7373
- Check out our how-to guide to learn how you can [gather user input](../../how-tos/call-automation/recognize-action.md).

articles/defender-for-cloud/github-action.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ Microsoft Security DevOps uses the following Open Source tools:
7575
permissions:
7676
contents: read
7777
id-token: write
78+
security-events: write
7879

7980
steps:
8081

articles/synapse-analytics/spark/apache-spark-autoscale.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
22
title: Automatically scale Apache Spark instances
3-
description: Use the Azure Synapse autoscale feature to automatically scale Apache Spark Instances
3+
description: Use the Azure Synapse Analytics autoscale feature to automatically scale Apache Spark Pools
44
author: guyhay
55
ms.author: guyhay
66
ms.service: synapse-analytics
77
ms.topic: conceptual
88
ms.subservice: spark
9-
ms.date: 02/14/2023
9+
ms.date: 03/11/2024
1010
---
1111

1212
# Automatically scale Azure Synapse Analytics Apache Spark pools
@@ -94,6 +94,9 @@ During the instance scaling down process, Autoscale will put the nodes in decomm
9494

9595
The running jobs will continue to run and finish. The pending jobs will wait to be scheduled as normal with fewer available nodes.
9696

97+
> [!NOTE]
98+
> By default, spark.yarn.executor.decommission.enabled is set to true, enabling the automatic shutdown of underutilized nodes to optimize compute efficiency. If less aggressive scaling down is preferred, this configuration can be set to false.
99+
97100
## Next steps
98101

99102
Quickstart to set up a new Spark pool [Create a Spark pool](../quickstart-create-apache-spark-pool-portal.md)

0 commit comments

Comments
 (0)