Skip to content

Commit c008aff

Browse files
authored
Merge pull request #188498 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 f1226e5 + 0f98533 commit c008aff

File tree

6 files changed

+26
-24
lines changed

6 files changed

+26
-24
lines changed

articles/active-directory/hybrid/how-to-connect-health-agent-install.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ The following table lists requirements for using Azure AD Connect Health.
3333
| The Azure service endpoints have outbound connectivity. | During installation and runtime, the agent requires connectivity to Azure AD Connect Health service endpoints. If firewalls block outbound connectivity, add the [outbound connectivity endpoints](how-to-connect-health-agent-install.md#outbound-connectivity-to-the-azure-service-endpoints) to the allow list. |
3434
|Outbound connectivity is based on IP addresses. | For information about firewall filtering based on IP addresses, see [Azure IP ranges](https://www.microsoft.com/download/details.aspx?id=56519).|
3535
| TLS inspection for outbound traffic is filtered or disabled. | The agent registration step or data upload operations might fail if there's TLS inspection or termination for outbound traffic at the network layer. For more information, see [Set up TLS inspection](/previous-versions/tn-archive/ee796230(v=technet.10)). |
36-
| Firewall ports on the server are running the agent. |The agent requires the following firewall ports to be open so that it can communicate with the Azure AD Connect Health service endpoints: <br /><li>TCP port 443</li><li>TCP port 5671</li> <br />The latest version of the agent doesn't require port 5671. Upgrade to the latest version so that only port 443 is required. For more information, see [Hybrid identity required ports and protocols](./reference-connect-ports.md). |
36+
| Firewall ports on the server are running the agent. |The agent requires the following firewall ports to be open so that it can communicate with the Azure AD Connect Health service endpoints: <br /><li>TCP port 443</li><li>TCP port 5671</li> <br />The latest version of the agent doesn't require port 5671. Upgrade to the latest version so that only port 443 is required. For more information, see [Hybrid identity required ports and protocols](./reference-connect-ports.md). |
3737
| If Internet Explorer enhanced security is enabled, allow specified websites. |If Internet Explorer enhanced security is enabled, then allow the following websites on the server where you install the agent:<br /><li>https:\//login.microsoftonline.com</li><li>https:\//secure.aadcdn.microsoftonline-p.com</li><li>https:\//login.windows.net</li><li>https:\//aadcdn.msftauth.net</li><li>The federation server for your organization that's trusted by Azure AD (for example, https:\//sts.contoso.com)</li> <br />For more information, see [How to configure Internet Explorer](https://support.microsoft.com/help/815141/internet-explorer-enhanced-security-configuration-changes-the-browsing). If you have a proxy in your network, then see the note that appears at the end of this table.|
3838
| PowerShell version 5.0 or newer is installed. | Windows Server 2016 includes PowerShell version 5.0.
3939

@@ -55,7 +55,7 @@ These URLs allow communication with Azure AD Connect Health service endpoints. L
5555

5656
| Domain environment | Required Azure service endpoints |
5757
| --- | --- |
58-
| General public | <li>&#42;.blob.core.windows.net </li><li>&#42;.aadconnecthealth.azure.com </li><li>&#42;.servicebus.windows.net - Port: 5671 (This endpoint isn't required in the latest version of the agent.)</li><li>&#42;.adhybridhealth.azure.com/</li><li>https:\//management.azure.com </li><li>https:\//policykeyservice.dc.ad.msft.net/</li><li>https:\//login.windows.net</li><li>https:\//login.microsoftonline.com</li><li>https:\//secure.aadcdn.microsoftonline-p.com </li><li>https:\//www.office.com (This endpoint is used only for discovery purposes during registration.)</li> <li>https://aadcdn.msftauth.net</li><li>https://aadcdn.msauth.net</li> |
58+
| General public | <li>&#42;.blob.core.windows.net </li><li>&#42;.aadconnecthealth.azure.com </li><li>&#42;*.servicebus.windows.net - Port: 5671 (If 5671 is blocked, the agent falls back to 443, but using 5671 is recommended. This endpoint isn't required in the latest version of the agent.)</li><li>&#42;.adhybridhealth.azure.com/</li><li>https:\//management.azure.com </li><li>https:\//policykeyservice.dc.ad.msft.net/</li><li>https:\//login.windows.net</li><li>https:\//login.microsoftonline.com</li><li>https:\//secure.aadcdn.microsoftonline-p.com </li><li>https:\//www.office.com (This endpoint is used only for discovery purposes during registration.)</li> <li>https://aadcdn.msftauth.net</li><li>https://aadcdn.msauth.net</li> |
5959
| Azure Germany | <li>&#42;.blob.core.cloudapi.de </li><li>&#42;.servicebus.cloudapi.de </li> <li>&#42;.aadconnecthealth.microsoftazure.de </li><li>https:\//management.microsoftazure.de </li><li>https:\//policykeyservice.aadcdi.microsoftazure.de </li><li>https:\//login.microsoftonline.de </li><li>https:\//secure.aadcdn.microsoftonline-p.de </li><li>https:\//www.office.de (This endpoint is used only for discovery purposes during registration.)</li> <li>https://aadcdn.msftauth.net</li><li>https://aadcdn.msauth.net</li> |
6060
| Azure Government | <li>&#42;.blob.core.usgovcloudapi.net </li> <li>&#42;.servicebus.usgovcloudapi.net </li> <li>&#42;.aadconnecthealth.microsoftazure.us </li> <li>https:\//management.usgovcloudapi.net </li><li>https:\//policykeyservice.aadcdi.azure.us </li><li>https:\//login.microsoftonline.us </li><li>https:\//secure.aadcdn.microsoftonline-p.com </li><li>https:\//www.office.com (This endpoint is used only for discovery purposes during registration.)</li> <li>https://aadcdn.msftauth.net</li><li>https://aadcdn.msauth.net</li> |
6161

articles/active-directory/hybrid/how-to-connect-sync-recycle-bin.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@ ms.author: billmath
1818

1919
ms.collection: M365-identity-device-management
2020
---
21-
# Azure AD Connect sync: Enable AD recycle bin
22-
It is recommended that you enable the AD Recycle Bin feature for your on-premises Active Directories, which are synchronized to Azure AD.
21+
# Azure AD Connect sync: Enable Active Directory recycle bin
22+
We recommend that you enable the Active Directory Recycle Bin feature for your on-premises instances of Active Directory (AD) that are synchronized to Azure AD.
2323

24-
If you accidentally deleted an on-premises AD user object and restore it using the feature, Azure AD restores the corresponding Azure AD user object. For information about the AD Recycle Bin feature, refer to article [Scenario Overview for Restoring Deleted Active Directory Objects](/previous-versions/windows/it-pro/windows-server-2008-R2-and-2008/dd379542(v=ws.10)).
24+
If you accidentally deleted an on-premises AD user object and restore it using the feature, Azure AD restores the corresponding Azure AD user object. For information about restoring Active Directory objects, see [Scenario overview for restoring deleted Active Directory objects](/previous-versions/windows/it-pro/windows-server-2008-R2-and-2008/dd379542(v=ws.10)).
25+
26+
To learn how to enable the Active Directory Recycle Bin feature, see [Active Directory Administrative Center enhancements](/windows-server/identity/ad-ds/get-started/adac/introduction-to-active-directory-administrative-center-enhancements--level-100-#ad_recycle_bin_mgmt).
2527

2628
## Benefits of enabling the AD recycle bin
2729
This feature helps with restoring Azure AD user objects by doing the following:

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ This table describes the ports and protocols that are required for communication
3333
| LDAP |389 (TCP/UDP) |Used for data import from AD. Data is encrypted with Kerberos Sign & Seal. |
3434
| SMB | 445 (TCP) |Used by Seamless SSO to create a computer account in the AD forest and during password writeback. For more information, see [Change a user account's password](/openspecs/windows_protocols/ms-adod/d211aaba-d188-4836-8007-8c62f7c9402d). |
3535
| LDAP/SSL |636 (TCP/UDP) |Used for data import from AD. The data transfer is signed and encrypted. Only used if you are using TLS. |
36-
| RPC |49152- 65535 (Random high RPC Port)(TCP) |Used during the initial configuration of Azure AD Connect when it binds to the AD forests, and during Password synchronization. If the dynamic port has been changed, you need to open that port. See [KB929851](https://support.microsoft.com/kb/929851), [KB832017](https://support.microsoft.com/kb/832017), and [KB224196](https://support.microsoft.com/kb/224196) for more information. |
36+
| RPC |49152- 65535 (Random high RPC Port) (TCP) |Used during the initial configuration of Azure AD Connect when it binds to the AD forests, and during Password synchronization. If the dynamic port has been changed, you need to open that port. See [KB929851](https://support.microsoft.com/kb/929851), [KB832017](https://support.microsoft.com/kb/832017), and [KB224196](https://support.microsoft.com/kb/224196) for more information. |
3737
|WinRM | 5985 (TCP) |Only used if you are installing AD FS with gMSA by Azure AD Connect Wizard|
3838
|AD DS Web Services | 9389 (TCP) |Only used if you are installing AD FS with gMSA by Azure AD Connect Wizard |
3939
| Global Catalog | 3268 (TCP) | Used by Seamless SSO to query the global catalog in the forest before creating a computer account in the domain. |
@@ -44,7 +44,7 @@ This table describes the ports and protocols that are required for communication
4444
| Protocol | Ports | Description |
4545
| --- | --- | --- |
4646
| HTTP |80 (TCP) |Used to download CRLs (Certificate Revocation Lists) to verify TLS/SSL certificates. |
47-
| HTTPS |443(TCP) |Used to synchronize with Azure AD. |
47+
| HTTPS |443 (TCP) |Used to synchronize with Azure AD. |
4848

4949
For a list of URLs and IP addresses you need to open in your firewall, see [Office 365 URLs and IP address ranges](https://support.office.com/article/Office-365-URLs-and-IP-address-ranges-8548a211-3fe7-47cb-abb1-355ea5aa88a2) and [Troubleshooting Azure AD Connect connectivity](tshoot-connect-connectivity.md#troubleshoot-connectivity-issues-in-the-installation-wizard).
5050

@@ -54,40 +54,40 @@ This table describes the ports and protocols that are required for communication
5454
| Protocol | Ports | Description |
5555
| --- | --- | --- |
5656
| HTTP |80 (TCP) |Used to download CRLs (Certificate Revocation Lists) to verify TLS/SSL certificates. |
57-
| HTTPS |443(TCP) |Used to synchronize with Azure AD. |
57+
| HTTPS |443 (TCP) |Used to synchronize with Azure AD. |
5858
| WinRM |5985 |WinRM Listener |
5959

6060
## Table 4 - WAP and Federation Servers
6161
This table describes the ports and protocols that are required for communication between the Federation servers and WAP servers.
6262

6363
| Protocol | Ports | Description |
6464
| --- | --- | --- |
65-
| HTTPS |443(TCP) |Used for authentication. |
65+
| HTTPS |443 (TCP) |Used for authentication. |
6666

6767
## Table 5 - WAP and Users
6868
This table describes the ports and protocols that are required for communication between users and the WAP servers.
6969

7070
| Protocol | Ports | Description |
7171
| --- | --- | --- |
72-
| HTTPS |443(TCP) |Used for device authentication. |
72+
| HTTPS |443 (TCP) |Used for device authentication. |
7373
| TCP |49443 (TCP) |Used for certificate authentication. |
7474

7575
## Table 6a & 6b - Pass-through Authentication with Single Sign On (SSO) and Password Hash Sync with Single Sign On (SSO)
7676
The following tables describes the ports and protocols that are required for communication between the Azure AD Connect and Azure AD.
7777

7878
### Table 6a - Pass-through Authentication with SSO
79-
|Protocol|Port Number|Description
80-
| --- | --- | ---
81-
|HTTP|80|Enable outbound HTTP traffic for security validation such as SSL. Also needed for the connector auto-update capability to function properly.
82-
|HTTPS|443| Enable outbound HTTPS traffic for operations such as enabling and disabling of the feature, registering connectors, downloading connector updates, and handling all user sign-in requests.
79+
| Protocol | Ports | Description |
80+
| --- | --- | --- |
81+
| HTTP |80 (TCP)|Used to download CRLs (Certificate Revocation Lists) to verify TLS/SSL certificates. Also needed for the connector auto-update capability to function properly. |
82+
| HTTPS |443 (TCP)|Used to enable and disable the feature, register connectors, download connector updates, and handle all user sign-in requests. |
8383

8484
In addition, Azure AD Connect needs to be able to make direct IP connections to the [Azure data center IP ranges](https://www.microsoft.com/download/details.aspx?id=41653).
8585

8686
### Table 6b - Password Hash Sync with SSO
8787

88-
|Protocol|Port Number|Description
89-
| --- | --- | ---
90-
|HTTPS|443| Enable SSO registration (required only for the SSO registration process).
88+
| Protocol | Ports | Description |
89+
| --- | --- | --- |
90+
| HTTPS |443 (TCP)|Used to enable SSO registration (required only for the SSO registration process).
9191

9292
In addition, Azure AD Connect needs to be able to make direct IP connections to the [Azure data center IP ranges](https://www.microsoft.com/download/details.aspx?id=41653). Again, this is only required for the SSO registration process.
9393

@@ -99,11 +99,11 @@ This table describes the following outbound ports and protocols that are require
9999

100100
| Protocol | Ports | Description |
101101
| --- | --- | --- |
102-
| HTTPS |443(TCP) |Outbound |
103-
| Azure Service Bus |5671 (TCP) |Outbound |
102+
| Azure Service Bus |5671 (TCP) | Used to send health information to Azure AD. (recommended but not required in latest versions)|
103+
| HTTPS |443 (TCP) |Used to send health information to Azure AD. (failback)|
104104

105-
Azure Service Bus port 5671 is no longer required for the latest version of agent. The latest Azure AD Connect Health agent version only required port 443.
105+
If 5671 is blocked, the agent falls back to 443, but using 5671 is recommended. This endpoint isn't required in the latest version of the agent.
106+
The latest Azure AD Connect Health agent versions only require port 443.
106107

107108
### 7b - Endpoints for Azure AD Connect Health agent for (AD FS/Sync) and Azure AD
108109
For a list of endpoints, see [the Requirements section for the Azure AD Connect Health agent](how-to-connect-health-agent-install.md#requirements).
109-

articles/azure-monitor/agents/data-sources-custom-logs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ The log files to be collected must match the following criteria.
2323

2424
YYYY-MM-DD HH:MM:SS<br>M/D/YYYY HH:MM:SS AM/PM<br>Mon DD, YYYY HH:MM:SS<br />yyMMdd HH:mm:ss<br />ddMMyy HH:mm:ss<br />MMM d hh:mm:ss<br />dd/MMM/yyyy:HH:mm:ss zzz<br />yyyy-MM-ddTHH:mm:ssK
2525

26-
- The log file must not allow circular logging, log rotation where the file is overwritten with new entries, or the file is renamed and the same file name resues for continued loging.
26+
- The log file must not allow circular logging, log rotation where the file is overwritten with new entries, or the file is renamed and the same file name is reused for continued logging.
2727
- The log file must use ASCII or UTF-8 encoding. Other formats such as UTF-16 are not supported.
2828
- For Linux, time zone conversion is not supported for time stamps in the logs.
2929
- As a best practice, the log file should include the date time that it was created to prevent log rotation overwiting or renaming.

articles/data-factory/data-flow-derived-column.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ To add more derived columns, click on **Add** above the column list or the plus
3131

3232
### Column patterns
3333

34-
In cases where your schema is not explicitly defined or if you want to update a set of columns in bulk, you will want to create column patters. Column patterns allow for you to match columns using rules based upon the column metadata and create derived columns for each matched column. For more information, learn [how to build column patterns](concepts-data-flow-column-pattern.md#column-patterns-in-derived-column-and-aggregate) in the derived column transformation.
34+
In cases where your schema is not explicitly defined or if you want to update a set of columns in bulk, you will want to create column patterns. Column patterns allow for you to match columns using rules based upon the column metadata and create derived columns for each matched column. For more information, learn [how to build column patterns](concepts-data-flow-column-pattern.md#column-patterns-in-derived-column-and-aggregate) in the derived column transformation.
3535

3636
:::image type="content" source="media/data-flow/column-pattern-derive.png" alt-text="Column patterns":::
3737

articles/postgresql/flexible-server/connect-azure-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ This quickstart demonstrates how to connect to an Azure Database for PostgreSQL
2222
- Login using Azure CLI with ```az login``` command
2323
- Turn on parameter persistence with ```az config param-persist on```. Parameter persistence will help you use local context without having to repeat a lot of arguments like resource group or location.
2424

25-
## Create an PostgreSQL Flexible Server
25+
## Create a PostgreSQL Flexible Server
2626

2727
The first thing we'll create is a managed PostgreSQL server. In [Azure Cloud Shell](https://shell.azure.com/), run the following script and make a note of the **server name**, **username** and **password** generated from this command.
2828

0 commit comments

Comments
 (0)