Skip to content

Commit 613de29

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into stonith
2 parents bfeb268 + 2235c79 commit 613de29

File tree

69 files changed

+1790
-125
lines changed

Some content is hidden

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

69 files changed

+1790
-125
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,11 @@ sections:
164164
How are Windows Updates applied in Azure AD Domain Services?
165165
answer: |
166166
Domain controllers in a managed domain automatically apply required Windows updates. There's nothing for you to configure or administer here. Make sure you don't create network security group rules that block outbound traffic to Windows Updates. For your own VMs joined to the managed domain, you are responsible for configuring and applying any required OS and application updates.
167+
168+
- question: |
169+
Why do my domain controllers change names?
170+
answer: |
171+
It is possible that during the maintenance of domain controllers there is a change in their names. To avoid problems with this type of change, it is recommended to not use the names of the domain controllers hardcoded in applications and/or other domain resources, but the FQDN of the domain. This way, no matter what the names of the domain controllers are, you won't need to reconfigure anything after a name change.
167172
168173
- name: Billing and availability
169174
questions:

articles/active-directory/authentication/how-to-migrate-mfa-server-to-azure-mfa-with-federation.md

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -113,28 +113,28 @@ Run the following PowerShell cmdlet:
113113
The command returns your current additional authentication rules for your relying party trust. Append the following rules to your current claim rules:
114114

115115
```console
116-
c:[Type == "https://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid", Value ==
117-
"YourGroupSID"] => issue(Type = "https://schemas.microsoft.com/claims/authnmethodsproviders",
116+
c:[Type == "http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid", Value ==
117+
"YourGroupSID"] => issue(Type = "http://schemas.microsoft.com/claims/authnmethodsproviders",
118118
Value = "AzureMfaAuthentication");
119-
not exists([Type == "https://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid",
119+
not exists([Type == "http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid",
120120
Value=="YourGroupSid"]) => issue(Type =
121-
"https://schemas.microsoft.com/claims/authnmethodsproviders", Value =
121+
"http://schemas.microsoft.com/claims/authnmethodsproviders", Value =
122122
"AzureMfaServerAuthentication");'
123123
```
124124

125125
The following example assumes your current claim rules are configured to prompt for MFA when users connect from outside your network. This example includes the additional rules that you need to append.
126126

127127
```PowerShell
128128
Set-AdfsAdditionalAuthenticationRule -AdditionalAuthenticationRules 'c:[type ==
129-
"https://schemas.microsoft.com/ws/2012/01/insidecorporatenetwork", value == "false"] => issue(type =
130-
"https://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod", value =
131-
"https://schemas.microsoft.com/claims/multipleauthn" );
132-
c:[Type == "https://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid", Value ==
133-
"YourGroupSID"] => issue(Type = "https://schemas.microsoft.com/claims/authnmethodsproviders",
129+
"http://schemas.microsoft.com/ws/2012/01/insidecorporatenetwork", value == "false"] => issue(type =
130+
"http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod", value =
131+
"http://schemas.microsoft.com/claims/multipleauthn" );
132+
c:[Type == "http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid", Value ==
133+
"YourGroupSID"] => issue(Type = "http://schemas.microsoft.com/claims/authnmethodsproviders",
134134
Value = "AzureMfaAuthentication");
135-
not exists([Type == "https://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid",
135+
not exists([Type == "http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid",
136136
Value=="YourGroupSid"]) => issue(Type =
137-
"https://schemas.microsoft.com/claims/authnmethodsproviders", Value =
137+
"http://schemas.microsoft.com/claims/authnmethodsproviders", Value =
138138
"AzureMfaServerAuthentication");'
139139
```
140140

@@ -145,15 +145,15 @@ This example modifies claim rules on a specific relying party trust (application
145145

146146
```PowerShell
147147
Set-AdfsRelyingPartyTrust -TargetName AppA -AdditionalAuthenticationRules 'c:[type ==
148-
"https://schemas.microsoft.com/ws/2012/01/insidecorporatenetwork", value == "false"] => issue(type =
149-
"https://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod", value =
150-
"https://schemas.microsoft.com/claims/multipleauthn" );
151-
c:[Type == "https://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid", Value ==
152-
"YourGroupSID"] => issue(Type = "https://schemas.microsoft.com/claims/authnmethodsproviders",
148+
"http://schemas.microsoft.com/ws/2012/01/insidecorporatenetwork", value == "false"] => issue(type =
149+
"http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod", value =
150+
"http://schemas.microsoft.com/claims/multipleauthn" );
151+
c:[Type == "http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid", Value ==
152+
"YourGroupSID"] => issue(Type = "http://schemas.microsoft.com/claims/authnmethodsproviders",
153153
Value = "AzureMfaAuthentication");
154-
not exists([Type == "https://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid",
154+
not exists([Type == "http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid",
155155
Value=="YourGroupSid"]) => issue(Type =
156-
"https://schemas.microsoft.com/claims/authnmethodsproviders", Value =
156+
"http://schemas.microsoft.com/claims/authnmethodsproviders", Value =
157157
"AzureMfaServerAuthentication");'
158158
```
159159

@@ -379,12 +379,12 @@ For example, remove the following from the rule(s):
379379

380380

381381
```console
382-
c:[Type == "https://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid", Value ==
383-
"**YourGroupSID**"] => issue(Type = "https://schemas.microsoft.com/claims/authnmethodsproviders",
382+
c:[Type == "http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid", Value ==
383+
"**YourGroupSID**"] => issue(Type = "http://schemas.microsoft.com/claims/authnmethodsproviders",
384384
Value = "AzureMfaAuthentication");
385-
not exists([Type == "https://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid",
385+
not exists([Type == "http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid",
386386
Value=="YourGroupSid"]) => issue(Type =
387-
"https://schemas.microsoft.com/claims/authnmethodsproviders", Value =
387+
"http://schemas.microsoft.com/claims/authnmethodsproviders", Value =
388388
"AzureMfaServerAuthentication");'
389389
```
390390

articles/active-directory/external-identities/hybrid-cloud-to-on-premises.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ The following diagram provides a high-level overview of how Azure AD Application
6666
You can manage the on-premises B2B user objects through lifecycle management policies. For example:
6767

6868
- You can set up multi-factor authentication (MFA) policies for the Guest user so that MFA is used during Application Proxy authentication. For more information, see [Conditional Access for B2B collaboration users](authentication-conditional-access.md).
69-
- Any sponsorships, access reviews, account verifications, etc. that are performed on the cloud B2B user applies to the on-premises users. For example, if the cloud user is deleted through your lifecycle management policies, the on-premises user is also deleted by MIM Sync or through Azure AD Connect sync. For more information, see [Manage guest access with Azure AD access reviews](../governance/manage-guest-access-with-access-reviews.md).
69+
- Any sponsorships, access reviews, account verifications, etc. that are performed on the cloud B2B user applies to the on-premises users. For example, if the cloud user is deleted through your lifecycle management policies, the on-premises user is also deleted by MIM Sync or through the Azure AD B2B script. For more information, see [Manage guest access with Azure AD access reviews](../governance/manage-guest-access-with-access-reviews.md).
7070

7171
### Create B2B guest user objects through an Azure AD B2B script
7272

articles/active-directory/governance/entitlement-management-organization.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,20 +78,20 @@ To add an external Azure AD directory or domain as a connected organization, fol
7878

7979
The **Select directories + domains** pane opens.
8080

81-
1. In the search box, enter a domain name to search for the Azure AD directory or domain. Be sure to enter the entire domain name.
81+
1. In the search box, enter a domain name to search for the Azure AD directory or domain. You can also add domains that are not in Azure AD. Be sure to enter the entire domain name.
8282

83-
1. Confirm that the organization name and authentication type are correct. User sign in, prior to being able to access the myaccess portal, depends on the authentication type for their organization. If the authentication type for a connected organization is Azure AD, then all users with an account in any verified domain of that Azure AD directory will sign into their directory, and then can request access to access packages that allow that connected organization. If the authentication type is One-time passcode, this allows users with email addresses from just that domain to visit the myaccess portal. Then, after they authenticate with the passcode, the user can make a request.
83+
1. Confirm that the organization name(s) and authentication type(s) are correct. User sign in, prior to being able to access the MyAccess portal, depends on the authentication type for their organization. If the authentication type for a connected organization is Azure AD, all users with an account in any verified domain of that Azure AD directory will sign into their directory, and then can request access to access packages that allow that connected organization. If the authentication type is One-time passcode, this allows users with email addresses from just that domain to visit the MyAccess portal. After they authenticate with the passcode, the user can make a request.
8484

8585
![The "Select directories + domains" pane](./media/entitlement-management-organization/organization-select-directories-domains.png)
8686

8787
> [!NOTE]
8888
> Access from some domains could be blocked by the Azure AD business to business (B2B) allow or deny list. For more information, see [Allow or block invitations to B2B users from specific organizations](../external-identities/allow-deny-list.md).
8989
90-
1. Select **Add** to add the Azure AD directory or domain. Currently, you can add only one Azure AD directory or domain per connected organization.
90+
1. Select **Add** to add the Azure AD directory or domain. **You can add multiple Azure AD directories and domains**.
9191

92-
1. After you've added the Azure AD directory or domain, select **Select**.
92+
1. After you've added the Azure AD directories or domains, select **Select**.
9393

94-
The organization appears in the list.
94+
The organization(s) appears in the list.
9595

9696
![The "Directory + domain" pane](./media/entitlement-management-organization/organization-directory-domain.png)
9797

articles/active-directory/reports-monitoring/reference-azure-ad-sla-performance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ For each month, we truncate the SLA attainment at three places after the decimal
6060
| May | 99.999% | 99.999% |
6161
| June | 99.999% | 99.999% |
6262
| July | 99.999% | 99.999% |
63-
| August | 99.999% | |
63+
| August | 99.999% | 99.999% |
6464
| September | 99.999% | |
6565
| October | 99.999% | |
6666
| November | 99.998% | |

articles/active-directory/verifiable-credentials/verifiable-credentials-configure-tenant.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ To add the required permissions, follow these steps:
158158
1. Website ID registration
159159
1. Domain verification.
160160
1. Select on each section and download the JSON file under each.
161-
1. Crete a website that you can use to distribute the files. If you specified **https://contoso.com** as your domain, the URLs for each of the files would look as shown below:
161+
1. Create a website that you can use to distribute the files. If you specified **https://contoso.com** as your domain, the URLs for each of the files would look as shown below:
162162
- `https://contoso.com/.well-known/did.json`
163163
- `https://contoso.com/.well-known/did-configuration.json`
164164

@@ -167,4 +167,4 @@ Once that you have successfully completed the verification steps, you are ready
167167
## Next steps
168168

169169
- [Learn how to issue Microsoft Entra Verified ID credentials from a web application](verifiable-credentials-configure-issuer.md).
170-
- [Learn how to verify Microsoft Entra Verified ID credentials](verifiable-credentials-configure-verifier.md).
170+
- [Learn how to verify Microsoft Entra Verified ID credentials](verifiable-credentials-configure-verifier.md).

articles/aks/TOC.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,8 +260,6 @@
260260
- name: Scan images in your CI/CD Workflow
261261
href: ../defender-for-cloud/defender-for-container-registries-cicd.md
262262
maintainContext: True
263-
- name: Remove vulnerable images with ImageCleaner (preview)
264-
href: image-cleaner.md
265263
- name: Registry security
266264
items:
267265
- name: Scanning images in ACR registries
@@ -273,6 +271,8 @@
273271
href: kubernetes-service-principal.md
274272
- name: Use managed identities
275273
href: use-managed-identity.md
274+
- name: Remove vulnerable images with ImageCleaner (preview)
275+
href: image-cleaner.md
276276
- name: Limit access to cluster configuration file
277277
href: control-kubeconfig-access.md
278278
- name: Define API server authorized IP ranges

articles/aks/image-cleaner.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ms.author: nickoman
55
author: nickomang
66
services: container-service
77
ms.topic: article
8-
ms.date: 08/26/2022
8+
ms.date: 09/09/2022
99
---
1010

1111
# Use ImageCleaner to clean up stale images on your Azure Kubernetes Service cluster (preview)
@@ -17,7 +17,7 @@ It's common to use pipelines to build and deploy images on Azure Kubernetes Serv
1717
## Prerequisites
1818

1919
* An Azure subscription. If you don't have an Azure subscription, you can create a [free account](https://azure.microsoft.com/free).
20-
* [Azure CLI][azure-cli-install] or [Azure PowerShell][azure-powershell-install] and the `aks-preview` CLI extension installed.
20+
* [Azure CLI][azure-cli-install] or [Azure PowerShell][azure-powershell-install] and the `aks-preview` 0.5.96 or later CLI extension installed.
2121
* The `EnableImageCleanerPreview` feature flag registered on your subscription:
2222

2323
### [Azure CLI](#tab/azure-cli)
@@ -164,4 +164,4 @@ The deletion logs are stored in the `image-cleaner-kind-worker` pods. You can ch
164164
[register-azresourceprovider]: /powershell/module/az.resources/register-azresourceprovider
165165

166166
[arm-vms]: https://azure.microsoft.com/blog/azure-virtual-machines-with-ampere-altra-arm-based-processors-generally-available/
167-
[trivy]: https://github.com/aquasecurity/trivy
167+
[trivy]: https://github.com/aquasecurity/trivy

articles/api-management/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@
7676
href: ./security-controls-policy.md
7777
- name: Security baseline
7878
href: /security/benchmark/azure/baselines/api-management-security-baseline?toc=/azure/api-management/&bc=/azure/api-management/breadcrumb/toc.json
79+
- name: Authentication and authorization
80+
href: authentication-authorization-overview.md
7981
- name: Observability
8082
href: observability.md
8183
- name: DevOps and CI/CD

0 commit comments

Comments
 (0)