Skip to content

Commit a46f2be

Browse files
authored
Merge branch 'MicrosoftDocs:main' into patch-7
2 parents a68b019 + 0edfc88 commit a46f2be

14 files changed

+103
-96
lines changed

articles/ai-services/document-intelligence/sdk-overview-v4-0.md

Lines changed: 31 additions & 31 deletions
Large diffs are not rendered by default.

articles/ai-services/document-intelligence/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ items:
1818
- name: Changelog and release history
1919
displayName: latest, update, beta, package, preview, version
2020
href: changelog-release-history.md
21-
- name: "SDK targets: REST API 2023–10–31-preview"
21+
- name: "SDK targets: REST API 2024–02–29-preview"
2222
displayName: get started, installation, downloads, documentAnalysisClient, document analysis client, Azure AD, Azure Active Directory, identity, changelog, package, version,AzureKeyCredential, Azure key credential, key, endpoint
2323
href: sdk-overview-v4-0.md
2424
- name: "SDK targets: REST API 2023–7–31 latest (GA)"

articles/aks/best-practices-app-cluster-reliability.md

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -186,33 +186,37 @@ You can use the `nodeSelector` field in your pod specification to specify the no
186186
The following example pod definition file shows how to use pod anti-affinity to ensure that pods are spread across nodes:
187187

188188
```yaml
189-
apiVersion: v1
190-
kind: Pod
189+
apiVersion: apps/v1
190+
kind: Deployment
191191
metadata:
192-
name: with-node-affinity
192+
name: multi-zone-deployment
193+
labels:
194+
app: myapp
193195
spec:
194-
affinity:
195-
nodeAffinity:
196-
requiredDuringSchedulingIgnoredDuringExecution:
197-
nodeSelectorTerms:
198-
- matchExpressions:
199-
- key: topology.kubernetes.io/zone
200-
operator: In
201-
values:
202-
- 0 # Azure Availability Zone 0
203-
- 1 # Azure Availability Zone 1
204-
- 2 # Azure Availability Zone 2
205-
preferredDuringSchedulingIgnoredDuringExecution:
206-
- weight: 1
207-
preference:
208-
matchExpressions:
209-
- key: another-node-label-key
210-
operator: In
211-
values:
212-
- another-node-label-value
213-
containers:
214-
- name: with-node-affinity
215-
image: registry.k8s.io/pause:2.0
196+
replicas: 3
197+
selector:
198+
matchLabels:
199+
app: myapp
200+
template:
201+
metadata:
202+
labels:
203+
app: myapp
204+
spec:
205+
containers:
206+
- name: myapp-container
207+
image: nginx
208+
ports:
209+
- containerPort: 80
210+
affinity:
211+
podAntiAffinity:
212+
requiredDuringSchedulingIgnoredDuringExecution:
213+
- labelSelector:
214+
matchExpressions:
215+
- key: app
216+
operator: In
217+
values:
218+
- myapp
219+
topologyKey: topology.kubernetes.io/zone
216220
```
217221

218222
For more information, see [Affinity and anti-affinity in Kubernetes](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity).

articles/azure-vmware/deploy-disaster-recovery-using-vmware-hcx.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ The diagram shows the deployment of VMware HCX from on-premises VMware vSphere t
1616
:::image type="content" source="./media/disaster-recovery-virtual-machines/hcx-disaster-recovery-scenario-1-diagram.png" alt-text="Diagram shows the VMware HCX manual disaster recovery solution in Azure VMware Solution with on-premises VMware vSphere." border="true" lightbox="./media/disaster-recovery-virtual-machines/hcx-disaster-recovery-scenario-1-diagram.png":::
1717

1818
>[!IMPORTANT]
19-
>Although part of VMware HCX, VMware HCX Disaster Recovery (DR) is not recommended for large deployments. The disaster recovery orchestration is 100% manual, and Azure VMware Solution currently doesn't have runbooks or features to support manual VMware HCX DR failover. For enterprise-class disaster recovery, refer to VMware Site Recovery Manager (SRM) or VMware business continuity and disaster recovery (BCDR) solutions.
19+
>Although part of VMware HCX, VMware HCX Disaster Recovery (DR) is not recommended for large deployments. The disaster recovery orchestration is 100% manual, and Azure VMware Solution currently doesn't have runbooks or features to support manual VMware HCX DR failover. For enterprise-class disaster recovery, refer to VMware Site Recovery Manager (SRM) or VMware Business Continuity and Disaster Recovery (BCDR) solutions.
2020
21-
VMware HCX provides various operations that provide fine control and granularity in replication policies. Available Operations include:
21+
VMware HCX provides various operations for fine control and granularity in replication policies. Available Operations include:
2222

2323
- **Reverse** – After a disaster occurs, reverse helps make Site B the source site and Site A, where the protected VM now lives.
2424

articles/azure-vmware/enable-public-ip-nsx-edge.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ A Source Network Address Translation (SNAT) service with Port Address Translatio
9090
9191
#### Create a SNAT rule
9292

93-
1. In your Azure VMware Solution private cloud, select **vCenter Server Credentials**.
93+
1. In your Azure VMware Solution private cloud, select **VMware credentials**.
9494
1. Locate your NSX Manager URL and credentials.
9595
1. Sign in to VMware NSX Manager.
9696
1. Go to **NAT Rules**.
@@ -116,7 +116,8 @@ For more information on NSX-T Data Center NAT configuration and options, see the
116116

117117
You can create a No-NAT or No-SNAT rule in NSX Manager to exclude certain matches from performing NAT. This policy can be used to allow private IP address traffic to bypass existing network translation rules.
118118

119-
1. In your Azure VMware Solution private cloud, select **vCenter Server Credentials**.
119+
1. In your Azure VMware Solution private cloud, select **VMware credentials**.
120+
1. Locate your NSX Manager URL and credentials.
120121
1. Sign in to NSX Manager, and then select **NAT Rules**.
121122
1. Select the T1 router, and then select **Add NAT Rule**.
122123
1. Select **No SNAT** rule as the type of NAT rule.
@@ -129,7 +130,8 @@ A Destination Network Translation (DNAT) service is used to expose a VM on a spe
129130

130131
#### Create a DNAT rule
131132

132-
1. In your Azure VMware Solution private cloud, select **vCenter Server Credentials**.
133+
1. In your Azure VMware Solution private cloud, select **VMware credentials**.
134+
1. Locate your NSX Manager URL and credentials.
133135
1. Sign in to NSX Manager, and then select **NAT Rules**.
134136
1. Select the T1 router, and then select **Add DNAT Rule**.
135137
1. Enter a name for the rule.
@@ -147,6 +149,7 @@ The VM is now exposed to the internet on the specific public IP address or on sp
147149
You can provide security protection for your network traffic in and out of the public internet through your gateway firewall.
148150

149151
1. In your Azure VMware Solution private cloud, select **VMware credentials**.
152+
1. Locate your NSX Manager URL and credentials.
150153
1. Sign in to NSX Manager.
151154
1. On the NSX-T overview page, select **Gateway Policies**.
152155
1. Select **Gateway Specific Rules**, choose the T1 gateway, and then select **Add Policy**.

articles/azure-vmware/introduction.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ The following table provides a detailed list of roles and responsibilities betwe
158158
| -------- | ---------------- |
159159
| Microsoft - Azure VMware Solution | Physical infrastructure<ul><li>Azure regions</li><li>Azure availability zones</li><li>Express Route/Global Reach</ul></li>Compute/Network/Storage<ul><li>Rack and power Bare Metal hosts</li><li>Rack and power network equipment</ul></li>Private cloud deploy/lifecycle<ul><li>VMware ESXi deploy, patch, and upgrade</li><li>VMware vCenter Servers deploy, patch, and upgrade</li><li>VMware NSX-T Data Centers deploy, patch, and upgrade</li><li>VMware vSAN deploy, patch, and upgrade</ul></li>Private cloud Networking - VMware NSX-T Data Center provider config<ul><li>Microsoft Edge node/cluster, VMware NSX-T Data Center host preparation</li><li>Provider Tier-0 and Tenant Tier-1 Gateway</li><li>Connectivity from Tier-0 (using BGP) to Azure Network via ExpressRoute</ul></li>Private cloud compute - VMware vCenter Server provider config<ul><li>Create default cluster</li><li>Configure virtual networking for vMotion, Management, vSAN, and others</ul></li>Private cloud backup/restore<ul><li>Back up and restore VMware vCenter Server</li><li>Back up and restore VMware NSX-T Data Center NSX-T Manager</ul></li>Private cloud health monitoring and corrective actions, for example: replace failed hosts</br><br>(optional) VMware HCX deploys with fully configured compute profile on cloud side as add-on</br><br>(optional) VMware SRM deploys, upgrade, and scale up/down</br><br>Support - Private cloud platforms and VMware HCX |
160160
| Customer | Request Azure VMware Solution host quote with Microsoft<br>Plan and create a request for private clouds on Azure portal with:<ul><li>Host count</li><li>Management network range</li><li>Other information</ul></li>Configure private cloud network and security (VMware NSX-T Data Center)<ul><li>Network segments to host applications</li><li>More Tier -1 routers</li><li>Firewall</li><li>VMware NSX-T Data Center LB</li><li>IPsec VPN</li><li>NAT</li><li>Public IP addresses</li><li>Distributed firewall/gateway firewall</li><li>Network extension using VMware HCX or VMware NSX-T Data Center</li><li>AD/LDAP config for RBAC</ul></li>Configure private cloud - VMware vCenter Server<ul><li>AD/LDAP config for RBAC</li><li>Deploy and lifecycle management of Virtual Machines (VMs) and application<ul><li>Install operating systems</li><li>Patch operating systems</li><li>Install antivirus software</li><li>Install backup software</li><li>Install configuration management software</li><li>Install application components</li><li>VM networking using VMware NSX-T Data Center segments</ul></li><li>Migrate Virtual Machines (VMs)<ul><li>VMware HCX configuration</li><li>Live vMotion</li><li>Cold migration</li><li>Content library sync</ul></li></ul></li>Configure private cloud - vSAN<ul><li>Define and maintain vSAN VM policies</li><li>Add hosts to maintain adequate 'slack space'</ul></li>Configure VMware HCX<ul><li>Download and deploy HCA connector OVA in on-premises</li><li>Pairing on-premises VMware HCX connector</li><li>Configure the network profile, compute profile, and service mesh</li><li>Configure VMware HCX network extension/MON</li><li>Upgrade/updates</ul></li>Network configuration to connect to on-premises, virtual network, or internet</br><br>Add or delete hosts requests to cluster from Portal</br><br>Deploy/lifecycle management of partner (third party) solutions |
161-
| Partner ecosystem | Support for their product/solution. For reference, the following are some of the supported Azure VMware Solution partner solution/product:<ul><li>BCDR - VMware SRM, JetStream, Zerto, and others</li><li>Backup - Veeam, Commvault, Rubrik, and others</li><li>VDI - Horizon/Citrix</li><li>Multitenancy for enterprises - VMware Cloud Director Service (CDS), VMware vCloud Director Availability (VCDA)</li><li>Security solutions - BitDefender, TrendMicro, Checkpoint</li><li>Other VMware products - Aria Suite, NSX Advanced Load Balancer |
161+
| Partner ecosystem | Support for their product/solution. For reference, the following are some of the supported Azure VMware Solution partner solution/product:<ul><li>BCDR - VMware SRM, JetStream, Zerto, and others</li><li>Backup - Veeam, Commvault, Rubrik, and others</li><li>VDI - Horizon, Citrix</li><li>Multitenancy for enterprises - VMware Cloud Director Service (CDS), VMware vCloud Director Availability (VCDA)</li><li>Security solutions - BitDefender, TrendMicro, Checkpoint</li><li>Other VMware products - Aria Suite, NSX Advanced Load Balancer |
162162

163163

164164
## Next steps

articles/azure-vmware/rotate-cloudadmin-credentials.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Consider and determine which services connect to vCenter Server as *cloudadmin@v
2222

2323
One way to determine which services authenticate to vCenter Server with the cloudadmin user is to inspect vSphere events using the vSphere Client for your private cloud. After you identify such services, and before rotating the password, you must stop these services. Otherwise, the services won't work after you rotate the password. You can also experience temporary locks on your vCenter Server CloudAdmin account, as these services continuously attempt to authenticate using a cached version of the old credentials.
2424

25-
Instead of using the cloudadmin user to connect services to vCenter Server or NSX-T Data Center, we recommend individual accounts for each service. For more information about setting up separate accounts for connected services, see [Access and Identity Concepts](./concepts-identity.md).
25+
Instead of using the cloudadmin user to connect services to vCenter Server or NSX-T, we recommend individual accounts for each service. For more information about setting up separate accounts for connected services, see [Access and Identity Concepts](./concepts-identity.md).
2626

2727
## Reset your vCenter Server credentials
2828

articles/data-factory/monitor-data-factory-reference.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,27 @@ ms.service: data-factory
1111

1212
# Azure Data Factory monitoring data reference
1313

14-
[!INCLUDE [horz-monitor-ref-intro](~/articles/reusable-content/ce-skilling/azure/includes/azure-monitor/horizontals/horz-monitor-ref-intro.md)]
14+
[!INCLUDE [horz-monitor-ref-intro](~/reusable-content/ce-skilling/azure/includes/azure-monitor/horizontals/horz-monitor-ref-intro.md)]
1515

1616
See [Monitor Data Factory](monitor-data-factory.md) for details on the data you can collect for Azure Data Factory and how to use it.
1717

18-
[!INCLUDE [horz-monitor-ref-metrics-intro](~/articles/reusable-content/ce-skilling/azure/includes/azure-monitor/horizontals/horz-monitor-ref-metrics-intro.md)]
18+
[!INCLUDE [horz-monitor-ref-metrics-intro](~/reusable-content/ce-skilling/azure/includes/azure-monitor/horizontals/horz-monitor-ref-metrics-intro.md)]
1919

2020
### Supported metrics for Microsoft.DataFactory/datafactories
2121
The following table lists the metrics available for the Microsoft.DataFactory/datafactories resource type.
22-
[!INCLUDE [horz-monitor-ref-metrics-tableheader](~/articles/reusable-content/ce-skilling/azure/includes/azure-monitor/horizontals/horz-monitor-ref-metrics-tableheader.md)]
22+
[!INCLUDE [horz-monitor-ref-metrics-tableheader](~/reusable-content/ce-skilling/azure/includes/azure-monitor/horizontals/horz-monitor-ref-metrics-tableheader.md)]
2323
[!INCLUDE [Microsoft.DataFactory/datafactories](~/azure-reference-other-repo/azure-monitor-ref/supported-metrics/includes/microsoft-datafactory-datafactories-metrics-include.md)]
2424

2525
### Supported metrics for Microsoft.DataFactory/factories
2626
The following table lists the metrics available for the Microsoft.DataFactory/factories resource type.
27-
[!INCLUDE [horz-monitor-ref-metrics-tableheader](~/articles/reusable-content/ce-skilling/azure/includes/azure-monitor/horizontals/horz-monitor-ref-metrics-tableheader.md)]
27+
[!INCLUDE [horz-monitor-ref-metrics-tableheader](~/reusable-content/ce-skilling/azure/includes/azure-monitor/horizontals/horz-monitor-ref-metrics-tableheader.md)]
2828
[!INCLUDE [Microsoft.DataFactory/factories](~/azure-reference-other-repo/azure-monitor-ref/supported-metrics/includes/microsoft-datafactory-factories-metrics-include.md)]
2929

3030
> [!NOTE]
3131
> Except for _PipelineElapsedTimeRuns_, only events from completed, triggered activity and pipeline runs are emitted. In-progress and debug runs aren't emitted. However, events from all SSIS package executions are emitted, including those that are completed and in progress, regardless of their invocation methods. For example, you can invoke package executions on Azure-enabled SQL Server Data Tools, via T-SQL on SQL Server Management Studio, SQL Server Agent, or other designated tools, and as triggered or debug runs of Execute SSIS Package activities in Data Factory pipelines.
3232
33-
[!INCLUDE [horz-monitor-ref-metrics-dimensions-intro](~/articles/reusable-content/ce-skilling/azure/includes/azure-monitor/horizontals/horz-monitor-ref-metrics-dimensions-intro.md)]
34-
[!INCLUDE [horz-monitor-ref-metrics-dimensions](~/articles/reusable-content/ce-skilling/azure/includes/azure-monitor/horizontals/horz-monitor-ref-metrics-dimensions.md)]
33+
[!INCLUDE [horz-monitor-ref-metrics-dimensions-intro](~/reusable-content/ce-skilling/azure/includes/azure-monitor/horizontals/horz-monitor-ref-metrics-dimensions-intro.md)]
34+
[!INCLUDE [horz-monitor-ref-metrics-dimensions](~/reusable-content/ce-skilling/azure/includes/azure-monitor/horizontals/horz-monitor-ref-metrics-dimensions.md)]
3535

3636
### Microsoft.DataFactory/datafactories
3737

@@ -57,12 +57,12 @@ The following table lists the metrics available for the Microsoft.DataFactory/fa
5757
- CancelledBy
5858
- RunId
5959

60-
[!INCLUDE [horz-monitor-ref-resource-logs](~/articles/reusable-content/ce-skilling/azure/includes/azure-monitor/horizontals/horz-monitor-ref-resource-logs.md)]
60+
[!INCLUDE [horz-monitor-ref-resource-logs](~/reusable-content/ce-skilling/azure/includes/azure-monitor/horizontals/horz-monitor-ref-resource-logs.md)]
6161

6262
### Supported resource logs for Microsoft.DataFactory/factories
6363
[!INCLUDE [Microsoft.DataFactory/factories](~/azure-reference-other-repo/azure-monitor-ref/supported-logs/includes/microsoft-datafactory-factories-logs-include.md)]
6464

65-
[!INCLUDE [horz-monitor-ref-logs-tables](~/articles/reusable-content/ce-skilling/azure/includes/azure-monitor/horizontals/horz-monitor-ref-logs-tables.md)]
65+
[!INCLUDE [horz-monitor-ref-logs-tables](~/reusable-content/ce-skilling/azure/includes/azure-monitor/horizontals/horz-monitor-ref-logs-tables.md)]
6666
### Data factories
6767

6868
Microsoft.DataFactory/factories
@@ -534,7 +534,7 @@ Here are the log attributes of data movements through each leg of data flow pipe
534534
| **executionPath** | String | The path of execution for data flow task | `\Transformation\Data Flow Task` |
535535
| **resourceId** | String | The unique ID of your data factory resource | `/SUBSCRIPTIONS/<subscriptionID>/RESOURCEGROUPS/<resourceGroupName>/PROVIDERS/MICROSOFT.DATAFACTORY/FACTORIES/<dataFactoryName>` |
536536

537-
[!INCLUDE [horz-monitor-ref-activity-log](~/articles/reusable-content/ce-skilling/azure/includes/azure-monitor/horizontals/horz-monitor-ref-activity-log.md)]
537+
[!INCLUDE [horz-monitor-ref-activity-log](~/reusable-content/ce-skilling/azure/includes/azure-monitor/horizontals/horz-monitor-ref-activity-log.md)]
538538
- [Microsoft.DataFactory resource provider operations](/azure/role-based-access-control/resource-provider-operations#microsoftdatafactory)
539539

540540
## Related content

0 commit comments

Comments
 (0)