Skip to content

Commit aed2ca9

Browse files
authored
Merge branch 'main' into 141588-refresh-2
2 parents f77ed58 + 6f71efc commit aed2ca9

File tree

1,406 files changed

+12731
-11228
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,406 files changed

+12731
-11228
lines changed

.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: 5 additions & 0 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",

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

articles/active-directory/authentication/concept-system-preferred-multifactor-authentication.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ ms.collection: M365-identity-device-management
1414

1515
# Customer intent: As an identity administrator, I want to encourage users to use the Microsoft Authenticator app in Azure AD to improve and secure user sign-in events.
1616
---
17+
1718
# System-preferred multifactor authentication - Authentication methods policy
1819

1920
System-preferred multifactor authentication (MFA) prompts users to sign in by using the most secure method they registered. Administrators can enable system-preferred MFA to improve sign-in security and discourage less secure sign-in methods like SMS.
@@ -111,7 +112,7 @@ When a user signs in, the authentication process checks which authentication met
111112

112113
1. [Temporary Access Pass](howto-authentication-temporary-access-pass.md)
113114
1. [FIDO2 security key](concept-authentication-passwordless.md#fido2-security-keys)
114-
1. [Microsoft Authenticator push notifications](concept-authentication-authenticator-app.md)
115+
1. [Microsoft Authenticator notifications](concept-authentication-authenticator-app.md)
115116
1. [Time-based one-time password (TOTP)](concept-authentication-oath-tokens.md)<sup>1</sup>
116117
1. [Telephony](concept-authentication-phone-options.md)<sup>2</sup>
117118
1. [Certificate-based authentication](concept-certificate-based-authentication.md)
@@ -134,3 +135,5 @@ The system-preferred MFA also applies for users who are enabled for MFA in the l
134135

135136
* [Authentication methods in Azure Active Directory](concept-authentication-authenticator-app.md)
136137
* [How to run a registration campaign to set up Microsoft Authenticator](how-to-mfa-registration-campaign.md)
138+
139+

articles/active-directory/authentication/how-to-certificate-based-authentication.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ Make sure that the following prerequisites are in place:
3636
>[!IMPORTANT]
3737
>Make sure the PKI is secure and can't be easily compromised. In the event of a compromise, the attacker can create and sign client certificates and compromise any user in the tenant, both users whom are synchronized from on-premises and cloud-only users. However, a strong key protection strategy, along with other physical and logical controls, such as HSM activation cards or tokens for the secure storage of artifacts, can provide defense-in-depth to prevent external attackers or insider threats from compromising the integrity of the PKI. For more information, see [Securing PKI](/previous-versions/windows/it-pro/windows-server-2012-r2-and-2012/dn786443(v=ws.11)).
3838
39+
>[!IMPORTANT]
40+
>Please visit the [Microsoft recommendations](/security/sdl/cryptographic-recommendations#security-protocol-algorithm-and-key-length-recommendations) for best practices for Microsoft Cryptographic involving algorithm choice, key length and data protection. Please make sure to use one of the recommended algorithms, key length and NIST approved curves.
41+
42+
3943
>[!NOTE]
4044
>When evaluating a PKI, it is important to review certificate issuance policies and enforcement. As mentioned, adding certificate authorities (CAs) to Azure AD configuration allows certificates issued by those CAs to authenticate any user in Azure AD. For this reason, it is important to consider how and when the CAs are allowed to issue certificates, and how they implement reusable identifiers. Where administrators need to ensure only a specific certificate is able to be used to authenticate a user, admins should exclusively use high-affinity bindings to achieve a higher level of assurance that only a specific certificate is able to authenticate the user. For more information, see [high-affinity bindings](concept-certificate-based-authentication-technical-deep-dive.md#understanding-the-username-binding-policy).
4145

articles/active-directory/authentication/howto-mfaserver-deploy.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: multi-factor-authentication
66
ms.service: active-directory
77
ms.subservice: authentication
88
ms.topic: how-to
9-
ms.date: 08/04/2023
9+
ms.date: 08/08/2023
1010

1111
ms.author: justinha
1212
author: justinha
@@ -53,10 +53,10 @@ Make sure the server that you're using for Azure Multi-Factor Authentication mee
5353
| Azure Multi-Factor Authentication Server Requirements | Description |
5454
|:--- |:--- |
5555
| Hardware |<li>200 MB of hard disk space</li><li>x32 or x64 capable processor</li><li>1 GB or greater RAM</li> |
56-
| Software |<li>Windows Server 2019<sup>1</sup></li><li>Windows Server 2016</li><li>Windows Server 2012 R2</li><li>Windows Server 2012</li><li>Windows Server 2008/R2 (with [ESU](/lifecycle/faq/extended-security-updates) only)</li><li>Windows 10</li><li>Windows 8.1, all editions</li><li>Windows 8, all editions</li><li>Windows 7, all editions (with [ESU](/lifecycle/faq/extended-security-updates) only)</li><li>Microsoft .NET 4.0 Framework</li><li>IIS 7.0 or greater if installing the user portal or web service SDK</li> |
56+
| Software |<li>Windows Server 2022<sup>1</sup><li>Windows Server 2019<sup>1</sup></li><li>Windows Server 2016</li><li>Windows Server 2012 R2</li><li>Windows Server 2012</li><li>Windows Server 2008/R2 (with [ESU](/lifecycle/faq/extended-security-updates) only)</li><li>Windows 10</li><li>Windows 8.1, all editions</li><li>Windows 8, all editions</li><li>Windows 7, all editions (with [ESU](/lifecycle/faq/extended-security-updates) only)</li><li>Microsoft .NET 4.0 Framework</li><li>IIS 7.0 or greater if installing the user portal or web service SDK</li> |
5757
| Permissions | Domain Administrator or Enterprise Administrator account to register with Active Directory |
5858

59-
<sup>1</sup>If Azure MFA Server fails to activate on an Azure VM that runs Windows Server 2019, try using another version of Windows Server.
59+
<sup>1</sup>If Azure MFA Server fails to activate on an Azure VM that runs Windows Server 2019 or later, try using an earlier version of Windows Server.
6060

6161
### Azure MFA Server Components
6262

0 commit comments

Comments
 (0)