Skip to content

Commit 733c11b

Browse files
authored
Merge pull request #293612 from MicrosoftDocs/main
Publish to live, Monday 4 AM PST, 1/27
2 parents 5efeb14 + 5fc194a commit 733c11b

31 files changed

+132
-254
lines changed

articles/communication-services/how-tos/router-sdk/subscribe-events.md

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ dotnet run
240240
"key": "string",
241241
"labelOperator": "equal",
242242
"value": 5,
243-
"ttl": "P3Y6M4DT12H30M5S"
243+
"ttlSeconds": 60.0
244244
}
245245
]
246246
},
@@ -260,8 +260,8 @@ dotnet run
260260
| channelReference | `string` ||
261261
|channelId | `string` ||
262262
| classificationPolicyId | `string` || |
263-
| queueId | `string` | ✔️ | | `null` when `classificationPolicy` is not used for queue selection
264-
| priority | `int` | ✔️ | | `null` when `classificationPolicy` is not used for applying priority on job
263+
| queueId | `string` | | |
264+
| priority | `int` | | |
265265
| labels | `Dictionary<string, object>` | ✔️ | | Based on user input
266266
| tags | `Dictionary<string, object>` | ✔️ | | Based on user input
267267
| attachedWorkerSelectors | `List<WorkerSelector>` | ✔️ | | List of worker selectors attached by a classification policy
@@ -296,15 +296,15 @@ dotnet run
296296
"key": "string",
297297
"labelOperator": "equal",
298298
"value": 5,
299-
"ttl": "P3Y6M4DT12H30M5S"
299+
"ttlSeconds": 60.0
300300
}
301301
],
302302
"attachedWorkerSelectors": [
303303
{
304304
"key": "string",
305305
"labelOperator": "equal",
306306
"value": 5,
307-
"ttl": "P3Y6M4DT12H30M5S"
307+
"ttlSeconds": 60.0
308308
}
309309
]
310310
},
@@ -594,20 +594,20 @@ dotnet run
594594
"Segment": "Enterprise",
595595
"Token": "FooToken"
596596
},
597-
"requestedWorkerSelectorsExpired": [
597+
"expiredRequestedWorkerSelectors": [
598598
{
599599
"key": "string",
600600
"labelOperator": "equal",
601601
"value": 5,
602-
"ttl": "P3Y6M4DT12H30M5S"
602+
"ttlSeconds": 60.0
603603
}
604604
],
605-
"attachedWorkerSelectorsExpired": [
605+
"expiredAttachedWorkerSelectors": [
606606
{
607607
"key": "string",
608608
"labelOperator": "equal",
609609
"value": 5,
610-
"ttl": "P3Y6M4DT12H30M5S"
610+
"ttlSeconds": 60.0
611611
}
612612
]
613613
},
@@ -628,8 +628,8 @@ dotnet run
628628
| channelId | `string` ||
629629
| labels | `Dictionary<string, object>` | ✔️ | | Based on user input
630630
| tags | `Dictionary<string, object>` | ✔️ | | Based on user input
631-
| requestedWorkerSelectorsExpired | `List<WorkerSelector>` | ✔️ | | Based on user input while creating a job
632-
| attachedWorkerSelectorsExpired | `List<WorkerSelector>` | ✔️ | | List of worker selectors attached by a classification policy
631+
| expiredRequestedWorkerSelectors | `List<WorkerSelector>` | ✔️ | | Based on user input while creating a job
632+
| expiredAttachedWorkerSelectors | `List<WorkerSelector>` | ✔️ | | List of worker selectors attached by a classification policy
633633

634634
### Microsoft.Communication.RouterJobUnassigned
635635

@@ -708,15 +708,15 @@ dotnet run
708708
"key": "string",
709709
"labelOperator": "equal",
710710
"value": 5,
711-
"ttl": "P3Y6M4DT12H30M5S"
711+
"ttlSeconds": 60.0
712712
}
713713
],
714714
"attachedWorkerSelectors": [
715715
{
716716
"key": "string",
717717
"labelOperator": "equal",
718718
"value": 5,
719-
"ttl": "P3Y6M4DT12H30M5S"
719+
"ttlSeconds": 60.0
720720
}
721721
],
722722
"scheduledOn": "2022-02-17T00:55:25.1736293Z",
@@ -775,15 +775,15 @@ dotnet run
775775
"key": "string",
776776
"labelOperator": "equal",
777777
"value": 5,
778-
"ttl": "P3Y6M4DT12H30M5S"
778+
"ttlSeconds": 60.0
779779
}
780780
],
781781
"attachedWorkerSelectors": [
782782
{
783783
"key": "string",
784784
"labelOperator": "equal",
785785
"value": 5,
786-
"ttl": "P3Y6M4DT12H30M5S"
786+
"ttlSeconds": 60.0
787787
}
788788
],
789789
"scheduledOn": "2022-02-17T00:55:25.1736293Z",
@@ -890,6 +890,16 @@ dotnet run
890890
"Segment": "Enterprise",
891891
"Token": "FooToken"
892892
},
893+
"workerLabels": {
894+
"Locale": "en-us",
895+
"Segment": "Enterprise",
896+
"Token": "FooToken"
897+
},
898+
"workerTags": {
899+
"Locale": "en-us",
900+
"Segment": "Enterprise",
901+
"Token": "FooToken"
902+
},
893903
"channelReference": "test-abc",
894904
"channelId": "FooVoiceChannelId",
895905
"queueId": "625fec06-ab81-4e60-b780-f364ed96ade1",
@@ -912,6 +922,8 @@ dotnet run
912922
| jobPriority| `int` ||
913923
| jobLabels | `Dictionary<string, object>` | ✔️ | | Based on user input
914924
| jobTags | `Dictionary<string, object>` | ✔️ | | Based on user input
925+
| workerLabels | `Dictionary<string, object>` | ✔️ | | Based on user input
926+
| workerTags | `Dictionary<string, object>` | ✔️ | | Based on user input
915927
| channelReference | `string` ||
916928
|channelId | `string` ||
917929
| queueId | `string` ||
@@ -1235,7 +1247,7 @@ public class WorkerSelector
12351247
public object Value { get; set; }
12361248
public double? TTLSeconds { get; set; }
12371249
public WorkerSelectorState State { get; set; }
1238-
public DateTimeOffset? ExpireTime { get; set; }
1250+
public DateTimeOffset? ExpirationTime { get; set; }
12391251
}
12401252

12411253
public enum WorkerSelectorState

articles/data-factory/connector-azure-database-for-mariadb.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ author: jianleishen
77
ms.subservice: data-movement
88
ms.topic: conceptual
99
ms.custom: synapse
10-
ms.date: 09/04/2024
10+
ms.date: 01/26/2025
1111
---
1212

1313
# Copy data from Azure Database for MariaDB using Azure Data Factory or Synapse Analytics
1414

1515
[!INCLUDE[appliesto-adf-asa-md](includes/appliesto-adf-asa-md.md)]
1616

1717
> [!IMPORTANT]
18-
> This connector will be deprecated on **December 31, 2024**. Please migrate to [Azure Database for MySQL connector](connector-azure-database-for-mysql.md) by that date. You can also refer to this [article](https://techcommunity.microsoft.com/t5/azure-database-for-mysql-blog/migrating-from-azure-database-for-mariadb-to-azure-database-for/ba-p/3838455) for the Azure Database for MariaDB migration guidance.
18+
> This connector is at [End of Support stage](connector-deprecation-plan.md). Please migrate to [Azure Database for MySQL connector](connector-azure-database-for-mysql.md). You can also refer to this [article](https://techcommunity.microsoft.com/blog/adformysql/migrating-from-azure-database-for-mariadb-to-azure-database-for-mysql/3838455) for the Azure Database for MariaDB migration guidance.
1919
2020
This article outlines how to use the Copy Activity in an Azure Data Factory or Synapse Analytics pipeline to copy data from Azure Database for MariaDB. It builds on the [copy activity overview](copy-activity-overview.md) article that presents a general overview of copy activity.
2121

articles/data-factory/connector-concur.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ author: jianleishen
66
ms.subservice: data-movement
77
ms.custom: synapse
88
ms.topic: conceptual
9-
ms.date: 09/12/2024
9+
ms.date: 01/26/2025
1010
ms.author: jianleishen
1111
---
1212
# Copy data from Concur using Azure Data Factory or Synapse Analytics(Preview)
1313

1414
[!INCLUDE[appliesto-adf-asa-md](includes/appliesto-adf-asa-md.md)]
1515

1616
> [!IMPORTANT]
17-
> This connector will be deprecated on **December 31, 2024**. You are recommended to migrate to [ODBC connector](connector-odbc.md) by installing a driver before that date.
17+
> This connector is at [End of Support stage](connector-deprecation-plan.md). You are recommended to migrate to [ODBC connector](connector-odbc.md) by installing a driver.
1818
1919
This article outlines how to use the Copy Activity in an Azure Data Factory or Synapse Analytics pipeline to copy data from Concur. It builds on the [copy activity overview](copy-activity-overview.md) article that presents a general overview of copy activity.
2020

articles/data-factory/connector-couchbase.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ author: jianleishen
66
ms.subservice: data-movement
77
ms.custom: synapse
88
ms.topic: conceptual
9-
ms.date: 11/05/2024
9+
ms.date: 01/26/2025
1010
ms.author: jianleishen
1111
---
1212
# Copy data from Couchbase using Azure Data Factory (Preview)
1313
[!INCLUDE[appliesto-adf-asa-md](includes/appliesto-adf-asa-md.md)]
1414

1515
> [!IMPORTANT]
16-
> This connector will be deprecated on **December 31, 2024**. You are recommended to migrate to [ODBC connector](connector-odbc.md) by installing a driver before that date.
16+
> This connector is at [End of Support stage](connector-deprecation-plan.md). You are recommended to migrate to [ODBC connector](connector-odbc.md) by installing a driver.
1717
1818
This article outlines how to use the Copy Activity in an Azure Data Factory or Synapse Analytics pipeline to copy data from Couchbase. It builds on the [copy activity overview](copy-activity-overview.md) article that presents a general overview of copy activity.
1919

articles/data-factory/connector-drill.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ author: jianleishen
66
ms.subservice: data-movement
77
ms.custom: synapse
88
ms.topic: conceptual
9-
ms.date: 09/04/2024
9+
ms.date: 01/26/2025
1010
ms.author: jianleishen
1111
---
1212
# Copy data from Drill using Azure Data Factory or Synapse Analytics
1313

1414
[!INCLUDE[appliesto-adf-asa-md](includes/appliesto-adf-asa-md.md)]
1515

1616
> [!IMPORTANT]
17-
> This connector will be deprecated on **December 31, 2024**. You are recommended to migrate to [ODBC connector](connector-odbc.md) by installing a driver before that date.
17+
> This connector is at [End of Support stage](connector-deprecation-plan.md). You are recommended to migrate to [ODBC connector](connector-odbc.md) by installing a driver.
1818
1919
This article outlines how to use the Copy Activity in an Azure Data Factory or Synapse Analytics pipeline to copy data from Drill. It builds on the [copy activity overview](copy-activity-overview.md) article that presents a general overview of copy activity.
2020

articles/data-factory/connector-google-bigquery-legacy.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ author: jianleishen
77
ms.subservice: data-movement
88
ms.topic: conceptual
99
ms.custom: synapse
10-
ms.date: 12/02/2024
10+
ms.date: 01/26/2025
1111
---
1212

1313
# Copy data from Google BigQuery using Azure Data Factory or Synapse Analytics (legacy)
1414
[!INCLUDE[appliesto-adf-asa-md](includes/appliesto-adf-asa-md.md)]
1515

1616
This article outlines how to use Copy Activity in Azure Data Factory and Synapse Analytics pipelines to copy data from Google BigQuery. It builds on the [Copy Activity overview](copy-activity-overview.md) article that presents a general overview of the copy activity.
1717

18-
>[!IMPORTANT]
19-
>The new Google BigQuery connector provides improved native Google BigQuery support. If you are using the legacy Google BigQuery connector in your solution, please [upgrade your Google BigQuery connector](connector-google-bigquery.md#upgrade-the-google-bigquery-linked-service) before **October 31, 2024**. Refer to this [section](connector-google-bigquery.md#differences-between-google-bigquery-and-google-bigquery-legacy) for details on the difference between the legacy and latest version.
18+
> [!IMPORTANT]
19+
> The [Google BigQuery V2 connector](connector-google-bigquery.md) provides improved native Google BigQuery support. If you are using the [Google BigQuery V1 connector](connector-google-bigquery-legacy.md) in your solution, please [upgrade your Google BigQuery connector](connector-google-bigquery.md#upgrade-the-google-bigquery-linked-service) as V1 is at [End of Support stage](connector-deprecation-plan.md). Refer to this [section](connector-google-bigquery.md#differences-between-google-bigquery-and-google-bigquery-legacy) for details on the difference between V2 and V1.
2020
2121
## Supported capabilities
2222

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

Lines changed: 3 additions & 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: 11/05/2024
10+
ms.date: 01/26/2025
1111
---
1212

1313
# Copy data from Google BigQuery using Azure Data Factory or Synapse Analytics
@@ -16,8 +16,8 @@ ms.date: 11/05/2024
1616

1717
This article outlines how to use Copy Activity in Azure Data Factory and Synapse Analytics pipelines to copy data from Google BigQuery. It builds on the [Copy Activity overview](copy-activity-overview.md) article that presents a general overview of the copy activity.
1818

19-
>[!IMPORTANT]
20-
>The new Google BigQuery connector provides improved native Google BigQuery support. If you are using the legacy Google BigQuery connector in your solution, please [upgrade your Google BigQuery connector](#upgrade-the-google-bigquery-linked-service) before **October 31, 2024**. Refer to this [section](#differences-between-google-bigquery-and-google-bigquery-legacy) for details on the difference between the legacy and latest version.
19+
> [!IMPORTANT]
20+
> The [Google BigQuery V2 connector](connector-google-bigquery.md) provides improved native Google BigQuery support. If you are using the [Google BigQuery V1 connector](connector-google-bigquery-legacy.md) in your solution, please [upgrade your Google BigQuery connector](#upgrade-the-google-bigquery-linked-service) as V1 is at [End of Support stage](connector-deprecation-plan.md). Refer to this [section](#differences-between-google-bigquery-and-google-bigquery-legacy) for details on the difference between V2 and V1.
2121
2222
## Supported capabilities
2323

articles/data-factory/connector-hbase.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ author: jianleishen
66
ms.subservice: data-movement
77
ms.custom: synapse
88
ms.topic: conceptual
9-
ms.date: 10/28/2024
9+
ms.date: 01/26/2025
1010
ms.author: jianleishen
1111
---
1212
# Copy data from HBase using Azure Data Factory or Synapse Analytics
1313
[!INCLUDE[appliesto-adf-asa-md](includes/appliesto-adf-asa-md.md)]
1414

1515
> [!IMPORTANT]
16-
> This connector will be deprecated on **December 31, 2024**. You are recommended to migrate to [ODBC connector](connector-odbc.md) by installing a driver before that date.
16+
> This connector is at [End of Support stage](connector-deprecation-plan.md). You are recommended to migrate to [ODBC connector](connector-odbc.md) by installing a driver.
1717
1818
This article outlines how to use the Copy Activity in an Azure Data Factory or Synapse Analytics pipeline to copy data from HBase. It builds on the [copy activity overview](copy-activity-overview.md) article that presents a general overview of copy activity.
1919

@@ -34,7 +34,7 @@ The service provides a built-in driver to enable connectivity, therefore you don
3434

3535
## Prerequisites
3636

37-
If your data store is a managed cloud data service, you can use the Azure Integration Runtime. If the access is restricted to IPs that are approved in the firewall rules, you can add [Azure Integration Runtime IPs](azure-integration-runtime-ip-addresses.md) to the allow list.
37+
If your data store is a managed cloud data service, you can use the Azure Integration Runtime. If the access is restricted to IPs that are approved in the firewall rules, you can add [Azure Integration Runtime IPs](azure-integration-runtime-ip-addresses.md) to the allowlist.
3838

3939
You can also use the [managed virtual network integration runtime](tutorial-managed-virtual-network-on-premise-sql-server.md) feature in Azure Data Factory to access the on-premises network without installing and configuring a self-hosted integration runtime.
4040

articles/data-factory/connector-magento.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ author: jianleishen
66
ms.subservice: data-movement
77
ms.custom: synapse
88
ms.topic: conceptual
9-
ms.date: 09/04/2024
9+
ms.date: 01/26/2025
1010
ms.author: jianleishen
1111
---
1212
# Copy data from Magento using Azure Data Factory or Synapse Analytics(Preview)
1313
[!INCLUDE[appliesto-adf-asa-md](includes/appliesto-adf-asa-md.md)]
1414

1515
> [!IMPORTANT]
16-
> This connector will be deprecated on **December 31, 2024**. You are recommended to migrate to [ODBC connector](connector-odbc.md) by installing a driver before that date.
16+
> This connector is at [End of Support stage](connector-deprecation-plan.md). You are recommended to migrate to [ODBC connector](connector-odbc.md) by installing a driver.
1717
1818
This article outlines how to use the Copy Activity in an Azure Data Factory or Synapse Analytics pipeline to copy data from Magento. It builds on the [copy activity overview](copy-activity-overview.md) article that presents a general overview of copy activity.
1919

articles/data-factory/connector-mariadb.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: jianleishen
66
ms.subservice: data-movement
77
ms.custom: synapse
88
ms.topic: conceptual
9-
ms.date: 10/24/2024
9+
ms.date: 01/26/2025
1010
ms.author: jianleishen
1111
---
1212

@@ -15,8 +15,8 @@ ms.author: jianleishen
1515

1616
This article outlines how to use the Copy Activity in an Azure Data Factory or Synapse Analytics pipeline to copy data from MariaDB. It builds on the [copy activity overview](copy-activity-overview.md) article that presents a general overview of copy activity.
1717

18-
>[!IMPORTANT]
19-
>MariaDB connector using the recommended driver version provides improved native MariaDB support. If you are using the connector with the legacy driver version, please [upgrade it](#upgrade-the-mariadb-driver-version) before **October 31, 2024**. Refer to this [section](#differences-between-the-recommended-and-the-legacy-driver-version) for details on the difference between the legacy and recommended version.
18+
> [!IMPORTANT]
19+
> The MariaDB connector version 2.0 provides improved native MariaDB support. If you are using MariaDB connector version 1.0 in your solution, please [upgrade your MariaDB connector](#upgrade-the-mariadb-driver-version) as version 1.0 is at [End of Support stage](connector-deprecation-plan.md). Refer to this [section](#differences-between-the-recommended-and-the-legacy-driver-version) for details on the difference between version 2.0 and version 1.0.
2020
2121
## Supported capabilities
2222

0 commit comments

Comments
 (0)