Skip to content

Commit 9fba32e

Browse files
authored
Merge branch 'release-synapse-current' into sql_articles_6
2 parents f486e07 + 364f992 commit 9fba32e

40 files changed

+196
-147
lines changed

articles/sql-database/transparent-data-encryption-byok-azure-sql.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ If the key that is needed for restoring a backup is no longer available to the t
158158

159159
To mitigate it, run the [Get-AzSqlServerKeyVaultKey](/powershell/module/az.sql/get-azsqlserverkeyvaultkey) cmdlet for target SQL Database logical server or [Get-AzSqlInstanceKeyVaultKey](/powershell/module/az.sql/get-azsqlinstancekeyvaultkey) for target managed instance to return the list of available keys and identify the missing ones. To ensure all backups can be restored, make sure the target server for the restore has access to all of keys needed. These keys don't need to be marked as TDE protector.
160160

161-
To learn more about backup recovery for SQL Database, see [Recover an Azure SQL database](sql-database-recovery-using-backups.md). To learn more about backup recovery for SQL Pool, see [Recover a SQL Pool](../synapse-analytics/sql-data-warehouse/backup-and-restore.md). For SQL Server's native backup/restore with managed instance, see [Quickstart: Restore a database to a Managed Instance](https://docs.microsoft.com/azure/sql-database/sql-database-managed-instance-get-started-restore)
161+
To learn more about backup recovery for SQL Database, see [Recover an Azure SQL database](sql-database-recovery-using-backups.md). To learn more about backup recovery for SQL pool, see [Recover a SQL pool](../synapse-analytics/sql-data-warehouse/backup-and-restore.md). For SQL Server's native backup/restore with managed instance, see [Quickstart: Restore a database to a Managed Instance](https://docs.microsoft.com/azure/sql-database/sql-database-managed-instance-get-started-restore)
162162

163163
Additional consideration for log files: Backed up log files remain encrypted with the original TDE protector, even if it was rotated and the database is now using a new TDE protector. At restore time, both keys will be needed to restore the database. If the log file is using a TDE protector stored in Azure Key Vault, this key will be needed at restore time, even if the database has been changed to use service-managed TDE in the meantime.
164164

articles/synapse-analytics/breadcrumb/toc.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,12 @@
4646
tocHref: /azure/active-directory
4747
topicHref: /azure/synapse-analytics/index
4848

49+
- name: Azure
50+
tocHref: /azure/
51+
topicHref: /azure/index
52+
items:
53+
- name: Synapse Analytics
54+
tocHref: /azure/cosmos-db
55+
topicHref: /azure/synapse-analytics/index
56+
4957

73.9 KB
Loading
-62 KB
Loading
-1.62 KB
Loading
36.2 KB
Loading
33.9 KB
Loading
24.6 KB
Loading
25.4 KB
Loading
184 KB
Loading

0 commit comments

Comments
 (0)