Skip to content

Commit b5a0283

Browse files
authored
Merge branch 'main' into monitoring-092623
2 parents cde5306 + 347eefe commit b5a0283

File tree

1,253 files changed

+17045
-11045
lines changed

Some content is hidden

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

1,253 files changed

+17045
-11045
lines changed

.openpublishing.publish.config.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1189,11 +1189,14 @@
11891189
"articles/data-catalog/.openpublishing.redirection.data-catalog.json",
11901190
"articles/data-factory/.openpublishing.redirection.data-factory.json",
11911191
"articles/data-lake-analytics/.openpublishing.redirection.data-lake-analytics.json",
1192+
"articles/deployment-environments/.openpublishing.redirection.deployment-environments.json",
1193+
"articles/dev-box/.openpublishing.redirection.dev-box.json",
11921194
"articles/digital-twins/.openpublishing.redirection.digital-twins.json",
11931195
"articles/event-grid/.openpublishing.redirection.event-grid.json",
11941196
"articles/event-hubs/.openpublishing.redirection.event-hubs.json",
11951197
"articles/hdinsight/.openpublishing.redirection.hdinsight.json",
11961198
"articles/healthcare-apis/.openpublishing.redirection.healthcare-apis.json",
1199+
"articles/internet-peering/.openpublishing.redirection.internet-peering.json",
11971200
"articles/iot-accelerators/.openpublishing.redirection.iot-accelerators.json",
11981201
"articles/iot-central/.openpublishing.redirection.iot-central.json",
11991202
"articles/iot-develop/.openpublishing.redirection.iot-develop.json",
@@ -1208,9 +1211,12 @@
12081211
"articles/mariadb/.openpublishing.redirection.mariadb.json",
12091212
"articles/marketplace/.openpublishing.redirection.marketplace.json",
12101213
"articles/mysql/.openpublishing.redirection.mysql.json",
1214+
"articles/network-watcher/.openpublishing.redirection.network-watcher.json",
12111215
"articles/object-anchors/.openpublishing.redirection.object-anchors.json",
1216+
"articles/peering-service/.openpublishing.redirection.peering-service.json",
12121217
"articles/postgresql/.openpublishing.redirection.postgresql.json",
12131218
"articles/purview/.openpublishing.redirection.purview.json",
1219+
"articles/route-server/.openpublishing.redirection.route-server.json",
12141220
"articles/sap/.openpublishing.redirection.sap.json",
12151221
"articles/service-bus-messaging/.openpublishing.redirection.service-bus-messaging.json",
12161222
"articles/spatial-anchors/.openpublishing.redirection.spatial-anchors.json",
@@ -1220,9 +1226,6 @@
12201226
"articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",
12211227
"articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",
12221228
"articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
1223-
"articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
1224-
"articles/dev-box/.openpublishing.redirection.dev-box.json",
1225-
"articles/deployment-environments/.openpublishing.redirection.deployment-environments.json",
1226-
"articles/network-watcher/.openpublishing.redirection.network-watcher.json"
1229+
"articles/virtual-machines/.openpublishing.redirection.virtual-machines.json"
12271230
]
12281231
}

.openpublishing.redirection.active-directory.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5460,6 +5460,16 @@
54605460
"redirect_url": "/azure/active-directory/fundamentals/concept-fundamentals-security-defaults",
54615461
"redirect_document_id": true
54625462
},
5463+
{
5464+
"source_path_from_root": "/articles/active-directory/reports-monitoring/reference-azure-ad-sla-performance.md",
5465+
"redirect_url": "/azure/active-directory/reports-monitoring/reference-sla-performance",
5466+
"redirect_document_id": true
5467+
},
5468+
{
5469+
"source_path_from_root": "/articles/active-directory/fundamentals/licensing-whatis-azure-portal.md",
5470+
"redirect_url": "/azure/active-directory/fundamentals/concept-group-based-licensing",
5471+
"redirect_document_id": false
5472+
},
54635473
{
54645474
"source_path_from_root": "/articles/active-directory/reports-monitoring/quickstart-filter-audit-log.md",
54655475
"redirect_url": "/azure/active-directory/reports-monitoring/howto-customize-filter-logs",

.openpublishing.redirection.json

Lines changed: 4 additions & 144 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,6 @@
2020
"redirect_URL": "tutorial-assess-webapps",
2121
"redirect_document_id": false
2222
},
23-
{
24-
"source_path": "articles/route-server/tutorial-protect-route-server.md",
25-
"redirect_URL": "/azure/route-server/tutorial-protect-route-server-ddos",
26-
"redirect_document_id": false
27-
},
28-
{
29-
"source_path": "articles/route-server/routing-preference.md",
30-
"redirect_url": "/azure/route-server/overview",
31-
"redirect_document_id": false
32-
},
3323
{
3424
"source_path": "articles/cloud-services-extended-support/deploy-visual-studio.md",
3525
"redirect_url": "/visualstudio/azure/cloud-services-extended-support?context=%2Fazure%2Fcloud-services-extended-support%2Fcontext%2Fcontext",
@@ -14452,121 +14442,6 @@
1445214442
"redirect_url": "/azure/networking/fundamentals/networking-overview",
1445314443
"redirect_document_id": false
1445414444
},
14455-
{
14456-
"source_path_from_root": "/articles/network-watcher/connection-monitor-preview-create-using-portal.md",
14457-
"redirect_url": "/azure/network-watcher/connection-monitor-create-using-portal",
14458-
"redirect_document_id": false
14459-
},
14460-
{
14461-
"source_path_from_root": "/articles/network-watcher/connection-monitor-preview-create-using-arm-client.md",
14462-
"redirect_url": "/azure/network-watcher/connection-monitor-create-using-template",
14463-
"redirect_document_id": false
14464-
},
14465-
{
14466-
"source_path_from_root": "/articles/network-watcher/connection-monitor-preview.md",
14467-
"redirect_url": "/azure/network-watcher/connection-monitor-overview",
14468-
"redirect_document_id": false
14469-
},
14470-
{
14471-
"source_path_from_root": "/articles/network-watcher/network-watcher-check-next-hop-portal.md",
14472-
"redirect_url": "/azure/network-watcher/diagnose-vm-network-routing-problem",
14473-
"redirect_document_id": true
14474-
},
14475-
{
14476-
"source_path_from_root": "/articles/network-watcher/network-watcher-check-next-hop-cli.md",
14477-
"redirect_url": "/azure/network-watcher/diagnose-vm-network-routing-problem-cli",
14478-
"redirect_document_id": true
14479-
},
14480-
{
14481-
"source_path_from_root": "/articles/network-watcher/network-watcher-check-next-hop-cli-nodejs.md",
14482-
"redirect_url": "/azure/network-watcher/diagnose-vm-network-routing-problem-cli",
14483-
"redirect_document_id": false
14484-
},
14485-
{
14486-
"source_path_from_root": "/articles/network-watcher/network-watcher-check-next-hop-powershell.md",
14487-
"redirect_url": "/azure/network-watcher/diagnose-vm-network-routing-problem-powershell",
14488-
"redirect_document_id": true
14489-
},
14490-
{
14491-
"source_path_from_root": "/articles/network-watcher/network-watcher-check-ip-flow-verify-portal.md",
14492-
"redirect_url": "/azure/network-watcher/diagnose-vm-network-traffic-filtering-problem",
14493-
"redirect_document_id": true
14494-
},
14495-
{
14496-
"source_path_from_root": "/articles/network-watcher/network-watcher-check-ip-flow-verify-cli.md",
14497-
"redirect_url": "/azure/network-watcher/diagnose-vm-network-traffic-filtering-problem-cli",
14498-
"redirect_document_id": false
14499-
},
14500-
{
14501-
"source_path_from_root": "/articles/network-watcher/network-watcher-check-ip-flow-verify-cli-nodejs.md",
14502-
"redirect_url": "/azure/network-watcher/diagnose-vm-network-traffic-filtering-problem-cli",
14503-
"redirect_document_id": true
14504-
},
14505-
{
14506-
"source_path_from_root": "/articles/network-watcher/network-watcher-check-ip-flow-verify-powershell.md",
14507-
"redirect_url": "/azure/network-watcher/diagnose-vm-network-traffic-filtering-problem-powershell",
14508-
"redirect_document_id": true
14509-
},
14510-
{
14511-
"source_path_from_root": "/articles/network-watcher/migrate-to-connection-monitor-preview-from-connection-monitor.md",
14512-
"redirect_url": "/azure/network-watcher/migrate-to-connection-monitor-from-connection-monitor-classic",
14513-
"redirect_document_id": false
14514-
},
14515-
{
14516-
"source_path_from_root": "/articles/network-watcher/migrate-to-connection-monitor-preview-from-network-performance-monitor.md",
14517-
"redirect_url": "/azure/network-watcher/migrate-to-connection-monitor-from-network-performance-monitor",
14518-
"redirect_document_id": false
14519-
},
14520-
{
14521-
"source_path_from_root": "/articles/network-watcher/network-watcher-nsg-flow-logging-cli-nodejs.md",
14522-
"redirect_url": "/azure/network-watcher/network-watcher-nsg-flow-logging-cli",
14523-
"redirect_document_id": true
14524-
},
14525-
{
14526-
"source_path_from_root": "/articles/network-watcher/prepare-flow-log.md",
14527-
"redirect_url": "/azure/network-watcher/network-watcher-nsg-flow-logging-overview",
14528-
"redirect_document_id": true
14529-
},
14530-
{
14531-
"source_path_from_root": "/articles/network-watcher/network-watcher-packet-capture-manage-cli-nodejs.md",
14532-
"redirect_url": "/azure/network-watcher/network-watcher-packet-capture-manage-cli",
14533-
"redirect_document_id": true
14534-
},
14535-
{
14536-
"source_path_from_root": "/articles/network-watcher/network-watcher-security-group-view-cli-nodejs.md",
14537-
"redirect_url": "/azure/network-watcher/network-watcher-security-group-view-cli",
14538-
"redirect_document_id": true
14539-
},
14540-
{
14541-
"source_path_from_root": "/articles/network-watcher/network-watcher-troubleshoot-manage-cli-nodejs.md",
14542-
"redirect_url": "/azure/network-watcher/network-watcher-troubleshoot-manage-cli",
14543-
"redirect_document_id": true
14544-
},
14545-
{
14546-
"source_path_from_root": "/articles/network-watcher/network-watcher-topology-cli.md",
14547-
"redirect_url": "/azure/network-watcher/view-network-topology",
14548-
"redirect_document_id": false
14549-
},
14550-
{
14551-
"source_path_from_root": "/articles/network-watcher/network-watcher-topology-cli-nodejs.md",
14552-
"redirect_url": "/azure/network-watcher/view-network-topology",
14553-
"redirect_document_id": false
14554-
},
14555-
{
14556-
"source_path_from_root": "/articles/network-watcher/network-watcher-topology-overview.md",
14557-
"redirect_url": "/azure/network-watcher/view-network-topology",
14558-
"redirect_document_id": true
14559-
},
14560-
{
14561-
"source_path_from_root": "/articles/network-watcher/network-watcher-topology-powershell.md",
14562-
"redirect_url": "/azure/network-watcher/view-network-topology",
14563-
"redirect_document_id": false
14564-
},
14565-
{
14566-
"source_path_from_root": "/articles/network-watcher/network-watcher-topology-rest.md",
14567-
"redirect_url": "/azure/network-watcher/view-network-topology",
14568-
"redirect_document_id": false
14569-
},
1457014445
{
1457114446
"source_path_from_root": "/articles/notebooks/index.yml",
1457214447
"redirect_url": "https://notebooks.azure.com",
@@ -20367,16 +20242,6 @@
2036720242
"redirect_url": "/rest/api/load-balancer/loadbalancers/createorupdate",
2036820243
"redirect_document_id": false
2036920244
},
20370-
{
20371-
"source_path_from_root": "/articles/network-watcher/network-watcher-check-next-hop-rest.md",
20372-
"redirect_url": "/rest/api/network-watcher/networkwatchers/getnexthop",
20373-
"redirect_document_id": false
20374-
},
20375-
{
20376-
"source_path_from_root": "/articles/network-watcher/network-watcher-check-ip-flow-verify-rest.md",
20377-
"redirect_url": "/rest/api/network-watcher/networkwatchers/verifyipflow",
20378-
"redirect_document_id": false
20379-
},
2038020245
{
2038120246
"source_path_from_root": "/articles/resource-group-link-resources.md",
2038220247
"redirect_url": "/rest/api/resources/resourcelinks",
@@ -22477,11 +22342,6 @@
2247722342
"redirect_url": "/windows-server/remote/remote-desktop-services/remote-desktop-gateway-role",
2247822343
"redirect_document_id": false
2247922344
},
22480-
{
22481-
"source_path_from_root": "/articles/peering-service/create-connection.md",
22482-
"redirect_url": "/azure/peering-service/azure-portal",
22483-
"redirect_document_id": false
22484-
},
2248522345
{
2248622346
"source_path_from_root": "/articles/lighthouse/concepts/azure-delegated-resource-management.md",
2248722347
"redirect_url": "/azure/lighthouse/concepts/architecture",
@@ -24553,22 +24413,22 @@
2455324413
},
2455424414
{
2455524415
"source_path_from_root": "/articles/active-directory/develop/single-page-app-tutorial-01-register-app.md",
24556-
"redirect_url": "/azure/active-directory/develop/tutorial-single-page-app-react-register-app.md",
24416+
"redirect_url": "/azure/active-directory/develop/tutorial-single-page-app-react-register-app",
2455724417
"redirect_document_id": false
2455824418
},
2455924419
{
2456024420
"source_path_from_root": "/articles/active-directory/develop/single-page-app-tutorial-02-prepare-spa.md",
24561-
"redirect_url": "/azure/active-directory/develop/tutorial-single-page-app-react-prepare-spa.md",
24421+
"redirect_url": "/azure/active-directory/develop/tutorial-single-page-app-react-prepare-spa",
2456224422
"redirect_document_id": false
2456324423
},
2456424424
{
2456524425
"source_path_from_root": "/articles/active-directory/develop/single-page-app-tutorial-03-sign-in-users.md",
24566-
"redirect_url": "/azure/active-directory/develop/tutorial-single-page-app-react-sign-in-users.md",
24426+
"redirect_url": "/azure/active-directory/develop/tutorial-single-page-app-react-sign-in-users",
2456724427
"redirect_document_id": false
2456824428
},
2456924429
{
2457024430
"source_path_from_root": "/articles/active-directory/develop/single-page-app-tutorial-04-call-api.md",
24571-
"redirect_url": "/azure/active-directory/develop/tutorial-single-page-app-react-call-api.md",
24431+
"redirect_url": "/azure/active-directory/develop/tutorial-single-page-app-react-call-api",
2457224432
"redirect_document_id": false
2457324433
}
2457424434
]

articles/active-directory-domain-services/TOC.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,15 @@
5252
- name: How Domain Services synchronization works
5353
href: synchronization.md
5454
- name: How password hash synchronization works
55-
href: ../active-directory/hybrid/connect/how-to-connect-password-hash-synchronization.md?context=/azure/active-directory-domain-services/context/azure-ad-ds-context
55+
href: /azure/active-directory/hybrid/connect/how-to-connect-password-hash-synchronization?context=/azure/active-directory-domain-services/context/azure-ad-ds-context
5656
- name: Custom attributes
5757
href: concepts-custom-attributes.md
5858
- name: Virtual network considerations
5959
href: network-considerations.md
6060
- name: What is Microsoft Entra ID?
61-
href: ../active-directory/fundamentals/whatis.md?context=/azure/active-directory-domain-services/context/azure-ad-ds-context
61+
href: /azure/active-directory/fundamentals/whatis?context=/azure/active-directory-domain-services/context/azure-ad-ds-context
6262
- name: Microsoft Entra architecture
63-
href: ../active-directory/architecture/architecture.md?context=/azure/active-directory-domain-services/context/azure-ad-ds-context
63+
href: /azure/active-directory/architecture/architecture?context=/azure/active-directory-domain-services/context/azure-ad-ds-context
6464
- name: How to
6565
items:
6666
- name: Configure common settings

articles/active-directory-domain-services/ad-auth-no-join-linux-vm.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,11 +224,11 @@ The final step is to check that the flow works properly. To check this, try logg
224224
[centosuser@centos8 ~]su - [email protected]
225225
Last login: Wed Oct 12 15:13:39 UTC 2022 on pts/0
226226
[ADUser@Centos8 ~]$ exit
227-
228227
```
228+
229229
Now you are ready to use AD authentication on your Linux VM.
230230

231231
<!-- INTERNAL LINKS -->
232-
[create-azure-ad-tenant]: ../active-directory/fundamentals/sign-up-organization.md
233-
[associate-azure-ad-tenant]: ../active-directory/fundamentals/how-subscriptions-associated-directory.md
232+
[create-azure-ad-tenant]: /azure/active-directory/fundamentals/sign-up-organization.md
233+
[associate-azure-ad-tenant]: /azure/active-directory/fundamentals/how-subscriptions-associated-directory.md
234234
[create-azure-ad-ds-instance]: tutorial-create-instance.md

articles/active-directory-domain-services/administration-concepts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ To get started, [create a Domain Services managed domain][create-instance].
105105
[password-policy]: password-policy.md
106106
[hybrid-phs]: tutorial-configure-password-hash-sync.md#enable-synchronization-of-password-hashes
107107
[secure-domain]: secure-your-domain.md
108-
[azure-ad-password-sync]: ../active-directory/hybrid/connect/how-to-connect-password-hash-synchronization.md#password-hash-sync-process-for-azure-ad-domain-services
108+
[azure-ad-password-sync]: /azure/active-directory/hybrid/connect/how-to-connect-password-hash-synchronization#password-hash-sync-process-for-azure-ad-domain-services
109109
[create-instance]: tutorial-create-instance.md
110110
[tutorial-create-instance-advanced]: tutorial-create-instance-advanced.md
111111
[concepts-forest]: ./concepts-forest-trust.md

articles/active-directory-domain-services/alert-ldaps.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,4 @@ Create a replacement secure LDAP certificate by following the steps to [create a
5959
If you still have issues, [open an Azure support request][azure-support] for more troubleshooting help.
6060

6161
<!-- INTERNAL LINKS -->
62-
[azure-support]: ../active-directory/fundamentals/how-to-get-support.md
62+
[azure-support]: /azure/active-directory/fundamentals/how-to-get-support

articles/active-directory-domain-services/alert-nsg.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,5 +87,5 @@ It takes a few moments for the security rule to be added and show in the list.
8787
If you still have issues, [open an Azure support request][azure-support] for additional troubleshooting assistance.
8888

8989
<!-- INTERNAL LINKS -->
90-
[azure-support]: ../active-directory/fundamentals/how-to-get-support.md
91-
[configure-ldaps]: tutorial-configure-ldaps.md
90+
[azure-support]: /azure/active-directory/fundamentals/how-to-get-support
91+
[configure-ldaps]: ./tutorial-configure-ldaps.md

articles/active-directory-domain-services/alert-service-principal.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ms.author: justinha
1616
---
1717
# Known issues: Service principal alerts in Microsoft Entra Domain Services
1818

19-
[Service principals](../active-directory/develop/app-objects-and-service-principals.md) are applications that the Azure platform uses to manage, update, and maintain a Microsoft Entra Domain Services managed domain. If a service principal is deleted, functionality in the managed domain is impacted.
19+
[Service principals](/azure/active-directory/develop/app-objects-and-service-principals) are applications that the Azure platform uses to manage, update, and maintain a Microsoft Entra Domain Services managed domain. If a service principal is deleted, functionality in the managed domain is impacted.
2020

2121
This article helps you troubleshoot and resolve service principal-related configuration alerts.
2222

@@ -109,7 +109,7 @@ After you delete both applications, the Azure platform automatically recreates t
109109
If you still have issues, [open an Azure support request][azure-support] for additional troubleshooting assistance.
110110
111111
<!-- INTERNAL LINKS -->
112-
[azure-support]: ../active-directory/fundamentals/how-to-get-support.md
112+
[azure-support]: /azure/active-directory/fundamentals/how-to-get-support
113113
114114
<!-- EXTERNAL LINKS -->
115115
[New-AzureAdServicePrincipal]: /powershell/module/azuread/new-azureadserviceprincipal

articles/active-directory-domain-services/change-sku.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ It can take a minute or two to change the SKU type.
6464
If you have a resource forest and want to create additional trusts after the SKU change, see [Create an outbound forest trust to an on-premises domain in Domain Services][create-trust].
6565

6666
<!-- INTERNAL LINKS -->
67-
[create-azure-ad-tenant]: ../active-directory/fundamentals/sign-up-organization.md
68-
[associate-azure-ad-tenant]: ../active-directory/fundamentals/how-subscriptions-associated-directory.md
67+
[create-azure-ad-tenant]: /azure/active-directory/fundamentals/sign-up-organization
68+
[associate-azure-ad-tenant]: /azure/active-directory/fundamentals/how-subscriptions-associated-directory
6969
[create-azure-ad-ds-instance]: tutorial-create-instance.md
7070
[concepts-sku]: administration-concepts.md#azure-ad-ds-skus
7171
[create-trust]: tutorial-create-forest-trust.md

0 commit comments

Comments
 (0)