diff --git a/samples/manage/synapse-analytics/azuredeploy.json b/samples/manage/synapse-analytics/azuredeploy.json index d7a398a0..869ce60b 100644 --- a/samples/manage/synapse-analytics/azuredeploy.json +++ b/samples/manage/synapse-analytics/azuredeploy.json @@ -24,7 +24,7 @@ "properties": { "mode": "Incremental", "templateLink": { - "uri": "[uri(deployment().properties.templateLink.uri, '/JocaPC/sql-server-samples/synapse/samples/manage/synapse-analytics/storage/azuredeploy.json')]", + "uri": "[uri(deployment().properties.templateLink.uri, '/microsoft/sql-server-samples/master/samples/manage/synapse-analytics/storage/azuredeploy.json')]", "contentVersion": "1.0.0.0" }, "parameters":{ @@ -39,7 +39,7 @@ "properties": { "mode": "Incremental", "templateLink": { - "uri": "[uri(deployment().properties.templateLink.uri, '/JocaPC/sql-server-samples/synapse/samples/manage/synapse-analytics/workspace/azuredeploy.json')]", + "uri": "[uri(deployment().properties.templateLink.uri, '/microsoft/sql-server-samples/master/samples/manage/synapse-analytics/workspace/azuredeploy.json')]", "contentVersion": "1.0.0.0" }, "parameters":{ diff --git a/samples/manage/synapse-analytics/readme.md b/samples/manage/synapse-analytics/readme.md index ca22ec40..1be32bf7 100644 --- a/samples/manage/synapse-analytics/readme.md +++ b/samples/manage/synapse-analytics/readme.md @@ -2,10 +2,10 @@ This template deploys Azure Synapse workspace with underlying Data Lake Storage. - + - + diff --git a/samples/manage/synapse-analytics/spark/deploy.ps1 b/samples/manage/synapse-analytics/spark/deploy.ps1 deleted file mode 100644 index 4425c69e..00000000 --- a/samples/manage/synapse-analytics/spark/deploy.ps1 +++ /dev/null @@ -1,88 +0,0 @@ -{ - "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "sparkPoolName": { - "type": "string" - }, - "workspaceName": { - "type": "string" - }, - "location": { - "type": "string" - }, - "sparkPoolTags": { - "type": "object", - "defaultValue": {} - }, - "sparkAutoScaleEnabled": { - "type": "bool" - }, - "sparkMinNodeCount": { - "type": "int", - "defaultValue": 0 - }, - "sparkMaxNodeCount": { - "type": "int", - "defaultValue": 0 - }, - "sparkNodeCount": { - "type": "int", - "defaultValue": 0 - }, - "sparkNodeSizeFamily": { - "type": "string" - }, - "sparkNodeSize": { - "type": "string" - }, - "sparkAutoPauseEnabled": { - "type": "bool" - }, - "sparkAutoPauseDelayInMinutes": { - "type": "int", - "defaultValue": 0 - }, - "sparkVersion": { - "type": "string" - }, - "packagesRequirementsFileName": { - "type": "string", - "defaultValue": "" - }, - "packagesRequirementsContent": { - "type": "string", - "defaultValue": "" - } - }, - "variables": {}, - "resources": [ - { - "type": "Microsoft.Synapse/workspaces/bigDataPools", - "apiVersion": "2019-06-01-preview", - "name": "[concat(parameters('workspaceName'), '/', parameters('sparkPoolName'))]", - "location": "[parameters('location')]", - "tags": "[parameters('sparkPoolTags')]", - "properties": { - "nodeCount": "[parameters('sparkNodeCount')]", - "nodeSizeFamily": "[parameters('sparkNodeSizeFamily')]", - "nodeSize": "[parameters('sparkNodeSize')]", - "autoScale": { - "enabled": "[parameters('sparkAutoScaleEnabled')]", - "minNodeCount": "[parameters('sparkMinNodeCount')]", - "maxNodeCount": "[parameters('sparkMaxNodeCount')]" - }, - "autoPause": { - "enabled": "[parameters('sparkAutoPauseEnabled')]", - "delayInMinutes": "[parameters('sparkAutoPauseDelayInMinutes')]" - }, - "sparkVersion": "[parameters('sparkVersion')]", - "libraryRequirements": { - "filename": "[parameters('packagesRequirementsFileName')]", - "content": "[parameters('packagesRequirementsContent')]" - } - } - } - ], - "outputs": {} -} \ No newline at end of file diff --git a/samples/manage/synapse-analytics/spark/parameters.json b/samples/manage/synapse-analytics/spark/parameters.json deleted file mode 100644 index b055e5b0..00000000 --- a/samples/manage/synapse-analytics/spark/parameters.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "sparkPoolName": { - "value": "jovanpopspark" - }, - "workspaceName": { - "value": "jovanpopws1" - }, - "location": { - "value": "westeurope" - }, - "sparkPoolTags": { - "value": { - "Owner": "jovanpop" - } - }, - "sparkAutoScaleEnabled": { - "value": true - }, - "sparkMinNodeCount": { - "value": 3 - }, - "sparkMaxNodeCount": { - "value": 3 - }, - "sparkNodeCount": { - "value": 0 - }, - "sparkNodeSizeFamily": { - "value": "MemoryOptimized" - }, - "sparkNodeSize": { - "value": "Small" - }, - "sparkAutoPauseEnabled": { - "value": true - }, - "sparkAutoPauseDelayInMinutes": { - "value": 15 - }, - "sparkVersion": { - "value": "2.4" - }, - "packagesRequirementsFileName": { - "value": "" - }, - "packagesRequirementsContent": { - "value": "" - } - } -} \ No newline at end of file diff --git a/samples/manage/synapse-analytics/spark/template.json b/samples/manage/synapse-analytics/spark/template.json deleted file mode 100644 index 4425c69e..00000000 --- a/samples/manage/synapse-analytics/spark/template.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "sparkPoolName": { - "type": "string" - }, - "workspaceName": { - "type": "string" - }, - "location": { - "type": "string" - }, - "sparkPoolTags": { - "type": "object", - "defaultValue": {} - }, - "sparkAutoScaleEnabled": { - "type": "bool" - }, - "sparkMinNodeCount": { - "type": "int", - "defaultValue": 0 - }, - "sparkMaxNodeCount": { - "type": "int", - "defaultValue": 0 - }, - "sparkNodeCount": { - "type": "int", - "defaultValue": 0 - }, - "sparkNodeSizeFamily": { - "type": "string" - }, - "sparkNodeSize": { - "type": "string" - }, - "sparkAutoPauseEnabled": { - "type": "bool" - }, - "sparkAutoPauseDelayInMinutes": { - "type": "int", - "defaultValue": 0 - }, - "sparkVersion": { - "type": "string" - }, - "packagesRequirementsFileName": { - "type": "string", - "defaultValue": "" - }, - "packagesRequirementsContent": { - "type": "string", - "defaultValue": "" - } - }, - "variables": {}, - "resources": [ - { - "type": "Microsoft.Synapse/workspaces/bigDataPools", - "apiVersion": "2019-06-01-preview", - "name": "[concat(parameters('workspaceName'), '/', parameters('sparkPoolName'))]", - "location": "[parameters('location')]", - "tags": "[parameters('sparkPoolTags')]", - "properties": { - "nodeCount": "[parameters('sparkNodeCount')]", - "nodeSizeFamily": "[parameters('sparkNodeSizeFamily')]", - "nodeSize": "[parameters('sparkNodeSize')]", - "autoScale": { - "enabled": "[parameters('sparkAutoScaleEnabled')]", - "minNodeCount": "[parameters('sparkMinNodeCount')]", - "maxNodeCount": "[parameters('sparkMaxNodeCount')]" - }, - "autoPause": { - "enabled": "[parameters('sparkAutoPauseEnabled')]", - "delayInMinutes": "[parameters('sparkAutoPauseDelayInMinutes')]" - }, - "sparkVersion": "[parameters('sparkVersion')]", - "libraryRequirements": { - "filename": "[parameters('packagesRequirementsFileName')]", - "content": "[parameters('packagesRequirementsContent')]" - } - } - } - ], - "outputs": {} -} \ No newline at end of file diff --git a/samples/manage/synapse-analytics/storage/readme.md b/samples/manage/synapse-analytics/storage/readme.md index a75c54e6..fe5cb122 100644 --- a/samples/manage/synapse-analytics/storage/readme.md +++ b/samples/manage/synapse-analytics/storage/readme.md @@ -1,15 +1,15 @@ # Deploy Azure Storage account for Synapse workspace -This template deploys Azure Storage account for Synapse workspace +This template deploys configured Azure Storage account for Synapse workspace. - + - + When you create storage, use [this link](https://portal.azure.com/?feature.customportal=false&feature.canmodifystamps=true&SqlAzureExtension=synapseµsoft_azure_synapse_assettypeoptions=%7B%22SynapseWorkspace%22%3A%7B%22options%22%3A%22%22%7D%2C%22SparkPool%22%3A%7B%22options%22%3A%22hideassettype%22%7D%7Dµsoft_azure_marketplace_ItemHideKey=SynapseExtensionPreview#blade/Microsoft_Azure_Marketplace/MarketplaceOffersBlade/selectedMenuItemId/home/searchQuery/Azure%2BSynapse%2BAnalytics%2B(preview) -) to create Azure Synapse Analytics workspace (not former DataWarehouse) and assign the Azure Storage account created with this template. +) to create Azure Synapse Analytics workspace **(not former DataWarehouse)** and assign the Azure Storage account created with this template. `Tags: Azure, Synapse, Storage` \ No newline at end of file diff --git a/samples/manage/synapse-analytics/workspace/readme.md b/samples/manage/synapse-analytics/workspace/readme.md index 7031e6f0..3e5780da 100644 --- a/samples/manage/synapse-analytics/workspace/readme.md +++ b/samples/manage/synapse-analytics/workspace/readme.md @@ -1,12 +1,12 @@ # Deploy Azure Synapse workspace -This template deploys Azure Synapse workspace +This template deploys Azure Synapse workspace. - + - + -`Tags: Azure, Synapse, Storage` \ No newline at end of file +`Tags: Azure, Synapse, Analytics` \ No newline at end of file