ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

implement review feedback (#11470)

Browse Source
This commit is contained in:
Alan Ren
2020-07-22 17:54:43 -07:00
committed by GitHub
parent 9b4931bb0e
commit 154b75a0de
5 changed files with 19 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
extensions/asde-deployment/notebooks/edge/deploy-sql-edge-azure.ipynb
View File

@@ -26,8 +26,8 @@
"![Microsoft](https://raw.githubusercontent.com/microsoft/azuredatastudio/main/extensions/resource-deployment/images/microsoft-small-logo.png)\n",
"## Deploy Azure SQL Edge to an Azure VM via IoT hub\n",
"This notebook will walk you through the end to end setup of Azure SQL Edge.\n",
"1. Create an Azure Edge VM as a virtual IoT device\n",
"1. Create an Azure IoT hub\n",
"1. Create an Azure Edge VM as a virtual IoT device, you can go the \"Default Settings\" cell and adjust the vm_size variable based on your needs. Available sizes and pricing information can be found [here](https://docs.microsoft.com/azure/virtual-machines/linux/sizes).\n",
"1. Create an Azure IoT hub, you can go to the \"Default Settings\" cell and adjust value of the following variables based on your needs: iot_hub_sku and iot_hub_units. Available SKUs and pricing information can be found [here](https://azure.microsoft.com/pricing/details/iot-hub/).\n",
"1. Add the device to the IoT hub\n",
"1. Deploy SQL Edge module to the device with optional dacpac\n",
"1. Enable connecting to the SQL Edge instance on the device\n",
@@ -126,7 +126,6 @@
"sa_password = os.environ[\"AZDATA_NB_VAR_SA_PASSWORD\"]\n",
"vm_admin = os.environ[\"AZDATA_NB_VAR_ASDE_VM_ADMIN\"]\n",
"vm_password = os.environ[\"AZDATA_NB_VAR_ASDE_VM_PASSWORD\"]\n",
"iot_device_id = os.environ[\"AZDATA_NB_VAR_ASDE_DEVICE_ID\"]\n",
"dacpac_path = os.environ[\"AZDATA_NB_VAR_ASDE_DACPAC_PATH\"]\n",
"sql_port = os.environ[\"AZDATA_NB_VAR_ASDE_SQL_PORT\"]\n",
"new_rg_flag = os.environ[\"AZDATA_NB_VAR_ASDE_NEW_RESOURCEGROUP\"]\n",
@@ -137,7 +136,6 @@
"print(f'Subscription: {azure_subscription_id}')\n",
"print(f'Resource group: {azure_resource_group}')\n",
"print(f'Location: {azure_location}')\n",
"print(f'VM name: {iot_device_id}')\n",
"print(f'VM admin username: {vm_admin}')\n",
"print(f'VM admin password: ******')\n",
"print(f'SQL Server port: {sql_port}')\n",
@@ -165,18 +163,19 @@
{
"cell_type": "code",
"source": [
"suffix = time.strftime(\"%Y%m%d%H%M%S\", time.localtime())\n",
"suffix = time.strftime(\"%y%m%d%H%M%S\", time.localtime())\n",
"network_security_group = f'nsg{suffix}'\n",
"public_ip_address_name = f'ip{suffix}'\n",
"iot_hub_name = f'hub{suffix}'\n",
"iot_hub_sku = 'S1'\n",
"iot_hub_units = 4\n",
"iot_device_id = f'vm{suffix}'\n",
"vm_size = 'Standard_DS3_v2'\n",
"vnet_name = f'net{suffix}'\n",
"subnet_name = f'subnet{suffix}'\n",
"subnet_address_prefix = '10.0.0.0/24'\n",
"vnet_address_prefix = '10.0.0.0/16'\n",
"azure_storage_account = azure_resource_group.lower()\n",
"azure_storage_account = f'sa{suffix}'\n",
"storage_account_container = 'sqldatabasedacpac'\n",
"sql_lcid = '1033'\n",
"sql_collation = 'SQL_Latin1_General_CP1_CI_AS'"
@@ -495,8 +494,8 @@
{
"cell_type": "markdown",
"source": [
"### **Connect to SQL Server instance in Azure Data Studio**\n",
"Click the link below to connect to the SQL Server, it might take a couple minutes for the service to start."
"### **Connect to Azure SQL Edge instance in Azure Data Studio**\n",
"Click the link below to connect to the Azure SQL Edge instance, it might take a couple minutes for the service to start."
],
"metadata": {
"azdata_cell_guid": "3bdfa537-a749-45c4-b219-57d296c22739"
@@ -507,8 +506,8 @@
"source": [
"from IPython.display import *\n",
"connectionParameter = '{\"serverName\":\"' + f'{ip_address},{sql_port}' + '\",\"providerName\":\"MSSQL\",\"authenticationType\":\"SqlLogin\",\"userName\": \"sa\",\"password\":' + json.dumps(sa_password) + '}'\n",
"display(HTML('<br/><a href=\"command:azdata.connect?' + html.escape(connectionParameter)+'\"><font size=\"3\">Click here to connect to SQL Server</font></a><br/>'))\n",
"display(HTML('<br/><span style=\"color:red\"><font size=\"2\">NOTE: The SQL Server password is included in this link, you may want to clear the results of this code cell before saving the notebook.</font></span>'))"
"display(HTML('<br/><a href=\"command:azdata.connect?' + html.escape(connectionParameter)+'\"><font size=\"3\">Click here to connect to the Azure SQL Edge instance</font></a><br/>'))\n",
"display(HTML('<br/><span style=\"color:red\"><font size=\"2\">NOTE: The Azure SQL Edge instance password is included in this link, you may want to clear the results of this code cell before saving the notebook.</font></span>'))"
],
"metadata": {
"azdata_cell_guid": "8bc29cce-96a7-4a78-89af-5c73a6431c24",

8
extensions/asde-deployment/notebooks/edge/deploy-sql-edge-local.ipynb
View File

@@ -233,8 +233,8 @@
{
"cell_type": "markdown",
"source": [
"### Connect to SQL Server in Azure Data Studio\n",
"It might take a couple minutes for SQL Server to launch"
"### Connect to Azure SQL Edge instance in Azure Data Studio\n",
"It might take a couple minutes for the service to launch"
],
"metadata": {
"azdata_cell_guid": "c84bc075-f8b2-48a3-bfc7-f07a5b8be7a0"
@@ -245,8 +245,8 @@
"source": [
"from IPython.display import *\n",
"connectionParameter = '{\"serverName\":\"localhost,' + sql_port + '\",\"providerName\":\"MSSQL\",\"authenticationType\":\"SqlLogin\",\"userName\":\"sa\",\"password\":' + json.dumps(sql_password) + '}'\n",
"display(HTML('<br/><a href=\"command:azdata.connect?' + html.escape(connectionParameter)+'\"><font size=\"3\">Click here to connect to SQL Server</font></a><br/>'))\n",
"display(HTML('<br/><span style=\"color:red\"><font size=\"2\">NOTE: The SQL Server password is included in this link, you may want to clear the results of this code cell before saving the notebook.</font></span>'))"
"display(HTML('<br/><a href=\"command:azdata.connect?' + html.escape(connectionParameter)+'\"><font size=\"3\">Click here to connect to the Azure SQL Edge instance</font></a><br/>'))\n",
"display(HTML('<br/><span style=\"color:red\"><font size=\"2\">NOTE: The Azure SQL Edge instance password is included in this link, you may want to clear the results of this code cell before saving the notebook.</font></span>'))"
],
"metadata": {
"azdata_cell_guid": "187a0067-a04c-4afb-a684-3103bb4522ae",

8
extensions/asde-deployment/notebooks/edge/deploy-sql-edge-remote.ipynb
View File

@@ -300,8 +300,8 @@
{
"cell_type": "markdown",
"source": [
"### Connect to SQL Server in Azure Data Studio\n",
"It might take a couple minutes for SQL Server to launch"
"### Connect to Azure SQL Edge instance in Azure Data Studio\n",
"It might take a couple minutes for the service to launch"
],
"metadata": {
"azdata_cell_guid": "c84bc075-f8b2-48a3-bfc7-f07a5b8be7a0"
@@ -312,8 +312,8 @@
"source": [
"from IPython.display import *\n",
"connectionParameter = '{\"serverName\":\"' + ssh_target + ',' + sql_port + '\",\"providerName\":\"MSSQL\",\"authenticationType\":\"SqlLogin\",\"userName\":\"sa\",\"password\":' + json.dumps(sql_password) + '}'\n",
"display(HTML('<br/><a href=\"command:azdata.connect?' + html.escape(connectionParameter)+'\"><font size=\"3\">Click here to connect to SQL Server</font></a><br/>'))\n",
"display(HTML('<br/><span style=\"color:red\"><font size=\"2\">NOTE: The SQL Server password is included in this link, you may want to clear the results of this code cell before saving the notebook.</font></span>'))"
"display(HTML('<br/><a href=\"command:azdata.connect?' + html.escape(connectionParameter)+'\"><font size=\"3\">Click here to connect to the Azure SQL Edge instance</font></a><br/>'))\n",
"display(HTML('<br/><span style=\"color:red\"><font size=\"2\">NOTE: The Azure SQL Edge instance password is included in this link, you may want to clear the results of this code cell before saving the notebook.</font></span>'))"
],
"metadata": {
"azdata_cell_guid": "187a0067-a04c-4afb-a684-3103bb4522ae",

6
extensions/asde-deployment/package.json
View File

@@ -318,12 +318,6 @@
"westus2"
]
},
{
"label": "%iot_device_id%",
"variableName": "AZDATA_NB_VAR_ASDE_DEVICE_ID",
"type": "text",
"required": true
},
{
"label": "%vm_admin%",
"variableName": "AZDATA_NB_VAR_ASDE_VM_ADMIN",

5
extensions/asde-deployment/package.nls.json
View File

@@ -2,9 +2,9 @@
"extension-displayName": "Azure SQL Edge Deployment Extension",
"extension-description": "Provides a notebook-based experience to deploy Azure SQL Edge",
"docker-container-name-field": "Container name",
"docker-sql-password-field": "SQL Server (sa) password",
"docker-sql-password-field": "Azure SQL Edge instance (sa) password",
"docker-confirm-sql-password-field": "Confirm password",
"docker-sql-port-field": "SQL Server Port",
"docker-sql-port-field": "Azure SQL Edge Port",
"microsoft-privacy-statement": "Microsoft Privacy Statement",
"resource-type-sql-edge-display-name": "Azure SQL Edge",
"resource-type-sql-edge-description": "Azure SQL Edge (Preview) is an optimized relational database engine geared for IoT and IoT Edge deployments.",
@@ -33,7 +33,6 @@
"vm_admin": "VM admin username",
"vm_password": "VM admin password",
"vm_password_confirm": "Confirm VM admin password",
"iot_device_id": "VM name",
"dacpac_path": "Dacpac zip file",
"azure-info-section-title": "Azure information",
"sqlserver-info-section-title": "SQL Server information",