diff --git a/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-azure.ipynb b/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-azure.ipynb index 7c1ec2ee80..0247b0d4f5 100644 --- a/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-azure.ipynb +++ b/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-azure.ipynb @@ -24,8 +24,13 @@ "cell_type": "markdown", "source": [ "![Microsoft](https://raw.githubusercontent.com/microsoft/azuredatastudio/main/extensions/resource-deployment/images/microsoft-small-logo.png)\n", - "## Run Azure SQL Database Edge image on a device\n", - "This notebook deploy the Azure SQL Database Edge module on a device and connect to it in Azure Data Studio\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. 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", "\n", "### Dependencies\n", "- Azure CLI. For more information, see [Azure CLI Installation](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest).\n", @@ -160,14 +165,15 @@ { "cell_type": "code", "source": [ - "network_security_group = 'asde_nsg'\n", - "public_ip_address_name = 'asde_public_ip'\n", - "iot_hub_name = 'asdeiothub'\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", "vm_size = 'Standard_DS3_v2'\n", - "vnet_name = 'asde_network'\n", - "subnet_name = 'asde_subnet'\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", @@ -459,7 +465,7 @@ { "cell_type": "markdown", "source": [ - "### Deploy Azure SQL Database Edge to the device" + "### Deploy Azure SQL Edge to the device" ], "metadata": { "azdata_cell_guid": "ec46957f-0795-4c75-804d-f8a7ecb26382" diff --git a/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-local.ipynb b/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-local.ipynb index 4d4107dc80..a3acb5714e 100644 --- a/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-local.ipynb +++ b/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-local.ipynb @@ -24,7 +24,7 @@ "cell_type": "markdown", "source": [ "![Microsoft](https://raw.githubusercontent.com/microsoft/azuredatastudio/main/extensions/resource-deployment/images/microsoft-small-logo.png)\n", - "## Run Azure SQL Edge image locally with Docker\n", + "## Deploy Azure SQL Edge container instance locally with Docker\n", "This notebook will use Docker to pull and run the Azure SQL Edge image and connect to it in Azure Data Studio\n", "\n", "### Dependencies\n", @@ -285,4 +285,4 @@ "execution_count": null } ] -} +} \ No newline at end of file diff --git a/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-remote.ipynb b/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-remote.ipynb index 5d206729c1..dcc51fc265 100644 --- a/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-remote.ipynb +++ b/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-remote.ipynb @@ -24,7 +24,7 @@ "cell_type": "markdown", "source": [ "![Microsoft](https://raw.githubusercontent.com/microsoft/azuredatastudio/main/extensions/resource-deployment/images/microsoft-small-logo.png)\n", - "## Run Azure SQL DB Edge image on a remote machine with Docker\n", + "## Deploy Azure SQL Edge container instance on a remote machine with Docker\n", "This notebook will use SSH to connect to the remote machine, use Docker to pull and run the Azure SQL Edge image and connect to it in Azure Data Studio\n", "\n", "\n", @@ -358,10 +358,12 @@ ], "metadata": { "azdata_cell_guid": "9f2c9d3a-b996-4977-81f5-05a79a2e0e12", - "tags": [] + "tags": [ + "hide_input" + ] }, "outputs": [], "execution_count": null } ] -} +} \ No newline at end of file diff --git a/extensions/asde-deployment/package.json b/extensions/asde-deployment/package.json index e504b10659..2e418d9dc3 100644 --- a/extensions/asde-deployment/package.json +++ b/extensions/asde-deployment/package.json @@ -396,7 +396,7 @@ }, { "text": "%edge-eula%", - "url": "https://go.microsoft.com/fwlink/?LinkId=746388" + "url": "https://go.microsoft.com/fwlink/?linkid=2128283" } ] } diff --git a/extensions/asde-deployment/package.nls.json b/extensions/asde-deployment/package.nls.json index 3638a6b4bf..da98ca677e 100644 --- a/extensions/asde-deployment/package.nls.json +++ b/extensions/asde-deployment/package.nls.json @@ -1,17 +1,17 @@ { - "extension-displayName": "Azure SQL DB Edge Deployment Extension", - "extension-description": "Provides a notebook-based experience to deploy Azure SQL DB Edge", + "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 password", + "docker-sql-password-field": "SQL Server (sa) password", "docker-confirm-sql-password-field": "Confirm password", "docker-sql-port-field": "SQL Server Port", "microsoft-privacy-statement": "Microsoft Privacy Statement", - "resource-type-sql-edge-display-name": "Azure SQL DB Edge", - "resource-type-sql-edge-description": "Deploy Azure SQL DB Edge (Preview)", + "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.", "sql-edge-type-display-name": "Deployment target", - "sql-edge-local-display-name": "Local", - "sql-edge-remote-display-name": "Remote", - "sql-edge-local-title": "Deploy Azure SQL DB Edge locally", + "sql-edge-local-display-name": "Local container instance", + "sql-edge-remote-display-name": "Remote container instance", + "sql-edge-local-title": "Deploy Azure SQL Edge container instance on local machine", "docker-settings-section-title": "Docker settings", "docker-registry-field": "Registry", "docker-repository-field": "Repository", @@ -19,21 +19,21 @@ "docker-username-field": "Username", "docker-password-field": "Password", "edge-agreement": "I accept {0} and {1}.", - "edge-eula": "Microsoft SQL Server License Agreement", - "sql-edge-remote-title": "Deploy Azure SQL DB Edge on a remote machine", + "edge-eula": "Microsoft Azure SQL Edge License Agreement", + "sql-edge-remote-title": "Deploy Azure SQL Edge container instance on remote machine", "remote-info-section-title": "Target machine information", "edge-remote-target-field": "Name or IP address", "edge-remote-username-field": "Username", "edge-remote-password-field": "Password", - "sql-edge-azure-display-name": "An Azure VM via Azure IoT Hub", - "sql-edge-azure-title": "Deploy Azure SQL DB Edge to an Azure VM via IoT hub", + "sql-edge-azure-display-name": "Azure VM via Azure IoT Hub", + "sql-edge-azure-title": "Deploy Azure SQL Edge to an Azure VM via IoT hub", "azure_subscription_id": "Subscription id", "azure_resource_group": "Resource group", "azure_location": "Location", "vm_admin": "VM admin username", "vm_password": "VM admin password", "vm_password_confirm": "Confirm VM admin password", - "iot_device_id": "VM name (device id)", + "iot_device_id": "VM name", "dacpac_path": "Dacpac zip file", "azure-info-section-title": "Azure information", "sqlserver-info-section-title": "SQL Server information",