diff --git a/README.md b/README.md index 7eef7608..078e3842 100644 --- a/README.md +++ b/README.md @@ -23,10 +23,10 @@ Below are a list of pre-defined/restricted deployment options based on typical d | Deployment Type | Description | Launch | | --- | --- | ---| -| Minimal | This deployment will use NFS, Azure Database for MySQL Flexible Server (Burstable SKU 2 vCores), and smaller autoscale web frontend VM sku (1 core) that'll give faster deployment time (less than 30 minutes) and requires only 2 VM cores currently that'll fit even in a free trial Azure subscription.|[![Deploy to Azure Minimally](http://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2FMoodle%2Fmaster%2Fazuredeploy-minimal.json)| -| Small to Mid-Size | Supporting up to 1000 concurrent users. This deployment will use NFS (no high availability) and Azure Database for MySQL Flexible Server(General Purpose SKU 8 vCores), without other options like elastic search or redis cache.|[![Deploy to Azure Minimally](http://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2FMoodle%2Fmaster%2Fazuredeploy-small2mid-noha.json)| -|Large size deployment (with high availability)| Supporting more than 2000 concurrent users. This deployment will use Azure Premium Files, Azure Database for MySQL Flexible Server (General Purpose SKU 16 vCores) and redis cache, without other options like elastic search. |[![Deploy to Azure Minimally](http://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2FMoodle%2Fmaster%2Fazuredeploy-large-ha.json)| -| Maximum |This maximal deployment will use Azure Premium Files, Azure Database for MySQL (Business Critical SKU 64 vCores), redis cache, elastic search (3 VMs), and pretty large storage sizes (both data disks and DB).|[![Deploy to Azure Maximally](http://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2FMoodle%2Fmaster%2Fazuredeploy-maximal.json)| +| Minimal | This deployment will use NFS, Azure Database for MySQL Flexible Server (Burstable SKU 2 vCores), and smaller autoscale web frontend VM sku (1 core) that'll give faster deployment time (less than 30 minutes) and requires only 2 VM cores currently that'll fit even in a free trial Azure subscription.|[![Deploy to Azure Minimally](http://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fprabowoekky%2FMoodle%2Fmaster%2Fazuredeploy-minimal.json)| +| Small to Mid-Size | Supporting up to 1000 concurrent users. This deployment will use NFS (no high availability) and Azure Database for MySQL Flexible Server(General Purpose SKU 8 vCores), without other options like elastic search or redis cache.|[![Deploy to Azure Minimally](http://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fprabowoekky%2FMoodle%2Fmaster%2Fazuredeploy-small2mid-noha.json)| +|Large size deployment (with high availability)| Supporting more than 2000 concurrent users. This deployment will use Azure Premium Files, Azure Database for MySQL Flexible Server (General Purpose SKU 16 vCores) and redis cache, without other options like elastic search. |[![Deploy to Azure Minimally](http://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fprabowoekky%2FMoodle%2Fmaster%2Fazuredeploy-large-ha.json)| +| Maximum |This maximal deployment will use Azure Premium Files, Azure Database for MySQL (Business Critical SKU 64 vCores), redis cache, elastic search (3 VMs), and pretty large storage sizes (both data disks and DB).|[![Deploy to Azure Maximally](http://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fprabowoekky%2FMoodle%2Fmaster%2Fazuredeploy-maximal.json)| **NOTE**: The above deployment templates use hard coded Azure Database for MySQL Flexible Server SKUs for easier configuration and quicker deployment of Moodle workloads. If your deployment fails for any reason, please revert to the fully configurable template where possible and change the Azure Database for MySQL Flexible Server parameters accordingly. @@ -34,7 +34,7 @@ Below are a list of pre-defined/restricted deployment options based on typical d If you would prefer to configure the deployment right at the start of the process, you use the button below. Please note that this method opens up a large number of parameters to configure and users new to this deployment process may find it overwhelming. It is also very likely you may end up with a deployment configuration that is not optimal to your needs. This method is recommended for power users. -[![Deploy to Azure Fully Configurable](http://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2FMoodle%2Fmaster%2Fazuredeploy.json) [![Visualize](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/visualizebutton.png)](http://armviz.io/#/?load=https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2FMoodle%2Fmaster%2Fazuredeploy.json) +[![Deploy to Azure Fully Configurable](http://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fprabowoekky%2FMoodle%2Fmaster%2Fazuredeploy.json) [![Visualize](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/visualizebutton.png)](http://armviz.io/#/?load=https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2FMoodle%2Fmaster%2Fazuredeploy.json) **NOTE**: Before you deploy your Moodle workloads using a fully configurable template, we suggest reviewing [Azure Database for MySQL Flexible Server](https://learn.microsoft.com/en-us/azure/mysql/flexible-server/) documentation to fully understand the parameters and the options suggested in the parameters to pick the right values for your workload needs. diff --git a/azuredeploy-minimal.json b/azuredeploy-minimal.json index 5ec728f9..e3993c87 100644 --- a/azuredeploy-minimal.json +++ b/azuredeploy-minimal.json @@ -35,7 +35,7 @@ "_artifactsLocationSasToken": { "value": "[parameters('_artifactsLocationSasToken')]" }, "redisDeploySwitch": { "value": false }, "sshPublicKey": { "value": "[parameters('sshPublicKey')]" }, - "autoscaleVmSku": { "value": "Standard_DS1_v2" }, + "autoscaleVmSku": { "value": "Standard_D2as_v5" }, "enableAccelNwForOtherVmsSwitch": { "value": false }, "dbServerType": { "value": "mysqlflex" }, "vnetDbDeploySwitch": {"value": true }, diff --git a/azuredeploy.json b/azuredeploy.json index 3d55ce4c..1bef2e37 100644 --- a/azuredeploy.json +++ b/azuredeploy.json @@ -7,7 +7,7 @@ "metadata": { "description": "The base URI where artifacts required by this template are located. When the template is deployed using the accompanying scripts, a private location in the subscription will be used and this value will be automatically generated." }, - "defaultValue": "https://raw.githubusercontent.com/Azure/Moodle/master/" + "defaultValue": "https://raw.githubusercontent.com/prabowoekky/Moodle/master/" }, "_artifactsLocationSasToken": { "type": "securestring", @@ -143,7 +143,7 @@ "type": "string" }, "controllerVmSku": { - "defaultValue": "Standard_DS1_v2", + "defaultValue": "Standard_F1s", "metadata": { "description": "VM size for the controller VM" }, @@ -161,7 +161,7 @@ "type": "string" }, "autoscaleVmSku": { - "defaultValue": "Standard_DS2_v2", + "defaultValue": "Standard_B2s_v2", "metadata": { "description": "VM size for autoscaled web VMs" }, diff --git a/nested/db-mysqlflex.json b/nested/db-mysqlflex.json index 8d55ff3d..efa2c68f 100644 --- a/nested/db-mysqlflex.json +++ b/nested/db-mysqlflex.json @@ -66,7 +66,7 @@ "network": "[if(parameters('moodleCommon').vnetDbDeploySwitch, variables('vnetNetworkData'), createObject())]", "Backup": { "backupRetentionDays": 35, - "geoRedundantBackup": "Enabled" + "geoRedundantBackup": "Disabled" } } }, @@ -151,4 +151,4 @@ "value": "[reference(parameters('moodleCommon').serverName).fullyQualifiedDomainName]" } } -} \ No newline at end of file +} diff --git a/nested/network.json b/nested/network.json index a5fce5cf..0e4b0997 100644 --- a/nested/network.json +++ b/nested/network.json @@ -234,6 +234,9 @@ "apiVersion": "2019-11-01", "location": "[parameters('moodleCommon').location]", "name": "[parameters('moodleCommon').ctlrPipName]", + "sku": { + "name": "Standard" + }, "properties": { "dnsSettings": { "domainNameLabel": "[parameters('moodleCommon').ctlrPipName]" diff --git a/package.json b/package.json index 251a53f2..5c0c7997 100644 --- a/package.json +++ b/package.json @@ -7,14 +7,14 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/Azure/Moodle.git" + "url": "git+https://github.com/prabowoekky/Moodle.git" }, "author": "Catalyst IT", "license": "GPL V3", "bugs": { - "url": "https://github.com/Azure/Moodle/issues" + "url": "https://github.com/prabowoekky/Moodle/issues" }, - "homepage": "https://github.com/Azure/Moodle#readme", + "homepage": "https://github.com/prabowoekky/Moodle#readme", "devDependencies": { "grunt": ">=1.3.0", "grunt-contrib-jshint": "^0.11.3",