Merge branch 'f1' of https://github.com/nilabjaball/ssma8.24 into f1

Author: nilabjaball

.openpublishing.redirection.azure-sql.json

@@ -22,7 +22,9 @@ Changing to Azure Hybrid Benefit does not require any downtime.
 
 ## Overview
 
-![vcore pricing structure](./media/azure-hybrid-benefit/pricing.png)
+:::image type="complex" source="media/azure-hybrid-benefit/pricing.png" alt-text="Diagram of vCore pricing structure for SQL Database.":::
+Diagram of vCore pricing structure for SQL Database. 'License Included' pricing is made up of base compute and SQL license components. Azure Hybrid Benefit pricing is made up of base compute and software assurance components.
+:::image-end:::
 
 With Azure Hybrid Benefit, you pay only for the underlying Azure infrastructure by using your existing SQL Server license for the SQL Server database engine itself (Base Compute pricing). If you do not use Azure Hybrid Benefit, you pay for both the underlying infrastructure and the SQL Server license (License-Included pricing).
 

azure-sql/azure-hybrid-benefit.md

@@ -6,8 +6,8 @@ ms.service: sql-database
 ms.subservice: high-availability
 ms.custom: sqldbrb=1, devx-track-azurecli
 ms.topic: tutorial
-author: emlisa
-ms.author: emlisa
+author: rajeshsetlem
+ms.author: rsetlem
 ms.reviewer: kendralittle, mathoma
 ms.date: 08/20/2021
 ---

azure-sql/database/active-geo-replication-configure-portal.md

@@ -5,8 +5,8 @@ ms.service: sql-database
 ms.subservice: high-availability
 ms.custom: sqldbrb=1
 ms.topic: conceptual
-author: emlisa
-ms.author: emlisa
+author: rajeshsetlem
+ms.author: rsetlem
 ms.reviewer: kendralittle, mathoma
 ms.date: 4/14/2022
 ---
@@ -36,7 +36,7 @@ If your application requires a stable connection endpoint and automatic geo-fail
 
 The following diagram illustrates a typical configuration of a geo-redundant cloud application using Active geo-replication.
 
-![active geo-replication](./media/active-geo-replication-overview/geo-replication.png)
+![active geo-replication](./media/active-geo-replication-overview/geo-replication-updated.png)
 
 If for any reason your primary database fails, you can initiate a geo-failover to any of your secondary databases. When a secondary is promoted to the primary role, all other secondaries are automatically linked to the new primary.
 
@@ -197,7 +197,7 @@ To create a geo-secondary in a subscription different from the subscription of t
 10. After the geo-secondary is successfully created, the users, logins, and firewall rules created by this procedure can be removed.
 
 > [!NOTE]
-> Cross-subscription geo-replication operations including setup and geo-failover are only supported using T-SQL commands.
+> Cross-subscription geo-replication operations including setup and geo-failover are only supported using REST API & T-SQL commands.
 > 
 > Adding a geo-secondary using T-SQL is not supported when connecting to the primary server over a [private endpoint](private-endpoint-overview.md). If a private endpoint is configured but public network access is allowed, adding a geo-secondary is supported when connected to the primary server from a public IP address. Once a geo-secondary is added, public access can be [denied](connectivity-settings.md#deny-public-network-access).
 > 

azure-sql/database/active-geo-replication-overview.md

@@ -7,8 +7,8 @@ ms.subservice: high-availability
 ms.custom: sqldbrb=1
 ms.devlang: 
 ms.topic: how-to
-author: emlisa
-ms.author: emlisa
+author: rajeshsetlem
+ms.author: rsetlem
 ms.reviewer: kendralittle, mathoma, vanto
 ms.date: 12/18/2018
 ---

azure-sql/database/active-geo-replication-security-configure.md

@@ -6,8 +6,8 @@ ms.service: sql-database
 ms.subservice: high-availability
 ms.custom: sql-db-mi-split
 ms.topic: conceptual
-author: emlisa
-ms.author: emlisa
+author: rajeshsetlem
+ms.author: rsetlem
 ms.reviewer: kendralittle, mathoma
 ms.date: 03/01/2022
 ---

azure-sql/database/auto-failover-group-sql-db.md

@@ -494,7 +494,7 @@ Backup and restore operations for Hyperscale databases are fast regardless of da
 
 ### Hyperscale backup retention
 
-Hyperscale supports short-term backup retention (STR) of 7 days by default; long-term retention (LTR) policies aren't currently supported.
+Default short-term backup retention (STR) for Hyperscale databases is 7 days; long-term retention (LTR) policies aren't currently supported.
 
 > [!NOTE]
 > Short-term backup retention up to 35 days for Hyperscale databases is now in preview. 
@@ -538,7 +538,7 @@ To view backup and data storage metrics in the Azure portal, follow these steps:
 Backup storage consumption for a Hyperscale database depends on the retention period, choice of region, backup storage redundancy and workload type. Consider some of the following tuning techniques to reduce your backup storage consumption for a Hyperscale database:
 
 - Reduce the [backup retention period](#change-the-short-term-retention-policy-using-the-azure-portal) to the minimum possible for your needs.
-- Avoid doing large write-operations, such as index maintenance, more frequently than you need to. For index maintenance recommendations, see [Optimize index maintenance to improve query performance and reduce resource consumption](/sql/relational-databases/indexes/reorganize-and-rebuild-indexes.md).
+- Avoid doing large write-operations, such as index maintenance, more frequently than you need to. For index maintenance recommendations, see [Optimize index maintenance to improve query performance and reduce resource consumption](/sql/relational-databases/indexes/reorganize-and-rebuild-indexes).
 - For large data-load operations, consider using data compression when appropriate.
 - Use the `tempdb` database instead of permanent tables in your application logic to store temporary results and/or transient data.
 - Use locally-redundant or zone-redundant backup storage when geo-restore capability is unnecessary (for example: dev/test environments). 
@@ -572,9 +572,6 @@ Backup storage redundancy for databases in Azure SQL Database can be configured
 
 For Azure SQL Managed Instance, backup storage redundancy is set at the instance level, and it is applied for all belonging managed databases. It can be configured at the time of an instance creation or updated for existing instances; the backup storage redundancy change would trigger then a new full backup per database and the change will apply for all future backups. The default storage redundancy type is geo-redundancy (RA-GRS).
 
-> [!NOTE]
-> Backup storage redundancy change for SQL Managed Instance is currently available only for the Public cloud via Azure Portal.
-
 ### Configure backup storage redundancy by using the Azure portal
 
 #### [SQL Database](#tab/single-database)

azure-sql/database/automated-backups-overview.md

@@ -9,8 +9,8 @@ ms.subservice: high-availability
 ms.custom: sqldbrb=2
 ms.devlang: 
 ms.topic: conceptual
-author: emlisa
-ms.author: emlisa
+author: rajeshsetlem
+ms.author: rsetlem
 ms.reviewer: kendralittle, mathoma
 ms.date: 10/18/2021
 monikerRange: "=azuresql||=azuresql-db||=azuresql-mi"

azure-sql/database/business-continuity-high-availability-disaster-recover-hadr-overview.md

@@ -7,7 +7,7 @@ ms.service: sql-database
 ms.subservice: connect
 ms.topic: quickstart
 ms.author: jukullam
-ms.date: 05/05/2021
+ms.date: 05/10/2022
 ms.custom: github-actions-azure, mode-other
 ms.reviewer: kendralittle, mathoma
 ---
@@ -18,7 +18,7 @@ Get started with [GitHub Actions](https://docs.github.com/en/actions) by using a
 
 ## Prerequisites
 
-You will need: 
+You will need:
 - An Azure account with an active subscription. [Create an account for free](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
 - A GitHub repository with a dacpac package (`Database.dacpac`). If you don't have a GitHub account, [sign up for free](https://github.com/join).  
 - An Azure SQL Database.
@@ -33,11 +33,13 @@ The file has two sections:
 
 |Section  |Tasks  |
 |---------|---------|
-|**Authentication** | 1. Define a service principal. <br /> 2. Create a GitHub secret. |
+|**Authentication** | 1.1. Generate deployment credentials. |
 |**Deploy** | 1. Deploy the database. |
 
 ## Generate deployment credentials
 
+# [Service principal](#tab/userlevel)
+
 You can create a [service principal](/azure/active-directory/develop/app-objects-and-service-principals) with the [az ad sp create-for-rbac](/cli/azure/ad/sp#az-ad-sp-create-for-rbac) command in the [Azure CLI](/cli/azure/). Run this command with [Azure Cloud Shell](https://shell.azure.com/) in the Azure portal or by selecting the **Try it** button.
 
 Replace the placeholders `server-name` with the name of your SQL server hosted on Azure. Replace the `subscription-id` and `resource-group` with the subscription ID and resource group connected to your SQL server.  
@@ -63,6 +65,27 @@ The output is a JSON object with the role assignment credentials that provide ac
 > [!IMPORTANT]
 > It is always a good practice to grant minimum access. The scope in the previous example is limited to the specific server and not the entire resource group.
 
+# [OpenID Connect](#tab/openid)
+
+You need to provide your application's **Client ID**, **Tenant ID**, and **Subscription ID** to the login action. These values can either be provided directly in the workflow or can be stored in GitHub secrets and referenced in your workflow. Saving the values as GitHub secrets is the more secure option.
+
+1. Open your GitHub repository and go to **Settings**.
+
+1. Select **Settings > Secrets > New secret**.
+
+1. Create secrets for `AZURE_CLIENT_ID`, `AZURE_TENANT_ID`, and `AZURE_SUBSCRIPTION_ID`. Use these values from your Active Directory application for your GitHub secrets:
+
+    |GitHub Secret  | Active Directory Application  |
+    |---------|---------|
+    |AZURE_CLIENT_ID     |      Application (client) ID   |
+    |AZURE_TENANT_ID     |     Directory (tenant) ID    |
+    |AZURE_SUBSCRIPTION_ID     |     Subscription ID    |
+
+1. Save each secret by selecting **Add secret**.
+
+---
+
+
 ## Copy the SQL connection string 
 
 In the Azure portal, go to your Azure SQL Database and open **Settings** > **Connection strings**. Copy the **ADO.NET** connection string. Replace the placeholder values for `your_database` and `your_password`. The connection string will look similar to this output. 
@@ -75,6 +98,8 @@ You'll use the connection string as a GitHub secret.
 
 ## Configure the GitHub secrets
 
+# [Service principal](#tab/userlevel)
+
 1. In [GitHub](https://github.com/), browse your repository.
 
 1. Select **Settings > Secrets > New secret**.
@@ -93,6 +118,25 @@ You'll use the connection string as a GitHub secret.
 
 1. Paste the connection string value into the secret's value field. Give the secret the name `AZURE_SQL_CONNECTION_STRING`.
 
+# [OpenID Connect](#tab/openid)
+
+You need to provide your application's **Client ID**, **Tenant ID**, and **Subscription ID** to the login action. These values can either be provided directly in the workflow or can be stored in GitHub secrets and referenced in your workflow. Saving the values as GitHub secrets is the more secure option.
+
+1. Open your GitHub repository and go to **Settings**.
+
+1. Select **Settings > Secrets > New secret**.
+
+1. Create secrets for `AZURE_CLIENT_ID`, `AZURE_TENANT_ID`, and `AZURE_SUBSCRIPTION_ID`. Use these values from your Active Directory application for your GitHub secrets:
+
+    |GitHub Secret  | Active Directory Application  |
+    |---------|---------|
+    |AZURE_CLIENT_ID     |      Application (client) ID   |
+    |AZURE_TENANT_ID     |     Directory (tenant) ID    |
+    |AZURE_SUBSCRIPTION_ID     |     Subscription ID    |
+
+1. Save each secret by selecting **Add secret**.
+
+---
 
 ## Add your workflow
 
@@ -107,21 +151,23 @@ You'll use the connection string as a GitHub secret.
 
     on:
     push:
-        branches: [ master ]
+        branches: [ main ]
     pull_request:
-        branches: [ master ]
+        branches: [ main ]
     ```
 
-1. Rename your workflow `SQL for GitHub Actions` and add the checkout and login actions. These actions will checkout your site code and authenticate with Azure using the `AZURE_CREDENTIALS` GitHub secret you created earlier. 
+1. Rename your workflow `SQL for GitHub Actions` and add the checkout and login actions. These actions will check out your site code and authenticate with Azure using the `AZURE_CREDENTIALS` GitHub secret you created earlier.
+
+    # [Service principal](#tab/userlevel)
 
     ```yaml
     name: SQL for GitHub Actions
 
     on:
     push:
-        branches: [ master ]
+        branches: [ main ]
     pull_request:
-        branches: [ master ]
+        branches: [ main ]
 
     jobs:
     build:
@@ -133,6 +179,31 @@ You'll use the connection string as a GitHub secret.
             creds: ${{ secrets.AZURE_CREDENTIALS }}
     ```
 
+    # [OpenID Connect](#tab/openid)
+
+    ```yaml
+    name: SQL for GitHub Actions
+
+    on:
+    push:
+        branches: [ main ]
+    pull_request:
+        branches: [ main ]
+
+    jobs:
+    build:
+        runs-on: windows-latest
+        steps:
+        - uses: actions/checkout@v1
+        - uses: azure/login@v1
+        with:
+            client-id: ${{ secrets.AZURE_CLIENT_ID }}
+            tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+            subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+    ```
+  
+  ---
+
 1. Use the Azure SQL Deploy action to connect to your SQL instance. Replace `SQL_SERVER_NAME` with the name of your server. You should have a dacpac package (`Database.dacpac`) at the root level of your repository. 
 
     ```yaml
@@ -141,18 +212,20 @@ You'll use the connection string as a GitHub secret.
         server-name: SQL_SERVER_NAME
         connection-string: ${{ secrets.AZURE_SQL_CONNECTION_STRING }}
         dacpac-package: './Database.dacpac'
-    ``` 
+    ```
 
-1. Complete your workflow by adding an action to logout of Azure. Here is the completed workflow. The file will appear in the `.github/workflows` folder of your repository.
+1. Complete your workflow by adding an action to logout of Azure. Here's the completed workflow. The file will appear in the `.github/workflows` folder of your repository.
+
+    # [Service principal](#tab/userlevel)
 
     ```yaml
     name: SQL for GitHub Actions
 
     on:
     push:
-        branches: [ master ]
+        branches: [ main ]
     pull_request:
-        branches: [ master ]
+        branches: [ main ]
 
 
     jobs:
@@ -176,6 +249,42 @@ You'll use the connection string as a GitHub secret.
          az logout
     ```
 
+    # [OpenID Connect](#tab/openid)
+
+    ```yaml
+    name: SQL for GitHub Actions
+
+    on:
+    push:
+        branches: [ main ]
+    pull_request:
+        branches: [ main ]
+
+
+    jobs:
+    build:
+        runs-on: windows-latest
+        steps:
+        - uses: actions/checkout@v1
+        - uses: azure/login@v1
+        with:
+            client-id: ${{ secrets.AZURE_CLIENT_ID }}
+            tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+            subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+    - uses: azure/sql-action@v1
+      with:
+        server-name: SQL_SERVER_NAME
+        connection-string: ${{ secrets.AZURE_SQL_CONNECTION_STRING }}
+        dacpac-package: './Database.dacpac'
+
+        # Azure logout 
+    - name: logout
+      run: |
+         az logout
+    ```
+
+    ---
+
 ## Review your deployment
 
 1. Go to **Actions** for your GitHub repository. 

azure-sql/database/connect-github-actions-sql-db.md

@@ -11,13 +11,13 @@ ms.topic: quickstart
 author: dzsquared
 ms.author: drskwier
 ms.reviewer: kendralittle, mathoma
-ms.date: 04/14/2021
+ms.date: 05/05/2022
 monikerRange: "=azuresql||=azuresql-db||=azuresql-mi"
 ---
 # Quickstart: Use Golang to query a database in Azure SQL Database or Azure SQL Managed Instance
 [!INCLUDE[appliesto-sqldb-sqlmi](../includes/appliesto-sqldb-sqlmi.md)]
 
-In this quickstart, you'll use the [Golang](https://godoc.org/github.com/denisenkom/go-mssqldb) programming language to connect to a database in Azure SQL Database or Azure SQL Managed Instance. You'll then run Transact-SQL statements to query and modify data. [Golang](https://go.dev/) is an open-source programming language that makes it easy to build simple, reliable, and efficient software.  
+In this quickstart, you'll use the Golang programming language to connect to a database in Azure SQL Database or Azure SQL Managed Instance with the [go-mssqldb]((https://github.com/microsoft/go-mssqldb). The sample queries and modifies data with explicit Transact-SQL statements. [Golang](https://go.dev/) is an open-source programming language that makes it easy to build simple, reliable, and efficient software.  
 
 ## Prerequisites
 
@@ -70,7 +70,7 @@ Get the connection information you need to connect to the database. You'll need
 
    ```bash
    cd SqlServerSample
-   go get github.com/denisenkom/go-mssqldb
+   go get github.com/microsoft/go-mssqldb
    ```
 
 ## Create sample data
@@ -114,7 +114,7 @@ Get the connection information you need to connect to the database. You'll need
    package main
 
    import (
-       _ "github.com/denisenkom/go-mssqldb"
+       _ "github.com/microsoft/go-mssqldb"
        "database/sql"
        "context"
        "log"
@@ -330,5 +330,5 @@ Get the connection information you need to connect to the database. You'll need
 ## Next steps
 
 - [Design your first database in Azure SQL Database](design-first-database-tutorial.md)
-- [Golang driver for SQL Server](https://github.com/denisenkom/go-mssqldb)
-- [Report issues or ask questions](https://github.com/denisenkom/go-mssqldb/issues)
+- [Golang driver for SQL Server](https://github.com/microsoft/go-mssqldb)
+- [Report issues or ask questions](https://github.com/microsoft/go-mssqldb/issues)