Merge branch 'master' of https://github.com/Microsoft/sql-server-samples

uc-msft · uc-msft · commit 8027d387006a · 2019-07-23T18:14:16.000-07:00
diff --git a/samples/features/sql-big-data-cluster/deployment/aks/README.md b/samples/features/sql-big-data-cluster/deployment/aks/README.md
@@ -16,9 +16,9 @@ Using this sample Python script, you will deploy a Kubernetes cluster in Azure u
         python -m pip install requests
         python -m pip install requests --upgrade
         ```
-    - Install mssqlctl CLI latest version using . Run the command below using elevated priviledges (sudo or admin cmd window):
+    - Install latest version of the cluster management tool **azdata** (previously named mssqlctl) using below command. Run the command below using elevated priviledges (sudo or admin cmd window):
         ```
-        pip3 install -r  https://private-repo.microsoft.com/python/ctp3.1/mssqlctl/requirements.txt
+        pip3 install -r https://aka.ms/azdata
         ```
 1. Login into your Azure account. Run this command:
 ```
diff --git a/samples/features/sql-big-data-cluster/deployment/aks/deploy-sql-big-data-aks.py b/samples/features/sql-big-data-cluster/deployment/aks/deploy-sql-big-data-aks.py
@@ -1,7 +1,7 @@
 #
 # Prerequisites: 
 # 
-# Azure CLI (https://docs.microsoft.com/en-us/cli/azure/install-azure-cli), python3 (https://www.python.org/downloads), mssqlctl CLI (pip3 install -r https://private-repo.microsoft.com/python/ctp3.1/mssqlctl/requirements.txt)
+# Azure CLI (https://docs.microsoft.com/en-us/cli/azure/install-azure-cli), python3 (https://www.python.org/downloads), azdata CLI (pip3 install -r https://aka.ms/azdata)
 #
 # Run `az login` at least once BEFORE running this script
 #
@@ -38,21 +38,24 @@ def executeCmd (cmd):
 CLUSTER_NAME=input("Provide name of AKS cluster and SQL big data cluster - Press ENTER for using  `sqlbigdata`:").strip() or "sqlbigdata"
 
 #This password will be use for Controller user, Knox user and SQL Server Master SA accounts
+# 
 CONTROLLER_USERNAME=input("Provide username to be used for Controller user - Press ENTER for using  `admin`:").strip() or "admin"
 PASSWORD = getpass.getpass("Provide password to be used for Controller user, Knox user and SQL Server Master SA accounts - Press ENTER for using  `MySQLBigData2019`").strip() or "MySQLBigData2019"
 
-#docker registry details
-DOCKER_REGISTRY="private-repo.microsoft.com"
-DOCKER_REPOSITORY="mssql-private-preview"
-DOCKER_IMAGE_TAG="ctp3.1"
+# Docker registry details
+# Use this only if you are using a private registry different than mcr. If so, make sure you are also setting the environment variables for DOCKER_USERNAME and DOCKER_PASSWORD
+# DOCKER_REGISTRY="<your private registry>"
+# DOCKER_REPOSITORY="<your private repository>"
+# DOCKER_IMAGE_TAG="<your Docker image tag>"
 
 print ('Setting environment variables')
 os.environ['MSSQL_SA_PASSWORD'] = PASSWORD
 os.environ['CONTROLLER_USERNAME'] = CONTROLLER_USERNAME
 os.environ['CONTROLLER_PASSWORD'] = PASSWORD
 os.environ['KNOX_PASSWORD'] = PASSWORD
-os.environ['DOCKER_USERNAME']=DOCKER_USERNAME
-os.environ['DOCKER_PASSWORD']=DOCKER_PASSWORD
+# Use this only if you are using a private registry different than mcr. If so, you must set the environment variables for DOCKER_USERNAME and DOCKER_PASSWORD
+# os.environ['DOCKER_USERNAME']=DOCKER_USERNAME
+# os.environ['DOCKER_PASSWORD']=DOCKER_PASSWORD
 os.environ['ACCEPT_EULA']="Yes"
 
 print ("Set azure context to subcription: "+SUBSCRIPTION_ID)
@@ -71,29 +74,30 @@ def executeCmd (cmd):
 executeCmd (command)
 
 print("Creating SQL Big Data cluster:" +CLUSTER_NAME)
-command="mssqlctl bdc config init --source aks-dev-test --target custom --force"
+command="azdata bdc config init --source aks-dev-test --target custom --force"
 executeCmd (command)
 
-command="mssqlctl bdc config section set -c custom -j ""metadata.name=" + CLUSTER_NAME + ""
+command="azdata bdc config section set -c custom -j ""metadata.name=" + CLUSTER_NAME + ""
 executeCmd (command)
 
-command="mssqlctl bdc config section set -c custom -j ""$.spec.controlPlane.spec.docker.registry=" + DOCKER_REGISTRY + ""
-executeCmd (command)
+# Use this only if you are using a private registry different than default Micrososft registry (mcr). 
+# command="azdata bdc config section set -c custom -j ""$.spec.controlPlane.spec.docker.registry=" + DOCKER_REGISTRY + ""
+# executeCmd (command)
 
-command="mssqlctl bdc config section set -c custom -j ""$.spec.controlPlane.spec.docker.repository=" + DOCKER_REPOSITORY + ""
-executeCmd (command)
+# command="azdata bdc config section set -c custom -j ""$.spec.controlPlane.spec.docker.repository=" + DOCKER_REPOSITORY + ""
+# executeCmd (command)
 
-command="mssqlctl bdc config section set -c custom -j ""$.spec.controlPlane.spec.docker.imageTag=" + DOCKER_IMAGE_TAG + ""
-executeCmd (command)
+# command="azdata bdc config section set -c custom -j ""$.spec.controlPlane.spec.docker.imageTag=" + DOCKER_IMAGE_TAG + ""
+# executeCmd (command)
 
-command="mssqlctl bdc create -c custom --accept-eula yes"
+command="azdata bdc create -c custom --accept-eula yes"
 executeCmd (command)
 
-command="mssqlctl login --cluster-name " + CLUSTER_NAME
+command="azdata login --cluster-name " + CLUSTER_NAME
 executeCmd (command)
 
 print("")
 print("SQL Server big data cluster endpoints: ")
-command="mssqlctl bdc endpoint list -o table"
+command="azdata bdc endpoint list -o table"
 executeCmd(command)
 
diff --git a/samples/features/sql-big-data-cluster/deployment/offline/Readme.md b/samples/features/sql-big-data-cluster/deployment/offline/Readme.md
@@ -24,7 +24,7 @@ python push-bdc-images-to-custom-private-repo.py
 >```
 
 When prompted, provide your input for:
-- Docker registry, repository and credentials to access Microsoft private registry where the images will be pulled from (source)
+- Docker registry, repository to access Microsoft registry where the images will be pulled from (source). Press enter to use default mcr registry.
 - Docker registry, repository and credentials to access your private registry where the images will be pushed to (target)
 
 ## Deploy with from your private repository
diff --git a/samples/features/sql-big-data-cluster/deployment/offline/push-bdc-images-to-custom-private-repo.py b/samples/features/sql-big-data-cluster/deployment/offline/push-bdc-images-to-custom-private-repo.py
@@ -13,10 +13,11 @@ def execute_cmd (cmd):
     if (stderr is not None):
         raise Exception(stderr)
 
-SOURCE_DOCKER_REGISTRY = input("Provide Docker registry source - press ENTER for using `private-repo.microsoft.com`:") or "private-repo.microsoft.com"
-SOURCE_DOCKER_REPOSITORY = input("Provide Docker repository source - press ENTER for using `mssql-private-preview`:") or "mssql-private-preview"
-SOURCE_DOCKER_USERNAME = input("Provide Docker username for the source registry:")
-SOURCE_DOCKER_PASSWORD=getpass.getpass("Provide Docker password for the source registry:")
+SOURCE_DOCKER_REGISTRY = input("Provide Docker registry source - press ENTER for using `mcr.microsoft.com`:") or "mcr.microsoft.com"
+SOURCE_DOCKER_REPOSITORY = input("Provide Docker repository source - press ENTER for using `mssql/bdc`:") or "mssql/bdc"
+# Use this only if your source is a private Docker registry
+# SOURCE_DOCKER_USERNAME = input("Provide Docker username for the source registry:")
+# SOURCE_DOCKER_PASSWORD=getpass.getpass("Provide Docker password for the source registry:")
 SOURCE_DOCKER_TAG = input("Provide Docker tag for the images at the source: ") or "latest"
 
 TARGET_DOCKER_REGISTRY = input("Provide Docker registry target:")
@@ -43,12 +44,14 @@ def execute_cmd (cmd):
             'mssql-service-proxy',
 	    'mssql-app-service-proxy',
 	    'mssql-ssis-app-runtime',
-            'mssql-monitor-telegraf']
+            'mssql-monitor-telegraf',
+	    'mssql-security-support']
 
-print("Execute docker login to source registry: " + SOURCE_DOCKER_REGISTRY)
-cmd = "docker login " + SOURCE_DOCKER_REGISTRY + " -u " + SOURCE_DOCKER_USERNAME + " -p " + SOURCE_DOCKER_PASSWORD
-execute_cmd(cmd)
-print("")
+# Use this only if your source is a private Docker registry
+# print("Execute docker login to source registry: " + SOURCE_DOCKER_REGISTRY)
+# cmd = "docker login " + SOURCE_DOCKER_REGISTRY + " -u " + SOURCE_DOCKER_USERNAME + " -p " + SOURCE_DOCKER_PASSWORD
+# execute_cmd(cmd)
+# print("")
 
 
 print("Pulling images from source repository: " + SOURCE_DOCKER_REGISTRY + "/" + SOURCE_DOCKER_REPOSITORY)
diff --git a/samples/manage/azure-sql-db-managed-instance/delegate-subnet/README.md b/samples/manage/azure-sql-db-managed-instance/delegate-subnet/README.md
@@ -0,0 +1,86 @@
+# Delegate subnet for Managed Instance deployment
+
+Script that validates and prepares virtual network and subnet for Managed Instance creation to comply with [networking requirements](https://docs.microsoft.com/azure/sql-database/sql-database-managed-instance-vnet-configuration#requirements).
+
+### Contents
+
+[About this sample](#about-this-sample)<br/>
+[Before you begin](#before-you-begin)<br/>
+[Run this sample](#run-this-sample)<br/>
+[Sample details](#sample-details)<br/>
+[Disclaimers](#disclaimers)<br/>
+[Related links](#related-links)<br/>
+
+
+<a name=about-this-sample></a>
+
+## About this sample
+
+- **Applies to:** Azure SQL Database
+- **Key features:**  Managed Instance
+- **Workload:** n/a
+- **Programming Language:** PowerShell
+- **Authors:** Srdan Bozovic
+- **Update history:** n/a
+
+<a name=before-you-begin></a>
+
+## Before you begin
+
+To run this sample, you need the following prerequisites.
+
+**Software prerequisites:**
+
+1. PowerShell 5.1 or PowerShell Core 6.0
+2. Azure PowerShell Az module
+
+**Azure prerequisites:**
+
+1. Permission to manage Azure virtual network
+
+<a name=run-this-sample></a>
+
+## Run this sample
+
+Run the script below from either Windows or Azure Cloud Shell
+
+```powershell
+
+$scriptUrlBase = 'https://raw.githubusercontent.com/Microsoft/sql-server-samples/master/samples/manage/azure-sql-db-managed-instance/delegate-subnet'
+
+$parameters = @{
+    subscriptionId = '<subscriptionId>'
+    resourceGroupName = '<resourceGroupName>'
+    virtualNetworkName = '<virtualNetworkName>'
+    subnetName = '<subnetName>'
+    }
+
+Invoke-Command -ScriptBlock ([Scriptblock]::Create((iwr ($scriptUrlBase+'/delegateSubnet.ps1?t='+ [DateTime]::Now.Ticks)).Content)) -ArgumentList $parameters
+
+```
+
+<a name=sample-details></a>
+
+## Sample details
+
+This sample shows how to prepare Azure virtual network and subnet for Managed Instance deployment using PowerShell
+
+This is done in three simple steps:
+- Validate - Selected virtual netwok and subnet are validated for Managed Instance networking requirements
+- Confirm - User is shown a set of changes that need to be made to prepare subnet for Managed Instance deployment and asked for consent
+- Prepare - Virtual network and subnet are configured properly
+
+<a name=disclaimers></a>
+
+## Disclaimers
+The scripts and this guide are copyright Microsoft Corporations and are provided as samples. They are not part of any Azure service and are not covered by any SLA or other Azure-related agreements. They are provided as-is with no warranties express or implied. Microsoft takes no responsibility for the use of the scripts or the accuracy of this document. Familiarize yourself with the scripts before using them.
+
+<a name=related-links></a>
+
+## Related Links
+<!-- Links to more articles. Remember to delete "en-us" from the link path. -->
+
+For more information, see these articles:
+
+- [What is a Managed Instance?](https://docs.microsoft.com/azure/sql-database/sql-database-managed-instance)
+- [Configure a VNet for Azure SQL Database Managed Instance](https://docs.microsoft.com/azure/sql-database/sql-database-managed-instance-vnet-configuration)
diff --git a/samples/manage/azure-sql-db-managed-instance/delegate-subnet/delegateSubnet.ps1 b/samples/manage/azure-sql-db-managed-instance/delegate-subnet/delegateSubnet.ps1
