Skip to content

Commit b55201e

Browse files
ShawnJacksonShawnJackson
authored
Merge branch 'main' into sql-vm-ag-docs
2 parents 353dd82 + 6f1e103 commit b55201e

1,207 files changed

Lines changed: 17181 additions & 14308 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.

‎.openpublishing.publish.config.json‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,24 @@
7878
"branch": "master",
7979
"branch_mapping": {}
8080
},
81+
{
82+
"path_to_root": "azure-dev-docs-pr",
83+
"url": "https://github.com/MicrosoftDocs/azure-dev-docs-pr",
84+
"branch": "main",
85+
"branch_mapping": {}
86+
},
87+
{
88+
"path_to_root": "terraform_scripts",
89+
"url": "https://github.com/Azure/terraform/",
90+
"branch": "master",
91+
"branch_mapping": {}
92+
},
8193
{
8294
"path_to_root": "powershell_scripts",
8395
"url": "https://github.com/Azure/azure-docs-powershell-samples",
8496
"branch": "master",
8597
"branch_mapping": {}
86-
},
98+
},
8799
{
88100
"path_to_root": "quickstart-templates",
89101
"url": "https://github.com/Azure/azure-quickstart-templates",

‎.openpublishing.redirection.json‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59529,6 +59529,40 @@
5952959529
"source_path": "docs/relational-databases/system-tables/cdc-change-feed-settings.md",
5953059530
"redirect_url": "/sql/relational-databases/system-tables/changefeed-change-feed-settings",
5953159531
"redirect_document_id": false
59532+
},
59533+
{
59534+
"source_path": "docs/relational-databases/errors-events/mssqlserver-neg2-database-engine-error.md",
59535+
"redirect_url": "/troubleshoot/sql/connect/timeout-expired-error",
59536+
"redirect_document_id": false
59537+
},
59538+
{
59539+
"source_path": "docs/relational-databases/errors-events/mssqlserver-1-database-engine-error.md",
59540+
"redirect_url": "/troubleshoot/sql/connect/network-related-or-instance-specific-error-occurred-while-establishing-connection",
59541+
"redirect_document_id": false
59542+
},
59543+
{
59544+
"source_path": "docs/relational-databases/errors-events/mssqlserver-2-database-engine-error.md",
59545+
"redirect_url": "/troubleshoot/sql/connect/network-related-or-instance-specific-error-occurred-while-establishing-connection",
59546+
"redirect_document_id": false
59547+
},
59548+
{
59549+
"source_path": "docs/relational-databases/errors-events/mssqlserver-53-database-engine-error.md",
59550+
"redirect_url": "/troubleshoot/sql/connect/network-related-or-instance-specific-error-occurred-while-establishing-connection",
59551+
},
59552+
{
59553+
"source_path": "azure-sql/database/sql-vulnerability-assessment.md",
59554+
"redirect_url": "/defender-for-cloud/sql-azure-vulnerability-assessment-overview",
59555+
"redirect_document_id": false
59556+
},
59557+
{
59558+
"source_path": "docs/database-engine/configure-windows/enable-encrypted-connections-to-the-database-engine.md",
59559+
"redirect_url": "/sql/database-engine/configure-windows/configure-sql-server-encryption",
59560+
"redirect_document_id": false
59561+
},
59562+
{
59563+
"source_path": "docs/relational-databases/performance/parameter-sensitivity-plan-optimization.md",
59564+
"redirect_url": "/sql/relational-databases/performance/parameter-sensitive-plan-optimization",
59565+
"redirect_document_id": false
5953259566
}
5953359567
]
5953459568
}

‎SECURITY.md‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<!-- BEGIN MICROSOFT SECURITY.MD V0.0.8 BLOCK -->
2+
3+
## Security
4+
5+
Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/).
6+
7+
If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://aka.ms/opensource/security/definition), please report it to us as described below.
8+
9+
## Reporting Security Issues
10+
11+
**Please do not report security vulnerabilities through public GitHub issues.**
12+
13+
Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://aka.ms/opensource/security/create-report).
14+
15+
If you prefer to submit without logging in, send email to [secure@microsoft.com](mailto:secure@microsoft.com). If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://aka.ms/opensource/security/pgpkey).
16+
17+
You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://aka.ms/opensource/security/msrc).
18+
19+
Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
20+
21+
* Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
22+
* Full paths of source file(s) related to the manifestation of the issue
23+
* The location of the affected source code (tag/branch/commit or direct URL)
24+
* Any special configuration required to reproduce the issue
25+
* Step-by-step instructions to reproduce the issue
26+
* Proof-of-concept or exploit code (if possible)
27+
* Impact of the issue, including how an attacker might exploit the issue
28+
29+
This information will help us triage your report more quickly.
30+
31+
If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/opensource/security/bounty) page for more details about our active programs.
32+
33+
## Preferred Languages
34+
35+
We prefer all communications to be in English.
36+
37+
## Policy
38+
39+
Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://aka.ms/opensource/security/cvd).
40+
41+
<!-- END MICROSOFT SECURITY.MD BLOCK -->

‎azure-sql/database/advance-notifications.md‎

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Get notification before planned maintenance for Azure SQL Database.
44
author: scott-kim-sql
55
ms.author: scottkim
66
ms.reviewer: wiassaf, mathoma, urosmil
7-
ms.date: 04/04/2022
7+
ms.date: 12/01/2022
88
ms.service: sql-db-mi
99
ms.subservice: service-overview
1010
ms.topic: how-to
@@ -25,39 +25,43 @@ Notifications can be configured so you can get texts, emails, Azure push notific
2525
2626
## Configure an advance notification
2727

28-
Advance notifications are available for Azure SQL databases that have their maintenance window configured.
28+
Advance notifications are available for Azure SQL databases that have their maintenance window configured and managed instances with any configuration (including the default one).
2929

3030
Complete the following steps to enable a notification.
3131

3232
1. Go to the [Planned maintenance](https://portal.azure.com/#blade/Microsoft_Azure_Health/AzureHealthBrowseBlade/plannedMaintenance) page, select **Health alerts**, then **Add service health alert**.
3333

3434
:::image type="content" source="media/advance-notifications/health-alerts.png" alt-text="create a new health alert menu option":::
35+
36+
2. In the **Scope** section, select subscription.
3537

36-
2. In the **Actions** section, select **Add action groups**.
38+
:::image type="content" source="media/advance-notifications/select-subscription.png" alt-text="A screenshot of the Azure portal page where you select the subscription where you will be configuring the health alert.":::
3739

38-
:::image type="content" source="media/advance-notifications/add-action-group.png" alt-text="add an action group menu option":::
40+
3. In the **Condition** section, configure service(s) to be alerted for, region(s) and criteria. For more generic alert, select all values. To narrow down, select Azure SQL Database or Azure SQL Managed Instance as a service, region(s) where you have those services deployed, and **Planned maintenance** for the event type.
3941

40-
3. Complete the **Create action group** form, then select **Next: Notifications**.
41-
42-
:::image type="content" source="media/advance-notifications/create-action-group.png" alt-text="create action group form":::
43-
44-
1. On the **Notifications** tab, select the **Notification type**. The **Email/SMS message/Push/Voice** option offers the most flexibility and is the recommended option. Select the pen to configure the notification.
45-
46-
:::image type="content" source="media/advance-notifications/notifications.png" alt-text="configure notifications":::
47-
48-
1. Complete the *Add or edit notification* form that opens and select **OK**:
42+
:::image type="content" source="media/advance-notifications/define-condition-services.png" alt-text="A screenshot of the Azure portal page where you define conditions for the health alert and define services to be notified for.":::
43+
44+
:::image type="content" source="media/advance-notifications/define-condition-regions.png" alt-text="A screenshot of the Azure portal page where you define conditions for the health alert and define regions to be notified for.":::
45+
46+
:::image type="content" source="media/advance-notifications/define-condition-event-types.png" alt-text="A screenshot of the Azure portal page where you define conditions for the health alert and define event types to be notified for.":::
47+
48+
> [!IMPORTANT]
49+
> Service health is rolling out new experiencs in phases. Some users will see the updated experience, others will still see the classic Service Health portal experience. In case that you still see the classic Service Health portal, for **Region** don't select Global as an option, but rather the specific region or all regions.
4950
50-
2. Actions and Tags are optional. Here you can configure additional actions to be triggered or use tags to categorize and organize your Azure resources.
51+
4. In the **Actions** section, select the existing action group or create a new one.
5152

52-
4. Check the details on the **Review + create** tab and select **Create**.
53+
:::image type="content" source="media/advance-notifications/add-action-group.png" alt-text="A screenshot of the Azure portal page where you add or create action groups.":::
5354

54-
7. After selecting create, the alert rule configuration screen opens and the action group will be selected. Give a name to your new alert rule, then choose the resource group for it, and select **Create alert rule**.
55+
5. In the **Details** section, define the name for your alert and specify resource group where it should be deployed.
5556

56-
8. Click the **Health alerts** menu item again, and the list of alerts now contains your new alert.
57+
:::image type="content" source="media/advance-notifications/define-alert-details.png" alt-text="A screenshot of the Azure portal page where you define alert details.":::
5758

59+
6. Select **Review + create** and your alert will be created.
5860

5961
You're all set. Next time there's a planned Azure SQL maintenance event, you'll receive an advance notification.
6062

63+
To learn more about creating health alerts, visit [Azure Service Health](/azure/service-health/service-health-portal-update)
64+
6165
## Receiving notifications
6266

6367
The following table shows the general-information notifications you may receive:

‎azure-sql/database/always-encrypted-enclaves-enable-sgx.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ms.topic: conceptual
1919
Configuring the DC-series hardware to enable Intel SGX enclaves is the responsibility of the Azure SQL Database administrator. See [Roles and responsibilities when configuring SGX enclaves and attestation](always-encrypted-enclaves-plan.md#roles-and-responsibilities-when-configuring-sgx-enclaves-and-attestation).
2020

2121
> [!NOTE]
22-
> Intel SGX is not available in hardware configurations other than DC-series. For example, Intel SGX is not available for Gen5 hardware, and it is not available for databases using the [DTU model](service-tiers-dtu.md).
22+
> Intel SGX is not available in hardware configurations other than DC-series. For example, Intel SGX is not available for standard-series (Gen5) hardware, and it is not available for databases using the [DTU model](service-tiers-dtu.md).
2323
2424
> [!IMPORTANT]
2525
> Before you configure the DC-series hardware for your database, check the regional availability of DC-series and make sure you understand its performance limitations. For more information, see [DC-series](service-tiers-sql-database-vcore.md#dc-series).

‎azure-sql/database/always-encrypted-enclaves-getting-started.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ In this step, you'll create a new Azure SQL Database logical server and a new da
5858
# [Portal](#tab/azure-portal)
5959

6060
1. Browse to the [Select SQL deployment option](https://portal.azure.com/#create/Microsoft.AzureSQL) page.
61-
1. If you aren't already signed in to Azure portal, sign in when prompted.
61+
1. If you aren't already signed in to the Azure portal, sign in when prompted.
6262
1. Under **SQL databases**, leave **Resource type** set to **Single database**, and select **Create**.
6363

64-
:::image type="content" source="./media/single-database-create-quickstart/select-deployment.png" alt-text="Add to Azure SQL":::
64+
:::image type="content" source="./media/single-database-create-quickstart/select-deployment.png" alt-text="Screenshot of Azure portal, showing the Add to Azure SQL deployment option.":::
6565

6666
1. On the **Basics** tab of the **Create SQL Database** form, under **Project details**, select the desired Azure **Subscription**.
6767
1. For **Resource group**, select **Create new**, enter a name for your resource group, and select **OK**.
@@ -78,17 +78,17 @@ In this step, you'll create a new Azure SQL Database logical server and a new da
7878
1. Leave **Want to use SQL elastic pool** set to **No**.
7979
1. Under **Compute + storage**, select **Configure database**, and select **Change configuration**.
8080

81-
:::image type="content" source="./media/always-encrypted-enclaves/portal-configure-database.png" alt-text="Configure database" lightbox="./media/always-encrypted-enclaves/portal-configure-database.png":::
81+
:::image type="content" source="./media/always-encrypted-enclaves/portal-configure-database.png" alt-text="Screenshot of Azure portal, hardware configuration, where to configure database." lightbox="./media/always-encrypted-enclaves/portal-configure-database.png":::
8282

8383
1. Select the **DC-series** hardware configuration, and then select **OK**.
8484

85-
:::image type="content" source="./media/always-encrypted-enclaves/portal-configure-dc-series-database.png" alt-text="Configure DC-series database":::
85+
:::image type="content" source="./media/always-encrypted-enclaves/portal-configure-dc-series-database.png" alt-text="Screenshot of Azure portal, showing Configure DC-series database.":::
8686

8787
1. Select **Apply**.
8888
1. Back on the **Basics** tab, verify **Compute + storage** is set to **General Purpose**, **DC, 2 vCores, 32 GB storage**.
8989
1. Select **Next: Networking** at the bottom of the page.
9090

91-
:::image type="content" source="./media/always-encrypted-enclaves/portal-configure-dc-series-database-basics.png" alt-text="Configure DC-series database - basics":::
91+
:::image type="content" source="./media/always-encrypted-enclaves/portal-configure-dc-series-database-basics.png" alt-text="Screenshot of Azure portal, showing Configure DC-series database - basics.":::
9292

9393
1. On the **Networking** tab, for **Connectivity method**, select **Public endpoint**.
9494
1. For **Firewall rules**, set **Add current client IP address** to **Yes**. Leave **Allow Azure services and resources to access this server** set to **No**.

‎azure-sql/database/always-encrypted-enclaves-plan.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ms.topic: conceptual
2121
Intel SGX is a hardware-based trusted execution environment technology. Intel SGX is available for databases that use the [vCore model](service-tiers-sql-database-vcore.md) and [DC-series](service-tiers-sql-database-vcore.md?#dc-series) hardware. Therefore, to ensure you can use Always Encrypted with secure enclaves in your database, you need to either select the DC-series hardware when you create the database, or you can update your existing database to use the DC-series hardware.
2222

2323
> [!NOTE]
24-
> Intel SGX is not available in hardware other than DC-series. For example, Intel SGX is not available for Gen5 hardware, and it is not available for databases using the [DTU model](service-tiers-dtu.md).
24+
> Intel SGX is not available in hardware other than DC-series. For example, Intel SGX is not available for standard-series (Gen5) hardware, and it is not available for databases using the [DTU model](service-tiers-dtu.md).
2525
2626
> [!IMPORTANT]
2727
> Before you configure the DC-series hardware for your database, check the regional availability of DC-series and make sure you understand its performance limitations. For details, see [DC-series](service-tiers-sql-database-vcore.md#dc-series).

‎azure-sql/database/arm-templates-content-guide.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.reviewer: wiassaf, mathoma
77
ms.date: 06/30/2021
88
ms.service: sql-db-mi
99
ms.subservice: deployment-configuration
10-
ms.topic: guide
10+
ms.topic: conceptual
1111
ms.custom: overview-samples sqldbrb=2
1212
---
1313

@@ -26,7 +26,6 @@ The following table includes links to Azure Resource Manager templates for Azure
2626
| [Server](https://github.com/Azure/azure-quickstart-templates/tree/master/quickstarts/microsoft.sql/sql-logical-server) | This Azure Resource Manager template creates a server for Azure SQL Database. |
2727
| [Elastic pool](https://github.com/Azure/azure-quickstart-templates/tree/master/quickstarts/microsoft.sql/sql-elastic-pool-create) | This template allows you to deploy an elastic pool and to assign databases to it. |
2828
| [Failover groups](https://github.com/Azure/azure-quickstart-templates/tree/master/quickstarts/microsoft.sql/sql-with-failover-group) | This template creates two servers, a single database, and a failover group in Azure SQL Database.|
29-
| [Threat Detection](https://github.com/Azure/azure-quickstart-templates/tree/master/quickstarts/microsoft.sql/sql-threat-detection-db-policy-multiple-databases) | This template allows you to deploy a server and a set of databases with Threat Detection enabled, with an email address for alerts for each database. Threat Detection is part of the SQL Advanced Threat Protection (ATP) offering and provides a layer of security that responds to potential threats over servers and databases.|
3029
| [Auditing to Azure Blob storage](https://github.com/Azure/azure-quickstart-templates/tree/master/quickstarts/microsoft.sql/sql-auditing-server-policy-to-blob-storage) | This template allows you to deploy a server with auditing enabled to write audit logs to a Blob storage. Auditing for Azure SQL Database tracks database events and writes them to an audit log that can be placed in your Azure storage account, OMS workspace, or Event Hubs.|
3130
| [Auditing to Azure Event Hub](https://github.com/Azure/azure-quickstart-templates/tree/master/quickstarts/microsoft.sql/sql-auditing-server-policy-to-eventhub) | This template allows you to deploy a server with auditing enabled to write audit logs to an existing event hub. In order to send audit events to Event Hubs, set auditing settings with `Enabled` `State`, and set `IsAzureMonitorTargetEnabled` as `true`. Also, configure Diagnostic Settings with the `SQLSecurityAuditEvents` log category on the `master` database (for server-level auditing). Auditing tracks database events and writes them to an audit log that can be placed in your Azure storage account, OMS workspace, or Event Hubs.|
3231
| [Azure Web App with SQL Database](https://github.com/Azure/azure-quickstart-templates/tree/master/quickstarts/microsoft.web/web-app-sql-database) | This sample creates a free Azure web app and a database in Azure SQL Database at the "Basic" service level.|

0 commit comments

Comments
 (0)