Merge pull request #304063 from MicrosoftDocs/main

Auto Publish – main to live - 2025-08-11 11:00 UTC

Author: learn-build-service-prod[bot]

articles/backup/backup-azure-files-faq.yml

@@ -108,6 +108,10 @@ sections:
         answer: |
           If you are restoring from snapshot backup, for Original Location Recovery (OLR) the total restore time depends on number of files and directories in the share. When you restore to alternate location, the restore time depends on number of files and directories in the share to be restored and  available IOPS on source and target storage account.
 
+      - question: |
+          Will the retention policy delete a recovery point selected for restore  before the restore operation completes?
+        answer: |
+          No. Azure Backup takes a lease on the recovery point during restore, ensuring it isn't deleted before completion.
 
 
   - name: Manage backup

articles/backup/troubleshoot-azure-files.md

@@ -2,7 +2,7 @@
 title: Troubleshoot Azure Files backup
 description: This article is troubleshooting information about issues occurring when protecting your Azure Files.
 ms.service: azure-backup
-ms.date: 04/30/2025
+ms.date: 08/11/2025
 ms.topic: troubleshooting
 author: AbhishekMallick-MS
 ms.author: v-mallicka
@@ -307,6 +307,13 @@ Recommended Actions: Ensure that the following configurations in the storage acc
 
 **Recommended action**: The next backup will be automatically triggered with increased vault storage.
 
+### UserErrorStorageKeyBasedAuthenticationNotPermitted
+
+**Error code**: `UserErrorStorageKeyBasedAuthenticationNotPermitted`
+
+**Error message**: Storage account does not support key based authentication required for Azure Backup integration.
+
+**Recommended action**: Enable storage key based authentication on storage account and the retry opertaion.
 
 ## Common policy modification errors
 

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

@@ -25,11 +25,12 @@ This connector is specialized for the [Azure Database for PostgreSQL service](/a
 
 This Azure Database for PostgreSQL connector is supported for the following capabilities:
 
-| Supported capabilities|IR | Managed private endpoint|
+| Supported capabilities | IR | Managed private endpoint | Connector supported versions |
 |---------| --------| --------|
-|[Copy activity](copy-activity-overview.md) (source/sink)|① ②|✓ |
-|[Mapping data flow](concepts-data-flow-overview.md) (source/sink)|① |✓ |
-|[Lookup activity](control-flow-lookup-activity.md)|① ②|✓ |
+|[Copy activity](copy-activity-overview.md) (source/sink)|① ②|✓ |1.0 & 2.0 |
+|[Mapping data flow](concepts-data-flow-overview.md) (source/sink)|① |✓ |1.0 & 2.0 |
+|[Lookup activity](control-flow-lookup-activity.md)|① ②|✓ |1.0 & 2.0 |
+|[Script activity](transform-data-using-script.md)|① ②|✓ |2.0 |
 
 *① Azure integration runtime ② Self-hosted integration runtime*
 
@@ -474,17 +475,20 @@ To copy data from Azure Database for PostgreSQL, set the source type in the copy
 
 ### Azure Database for PostgreSQL as sink
 
-To copy data to Azure Database for PostgreSQL, the following properties are supported in the copy activity **sink** section:
+To copy data to Azure Database for PostgreSQL, set the sink type in the copy activity to **SqlSink**. The following properties are supported in the copy activity **sink** section:
 
-| Property | Description | Required |
-|:--- |:--- |:--- |
-| type | The type property of the copy activity sink must be set to **AzurePostgreSqlSink**. | Yes |
-| preCopyScript | Specify a SQL query for the copy activity to execute before you write data into Azure Database for PostgreSQL in each run. You can use this property to clean up the preloaded data. | No |
-| writeMethod | The method used to write data into Azure Database for PostgreSQL.<br>Allowed values are: **CopyCommand** (default, which is more performant), **BulkInsert**. | No |
-| writeBatchSize | The number of rows loaded into Azure Database for PostgreSQL per batch.<br>Allowed value is an integer that represents the number of rows. | No (default is 1,000,000) |
-| writeBatchTimeout | Wait time for the batch insert operation to complete before it times out.<br>Allowed values are Timespan strings. An example is 00:30:00 (30 minutes). | No (default is 00:30:00) |
+| Property | Description | Required | Connector support version |
+|:--- |:--- |:--- |:--- |
+| type | The type property of the copy activity sink must be set to **AzurePostgreSQLSink**. | Yes | Version 1.0 & Version 2.0 |
+| preCopyScript | Specify a SQL query for the copy activity to execute before you write data into Azure Database for PostgreSQL in each run. You can use this property to clean up the preloaded data. | No | Version 1.0 & Version 2.0 |
+| writeMethod | The method used to write data into Azure Database for PostgreSQL.<br>Allowed values are: **CopyCommand** (default, which is more performant), **BulkInsert** and **Upsert** (Version 2.0 only). | No | Version 1.0 & Version 2.0 |
+| upsertSettings | Specify the group of the settings for write behavior. <br/> Apply when the WriteBehavior option is `Upsert`. | No | Version 2.0 |
+| ***Under `upsertSettings`:*** | | |
+| keys | Specify the column names for unique row identification. Either a single key or a series of keys can be used. Keys must be a primary key or unique column. If not specified, the primary key is used. | No | Version 2.0 |
+| writeBatchSize | The number of rows loaded into Azure Database for PostgreSQL per batch.<br>Allowed value is an integer that represents the number of rows. | No (default is 1,000,000) | Version 1.0 & Version 2.0 |
+| writeBatchTimeout | Wait time for the batch insert operation to complete before it times out.<br>Allowed values are Timespan strings. An example is 00:30:00 (30 minutes). | No (default is 00:30:00) | Version 1.0 & Version 2.0 |
 
-**Example**:
+**Example 1: Copy Command**
 
 ```json
 "activities":[
@@ -518,6 +522,47 @@ To copy data to Azure Database for PostgreSQL, the following properties are supp
 ]
 ```
 
+**Example 2: Upsert data**
+
+```json
+"activities":[
+    {
+        "name": "CopyToAzureDatabaseForPostgreSQL",
+        "type": "Copy",
+        "inputs": [
+            {
+                "referenceName": "<input dataset name>",
+                "type": "DatasetReference"
+            }
+        ],
+        "outputs": [
+            {
+                "referenceName": "<Azure PostgreSQL output dataset name>",
+                "type": "DatasetReference"
+            }
+        ],
+        "typeProperties": {
+            "source": {
+                "type": "<source type>"
+            },
+            "sink": {
+                "type": "AzurePostgreSQLSink",
+                "writeMethod": "Upsert",
+                "upsertSettings": {
+                    "keys": [
+                        "<column name>"
+                    ]
+                },
+            }
+        }
+    }
+]
+```
+
+### Upsert data
+
+Copy activity natively supports upsert operations. To perform an upsert, user should provide key column(s) that are either primary keys or unique columns. If the user does not provide key column(s) then primary key column(s) in the sink table are used. Copy Activity will update non-key column(s) in the sink table where the key column value(s) match those in the source table; otherwise, it will insert new data.
+
 ## Parallel copy from Azure Database for PostgreSQL
 
 The Azure Database for PostgreSQL connector in copy activity provides built-in data partitioning to copy data in parallel. You can find data partitioning options on the **Source** tab of the copy activity.
@@ -641,6 +686,17 @@ IncomingStream sink(allowSchemaDrift: true,
     skipDuplicateMapOutputs: true) ~> AzurePostgreSqlSink
 ```
 
+## Script activity
+
+> [!IMPORTANT]
+> Script activity is only supported in the version 2.0 connector.
+> [!IMPORTANT]
+> Multi-query statements using output parameters are not supported. It is recommended that you split any output queries into separate script blocks within the same or different script activity.
+>
+> Multi-query statements using positional parameters are not supported. It is recommended that you split any positional queries into separate script blocks within the same or different script activity.
+
+For more information about script activity, see [Script activity](transform-data-using-script.md).
+
 ## Lookup activity properties
 
 For more information about the properties, see [Lookup activity](control-flow-lookup-activity.md).

articles/data-factory/connector-teradata.md

@@ -6,7 +6,7 @@ author: jianleishen
 ms.subservice: data-movement
 ms.custom: synapse
 ms.topic: conceptual
-ms.date: 06/06/2025
+ms.date: 08/05/2025
 ms.author: jianleishen
 ---
 
@@ -34,7 +34,8 @@ For a list of data stores that are supported as sources/sinks by the copy activi
 
 Specifically, this Teradata connector supports:
 
-- Teradata **version 14.10, 15.0, 15.10, 16.0, 16.10, and 16.20**.
+- Teradata Vantage Versions **17.0, 17.10, 17.20 and 20.0** for version 2.0.
+- Teradata Vantage Versions **14.10, 15.0, 15.10, 16.0, 16.10, and 16.20** for version 1.0.
 - Copying data by using **Basic**, **Windows**, or **LDAP** authentication.
 - Parallel copying from a Teradata source. See the [Parallel copy from Teradata](#parallel-copy-from-teradata) section for details.
 
@@ -44,7 +45,8 @@ Specifically, this Teradata connector supports:
 
 ### For version 2.0
 
- You need to [install .NET Data Provider](https://downloads.teradata.com/download/connectivity/net-data-provider-teradata) with version 20.00.03.00 or above on your self-hosted integration runtime if you use it.
+ You need to [install .NET Data Provider](https://downloads.teradata.com/download/connectivity/net-data-provider-teradata) with version 20.00.03.00 or above on the machine running the self-hosted integration runtime with a version under 5.56.9318.1. Manual installation of the Teradata driver is not required when using self-hosted integration runtime version 5.56.9318.1 or above, as these versions provide a built-in driver.
+
 ### For version 1.0
 
 If you use Self-hosted Integration Runtime, note it provides a built-in Teradata driver starting from version 3.18. You don't need to manually install any driver. The driver requires "Visual C++ Redistributable 2012 Update 4" on the self-hosted integration runtime machine. If you don't yet have it installed, download it from [here](https://www.microsoft.com/en-sg/download/details.aspx?id=30679).

articles/data-factory/transform-data-using-script.md

@@ -6,7 +6,7 @@ ms.topic: conceptual
 author: nabhishek
 ms.author: abnarain
 ms.custom: synapse
-ms.date: 10/03/2024
+ms.date: 08/01/2025
 ms.subservice: orchestration
 ---
 
@@ -20,9 +20,10 @@ Using the script activity, you can execute common operations with Data Manipulat
 
 You can use the Script activity to invoke a SQL script in one of the following data stores in your enterprise or on an Azure virtual machine (VM): 
 
+- Azure Database for PostgreSQL (Version 2.0)
 - Azure SQL Database 
-- Azure Synapse Analytics 
-- SQL Server Database. If you are using SQL Server, install Self-hosted integration runtime on the same machine that hosts the database or on a separate machine that has access to the database. Self-Hosted integration runtime is a component that connects data sources on-premises/on Azure VM with cloud services in a secure and managed way. See the [Self-hosted integration runtime](create-self-hosted-integration-runtime.md) article for details. 
+- Azure Synapse Analytics
+- SQL Server Database. If you're using SQL Server, install Self-hosted integration runtime on the same machine that hosts the database or on a separate machine that has access to the database. Self-Hosted integration runtime is a component that connects data sources on-premises/on Azure VM with cloud services in a secure and managed way. See the [Self-hosted integration runtime](create-self-hosted-integration-runtime.md) article for details.
 - Oracle
 - Snowflake
 
@@ -36,7 +37,7 @@ The script can contain either a single SQL statement or multiple SQL statements
 
 ## Syntax details
 
-Here is the JSON format for defining a Script activity: 
+Here's the JSON format for defining a Script activity: 
 
 ```json
 { 
@@ -142,7 +143,7 @@ Sample output:
 |Property name  |Description  |Condition  |
 |---------|---------|---------|
 |resultSetCount     |The count of result sets returned by the script.           |Always         |
-|resultSets     |The array which contains all the result sets.           |Always          |
+|resultSets     |The array that contains all the result sets.           |Always          |
 |resultSets.rowCount      |Total rows in the result set.         |Always          |
 |resultSets.rows      |The array of rows in the result set.           |Always         |
 |recordsAffected      |The row count of affected rows by the script.         |If scriptType is NonQuery         |
@@ -153,10 +154,10 @@ Sample output:
 
 > [!NOTE]
 > - The output is collected every time a script block is executed. The final output is the merged result of all script block outputs. The output parameter with same name in different script block will get overwritten. 
-> - Since the output has size / rows limitation, the output will be truncated in following order: logs -> parameters -> rows. Note, this applies to a single script block, which means the output rows of next script block won’t evict previous logs. 
+> - Since the output has size / rows limitation, the output will be truncated in the following order: logs -> parameters -> rows. This applies to a single script block, which means the output rows of next script block won’t evict previous logs. 
 > - Any error caused by log won’t fail the activity. 
-> - For consuming activity output resultSets in down stream activity please refer to the [Lookup activity result documentation](control-flow-lookup-activity.md#use-the-lookup-activity-result).
-> - Use outputLogs when you are using 'PRINT' statements for logging purpose. If query returns resultSets, it will be available in the activity output and will be limited to 5000 rows/ 4MB size limit. 
+> - For consuming activity output resultSets in down stream activity, refer to the [Lookup activity result documentation](control-flow-lookup-activity.md#use-the-lookup-activity-result).
+> - Use outputLogs when you're using 'PRINT' statements for logging purpose. If query returns resultSets, it will be available in the activity output and will be limited to 5000 rows/ 4MB size limit. 
 
 ## Configure the Script activity using UI
 

articles/hdinsight/hdinsight-autoscale-clusters.md

@@ -75,13 +75,12 @@ It's recommended that Ambari DB is sized correctly to reap the benefits of autos
 The following table describes the cluster types and versions that are compatible with the Autoscale feature.
 
 | Version | Spark | Hive | Interactive Query | HBase | Kafka |
-|---|---|---|---|---|---|---|
-| HDInsight 4.0 without ESP | Yes | Yes | Yes* | No | No |
-| HDInsight 4.0 with ESP | Yes | Yes | Yes* | No | No |
-| HDInsight 5.0 without ESP | Yes | Yes | Yes* | No | No |
-| HDInsight 5.0 with ESP | Yes | Yes | Yes* | No | No |
+|---|---|---|---|---|---|
+| HDInsight 5.1 without ESP | Yes | Yes | Yes* | No | No |
+| HDInsight 5.1 with ESP | Yes | Yes | Yes* | No | No |
 
-\* Interactive Query clusters can only be configured for schedule-based scaling, not load-based.
+> [!Note]
+> Interactive Query clusters can only be configured for schedule-based scaling. Load-based Autoscale is not supported.
 
 ## Get started
 

articles/hdinsight/hdinsight-component-retirements-and-action-required.md

@@ -3,7 +3,7 @@ title: Azure HDInsight component retirements and action required
 description: Learn about HDInsight retirement versions and its components in Azure HDInsight clusters.
 ms.service: azure-hdinsight
 ms.topic: conceptual
-ms.date: 09/30/2024
+ms.date: 08/11/2025
 author: anuj1905
 ms.author: anujsharda
 ms.reviewer: hgowrisankar
@@ -42,8 +42,9 @@ HDInsight bundles open-source components and HDInsight platform into a package t
 
 |Retirement Item | Retirement Date | Action Required by Customers| Cluster creation required?|
 |-|-|-|-|
-|[Basic and Standard A-series VMs Retirement](https://azure.microsoft.com/updates/basic-and-standard-aseries-vms-on-hdinsight-will-retire-on-31-august-2024/) |August 31, 2024 |[Av1-series retirement - Azure Virtual Machines](/azure/virtual-machines/sizes/migration-guides/av1-series-retirement) |N|
+|[Basic and Standard A-series VMs Retirement](https://azure.microsoft.com/updates/basic-and-standard-aseries-vms-on-hdinsight-will-retire-on-31-august-2024/) |August 31, 2024 |[Av1-series retirement - Azure Virtual Machines](/azure/virtual-machines/sizes/migration-guides/av1-series-retirement) |Y|
 |[Azure Monitor experience (preview)](https://azure.microsoft.com/updates/v2/hdinsight-azure-monitor-experience-retirement/) | February 01, 2025 |[Azure Monitor Agent (AMA) migration guide for Azure HDInsight clusters](./azure-monitor-agent.md) |Y|
+|[Enterprise Security Package](https://azure.microsoft.com/updates?id=497263) | July 31, 2026 | Migrate to alternative Azure offerings such as Microsoft Fabric |N/A|
 
 
 ## Next steps

articles/hdinsight/interactive-query/llap-schedule-based-autoscale-best-practices.md

@@ -16,9 +16,9 @@ This document provides the onboarding steps to enable schedule-based autosca
 ## **Supportability**
 
 - Autoscale isn't supported in HDI 3.6 Interactive Query(LLAP) cluster.  
-- HDI 4.0 Interactive Query Cluster supports only Schedule-Based Autoscale. 
+- Interactive Query Cluster supports only Schedule-Based Autoscale. 
 
-Feature Supportability with HDInsight 4.0 Interactive Query(LLAP) Autoscale
+Feature Supportability with Interactive Query(LLAP) Autoscale
 
 | Feature  | Schedule-Based Autoscale  |
 |:---:|:---:|

articles/migrate/common-questions-server-migration.md

@@ -156,7 +156,7 @@ The **Migration and modernization** tool migrates all the UEFI-based machines to
 > [!NOTE]
 > If a major version of an operating system is supported in agentless migration, all minor versions and kernels are automatically supported.
 
-[!CAUTION]
+> [!CAUTION]
 > This article references Windows Server versions that have reached End of Support (EOS).Microsoft has officially ended support for the following operating systems:
 > - Windows Server 2003
 > - Windows Server 2008 (including SP2 and R2 SP1)

articles/sentinel/sap/deploy-data-connector-agent-container.md

@@ -370,6 +370,9 @@ At this stage, the system's **Health** status is **Pending**. If the agent is up
 
 1. Select **Connect**.
 
+> [!IMPORTANT]
+> There may be some wait time on initial connect. Find more details to verify the connector [here](/azure/sentinel/create-codeless-connector#verify-the-codeless-connector).
+
 ## Customize data connector behavior (optional)
 
 If you have an SAP agentless data connector for Microsoft Sentinel, you can use the SAP Integration Suite to customize how the agentless data connector ingests data from your SAP system into Microsoft Sentinel.