Skip to content

Commit 246bace

Browse files
authored
Merge pull request #227311 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 9919940 + 4d0059e commit 246bace

20 files changed

+130
-136
lines changed

articles/active-directory/develop/scenario-desktop-acquire-token-wam.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ Applications cannot remove accounts from Windows!
129129
- Removes app-only (not OS-wide) accounts.
130130

131131
>[!NOTE]
132-
> Ony users can remove OS accounts, whereas apps themselves cannot. If an OS account is passed into `RemoveAsync`, and then `GetAccounts` is called with `ListWindowsWorkAndSchoolAccounts` enabled, the same OS accounts will still be returned.
132+
> Only users can remove OS accounts, whereas apps themselves cannot. If an OS account is passed into `RemoveAsync`, and then `GetAccounts` is called with `ListWindowsWorkAndSchoolAccounts` enabled, the same OS accounts will still be returned.
133133
134134
## Other considerations
135135

articles/active-directory/develop/v2-oauth2-client-creds-grant-flow.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ https://login.microsoftonline.com/common/adminconsent?client_id=6731de76-14a6-49
106106
| `redirect_uri` | Required | The redirect URI where you want the response to be sent for your app to handle. It must exactly match one of the redirect URIs that you registered in the portal, except that it must be URL-encoded, and it can have additional path segments. |
107107
| `state` | Recommended | A value that's included in the request that's also returned in the token response. It can be a string of any content that you want. The state is used to encode information about the user's state in the app before the authentication request occurred, such as the page or view they were on. |
108108

109-
At this point, Azure AD enforces that only a tenant administrator can sign into complete the request. The administrator will be asked to approve all the direct application permissions that you have requested for your app in the app registration portal.
109+
At this point, Azure AD enforces that only a tenant administrator can sign in to complete the request. The administrator will be asked to approve all the direct application permissions that you have requested for your app in the app registration portal.
110110

111111
##### Successful response
112112

articles/active-directory/hybrid/concept-azure-ad-connect-sync-declarative-provisioning.md

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ In the attribute flows there is a setting to determine if multi-valued attribute
9898

9999
![Screenshot that shows the "Add transformations" section with the "Merge Types" drop-down menu open.](./media/concept-azure-ad-connect-sync-declarative-provisioning/mergetype.png)
100100

101-
There is also **Merge** and **MergeCaseInsensitive**. These options allow you to merge values from different sources. For example, it can be used to merge the member or proxyAddresses attribute from several different forests. When you use this option, all sync rules in scope for an object must use the same merge type. You cannot define **Update** from one Connector and **Merge** from another. If you try, you receive an error.
101+
There is also **Merge** and **MergeCaseInsensitive**. These options allow you to merge values from different sources. For example, it can be used to merge the proxyAddresses attribute from several different forests. When you use this option, all sync rules in scope for an object must use the same merge type. You cannot define **Update** from one Connector and **Merge** from another. If you try, you receive an error.
102102

103103
The difference between **Merge** and **MergeCaseInsensitive** is how to process duplicate attribute values. The sync engine makes sure duplicate values are not inserted into the target attribute. With **MergeCaseInsensitive**, duplicate values with only a difference in case are not going to be present. For example, you should not see both "SMTP:bob@contoso.com" and "smtp:bob@contoso.com" in the target attribute. **Merge** is only looking at the exact values and multiple values where there only is a difference in case might be present.
104104

@@ -122,14 +122,20 @@ In *Out to AD - User Exchange hybrid* the following flow can be found:
122122
This expression should be read as: if the user mailbox is located in Azure AD, then flow the attribute from Azure AD to AD. If not, do not flow anything back to Active Directory. In this case, it would keep the existing value in AD.
123123

124124
### ImportedValue
125-
The function ImportedValue is different than all other functions since the attribute name must be enclosed in quotes rather than square brackets:
125+
126+
The function ImportedValue is different than all other functions since the attribute name must be enclosed in quotes rather than square brackets:
127+
126128
`ImportedValue("proxyAddresses")`.
127129

128-
Usually during synchronization an attribute uses the expected value, even if it hasn’t been exported yet or an error was received during export (“top of the tower”). An inbound synchronization assumes that an attribute that hasn’t yet reached a connected directory eventually reaches it. In some cases, it is important to only synchronize a value that has been confirmed by the connected directory (“hologram and delta import tower”).
130+
Inbound synchronization has a concept of assuming that an attribute that hasn’t yet reached a connected directory will eventually reach it at some point so, normally, synchronization gets an attribute value from the respective connector space, even if it hasn’t been yet exported or an error occurred during export.
131+
In some cases, however, it is important to only synchronize a value that has been exported and confirmed during import from the connected directory. This function can be found in multiple “In From AD/AAD” out-of-box transformation rules where the attribute should only be synchronized when it has been confirmed that the value was exported successfully.
132+
133+
An example of this function can be found in the out-of-box Synchronization Rule *In from AD – User Common from Exchange*, for ProxyAddresses attribute flow with Hybrid Exchange. E.g., when a user’s ProxyAddresses is added, the ImportedValue function will only return the new value after it has been confirmed from the following import step:
129134

130-
An example of this function can be found in the out-of-box Synchronization Rule *In from AD – User Common from Exchange*. In Hybrid Exchange, the value added by Exchange online should only be synchronized when it has been confirmed that the value was exported successfully:
131135
`proxyAddresses` <- `RemoveDuplicates(Trim(ImportedValue("proxyAddresses")))`
132136

137+
This function is required when the target directory might change or discard an exported attribute value silently, and we want the synchronization to only process confirmed attribute values.
138+
133139
## Precedence
134140
When several sync rules try to contribute the same attribute value to the target, the precedence value is used to determine the winner. The rule with highest precedence, lowest numeric value, is going to contribute the attribute in a conflict.
135141

@@ -140,11 +146,9 @@ This ordering can be used to define more precise attribute flows for a small sub
140146
Precedence can be defined between Connectors. That allows Connectors with better data to contribute values first.
141147

142148
### Multiple objects from the same connector space
143-
If you have several objects in the same connector space joined to the same metaverse object, precedence must be adjusted. If several objects are in scope of the same sync rule, then the sync engine is not able to determine precedence. It is ambiguous which source object should contribute the value to the metaverse. This configuration is reported as ambiguous even if the attributes in the source have the same value.
144-
![Diagram that shows multiple objects joined to the same mv object with a transparent red X overlay. ](./media/concept-azure-ad-connect-sync-declarative-provisioning/multiple1.png)
149+
It is not possible to have several objects in the same connector space joined to the same metaverse object. This configuration is reported as ambiguous even if the attributes in the source have the same value.
145150

146-
For this scenario, you need to change the scope of the sync rules so the source objects have different sync rules in scope. That allows you to define different precedence.
147-
![Multiple objects joined to the same mv object](./media/concept-azure-ad-connect-sync-declarative-provisioning/multiple2.png)
151+
![Diagram that shows multiple objects joined to the same mv object with a transparent red X overlay. ](./media/concept-azure-ad-connect-sync-declarative-provisioning/multiple1.png)
148152

149153
## Next steps
150154
* Read more about the expression language in [Understanding Declarative Provisioning Expressions](concept-azure-ad-connect-sync-declarative-provisioning-expressions.md).

articles/active-directory/hybrid/how-to-connect-group-writeback-v2.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -136,11 +136,6 @@ These limitations and known issues are specific to group writeback:
136136
- Nested cloud groups that are members of writeback enabled groups must also be enabled for writeback to remain nested in AD.
137137
- Group Writeback setting to manage new security group writeback at scale is not yet available. You will need to configure writeback for each group. 
138138

139-
If you have a nested group like this, you'll see an export error in Azure AD Connect with the message "A universal group cannot have a local group as a member." The resolution is to remove the member with the **Domain local** scope from the Azure AD group, or update the nested group member scope in Active Directory to **Global** or **Universal**.
140-
- Group writeback supports writing back groups to only a single organizational unit (OU). After the feature is enabled, you can't change the OU that you selected. A workaround is to disable group writeback entirely in Azure AD Connect and then select a different OU when you re-enable the feature. 
141-
- Nested cloud groups that are members of writeback-enabled groups must also be enabled for writeback to remain nested in Active Directory.
142-
- A group writeback setting to manage new security group writeback at scale is not yet available. You need to configure writeback for each group. 
143-
144139
## Next steps
145140

146141
- [Modify Azure AD Connect group writeback default behavior](how-to-connect-modify-group-writeback.md)

articles/active-directory/hybrid/how-to-connect-sync-configure-filtering.md

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ This article covers how to configure the different filtering methods.
3434
## Basics and important notes
3535
In Azure AD Connect sync, you can enable filtering at any time. If you start with a default configuration of directory synchronization and then configure filtering, the objects that are filtered out are no longer synchronized to Azure AD. Because of this change, any objects in Azure AD that were previously synchronized but were then filtered are deleted in Azure AD.
3636

37-
Before you start making changes to filtering, make sure that you [disable the scheduled task](#disable-the-scheduled-task) so you don't accidentally export changes that you haven't yet verified to be correct.
37+
Before you start making changes to filtering, make sure that you [disable the built-in scheduler](#disable-the-synchronization-scheduler) so you don't accidentally export changes that you haven't yet verified to be correct.
3838

3939
Because filtering can remove many objects at the same time, you want to make sure that your new filters are correct before you start exporting any changes to Azure AD. After you've completed the configuration steps, we strongly recommend that you follow the [verification steps](#apply-and-verify-changes) before you export and make changes to Azure AD.
4040

@@ -50,23 +50,21 @@ The filtering configuration is retained when you install or upgrade to a newer v
5050

5151
If you have more than one forest, then you must apply the filtering configurations that are described in this topic to every forest (assuming that you want the same configuration for all of them).
5252

53-
### Disable the scheduled task
53+
### Disable the synchronization scheduler
5454
To disable the built-in scheduler that triggers a synchronization cycle every 30 minutes, follow these steps:
5555

56-
1. Go to a PowerShell prompt.
57-
2. Run `Set-ADSyncScheduler -SyncCycleEnabled $False` to disable the scheduler.
58-
3. Make the changes that are documented in this article.
59-
4. Run `Set-ADSyncScheduler -SyncCycleEnabled $True` to enable the scheduler again.
56+
1. Open Windows Powershell, import the ADSync module and disable the scheduler using the follwoing commands
6057

61-
**If you use an Azure AD Connect build before 1.1.105.0**
62-
To disable the scheduled task that triggers a synchronization cycle every three hours, follow these steps:
58+
```Powershell
59+
import-module ADSync
60+
Set-ADSyncScheduler -SyncCycleEnabled $False
61+
```
6362

64-
1. Start **Task Scheduler** from the **Start** menu.
65-
2. Directly under **Task Scheduler Library**, find the task named **Azure AD Sync Scheduler**, right-click, and select **Disable**.
66-
![Task Scheduler](./media/how-to-connect-sync-configure-filtering/taskscheduler.png)
67-
3. You can now make configuration changes and run the sync engine manually from the **Synchronization Service Manager** console.
63+
2. Make the changes that are documented in this article. Then re-enable the scheduler again with the following command
6864

69-
After you've completed all your filtering changes, don't forget to come back and **Enable** the task again.
65+
```Powershell
66+
Set-ADSyncScheduler -SyncCycleEnabled $True
67+
```
7068

7169
## Filtering options
7270
You can apply the following filtering configuration types to the directory synchronization tool:

articles/aks/node-upgrade-github-actions.md

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ Download and sign in to the Azure CLI.
9595
9696
steps:
9797
- name: Azure Login
98-
uses: Azure/login@v1.1
98+
uses: Azure/login@v1.4.3
9999
with:
100100
creds: ${{ secrets.AZURE_CREDENTIALS }}
101101
```
@@ -110,11 +110,16 @@ Download and sign in to the Azure CLI.
110110

111111
```output
112112
{
113-
"appId": "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
114-
"displayName": "azure-cli-xxxx-xx-xx-xx-xx-xx",
115-
"name": "http://azure-cli-xxxx-xx-xx-xx-xx-xx",
116-
"password": "xXxXxXxXx",
117-
"tenant": "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
113+
"clientId": "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
114+
"clientSecret": "xXxXxXxXx",
115+
"subscriptionId": "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
116+
"tenantId": "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
117+
"activeDirectoryEndpointUrl": "https://login.microsoftonline.com",
118+
"resourceManagerEndpointUrl": "https://management.azure.com/",
119+
"activeDirectoryGraphResourceId": "https://graph.windows.net/",
120+
"sqlManagementEndpointUrl": "https://management.core.windows.net:8443/",
121+
"galleryEndpointUrl": "https://gallery.azure.com/",
122+
"managementEndpointUrl": "https://management.core.windows.net/"
118123
}
119124
```
120125

@@ -149,11 +154,11 @@ To create the steps to execute Azure CLI commands.
149154
150155
steps:
151156
- name: Azure Login
152-
uses: Azure/login@v1.1
157+
uses: Azure/login@v1.4.3
153158
with:
154159
creds: ${{ secrets.AZURE_CREDENTIALS }}
155160
- name: Upgrade node images
156-
uses: Azure/[email protected].0
161+
uses: Azure/[email protected].6
157162
with:
158163
inlineScript: az aks upgrade -g {resourceGroupName} -n {aksClusterName} --node-image-only --yes
159164
```
@@ -190,7 +195,7 @@ jobs:
190195
191196
steps:
192197
- name: Azure Login
193-
uses: Azure/login@v1.1
198+
uses: Azure/login@v1.4.3
194199
with:
195200
creds: ${{ secrets.AZURE_CREDENTIALS }}
196201

articles/azure-arc/data/validation-program.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,19 @@ To see how all Azure Arc-enabled components are validated, see [Validation progr
3434

3535
|Solution and version | Kubernetes version | Azure Arc-enabled data services version | SQL engine version | PostgreSQL server version
3636
|-----|-----|-----|-----|-----|
37+
| PowerStore T|1.25.4|1.15.0_2023-01-10|16.0.816.19223 |Not validated|
3738
| Dell EMC PowerFlex |1.21.5|1.4.1_2022-03-08|15.0.2255.119 | postgres 12.3 (Ubuntu 12.3-1) |
3839
| PowerFlex version 3.6 |1.21.5|1.4.1_2022-03-08|15.0.2255.119 | postgres 12.3 (Ubuntu 12.3-1) |
3940
| PowerFlex CSI version 1.4 |1.21.5|1.4.1_2022-03-08 | 15.0.2255.119 | postgres 12.3 (Ubuntu 12.3-1) |
4041
| PowerStore X|1.20.6|1.0.0_2021-07-30|15.0.2148.140 |postgres 12.3 (Ubuntu 12.3-1) |
41-
| PowerStore T|1.23.5|1.9.0_2022-07-12|16.0.312.4243 |postgres 12.3 (Ubuntu 12.3-1)|
42+
4243

4344
### HPE
4445

4546
|Solution and version | Kubernetes version | Azure Arc-enabled data services version | SQL engine version | PostgreSQL server version
4647
|-----|-----|-----|-----|-----|
47-
|HPE Superdome Flex 280|1.20.0|1.8.0_2022-06-14|16.0.41.7339|12.3 (Ubuntu 12.3-1)
4848
|HPE Apollo 4200 Gen10 Plus | 1.22.6 | 1.11.0_2022-09-13 |16.0.312.4243|12.3 (Ubuntu 12.3-1)|
49+
|HPE Superdome Flex 280|1.20.0|1.8.0_2022-06-14|16.0.41.7339|12.3 (Ubuntu 12.3-1)
4950

5051
### Kublr
5152

@@ -57,8 +58,10 @@ To see how all Azure Arc-enabled components are validated, see [Validation progr
5758

5859
|Solution and version | Kubernetes version | Azure Arc-enabled data services version | SQL engine version | PostgreSQL server version
5960
|-----|-----|-----|-----|-----|
61+
|Lenovo ThinkAgile MX1020 |1.24.6| 1.14.0_2022-12-13 |16.0.816.19223|Not validated|
6062
|Lenovo ThinkAgile MX3520 |AKS on Azure Stack HCI 21H2| 1.10.0_2022-08-09 |16.0.312.4243|postgres 12.3 (Ubuntu 12.3-1)|
6163

64+
6265
### Nutanix
6366

6467
|Solution and version | Kubernetes version | Azure Arc-enabled data services version | SQL engine version | PostgreSQL server version
@@ -83,8 +86,9 @@ To see how all Azure Arc-enabled components are validated, see [Validation progr
8386

8487
|Solution and version | Kubernetes version | Azure Arc-enabled data services version | SQL engine version | PostgreSQL server version
8588
|-----|-----|-----|-----|-----|
86-
| TKGm v1.5.3 | 1.22.8 | 1.9.0_2022-07-12 | 16.0.312.4243 | postgres 12.3 (Ubuntu 12.3-1)|
89+
| TKG 2.1.0 | 1.26.0 | 1.15.0_2023-01-10 | 16.0.816.19223 | postgres 14.5 (Ubuntu 20.04)
8790
| TKG-1.6.0 | 1.23.8 | 1.11.0_2022-09-13 | 16.0.312.4243 | postgres 12.3 (Ubuntu 12.3-1)
91+
| TKGm v1.5.3 | 1.22.8 | 1.9.0_2022-07-12 | 16.0.312.4243 | postgres 12.3 (Ubuntu 12.3-1)|
8892

8993
### Wind River
9094

articles/azure-arc/kubernetes/tutorial-use-gitops-flux2.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,8 @@ az k8s-configuration flux create -g flux-demo-rg \
219219
--scope cluster \
220220
-u https://github.com/Azure/gitops-flux2-kustomize-helm-mt \
221221
--branch main \
222-
--kustomization-name=infra path=./infrastructure prune=true \
223-
--kustomization-name=apps path=./apps/staging prune=true dependsOn=\["infra"\]
222+
--kustomization name=infra path=./infrastructure prune=true \
223+
--kustomization name=apps path=./apps/staging prune=true dependsOn=\["infra"\]
224224
```
225225

226226
The `microsoft.flux` extension will be installed on the cluster (if it hasn't already been installed due to a previous GitOps deployment).
@@ -590,4 +590,4 @@ az k8s-extension delete -g <resource-group> -c <cluster-name> -n flux -t managed
590590
## Next steps
591591

592592
* Read more about [configurations and GitOps](conceptual-gitops-flux2.md).
593-
* Learn how to [use Azure Policy to enforce GitOps at scale](./use-azure-policy-flux-2.md).
593+
* Learn how to [use Azure Policy to enforce GitOps at scale](./use-azure-policy-flux-2.md).

0 commit comments

Comments
 (0)