Skip to content

Commit 71eb8d8

Browse files
davidpeterhdavidpeterh
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/sql-docs-pr into davidph-predict-fix
2 parents 6d9ad2d + b71882c commit 71eb8d8

35 files changed

Lines changed: 139 additions & 166 deletions

File tree

‎docs/azure-data-studio/media/quickstart-sql-database/change-context2.png‎

72.1 KB
Loading

‎docs/azure-data-studio/media/quickstart-sql-database/select-results2.png‎

78.4 KB
Loading

‎docs/azure-data-studio/quickstart-sql-database.md‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: "Quickstart: Connect and query an Azure SQL database using Azure Data Studio | Microsoft Docs"
33
description: This quickstart shows how to use Azure Data Studio to connect to a SQL database and run a query
44
ms.custom: "tools|sos"
5-
ms.date: "09/24/2018"
5+
ms.date: "12/03/2018"
66
ms.prod: sql
77
ms.technology: azure-data-studio
88
ms.reviewer: "alayu; sstein"
@@ -13,15 +13,15 @@ manager: craigg
1313
---
1414
# Quickstart: Use [!INCLUDE[name-sos](../includes/name-sos-short.md)] to connect and query Azure SQL database
1515

16-
This quickstart demonstrates how to use *[!INCLUDE[name-sos](../includes/name-sos-short.md)]* to connect to an Azure SQL database, and then use Transact-SQL (T-SQL) statements to create the *TutorialDB* used in [!INCLUDE[name-sos](../includes/name-sos-short.md)] tutorials.
16+
This quickstart demonstrates how to use [!INCLUDE[name-sos](../includes/name-sos-short.md)] to connect to an Azure SQL Database server and then use Transact-SQL (T-SQL) statements to create and query the TutorialDB database, which is used in other [!INCLUDE[name-sos](../includes/name-sos-short.md)] tutorials.
1717

1818
## Prerequisites
1919

20-
To complete this quickstart, you need [!INCLUDE[name-sos](../includes/name-sos-short.md)], and an Azure SQL server.
20+
To complete this quickstart, you need [!INCLUDE[name-sos](../includes/name-sos-short.md)], and an Azure SQL Database server.
2121

22-
- [Install [!INCLUDE[name-sos](../includes/name-sos-short.md)]](download.md).
22+
- [Install [!INCLUDE[name-sos](../includes/name-sos-short.md)]](download.md)
2323

24-
If you don't already have an Azure SQL server, complete one of the following Azure SQL Database quickstarts (remember the server name, and login credentials!):
24+
If you don't already have an Azure SQL server, complete one of the following Azure SQL Database quickstarts (remember the fully qualified server name and sign in credentials for steps in the next section):
2525

2626
- [Create DB - Portal](https://docs.microsoft.com/azure/sql-database/sql-database-get-started-portal)
2727
- [Create DB - CLI](https://docs.microsoft.com/azure/sql-database/sql-database-get-started-cli)
@@ -32,37 +32,39 @@ If you don't already have an Azure SQL server, complete one of the following Azu
3232

3333
Use [!INCLUDE[name-sos](../includes/name-sos-short.md)] to establish a connection to your Azure SQL Database server.
3434

35-
1. The first time you run [!INCLUDE[name-sos](../includes/name-sos-short.md)] the **Connection** page should open. If you don't see the **Connection** page, click **Add Connection**, or the **New Connection** icon in the **SERVERS** sidebar:
35+
1. The first time you run [!INCLUDE[name-sos](../includes/name-sos-short.md)] the **Connection** page should open. If you don't see the **Connection** page, select **Add Connection**, or the **New Connection** icon in the **SERVERS** sidebar:
3636

3737
![New Connection Icon](media/quickstart-sql-database/new-connection-icon.png)
3838

39-
2. This article uses *SQL Login*, but *Windows Authentication* is also supported. Fill in the fields as follows using the server name, user name, and password for *your* Azure SQL server:
39+
2. This article uses SQL Login, but Windows Authentication is also supported. Fill in the following fields using the server name, user name, and password for your Azure SQL server:
4040

4141
| Setting | Suggested value | Description |
4242
| ------------ | ------------------ | ------------------------------------------------- |
43-
| **Server name** | The fully qualified server name | The name should be something like this: **servername.database.windows.net** |
44-
| **Authentication** | SQL Login| SQL Authentication is used in this tutorial. |
45-
| **User name** | The server admin account | This is the account that you specified when you created the server. |
46-
| **Password (SQL Login)** | The password for your server admin account | This is the password that you specified when you created the server. |
47-
| **Save Password?** | Yes or No | Select Yes if you do not want to enter the password each time. |
48-
| **Database name** | *leave blank* | The name of the database you want to connect to. |
49-
| **Server Group** | Select <Default> | If you created a server group, you can set to a specific server group. |
43+
| **Server name** | The fully qualified server name | Something like: **servername.database.windows.net**. |
44+
| **Authentication** | SQL Login| This tutorial uses SQL Authentication. |
45+
| **User name** | The server admin account user name | The user name from the account used to create the server. |
46+
| **Password (SQL Login)** | The server admin account password | The password from the account used to create the server. |
47+
| **Save Password?** | Yes or No | Select **Yes** if you don't want to enter the password each time. |
48+
| **Database name** | *leave blank* | You're only connecting to the server here. |
49+
| **Server Group** | Select <Default> | You can set this to a specific server group you created. |
5050

5151
![New Connection Icon](media/quickstart-sql-database/new-connection-screen.png)
5252

53-
3. If your server doesn't have a firewall rule allowing Azure Data Studio to connect, the **Create new firewall rule** form opens. Complete the form to create a new firewall rule. For details, see [Firewall rules](https://docs.microsoft.com/azure/sql-database/sql-database-firewall-configure).
53+
3. Select **Connect**.
54+
55+
4. If your server doesn't have a firewall rule allowing Azure Data Studio to connect, the **Create new firewall rule** form opens. Complete the form to create a new firewall rule. For details, see [Firewall rules](https://docs.microsoft.com/azure/sql-database/sql-database-firewall-configure).
5456

5557
![New firewall rule](media/quickstart-sql-database/firewall.png)
5658

57-
4. After successfully connecting your server opens in the *Servers* sidebar.
59+
After successfully connecting, your server opens in the **SERVERS** sidebar.
5860

5961
## Create the tutorial database
6062

61-
The following sections create the *TutorialDB* database that is used in several [!INCLUDE[name-sos](../includes/name-sos-short.md)] tutorials.
63+
The following sections create the TutorialDB database that's used in other [!INCLUDE[name-sos](../includes/name-sos-short.md)] tutorials.
6264

63-
1. Right click on your Azure SQL server in the SERVERS sidebar and select **New Query.**
65+
1. Right-click on your Azure SQL server in the **SERVERS** sidebar and select **New Query**.
6466

65-
1. Paste the following snippet into the query editor and click **Run**:
67+
1. Paste the following SQL snippet into the query editor.
6668

6769
```sql
6870
IF NOT EXISTS (
@@ -77,22 +79,21 @@ The following sections create the *TutorialDB* database that is used in several
7779
GO
7880
```
7981

80-
82+
1. Select **Run**. Notifications appear in the **MESSAGES** pane showing query progress.
8183

8284
## Create a table
8385

84-
The query editor is still connected to the *master* database, but we want to create a table in the *TutorialDB* database.
86+
The query editor is still connected to the master database, but we want to create a table in the TutorialDB database.
8587

86-
1. Change the connection context to **TutorialDB**:
88+
1. Connect to the **TutorialDB** database:
8789

88-
![Change context](media/quickstart-sql-database/change-context.png)
90+
![Change context](media/quickstart-sql-database/change-context2.png)
8991

9092

9193

92-
1. Paste the following snippet into the query editor and click **Run**:
94+
1. Create a `Customers` table.
9395

94-
> [!NOTE]
95-
> You can append this to, or overwrite the previous query in the editor. Note that clicking **Run** executes only the query that is selected. If nothing is selected, clicking **Run** executes all queries in the editor.
96+
Overwrite the previous query in the query editor with this SQL snippet and select **Run**.
9697

9798
```sql
9899
-- Create a new table called 'Customers' in schema 'dbo'
@@ -112,9 +113,9 @@ The query editor is still connected to the *master* database, but we want to cre
112113
```
113114

114115

115-
## Insert rows
116+
## Insert rows into the table
116117

117-
- Paste the following snippet into the query editor and click **Run**:
118+
Overwrite the previous query in the query editor with this SQL snippet and select **Run**.
118119

119120
```sql
120121
-- Insert rows into table 'Customers'
@@ -130,23 +131,22 @@ The query editor is still connected to the *master* database, but we want to cre
130131

131132

132133
## View the result
133-
1. Paste the following snippet into the query editor and click **Run**:
134+
Overwrite the previous query in the query editor with this SQL snippet and select **Run**.
134135

135136
```sql
136137
-- Select rows from table 'Customers'
137138
SELECT * FROM dbo.Customers;
138139
```
139140

140-
1. The results of the query are displayed:
141+
The query results display:
141142

142-
![Select results](media/quickstart-sql-database/select-results.png)
143+
![Select results](media/quickstart-sql-database/select-results2.png)
143144

144145

145146
## Clean up resources
146147

147-
Other articles in this collection build upon this quickstart. If you plan to continue on to work with subsequent quickstarts, do not clean up the resources created in this quickstart. If you do not plan to continue, use the following steps to delete resources created by this quickstart in the Azure portal.
148-
Clean up resources by deleting the resource groups you no longer need. For details, see [Clean up resources](https://docs.microsoft.com/azure/sql-database/sql-database-get-started-portal#clean-up-resources).
148+
Later quickstart articles build upon the resources created here. If you plan to work through these articles, be sure not to delete these resources. Otherwise, in the Azure portal, you can delete the resources you no longer need. For details, see [Clean up resources](https://docs.microsoft.com/azure/sql-database/sql-database-get-started-portal#clean-up-resources).
149149

150150
## Next steps
151151

152-
Now that you've successfully connected to an Azure SQL database and ran a query, try out the [Code editor tutorial](tutorial-sql-editor.md).
152+
Now that you have successfully connected to an Azure SQL database and run a query, try out the [Code editor tutorial](tutorial-sql-editor.md).

‎docs/big-data-cluster/deploy-big-data-tools.md‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@ When you connect to a big data cluster, you have the option to connect to the SQ
2929

3030
## <a id="master"></a> Master instance
3131

32+
1. From the command-line, find the IP of your master instance with the following command:
33+
34+
```
35+
kubectl get svc endpoint-master-pool -n <your-cluster-name>
36+
```
37+
3238
1. In Azure Data Studio, press **F1** > **New Connection**.
3339

3440
1. In **Connection type**, select **Microsoft SQL Server**.
@@ -45,11 +51,25 @@ When you connect to a big data cluster, you have the option to connect to the SQ
4551

4652
## <a id="hdfs"></a> HDFS/Spark gateway
4753

54+
1. From the command-line, find the IP address of your HDFS/Spark gateway with one of the following commands.
55+
56+
**AKS deployments:**
57+
58+
```
59+
kubectl get svc service-security-lb -n <your-cluster-name>
60+
```
61+
62+
**Non-AKS deployments**:
63+
64+
```
65+
kubectl get svc service-security-nodeport -n <your-cluster-name>
66+
```
67+
4868
1. In Azure Data Studio, press **F1** > **New Connection**.
4969

5070
1. In **Connection type**, select **SQL Server big data cluster**.
5171

52-
1. Type the IP address of the big data cluster in **Server name**.
72+
1. Type the IP address of the big data cluster in **Server name** (do not specify a port).
5373

5474
1. Enter `root` for the **User** and specify the **Password** to your big data cluster.
5575

‎docs/big-data-cluster/deployment-guidance.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.topic: conceptual
99
ms.prod: sql
1010
---
1111

12-
# How to deploy SQL Server big data cluster on Kubernetes
12+
# How to deploy SQL Server big data clusters on Kubernetes
1313

1414
SQL Server big data cluster can be deployed as docker containers on a Kubernetes cluster. This is an overview of the setup and configuration steps:
1515

‎docs/big-data-cluster/quickstart-big-data-cluster-deploy.md‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,14 @@ ms.prod: sql
1010
---
1111
# Quickstart: Deploy SQL Server big data cluster on Azure Kubernetes Service (AKS)
1212

13-
Install SQL Server big data cluster on AKS in a default configuration suitable for dev/test environments. In addition to a SQL Master instance, the cluster includes one compute pool instance, one data pool instance, and two storage pool instances. Data is persisted using Kubernetes persistent volumes that use AKS default storage classes. To further customize your configuration, see the environment variables at [deployment guidance](deployment-guidance.md).
13+
In this quickstart, you will deploy a SQL Server 2019 big data cluster (preview) on AKS in a default configuration suitable for dev/test environments.
14+
15+
> [!NOTE]
16+
> AKS is just one location to host Kubernetes. Big data clusters can be deployed to Kubernetes regardless of the underlying infrastructure. For more information, see [How to deploy SQL Server big data clusters on Kubernetes](deployment-guidance.md).
17+
18+
In addition to a SQL Master instance, the cluster includes one compute pool instance, one data pool instance, and two storage pool instances. Data is persisted using Kubernetes persistent volumes that use AKS default storage classes. To further customize your configuration, see the environment variables in the [deployment guidance](deployment-guidance.md).
19+
20+
If you would prefer to run a script to create your AKS cluster and install a big data cluster at the same time, see [Deploy a SQL Server big data cluster on Azure Kubernetes Service (AKS)](https://github.com/Microsoft/sql-server-samples/tree/master/samples/features/sql-big-data-cluster/deployment/aks).
1421

1522
[!INCLUDE [Limited public preview note](../includes/big-data-cluster-preview-note.md)]
1623

@@ -156,10 +163,6 @@ kubectl get svc service-security-lb -n <your-cluster-name>
156163

157164
Look for the **External-IP** value that is assigned to the services. Connect to the SQL Server master instance using the IP address for the `service-master-pool-lb` at port 31433 (Ex: **\<ip-address\>,31433**) and to the SQL Server big data cluster endpoint using the external-IP for the `service-security-lb` service. That big data cluster end point is where you can interact with HDFS and submit Spark jobs through Knox.
158165

159-
## Sample deployment script
160-
161-
For a sample python script that deploys both AKS and SQL Server big data cluster, see [Deploy a SQL Server big data cluster on Azure Kubernetes Service (AKS)](https://github.com/Microsoft/sql-server-samples/tree/master/samples/features/sql-big-data-cluster/deployment/aks).
162-
163166
## Next steps
164167

165168
Now that the SQL Server big data cluster is deployed, try out some of the new capabilities:

‎docs/big-data-cluster/toc.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
href: concept-data-persistence.md
3737
- name: Security
3838
href: concept-security.md
39-
- name: How-to-guides
39+
- name: How-to guides
4040
items:
4141
- name: Install
4242
items:

‎docs/linux/sql-server-linux-encrypted-connections.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ TLS is used to encrypt connections from a client application to [!INCLUDE[ssNoVe
5050

5151
systemctl stop mssql-server
5252
cat /var/opt/mssql/mssql.conf
53-
sudo /opt/mssql/bin/mssql-conf set network.tlscert /etc/ssl/certs/mssqlfqdn.pem
54-
sudo /opt/mssql/bin/mssql-conf set network.tlskey /etc/ssl/private/mssqlfqdn.key
53+
sudo /opt/mssql/bin/mssql-conf set network.tlscert /etc/ssl/certs/mssql.pem
54+
sudo /opt/mssql/bin/mssql-conf set network.tlskey /etc/ssl/private/mssql.key
5555
sudo /opt/mssql/bin/mssql-conf set network.tlsprotocols 1.2
5656
sudo /opt/mssql/bin/mssql-conf set network.forceencryption 0
5757

@@ -100,8 +100,8 @@ TLS is used to encrypt connections from a client application to [!INCLUDE[ssNoVe
100100

101101
systemctl stop mssql-server
102102
cat /var/opt/mssql/mssql.conf
103-
sudo /opt/mssql/bin/mssql-conf set network.tlscert /etc/ssl/certs/mssqlfqdn.pem
104-
sudo /opt/mssql/bin/mssql-conf set network.tlskey /etc/ssl/private/mssqlfqdn.key
103+
sudo /opt/mssql/bin/mssql-conf set network.tlscert /etc/ssl/certs/mssql.pem
104+
sudo /opt/mssql/bin/mssql-conf set network.tlskey /etc/ssl/private/mssql.key
105105
sudo /opt/mssql/bin/mssql-conf set network.tlsprotocols 1.2
106106
sudo /opt/mssql/bin/mssql-conf set network.forceencryption 1
107107

0 commit comments

Comments
 (0)