Skip to content

Commit aea9f64

Browse files
authored
Merge branch 'MicrosoftDocs:main' into nzthiagopatch1
2 parents ef4242f + 6502e97 commit aea9f64

File tree

56 files changed

+849
-1459
lines changed

Some content is hidden

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

56 files changed

+849
-1459
lines changed

.openpublishing.redirection.json

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,40 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/cdn/cdn-traffic-manager.md",
5+
"redirect_url": "/previous-versions/azure/cdn/cdn-traffic-manager",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "articles/frontdoor/quickstart-create-front-door.md",
10+
"redirect_url": "/previous-versions/azure/frontdoor/quickstart-create-front-door",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "articles/frontdoor/quickstart-create-front-door-terraform.md",
15+
"redirect_url": "/previous-versions/azure/frontdoor/quickstart-create-front-door-terraform",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path": "articles/frontdoor/quickstart-create-front-door-template.md",
20+
"redirect_url": "/previous-versions/azure/frontdoor/quickstart-create-front-door-template",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path": "articles/frontdoor/quickstart-create-front-door-powershell.md",
25+
"redirect_url": "/previous-versions/azure/frontdoor/quickstart-create-front-door-powershell",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path": "articles/frontdoor/quickstart-create-front-door-cli.md",
30+
"redirect_url": "/previous-versions/azure/frontdoor/quickstart-create-front-door-cli",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path": "articles/frontdoor/quickstart-create-front-door-bicep.md",
35+
"redirect_url": "/previous-versions/azure/frontdoor/quickstart-create-front-door-bicep",
36+
"redirect_document_id": false
37+
},
338
{
439
"source_path": "articles/cloud-services/cloud-services-application-and-service-availability-faq.yml",
540
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-application-and-service-availability-faq",

articles/app-service/samples-terraform.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,5 @@ The following table includes links to Terraform scripts.
2020
|**Create app**||
2121
| [Create two apps and connect securely with Private Endpoint and VNet integration](./scripts/terraform-secure-backend-frontend.md)| Creates two App Service apps and connect apps together with Private Endpoint and VNet integration. |
2222
| [Provision App Service and use slot swap to deploy](/azure/developer/terraform/provision-infrastructure-using-azure-deployment-slots)| Provision App Service infrastructure with Azure deployment slots. |
23-
| [Create an Azure Windows web app with a backup](./scripts/terraform-backup.md)| Create an Azure Windows web app with a backup schedule. |
23+
| [Create an Azure Windows web app with a backup](./scripts/terraform-backup.md)| Create an Azure Windows web app with a backup schedule. |
24+
| [Create a Windows container app on App Service](/azure/app-service/provision-resource-terraform?tabs=windows-container)| Create an Azure Windows web app with a backup schedule. |

articles/azure-health-insights/radiology-insights/get-started.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ ms.author: janschietse
1717
This quickstart provides an overview on how to use the Radiology Insights.
1818

1919
## Prerequisites
20-
To use the Radiology Insights (Preview) model, you must have an Azure AI Health Insights service created.
20+
To use the Radiology Insights model, you must have an Azure AI Health Insights service created.
2121

2222
If you have no Azure AI Health Insights service, see [Deploy Azure AI Health Insights using the Azure portal.](../deploy-portal.md)
23+
If you have an Azure AI Health Insights service, you must link it to an Azure AI Language resource to enable Text Analytics for Health by the Health Insight AI models.
2324

2425
Once deployment is complete, you use the Azure portal to navigate to the newly created Azure AI Health Insights service to see the details, including your Service URL.
2526
The Service URL to access your service is: https://```YOUR-NAME```.cognitiveservices.azure.com.

articles/azure-resource-manager/bicep/toc.yml

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ items:
44
- name: Overview
55
items:
66
- name: What is Bicep?
7-
href: overview.md
87
displayName: benefits,faq,playground
8+
href: overview.md
99
- name: Compare JSON and Bicep
1010
href: compare-template-syntax.md
1111
- name: Frequently asked questions
1212
href: frequently-asked-questions.yml
1313
- name: Install
1414
items:
1515
- name: Install Bicep tools
16-
href: install.md
1716
displayName: nightly
17+
href: install.md
1818
- name: Troubleshoot installation
1919
href: installation-troubleshoot.md
2020
- name: Quickstarts
@@ -44,8 +44,8 @@ items:
4444
displayName: continuous, ci, cd, CI/CD
4545
href: deploy-github-actions.md
4646
- name: Bicep with MSBuild
47-
href: msbuild-bicep-file.md
4847
displayName: continuous, ci, cd, CI/CD
48+
href: msbuild-bicep-file.md
4949
- name: Tutorials
5050
items:
5151
- name: Learn modules for Bicep
@@ -208,8 +208,6 @@ items:
208208
href: ../../firewall-manager/quick-firewall-policy-bicep.md?toc=/azure/azure-resource-manager/bicep/toc.json
209209
- name: Firewall Manager - virtual hub
210210
href: ../../firewall-manager/quick-secure-virtual-hub-bicep.md?toc=/azure/azure-resource-manager/bicep/toc.json
211-
- name: Front Door
212-
href: ../../frontdoor/quickstart-create-front-door-bicep.md?toc=/azure/azure-resource-manager/bicep/toc.json
213211
- name: Front Door - Standard/Premium
214212
href: ../../frontdoor/create-front-door-bicep.md?toc=/azure/azure-resource-manager/bicep/toc.json
215213
- name: Load Balancer - internal
@@ -255,30 +253,29 @@ items:
255253
- name: SignalR Service
256254
href: ../../azure-signalr/signalr-quickstart-azure-signalr-service-bicep.md?toc=/azure/azure-resource-manager/bicep/toc.json
257255
- name: Concepts
258-
expanded: true
259256
items:
260257
- name: Bicep file
261-
href: file.md
262258
displayName: parameters,variables,resources,outputs,condition,syntax
259+
href: file.md
263260
- name: Data types
264-
href: data-types.md
265261
displayName: supported types,arrays,booleans,integers,objects,strings,secure,interpolation
262+
href: data-types.md
266263
- name: Parameters (param)
267-
href: parameters.md
268264
displayName: decorators,secure,objects,constraints
265+
href: parameters.md
269266
- name: Variables (var)
270-
href: variables.md
271267
displayName: configuration
268+
href: variables.md
272269
- name: Resources (resource)
273270
href: resource-declaration.md
274271
- name: Outputs (output)
275-
href: outputs.md
276272
displayName: dynamic number of outputs,modules
273+
href: outputs.md
277274
- name: Modules (module)
275+
displayName: scopes,consume,registry,module registry,private module registry,public module registry,avm,azure verified modules
278276
href: modules.md
279-
displayName: scopes,consume,registry,module registry,private module registry,public module registry,avm,azure verified modules
280277
- name: Using (using)
281-
displayName: avm,azure verified modules
278+
displayName: avm,azure verified modules
282279
href: bicep-using.md
283280
- name: Import (import)
284281
href: bicep-import.md
@@ -291,33 +288,33 @@ items:
291288
- name: Existing resources (existing)
292289
href: existing-resource.md
293290
- name: Child resources (parent)
294-
href: child-resource-name-type.md
295291
displayName: parent,parent resource,sub,nested
292+
href: child-resource-name-type.md
296293
- name: Extension resources (scope)
297294
href: scope-extension-resources.md
298295
- name: Dependencies (dependsOn)
299296
href: resource-dependencies.md
300297
- name: Loops (for)
301-
href: loops.md
302298
displayName: multiple
299+
href: loops.md
303300
- name: Conditions (if)
304301
href: conditional-resource-deployment.md
305302
- name: Extension (extension)
306303
href: bicep-extension.md
307304
- name: Scopes (targetScope)
308305
items:
309306
- name: Resource group
310-
href: deploy-to-resource-group.md
311307
displayName: deployment commands,multiple resource groups,scope
308+
href: deploy-to-resource-group.md
312309
- name: Subscription
313-
href: deploy-to-subscription.md
314310
displayName: Azure Policy,policy,access control,scope
311+
href: deploy-to-subscription.md
315312
- name: Management group
316-
href: deploy-to-management-group.md
317313
displayName: policy,Azure Policy,scope
314+
href: deploy-to-management-group.md
318315
- name: Tenant
319-
href: deploy-to-tenant.md
320316
displayName: assign role,scope
317+
href: deploy-to-tenant.md
321318
- name: Functions
322319
items:
323320
- name: All functions
@@ -382,8 +379,9 @@ items:
382379
href: operators-numeric.md
383380
- name: Safe-dereference operator
384381
href: operator-safe-dereference.md
385-
- name: Spread
382+
- name: Spread
386383
href: operator-spread.md
384+
expanded: true
387385
- name: How to
388386
items:
389387
- name: Author
@@ -394,8 +392,8 @@ items:
394392
displayName: vscode,vs code,deployment pane
395393
href: visual-studio-code.md
396394
- name: Private module registry
397-
href: private-module-registry.md
398395
displayName: module registry,private module registry
396+
href: private-module-registry.md
399397
- name: Deployment script
400398
items:
401399
- name: Use deployment script resource
@@ -577,8 +575,8 @@ items:
577575
- name: Deploy
578576
items:
579577
- name: What-if check
580-
href: deploy-what-if.md
581578
displayName: whatif, what if
579+
href: deploy-what-if.md
582580
- name: Deploy - VS Code
583581
displayName: visual studio code,vscode
584582
href: deploy-vscode.md
@@ -588,7 +586,7 @@ items:
588586
href: deploy-powershell.md
589587
- name: Deploy - Cloud Shell
590588
href: deploy-cloud-shell.md
591-
- name: Export
589+
- name: Export
592590
items:
593591
- name: Portal
594592
href: export-bicep-portal.md
@@ -606,9 +604,9 @@ items:
606604
- name: Recommended workflow
607605
href: migrate.md
608606
- name: Decompile
609-
href: decompile.md
610607
displayName: conversion issues,export,convert,playground
611-
- name: Blueprint to deployment stack
608+
href: decompile.md
609+
- name: Blueprint to deployment stack
612610
href: migrate-blueprint.md
613611
- name: Contribute to Bicep
614612
href: contribute.md
@@ -617,11 +615,11 @@ items:
617615
- name: Resource reference
618616
href: /azure/templates/
619617
- name: Bicep CLI
620-
href: bicep-cli.md
621618
displayName: build,decompile,install,list-versions,list versions,upgrade,version,module,registry
619+
href: bicep-cli.md
622620
- name: Azure PowerShell
623621
href: /powershell/module/az.resources/
624-
- name: Bicep core diagnostics
622+
- name: Bicep core diagnostics
625623
items:
626624
- name: All codes
627625
href: bicep-core-diagnostics.md
@@ -648,7 +646,7 @@ items:
648646
- name: BCP053
649647
href: diagnostics/bcp053.md
650648
- name: BCP055
651-
href: diagnostics/bcp055.md
649+
href: diagnostics/bcp055.md
652650
- name: BCP057
653651
href: diagnostics/bcp057.md
654652
- name: BCP062
@@ -734,7 +732,7 @@ items:
734732
- name: BCP333
735733
href: diagnostics/bcp333.md
736734
- name: BCP338
737-
href: diagnostics/bcp338.md
735+
href: diagnostics/bcp338.md
738736
- name: BCP401
739737
href: diagnostics/bcp401.md
740738
- name: BCP414

articles/azure-resource-manager/templates/toc.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ items:
5555
displayName: template specs
5656
href: template-specs-deploy-linked-template.md
5757
- name: Create portal form
58-
href: template-specs-create-portal-forms.md
5958
displayName: UI,form,blade
59+
href: template-specs-create-portal-forms.md
6060
- name: Advanced templates
6161
items:
6262
- name: Use template reference
@@ -246,8 +246,6 @@ items:
246246
href: ../../firewall-manager/quick-firewall-policy.md?toc=/azure/azure-resource-manager/template/toc.json
247247
- name: Firewall Manager - virtual hub
248248
href: ../../firewall-manager/quick-secure-virtual-hub.md?toc=/azure/azure-resource-manager/templates/toc.json
249-
- name: Front Door
250-
href: ../../frontdoor/quickstart-create-front-door-template.md?toc=/azure/azure-resource-manager/templates/toc.json
251249
- name: Front Door - Standard/Premium
252250
href: ../../frontdoor/create-front-door-template.md?toc=/azure/azure-resource-manager/templates/toc.json
253251
- name: Load Balancer - internal

articles/batch/batch-automatic-scaling.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Autoscale compute nodes in an Azure Batch pool
33
description: Enable automatic scaling on an Azure Batch cloud pool to dynamically adjust the number of compute nodes in the pool.
44
ms.topic: how-to
5-
ms.date: 04/02/2025
5+
ms.date: 06/05/2025
66
ms.custom: H1Hack27Feb2017, fasttrack-edit, devx-track-csharp
77
---
88

@@ -46,15 +46,15 @@ The following examples show two autoscale formulas, which can be adjusted to wor
4646

4747
#### Pending tasks
4848

49-
With this autoscale formula, the pool is initially created with a single VM. The `$PendingTasks` metric defines the number of tasks that are running or queued. The formula finds the average number of pending tasks in the last 180 seconds and sets the `$TargetDedicatedNodes` variable accordingly. The formula ensures that the target number of dedicated nodes never exceeds 25 VMs. As new tasks are submitted, the pool automatically grows. As tasks complete, VMs become free and the autoscaling formula shrinks the pool.
49+
With this autoscale formula, the pool is initially created with a single VM. The `$PendingTasks` metric defines the number of tasks that are running or queued. The formula finds the average number of pending tasks in the last 15 minutes and sets the `$TargetDedicatedNodes` variable accordingly. The formula ensures that the target number of dedicated nodes never exceeds 25 VMs. As new tasks are submitted, the pool automatically grows. As tasks complete, VMs become free and the autoscaling formula shrinks the pool.
5050

5151
This formula scales dedicated nodes, but can be modified to apply to scale Spot nodes as well.
5252

5353
```
5454
startingNumberOfVMs = 1;
5555
maxNumberofVMs = 25;
56-
pendingTaskSamplePercent = $PendingTasks.GetSamplePercent(180 * TimeInterval_Second);
57-
pendingTaskSamples = pendingTaskSamplePercent < 70 ? startingNumberOfVMs : avg($PendingTasks.GetSample(180 * TimeInterval_Second));
56+
pendingTaskSamplePercent = $PendingTasks.GetSamplePercent(TimeInterval_Minute * 15);
57+
pendingTaskSamples = pendingTaskSamplePercent < 70 ? startingNumberOfVMs : avg($PendingTasks.GetSample(TimeInterval_Minute * 15));
5858
$TargetDedicatedNodes=min(maxNumberofVMs, pendingTaskSamples);
5959
$NodeDeallocationOption = taskcompletion;
6060
```

0 commit comments

Comments
 (0)