Skip to content

Commit b22353c

Browse files
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into aca/config-server
2 parents a851243 + ffc2c5b commit b22353c

File tree

470 files changed

+8460
-7899
lines changed

Some content is hidden

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

470 files changed

+8460
-7899
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/ai-studio/how-to/costs-plan-manage.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,15 @@ Before you delete an Azure AI hub resource in the Azure portal or with Azure CLI
6363
- Azure AI Search (for the data)
6464
- Virtual machines
6565
- Load Balancer
66-
- Virtual Network
66+
- Azure Virtual Network
6767
- Bandwidth
6868

6969
Each VM is billed per hour it's running. Cost depends on VM specifications. VMs that are running but not actively working on a dataset will still be charged via the load balancer. For each compute instance, one load balancer is billed per day. Every 50 nodes of a compute cluster have one standard load balancer billed. Each load balancer is billed around $0.33/day. To avoid load balancer costs on stopped compute instances and compute clusters, delete the compute resource.
7070

71-
Compute instances also incur P10 disk costs even in stopped state. This is because any user content saved there's persisted across the stopped state similar to Azure VMs. We're working on making the OS disk size/ type configurable to better control costs. For virtual networks, one virtual network is billed per subscription and per region. Virtual networks can't span regions or subscriptions. Setting up private endpoints in virtual network setups might also incur charges. Bandwidth is charged by usage; the more data transferred, the more you're charged.
71+
Compute instances also incur P10 disk costs even in stopped state. This is because any user content saved there's persisted across the stopped state similar to Azure VMs. We're working on making the OS disk size/ type configurable to better control costs. For Azure Virtual Networks, one virtual network is billed per subscription and per region. Virtual networks can't span regions or subscriptions. Setting up private endpoints in virtual network setups might also incur charges. If your virtual network uses an Azure Firewall, this might also incur charges. Bandwidth is charged by usage; the more data transferred, the more you're charged.
72+
73+
> [!TIP]
74+
> Using an managed virtual network is free. However some features of the managed network rely on Azure Private Link (for private endpoints) and Azure Firewall (for FQDN rules) and will incur charges. For more information, see [Managed virtual network isolation](configure-managed-network.md#pricing).
7275
7376
### Costs might accrue after resource deletion
7477

articles/aks/ingress-tls.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.custom: devx-track-azurecli, devx-track-azurepowershell, linux-related-conten
77
author: asudbring
88
ms.author: allensu
99
ms.topic: how-to
10-
ms.date: 12/13/2023
10+
ms.date: 03/14/2024
1111
ROBOTS: NOINDEX
1212
#Customer intent: As a cluster operator or developer, I want to use TLS with an ingress controller to handle the flow of incoming traffic and secure my apps using my own certificates or automatically generated certificates.
1313
---
@@ -73,6 +73,9 @@ To use TLS with [Let's Encrypt][lets-encrypt] certificates, you'll deploy [cert-
7373
7474
* Use `Import-AzContainerRegistryImage` to import the following images into your ACR.
7575
76+
>[!NOTE]
77+
>When performing the steps to import the images into your ACR when working in Azure Government, you need to include the [`targetTag`][parameter-targettag] parameter with the value representing the tag of the image you want to import.
78+
7679
```azurepowershell
7780
$RegistryName = "<REGISTRY_NAME>"
7881
$ResourceGroup = (Get-AzContainerRegistry | Where-Object {$_.name -eq $RegistryName} ).ResourceGroupName
@@ -659,4 +662,5 @@ You can also:
659662
[acr-helm]: ../container-registry/container-registry-helm-repos.md
660663
[get-az-aks-cluster]: /powershell/module/az.aks/get-azakscluster
661664
[new-az-public-ip-address]: /powershell/module/az.network/new-azpublicipaddress
662-
[aks-app-add-on]: app-routing.md
665+
[aks-app-add-on]: app-routing.md
666+
[parameter-targettag]: /powershell/module/az.containerregistry/import-azcontainerregistryimage

articles/app-service/manage-custom-dns-buy-domain.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ App Service domains are custom domains that are managed directly in Azure. They
1717
* To use an App Service domain, the app's [App Service plan](overview-hosting-plans.md) must be a paid tier and not **Free (F1)**. See [Scale up an app](manage-scale-up.md#scale-up-your-pricing-tier) to update the tier.
1818
* [Remove the spending limit on your subscription](../cost-management-billing/manage/spending-limit.md#remove).
1919

20+
> [!NOTE]
21+
> Some subscriptions types would be required to have sufficient history on Azure prior to creating an App Service Domain.
22+
> Free trial and credit based subscriptions are not eligible to create an App Service Domain.
23+
>
24+
2025
## Buy and map an App Service domain
2126

2227
For pricing information on App Service domains, visit the [App Service Pricing page](https://azure.microsoft.com/pricing/details/app-service/windows/) and scroll down to App Service Domain.
@@ -71,7 +76,6 @@ For pricing information on App Service domains, visit the [App Service Pricing p
7176
> [!NOTE]
7277
> App Service Domains use GoDaddy for domain registration and Azure DNS to host the domains. In addition to the yearly domain registration fee, usage charges for Azure DNS apply. For information, see [Azure DNS Pricing](https://azure.microsoft.com/pricing/details/dns/).
7378
>
74-
>
7579
7680
1. When the domain registration is complete, you see a **Go to resource** button. Select it to see its management page.
7781

@@ -80,7 +84,9 @@ For pricing information on App Service domains, visit the [App Service Pricing p
8084
You're now ready to assign an App Service app to this custom domain.
8185

8286
> [!NOTE]
83-
> Depending on the subscription type, a sufficient payment history within Azure may be required prior to creating an App Service domain.
87+
> Some subscriptions types would be required to have sufficient history on Azure prior to creating an App Service Domain.
88+
> Free trial and credit based subscriptions are not eligible to create an App Service Domain.
89+
>
8490
8591
## Map a hostname manually
8692

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-functions/functions-bindings-azure-sql-trigger.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,9 +219,9 @@ public class SqlChangeToDoItem {
219219
public SqlChangeToDoItem() {
220220
}
221221

222-
public SqlChangeToDoItem(ToDoItem item, SqlChangeOperation operation) {
223-
this.item = item;
224-
this.operation = operation;
222+
public SqlChangeToDoItem(ToDoItem Item, SqlChangeOperation Operation) {
223+
this.Item = Item;
224+
this.Operation = Operation;
225225
}
226226
}
227227
```

articles/azure-functions/functions-bindings-cosmosdb-v2-output.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ This article supports both programming models.
3737
::: zone-end
3838
## Example
3939

40-
Unless otherwise noted, examples in this article target version 3.x of the [Azure Cosmos DB extension](functions-bindings-cosmosdb-v2.md). For use with extension version 4.x, you need to replace the string `collection` in property and attribute names with `container`.
40+
Unless otherwise noted, examples in this article target version 3.x of the [Azure Cosmos DB extension](functions-bindings-cosmosdb-v2.md). For use with extension version 4.x, you need to replace the string `collection` in property and attribute names with `container` and `connection_string_setting` with `connection`.
4141

4242
::: zone pivot="programming-language-csharp"
4343

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

0 commit comments

Comments
 (0)