Skip to content

Commit b2bcf17

Browse files
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into WI-96522-verbatim-fix-builtin-policy-name
2 parents c0c5a4f + 00a5aa3 commit b2bcf17

File tree

2,346 files changed

+23437
-17397
lines changed

Some content is hidden

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

2,346 files changed

+23437
-17397
lines changed

.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: 16 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",
@@ -24127,11 +24132,20 @@
2412724132
"source_path_from_root": "/articles/reliability/migrate-app-service-environment.md",
2412824133
"redirect_url": "/azure/reliability/reliability-app-service",
2412924134
"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
2413024145
}
2413124146

2413224147

2413324148

24134-
24135-
24149+
2413624150
]
2413724151
}

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-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
```

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ To get started, you need:
2828
* If you don't have one, get a [Azure free account](https://azure.microsoft.com/free/)
2929
* An Azure AD B2C tenant linked to the Azure subscription
3030
* [Tutorial: Create an Azure Active Directory B2C tenant](tutorial-create-tenant.md)
31-
* Go to [noknok.com](https://noknok.com/products/strong-authentication-service/). On the top menu, select **Demo**.
31+
* Go to [noknok.com](https://noknok.com/). On the top menu, select **Demo**.
3232

3333
## Scenario description
3434

articles/active-directory-domain-services/policy-reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Built-in policy definitions for Azure Active Directory Domain Services
33
description: Lists Azure Policy built-in policy definitions for Azure Active Directory Domain Services. These built-in policy definitions provide common approaches to managing your Azure resources.
4-
ms.date: 08/03/2023
4+
ms.date: 08/08/2023
55
ms.service: active-directory
66
ms.subservice: domain-services
77
author: justinha

articles/active-directory/app-provisioning/on-premises-web-services-connector.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ The web services connector implements the following functionalities:
4040

4141

4242
## Documentation for popular applications
43-
Integrations with popular applications such as SAP ECC and Oracle eBusiness Suite can be found [here](https://www.microsoft.com/download/details.aspx?id=51495). You can also configure a template to connect to your own [rest or SOAP API](/microsoft-identity-manager/reference/microsoft-identity-manager-2016-ma-ws).
43+
Integrations with popular applications such as [SAP ECC 7.0](on-premises-sap-connector-configure.md) and Oracle eBusiness Suite can be found [here](https://www.microsoft.com/download/details.aspx?id=51495). You can also configure a template to connect to your own [rest or SOAP API](/microsoft-identity-manager/reference/microsoft-identity-manager-2016-ma-ws).
4444

4545

4646
For more information, see [the Overview of the generic Web Service connector](/microsoft-identity-manager/reference/microsoft-identity-manager-2016-ma-ws) in the MIM documentation library.

articles/active-directory/app-provisioning/skip-out-of-scope-deletions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ This article describes how to use the Microsoft Graph API and the Microsoft Grap
2020
* If ***SkipOutOfScopeDeletions*** is set to 0 (false), accounts that go out of scope are disabled in the target.
2121
* If ***SkipOutOfScopeDeletions*** is set to 1 (true), accounts that go out of scope aren't disabled in the target. This flag is set at the *Provisioning App* level and can be configured using the Graph API.
2222

23-
Because this configuration is widely used with the *Workday to Active Directory user provisioning* app, the following steps include screenshots of the Workday application. However, the configuration can also be used with *all other apps*, such as ServiceNow, Salesforce, and Dropbox and [cross-tenant synchronization](../multi-tenant-organizations/cross-tenant-synchronization-configure.md). To successfully complete this procedure, you must have first set up app provisioning for the app. Each app has its own configuration article. For example, to configure the Workday application, see [Tutorial: Configure Workday to Azure AD user provisioning](../saas-apps/workday-inbound-cloud-only-tutorial.md).
23+
Because this configuration is widely used with the *Workday to Active Directory user provisioning* app, the following steps include screenshots of the Workday application. However, the configuration can also be used with *all other apps*, such as ServiceNow, Salesforce, and Dropbox. To successfully complete this procedure, you must have first set up app provisioning for the app. Each app has its own configuration article. For example, to configure the Workday application, see [Tutorial: Configure Workday to Azure AD user provisioning](../saas-apps/workday-inbound-cloud-only-tutorial.md). SkipOutOfScopeDeletions does not work for cross-tenant synchronization.
2424

2525
## Step 1: Retrieve your Provisioning App Service Principal ID (Object ID)
2626

articles/active-directory/app-proxy/application-proxy-connectors.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.service: active-directory
88
ms.subservice: app-proxy
99
ms.workload: identity
1010
ms.topic: conceptual
11-
ms.date: 11/17/2022
11+
ms.date: 08/09/2023
1212
ms.author: kenwith
1313
ms.reviewer: ashishj
1414
---
@@ -28,6 +28,8 @@ To deploy Application Proxy successfully, you need at least one connector, but w
2828
### Windows Server
2929
You need a server running Windows Server 2012 R2 or later on which you can install the Application Proxy connector. The server needs to connect to the Application Proxy services in Azure, and the on-premises applications that you're publishing.
3030

31+
Starting from the version 1.5.3437.0, having the .NET version 4.7.1 or greater is required for successful installation (upgrade).
32+
3133
The server needs to have TLS 1.2 enabled before you install the Application Proxy connector. To enable TLS 1.2 on the server:
3234

3335
1. Set the following registry keys:
@@ -36,7 +38,7 @@ The server needs to have TLS 1.2 enabled before you install the Application Prox
3638
[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\TLS 1.2]
3739
[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\TLS 1.2\Client] "DisabledByDefault"=dword:00000000 "Enabled"=dword:00000001
3840
[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\TLS 1.2\Server] "DisabledByDefault"=dword:00000000 "Enabled"=dword:00000001
39-
[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\.NETFramework\v4.0.30319] "SchUseStrongCrypto"=dword:00000001
41+
[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\.NETFramework\v4.8.4250.0] "SchUseStrongCrypto"=dword:00000001
4042
```
4143
4244
A `regedit` file you can use to set these values follows:
@@ -51,7 +53,7 @@ The server needs to have TLS 1.2 enabled before you install the Application Prox
5153
[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\TLS 1.2\Server]
5254
"DisabledByDefault"=dword:00000000
5355
"Enabled"=dword:00000001
54-
[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\.NETFramework\v4.0.30319]
56+
[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\.NETFramework\v4.8.4250.0]
5557
"SchUseStrongCrypto"=dword:00000001
5658
```
5759

0 commit comments

Comments
 (0)