Skip to content

Commit 568a61b

Browse files
authored
Merge pull request #153749 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/azure-docs (branch master)
2 parents e4a4ec2 + aa7ead4 commit 568a61b

File tree

4 files changed

+40
-48
lines changed

4 files changed

+40
-48
lines changed

articles/availability-zones/az-overview.md

Lines changed: 26 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -95,45 +95,35 @@ As mentioned previously, Azure classifies services into three categories: founda
9595
> | Azure Data Lake Storage Gen2 | Azure Active Directory Domain Services |
9696
> | Azure ExpressRoute | Azure Bastion |
9797
> | Azure Public IP | Azure Cache for Redis |
98-
> | Azure SQL Database | Azure Cognitive Search |
99-
> | Azure SQL Managed Instance | Azure Cognitive Services |
100-
> | Disk Storage | Azure Cognitive Services: Computer Vision |
101-
> | Event Hubs | Azure Cognitive Services: Content Moderator |
102-
> | Key Vault | Azure Cognitive Services: Face |
103-
> | Load balancer | Azure Cognitive Services: Immersive Reader |
104-
> | Service Bus | Azure Cognitive Services: Language Understanding |
105-
> | Service Fabric | Azure Cognitive Services: Speech Services |
106-
> | Storage: Hot/Cool Blob Storage Tiers | Azure Cognitive Services: Text Analytics |
107-
> | Storage: Managed Disks | Azure Cognitive Services: Translator |
108-
> | Virtual Machine Scale Sets | Azure Data Explorer |
109-
> | Virtual Machines | Azure Data Share |
110-
> | Virtual Machines: Azure Dedicated Host | Azure Database for MySQL |
111-
> | Virtual Machines: Av2-Series | Azure Database for PostgreSQL |
112-
> | Virtual Machines: Bs-Series | Azure DDoS Protection |
113-
> | Virtual Machines: DSv2-Series | Azure Firewall |
114-
> | Virtual Machines: DSv3-Series | Azure Firewall Manager |
115-
> | Virtual Machines: Dv2-Series | Azure Functions |
116-
> | Virtual Machines: Dv3-Series | Azure IoT Hub |
117-
> | Virtual Machines: ESv3-Series | Azure Kubernetes Service (AKS) |
118-
> | Virtual Machines: Ev3-Series | Azure Machine Learning |
119-
> | Virtual Network | Azure Monitor: Application Insights |
120-
> | VPN Gateway | Azure Monitor: Log Analytics |
121-
> | | Azure Private Link |
122-
> | | Azure Red Hat OpenShift |
123-
> | | Azure Site Recovery |
124-
> | | Azure Stream Analytics |
125-
> | | Azure Synapse Analytics |
126-
> | | Batch |
127-
> | | Cloud Services: M-series |
128-
> | | Container Instances |
129-
> | | Container Registry |
98+
> | Azure SQL Database | Azure Cognitive Services |
99+
> | Azure SQL Managed Instance | Azure Cognitive Services: Computer Vision |
100+
> | Disk Storage | Azure Cognitive Services: Content Moderator |
101+
> | Event Hubs | Azure Cognitive Services: Face |
102+
> | Key Vault | Azure Cognitive Services: Text Analytics |
103+
> | Load balancer | Azure Data Explorer |
104+
> | Service Bus | Azure Database for MySQL |
105+
> | Service Fabric | Azure Database for PostgreSQL |
106+
> | Storage: Hot/Cool Blob Storage Tiers | Azure DDoS Protection |
107+
> | Storage: Managed Disks | Azure Firewall |
108+
> | Virtual Machine Scale Sets | Azure Firewall Manager |
109+
> | Virtual Machines | Azure Functions |
110+
> | Virtual Machines: Azure Dedicated Host | Azure IoT Hub |
111+
> | Virtual Machines: Av2-Series | Azure Kubernetes Service (AKS) |
112+
> | Virtual Machines: Bs-Series | Azure Monitor: Application Insights |
113+
> | Virtual Machines: DSv2-Series | Azure Monitor: Log Analytics |
114+
> | Virtual Machines: DSv3-Series | Azure Private Link |
115+
> | Virtual Machines: Dv2-Series | Azure Site Recovery |
116+
> | Virtual Machines: Dv3-Series | Azure Synapse Analytics |
117+
> | Virtual Machines: ESv3-Series | Batch |
118+
> | Virtual Machines: Ev3-Series | Cloud Services: M-series |
119+
> | Virtual Network | Container Instances |
120+
> | VPN Gateway | Container Registry |
130121
> | | Data Factory |
131122
> | | Event Grid |
132123
> | | HDInsight |
133124
> | | Logic Apps |
134125
> | | Media Services |
135126
> | | Network Watcher |
136-
> | | Notification Hubs |
137127
> | | Premium Blob Storage |
138128
> | | Premium Files Storage |
139129
> | | Virtual Machines: Ddsv4-Series |
@@ -163,21 +153,23 @@ As mentioned previously, Azure classifies services into three categories: founda
163153
> | Azure Cognitive Services: Form Recognizer |
164154
> | Azure Cognitive Services: Personalizer |
165155
> | Azure Cognitive Services: QnA Maker |
156+
> | Azure Data Share |
166157
> | Azure Database for MariaDB |
167158
> | Azure Database Migration Service |
168159
> | Azure Dedicated HSM |
169160
> | Azure Digital Twins |
170161
> | Azure Health Bot |
171162
> | Azure HPC Cache |
172163
> | Azure Lab Services |
164+
> | Azure Machine Learning Studio (classic) |
173165
> | Azure NetApp Files |
166+
> | Azure Red Hat OpenShift |
174167
> | Azure SignalR Service |
175168
> | Azure Spring Cloud Service |
176169
> | Azure Time Series Insights |
177170
> | Azure VMware Solution |
178171
> | Azure VMware Solution by CloudSimple |
179172
> | Data Lake Analytics |
180-
> | Azure Machine Learning Studio (classic) |
181173
> | Spatial Anchors |
182174
> | Storage: Archive Storage |
183175
> | Ultra Disk Storage |

articles/azure-vmware/includes/hcx-network-segments.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@ There are varying ways to configure VMware HCX network segments on-premises. The
1111

1212
In preparation for the VMware HCX deployment to support the pilot or small production use case, identify the following:
1313

14-
- **Management network:** When deploying VMware HCX on-premises, you'll need to define a management network. Typically, it's the same management network used by your on-premises VMware cluster. At a minimum, identify **two** IPs on this network segment for VMware HCX. You might need larger numbers, depending on the scale of your deployment beyond the pilot or small use case.
14+
- **Management network:** When deploying VMware HCX on-premises, you'll need to identify a management network for VMware HCX. Typically, it's the same management network used by your on-premises VMware cluster. At a minimum, identify **two** IPs on this network segment for VMware HCX. You might need larger numbers, depending on the scale of your deployment beyond the pilot or small use case.
1515

16-
> [!NOTE]
17-
> The recommended method is to create a /26 network because you can use up to 10 service meshes and 60 network extenders (-1 per service mesh). You can stretch **eight** networks per network extender by using Azure VMware Solution private clouds.
18-
>
19-
20-
- **vMotion network:** When deploying VMware HCX on-premises, you'll need to define a vMotion network. Typically, it's the same network used for vMotion by your on-premises VMware cluster. At a minimum, identify **two** IPs on this network segment for VMware HCX. You might need larger numbers, depending on the scale of your deployment beyond the pilot or small use case.
16+
> [!NOTE]
17+
> Preparing for large environments, instead of using the management network used for the on-premises VMware cluster, create a new /26 network and present that network as a port group to your on-premises VMware cluster. You can then create up to 10 service meshes and 60 network extenders (-1 per service mesh). You can stretch **eight** networks per network extender by using Azure VMware Solution private clouds.
18+
>
19+
20+
- **Uplink network:** When deploying VMware HCX on-premises, you'll need to identify a Uplink network for VMware HCX. Use the same network which you will be using for the Management network.
21+
22+
- **vMotion network:** When deploying VMware HCX on-premises, you'll need to identify a vMotion network for VMware HCX. Typically, it's the same network used for vMotion by your on-premises VMware cluster. At a minimum, identify **two** IPs on this network segment for VMware HCX. You might need larger numbers, depending on the scale of your deployment beyond the pilot or small use case.
2123

2224
The vMotion network must be exposed on a distributed virtual switch or vSwitch0. If it's not, modify the environment to accommodate.
2325

2426
> [!NOTE]
2527
> Many VMware environments use non-routed network segments for vMotion, which poses no problems.
26-
27-
- **Uplink network:** When deploying VMware HCX on-premises, you'll need to define an Uplink network. Use the management network defined as your uplink network.
28-
29-
- **Replication network:** When deploying VMware HCX on-premises, you'll need to define a replication network. Use the management network defined as your replication network. If the on-premises cluster hosts use a dedicated Replication VMkernel network, reserve **two** IP addresses in this network segment and use the Replication VMkernel network for the replication network.
28+
29+
- **Replication network:** When deploying VMware HCX on-premises, you'll need to define a replication network. Use the same network as you are using for your Management and Uplink networks. If the on-premises cluster hosts use a dedicated Replication VMkernel network, reserve **two** IP addresses in this network segment and use the Replication VMkernel network for the replication network.

articles/cosmos-db/performance-tips-dotnet-sdk-v3-sql.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ Throughput is provisioned based on the number of [Request Units](request-units.m
211211

212212
The complexity of a query affects how many Request Units are consumed for an operation. The number of predicates, the nature of the predicates, the number of UDF files, and the size of the source dataset all influence the cost of query operations.
213213

214-
To measure the overhead of any operation (create, update, or delete), inspect the [x-ms-request-charge](/rest/api/cosmos-db/common-cosmosdb-rest-response-headers) header (or the equivalent `RequestCharge` property in `ResourceResponse\<T>` or `FeedResponse\<T>` in the .NET SDK) to measure the number of Request Units consumed by the operations:
214+
To measure the overhead of any operation (create, update, or delete), inspect the [x-ms-request-charge](/rest/api/cosmos-db/common-cosmosdb-rest-response-headers) header (or the equivalent `RequestCharge` property in `ResourceResponse<T>` or `FeedResponse<T>` in the .NET SDK) to measure the number of Request Units consumed by the operations:
215215

216216
```csharp
217217
// Measure the performance (Request Units) of writes
@@ -256,4 +256,4 @@ The request charge (that is, the request-processing cost) of a specified operati
256256
## Next steps
257257
For a sample application that's used to evaluate Azure Cosmos DB for high-performance scenarios on a few client machines, see [Performance and scale testing with Azure Cosmos DB](performance-testing.md).
258258

259-
To learn more about designing your application for scale and high performance, see [Partitioning and scaling in Azure Cosmos DB](partitioning-overview.md).
259+
To learn more about designing your application for scale and high performance, see [Partitioning and scaling in Azure Cosmos DB](partitioning-overview.md).

includes/api-management-service-limits.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ ms.custom: include file
2626
| Maximum number of subscriptions per service instance<sup>8</sup> | 500 |
2727
| Maximum number of client certificates per service instance<sup>8</sup> | 50 |
2828
| Maximum number of APIs per service instance<sup>8</sup> | 50 |
29-
| Maximum number of API operations per service instance<sup>8</sup> | 1,000 |
29+
| Maximum number of API management operations per service instance<sup>8</sup> | 1,000 |
3030
| Maximum total request duration<sup>8</sup> | 30 seconds |
3131
| Maximum buffered payload size<sup>8</sup> | 2 MiB |
3232
| Maximum request URL size<sup>9</sup> | 4096 bytes |
@@ -45,4 +45,4 @@ ms.custom: include file
4545
<sup>8</sup>This limit applies to the Consumption tier only. There are no limits in these categories for other tiers.<br/>
4646
<sup>9</sup>Applies to the Consumption tier only. Includes an up to 2048 bytes long query string.<br/>
4747
<sup>10</sup> To increase this limit, please contact [support](https://azure.microsoft.com/support/options/).<br/>
48-
<sup>11</sup>Self-hosted gateways are supported in the Developer and Premium tiers only. The limit applies to the number of [self-hosted gateway resources](/rest/api/apimanagement/2019-12-01/gateway). To raise this limit please contact [support](https://azure.microsoft.com/support/options/). Note, that the number of nodes (or replicas) associated with a self-hosted gateway resource is unlimited in the Premium tier and capped at a single node in the Developer tier.
48+
<sup>11</sup>Self-hosted gateways are supported in the Developer and Premium tiers only. The limit applies to the number of [self-hosted gateway resources](/rest/api/apimanagement/2019-12-01/gateway). To raise this limit please contact [support](https://azure.microsoft.com/support/options/). Note, that the number of nodes (or replicas) associated with a self-hosted gateway resource is unlimited in the Premium tier and capped at a single node in the Developer tier.

0 commit comments

Comments
 (0)