Skip to content

Commit 3a714a9

Browse files
authored
Merge pull request #214461 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 f1cd9b6 + 27e5c11 commit 3a714a9

File tree

15 files changed

+107
-70
lines changed

15 files changed

+107
-70
lines changed

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

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -70,56 +70,56 @@ To configure directory settings to disable automatic writeback of newly created
7070
import-module ADSync
7171
$precedenceValue = Read-Host -Prompt "Enter a unique sync rule precedence value [0-99]"
7272
73-
New-ADSyncRule `
74-
-Name 'In from AAD - Group SOAinAAD Delete WriteBackOutOfScope and SoftDelete' `
75-
-Identifier 'cb871f2d-0f01-4c32-a333-ff809145b947' `
76-
-Description 'Delete AD groups that fall out of scope of Group Writeback or get Soft Deleted in Azure AD' `
77-
-Direction 'Inbound' `
78-
-Precedence $precedenceValue `
79-
-PrecedenceAfter '00000000-0000-0000-0000-000000000000' `
80-
-PrecedenceBefore '00000000-0000-0000-0000-000000000000' `
81-
-SourceObjectType 'group' `
82-
-TargetObjectType 'group' `
83-
-Connector 'b891884f-051e-4a83-95af-2544101c9083' `
84-
-LinkType 'Join' `
85-
-SoftDeleteExpiryInterval 0 `
86-
-ImmutableTag '' `
87-
-OutVariable syncRule
88-
89-
Add-ADSyncAttributeFlowMapping `
90-
-SynchronizationRule $syncRule[0] `
91-
-Destination 'reasonFiltered' `
92-
-FlowType 'Expression' `
93-
-ValueMergeType 'Update' `
94-
-Expression 'IIF((IsPresent([reasonFiltered]) = True) && (InStr([reasonFiltered], "WriteBackOutOfScope") > 0 || InStr([reasonFiltered], "SoftDelete") > 0), "DeleteThisGroupInAD", [reasonFiltered])' `
95-
-OutVariable syncRule
96-
97-
New-Object `
98-
-TypeName 'Microsoft.IdentityManagement.PowerShell.ObjectModel.ScopeCondition' `
99-
-ArgumentList 'cloudMastered','true','EQUAL' `
100-
-OutVariable condition0
101-
102-
Add-ADSyncScopeConditionGroup `
103-
-SynchronizationRule $syncRule[0] `
104-
-ScopeConditions @($condition0[0]) `
105-
-OutVariable syncRule
73+
New-ADSyncRule `
74+
-Name 'In from AAD - Group SOAinAAD Delete WriteBackOutOfScope and SoftDelete' `
75+
-Identifier 'cb871f2d-0f01-4c32-a333-ff809145b947' `
76+
-Description 'Delete AD groups that fall out of scope of Group Writeback or get Soft Deleted in Azure AD' `
77+
-Direction 'Inbound' `
78+
-Precedence $precedenceValue `
79+
-PrecedenceAfter '00000000-0000-0000-0000-000000000000' `
80+
-PrecedenceBefore '00000000-0000-0000-0000-000000000000' `
81+
-SourceObjectType 'group' `
82+
-TargetObjectType 'group' `
83+
-Connector 'b891884f-051e-4a83-95af-2544101c9083' `
84+
-LinkType 'Join' `
85+
-SoftDeleteExpiryInterval 0 `
86+
-ImmutableTag '' `
87+
-OutVariable syncRule
88+
89+
Add-ADSyncAttributeFlowMapping `
90+
-SynchronizationRule $syncRule[0] `
91+
-Destination 'reasonFiltered' `
92+
-FlowType 'Expression' `
93+
-ValueMergeType 'Update' `
94+
-Expression 'IIF((IsPresent([reasonFiltered]) = True) && (InStr([reasonFiltered], "WriteBackOutOfScope") > 0 || InStr([reasonFiltered], "SoftDelete") > 0), "DeleteThisGroupInAD", [reasonFiltered])' `
95+
-OutVariable syncRule
96+
97+
New-Object `
98+
-TypeName 'Microsoft.IdentityManagement.PowerShell.ObjectModel.ScopeCondition' `
99+
-ArgumentList 'cloudMastered','true','EQUAL' `
100+
-OutVariable condition0
101+
102+
Add-ADSyncScopeConditionGroup `
103+
-SynchronizationRule $syncRule[0] `
104+
-ScopeConditions @($condition0[0]) `
105+
-OutVariable syncRule
106106
107-
New-Object `
108-
-TypeName 'Microsoft.IdentityManagement.PowerShell.ObjectModel.JoinCondition' `
109-
-ArgumentList 'cloudAnchor','cloudAnchor',$false `
110-
-OutVariable condition0
111-
112-
Add-ADSyncJoinConditionGroup `
113-
-SynchronizationRule $syncRule[0] `
114-
-JoinConditions @($condition0[0]) `
115-
-OutVariable syncRule
116-
117-
Add-ADSyncRule `
118-
-SynchronizationRule $syncRule[0]
119-
120-
Get-ADSyncRule `
121-
-Identifier 'cb871f2d-0f01-4c32-a333-ff809145b947'
122-
```
107+
New-Object `
108+
-TypeName 'Microsoft.IdentityManagement.PowerShell.ObjectModel.JoinCondition' `
109+
-ArgumentList 'cloudAnchor','cloudAnchor',$false `
110+
-OutVariable condition0
111+
112+
Add-ADSyncJoinConditionGroup `
113+
-SynchronizationRule $syncRule[0] `
114+
-JoinConditions @($condition0[0]) `
115+
-OutVariable syncRule
116+
117+
Add-ADSyncRule `
118+
-SynchronizationRule $syncRule[0]
119+
120+
Get-ADSyncRule `
121+
-Identifier 'cb871f2d-0f01-4c32-a333-ff809145b947'
122+
```
123123

124124
4. [Enable group writeback](how-to-connect-group-writeback-enable.md).
125125
5. Enable the Azure AD Connect sync scheduler:

articles/active-directory/saas-apps/confluencemicrosoft-tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ In this section, you'll enable B.Simon to use Azure single sign-on by granting a
211211
> To enable the default login form for admin login on the login page when the force azure login is enabled, add the query parameter in the browser URL.
212212
> `https://<DOMAIN:PORT>/login.action?force_azure_login=false`
213213
214-
1. **Enable Use of Application Proxy** checkbox, if you have configured your on-premise atlassian application in an App Proxy setup. For App proxy setup , follow the steps on the [Azure AD App Proxy Documentation](/articles/active-directory/app-proxy/what-is-application-proxy.md).
214+
1. **Enable Use of Application Proxy** checkbox, if you have configured your on-premise atlassian application in an App Proxy setup. For App proxy setup , follow the steps on the [Azure AD App Proxy Documentation](../app-proxy/what-is-application-proxy.md).
215215

216216
1. Click **Save** button to save the settings.
217217

articles/active-directory/saas-apps/github-enterprise-managed-user-oidc-provisioning-tutorial.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,12 @@ This section guides you through the steps to configure the Azure AD provisioning
106106

107107
5. Under the **Admin Credentials** section, input your GitHub Enterprise Managed User (OIDC) Tenant URL and Secret Token. Click **Test Connection** to ensure Azure AD can connect to GitHub Enterprise Managed User (OIDC). If the connection fails, ensure your GitHub Enterprise Managed User (OIDC) account has created the secret token as an enterprise owner and try again.
108108

109+
For "Tenant URL", type https://api.github.com/scim/v2/enterprises/YOUR_ENTERPRISE, replacing YOUR_ENTERPRISE with the name of your enterprise account.
110+
111+
For example, if your enterprise account's URL is https://github.com/enterprises/octo-corp, the name of the enterprise account is octo-corp.
112+
113+
For "Secret token", paste the personal access token with the admin:enterprise scope that you created earlier.
114+
109115
![Token](common/provisioning-testconnection-tenanturltoken.png)
110116

111117
6. In the **Notification Email** field, enter the email address of a person or group who should receive the provisioning error notifications and select the **Send an email notification when a failure occurs** check box.
@@ -172,4 +178,4 @@ Once you've configured provisioning, use the following resources to monitor your
172178

173179
## Next steps
174180

175-
* [Learn how to review logs and get reports on provisioning activity](../app-provisioning/check-status-user-account-provisioning.md)
181+
* [Learn how to review logs and get reports on provisioning activity](../app-provisioning/check-status-user-account-provisioning.md)

articles/active-directory/saas-apps/jiramicrosoft-tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ In this section, you'll enable B.Simon to use Azure single sign-on by granting a
237237

238238
k. **Enable Use of Application Proxy** checkbox, if you have configured your on-premise atlassian application in an App Proxy setup.
239239

240-
* For App proxy setup , follow the steps on the [Azure AD App Proxy Documentation](/articles/active-directory/app-proxy/what-is-application-proxy.md).
240+
* For App proxy setup , follow the steps on the [Azure AD App Proxy Documentation](../app-proxy/what-is-application-proxy.md).
241241

242242
l. Click **Save** button to save the settings.
243243

articles/azure-vmware/concepts-storage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ vSAN datastores use data-at-rest encryption by default using keys stored in Azur
4949

5050
## Datastore capacity expansion options
5151

52-
The vSAN datastore capacity can be expanded by connecting Azure storage resources such as [Azure NetApp Files volumes as datastores](/azure/azure-vmware/attach-azure-netapp-files-to-azure-vmware-solution-hosts). Virtual machines can be migrated between vSAN and Azure NetApp Files datastores using storage vMotion. Azure NetApp Files datastores can be replicated to other regions using storage based [Cross-region replication](/azure/azure-netapp-files/cross-region-replication-introduction) for testing, development and failover purposes.
52+
The vSAN datastore capacity can be expanded by connecting Azure storage resources such as [Azure NetApp Files volumes as datastores](/azure/azure-vmware/attach-azure-netapp-files-to-azure-vmware-solution-hosts). Virtual machines can be migrated between vSAN and Azure NetApp Files datastores using storage vMotion.
5353
Azure NetApp Files is available in [Ultra, Premium and Standard performance tiers](/azure/azure-netapp-files/azure-netapp-files-service-levels) to allow for adjusting performance and cost to the requirements of the workloads.
5454

5555
## Azure storage integration

articles/azure-vmware/configure-vmware-hcx.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,12 @@ VMware HCX Connector deploys a subset of virtual appliances (automated) that req
7575
- vMotion
7676
- Replication
7777
- Uplink
78+
79+
> [!NOTE]
80+
> * Azure VMware Solution connected via VPN should set Uplink Network Profile MTU's to 1350 to account for IPSec overhead.
81+
> * Azure VMWare Solution defaults to 1500 MTU and is sufficient for most ExpressRoute implementations.
82+
> * If your ExpressRoute provider does not support jumbo frame, MTU may need to be lowered in ExpressRoute setups as well.
83+
> * Changes to MTU should be performed on both HCX Connector (on-premises) and HCX Cloud Manager (Azure VMware Solution) network profiles.
7884
7985
1. Under **Infrastructure**, select **Interconnect** > **Multi-Site Service Mesh** > **Network Profiles** > **Create Network Profile**.
8086

articles/container-apps/communicate-between-microservices.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,13 +163,15 @@ Output from the `az acr build` command shows the upload progress of the source c
163163
# [Bash](#tab/bash)
164164
165165
```azurecli
166-
docker push $ACR_NAME.azurecr.io/albumapp-ui
166+
167+
docker push "$ACR_NAME.azurecr.io/albumapp-ui"
167168
```
168169
169170
# [PowerShell](#tab/powershell)
170171
171172
```powershell
172-
docker push $ACR_NAME.azurecr.io/albumapp-ui
173+
174+
docker push "$ACR_NAME.azurecr.io/albumapp-ui"
173175
```
174176
175177
---

articles/dev-box/concept-dev-box-concepts.md

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,10 @@ This article describes the key concepts and components of Microsoft Dev Box.
2121

2222
## Dev center
2323

24-
A dev center is a collection of projects that require similar settings. Dev centers enable dev infrastructure managers to manage the images and SKUs available to the projects using [dev box definitions](concept-dev-box-concepts.md#dev-box-definition), and configure the networks the development teams consume using [network connections](./concept-dev-box-concepts.md#network-connection).
25-
24+
A dev center is a collection of projects that require similar settings. Dev centers enable dev infrastructure managers to manage the images and SKUs available to the projects using [dev box definitions](concept-dev-box-concepts.md#dev-box-definition) and configure the networks the development teams consume using [network connections](./concept-dev-box-concepts.md#network-connection).
2625
## Projects
2726

28-
A project is the point of access for the development team members. When you associate a project with a dev center, all the settings at the dev center level will be applied to the project automatically. Each project can be associated with only one dev center. Dev managers can configure the dev boxes available for the project by specifying the [dev box definitions](./concept-dev-box-concepts.md#dev-box-definition) appropriate for their workloads.
29-
27+
A project is the point of access for the development team members. When you associate a project with a dev center, all the settings at the dev center level will be applied to the project automatically. Each project can be associated with only one dev center. Dev managers can configure the dev boxes available for the project by specifying the [dev box definitions](./concept-dev-box-concepts.md#dev-box-definition) appropriate for their workloads.
3028
## Dev box definition
3129

3230
A dev box definition specifies a source image and size, including compute size and storage size. You can use a source image from the marketplace, or a custom image from your own [Azure Compute Gallery](./how-to-configure-azure-compute-gallery.md). You can use dev box definitions across multiple projects in a dev center.
@@ -35,12 +33,10 @@ A dev box definition specifies a source image and size, including compute size a
3533

3634
IT administrators and dev infrastructure managers configure the network used for dev box creation in accordance with their organizational policies. Network connections store configuration information like Active Directory join type and virtual network that dev boxes use to connect to network resources.
3735

38-
When creating a network connection, you must choose whether to use a native Azure Active Directory (Azure AD) join or a hybrid Azure AD join. If your dev boxes need to connect exclusively to cloud-based resources, use a native Azure AD join. Use a hybrid Azure AD join if your dev boxes need to connect to on-premises resources and cloud-based resources. To learn more about Azure AD and hybrid Azure AD joined devices, [Plan your Azure Active Directory device deployment](/azure/active-directory/devices/plan-device-deployment).
39-
36+
When creating a network connection, you must choose whether to use a native Azure Active Directory (Azure AD) join or a hybrid Azure AD join. If your dev boxes need to connect exclusively to cloud-based resources, use a native Azure AD join. Use a hybrid Azure AD join if your dev boxes need to connect to on-premises resources and cloud-based resources. To learn more about Azure AD and hybrid Azure AD joined devices, [Plan your Azure Active Directory device deployment](/azure/active-directory/devices/plan-device-deployment).
4037
The virtual network specified in a network connection also determines the region for the dev box. You can create multiple network connections based on the regions where you support developers and use them when creating different dev box pools to ensure dev box users create a dev box in a region close to them. Using a region close to the dev box user provides the best experience.
4138

4239
## Dev box pool
43-
A dev box pool is a collection of dev boxes that you manage together that you manage together and to which you apply similar settings. You can create multiple dev box pools to support the needs of hybrid teams working in different regions or on different workloads.
44-
40+
A dev box pool is a collection of dev boxes that you manage together and to which you apply similar settings. You can create multiple dev box pools to support the needs of hybrid teams working in different regions or on different workloads.
4541
## Dev box
46-
A dev box is a preconfigured ready-to-code workstation that you create through the self-service developer portal. The new dev box has all the tools, binaries, and configuration required for a dev box user to be productive immediately. You can create and manage multiple dev boxes to work on multiple work streams. As a dev box user you have control over your own dev boxes - you can create more as you need them, and delete them when you have finished using them.
42+
A dev box is a preconfigured ready-to-code workstation that you create through the self-service developer portal. The new dev box has all the tools, binaries, and configuration required for a dev box user to be productive immediately. You can create and manage multiple dev boxes to work on multiple work streams. As a dev box user, you have control over your own dev boxes - you can create more as you need them and delete them when you have finished using them.

articles/openshift/support-policies-v4.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Certain configurations for Azure Red Hat OpenShift 4 clusters can affect your cl
2525
* Don't remove or modify the cluster Prometheus service.
2626
* Don't remove or modify the cluster Alertmanager service or Default receiver. It *is* supported to create additional receivers to notify external systems.
2727
* Don't remove Service Alertmanager rules.
28-
* Security groups can't be modified. Any attempt to modify security groups will be reverted.
28+
* The ARO-provided Network Security Group can't be modified or replaced. Any attempt to modify or replace it will be reverted.
2929
* Don't remove or modify Azure Red Hat OpenShift service logging (mdsd pods).
3030
* Don't remove or modify the 'arosvc.azurecr.io' cluster pull secret.
3131
* All cluster virtual machines must have direct outbound internet access, at least to the Azure Resource Manager (ARM) and service logging (Geneva) endpoints. No form of HTTPS proxying is supported.

articles/service-bus-messaging/service-bus-messages-payloads.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,12 @@ While this hidden serialization magic is convenient, applications should take ex
6767

6868
The .NET Standard and Java API variants only accept byte arrays, which means that the application must handle object serialization control.
6969

70+
If the payload of a message can't be deserialized, then it is recommended to [dead-letter the message](/azure/service-bus-messaging/service-bus-dead-letter-queues?source=recommendations#application-level-dead-lettering).
71+
7072
## Next steps
7173

7274
To learn more about Service Bus messaging, see the following topics:
7375

7476
* [Service Bus queues, topics, and subscriptions](service-bus-queues-topics-subscriptions.md)
7577
* [Get started with Service Bus queues](service-bus-dotnet-get-started-with-queues.md)
76-
* [How to use Service Bus topics and subscriptions](service-bus-dotnet-how-to-use-topics-subscriptions.md)
78+
* [How to use Service Bus topics and subscriptions](service-bus-dotnet-how-to-use-topics-subscriptions.md)

0 commit comments

Comments
 (0)