Skip to content

Commit 2a96d3a

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into Exrlegacy
2 parents 3a80724 + b55fac1 commit 2a96d3a

9 files changed

+91
-96
lines changed

articles/data-factory/connector-google-adwords.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: jianleishen
77
ms.subservice: data-movement
88
ms.topic: conceptual
99
ms.custom: synapse
10-
ms.date: 05/06/2024
10+
ms.date: 02/13/2025
1111
---
1212

1313
# Copy data from Google Ads using Azure Data Factory or Synapse Analytics
@@ -324,8 +324,6 @@ Upgrade your Google AdWords linked service to the latest Google Ads linked servi
324324
| USER_AD_DISTANCE_REPORT | distance_view |
325325
| VIDEO_PERFORMANCE_REPORT | video |
326326

327-
1. If the pipeline is using query to retrieve data from Google AdWords, use [Query Migration tool](https://developers.google.com/google-ads/scripts/docs/reference/query-migration-tool) to translate the AWQL (AdWords Query Language) into GAQL (Google Ads Query Language).
328-
329327
1. Be aware that there are certain limitations with this upgrade:
330328
1. Not all report types from AWQL are supported in GAQL.
331329
1. Not all AWQL queries are cleanly translated to GAQL queries.

articles/data-factory/self-hosted-integration-runtime-proxy-ssis.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Finally, you download and install the latest version of self-hosted IR, as well
5757

5858
If you use the earlier version of the OLEDB driver for SQL Server (SQL Server Native Client [SQLNCLI]), [download the 64-bit version](https://www.microsoft.com/download/details.aspx?id=50402).
5959

60-
If you use the latest version of OLEDB driver for SQL Server (MSOLEDBSQL), [download the 64-bit version](https://www.microsoft.com/download/details.aspx?id=56730).
60+
If you use the latest version of OLEDB driver for SQL Server (MSOLEDBSQL), [download the 64-bit version](https://go.microsoft.com/fwlink/?linkid=2278038).
6161

6262
If you use OLEDB/ODBC/ADO.NET drivers for other database systems, such as PostgreSQL, MySQL, Oracle, and so on, you can download the 64-bit versions from their websites.
6363
- If you use data flow components from Azure Feature Pack in your packages, [download and install Azure Feature Pack for SQL Server 2017](https://www.microsoft.com/download/details.aspx?id=54798) on the same machine where your self-hosted IR is installed, if you haven't done so already.

articles/data-factory/tutorial-incremental-copy-multiple-tables-powershell.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ END
225225

226226
### Azure PowerShell
227227

228-
Install the latest Azure PowerShell modules by following the instructions in [Install and configure Azure PowerShell](/powershell/azure/azurerm/install-azurerm-ps).
228+
Install the latest Azure PowerShell modules by following the instructions in [Install and configure Azure PowerShell](/powershell/azure/install-azure-powershell).
229229

230230
## Create a data factory
231231

articles/iot-operations/connect-to-cloud/howto-create-dataflow.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -677,7 +677,7 @@ You can use the **Compute** transform to apply a formula to the source data. Thi
677677
| Last known value | Optionally, use the last known value if the current value isn't available. |
678678

679679

680-
You can enter or edit a formula in the **Formula** field. The formula can use the fields in the source data. Enter `@` or select **Ctrl + Space** to choose datapoints from a dropdown.
680+
You can enter or edit a formula in the **Formula** field. The formula can use the fields in the source data. Enter `@` or select **Ctrl + Space** to choose datapoints from a dropdown. For built-in formulas, select the `<dataflow>` placeholder to see the list of available datapoints.
681681

682682
You can enter MQTT metadata properties using the format `@$metadata.user_properties.<property>` or `@$metadata.topic`. You can also enter $metadata headers using the format `@$metadata.<header>`. The `$metadata` syntax is only needed for MQTT properties that are part of the message header. For more information, see [field references](concept-dataflow-mapping.md#field-references).
683683

@@ -701,11 +701,8 @@ You can rename a datapoint using the **Rename** transform. This operation is use
701701
| New datapoint name | Enter the new name for the datapoint. |
702702
| Description | Provide a description for the transformation. |
703703

704-
Enter `@` or select **Ctrl + Space** to choose datapoints from a dropdown.
705-
706704
You can enter MQTT metadata properties using the format `@$metadata.user_properties.<property>` or `@$metadata.topic`. You can also enter $metadata headers using the format `@$metadata.<header>`. The `$metadata` syntax is only needed for MQTT properties that are part of the message header. For more information, see [field references](concept-dataflow-mapping.md#field-references).
707705

708-
709706
1. Select **Apply**.
710707

711708
#### New property

articles/load-balancer/TOC.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,11 @@
6060
href: tutorial-load-balancer-standard-public-zonal-portal.md
6161
- name: Load balance VMs with multiple availability sets
6262
href: tutorial-multi-availability-sets-portal.md
63-
- name: Cross-region load balancer
63+
- name: Globalload balancer
6464
items:
65-
- name: Create cross-region load balancer - Portal
65+
- name: Create global load balancer - Portal
6666
href: tutorial-cross-region-portal.md
67-
- name: Deploy cross-region load balancer - ARM template
67+
- name: Deploy global load balancer - ARM template
6868
href: tutorial-deploy-cross-region-load-balancer-template.md
6969
- name: Gateway load balancer
7070
items:
@@ -108,13 +108,13 @@
108108
href: load-balancer-custom-probe-overview.md
109109
- name: Cross-subscription load balancer
110110
href: cross-subscription-overview.md
111-
- name: Cross-region load balancer
111+
- name: Global load balancer
112112
href: cross-region-overview.md
113113
- name: Administrative state
114114
href: admin-state-overview.md
115115
- name: Reliability
116116
items:
117-
- name: Availability zones and cross-region load balancer
117+
- name: Availability zones and global load balancer
118118
href: ../reliability/reliability-load-balancer.md?toc=/azure/load-balancer/toc.json&bc=/azure/load-balancer/breadcrumb/toc.json
119119
- name: Availability zone migration
120120
href: ../reliability/migrate-load-balancer.md?toc=/azure/load-balancer/toc.json&bc=/azure/load-balancer/breadcrumb/toc.json

articles/load-balancer/cross-region-overview.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2-
title: Cross-region load balancer
2+
title: Global load balancer
33
titleSuffix: Azure Load Balancer
4-
description: Overview of cross region load balancer tier for Azure Load Balancer.
4+
description: Overview of global load balancer tier for Azure Load Balancer.
55
services: load-balancer
66
author: mbender-ms
77
ms.service: azure-load-balancer
@@ -13,7 +13,7 @@ ms.custom: references_regions
1313

1414
# Global Load Balancer
1515

16-
Azure Standard Load Balancer supports cross-region load balancing enabling geo-redundant high availability scenarios such as:
16+
Azure Standard Load Balancer supports global load balancing enabling geo-redundant high availability scenarios such as:
1717

1818
* Incoming traffic originating from multiple regions.
1919
* [Instant global failover](#regional-redundancy) to the next optimal regional deployment.

articles/load-balancer/tutorial-cross-region-portal.md

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
---
2-
title: 'Tutorial: Create a cross-region load balancer'
2+
title: 'Tutorial: Create an Azure Global Load Balancer'
33
titleSuffix: Azure Load Balancer
4-
description: Get started with this tutorial deploying a cross-region Azure Load Balancer with the Azure portal, Azure CLI, or Azure PowerShell.
4+
description: Get started with this tutorial deploying a global Load Balancer with the Azure portal, Azure CLI, or Azure PowerShell.
55
author: mbender-ms
66
ms.author: mbender
77
ms.service: azure-load-balancer
88
ms.topic: tutorial
99
ms.date: 08/01/2024
1010
ms.custom: template-tutorial, references_regions
11-
#Customer intent: As a administrator, I want to deploy a cross-region load balancer for global high availability of my application or service.
11+
#Customer intent: As a administrator, I want to deploy a global load balancer for global high availability of my application or service.
1212
---
1313

14-
# Tutorial: Create a cross-region Azure Load Balancer
14+
# Tutorial: Create an Azure Global Load Balancer
1515

16-
A cross-region load balancer ensures a service is available globally across multiple Azure regions. If one region fails, the traffic is routed to the next closest healthy regional load balancer.
16+
A global load balancer ensures a service is available globally across multiple Azure regions. If one region fails, the traffic is routed to the next closest healthy regional load balancer.
1717

1818
In this tutorial, you learn how to:
1919

2020
> [!div class="checklist"]
21-
> * Create cross-region load balancer.
21+
> * Create global load balancer.
2222
> * Create a backend pool containing two regional load balancers.
2323
> * Create a load balancer rule.
2424
> * Test the load balancer.
@@ -56,9 +56,9 @@ If you choose to install and use PowerShell locally, this article requires the A
5656
---
5757

5858

59-
## Create cross-region load balancer
59+
## Create global load balancer
6060

61-
In this section, you create a cross-region load balancer with a public IP address, a frontend IP configuration, a backend pool with region load balancers added, and a load balancer rule.
61+
In this section, you create a global load balancer with a public IP address, a frontend IP configuration, a backend pool with region load balancers added, and a load balancer rule.
6262

6363
# [Azure portal](#tab/azureportal)
6464

@@ -87,7 +87,7 @@ In this section, you create a cross-region load balancer with a public IP addres
8787
| SKU | Leave the default of **Standard**. |
8888
| Tier | Select **Global** |
8989

90-
:::image type="content" source="./media/tutorial-cross-region-portal/create-cross-region.png" alt-text="Create a cross-region load balancer" border="true":::
90+
:::image type="content" source="./media/tutorial-cross-region-portal/create-cross-region.png" alt-text="Create a global load balancer" border="true":::
9191

9292
5. Select **Next: Frontend IP configuration** at the bottom of the page.
9393

@@ -158,9 +158,9 @@ Create a resource group with [az group create](/cli/azure/group#az-group-create)
158158
--location westus
159159
```
160160

161-
### Create the cross-region load balancer resource
161+
### Create the global load balancer resource
162162

163-
Create a cross-region load balancer with [az network cross-region-lb create](/cli/azure/network/cross-region-lb#az-network-cross-region-lb-create):
163+
Create a global load balancer with [az network cross-region-lb create](/cli/azure/network/cross-region-lb#az-network-cross-region-lb-create):
164164

165165
* Named **myLoadBalancer-CR**.
166166
* A frontend pool named **myFrontEnd-CR**.
@@ -203,18 +203,18 @@ Create a load balancer rule with [az network cross-region-lb rule create](/cli/a
203203

204204
## Create backend pool
205205

206-
In this section, you add two regional standard load balancers to the backend pool of the cross-region load balancer.
206+
In this section, you add two regional standard load balancers to the backend pool of the global load balancer.
207207

208208
> [!IMPORTANT]
209209
> To complete these steps, ensure that two regional load balancers with backend pools have been deployed in your subscription. For more information, see, **[Quickstart: Create a public load balancer to load balance VMs using Azure CLI](quickstart-load-balancer-standard-public-cli.md)**.
210210
211211
### Add the regional frontends to load balancer
212212

213-
In this section, you place the resource IDs of two regional load balancers frontends into variables, and then use the variables to add the frontends to the backend address pool of the cross-region load balancer.
213+
In this section, you place the resource IDs of two regional load balancers frontends into variables, and then use the variables to add the frontends to the backend address pool of the global load balancer.
214214

215215
Retrieve the resource IDs with [az network lb frontend-ip show](/cli/azure/network/lb/frontend-ip#az-network-lb-frontend-ip-show).
216216

217-
Use [az network cross-region-lb address-pool address add](/cli/azure/network/cross-region-lb/address-pool/address#az-network-cross-region-lb-address-pool-address-add) to add the frontends you placed in variables in the backend pool of the cross-region load balancer:
217+
Use [az network cross-region-lb address-pool address add](/cli/azure/network/cross-region-lb/address-pool/address#az-network-cross-region-lb-address-pool-address-add) to add the frontends you placed in variables in the backend pool of the global load balancer:
218218

219219
```azurecli-interactive
220220
region1id=$(az network lb frontend-ip show \
@@ -264,11 +264,11 @@ New-AzResourceGroup @rg
264264
265265
```
266266

267-
### Create cross-region load balancer resources
267+
### Create global load balancer resources
268268

269-
In this section, you create the resources needed for the cross-region load balancer.
269+
In this section, you create the resources needed for the global load balancer.
270270

271-
A global standard sku public IP is used for the frontend of the cross-region load balancer.
271+
A global standard sku public IP is used for the frontend of the global load balancer.
272272

273273
* Use [New-AzPublicIpAddress](/powershell/module/az.network/new-azpublicipaddress) to create the public IP address.
274274

@@ -278,7 +278,7 @@ A global standard sku public IP is used for the frontend of the cross-region loa
278278

279279
* Create a load balancer rule with [Add-AzLoadBalancerRuleConfig](/powershell/module/az.network/add-azloadbalancerruleconfig).
280280

281-
* Create a cross-region load Balancer with [New-AzLoadBalancer](/powershell/module/az.network/new-azloadbalancer).
281+
* Create a global load Balancer with [New-AzLoadBalancer](/powershell/module/az.network/new-azloadbalancer).
282282

283283
```azurepowershell-interactive
284284
`## Create global IP address for load balancer ##
@@ -316,7 +316,7 @@ $rul = @{
316316
}
317317
$rule = New-AzLoadBalancerRuleConfig @rul
318318
319-
## Create cross-region load balancer resource ##
319+
## Create global load balancer resource ##
320320
$lbp = @{
321321
ResourceGroupName = 'myResourceGroupLB-CR'
322322
Name = 'myLoadBalancer-CR'
@@ -332,7 +332,7 @@ $lb = New-AzLoadBalancer @lbp`
332332

333333
## Configure backend pool
334334

335-
In this section, you add two regional standard load balancers to the backend pool of the cross-region load balancer.
335+
In this section, you add two regional standard load balancers to the backend pool of the global load balancer.
336336

337337
> [!IMPORTANT]
338338
> To complete these steps, ensure that two regional load balancers with backend pools have been deployed in your subscription. For more information, see, **[Quickstart: Create a public load balancer to load balance VMs using Azure PowerShell](quickstart-load-balancer-standard-public-powershell.md)**.
@@ -341,7 +341,7 @@ In this section, you add two regional standard load balancers to the backend poo
341341

342342
* Use [New-AzLoadBalancerBackendAddressConfig](/powershell/module/az.network/new-azloadbalancerbackendaddressconfig) to create the backend address pool configuration for the load balancer.
343343

344-
* Use [Set-AzLoadBalancerBackendAddressPool](/powershell/module/az.network/new-azloadbalancerbackendaddresspool) to add the regional load balancer frontend to the cross-region backend pool.
344+
* Use [Set-AzLoadBalancerBackendAddressPool](/powershell/module/az.network/new-azloadbalancerbackendaddresspool) to add the regional load balancer frontend to the global backend pool.
345345

346346
```azurepowershell-interactive
347347
## Place the region one load balancer configuration in a variable ##
@@ -372,21 +372,21 @@ $region2fe = @{
372372
}
373373
$R2FE = Get-AzLoadBalancerFrontendIpConfig @region2fe
374374
375-
## Create the cross-region backend address pool configuration for region 1 ##
375+
## Create the global backend address pool configuration for region 1 ##
376376
$region1ap = @{
377377
Name = 'MyBackendPoolConfig-R1'
378378
LoadBalancerFrontendIPConfigurationId = $R1FE.Id
379379
}
380380
$beaddressconfigR1 = New-AzLoadBalancerBackendAddressConfig @region1ap
381381
382-
## Create the cross-region backend address pool configuration for region 2 ##
382+
## Create the global backend address pool configuration for region 2 ##
383383
$region2ap = @{
384384
Name = 'MyBackendPoolConfig-R2'
385385
LoadBalancerFrontendIPConfigurationId = $R2FE.Id
386386
}
387387
$beaddressconfigR2 = New-AzLoadBalancerBackendAddressConfig @region2ap
388388
389-
## Apply the backend address pool configuration for the cross-region load balancer ##
389+
## Apply the backend address pool configuration for the global load balancer ##
390390
$bepoolcr = @{
391391
ResourceGroupName = 'myResourceGroupLB-CR'
392392
LoadBalancerName = 'myLoadBalancer-CR'
@@ -402,7 +402,7 @@ Set-AzLoadBalancerBackendAddressPool @bepoolcr
402402
## Test the load balancer
403403

404404
# [Azure portal](#tab/azureportal)
405-
In this section, you test the cross-region load balancer. You connect to the public IP address in a web browser. You stop the virtual machines in one of the regional load balancer backend pools and observe the failover.
405+
In this section, you test the global load balancer. You connect to the public IP address in a web browser. You stop the virtual machines in one of the regional load balancer backend pools and observe the failover.
406406

407407
1. Find the public IP address for the load balancer on the **Overview** screen. Select **All services** in the left-hand menu, select **All resources**, and then select **myPublicIP-cr**.
408408

@@ -418,7 +418,7 @@ In this section, you test the cross-region load balancer. You connect to the pub
418418

419419
# [Azure CLI](#tab/azurecli/)
420420

421-
In this section, you test the cross-region load balancer. You connect to the public IP address in a web browser. You stop the virtual machines in one of the regional load balancer backend pools and observe the failover.
421+
In this section, you test the global load balancer. You connect to the public IP address in a web browser. You stop the virtual machines in one of the regional load balancer backend pools and observe the failover.
422422

423423
1. To get the public IP address of the load balancer, use [az network public-ip show](/cli/azure/network/public-ip#az-network-public-ip-show):
424424

@@ -437,7 +437,7 @@ In this section, you test the cross-region load balancer. You connect to the pub
437437
438438
# [Azure PowerShell](#tab/azurepowershell/)
439439
440-
In this section, you test the cross-region load balancer. You connect to the public IP address in a web browser. You stop the virtual machines in one of the regional load balancer backend pools and observe the failover.
440+
In this section, you test the global load balancer. You connect to the public IP address in a web browser. You stop the virtual machines in one of the regional load balancer backend pools and observe the failover.
441441
442442
1. Use [Get-AzPublicIpAddress](/powershell/module/az.network/get-azpublicipaddress) to get the public IP address of the load balancer:
443443
@@ -487,11 +487,11 @@ Remove-AzResourceGroup -Name 'myResourceGroupLB-CR'
487487

488488
In this tutorial, you:
489489

490-
* Created a cross-region load balancer.
491-
* Added regional load balancers to the backend pool of the cross-region load balancer.
490+
* Created a global load balancer.
491+
* Added regional load balancers to the backend pool of the global load balancer.
492492
* Created a load-balancing rule.
493493
* Tested the load balancer.
494494

495-
For more information on cross-region load balancer, see:
495+
For more information on global load balancer, see:
496496
> [!div class="nextstepaction"]
497-
> [Cross-region load balancer (Preview)](cross-region-overview.md)
497+
> [Global load balancer](cross-region-overview.md)

0 commit comments

Comments
 (0)