Merge branch 'main' into release-arc-data

Author: v-alje

azure-sql/database/hyperscale-architecture.md

@@ -4,7 +4,7 @@ description: Learn how Hyperscale databases are architected to scale out storage
 author: dimitri-furman
 ms.author: dfurman
 ms.reviewer: wiassaf, mathoma
-ms.date: 2/17/2022
+ms.date: 8/4/2023
 ms.service: sql-database
 ms.subservice: service-overview
 ms.custom: build-2023, build-2023-dataai
@@ -67,7 +67,16 @@ Azure Storage contains all data files in a database. Page servers keep data file
 
 Backups are implemented using storage snapshots of data files. Restore operations using snapshots are fast regardless of data size. A database can be restored to any point in time within its backup retention period.
 
-Hyperscale supports configurable storage redundancy. When creating a Hyperscale database, you can choose read-access geo-redundant storage (RA-GRS), zone-redundant storage (ZRS)(preview), or locally redundant storage (LRS)(preview) Azure standard storage. The selected storage redundancy option will be used for the lifetime of the database for both data storage redundancy and [backup storage redundancy](automated-backups-overview.md#backup-storage-redundancy).
+Hyperscale supports configurable storage redundancy. When creating a Hyperscale database, you can choose from the following types of Azure standard storage:
+
+- Locally redundant storage (LRS)
+- Zone-redundant storage (ZRS)
+- Read-access geo-redundant storage (RA-GRS)
+- Read-access geo-zone-redundant storage (RA-GZRS)
+
+Zone-redundant storage options are available in Azure [regions with availability zones](/azure/reliability/availability-zones-service-support).
+
+The selected storage redundancy option will be used for the lifetime of the database for both data storage redundancy and [backup storage redundancy](automated-backups-overview.md#backup-storage-redundancy).
 
 ## Next steps
 

azure-sql/database/metrics-diagnostic-telemetry-logging-streaming-export-configure.md

@@ -4,7 +4,7 @@ description: Learn how to configure streaming export of metrics and resource log
 author: dimitri-furman
 ms.author: dfurman
 ms.reviewer: wiassaf, mathoma
-ms.date: 07/17/2023
+ms.date: 08/04/2023
 ms.service: sql-db-mi
 ms.subservice: performance
 ms.topic: how-to
@@ -738,6 +738,14 @@ Learn more about [database wait statistics](/sql/relational-databases/system-dyn
 | Event_s | Type of Automatic tuning event |
 | Timestamp_t | Last updated timestamp |
 
+> [!TIP]
+> `query_hash_s` and `query_plan_hash_s` are provided as numeric values. If you want to find the matching queries and query plans in [Query Store](/sql/relational-databases/performance/monitoring-performance-by-using-the-query-store), use the following T-SQL expression to convert numeric hash values to binary hash values used in [sys.query_store_query](/sql/relational-databases/system-catalog-views/sys-query-store-query-transact-sql) and [sys.query_store_plan](/sql/relational-databases/system-catalog-views/sys-query-store-plan-transact-sql):
+>
+> `SELECT CAST(CAST(hash_value as bigint) AS binary(8))`.
+>
+> Replace the `hash_value` placeholder with the actual `query_hash_s` or `query_plan_hash_s` numeric value.
+
+
 #### Intelligent Insights dataset
 
 Learn more about the [Intelligent Insights log format](intelligent-insights-use-diagnostics-log.md).

azure-sql/database/sql-data-sync-data-sql-server-sql-database.md

@@ -232,7 +232,7 @@ Yes. You can configure sync between databases that belong to resource groups own
 - If the subscriptions belong to the same tenant and you have permission to all subscriptions, you can configure the sync group in the Azure portal.
 - Otherwise, you have to use PowerShell to add the sync members.
 
-### Can I set up Data Sync to sync between databases in SQL Database that belong to different clouds (like Azure Public Cloud and Azure China 21Vianet)
+### Can I set up Data Sync to sync between databases in SQL Database that belong to different clouds (like Azure Public Cloud and Azure operated by 21Vianet)
 
 Yes. You can set up sync between databases that belong to different clouds. You have to use PowerShell to add the sync members that belong to the different subscriptions.
 

azure-sql/includes/resource-graph/samples/bycat/azure-sql.md

@@ -41,7 +41,7 @@ Search-AzGraph -Query "Resources | where type =~ 'microsoft.sql/servers/database
 
 - Azure portal: <a href="https://portal.azure.com/?feature.customportal=false#blade/HubsExtension/ArgQueryBlade/query/Resources%0a%7c%20where%20type%20%3d%7e%20%27microsoft.sql%2fservers%2fdatabases%27%0a%7c%20project%20databaseId%20%3d%20id%2c%20databaseName%20%3d%20name%2c%20elasticPoolId%20%3d%20tolower(tostring(properties.elasticPoolId))%0a%7c%20join%20kind%3dleftouter%20(%0a%09Resources%0a%09%7c%20where%20type%20%3d%7e%20%27microsoft.sql%2fservers%2felasticpools%27%0a%09%7c%20project%20elasticPoolId%20%3d%20tolower(id)%2c%20elasticPoolName%20%3d%20name%2c%20elasticPoolState%20%3d%20properties.state)%0a%09on%20elasticPoolId%0a%7c%20project-away%20elasticPoolId1" target="_blank">portal.azure.com</a>
 - Azure Government portal: <a href="https://portal.azure.us/?feature.customportal=false#blade/HubsExtension/ArgQueryBlade/query/Resources%0a%7c%20where%20type%20%3d%7e%20%27microsoft.sql%2fservers%2fdatabases%27%0a%7c%20project%20databaseId%20%3d%20id%2c%20databaseName%20%3d%20name%2c%20elasticPoolId%20%3d%20tolower(tostring(properties.elasticPoolId))%0a%7c%20join%20kind%3dleftouter%20(%0a%09Resources%0a%09%7c%20where%20type%20%3d%7e%20%27microsoft.sql%2fservers%2felasticpools%27%0a%09%7c%20project%20elasticPoolId%20%3d%20tolower(id)%2c%20elasticPoolName%20%3d%20name%2c%20elasticPoolState%20%3d%20properties.state)%0a%09on%20elasticPoolId%0a%7c%20project-away%20elasticPoolId1" target="_blank">portal.azure.us</a>
-- Azure China 21Vianet portal: <a href="https://portal.azure.cn/?feature.customportal=false#blade/HubsExtension/ArgQueryBlade/query/Resources%0a%7c%20where%20type%20%3d%7e%20%27microsoft.sql%2fservers%2fdatabases%27%0a%7c%20project%20databaseId%20%3d%20id%2c%20databaseName%20%3d%20name%2c%20elasticPoolId%20%3d%20tolower(tostring(properties.elasticPoolId))%0a%7c%20join%20kind%3dleftouter%20(%0a%09Resources%0a%09%7c%20where%20type%20%3d%7e%20%27microsoft.sql%2fservers%2felasticpools%27%0a%09%7c%20project%20elasticPoolId%20%3d%20tolower(id)%2c%20elasticPoolName%20%3d%20name%2c%20elasticPoolState%20%3d%20properties.state)%0a%09on%20elasticPoolId%0a%7c%20project-away%20elasticPoolId1" target="_blank">portal.azure.cn</a>
+- Microsoft Azure portal operated by 21Vianet: <a href="https://portal.azure.cn/?feature.customportal=false#blade/HubsExtension/ArgQueryBlade/query/Resources%0a%7c%20where%20type%20%3d%7e%20%27microsoft.sql%2fservers%2fdatabases%27%0a%7c%20project%20databaseId%20%3d%20id%2c%20databaseName%20%3d%20name%2c%20elasticPoolId%20%3d%20tolower(tostring(properties.elasticPoolId))%0a%7c%20join%20kind%3dleftouter%20(%0a%09Resources%0a%09%7c%20where%20type%20%3d%7e%20%27microsoft.sql%2fservers%2felasticpools%27%0a%09%7c%20project%20elasticPoolId%20%3d%20tolower(id)%2c%20elasticPoolName%20%3d%20name%2c%20elasticPoolState%20%3d%20properties.state)%0a%09on%20elasticPoolId%0a%7c%20project-away%20elasticPoolId1" target="_blank">portal.azure.cn</a>
 
 ---
 

azure-sql/managed-instance/sql-managed-instance-paas-overview.md

@@ -46,7 +46,7 @@ SQL Managed Instance combines the best features that are available both in Azure
 
 | **PaaS benefits** | **Business continuity** |
 | --- | --- |
-|No purchasing or managing hardware <br>No management overhead to manage underlying infrastructure <br>Quick provisioning and service scaling <br>Automated patching and version upgrade <br /> You can [stop and start](instance-stop-start-how-to.md) the instance to save on costs <br>Integration with other PaaS data services |99.99% uptime SLA  <br>Built-in [high availability](../database/high-availability-sla.md) <br> [Hybrid Disaster recovery with failover (preview)](managed-instance-link-feature-overview.md) between SQL Managed Instance and SQL Server 2022. <br>Data protected with [automated backups](../database/automated-backups-overview.md) <br>Customer configurable backup retention period <br>User-initiated [backups](/sql/t-sql/statements/backup-transact-sql?preserve-view=true&view=azuresqldb-mi-current) that can be [restored to SQL Server 2022](restore-database-to-sql-server.md) <br>[Point-in-time database restore](../database/recovery-using-backups.md#point-in-time-restore) capability |
+|No purchasing or managing hardware <br>No management overhead to manage underlying infrastructure <br>Quick provisioning and service scaling <br>Automated patching and version upgrade <br /> You can [stop and start](instance-stop-start-how-to.md) the instance to save on costs <br>Integration with other PaaS data services |99.99% uptime SLA  <br>Built-in [high availability](high-availability-sla.md) <br> [Hybrid Disaster recovery with failover (preview)](managed-instance-link-feature-overview.md) between SQL Managed Instance and SQL Server 2022. <br>Data protected with [automated backups](../database/automated-backups-overview.md) <br>Customer configurable backup retention period <br>User-initiated [backups](/sql/t-sql/statements/backup-transact-sql?preserve-view=true&view=azuresqldb-mi-current) that can be [restored to SQL Server 2022](restore-database-to-sql-server.md) <br>[Point-in-time database restore](../database/recovery-using-backups.md#point-in-time-restore) capability |
 |**Security and compliance** | **Management**|
 |Isolated environment ([VNet integration](connectivity-architecture-overview.md), single tenant service, dedicated compute and storage) <br> Adheres to the same compliance standards as Azure SQL Database <br>[Transparent data encryption (TDE)](/sql/relational-databases/security/encryption/transparent-data-encryption-azure-sql)<br>[Azure Active Directory (Azure AD) authentication](../database/authentication-aad-overview.md), single sign-on support <br> [Azure AD server principals (logins)](/sql/t-sql/statements/create-login-transact-sql?view=azuresqldb-mi-current&preserve-view=true) <br>[Windows Authentication for Azure AD principals](winauth-azuread-overview.md)  <br>[SQL auditing](auditing-configure.md) <br>[Advanced Threat Protection](threat-detection-configure.md) |Azure Resource Manager API for automating service provisioning and scaling <br>Azure portal functionality for manual service provisioning and scaling <br>Data Migration Service
 

azure-sql/virtual-machines/windows/hadr-cluster-quorum-configure-how-to.md

@@ -104,7 +104,7 @@ Use the Quorum Configuration Wizard built into Failover Cluster Manager to confi
    2. (Required parameter) Access Key corresponding to the Storage Account.
        1. When creating for the first time, use Primary Access Key 
        2. When rotating the Primary Access Key, use Secondary Access Key
-   3. (Optional parameter) If you intend to use a different Azure service endpoint (for example the Microsoft Azure service in China), then update the endpoint server name.
+   3. (Optional parameter) If you intend to use a different Azure service endpoint (for example, Azure operated by 21Vianet), update the endpoint server name.
 
     ![Snapshot of the Cloud Witness configuration pane in the Cluster Quorum wizard](./media/hadr-create-quorum-windows-failover-cluster-how-to/cloud-witness-10.png)
 

azure-sql/virtual-machines/windows/licensing-model-azure-hybrid-benefit-ahb-change.md

@@ -102,7 +102,6 @@ Changing the license model is:
 
 - Only supported for the Standard and Enterprise editions of SQL Server. License changes for Express, Web, and Developer are not supported.
 - Only supported for virtual machines deployed through the Azure Resource Manager model. Virtual machines deployed through the classic model are not supported.
-- Available only for the public or Azure Government clouds. Currently unavailable for the Azure China region.
 
 Additionally, changing the license model to **Azure Hybrid Benefit** requires [Software Assurance](https://www.microsoft.com/en-us/licensing/licensing-programs/software-assurance-overview).
 

docs/azure-data-studio/azure-connectivity.md

@@ -137,7 +137,7 @@ In a proxy environment, user applications may need to allow specific domains use
 - https://management.core.usgovcloudapi.net/
 - https://login.microsoftonline.us/
 
-**Azure (China)**
+**Azure operated by 21Vianet**
 
 - https://management.core.chinacloudapi.cn/
 - https://login.partner.microsoftonline.cn/

docs/database-engine/availability-groups/windows/distributed-availability-groups.md

@@ -51,7 +51,7 @@ Distributed availability groups in SQL Server 2017 or later can mix major versio
 Because the distributed availability groups feature didn't exist in SQL Server 2012 or 2014, availability groups that were created with these versions can't participate in distributed availability groups.
 
 > [!NOTE]  
-> Starting with [!INCLUDE [sssql19-md](../../../includes/sssql19-md.md)] CU 17, when connecting to Azure services (such as the [Managed Instance link](/azure/azure-sql/managed-instance/managed-instance-link-feature-overview)), it's possible to configure a distributed availability groups with Standard edition, or a mix of Standard and Enterprise editions. Review [KB5016729](https://support.microsoft.com/topic/kb5016729-improvement-enable-distributed-availability-groups-on-sql-server-standard-editions-40d5724d-f459-4240-8bae-f8c075a7e2a5) to learn more. 
+> Depending on the version of SQL Server, when connecting to Azure services (such as the [Managed Instance link](/azure/azure-sql/managed-instance/managed-instance-link-feature-overview)), it's possible to configure a distributed availability group with Standard edition, or a mix of Standard and Enterprise editions. Review [KB5016729](https://support.microsoft.com/topic/kb5016729-improvement-enable-distributed-availability-groups-on-sql-server-standard-editions-40d5724d-f459-4240-8bae-f8c075a7e2a5) to learn more. 
 
 Because there are two separate availability groups, the process of installing a service pack or cumulative update on a replica that's participating in a distributed availability group is slightly different from that of a traditional availability group:
 

docs/linux/quickstart-install-connect-docker.md

@@ -617,7 +617,7 @@ The following steps use the [!INCLUDE [ssnoversion-md](../includes/ssnoversion-m
 1. Once inside the container, connect locally with **sqlcmd**, using its full path.
 
    ```bash
-   /opt/mssql-tools18/bin/sqlcmd -S localhost -U SA -P "<YourNewStrong@Passw0rd>"
+   /opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P "<YourNewStrong@Passw0rd>"
    ```
 
    > [!NOTE]  
@@ -626,7 +626,7 @@ The following steps use the [!INCLUDE [ssnoversion-md](../includes/ssnoversion-m
    You can omit the password on the command-line to be prompted to enter it. For example:
 
    ```bash
-     /opt/mssql-tools18/bin/sqlcmd -S localhost -U SA
+     /opt/mssql-tools/bin/sqlcmd -S localhost -U SA
    ```
 
 1. If successful, you should get to a **sqlcmd** command prompt: `1>`.