Skip to content

Commit a391255

Browse files
committed
Merge branch 'main' into release-arc-data
2 parents 8954e88 + c6590ff commit a391255

69 files changed

Lines changed: 6101 additions & 5313 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
146 KB
Loading

azure-sql/database/sql-database-vulnerability-assessment-storage.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Since Azure SQL Managed Instance isn't a trusted Microsoft Service and has a dif
6767
To support VA scans on Azure SQL Managed Instances that **have the November 2022 feature wave installed**, follow the below steps:
6868

6969
1. Under the Azure SQL Managed Instance's **Overview** page, note the value under **Virtual network / subnet**.
70-
70+
7171
1. Head to the **Networking** page in the storage account where SQL VA is configured to store the scan results.
7272

7373
1. Under the **Firewalls and virtual networks** tab, under **Public network access** select **Enabled from selected virtual networks and IP addresses**.
@@ -76,7 +76,6 @@ To support VA scans on Azure SQL Managed Instances that **have the November 2022
7676

7777
:::image type="content" source="media/sql-database-vulnerability-assessment-storage/storage-networking-post-nov-22-wave.png" alt-text="Screenshot of storage account networking settings for Nov22 feature wave (and up)." lightbox="media/sql-database-vulnerability-assessment-storage/storage-networking-post-nov-22-wave.png":::
7878

79-
8079
To support VA scans on Azure SQL Managed Instances that **do not have the November 2022 feature wave installed**, follow the below steps:
8180

8281
1. In the **SQL managed instance** pane, under the **Overview** heading, click the **Virtual network/subnet** link. This takes you to the **Virtual network** pane.
@@ -87,6 +86,11 @@ To support VA scans on Azure SQL Managed Instances that **do not have the Novemb
8786

8887
:::image type="content" source="media/sql-database-vulnerability-assessment-storage/mi-add-subnet.png" alt-text="Screenshot shows a list of subnets and the add subnet option." lightbox="media/sql-database-vulnerability-assessment-storage/mi-add-subnet.png" :::
8988

89+
1. Traffic from the instance in the default managed instance subnet to Azure Resource Manager must be routed through the internet. Therefore, a route with the next hop being the internet and the destination tag being the appropriate UDR tag for the Azure Resource Manager address range must be assigned to the subnet where the managed instance is located.
90+
This route will be added automatically in new deployments, but needs to be added again if it was removed.
91+
92+
:::image type="content" source="media/sql-database-vulnerability-assessment-storage/managed-instance-post-nov-22-required-routing-settings.png" alt-text="Screenshot that shows the required route for the November 22 feature wave and later." lightbox="media/sql-database-vulnerability-assessment-storage/managed-instance-post-nov-22-required-routing-settings.png":::
93+
9094
1. The new subnet should have the following configurations:
9195

9296
:::image type="content" source="media/sql-database-vulnerability-assessment-storage/mi-add-subnet-details.png" alt-text="Screenshot shows a subnet called VA and its settings.":::
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
author: WilliamDAssafMSFT
3+
ms.author: wiassaf
4+
ms.date: 07/05/2024
5+
ms.service: sql
6+
ms.topic: include
7+
---
8+
9+
[!INCLUDE [Applies to](../../includes/applies-md.md)] [!INCLUDE [SQL Server 2016](_ss2016.md)] and later [!INCLUDE [Azure SQL Database](../../includes/applies-to-version/_asdb.md)] [!INCLUDE [SQL Managed Instance](../../includes/applies-to-version/_asmi.md)] [!INCLUDE [Azure Synapse Analytics](../../includes/applies-to-version/_asa.md)] [!INCLUDE [Analytics Platform System (PDW)](../../includes/applies-to-version/_pdw.md)] [!INCLUDE [Fabric Warehouse](../../includes/applies-to-version/_fabric-dw.md)]

docs/includes/big-data-clusters-master-instance-ha-endpoint-requirement.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ ms.service: sql
66
ms.topic: include
77
---
88

9-
Certain operations, including configuring server (instance level) settings, or manually adding a database to an availability group, require a connection to the SQL Server Instance. Operations like `sp_configure`, `RESTORE DATABASE`, or any DDL command in a database belonging to an availability group require a connection to the SQL Server instance. By default, a big data cluster does not include an endpoint that enables a connection to the instance. You must expose this endpoint manually.
9+
Certain operations, including configuring server (instance level) settings, or manually adding a database to an availability group, require a connection to the SQL Server instance. Operations like `sp_configure`, `RESTORE DATABASE`, or any DDL command in a database belonging to an availability group require a connection to the SQL Server instance. By default, a big data cluster does not include an endpoint that enables a connection to the instance. You must expose this endpoint manually.
1010

1111
For instructions, see [Connect to databases on the primary replica](../big-data-cluster/deployment-high-availability.md#instance-connect).

docs/relational-databases/backup-restore/back-up-database-backup-options-page.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ f1_keywords:
3838
For information about backup sets, see [Media Sets, Media Families, and Backup Sets (SQL Server)](../../relational-databases/backup-restore/media-sets-media-families-and-backup-sets-sql-server.md).
3939

4040
**Description**
41-
Enter a description of the backup set. The description value is available in the `description` column of [`backupset` (Transact-SQL)](/sql/relational-databases/system-tables/backupset-transact-sql).
41+
Enter a description of the backup set. The description value is available in the `description` column of [`backupset` (Transact-SQL)](../system-tables/backupset-transact-sql.md).
4242

4343
**Backup set will expire**
4444
Choose one of the following expiration options. This option is disabled if **URL** is chosen as the backup destination.

0 commit comments

Comments
 (0)