Skip to content

Commit 6d54f2c

Browse files
authored
Merge pull request #219663 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 e3ac5ce + fe3c33a commit 6d54f2c

File tree

5 files changed

+18
-9
lines changed

5 files changed

+18
-9
lines changed

articles/azure-arc/servers/ssh-arc-overview.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ This functionality is currently packaged in an Azure CLI extension and an Azure
5656

5757
```Install-Module -Name AzPreview -Scope CurrentUser -Repository PSGallery -Force```
5858

59+
---
60+
5961
### Enable functionality on your Arc-enabled server
6062
In order to use the SSH connect feature, you must enable connections on the hybrid agent.
6163

articles/azure-monitor/alerts/itsm-connector-secure-webhook-connections-azure-configuration.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,11 @@ Action groups provide a modular and reusable way of triggering actions for Azure
3636
To learn more about action groups, see [Create and manage action groups in the Azure portal](../alerts/action-groups.md).
3737

3838
> [!NOTE]
39-
> If you are using a log alert, the query results must include a “Computer” column containing the configuration items list.
39+
> To map the configuration items to the ITSM payload when you define a Log Search alerts query, the query result must be included in the **Configuration items**, with one of these labels:
40+
> - "Computer"
41+
> - "Resource"
42+
> - "_ResourceId"
43+
> - "ResourceId”
4044
4145
To add a webhook to an action, follow these instructions for Secure Webhook:
4246

articles/azure-monitor/insights/network-performance-monitor.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ NPM can monitor connectivity between networks and applications in any part of th
5050
* West US 2
5151
* East Japan
5252
* South East Asia
53-
* South East Australia
5453
* Australia Central
5554
* Australia East
55+
* Australia Southeast
5656
* South UK
5757
* East Asia
5858
* Korea Central

articles/azure-vmware/tutorial-network-checklist.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,16 @@ The subnets:
8282
| On-premises network | Private Cloud vCenter Server | TCP(HTTPS) | 443 | This port allows you to access vCenter Server from an on-premises network. The default port that the vCenter Server system uses to listen for connections from the vSphere Client. To enable the vCenter Server system to receive data from the vSphere Client, open port 443 in the firewall. The vCenter Server system also uses port 443 to monitor data transfer from SDK clients. |
8383
| On-premises network | HCX Manager | TCP(HTTPS) | 9443 | Hybrid Cloud Manager Virtual Appliance Management Interface for Hybrid Cloud Manager system configuration. |
8484
| Admin Network | Hybrid Cloud Manager | SSH | 22 | Administrator SSH access to Hybrid Cloud Manager. |
85-
| HCX Manager | Cloud Gateway | TCP(HTTPS) | 8123 | Send host-based replication service instructions to the Hybrid Cloud Gateway. |
86-
| HCX Manager | Cloud Gateway | HTTP TCP(HTTPS) | 9443 | Send management instructions to the local Hybrid Cloud Gateway using the REST API. |
87-
| Cloud Gateway | L2C | TCP(HTTPS) | 443 | Send management instructions from Cloud Gateway to L2C when L2C uses the same path as the Hybrid Cloud Gateway. |
88-
| Cloud Gateway | ESXi Hosts | TCP | 80,902 | Management and OVF deployment. |
89-
| Cloud Gateway (local)| Cloud Gateway (remote) | UDP | 4500 | Required for IPSEC<br> Internet key exchange (IKEv2) to encapsulate workloads for the bidirectional tunnel. Network Address Translation-Traversal (NAT-T) is also supported. |
90-
| Cloud Gateway (local) | Cloud Gateway (remote) | UDP | 500 | Required for IPSEC<br> Internet key exchange (ISAKMP) for the bidirectional tunnel. |
85+
| HCX Manager | Interconnect (HCX-IX) | TCP(HTTPS) | 8123 | HCX Bulk Migration Control |
86+
| HCX Manager | Interconnect (HCX-IX), Network Extension (HCX-NE) | HTTP TCP(HTTPS) | 9443 | Send management instructions to the local HCX Interconnect using the REST API. |
87+
| Interconnect (HCX-IX)| L2C | TCP(HTTPS) | 443 | Send management instructions from Interconnect to L2C when L2C uses the same path as the Interconnect. |
88+
| HCX Manager, Interconnect (HCX-IX) | ESXi Hosts | TCP | 80,902 | Management and OVF deployment. |
89+
| HCX NE, Interconnect (HCX-IX) at Source| HCX NE, Interconnect (HCX-IX) at Destination)| UDP | 4500 | Required for IPSEC<br> Internet key exchange (IKEv2) to encapsulate workloads for the bidirectional tunnel. Network Address Translation-Traversal (NAT-T) is also supported. |
90+
| Interconnect (HCX-IX) local | Interconnect (HCX-IX) (remote) | UDP | 500 | Required for IPSEC<br> Internet key exchange (ISAKMP) for the bidirectional tunnel. |
9191
| On-premises vCenter Server network | Private Cloud management network | TCP | 8000 | vMotion of VMs from on-premises vCenter Server to Private Cloud vCenter Server |
9292

93+
[For a full list of HCX port requirements](https://ports.esp.vmware.com/home/VMware-HCX)
94+
9395
## DHCP and DNS resolution considerations
9496

9597
[!INCLUDE [dhcp-dns-in-azure-vmware-solution-description](includes/dhcp-dns-in-azure-vmware-solution-description.md)]

articles/postgresql/flexible-server/concepts-query-store.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ The following options are available for configuring Query Store parameters.
7777
| pg_qs.max_plan_size | Sets the maximum number of bytes that will be saved for query plan text for pg_qs; longer plans will be truncated. | 7500 | 100 - 10k |
7878
| pg_qs.max_query_text_length | Sets the maximum query length that can be saved. Longer queries will be truncated. | 6000 | 100 - 10K |
7979
| pg_qs.retention_period_in_days | Sets the retention period. | 7 | 1 - 30 |
80+
| pg_qs.index_generation_interval | Sets the index recommendation generating frequency for all databases when query store enabled. | 15 | 15 - 10080 |
8081
| pg_qs.track_utility | Sets whether utility commands are tracked | on | on, off |
8182

8283
The following options apply specifically to wait statistics.
@@ -103,7 +104,7 @@ This view returns all the data in Query Store. There is one row for each distinc
103104
|db_id |oid |pg_database.oid |OID of database in which the statement was executed|
104105
|query_id |bigint || Internal hash code, computed from the statement's parse tree|
105106
|query_sql_text |Varchar(10000) || Text of a representative statement. Different queries with the same structure are clustered together; this text is the text for the first of the queries in the cluster.|
106-
|plan_id |bigint | |ID of the plan corresponding to this query, not available yet|
107+
|plan_id |bigint | |ID of the plan corresponding to this query|
107108
|start_time |timestamp || Queries are aggregated by time buckets - the time span of a bucket is 15 minutes by default. This is the start time corresponding to the time bucket for this entry.|
108109
|end_time |timestamp || End time corresponding to the time bucket for this entry.|
109110
|calls |bigint || Number of times the query executed|

0 commit comments

Comments
 (0)