Ignite Updates

- Azure Synapse Analytics - Azure Data Lake Gen2 Multi-Protocol - Azure Bastion - Lab3 Spark Table - New Lab5
moqmarty · Nov 25, 2019 · 0ea0037 · 0ea0037
1 parent 4629c30
commit 0ea0037
Show file tree

Hide file tree

Showing 173 changed files with 694 additions and 639 deletions.
diff --git a/Deploy/Deploy.md b/Deploy/Deploy.md
@@ -8,24 +8,25 @@ The following Azure services will be deployed in your subscription:
 
 Name                        | Type | Pricing Tier | Pricing Info |
 ----------------------------|------|--------------|--------------|
-mdwcosmosdb-*suffix*        | Azure Cosmos DB account | 400 RU/sec | https://azure.microsoft.com/en-us/pricing/details/cosmos-db/
-MDWDatabricks-*suffix*      | Azure Databricks Service | Standard | https://azure.microsoft.com/en-us/pricing/details/databricks/
-MDWComputerVision	        | Cognitive Services | S1 | https://azure.microsoft.com/en-us/pricing/details/cognitive-services/computer-vision/
-MDWTextAnalytics	        | Cognitive Services | Standard | https://azure.microsoft.com/en-us/pricing/details/cognitive-services/text-analytics/
-MDWDataFactory-*suffix*	    | Data factory (V2) | Data pipelines | https://azure.microsoft.com/en-us/pricing/details/data-factory/
-MDWEventHubs-*suffix*       | Event Hubs Namespace | Standard | https://azure.microsoft.com/en-us/pricing/details/event-hubs/
-MDWKeyVault-*suffix*        | Key vault | Standard | https://azure.microsoft.com/en-us/pricing/details/key-vault/
-MDWLogicApp	                | Logic app | | https://azure.microsoft.com/en-au/pricing/details/logic-apps/
-MDWASQLDW                   | SQL data warehouse | DW200c | https://azure.microsoft.com/en-us/pricing/details/sql-data-warehouse/gen2/
+adpcosmosdb-*suffix*        | Azure Cosmos DB account | 400 RU/sec | https://azure.microsoft.com/en-us/pricing/details/cosmos-db/
+ADPDatabricks-*suffix*      | Azure Databricks Service | Standard | https://azure.microsoft.com/en-us/pricing/details/databricks/
+ADPComputerVision	        | Cognitive Services | S1 | https://azure.microsoft.com/en-us/pricing/details/cognitive-services/computer-vision/
+SynapseDataFactory-*suffix*	    | Data factory (V2) | Data pipelines | https://azure.microsoft.com/en-us/pricing/details/data-factory/
+ADPEventHubs-*suffix*       | Event Hubs Namespace | Standard | https://azure.microsoft.com/en-us/pricing/details/event-hubs/
+ADPLogicApp	                | Logic app | | https://azure.microsoft.com/en-au/pricing/details/logic-apps/
+SynapseDW                   | Azure Synapse Analytics | DW200c | https://azure.microsoft.com/en-us/pricing/details/synapse-analytics/gen2/
 NYCDataSets                   | SQL database | Standard S1 | https://azure.microsoft.com/en-au/pricing/details/sql-database/single/
-mdwsqlvirtualserver-*suffix*| SQL server || 
-mdwdatalakesuffix	        | Storage account || https://azure.microsoft.com/en-us/pricing/details/storage/blobs/
-MDWStreamAnalytics-*suffix*	| Stream Analytics job | 3 SU | https://azure.microsoft.com/en-us/pricing/details/stream-analytics/
-MDWDesktop	                | Virtual machine | A4 v2 | https://azure.microsoft.com/en-us/pricing/details/virtual-machines/windows/
-MDWDesktop_OsDisk	        | Disk | E10 | https://azure.microsoft.com/en-us/pricing/details/managed-disks/
-MDWDesktop-nic	            | Network interface ||
-MDWDesktop-publicip	        | Public IP address || https://azure.microsoft.com/en-us/pricing/details/ip-addresses/
-MDWVirtualNetwork	        | Virtual network || https://azure.microsoft.com/en-us/pricing/details/virtual-network/
+synapsesql-*suffix*| SQL server || 
+operationalsql-*suffix*| SQL server || 
+synapsedatalake*suffix*	        | Azure Data Lake Storage Gen2 || https://azure.microsoft.com/en-us/pricing/details/storage/data-lake/
+SynapseStreamAnalytics-*suffix*	| Stream Analytics job | 3 SU | https://azure.microsoft.com/en-us/pricing/details/stream-analytics/
+ADPDesktop	                | Virtual machine | A4 v2 | https://azure.microsoft.com/en-us/pricing/details/virtual-machines/windows/
+ADPDesktop_OsDisk	        | Disk | E10 | https://azure.microsoft.com/en-us/pricing/details/managed-disks/
+ADPDesktop-nic	            | Network interface ||
+ADPDesktop-publicip	        | Public IP address || https://azure.microsoft.com/en-us/pricing/details/ip-addresses/
+ADPVirtualNetwork	        | Virtual network || https://azure.microsoft.com/en-us/pricing/details/virtual-network/
+ADPIntegrationAccount       | Integration Account | Basic | https://azure.microsoft.com/en-au/pricing/details/logic-apps/
+ADPBastionHost              | Bastion | | https://azure.microsoft.com/en-au/pricing/details/azure-bastion/
 
 
  <br>**IMPORTANT**: When you deploy the lab resources in your own subscription you are responsible for the charges related to the use of the services provisioned. If you don't want any extra charges associated with the lab resources you should delete the lab resource group and all resources in it.
@@ -55,9 +56,9 @@ In this section you will use the Azure Portal to create a Resource Group that wi
 
 5.	On the **Create a resource group** blade, select your subscription in **Subscription** drop down list.
 
-6.	In the Resource group text box enter “MDW-Lab”
+6.	In the Resource group text box enter “ADPE2E-Lab”
 
-    **IMPORTANT**: If you are deploying this workshop to multiple students using the same subscription then add the student alias to the resources group name so they can identify their own set of resources and avoid confusion during the labs. Example: "MDW-Lab-*Student01*"
+    **IMPORTANT**: If you are deploying this workshop to multiple students using the same subscription then add the student alias to the resources group name so they can identify their own set of resources and avoid confusion during the labs. Example: "ADPE2E-Lab-*Student01*"
 
     **IMPORTANT**: The name of the resource group chosen is *not* relevant to the successful completion of the labs. If you choose to use a different name, then please proceed with the rest of the lab using your unique name for the resource group.
 
@@ -92,28 +93,25 @@ In this section you will use automated deployment and ARM templates to automate
 
 1. You can deploy all Azure services required in each lab by clicking the **Deploy to Azure** button below. 
 
-    [![Deploy to Azure](https://azuredeploy.net/deploybutton.png)](https://azuredeploy.net/)
+    <a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FfabragaMS%2FADPE2E%2Fmaster%2FDeploy%2Fazuredeploy.json" target="_blank">
+    <img src="https://github.com/fabragaMS/ADPE2E/raw/master/Deploy/Media/deploytoazure.png"/>    
+</a>
 
-2. On the **Deploy to Azure - Setup** page provide:
-    <br>- Your organisation directory
-    <br>- The subscription you want to use
-    <br>- The resource group you created in the previous section
+2. You will be directed to the Azure portal to deploy the ADPE2E ARM template from this repository. On the **Custom deployment** blade, enter the following details:
+    <br>- **Subscription**: [your Azure subscription]
+    <br>- **Resource group**: [select the resource group you created in the previous section]
 
-    ![](./Media/Lab0-Image06.png)
+    Please review the Terms and Conditions and check the box to indicate that you agree with them.
 
-3. Click **Next**
+3. Click **Purchase**
 
-4. On the **Deploy to Azure - Preview** just click **Deploy**
+![](./Media/Lab0-Image10.png)
 
-    ![](./Media/Lab0-Image07.png)
+4. Navigate to your resource group to monitor the progress of your ARM template deployment. A successful deployment should last less than 10 minutes.
 
-5. On the Azure Portal, navigate to your resource group.
+    ![](./Media/Lab0-Image11.png)
 
-6. On the **Overview** panel, click on the **Deployments** link to follow the progress of your deployment. A successful deployment should last less than 10 minutes.
-
-    ![](./Media/Lab0-Image08.png)
-
-7. Once your deployment is complete you are ready to start your labs. Enjoy!
+5. Once your deployment is complete you are ready to start your labs. Enjoy!
 
     ![](./Media/Lab0-Image09.png)
 
@@ -123,11 +121,11 @@ The approximate cost to run the resources provisioned for the estimated duration
 
 Azure Resource | Type | Action |
 ---------------|------|--------|
-MDWASQLDW      | Azure SQL Data Warehouse | Pause it after completing Lab 3|
-MDWDatabricks | Databricks Workspace | Stop cluster after completing Lab 4
-MDWCosmosDB   | Cosmos DB | Delete ImageMetadata container after completing Lab 4
-MDWDesktop | Virtual Machine | Stop it after completing Lab 4
-MDWLogicApp | Logic App | Disable it after completing Lab 5
-MDWStreamAnalytics | Stream Analytics job | Pause job after completing Lab 5
+SynapseDW      | Azure Azure Synapse Analytics | Pause it after completing Lab 3|
+ADPDatabricks | Databricks Workspace | Stop cluster after completing Lab 4
+adpcosmosdb-*suffix*   | Cosmos DB | Delete ImageMetadata container after completing Lab 4
+ADPDesktop | Virtual Machine | Stop it after completing Lab 4
+ADPLogicApp | Logic App | Disable it after completing Lab 5
+SynapseStreamAnalytics-*suffix* | Stream Analytics job | Pause job after completing Lab 5
 
 Some of the services still incur costs even when not running. If you don't want any extra charges associated with the lab resources you should delete the lab resource group and all resources in it.
diff --git a/Deploy/Media/Lab0-Image09.png b/Deploy/Media/Lab0-Image09.png
diff --git a/Deploy/Media/Lab0-Image10.png b/Deploy/Media/Lab0-Image10.png
diff --git a/Deploy/Media/Lab0-Image11.png b/Deploy/Media/Lab0-Image11.png