Skip to content

Commit 1c5a41e

Browse files
authored
Merge branch 'MicrosoftDocs:main' into release-arc-data
2 parents 30e33a8 + 4fedbd9 commit 1c5a41e

File tree

5,955 files changed

+58093
-327175
lines changed

Some content is hidden

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

5,955 files changed

+58093
-327175
lines changed

.openpublishing.redirection.active-directory.json

Lines changed: 33688 additions & 33699 deletions
Large diffs are not rendered by default.

.openpublishing.redirection.api-management.json

Lines changed: 275 additions & 279 deletions
Large diffs are not rendered by default.

.openpublishing.redirection.devops-project.json

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -94,21 +94,6 @@
9494
"source_path": "articles/devops-project/retirement-and-migration.md",
9595
"redirect_url": "/previous-versions/azure/devops-project/retirement-and-migration",
9696
"redirect_document_id": false
97-
},
98-
{
99-
"source_path": "articles/virtual-machines/linux/tutorial-azure-devops-blue-green-strategy.md",
100-
"redirect_url": "/previous-versions/azure/virtual-machines/linux/tutorial-azure-devops-blue-green-strategy",
101-
"redirect_document_id": false
102-
},
103-
{
104-
"source_path": "articles/virtual-machines/linux/tutorial-azure-devops-canary-strategy.md",
105-
"redirect_url": "/previous-versions/azure/virtual-machines/linux/tutorial-azure-devops-canary-strategy",
106-
"redirect_document_id": false
107-
},
108-
{
109-
"source_path": "articles/virtual-machines/linux/tutorial-build-deploy-azure-pipelines.md",
110-
"redirect_url": "/previous-versions/azure/virtual-machines/linux/tutorial-build-deploy-azure-pipelines",
111-
"redirect_document_id": false
11297
}
11398
]
11499
}

.openpublishing.redirection.json

Lines changed: 16 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/ai-studio/how-to/commitment-tier.md",
5+
"redirect_url": "/azure/ai-services/commitment-tier.md",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path": "articles/storage/files/files-samples-dotnet-v11.md",
510
"redirect_url": "/previous-versions/azure/storage/files/files-samples-dotnet-v11",
@@ -1265,46 +1270,6 @@
12651270
"redirect_url": "/azure/cloudfoundry",
12661271
"redirect_document_id": false
12671272
},
1268-
{
1269-
"source_path_from_root": "/articles/container-instances/availability-zones.md",
1270-
"redirect_url": "/azure/reliability/reliability-containers",
1271-
"redirect_document_id": false
1272-
},
1273-
{
1274-
"source_path_from_root": "/articles/container-instances/container-instances-jenkins.md",
1275-
"redirect_url": "/azure/jenkins/container-instances-jenkins",
1276-
"redirect_document_id": false
1277-
},
1278-
{
1279-
"source_path_from_root": "/articles/container-instances/container-instances-monitor.md",
1280-
"redirect_url": "/azure/container-instances/monitor-azure-container-instances",
1281-
"redirect_document_id": false
1282-
},
1283-
{
1284-
"source_path_from_root": "/articles/container-instances/container-instances-mounting-azure-files-volume.md",
1285-
"redirect_url": "/azure/container-instances/container-instances-volume-azure-files",
1286-
"redirect_document_id": false
1287-
},
1288-
{
1289-
"source_path_from_root": "/articles/container-instances/container-instances-quickstart-docker-cli.md",
1290-
"redirect_url": "/azure/container-instances/quickstart-docker-cli",
1291-
"redirect_document_id": false
1292-
},
1293-
{
1294-
"source_path_from_root": "/articles/container-instances/container-instances-quotas.md",
1295-
"redirect_url": "/azure/container-instances/container-instances-resource-and-quota-limits",
1296-
"redirect_document_id": false
1297-
},
1298-
{
1299-
"source_path_from_root": "/articles/container-instances/container-instances-region-availability.md",
1300-
"redirect_url": "/azure/container-instances/container-instances-resource-and-quota-limits",
1301-
"redirect_document_id": false
1302-
},
1303-
{
1304-
"source_path_from_root": "/articles/container-instances/tutorial-docker-compose.md",
1305-
"redirect_url": "/azure/container-instances/container-instances-multi-container-group",
1306-
"redirect_document_id": false
1307-
},
13081273
{
13091274
"source_path_from_root": "/articles/container-registry/manual-regional-move.md",
13101275
"redirect_url": "/azure/operational-excellence/relocation-container-registry",
@@ -3690,36 +3655,6 @@
36903655
"redirect_url": "/azure/sentinel/monitor-your-data",
36913656
"redirect_document_id": false
36923657
},
3693-
{
3694-
"source_path_from_root": "/articles/service-fabric/service-fabric-best-practices-overview.md",
3695-
"redirect_url": "/azure/service-fabric/service-fabric-best-practices-security",
3696-
"redirect_document_id": false
3697-
},
3698-
{
3699-
"source_path_from_root": "/articles/service-fabric/service-fabric-diagnostics-event-generation-app.md",
3700-
"redirect_url": "/azure/service-fabric/monitor-service-fabric#application-monitoring",
3701-
"redirect_document_id": false
3702-
},
3703-
{
3704-
"source_path_from_root": "/articles/service-fabric/service-fabric-diagnostics-event-generation-perf.md",
3705-
"redirect_url": "/azure/service-fabric/monitor-service-fabric-reference#performance-metrics",
3706-
"redirect_document_id": false
3707-
},
3708-
{
3709-
"source_path_from_root": "/articles/service-fabric/service-fabric-diagnostics-overview.md",
3710-
"redirect_url": "/azure/service-fabric/monitor-service-fabric",
3711-
"redirect_document_id": false
3712-
},
3713-
{
3714-
"source_path_from_root": "/articles/service-fabric/service-fabric-rest-based-application-lifecycle-sample.md",
3715-
"redirect_url": "/rest/api/servicefabric/",
3716-
"redirect_document_id": false
3717-
},
3718-
{
3719-
"source_path_from_root": "/articles/service-fabric/upgrade-managed-disks.md",
3720-
"redirect_url": "/azure/service-fabric/service-fabric-scale-up-primary-node-type",
3721-
"redirect_document_id": false
3722-
},
37233658
{
37243659
"source_path_from_root": "/articles/service-health/alerts-activity-log-service-notifications.md",
37253660
"redirect_url": "/azure/service-health/alerts-activity-log-service-notifications-portal",
@@ -4569,6 +4504,16 @@
45694504
"source_path_from_root": "/articles/virtual-network/how-to-create-encryption-cli.md",
45704505
"redirect_url": "/azure/virtual-network/how-to-create-encryption",
45714506
"redirect_document_id": false
4507+
},
4508+
{
4509+
"source_path_from_root": "/articles/virtual-network/tutorial-filter-network-traffic-powershell.md",
4510+
"redirect_url": "/azure/virtual-network/tutorial-filter-network-traffic",
4511+
"redirect_document_id": false
4512+
},
4513+
{
4514+
"source_path_from_root": "/articles/virtual-network/tutorial-filter-network-traffic-cli.md",
4515+
"redirect_url": "/azure/virtual-network/tutorial-filter-network-traffic",
4516+
"redirect_document_id": false
45724517
}
45734518
]
4574-
}
4519+
}

.openpublishing.redirection.security-benchmark.json

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -350,11 +350,6 @@
350350
"redirect_url": "/security/benchmark/azure/baselines/cognitive-services-security-baseline",
351351
"redirect_document_id": false
352352
},
353-
{
354-
"source_path_from_root": "/articles/container-instances/security-baseline.md",
355-
"redirect_url": "/security/benchmark/azure/baselines/container-instances-security-baseline",
356-
"redirect_document_id": false
357-
},
358353
{
359354
"source_path_from_root": "/articles/container-registry/security-baseline.md",
360355
"redirect_url": "/security/benchmark/azure/baselines/container-registry-security-baseline",
@@ -425,11 +420,6 @@
425420
"redirect_url": "/security/benchmark/azure/baselines/service-bus-messaging-security-baseline",
426421
"redirect_document_id": false
427422
},
428-
{
429-
"source_path_from_root": "/articles/service-fabric/security-baseline.md",
430-
"redirect_url": "/security/benchmark/azure/baselines/service-fabric-security-baseline",
431-
"redirect_document_id": false
432-
},
433423
{
434424
"source_path_from_root": "/articles/site-recovery/security-baseline.md",
435425
"redirect_url": "/security/benchmark/azure/baselines/site-recovery-security-baseline",
@@ -450,21 +440,6 @@
450440
"redirect_url": "/security/benchmark/azure/baselines/traffic-manager-security-baseline",
451441
"redirect_document_id": false
452442
},
453-
{
454-
"source_path_from_root": "/articles/virtual-machine-scale-sets/security-baseline.md",
455-
"redirect_url": "/security/benchmark/azure/baselines/virtual-machine-scale-sets-security-baseline",
456-
"redirect_document_id": false
457-
},
458-
{
459-
"source_path_from_root": "/articles/virtual-machines/linux/security-baseline.md",
460-
"redirect_url": "/security/benchmark/azure/baselines/virtual-machines-linux-security-baseline",
461-
"redirect_document_id": false
462-
},
463-
{
464-
"source_path_from_root": "/articles/virtual-machines/windows/security-baseline.md",
465-
"redirect_url": "/security/benchmark/azure/baselines/virtual-machines-windows-security-baseline",
466-
"redirect_document_id": false
467-
},
468443
{
469444
"source_path_from_root": "/articles/virtual-network/security-baseline.md",
470445
"redirect_url": "/security/benchmark/azure/baselines/virtual-network-security-baseline",

.openpublishing.redirection.virtual-machines.json

Lines changed: 0 additions & 9 deletions
This file was deleted.

CODEOWNERS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,7 @@
1515
/articles/mariadb @tynevi @thomps23
1616
/articles/mysql @tynevi @thomps23
1717
/articles/managed-instance-apache-cassandra @tynevi @thomps23
18+
/articles/virtual-machines @jasonwhowell @thomps23
19+
/articles/virtual-machines-scale-sets @jasonwhowell @thomps23
20+
/articles/container-instances @jasonwhowell @thomps23
21+
/articles/service-fabric @jasonwhowell @thomps23

articles/active-directory-b2c/partner-onfido.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ REST API settings:
111111
#### Upload your files
112112

113113
1. Store the UI folder files in your blob container.
114-
2. [Use Azure Storage Explorer to manage Azure managed disks](../virtual-machines/disks-use-storage-explorer-managed-disks.md) and access permissions.
114+
2. [Use Azure Storage Explorer to manage Azure managed disks](/azure/virtual-machines/disks-use-storage-explorer-managed-disks) and access permissions.
115115

116116
### Configure Azure AD B2C
117117

articles/advisor/advisor-cost-optimization-workbook.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,14 @@ Azure Hybrid Benefit represents an excellent opportunity to save on Virtual Mach
7878
#### Windows VM/VMSS
7979

8080
Azure Hybrid Benefit represents an excellent opportunity to save on Virtual Machines OS costs.
81-
If you have Software Assurance, you can enable the [Azure Hybrid Benefit](../virtual-machines/windows/hybrid-use-benefit-licensing.md). You can see potential savings using [Azure Hybrid Benefit Calculator](https://azure.microsoft.com/pricing/hybrid-benefit/#calculator).
81+
If you have Software Assurance, you can enable the [Azure Hybrid Benefit](/azure/virtual-machines/windows/hybrid-use-benefit-licensing). You can see potential savings using [Azure Hybrid Benefit Calculator](https://azure.microsoft.com/pricing/hybrid-benefit/#calculator).
8282

8383
> [!NOTE]
8484
> The query has a Quick Fix column that helps you to apply Azure Hybrid Benefit to Windows VMs.
8585
8686
#### Linux VM/VMSS
8787

88-
[Azure Hybrid Benefit for Linux](../virtual-machines/linux/azure-hybrid-benefit-linux.md) is a licensing benefit that helps you to significantly reduce the costs of running your Red Hat Enterprise Linux (RHEL) and SUSE Linux Enterprise Server (SLES) virtual machines (VMs) in the cloud.
88+
[Azure Hybrid Benefit for Linux](/azure/virtual-machines/linux/azure-hybrid-benefit-linux) is a licensing benefit that helps you to significantly reduce the costs of running your Red Hat Enterprise Linux (RHEL) and SUSE Linux Enterprise Server (SLES) virtual machines (VMs) in the cloud.
8989

9090
#### SQL
9191

@@ -117,7 +117,7 @@ The following queries show compute resources that you can optimize to save money
117117

118118
#### Virtual Machines in a Stopped State
119119

120-
This query identifies Virtual Machines that aren't properly deallocated. If a virtual machine’s status is Stopped rather than Stopped (Deallocated), you're still billed for the resource as the hardware remains allocated for you. Learn more about [States and billing status of Azure Virtual Machines](../virtual-machines/states-billing.md).
120+
This query identifies Virtual Machines that aren't properly deallocated. If a virtual machine’s status is Stopped rather than Stopped (Deallocated), you're still billed for the resource as the hardware remains allocated for you. Learn more about [States and billing status of Azure Virtual Machines](/azure/virtual-machines/states-billing).
121121

122122
#### Deallocated virtual machines
123123

articles/advisor/advisor-cost-recommendations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Advisor recommends resizing virtual machines when it's possible to fit the curre
6767

6868
### Burstable recommendations
6969

70-
We evaluate if workloads are eligible to run on specialized SKUs called **Burstable SKUs** that support variable workload performance requirements and are less expensive than general purpose SKUs. Learn more about burstable SKUs here: [B-series burstable - Azure Virtual Machines](../virtual-machines/sizes-b-series-burstable.md).
70+
We evaluate if workloads are eligible to run on specialized SKUs called **Burstable SKUs** that support variable workload performance requirements and are less expensive than general purpose SKUs. Learn more about burstable SKUs here: [B-series burstable - Azure Virtual Machines](/azure/virtual-machines/sizes-b-series-burstable).
7171

7272
A burstable SKU recommendation is made if:
7373

0 commit comments

Comments
 (0)