Skip to content

Commit 31780f5

Browse files
authored
Merge pull request #299387 from MicrosoftDocs/main
Publish to live, Tuesday 4 AM PST, 5/6
2 parents f981fac + 6887e70 commit 31780f5

11 files changed

+114
-95
lines changed

articles/backup/backup-managed-disks-cli.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ This article describes how to back up [Azure Managed Disk](/azure/virtual-machin
1717
1818
Learn about the [Azure Disk backup region availability, supported scenarios and limitations](disk-backup-support-matrix.md).
1919

20+
>[!Note]
21+
>- If the target disk is attached as a Persistent Volume to an AKS cluster, choose [Azure Backup for AKS](./azure-kubernetes-service-cluster-backup.md) over the standalone Disk Backup solution. It enables backing up the disk as snapshots along with the containerized application in a Kubernetes-aware manner, all as a single unit. Additionally, you get Cross Region Restore and ransomware protection capabilities with AKS Backup.
22+
23+
2024
## Create a Backup vault
2125

2226
Backup vault is a storage entity in Azure that stores backup data for various newer workloads that Azure Backup supports, such as Azure Database for PostgreSQL servers, blobs in a storage account, and Azure Disks. Backup vaults make it easy to organize your backup data, while minimizing management overhead. Backup vaults are based on the Azure Resource Manager model of Azure, which provides enhanced capabilities to help secure backup data.

articles/backup/backup-managed-disks-ps.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ This article explains how to back up [Azure Managed Disk](/azure/virtual-machine
1414

1515
Learn about the [Azure Disk backup region availability, supported scenarios and limitations](disk-backup-support-matrix.md).
1616

17+
>[!Note]
18+
>- If the target disk is attached as a Persistent Volume to an AKS cluster, choose [Azure Backup for AKS](./azure-kubernetes-service-cluster-backup.md) over the standalone Disk Backup solution. It enables backing up the disk as snapshots along with the containerized application in a Kubernetes-aware manner, all as a single unit. Additionally, you get Cross Region Restore and ransomware protection capabilities with AKS Backup.
19+
20+
1721
## Create a Backup vault
1822

1923
A Backup vault is a storage entity in Azure that holds backup data for various newer workloads that Azure Backup supports, such as Azure Database for PostgreSQL servers and Azure Disks. Backup vaults make it easy to organize your backup data, while minimizing management overhead. Backup vaults are based on the Azure Resource Manager model of Azure, which provides enhanced capabilities to help secure backup data.

articles/backup/backup-managed-disks.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ This article explains how to back up [Azure Managed Disk](/azure/virtual-machine
1414

1515
Learn about the [Azure Disk backup region availability, supported scenarios and limitations](disk-backup-support-matrix.md).
1616

17+
>[!Note]
18+
>- If the target disk is attached as a Persistent Volume to an AKS cluster, choose [Azure Backup for AKS](./azure-kubernetes-service-cluster-backup.md) over the standalone Disk Backup solution. It enables backing up the disk as snapshots along with the containerized application in a Kubernetes-aware manner, all as a single unit. Additionally, you get Cross Region Restore and ransomware protection capabilities with AKS Backup.
19+
1720
## Create a Backup vault
1821

1922
A Backup vault is a storage entity in Azure that holds backup data for various newer workloads that Azure Backup supports, such as Azure Database for PostgreSQL servers and Azure Disks. Backup vaults make it easy to organize your backup data, while minimizing management overhead. Backup vaults are based on the Azure Resource Manager model of Azure, which provides enhanced capabilities to help secure backup data.

articles/backup/disk-backup-overview.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ Azure Disk Backup offers a turnkey solution that provides snapshot lifecycle man
1616

1717
If you require application-consistent backup of virtual machine including the data disks, or an option to restore an entire virtual machine from backup, restore a file or folder, or restore to a secondary region, then use the [Azure VM backup](backup-azure-vms-introduction.md) solution. Azure Backup offers side-by-side support for backup of managed disks using Disk Backup in addition to [Azure VM backup](./backup-azure-vms-introduction.md) solutions. This is useful when you need once-a-day application consistent backups of virtual machines and also more frequent backups of OS disks or a specific data disk that are crash consistent, and don't impact the production application performance.
1818

19-
Azure Disk Backup is integrated into Backup Center, which provides a **single unified management experience** in Azure for enterprises to govern, monitor, operate, and analyze backups at scale.
19+
Azure Disk Backup is integrated into Azure Business Continuity Center, which provides a **single unified management experience** in Azure for enterprises to govern, monitor, operate, and analyze backups at scale.
20+
21+
>[!Note]
22+
>- If the target disk is attached as a Persistent Volume to an AKS cluster, choose [Azure Backup for AKS](./azure-kubernetes-service-cluster-backup.md) over the standalone Disk Backup solution. It enables backing up the disk as snapshots along with the containerized application in a Kubernetes-aware manner, all as a single unit. Additionally, you get Cross Region Restore and ransomware protection capabilities with AKS Backup.
2023
2124
## Key benefits of Disk Backup
2225

@@ -105,4 +108,4 @@ The number of recovery points is determined by the Backup policy used to configu
105108

106109
- [Create a Backup policy for Azure Managed Disk using REST API](backup-azure-dataprotection-use-rest-api-create-update-disk-policy.md).
107110
- [Configure backup for Azure Managed Disk using REST API](backup-azure-dataprotection-use-rest-api-backup-disks.md).
108-
- [Restore Azure Managed Disk using REST API](backup-azure-dataprotection-use-rest-api-restore-disks.md).
111+
- [Restore Azure Managed Disk using REST API](backup-azure-dataprotection-use-rest-api-restore-disks.md).

articles/backup/disk-backup-support-matrix.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ Azure Disk Backup is available in all public cloud and Sovereign cloud regions.
2525
>- For Azure Disks belonging to Standard HDD, Standard SSD, and Premium SSD SKUs, you can define the backup schedule with *Hourly* frequency (of 1, 2, 4, 6, 8, or 12 hours) and *Daily* frequency.
2626
>- For Azure Disks belonging to Premium V2 and Ultra Disk SKUs, you can define the backup schedule with *Hourly* frequency of only 12 hours and *Daily* frequency.
2727
28+
>[!Note]
29+
>- If the target disk is attached as a Persistent Volume to an AKS cluster, choose [Azure Backup for AKS](./azure-kubernetes-service-cluster-backup.md) over the standalone Disk Backup solution. It enables backing up the disk as snapshots along with the containerized application in a Kubernetes-aware manner, all as a single unit. Additionally, you get Cross Region Restore and ransomware protection capabilities with AKS Backup.
30+
2831
- Azure Disk Backup supports backup of Write Accelerator disk. However, during restore the disk would be restored as a normal disk. Write Accelerated cache can be enabled on the disk after mounting it to a VM.
2932

3033
- Azure Backup provides operational (snapshot) tier backup of Azure managed disks with support for multiple backups per day. The backups aren't copied to the backup vault.
@@ -47,21 +50,21 @@ Azure Disk Backup is available in all public cloud and Sovereign cloud regions.
4750

4851
- ADE encrypted disks can't be protected.
4952

50-
- Disks encrypted with platform-managed keys or customer-managed keys are supported. However, the restore will fail for the restore points of a disk that is encrypted using customer-managed keys (CMK) if the Disk Encryption Set KeyVault key is disabled or deleted.
53+
- Disks encrypted with platform-managed keys or customer-managed keys are supported. However, the restore fails for the restore points of a disk that is encrypted using customer-managed keys (CMK) if the Disk Encryption Set KeyVault key is disabled or deleted.
5154

52-
- Currently, the Backup policy can't be modified, and the Snapshot Resource group that is assigned to a backup instance when you configure the backup of a disk can't be changed.
55+
- The Snapshot Resource group that is assigned to a backup instance when you configure the backup of a disk can't be changed.
5356

5457
- When you configure backup, the disk selected to be backed up and the snapshot resource group where the snapshots are to be stored must be part of the same subscription. You can't create an incremental snapshot for a particular disk outside of that disk's subscription. Learn more about [incremental snapshots](/azure/virtual-machines/disks-incremental-snapshots#restrictions) for managed disk. For more information on how to choose a snapshot resource group, see [Configure backup](backup-managed-disks.md#configure-backup).
5558

5659
- For successful backup and restore operations, role assignments are required by the Backup vault’s managed identity. Use only the role definitions provided in the documentation. Use of other roles like owner, contributor, and so on, isn't supported. You may face permission issues, if you start configuring backup or restore operations soon after assigning roles. This is because the role assignments take a few minutes to take effect.
5760

58-
- Managed disks allow changing the performance tier at deployment or afterwards without changing size of the disk. The Azure Disk Backup solution supports the performance tier changes to the source disk that is being backed up. During restore, the performance tier of the restored disk will be the same as that of the source disk at the time of backup. Follow the documentation [here](/azure/virtual-machines/disks-performance-tiers-portal) to change your disk’s performance tier after restore operation.
61+
- Managed disks allow changing the performance tier at deployment or afterwards without changing size of the disk. The Azure Disk Backup solution supports the performance tier changes to the source disk that is being backed up. During restore, the performance tier of the restored disk is the same as that of the source disk at the time of backup. Follow the documentation [here](/azure/virtual-machines/disks-performance-tiers-portal) to change your disk’s performance tier after restore operation.
5962

6063
- [Private Links](/azure/virtual-machines/disks-enable-private-links-for-import-export-portal) support for managed disks allows you to restrict the export and import of managed disks so that it only occurs within your Azure virtual network. Azure Disk Backup supports backup of disks that have private endpoints enabled. This doesn't include the backup data or snapshots to be accessible through the private endpoint.
6164

6265
- You can stop backup and retain backup data. This allows you to *retain backup data* forever or as per the backup policy. You can also delete a backup instance, which stops the backup and deletes all backup data.
6366

64-
- Backup Vault does not support Azure Lighthouse. Thus, cross tenant management experiences cannot be enabled by Lighthouse for Azure Disk Backup and you cannot backup/restore Azure Disks across tenant.
67+
- Backup Vault doesn't support Azure Lighthouse. Thus, cross tenant management experiences can't be enabled by Lighthouse for Azure Disk Backup and you can't backup/restore Azure Disks across tenant.
6568

6669
- Azure Disk Backup limits are:
6770

@@ -80,4 +83,4 @@ Azure Disk Backup is available in all public cloud and Sovereign cloud regions.
8083

8184
- [Create a Backup policy for Azure Managed Disk using REST API](backup-azure-dataprotection-use-rest-api-create-update-disk-policy.md).
8285
- [Configure backup for Azure Managed Disk using REST API](backup-azure-dataprotection-use-rest-api-backup-disks.md).
83-
- [Restore Azure Managed Disk using REST API](backup-azure-dataprotection-use-rest-api-restore-disks.md).
86+
- [Restore Azure Managed Disk using REST API](backup-azure-dataprotection-use-rest-api-restore-disks.md).

articles/data-factory/connector-cassandra.md

Lines changed: 15 additions & 15 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: 04/02/2025
9+
ms.date: 05/06/2025
1010
ms.author: jianleishen
1111
---
1212
# Copy data from Cassandra using Azure Data Factory or Synapse Analytics
@@ -30,7 +30,7 @@ For a list of data stores that are supported as sources/sinks, see the [Supporte
3030

3131
Specifically, this Cassandra connector supports:
3232

33-
- Cassandra **versions 3.x.x and 4.x.x** for version 2.0 (Preview).
33+
- Cassandra **versions 3.x.x and 4.x.x** for version 2.0.
3434
- Cassandra **versions 2.x and 3.x** for version 1.0.
3535
- Copying data using **Basic** or **Anonymous** authentication.
3636

@@ -81,7 +81,7 @@ The following properties are supported for Cassandra linked service:
8181
| Property | Description | Required |
8282
|:--- |:--- |:--- |
8383
| type |The type property must be set to: **Cassandra** |Yes |
84-
| version | The version that you specify. | Yes for version 2.0 (Preview). |
84+
| version | The version that you specify. | Yes for version 2.0. |
8585
| host |One or more IP addresses or host names of Cassandra servers.<br/>Specify a comma-separated list of IP addresses or host names to connect to all servers concurrently. |Yes |
8686
| port |The TCP port that the Cassandra server uses to listen for client connections. |No (default is 9042) |
8787
| authenticationType | Type of authentication used to connect to the Cassandra database.<br/>Allowed values are: **Basic**, and **Anonymous**. |Yes |
@@ -92,7 +92,7 @@ The following properties are supported for Cassandra linked service:
9292
>[!NOTE]
9393
>Currently connection to Cassandra using TLS is not supported.
9494
95-
**Example: version 2.0 (Preview)**
95+
**Example: version 2.0**
9696

9797
```json
9898
{
@@ -180,7 +180,7 @@ For a full list of sections and properties available for defining activities, se
180180

181181
### Cassandra as source
182182

183-
If you use version 2.0 (Preview) to copy data from Cassandra, set the source type in the copy activity to **CassandraSource**. The following properties are supported in the copy activity **source** section:
183+
If you use version 2.0 to copy data from Cassandra, set the source type in the copy activity to **CassandraSource**. The following properties are supported in the copy activity **source** section:
184184

185185
| Property | Description | Required |
186186
|:--- |:--- |:--- |
@@ -233,7 +233,7 @@ If you use version 1.0 to copy data from Cassandra, set the source type in the c
233233

234234
When copying data from Cassandra, the following mappings are used from Cassandra data types to interim data types used internally within the service. See [Schema and data type mappings](copy-activity-schema-and-type-mapping.md) to learn about how copy activity maps the source schema and data type to the sink.
235235

236-
| Cassandra data type | Interim service data type (for version 2.0 (Preview)) | Interim service data type (for version 1.0) |
236+
| Cassandra data type | Interim service data type (for version 2.0) | Interim service data type (for version 1.0) |
237237
|:--- |:--- |:--- |
238238
| ASCII |String |String |
239239
| BIGINT |Int64 |Int64 |
@@ -262,9 +262,9 @@ When copying data from Cassandra, the following mappings are used from Cassandra
262262
> The length of Binary Column and String Column lengths cannot be greater than 4000.
263263
>
264264
265-
## Work with collections when using version 2.0 (Preview)
265+
## Work with collections when using version 2.0
266266

267-
When using version 2.0 (Preview) to copy data from your Cassandra database, no virtual tables for collection types are created. You can copy a source table to the sink in its original type in JSON format.
267+
When using version 2.0 to copy data from your Cassandra database, no virtual tables for collection types are created. You can copy a source table to the sink in its original type in JSON format.
268268

269269
### Example
270270

@@ -351,21 +351,21 @@ To learn details about the properties, check [Lookup activity](control-flow-look
351351

352352
Here are steps that help you upgrade the Cassandra connector:
353353

354-
1. In **Edit linked service** page, select version 2.0 (Preview) and configure the linked service by referring to [Linked service properties](#linked-service-properties).
354+
1. In **Edit linked service** page, select version 2.0 and configure the linked service by referring to [Linked service properties](#linked-service-properties).
355355

356-
2. In version 2.0 (Preview), the `query` in the copy activity source supports only CQL query, not SQL-92 query. For more information, see [Cassandra as source](#cassandra-as-source).
356+
2. In version 2.0, the `query` in the copy activity source supports only CQL query, not SQL-92 query. For more information, see [Cassandra as source](#cassandra-as-source).
357357

358-
3. The data type mapping for version 2.0 (Preview) is different from that for version 1.0. To learn the latest data type mapping, see [Data type mapping for Cassandra](#data-type-mapping-for-cassandra).
358+
3. The data type mapping for version 2.0 is different from that for version 1.0. To learn the latest data type mapping, see [Data type mapping for Cassandra](#data-type-mapping-for-cassandra).
359359

360-
## Differences between Cassandra version 2.0 (Preview) and version 1.0
360+
## Differences between Cassandra version 2.0 and version 1.0
361361

362-
The Cassandra connector version 2.0 (Preview) offers new functionalities and is compatible with most features of version 1.0. The table below shows the feature differences between version 2.0 (Preview) and version 1.0.
362+
The Cassandra connector version 2.0 offers new functionalities and is compatible with most features of version 1.0. The table below shows the feature differences between version 2.0 and version 1.0.
363363

364-
| Version 2.0 (Preview) | Version 1.0 |
364+
| Version 2.0 | Version 1.0 |
365365
| --- | --- |
366366
| Support CQL query. | Support SQL-92 query or CQL query. |
367367
| Support specifying `keyspace` and `tableName` separately in dataset. | Support editing `keyspace` when you select enter manually table name in dataset. |
368-
| No virtual tables are created for collection types. For more information, see [Work with collections when using version 2.0 (Preview)](#work-with-collections-when-using-version-20-preview). | Virtual tables are created for collection types. For more information, see [Work with Cassandra collection types using virtual table when using version 1.0](#work-with-collections-using-virtual-table-when-using-version-10). |
368+
| No virtual tables are created for collection types. For more information, see [Work with collections when using version 2.0](#work-with-collections-when-using-version-20). | Virtual tables are created for collection types. For more information, see [Work with Cassandra collection types using virtual table when using version 1.0](#work-with-collections-using-virtual-table-when-using-version-10). |
369369
| The following mappings are used from Cassandra data types to interim service data type. <br><br> SMALLINT -> Short <br> TINYINT -> SByte | The following mappings are used from Cassandra data types to interim service data type. <br><br> SMALLINT -> Int16 <br> TINYINT -> Int16 |
370370

371371
## Related content

0 commit comments

Comments
 (0)