Skip to content

Commit 76fba48

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into mi-decomission
2 parents 88e3ccf + e272334 commit 76fba48

File tree

12 files changed

+129
-83
lines changed

12 files changed

+129
-83
lines changed

articles/active-directory-b2c/configure-authentication-sample-spa-app.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,10 @@ Now that you've obtained the SPA sample, update the code with your Azure AD B2C
131131
|---------|---------|---------|
132132
|authConfig.js|clientId| The SPA ID from [step 2.3](#step-23-register-the-spa).|
133133
|policies.js| names| The user flows, or custom policy you created in [step 1](#step-1-configure-your-user-flow).|
134-
|policies.js|authorities|Your Azure AD B2C [tenant name](tenant-management.md#get-your-tenant-name) (for example, `contoso.onmicrosoft.com`). Then, replace with the user flows, or custom policy you created in [step 1](#step-1-configure-your-user-flow) (for example, `https://<your-tenant-name>.b2clogin.com/<your-tenant-name>.onmicrosoft.com/<your-sign-in-sign-up-policy>`).|
135-
|policies.js|authorityDomain|Your Azure AD B2C [tenant name](tenant-management.md#get-your-tenant-name) (for example, `contoso.onmicrosoft.com`).|
134+
|policies.js|authorities|Your Azure AD B2C user flows or custom policies authorities such as `https://<your-tenant-name>.b2clogin.com/<your-tenant-name>.onmicrosoft.com/<your-sign-in-sign-up-policy>`. Replace `your-sign-in-sign-up-policy` with user flow or custom policy you created in [step 1](#sign-in-flow)|
135+
|policies.js|authorityDomain|Your Azure AD B2C authority domain such as `<your-tenant-name>.b2clogin.com`.|
136136
|apiConfig.js|b2cScopes|The web API scopes you created in [step 2.2](#step-22-configure-scopes) (for example, `b2cScopes: ["https://<your-tenant-name>.onmicrosoft.com/tasks-api/tasks.read"]`).|
137-
|apiConfig.js|webApi|The URL of the web API, `http://localhost:5000/tasks`.|
137+
|apiConfig.js|webApi|The URL of the web API, `http://localhost:5000/hello`.|
138138
| | | |
139139
140140
Your resulting code should look similar to following sample:
@@ -192,7 +192,7 @@ const b2cPolicies = {
192192
```javascript
193193
const apiConfig = {
194194
b2cScopes: ["https://your-tenant-name.onmicrosoft.com/tasks-api/tasks.read"],
195-
webApi: "http://localhost:5000/tasks"
195+
webApi: "http://localhost:5000/hello"
196196
};
197197
```
198198

articles/azure-monitor/insights/sql-insights-enable.md

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Enable SQL insights in Azure Monitor
44
ms.topic: conceptual
55
author: bwren
66
ms.author: bwren
7-
ms.date: 1/6/2022
7+
ms.date: 1/18/2022
88
---
99

1010
# Enable SQL insights (preview)
@@ -196,6 +196,8 @@ The connection string specifies the login name that SQL insights should use when
196196
The connections string will vary for each type of SQL resource:
197197

198198
#### Azure SQL Database
199+
TCP connections from the monitoring machine to the IP address and port used by the database must be allowed by any firewalls or [network security groups](../../virtual-network/network-security-groups-overview.md) (NSGs) that may exist on the network path. For details on IP addresses and ports, see [Azure SQL Database connectivity architecture](../../azure-sql/database/connectivity-architecture.md).
200+
199201
Enter the connection string in the form:
200202

201203
```
@@ -208,36 +210,53 @@ Get the details from the **Connection strings** menu item for the database.
208210

209211
:::image type="content" source="media/sql-insights-enable/connection-string-sql-database.png" alt-text="SQL database connection string" lightbox="media/sql-insights-enable/connection-string-sql-database.png":::
210212

211-
To monitor a readable secondary, include the key-value `ApplicationIntent=ReadOnly` in the connection string. SQL Insights supports monitoring a single secondary. The collected data will be tagged to reflect primary or secondary.
213+
To monitor a readable secondary, append `;ApplicationIntent=ReadOnly` to the connection string. SQL Insights supports monitoring a single secondary. The collected data will be tagged to reflect primary or secondary.
212214

213215
#### Azure SQL Managed Instance
216+
TCP connections from the monitoring machine to the IP address and port used by the managed instance must be allowed by any firewalls or [network security groups](../../virtual-network/network-security-groups-overview.md) (NSGs) that may exist on the network path. For details on IP addresses and ports, see [Azure SQL Managed Instance connection types](../../azure-sql/managed-instance/connection-types-overview.md).
217+
214218
Enter the connection string in the form:
215219

216220
```
217221
"sqlManagedInstanceConnections": [
218222
"Server= mysqlserver.database.windows.net;Port=1433;User Id=$username;Password=$password;"
219223
]
220224
```
221-
Get the details from the **Connection strings** menu item for the managed instance.
222-
225+
Get the details from the **Connection strings** menu item for the managed instance. If using managed instance [public endpoint](../../azure-sql/managed-instance/public-endpoint-configure.md), replace port 1433 with 3342.
223226

224227
:::image type="content" source="media/sql-insights-enable/connection-string-sql-managed-instance.png" alt-text="SQL Managed Instance connection string" lightbox="media/sql-insights-enable/connection-string-sql-managed-instance.png":::
225228

226-
To monitor a readable secondary, include the key-value `ApplicationIntent=ReadOnly` in the connection string. SQL Insights supports monitoring of a single secondary. Collected data will be tagged to reflect Primary or Secondary.
229+
To monitor a readable secondary, append `;ApplicationIntent=ReadOnly` to the connection string. SQL Insights supports monitoring of a single secondary. Collected data will be tagged to reflect Primary or Secondary.
227230

228231
#### SQL Server
232+
The TCP/IP protocol must be enabled for the SQL Server instance you want to monitor. TCP connections from the monitoring machine to the IP address and port used by the SQL Server instance must be allowed by any firewalls or [network security groups](../../virtual-network/network-security-groups-overview.md) (NSGs) that may exist on the network path.
233+
234+
If you want to monitor SQL Server configured for high availability (using either availability groups or failover cluster instances), we recommend monitoring each SQL Server instance in the cluster individually rather than connecting via an availability group listener or a failover cluster name. This ensures that monitoring data is collected regardless of the current instance role (primary or secondary).
235+
229236
Enter the connection string in the form:
230237

231238
```
232239
"sqlVmConnections": [
233-
"Server=MyServerIPAddress;Port=1433;User Id=$username;Password=$password;"
240+
"Server=SQLServerInstanceIPAddress;Port=1433;User Id=$username;Password=$password;"
234241
]
235242
```
236243

237-
If your monitoring virtual machine is in the same VNET, use the private IP address of the Server. Otherwise, use the public IP address. If you're using Azure SQL virtual machine, you can see which port to use here on the **Security** page for the resource.
244+
Use the IP address that the SQL Server instance listens on.
245+
246+
If your SQL Server instance is configured to listen on a non-default port, replace 1433 with that port number in the connection string. If you're using Azure SQL virtual machine, you can see which port to use on the **Security** page for the resource.
238247

239248
:::image type="content" source="media/sql-insights-enable/sql-vm-security.png" alt-text="SQL virtual machine security" lightbox="media/sql-insights-enable/sql-vm-security.png":::
240249

250+
For any SQL Server instance, you can determine all IP addresses and ports it is listening on by connecting to the instance and executing the following T-SQL query, as long as there is at least one TCP connection to the instance:
251+
252+
```sql
253+
SELECT DISTINCT local_net_address, local_tcp_port
254+
FROM sys.dm_exec_connections
255+
WHERE net_transport = 'TCP'
256+
AND
257+
protocol_type = 'TSQL';
258+
```
259+
241260
## Monitoring profile created
242261

243262
Select **Add monitoring virtual machine** to configure the virtual machine to collect data from your SQL resources. Do not return to the **Overview** tab. In a few minutes, the Status column should change to read "Collecting", you should see data for the SQL resources you have chosen to monitor.

articles/azure-sql/managed-instance/link-feature.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.topic: conceptual
1111
author: danimir
1212
ms.author: danil
1313
ms.reviewer: mathoma, danil
14-
ms.date: 11/05/2021
14+
ms.date: 01/19/2022
1515
---
1616
# Link feature for Azure SQL Managed Instance (limited preview)
1717
[!INCLUDE[appliesto-sqlmi](../includes/appliesto-sqlmi.md)]
@@ -20,8 +20,18 @@ The new link feature in Azure SQL Managed Instance connects your SQL Servers h
2020

2121
After a disastrous event, you can continue running your read-only workloads on SQL Managed Instance in Azure. You can also choose to migrate one or more applications from SQL Server to SQL Managed Instance at the same time, at your own pace, and with the best possible minimum downtime compared to other solutions in Azure today.
2222

23-
> [!NOTE]
24-
> The link feature is released in limited public preview with support for currently only SQL Server 2019 Enterprise Edition CU13 (or above). [Sign-up now](https://aka.ms/mi-link-signup) to participate in the limited public preview.
23+
## Sign-up for link
24+
25+
To use the link feature, you will need:
26+
27+
- SQL Server 2019 Enterprise Edition with [CU13 (or above)](https://support.microsoft.com/topic/kb5005679-cumulative-update-13-for-sql-server-2019-5c1be850-460a-4be4-a569-fe11f0adc535) installed on-premises, or on an Azure VM.
28+
- Network connectivity between your SQL Server and managed instance is required. If your SQL Server is running on-premises, use a VPN link or Express route. If your SQL Server is running on an Azure VM, either deploy your VM to the same subnet as your managed instance, or use global VNet peering to connect two separate subnets.
29+
- Azure SQL Managed Instance provisioned on any service tier.
30+
31+
Use the following link to sign-up for the limited preview of the link feature.
32+
33+
> [!div class="nextstepaction"]
34+
> [Sign up for link feature preview](https://aka.ms/mi-link-signup)
2535
2636
## Overview
2737

@@ -71,18 +81,8 @@ Secure connectivity, such as VPN or Express Route is used between an on-premises
7181

7282
There could exist up to 100 links from the same, or various SQL Server sources to a single SQL Managed Instance. This limit is governed by the number of databases that could be hosted on a managed instance at this time. Likewise, a single SQL Server can establish multiple parallel database replication links with several managed instances in different Azure regions in a 1 to 1 relationship between a database and a managed instance . The feature requires CU13 or higher to be installed on SQL Server 2019.
7383

74-
## Sign-up for link
75-
76-
To use the link feature, you will need:
77-
78-
- SQL Server 2019 Enterprise Edition with [CU13 (or above)](https://support.microsoft.com/topic/kb5005679-cumulative-update-13-for-sql-server-2019-5c1be850-460a-4be4-a569-fe11f0adc535) installed on-premises, or on an Azure VM.
79-
- Network connectivity between your SQL Server and managed instance is required. If your SQL Server is running on-premises, use a VPN link or Express route. If your SQL Server is running on an Azure VM, either deploy your VM to the same subnet as your managed instance, or use global VNet peering to connect two separate subnets.
80-
- Azure SQL Managed Instance provisioned on any service tier.
81-
82-
Use the following link to sign-up for the limited preview of the link feature.
83-
84-
> [!div class="nextstepaction"]
85-
> [Sign up for link feature preview](https://aka.ms/mi-link-signup)
84+
> [!NOTE]
85+
> The link feature is released in limited public preview with support for currently only SQL Server 2019 Enterprise Edition CU13 (or above). [Sign-up now](https://aka.ms/mi-link-signup) to participate in the limited public preview.
8686
8787
## Next steps
8888

articles/hpc-cache/configuration.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
22
title: Configure Azure HPC Cache settings
33
description: Explains how to configure additional settings for the cache like MTU, custom NTP and DNS configuration, and how to access the express snapshots from Azure Blob storage targets.
4-
author: femila
4+
author: ronhogue
55
ms.service: hpc-cache
66
ms.topic: how-to
77
ms.date: 04/08/2021
8-
ms.author: femila
8+
ms.author: rohogue
99
---
1010

1111
# Configure additional Azure HPC Cache settings
@@ -76,7 +76,7 @@ Consider using a test cache to check and refine your DNS setup before you use it
7676

7777
### Refresh storage target DNS
7878

79-
If your DNS server updates IP addresses, the associated NFS storage targets will become temporarily unavailable. Read how to update your custom DNS system IP addresses in [View and manage storage targets](manage-storage-targets.md#update-ip-address-custom-dns-configurations-only).
79+
If your DNS server updates IP addresses, the associated NFS storage targets will become temporarily unavailable. Read how to update your custom DNS system IP addresses in [View and manage storage targets](manage-storage-targets.md#update-ip-address-specific-configurations-only).
8080

8181
## View snapshots for blob storage targets
8282

0 commit comments

Comments
 (0)