Skip to content

Commit 0a6bb59

Browse files
authored
Merge branch 'MicrosoftDocs:main' into aca/v-jaswel_20230802
2 parents b96c1af + adb7b1d commit 0a6bb59

File tree

4,137 files changed

+39854
-25001
lines changed

Some content is hidden

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

4,137 files changed

+39854
-25001
lines changed

.openpublishing.redirection.active-directory.json

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@
1010
"redirect_url": "/azure/active-directory/develop/enterprise-app-role-management",
1111
"redirect_document_id": false
1212
},
13+
{
14+
"source_path_from_root": "/articles/active-directory/governance/tutorial-prepare-azure-ad-user-accounts.md",
15+
"redirect_url": "/azure/active-directory/governance/tutorial-prepare-user-accounts",
16+
"redirect_document_id": false
17+
},
1318
{
1419
"source_path_from_root": "/articles/active-directory/develop/active-directory-schema-extensions.md",
1520
"redirect_url": "/azure/active-directory/develop/schema-extensions",
@@ -13473,6 +13478,90 @@
1347313478
"source_path_from_root": "/articles/active-directory/managed-identities-azure-resources/services-azure-active-directory-support.md",
1347413479
"redirect_url": "/azure/active-directory/managed-identities-azure-resources/services-id-authentication-support",
1347513480
"redirect_document_id": false
13481+
},
13482+
{
13483+
"source_path_from_root": "/articles/active-directory/hybrid/connect/plan-hybrid-identity-design-considerations-accesscontrol-requirements.md",
13484+
"redirect_url": "/azure/active-directory/hybrid/index",
13485+
"redirect_document_id": false
13486+
},
13487+
{
13488+
"source_path_from_root": "/articles/active-directory/hybrid/connect/plan-hybrid-identity-design-considerations-business-needs.md",
13489+
"redirect_url": "/azure/active-directory/hybrid/index",
13490+
"redirect_document_id": false
13491+
},
13492+
{
13493+
"source_path_from_root": "/articles/active-directory/hybrid/connect/plan-hybrid-identity-design-considerations-contentmgt-requirements.md",
13494+
"redirect_url": "/azure/active-directory/hybrid/index",
13495+
"redirect_document_id": false
13496+
},
13497+
{
13498+
"source_path_from_root": "/articles/active-directory/hybrid/connect/aplan-hybrid-identity-design-considerations-data-protection-strategy.md",
13499+
"redirect_url": "/azure/active-directory/hybrid/index",
13500+
"redirect_document_id": false
13501+
},
13502+
{
13503+
"source_path_from_root": "/articles/active-directory/hybrid/connect/plan-hybrid-identity-design-considerations-dataprotection-requirements.md",
13504+
"redirect_url": "/azure/active-directory/hybrid/index",
13505+
"redirect_document_id": false
13506+
},
13507+
{
13508+
"source_path_from_root": "/articles/active-directory/hybrid/connect/plan-hybrid-identity-design-considerations-hybrid-id-management-tasks.md",
13509+
"redirect_url": "/azure/active-directory/hybrid/index",
13510+
"redirect_document_id": false
13511+
},
13512+
{
13513+
"source_path_from_root": "/articles/active-directory/hybrid/connect/plan-hybrid-identity-design-considerations-identity-adoption-strategy.md",
13514+
"redirect_url": "/azure/active-directory/hybrid/index",
13515+
"redirect_document_id": false
13516+
},
13517+
{
13518+
"source_path_from_root": "/articles/active-directory/hybrid/connect/plan-hybrid-identity-design-considerations-lifecycle-adoption-strategy.md",
13519+
"redirect_url": "/azure/active-directory/hybrid/index",
13520+
"redirect_document_id": false
13521+
},
13522+
{
13523+
"source_path_from_root": "/articles/active-directory/hybrid/connect/plan-hybrid-identity-design-considerations-data-protection-strategy.md",
13524+
"redirect_url": "/azure/active-directory/hybrid/connect/index",
13525+
"redirect_document_id": false
13526+
},
13527+
{
13528+
"source_path_from_root": "/articles/active-directory/hybrid/connect/plan-hybrid-identity-design-considerations-directory-sync-requirements.md",
13529+
"redirect_url": "/azure/active-directory/hybrid/connect/index",
13530+
"redirect_document_id": false
13531+
},
13532+
{
13533+
"source_path_from_root": "/articles/active-directory/hybrid/connect/plan-hybrid-identity-design-considerations-multifactor-auth-requirements.md",
13534+
"redirect_url": "/azure/active-directory/hybrid/index",
13535+
"redirect_document_id": false
13536+
},
13537+
{
13538+
"source_path_from_root": "/articles/active-directory/hybrid/connect/plan-hybrid-identity-design-considerations-incident-response-requirements.md",
13539+
"redirect_url": "/azure/active-directory/hybrid/connect/index",
13540+
"redirect_document_id": false
13541+
},
13542+
13543+
{
13544+
"source_path_from_root": "/articles/active-directory/hybrid/connect/plan-hybrid-identity-design-considerations-nextsteps.md",
13545+
"redirect_url": "/azure/active-directory/hybrid/index",
13546+
"redirect_document_id": false
13547+
},
13548+
{
13549+
"source_path_from_root": "/articles/active-directory/hybrid/connect/plan-hybrid-identity-design-considerations-overview.md",
13550+
"redirect_url": "/azure/active-directory/hybrid/index",
13551+
"redirect_document_id": false
13552+
},
13553+
{
13554+
"source_path_from_root": "/articles/active-directory/hybrid/connect/plan-hybrid-identity-design-considerations-tools-comparison.md",
13555+
"redirect_url": "/azure/active-directory/hybrid/index",
13556+
"redirect_document_id": false
13557+
},
13558+
13559+
13560+
{
13561+
"source_path_from_root": "/articles/active-directory/fundamentals/add-users-azure-active-directory.md",
13562+
"redirect_url": "/azure/active-directory/fundamentals/add-users",
13563+
"redirect_document_id": false
1347613564
}
13565+
1347713566
]
1347813567
}

.openpublishing.redirection.azure-kubernetes-service.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@
1414
"source_path_from_root": "/articles/aks/web-app-routing.md",
1515
"redirect_url": "/azure/aks/app-routing",
1616
"redirect_document_id": false
17+
},
18+
{
19+
"source_path_from_root": "/articles/aks/aks-planned-maintenance-weekly-releases.md",
20+
"redirect_url": "/azure/aks/planned-maintenance",
21+
"redirect_document_id": false
1722
}
1823
]
1924
}

.openpublishing.redirection.azure-monitor.json

Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6194,6 +6194,141 @@
61946194
"source_path_from_root": "/articles/azure-monitor/essentials/resource-logs-categories.md",
61956195
"redirect_url": "/azure/azure-monitor/reference/supported-logs/logs-index",
61966196
"redirect_document_id": false
6197+
},
6198+
{
6199+
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-prometheus.md",
6200+
"redirect_url": "/azure/azure-monitor/containers/prometheus-metrics-enable",
6201+
"redirect_document_id": false
6202+
},
6203+
{
6204+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-metrics-enable.md",
6205+
"redirect_url": "/azure/azure-monitor/containers/prometheus-metrics-enable",
6206+
"redirect_document_id": false
6207+
},
6208+
{
6209+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-metrics-disable.md",
6210+
"redirect_url": "/azure/azure-monitor/containers/prometheus-metrics-disable",
6211+
"redirect_document_id": false
6212+
},
6213+
{
6214+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-metrics-from-arc-enabled-cluster.md",
6215+
"redirect_url": "/azure/azure-monitor/containers/prometheus-metrics-from-arc-enabled-cluster",
6216+
"redirect_document_id": false
6217+
},
6218+
{
6219+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-metrics-scrape-default.md",
6220+
"redirect_url": "/azure/azure-monitor/containers/prometheus-metrics-scrape-default",
6221+
"redirect_document_id": false
6222+
},
6223+
{
6224+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-metrics-scrape-configuration.md",
6225+
"redirect_url": "/azure/azure-monitor/containers/prometheus-metrics-scrape-configuration",
6226+
"redirect_document_id": false
6227+
},
6228+
{
6229+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-metrics-scrape-configuration-minimal.md",
6230+
"redirect_url": "/azure/azure-monitor/containers/prometheus-metrics-scrape-configuration-minimal",
6231+
"redirect_document_id": false
6232+
},
6233+
{
6234+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-metrics-scrape-scale.md",
6235+
"redirect_url": "/azure/azure-monitor/containers/prometheus-metrics-scrape-scale",
6236+
"redirect_document_id": false
6237+
},
6238+
{
6239+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-metrics-scrape-validate.md",
6240+
"redirect_url": "/azure/azure-monitor/containers/prometheus-metrics-scrape-validate",
6241+
"redirect_document_id": false
6242+
},
6243+
{
6244+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-metrics-multiple-workspaces.md",
6245+
"redirect_url": "/azure/azure-monitor/containers/prometheus-metrics-multiple-workspaces",
6246+
"redirect_document_id": false
6247+
},
6248+
{
6249+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-metrics-troubleshoot.md",
6250+
"redirect_url": "/azure/azure-monitor/containers/prometheus-metrics-troubleshoot",
6251+
"redirect_document_id": false
6252+
},
6253+
{
6254+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-remote-write.md",
6255+
"redirect_url": "/azure/azure-monitor/containers/prometheus-remote-write",
6256+
"redirect_document_id": false
6257+
},
6258+
{
6259+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-remote-write-azure-ad-pod-identity.md",
6260+
"redirect_url": "/azure/azure-monitor/containers/prometheus-remote-write-azure-ad-pod-identity",
6261+
"redirect_document_id": false
6262+
},
6263+
{
6264+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-remote-write-managed-identity.md",
6265+
"redirect_url": "/azure/azure-monitor/containers/prometheus-remote-write-managed-identity",
6266+
"redirect_document_id": false
6267+
},
6268+
{
6269+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-remote-write-active-directory.md",
6270+
"redirect_url": "/azure/azure-monitor/containers/prometheus-remote-write-active-directory",
6271+
"redirect_document_id": false
6272+
},
6273+
{
6274+
"source_path_from_root": "/articles/azure-monitor/essentials/integrate-keda.md",
6275+
"redirect_url": "/azure/azure-monitor/containers/integrate-keda",
6276+
"redirect_document_id": false
6277+
},
6278+
{
6279+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-authorization-proxy.md",
6280+
"redirect_url": "/azure/azure-monitor/containers/prometheus-authorization-proxy",
6281+
"redirect_document_id": false
6282+
},
6283+
{
6284+
"source_path_from_root": "/articles/azure-monitor/azure-cli-metrics-alert-sample.md",
6285+
"redirect_url": "/azure/azure-monitor/alerts/azure-cli-metrics-alert-sample",
6286+
"redirect_document_id": false
6287+
},
6288+
{
6289+
"source_path_from_root": "/articles/azure-monitor/terminology.md",
6290+
"redirect_url": "/azure/azure-monitor/overview",
6291+
"redirect_document_id": false
6292+
},
6293+
{
6294+
"source_path_from_root": "/articles/azure-monitor/logs/create-pipeline-datacollector-api.md",
6295+
"redirect_url": "/azure/azure-monitor/logs/data-collector-api",
6296+
"redirect_document_id": false
6297+
},
6298+
{
6299+
"source_path_from_root": "/articles/azure-monitor/visualize/vmext-troubleshoot.md",
6300+
"redirect_url": "/azure/azure-monitor/agents/vmext-troubleshoot",
6301+
"redirect_document_id": false
6302+
},
6303+
{
6304+
"source_path_from_root": "/articles/azure-monitor/logs/unify-app-resource-data.md",
6305+
"redirect_url": "/azure/azure-monitor/logs/cross-workspace-query",
6306+
"redirect_document_id": false
6307+
},
6308+
{
6309+
"source_path_from_root": "/articles/azure-monitor/insights/solution-agenthealth.md",
6310+
"redirect_url": "/azure/azure-monitor/agents/solution-agenthealth",
6311+
"redirect_document_id": false
6312+
},
6313+
{
6314+
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-hybrid-setup.md",
6315+
"redirect_url": "/azure/azure-monitor/containers/container-insights-enable-arc-enabled-clusters",
6316+
"redirect_document_id": false
6317+
},
6318+
{
6319+
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-optout-openshift-v3.md",
6320+
"redirect_url": "/azure/azure-monitor/containers/container-insights-optout",
6321+
"redirect_document_id": false
6322+
},
6323+
{
6324+
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-optout-openshift-v4.md",
6325+
"redirect_url": "/azure/azure-monitor/containers/container-insights-optout",
6326+
"redirect_document_id": false
6327+
},
6328+
{
6329+
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-optout-hybrid.md",
6330+
"redirect_url": "/azure/azure-monitor/containers/container-insights-optout",
6331+
"redirect_document_id": false
61976332
}
61986333
]
61996334
}

.openpublishing.redirection.json

Lines changed: 66 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1240,6 +1240,11 @@
12401240
"redirect_url": "/previous-versions/azure/azure-video-analyzer/video-analyzer-docs/edge/use-visual-studio-code-extension",
12411241
"redirect_document_id": false
12421242
},
1243+
{
1244+
"source_path": "articles/azure-video-indexer/observed-people-tracing.md",
1245+
"redirect_url": "/azure/azure-video-indexer/observed-people-tracking",
1246+
"redirect_document_id": false
1247+
},
12431248
{
12441249
"source_path": "articles/cloudfoundry/index.yml",
12451250
"redirect_url": "https://docs.pivotal.io/pivotalcf/1-11/customizing/pcf_azure.html",
@@ -23200,7 +23205,7 @@
2320023205
},
2320123206
{
2320223207
"source_path_from_root": "/articles/active-directory/develop/web-app-quickstart-portal-node-js-passport.md",
23203-
"redirect_url": "/azure/active-directory/develop/web-app-quickstart?pivots=devlang-nodejs-msal",
23208+
"redirect_url": "/azure/active-directory/develop/quickstart-web-app-nodejs-msal-sign-in",
2320423209
"redirect_document_id": false
2320523210
},
2320623211
{
@@ -23215,7 +23220,37 @@
2321523220
},
2321623221
{
2321723222
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-nodejs-webapp.md",
23218-
"redirect_url": "/azure/active-directory/develop/web-app-quickstart?pivots=devlang-nodejs-msal",
23223+
"redirect_url": "/azure/active-directory/develop/quickstart-web-app-nodejs-msal-sign-in",
23224+
"redirect_document_id": false
23225+
},
23226+
{
23227+
"source_path_from_root": "/articles/active-directory/develop/console-app-quickstart.md",
23228+
"redirect_url": "/azure/active-directory/develop/index-service",
23229+
"redirect_document_id": false
23230+
},
23231+
{
23232+
"source_path_from_root": "/articles/active-directory/develop/desktop-app-quickstart.md",
23233+
"redirect_url": "/azure/active-directory/develop/index-desktop",
23234+
"redirect_document_id": false
23235+
},
23236+
{
23237+
"source_path_from_root": "/articles/active-directory/develop/mobile-app-quickstart.md",
23238+
"redirect_url": "/azure/active-directory/develop/index-mobile",
23239+
"redirect_document_id": false
23240+
},
23241+
{
23242+
"source_path_from_root": "/articles/active-directory/develop/web-api-quickstart.md",
23243+
"redirect_url": "/azure/active-directory/develop/index-web-api",
23244+
"redirect_document_id": false
23245+
},
23246+
{
23247+
"source_path_from_root": "/articles/active-directory/develop/web-app-quickstart.md",
23248+
"redirect_url": "/azure/active-directory/develop/index-web-app",
23249+
"redirect_document_id": false
23250+
},
23251+
{
23252+
"source_path_from_root": "/articles/active-directory/develop/single-page-app-quickstart.md",
23253+
"redirect_url": "/azure/active-directory/develop/index-spa",
2321923254
"redirect_document_id": false
2322023255
},
2322123256
{
@@ -24082,6 +24117,35 @@
2408224117
"source_path_from_root": "/articles/private-link/tutorial-private-endpoint-webapp-portal.md",
2408324118
"redirect_url": "/azure/private-link/create-private-endpoint-portal",
2408424119
"redirect_document_id": false
24120+
},
24121+
{
24122+
"source_path_from_root": "/articles/aks/use-multiple-node-pools.md",
24123+
"redirect_url": "/azure/aks/create-node-pools",
24124+
"redirect_document_id": false
24125+
},
24126+
{
24127+
"source_path_from_root": "/articles/reliability/migrate-app-service.md",
24128+
"redirect_url": "/azure/reliability/reliability-app-service",
24129+
"redirect_document_id": false
24130+
},
24131+
{
24132+
"source_path_from_root": "/articles/reliability/migrate-app-service-environment.md",
24133+
"redirect_url": "/azure/reliability/reliability-app-service",
24134+
"redirect_document_id": false
24135+
},
24136+
{
24137+
"source_path_from_root": "/articles/flexible-server/concepts-high-availability.md",
24138+
"redirect_url": "/azure/reliability/reliability-postgre-flexible",
24139+
"redirect_document_id": false
24140+
},
24141+
{
24142+
"source_path": "articles/azure-cache-for-redis/cache-how-to-functions.md",
24143+
"redirect_url": "/azure/azure-functions/functions-bindings-cache",
24144+
"redirect_document_id": false
2408524145
}
24146+
24147+
24148+
24149+
2408624150
]
2408724151
}

.openpublishing.redirection.sentinel.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,11 @@
174174
"source_path": "articles/sentinel/data-connectors/zoom-reports-using-azure-function.md",
175175
"redirect_url": "/azure/sentinel/data-connectors/zoom-reports-using-azure-functions",
176176
"redirect_document_id": true
177+
},
178+
{
179+
"source_path": "articles/sentinel/store-logs-in-azure-data-explorer.md",
180+
"redirect_url": "/azure/azure-monitor/logs/data-retention-archive",
181+
"redirect_document_id": true
177182
}
178183
]
179184
}

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Please use the Feedback tool at the bottom of any article to submit bugs and sug
2222

2323
### Editing in GitHub
2424

25-
Follow the guidance for [Quick edits to existing documents](https://learn.microsoft.com/contribute/#quick-edits-to-documentation) in our contributor guide.
25+
Follow the guidance for [Quick edits to existing documents](https://learn.microsoft.com/contribute/content/#quick-edits-to-documentation) in our contributor guide.
2626

2727
### Pull requests
2828

articles/active-directory-b2c/enable-authentication-python-web-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ In the root folder of your web app, create the `templates` folder. In the templa
190190

191191
Add the following templates under the templates folder. These templates extend the `base.html` template:
192192

193-
- **index.html**: the home page of the web app. The templates use the following logic: if a user doesn't sign-in, it renders the sing-in button. If users sings-in, it renders the access token's claims, link to edit profile, and call a Graph API.
193+
- **index.html**: the home page of the web app. The templates use the following logic: if a user doesn't sign in, it renders the sign-in button. If a user signs in, it renders the access token's claims, link to edit profile, and call a Graph API.
194194

195195
```html
196196
{% extends "base.html" %}

articles/active-directory-b2c/enable-authentication-web-application.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ Azure AD B2C identity provider settings are stored in the *appsettings.json* fil
260260
"Instance": "https://<your-tenant-name>.b2clogin.com",
261261
"ClientId": "<web-app-application-id>",
262262
"Domain": "<your-b2c-domain>",
263-
"SignedOutCallbackPath": "/signout-oidc
263+
"SignedOutCallbackPath": "/signout-oidc",
264264
"SignUpSignInPolicyId": "<your-sign-up-in-policy>"
265265
}
266266
```

0 commit comments

Comments
 (0)