Skip to content

Commit 282b6af

Browse files
authored
Merge pull request #212277 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 a9715ea + deef9a9 commit 282b6af

File tree

5 files changed

+27
-6
lines changed

5 files changed

+27
-6
lines changed

articles/active-directory/cloud-sync/how-to-prerequisites.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ The following are known limitations:
195195
196196
### Scoping filter
197197
When using OU scoping filter
198-
- You can only sync up to 59 separate OUs for a given configuration.
198+
- You can only sync up to 59 separate OUs or Security Groups for a given configuration.
199199
- Nested OUs are supported (that is, you **can** sync an OU that has 130 nested OUs, but you **cannot** sync 60 separate OUs in the same configuration).
200200
201201
### Password Hash Sync

articles/active-directory/hybrid/reference-connect-adconnectivitytools.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ Confirm-DnsConnectivity [-Forest] <String> [-DCs] <Array> [-ReturnResultAsPSObje
3131
### DESCRIPTION
3232

3333
Runs local Dns connectivity tests.
34-
In order to configure the Active Directory connector, user must have both name resolutionthe
35-
for the forest they is attempting to connect to as well as in the domain controllers
34+
In order to configure the Active Directory connector, AADConnect server must have both name resolution
35+
for the forest it's attempting to connect to as well as to the domain controllers
3636
associated to this forest.
3737

3838
### EXAMPLES

articles/azure-vmware/concepts-storage.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,14 @@ In a three-host cluster, FTT-1 accommodates a single host's failure. Microsoft g
4747

4848
vSAN datastores use data-at-rest encryption by default using keys stored in Azure Key Vault. The encryption solution is KMS-based and supports vCenter Server operations for key management. When a host is removed from a cluster, all data on SSDs is invalidated immediately.
4949

50+
## Datastore capacity expansion options
51+
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.
53+
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.
54+
5055
## Azure storage integration
5156

5257
You can use Azure storage services in workloads running in your private cloud. The Azure storage services include Storage Accounts, Table Storage, and Blob Storage. The connection of workloads to Azure storage services doesn't traverse the internet. This connectivity provides more security and enables you to use SLA-based Azure storage services in your private cloud workloads.
53-
You can expand the datastore capacity by connecting Azure disk pools or [Azure NetApp Files datastores](attach-azure-netapp-files-to-azure-vmware-solution-hosts.md). Azure NetApp Files is available in Ultra, [Premium and Standard performance tiers](/azure/azure-netapp-files/azure-netapp-files-service-levels) to allow adjusting the performance and cost to the requirements of the workloads.
5458

5559
## Alerts and monitoring
5660

articles/event-grid/manage-event-delivery.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ To set a dead letter location, you need a storage account for holding events tha
2323
> [!NOTE]
2424
> - Create a storage account and a blob container in the storage before running commands in this article.
2525
> - The Event Grid service creates blobs in this container. The names of blobs will have the name of the Event Grid subscription with all the letters in upper case. For example, if the name of the subscription is My-Blob-Subscription, names of the dead letter blobs will have MY-BLOB-SUBSCRIPTION (myblobcontainer/MY-BLOB-SUBSCRIPTION/2019/8/8/5/111111111-1111-1111-1111-111111111111.json). This behavior is to protect against differences in case handling between Azure services.
26+
> - In the above example .../2019/8/8/5/... represents the non-zero padded date and hour (UTC): .../YYYY/MM/DD/HH/...
2627
> - The dead letter blobs created will contain one or more events in an array. An important behavior to consider when processing dead letters.
2728
2829

articles/virtual-machines/windows/external-ntpsource-configuration.md

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Time synchronization in Active Directory should be managed by only allowing the
2525
2626
To check current time source in your **PDC**, from an elevated command prompt run *w32tm /query /source* and note the output for later comparison.
2727

28-
1. From *Start* run *gpedit.msc*
28+
1. From *Start* run *gpedit.msc*.
2929
2. Navigate to the *Global Configuration Settings* policy under *Computer Configuration* -> *Administrative Templates* -> *System* -> *Windows Time Service*.
3030
3. Set it to *Enabled* and configure the *AnnounceFlags* parameter to **5**.
3131
4. Navigate to *Computer Settings* -> *Administrative Templates* -> *System* -> *Windows Time Service* -> *Time Providers*.
@@ -55,13 +55,29 @@ To mark the VMIC provider as *Disabled* from *Start* type *regedit.exe* -> In th
5555
5656
From an elevated command prompt rerun *w32tm /query /source* and compare the output to the one you noted at the beginning of the configuration. Now it will be set to the NTP Server you chose.
5757

58+
>[!TIP]
59+
>Follow the steps below if you want to speed-up the process of changing the NTP source on your PDC. You can create a scheduled task to run at **System Start-up** with the **Delay** task for up to (random delay) set to **2 minutes**.
60+
61+
## Scheduled task to set NTP source on your PDC
62+
63+
1. From *Start* run *Task Scheduler*.
64+
2. Browse to *Task Scheduler* Library -> *Microsoft* -> *Windows* -> *Time Synchronization* -> Right-click in the right hand side pane and select *Create New Task*.
65+
3. In the *General* tab, click the *Change User or Group...* button and set it to run as *LOCAL SERVICE*. Then check the box to *Run with highest privileges*.
66+
4. Under *Configure for:* select your operating system version.
67+
5. Switch to the *Triggers* tab, click the *New...* button, and set the schedule as per your requirements. Before clicking *OK*, make sure the box next to *Enabled* is checked.
68+
6. Go to the *Actions* tab. Click the *New...* button and enter the following details:
69+
- On *Action:* set *Start a program*.
70+
- On *Program/script:* set the path to *%windir%\system32\w32tm.exe*.
71+
- On *Add arguments:* type */resync*, and click *OK* to save changes.
72+
7. Under the *Conditions* tab ensure that *Start the task only if the computer is in idle for* and *Start the task only if the computer is on AC power* is *not selected*. Click *OK*.
73+
5874
## GPO for Clients
5975

6076
Configure the following Group Policy Object to enable your clients to synchronize time with any Domain Controller in your Domain:
6177

6278
To check current time source in your client, from an elevated command prompt run *w32tm /query /source* and note the output for later comparison.
6379

64-
1. From a Domain Controller go to *Start* run *gpmc.msc*
80+
1. From a Domain Controller go to *Start* run *gpmc.msc*.
6581
2. Browse to the Forest and Domain where you want to create the GPO.
6682
3. Create a new GPO, for example *Clients Time Sync*, in the container *Group Policy Objects*.
6783
4. Right-click on the newly created GPO and Edit.

0 commit comments

Comments
 (0)