Skip to content

Commit d0a6631

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into patricka-amqp-multiplex
2 parents 1934a92 + a53c98c commit d0a6631

File tree

106 files changed

+1062
-844
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+1062
-844
lines changed

articles/azure-functions/functions-bindings-azure-mysql.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ This set of articles explains how to work with [Azure Database for MySQL](/azure
2323
|---------|---------|
2424
| Read data from a database | [Input binding](./functions-bindings-azure-mysql-input.md) |
2525
| Save data to a database |[Output binding](./functions-bindings-azure-mysql-output.md) |
26+
| Trigger a function when a change is detected on a MySQL Table | [Trigger binding](./functions-bindings-azure-mysql-trigger.md) |
2627

2728
::: zone pivot="programming-language-csharp"
2829

@@ -171,5 +172,4 @@ In addition to the samples for C#, Java, JavaScript, PowerShell, and Python avai
171172

172173
- [Read data from a database (Input binding)](./functions-bindings-azure-mysql-input.md)
173174
- [Save data to a database (Output binding)](./functions-bindings-azure-mysql-output.md)
174-
- [Trigger Binding](./functions-bindings-azure-mysql-trigger.md)
175-
175+
- [Trigger a function when a change is detected on a table (Trigger binding)](./functions-bindings-azure-mysql-trigger.md)

articles/azure-functions/functions-develop-local.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Other files in the project depend on your language and specific functions. For m
4444
The local.settings.json file stores app settings and settings used by local development tools. Settings in the local.settings.json file are used only when you're running your project locally. When you publish your project to Azure, be sure to also add any required settings to the app settings for the function app.
4545

4646
> [!IMPORTANT]
47-
> Because the local.settings.json may contain secrets, such as connection strings, you should never store it in a remote repository. Tools that support Functions provide ways to synchronize settings in the local.settings.json file with the [app settings](functions-how-to-use-azure-function-app-settings.md#settings) in the function app to which your project is deployed.
47+
> Because the local.settings.json may contain secrets, such as connection strings, you should take care if committing to source control. Tools that support Functions provide ways to synchronize settings in the local.settings.json file with the [app settings](functions-how-to-use-azure-function-app-settings.md#settings) in the function app to which your project is deployed.
4848
4949
The local settings file has this structure:
5050

articles/azure-government/compliance/compliance-tic.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ The TIC 2.0 initiative also includes security policies, guidelines, and framewor
3535

3636
### TIC 3.0 guidance
3737

38-
In September 2019, OMB released [Memorandum M-19-26](https://www.whitehouse.gov/wp-content/uploads/2019/09/M-19-26.pdf) that rescinded prior TIC-related memorandums and introduced [TIC 3.0 guidance](https://www.cisa.gov/resources-tools/programs/trusted-internet-connections-tic). The previous OMB memorandums required agency traffic to flow through a physical TIC access point, which has proven to be an obstacle to the adoption of cloud-based infrastructure. For example, TIC 2.0 focused exclusively on perimeter security by channeling all incoming and outgoing agency data through a TIC access point. In contrast, TIC 3.0 recognizes the need to account for multiple and diverse security architectures rather than a single perimeter security approach. This flexibility allows agencies to choose how to implement security capabilities in a way that fits best into their overall network architecture, risk management approach, and more.
38+
In September 2019, OMB released Memorandum M-19-26 that rescinded prior TIC-related memorandums and introduced [TIC 3.0 guidance](https://www.cisa.gov/resources-tools/programs/trusted-internet-connections-tic). The previous OMB memorandums required agency traffic to flow through a physical TIC access point, which has proven to be an obstacle to the adoption of cloud-based infrastructure. For example, TIC 2.0 focused exclusively on perimeter security by channeling all incoming and outgoing agency data through a TIC access point. In contrast, TIC 3.0 recognizes the need to account for multiple and diverse security architectures rather than a single perimeter security approach. This flexibility allows agencies to choose how to implement security capabilities in a way that fits best into their overall network architecture, risk management approach, and more.
3939

4040
To enable this flexibility, the Cybersecurity & Infrastructure Security Agency (CISA) works with federal agencies to conduct pilots in diverse agency environments, which result in the development of TIC 3.0 use cases. For TIC 3.0 implementations, CISA encourages agencies to use [TIC 3.0 Core Guidance Documents](https://www.cisa.gov/resources-tools/resources/trusted-internet-connections-tic-30-core-guidance-documents) with the National Institute of Standards and Technology (NIST) [Cybersecurity Framework](https://www.nist.gov/cyberframework) (CSF) and [NIST SP 800-53](https://csrc.nist.gov/publications/detail/sp/800-53/rev-5/final) *Security and Privacy Controls for Federal Information Systems and Organizations*. These documents can help agencies design a secure network architecture and determine appropriate requirements from cloud service providers.
4141

articles/azure-netapp-files/azure-netapp-files-performance-considerations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,6 @@ To check if the maximum throughput limit has been reached, monitor the metric [T
7272

7373
## Next steps
7474

75-
- [Azure NetApp Files Performance Calculator](https://cloud.netapp.com/azure-netapp-files/tco?hs_preview=tIKQbfoF-41214739590)
75+
- [Azure NetApp Files Performance Calculator](https://docs.netapp.com/us-en/netapp-solutions/ehc/azure-storage-options.html?hs_preview=tIKQbfoF-41214739590)
7676
- [Service levels for Azure NetApp Files](azure-netapp-files-service-levels.md)
7777
- [Performance benchmarks for Linux](performance-benchmarks-linux.md)

articles/azure-netapp-files/azure-netapp-files-solution-architectures.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ This section provides references for Windows applications and SQL Server solutio
8383

8484
* [Enterprise file shares with disaster recovery - Azure Example Scenarios](/azure/architecture/example-scenario/file-storage/enterprise-file-shares-disaster-recovery)
8585
* [Disaster Recovery for Enterprise File Shares with Azure NetApp Files and DFS Namespaces](https://techcommunity.microsoft.com/t5/azure-architecture-blog/disaster-recovery-for-enterprise-file-shares/ba-p/2808757)
86-
* [Build Your Own Azure NFS? Wrestling Linux File Shares into Cloud](https://cloud.netapp.com/blog/ma-anf-blg-build-your-own-linux-nfs-file-shares)
86+
* [Build Your Own Azure NFS? Wrestling Linux File Shares into Cloud](https://bluexp.netapp.com/blog/ma-anf-blg-build-your-own-linux-nfs-file-shares)
8787
* [Globally Distributed Enterprise File Sharing with Azure NetApp Files and NetApp Global File Cache](https://f.hubspotusercontent20.net/hubfs/525875/NA-580-0521-Architecture-Doc-R3.pdf)
88-
* [Cloud Compliance for Azure NetApp Files](https://cloud.netapp.com/hubfs/Cloud%20Compliance%20for%20Azure%20NetApp%20Files%20-%20November%202020.pdf)
88+
* [Cloud Compliance for Azure NetApp Files](https://docs.netapp.com/us-en/occm38/task_getting_started_compliance.html)
8989

9090
### SQL Server
9191

@@ -197,7 +197,7 @@ This section provides references for High Performance Computing (HPC) solutions.
197197
### Generic HPC
198198

199199
* [Azure HPC OnDemand Platform](https://azure.github.io/az-hop/)
200-
* [Azure NetApp Files: Getting the most out of your cloud storage](https://cloud.netapp.com/hubfs/Resources/ANF%20PERFORMANCE%20TESTING%20IN%20TEMPLATE.pdf)
200+
* [Azure NetApp Files: Getting the most out of your cloud storage](https://community.netapp.com/t5/AFF/SAP-Hana-ANF-best-practice-documents/m-p/169694)
201201
* [Run MPI workloads with Azure Batch and Azure NetApp Files](https://azure.microsoft.com/resources/run-mpi-workloads-with-azure-batch-and-azure-netapp-files/)
202202
* [Azure Cycle Cloud: CycleCloud HPC environments on Azure NetApp Files](/azure/cyclecloud/overview)
203203

@@ -229,14 +229,14 @@ This section provides solutions for Azure platform services.
229229

230230
### Azure Kubernetes Services and Kubernetes
231231

232-
* [Astra: protect, recover, and manage your AKS workloads on Azure NetApp Files](https://cloud.netapp.com/hubfs/Astra%20Azure%20Documentation.pdf)
232+
* [Astra: protect, recover, and manage your AKS workloads on Azure NetApp Files](https://docs.netapp.com/us-en/astra-control-service/get-started/set-up-microsoft-azure-with-anf.html)
233233
* [Integrate Azure NetApp Files with Azure Kubernetes Service](/azure/aks/azure-netapp-files)
234234
* [Azure NetApp Files SMB volumes for Azure Kubernetes Services with Astra Trident on Windows](https://techcommunity.microsoft.com/t5/azure-architecture-blog/azure-netapp-files-smb-volumes-for-azure-kubernetes-services/ba-p/3052900)
235235
* [Application data protection for AKS workloads on Azure NetApp Files - Azure Example Scenarios](/azure/architecture/example-scenario/file-storage/data-protection-kubernetes-astra-azure-netapp-files)
236236
* [Disaster Recovery of AKS workloads with Astra Control Service and Azure NetApp Files](https://techcommunity.microsoft.com/t5/azure-architecture-blog/disaster-recovery-of-aks-workloads-with-astra-control-service/ba-p/2948089)
237237
* [Protecting MongoDB on AKS/ANF with Astra Control Service using custom execution hooks](https://techcommunity.microsoft.com/t5/azure-architecture-blog/protecting-mongodb-on-aks-anf-with-astra-control-service-using/ba-p/3057574)
238238
* [Comparing and Contrasting the AKS/ANF NFS subdir external provisioner with Astra Trident](https://techcommunity.microsoft.com/t5/azure-architecture-blog/comparing-and-contrasting-the-aks-anf-nfs-subdir-external/ba-p/3057547)
239-
* [Out-of-This-World Kubernetes performance on Azure with Azure NetApp Files](https://cloud.netapp.com/blog/ma-anf-blg-configure-kubernetes-openshift)
239+
* [Out-of-This-World Kubernetes performance on Azure with Azure NetApp Files](https://bluexp.netapp.com/blog/ma-anf-blg-configure-kubernetes-openshift)
240240
* [Azure NetApp Files + Trident = Dynamic and Persistent Storage for Kubernetes](https://anfcommunity.com/2021/02/16/azure-netapp-files-trident-dynamic-and-persistent-storage-for-kubernetes/)
241241
* [Magento e-commerce platform in Azure Kubernetes Service (AKS)](/azure/architecture/example-scenario/magento/magento-azure)
242242
* [Protecting Magento e-commerce platform in AKS against disasters with Astra Control Service](https://techcommunity.microsoft.com/t5/azure-architecture-blog/protecting-magento-e-commerce-platform-in-aks-against-disasters/ba-p/3285525)

articles/azure-netapp-files/faq-data-migration-protection.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Azure NetApp Files provides NFS and SMB volumes. You can use any file-based copy
1616

1717
For more information about the Azure File Migration Program, see [Migrate the critical file data you need to power your applications](https://techcommunity.microsoft.com/t5/azure-storage-blog/migrate-the-critical-file-data-you-need-to-power-your/ba-p/3038751). Also, see [Azure Storage migration tools comparison - Unstructured data](../storage/solution-integration/validated-partners/data-management/migration-tools-comparison.md).
1818

19-
NetApp offers a SaaS-based solution, [NetApp Cloud Sync](https://cloud.netapp.com/cloud-sync-service). The solution enables you to replicate NFS or SMB data to Azure NetApp Files NFS exports or SMB shares.
19+
NetApp offers a SaaS-based solution, [NetApp Cloud Sync](https://docs.netapp.com/us-en/occm38/concept_cloud_sync.html). The solution enables you to replicate NFS or SMB data to Azure NetApp Files NFS exports or SMB shares.
2020

2121
You can also use a wide array of free tools to copy data. For NFS, you can use workloads tools such as [rsync](https://rsync.samba.org/examples.html) to copy and synchronize source data into an Azure NetApp Files volume. For SMB, you can use workloads [robocopy](/windows-server/administration/windows-commands/robocopy) in the same manner. These tools can also replicate file or folder permissions.
2222

@@ -42,7 +42,7 @@ Azure NetApp Files provides NFS and SMB volumes. Any file based-copy tool can be
4242

4343
The [cross-region replication](cross-region-replication-introduction.md) functionality enables you to asynchronously replicate data from an Azure NetApp Files volume (source) in one region to another Azure NetApp Files volume (destination) in another region. Additionally, you can [create a new volume by using a snapshot of an existing volume](snapshots-restore-new-volume.md).
4444

45-
NetApp offers a SaaS based solution, [NetApp Cloud Sync](https://cloud.netapp.com/cloud-sync-service). The solution enables you to replicate NFS or SMB data to Azure NetApp Files NFS exports or SMB shares.
45+
NetApp offers a SaaS based solution, [NetApp Cloud Sync](https://docs.netapp.com/us-en/occm38/concept_cloud_sync.html). The solution enables you to replicate NFS or SMB data to Azure NetApp Files NFS exports or SMB shares.
4646

4747
You can also use a wide array of free tools to copy data. For NFS, you can use workloads tools such as [rsync](https://rsync.samba.org/examples.html) to copy and synchronize source data into an Azure NetApp Files volume. For SMB, you can use workloads [robocopy](/windows-server/administration/windows-commands/robocopy) in the same manner. These tools can also replicate file or folder permissions.
4848

articles/azure-netapp-files/performance-azure-vmware-solution-datastore.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ When you determine how to configure datastores, the easiest solution from a mana
2626

2727
For Azure NetApp Files performance data, see:
2828

29-
* [Azure NetApp Files: Getting the Most Out of Your Cloud Storage](https://cloud.netapp.com/hubfs/Resources/ANF%20PERFORMANCE%20TESTING%20IN%20TEMPLATE.pdf)
29+
* [Azure NetApp Files: Getting the Most Out of Your Cloud Storage](https://community.netapp.com/t5/AFF/SAP-Hana-ANF-best-practice-documents/m-p/169694)
3030

3131
On an Azure VMware Solution host, a single network connection is established per NFS datastore akin to using `nconnect=1` on the Linux tests referenced in Section 6 (*The Tuning Options*). This fact is key to understanding how Azure VMware Solution scales performance so well across multiple datastores.
3232

articles/azure-vmware/configure-github-enterprise-server.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ GitHub Enterprise Server requires a valid license key. You can sign up for a [tr
1717

1818
## Install GitHub Enterprise Server on VMware
1919

20-
1. Download [the current release of GitHub Enterprise Server](https://enterprise.github.com/releases/2.19.0/download) for VMware ESXi/vSphere (OVA) and [deploy the OVA template](https://techdocs.broadcom.com/us/en/vmware-cis/vsphere/vsphere/8-0/vsphere-virtual-machine-administration-guide-8-0/deploying-ovf-templatesvsphere-vm-admin/deploy-an-ovf-template-flex-and-h5vsphere-vm-admin.html) you downloaded.
20+
1. Download [the current release of GitHub Enterprise Server](https://enterprise.github.com/releases/2.19.0/download) for VMware ESXi/vSphere (OVA) and [deploy the OVA template](https://techdocs.broadcom.com/us/en/vmware-cis/vsphere/vsphere/8-0/vsphere-virtual-machine-administration-guide-8-0.html) you downloaded.
2121

2222
:::image type="content" source="media/github-enterprise-server/github-options.png" alt-text="Screenshot showing the GitHub Enterprise Server on VMware installation options.":::
2323

articles/azure-vmware/install-vmware-hcx.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ Use the following steps to download the VMware HCX Connector OVA file, and then
9393
1. Under **Administration** > **System Updates**, select **Request Download Link**. If the box is greyed, wait a few seconds for it to generate a link.
9494

9595
1. Either download or receive a link for the VMware HCX Connector OVA file you deploy on your local vCenter Server.
96-
1. In your on-premises vCenter Server, select an [OVF template](https://techdocs.broadcom.com/us/en/vmware-cis/vsphere/vsphere/8-0/vsphere-virtual-machine-administration-guide-8-0/deploying-ovf-templatesvsphere-vm-admin/deploy-an-ovf-template-flex-and-h5vsphere-vm-admin.html) to deploy the VMware HCX Connector to your on-premises vSphere cluster.
96+
1. In your on-premises vCenter Server, select an [OVF template](https://techdocs.broadcom.com/us/en/vmware-cis/vsphere/vsphere/8-0/vsphere-virtual-machine-administration-guide-8-0.html) to deploy the VMware HCX Connector to your on-premises vSphere cluster.
9797
1. Navigate to and select the OVA file that you downloaded and then select **Open**.
9898

9999
:::image type="content" source="media/tutorial-vmware-hcx/select-ovf-template.png" alt-text="Screenshot of browsing to an OVF template." lightbox="media/tutorial-vmware-hcx/select-ovf-template.png":::

articles/azure-vmware/move-azure-vmware-solution-across-regions.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ You can move Azure VMware Solution resources to a different region for several r
1818

1919
This article helps you plan and migrate Azure VMware Solution from one Azure region to another, such as Azure region A to Azure region B.
2020

21-
The diagram shows the recommended ExpressRoute connectivity between the two Azure VMware Solution environments. An HCX site pairing and service mesh are created between the two environments. The HCX migration traffic and Layer-2 extension moves (depicted by the purple line) between the two environments. For VMware recommended HCX planning, see [Planning an HCX Migration](https://www.vmware.com/docs/vmware-cloud-planning-an-hcx-migration).
21+
The diagram shows the recommended ExpressRoute connectivity between the two Azure VMware Solution environments. An HCX site pairing and service mesh are created between the two environments. The HCX migration traffic and Layer-2 extension moves (depicted by the purple line) between the two environments. For VMware recommended HCX planning, see [Planning an HCX Migration](https://docs.vmware.com/en/VMware-HCX/index.html).
2222

2323
:::image type="content" source="media/move-across-regions/move-ea-csp-across-regions-2.png" alt-text="Diagram showing ExpressRoute Global Reach communication between the source and target Azure VMware Solution environments." border="false" lightbox="media/move-across-regions/move-ea-csp-across-regions-2.png":::
2424

@@ -56,7 +56,7 @@ The following steps show how to prepare your Azure VMware Solution private cloud
5656

5757
1. [Export the contents of an inventory list view to a CSV file](https://techdocs.broadcom.com/us/en/vmware-cis/vsphere/vsphere/8-0/vcenter-and-host-management-8-0/using-the-vsphere-client-host-management/working-with-the-vsphere-client-inventory-host-management.html#GUID-C0E8DD52-677E-464F-A3EA-044EE20B7B92-en).
5858

59-
1. [Sort workloads into migration groups (migration wave)](https://www.vmware.com/docs/vmware-cloud-planning-an-hcx-migration).
59+
1. [Sort workloads into migration groups (migration wave)](https://docs.vmware.com/en/VMware-HCX/index.html).
6060

6161

6262
### Deploy the target environment
@@ -281,7 +281,7 @@ In this step, use VMware HCX to migrate the VMs from the source to the target. Y
281281

282282
Besides vMotion, other methods, like Bulk and Cold vMotion, are also recommended. Learn more about:
283283

284-
- [Plan an HCX Migration](https://www.vmware.com/docs/vmware-cloud-planning-an-hcx-migration)
284+
- [Plan an HCX Migration](https://docs.vmware.com/en/VMware-HCX/index.html)
285285

286286
- [Migrate Virtual Machines with HCX](https://docs.vmware.com/en/VMware-HCX/services/user-guide/GUID-14D48C15-3D75-485B-850F-C5FCB96B5637.html)
287287

@@ -294,7 +294,7 @@ In this step, perform a final gateway cutover to terminate the extended networks
294294
295295
Before the gateway cutover, verify all migrated workload services and performance. Once application and web service owners accept the performance (except for any latency issues), you can continue with the gateway cutover. Once the cutover is completed, you need to modify the public DNS A and PTR records.
296296

297-
For VMware recommendations, see [Cutover of extended networks](https://www.vmware.com/docs/vmware-cloud-planning-an-hcx-migration).
297+
For VMware recommendations, see [Cutover of extended networks](https://docs.vmware.com/en/VMware-HCX/index.html).
298298

299299
### Public IP DNAT for migrated DMZ VMs
300300

0 commit comments

Comments
 (0)