diff --git a/challenges/Module0-Getting Started.MD b/challenges/Module0-Getting Started.MD
index fd5cec4..3d7ddb6 100644
--- a/challenges/Module0-Getting Started.MD
+++ b/challenges/Module0-Getting Started.MD
@@ -4,7 +4,7 @@
In this lab, you will be deploying pre-requisite infrastructure which is required for CosmosDB Hackfest.
#### Prerequisites
* Windows or a Mac machine with HTML5 supported browser such as Microsoft Edge, Internet Explorer, Chrome or Firefox.
-* You should have registered in the training portal https://azuretraining.spektrasystems.com and received the confirmation message with the credentials to login to the Azure portal.
+* You should have registered in the training portal https://experience-azure-mgmt.azurewebsites.net and received the confirmation message with the credentials to login to the Azure portal.
* You will need Remote Desktop Connection (RDP) access. If you are using Mac, follow these details for installation: [Install Microsoft RDP on Mac](https://docs.microsoft.com/en-us/windows-server/remote/remote-desktop-services/clients/remote-desktop-mac)
diff --git a/challenges/Module1-Introduction to Cosmos DB.MD b/challenges/Module1-Introduction to Cosmos DB.MD
index 2da0338..92e9d97 100644
--- a/challenges/Module1-Introduction to Cosmos DB.MD
+++ b/challenges/Module1-Introduction to Cosmos DB.MD
@@ -30,7 +30,7 @@
3. Now in the **Resource Groups** blade that appear, select the resource group for cosmos DB, (i.e, **odl-cosmosdb-hackfest**).
-4. Then click on the created Azure Cosmos DB account(i.e,cosmosdb321).
+4. Then click on the created Azure Cosmos DB account32.
5. In the Azure Cosmos DB account blade that appear, Click on **Overview**.
@@ -46,26 +46,21 @@
### 1.3 Load the Data in to Cosmos DB.
#### 1.3.1 Access Windows VM and Launch Data migration tool.
-
1. You'd have a pre-created windows virtual machine named PowerBI VM for you in your azure lab environment. Please access the virtual machine via remote desktop. DNS Name for the virtual machine is also available on the lab details page.
-
-Open Internet Explorer inside the Windows VM and download the data which we would migrate to cosmos DB by clicking [here](http://jsonstudio.com/wp-content/uploads/2014/02/stocks.zip) (http://bit.ly/cosmos-data)
-A zip file will download, extract and open the file to view the json data set.
-2. **Launch** your **data migration tool** by opening the **dtui.exe** application. (under C:\Packages)
-
+2. **Launch** your **data migration tool** by opening the **dtui** application (From Desktop).
+
3. In the **DocumentDB Data Migration Tool** blade that appear, Click on **Next**.
4. In the source information page that appear, select Import from **JSON file(s)** and click on **Add Files**.
-5. Select the downloaded file, **stocks.json** and click on open.
-
+5. Go to **C** drive and select the **stocks** folder, click on **stocks.json** to open it.
+
6. Then in the **source information** page, click on **Next** and a Target information page will appear.
7. **Launch** a browser and **navigate** to https://portal.azure.com. **Login** with your Microsoft Azure credentials.
8. Click on the **Resource Group** icon on the **Menu navigation bar**.
-9. Now in the **Resource Groups** blade that appear, select the created resource group for cosmos DB, (i.e, **cosmosdb-rg**).
-
-10. Then click on the created **Azure Cosmos DB account(i.e,cosmosdb321)**.
+9. Now in the **Resource Groups** blade that appear, select the created resource group for cosmos DB.
+10. Then click on the created **Azure Cosmos DB account**.
11. In the **Azure Cosmos DB account** blade, Click on **keys** menu under the **setting** tile.
@@ -98,9 +93,8 @@ A zip file will download, extract and open the file to view the json data set.
2. Click on the **Resource Group** icon on the **Menu navigation bar**.
-3. Now in the **Resource Groups** blade that appear, select the created resource group for cosmos DB, (i.e, **cosmosdb-rg**).
-
-4. Then click on the created **Azure Cosmos DB account(i.e,cosmosdb321)**.
+3. Now in the **Resource Groups** blade that appear, select the created resource group for cosmos DB.
+4. Then click on the created **Azure Cosmos DB account**.
5. In the **Azure Cosmos DB account** blade that appear, Click on **Data Explorer**.
diff --git a/challenges/images/addcosmos.jpg b/challenges/images/addcosmos.jpg
index 6721668..fe03915 100644
Binary files a/challenges/images/addcosmos.jpg and b/challenges/images/addcosmos.jpg differ
diff --git a/challenges/images/cosmosdb1.jpg b/challenges/images/cosmosdb1.jpg
index 099e7f3..e20f5d5 100644
Binary files a/challenges/images/cosmosdb1.jpg and b/challenges/images/cosmosdb1.jpg differ
diff --git a/challenges/images/cosmosdbinfo.jpg b/challenges/images/cosmosdbinfo.jpg
index b3cd17e..aeed8f2 100644
Binary files a/challenges/images/cosmosdbinfo.jpg and b/challenges/images/cosmosdbinfo.jpg differ
diff --git a/challenges/images/cosmoskeyandurl.jpg b/challenges/images/cosmoskeyandurl.jpg
index 39b99f9..8c411db 100644
Binary files a/challenges/images/cosmoskeyandurl.jpg and b/challenges/images/cosmoskeyandurl.jpg differ
diff --git a/challenges/images/dtui.jpg b/challenges/images/dtui.jpg
new file mode 100644
index 0000000..efcc1eb
Binary files /dev/null and b/challenges/images/dtui.jpg differ
diff --git a/challenges/images/fnxinfo.jpg b/challenges/images/fnxinfo.jpg
index b4493bd..b9e2c01 100644
Binary files a/challenges/images/fnxinfo.jpg and b/challenges/images/fnxinfo.jpg differ
diff --git a/challenges/images/inputs.jpg b/challenges/images/inputs.jpg
new file mode 100644
index 0000000..379eb80
Binary files /dev/null and b/challenges/images/inputs.jpg differ
diff --git a/challenges/images/jumpvm1.jpg b/challenges/images/jumpvm1.jpg
index fae45cc..83b0fd8 100644
Binary files a/challenges/images/jumpvm1.jpg and b/challenges/images/jumpvm1.jpg differ
diff --git a/challenges/images/module8.jpg b/challenges/images/module8.jpg
index c468a10..fc09e40 100644
Binary files a/challenges/images/module8.jpg and b/challenges/images/module8.jpg differ
diff --git a/challenges/images/sqlcosmos.jpg b/challenges/images/sqlcosmos.jpg
index 4949274..c34f123 100644
Binary files a/challenges/images/sqlcosmos.jpg and b/challenges/images/sqlcosmos.jpg differ
diff --git a/template/azuredeploy.json b/template/azuredeploy.json
index 3022ce8..afeceff 100644
--- a/template/azuredeploy.json
+++ b/template/azuredeploy.json
@@ -38,7 +38,8 @@
"vnetID": "[resourceId('Microsoft.Network/virtualNetworks',variables('virtualNetworkName'))]",
"subnetRef": "[concat(variables('vnetID'),'/subnets/','subnet')]"
},
- "resources": [{
+ "resources": [
+ {
"apiVersion": "2017-04-01",
"type": "Microsoft.Network/publicIPAddresses",
"name": "[variables('jumpPublicIPAddressName')]",
@@ -208,46 +209,48 @@
}]
}
},
- {
- "apiVersion": "2017-03-30",
- "type": "Microsoft.Compute/virtualMachines",
- "name": "[parameters('jumpVirtualMachineName')]",
- "location": "[resourceGroup().location]",
- "comments": "Jump VM name",
- "dependsOn": [
- "[concat('Microsoft.Network/networkInterfaces/', variables('jumpNicName'))]"
- ],
- "tags": {
- "displayName": "Jump Virtual Machine"
- },
- "properties": {
- "hardwareProfile": {
- "vmSize": "Standard_DS2_v2"
- },
- "osProfile": {
- "computerName": "[parameters('jumpVirtualMachineName')]",
- "adminUsername": "[parameters('adminUsername')]",
- "adminPassword": "[parameters('adminPassword')]"
- },
- "storageProfile": {
- "imageReference": {
- "id": "[concat('/subscriptions/', subscription().subscriptionId, '/resourceGroups/cosmos-hackfest-images/providers/Microsoft.Compute/images/jumpvm-', resourceGroup().location)]"
- },
- "osDisk": {
- "createOption": "FromImage",
- "managedDisk": {
- "storageAccountType": "Premium_LRS"
- }
- },
- "dataDisks": []
- },
- "networkProfile": {
- "networkInterfaces": [{
- "id": "[resourceId('Microsoft.Network/networkInterfaces',variables('jumpNicName'))]"
- }]
- }
- }
+ {
+ "apiVersion": "2017-03-30",
+ "type": "Microsoft.Compute/virtualMachines",
+ "name": "[parameters('jumpVirtualMachineName')]",
+ "location": "[resourceGroup().location]",
+ "comments": "Jump VM name",
+ "dependsOn": [
+ "[concat('Microsoft.Network/networkInterfaces/', variables('jumpNicName'))]"
+ ],
+ "tags": {
+ "displayName": "Jump Virtual Machine"
},
+ "properties": {
+ "hardwareProfile": {
+ "vmSize": "Standard_DS2_v2"
+ },
+ "osProfile": {
+ "computerName": "[parameters('jumpVirtualMachineName')]",
+ "adminUsername": "[parameters('adminUsername')]",
+ "adminPassword": "[parameters('adminPassword')]"
+ },
+ "storageProfile": {
+ "imageReference": {
+ "id": "[concat('/subscriptions/', subscription().subscriptionId, '/resourceGroups/aec-mgmt-rg/providers/Microsoft.Compute/images/cosmosdb-lin-v1-',resourceGroup().location)]"
+ },
+ "osDisk": {
+ "createOption": "FromImage",
+ "managedDisk": {
+ "storageAccountType": "Premium_LRS"
+ }
+ },
+ "dataDisks": []
+ },
+ "networkProfile": {
+ "networkInterfaces": [
+ {
+ "id": "[resourceId('Microsoft.Network/networkInterfaces',variables('jumpNicName'))]"
+ }
+ ]
+ }
+ }
+ },
{
"apiVersion": "2016-04-30-preview",
"type": "Microsoft.Compute/virtualMachines",
@@ -274,7 +277,7 @@
},
"storageProfile": {
"imageReference": {
- "id": "[concat('/subscriptions/', subscription().subscriptionId, '/resourceGroups/cosmos-powerbi-vmimage/providers/Microsoft.Compute/images/cosmospowerbi-', resourceGroup().location)]"
+ "id": "[concat('/subscriptions/', subscription().subscriptionId, '/resourceGroups/aec-mgmt-rg/providers/Microsoft.Compute/images/cosmosdb-win-v1-',resourceGroup().location)]"
},
"osDisk": {
"createOption": "fromImage",