diff --git a/docs/howto/providers/azure.rst b/docs/howto/providers/azure.rst index e610203..889ab60 100644 --- a/docs/howto/providers/azure.rst +++ b/docs/howto/providers/azure.rst @@ -5,7 +5,7 @@ Perform common Microsoft Azure configuration tasks ================================================== This page lists various common tasks you can perform on your -Microsoft Azure virtual machine. +`Microsoft Azure virtual machine `_. .. _howto/providers/azure/resize: @@ -13,12 +13,14 @@ Deleting or stopping your virtual machine =========================================== After you have finished using your TLJH you might wanto to either Stop or completely delete the Virtual Machine to avoid incurring in subsequent costs. -The difference between these two approaches is that **Stop** will keep the VM resources but will effectively stop any compute / runtime activities. + +The difference between these two approaches is that **Stop** will keep the VM resources (e.g. storage and network) but will effectively stop any compute / runtime activities. + If you choose to delete the VM then all the resources associated with it will be wiped out. To do either of this: -* Go to "Virtual Machines" +* Go to "Virtual Machines" on the left hand panel * Click on your machine name * Click on "Stop" to stop the machine temporarily, or "Delete" to delete it permanently. @@ -26,3 +28,11 @@ To do either of this: :alt: Delete vm .. note:: It is important to mention that even if you stop the machine you will still be charged for the use of the data disk. + +If you no longer need any of your resources you can delete the entire resource group. + +* Go to "Reosurce groups" on the left hand panel +* Click on your resource group +* Click on "Delete resource group" you will then be asked to confirm the operation. This operation will take between 5 and 10 minutes. + + diff --git a/docs/images/providers/azure/add-vm.png b/docs/images/providers/azure/add-vm.png index 9a93754..41fb2f6 100644 Binary files a/docs/images/providers/azure/add-vm.png and b/docs/images/providers/azure/add-vm.png differ diff --git a/docs/images/providers/azure/azure-vms.png b/docs/images/providers/azure/azure-vms.png index 894e724..67d4d8d 100644 Binary files a/docs/images/providers/azure/azure-vms.png and b/docs/images/providers/azure/azure-vms.png differ diff --git a/docs/images/providers/azure/backup-vm.png b/docs/images/providers/azure/backup-vm.png index 134ddbe..e054c89 100644 Binary files a/docs/images/providers/azure/backup-vm.png and b/docs/images/providers/azure/backup-vm.png differ diff --git a/docs/images/providers/azure/cloudinit-vm.png b/docs/images/providers/azure/cloudinit-vm.png index 87d27dd..14bc2c7 100644 Binary files a/docs/images/providers/azure/cloudinit-vm.png and b/docs/images/providers/azure/cloudinit-vm.png differ diff --git a/docs/images/providers/azure/create-disk.png b/docs/images/providers/azure/create-disk.png new file mode 100644 index 0000000..9364de1 Binary files /dev/null and b/docs/images/providers/azure/create-disk.png differ diff --git a/docs/images/providers/azure/create-vm.png b/docs/images/providers/azure/create-vm.png index 8578127..0398013 100644 Binary files a/docs/images/providers/azure/create-vm.png and b/docs/images/providers/azure/create-vm.png differ diff --git a/docs/images/providers/azure/delete-vm.png b/docs/images/providers/azure/delete-vm.png index 8f7d97d..40c2b61 100644 Binary files a/docs/images/providers/azure/delete-vm.png and b/docs/images/providers/azure/delete-vm.png differ diff --git a/docs/images/providers/azure/deployed-vm.png b/docs/images/providers/azure/deployed-vm.png index e24a76e..ccafb50 100644 Binary files a/docs/images/providers/azure/deployed-vm.png and b/docs/images/providers/azure/deployed-vm.png differ diff --git a/docs/images/providers/azure/disk-vm.png b/docs/images/providers/azure/disk-vm.png index 9752fce..b7250a0 100644 Binary files a/docs/images/providers/azure/disk-vm.png and b/docs/images/providers/azure/disk-vm.png differ diff --git a/docs/images/providers/azure/goto-vm.png b/docs/images/providers/azure/goto-vm.png index b7353af..282c60e 100644 Binary files a/docs/images/providers/azure/goto-vm.png and b/docs/images/providers/azure/goto-vm.png differ diff --git a/docs/images/providers/azure/ip-vm.png b/docs/images/providers/azure/ip-vm.png index c249623..70783a2 100644 Binary files a/docs/images/providers/azure/ip-vm.png and b/docs/images/providers/azure/ip-vm.png differ diff --git a/docs/images/providers/azure/networking-vm.png b/docs/images/providers/azure/networking-vm.png index e04e674..28c3e45 100644 Binary files a/docs/images/providers/azure/networking-vm.png and b/docs/images/providers/azure/networking-vm.png differ diff --git a/docs/images/providers/azure/new-rg.png b/docs/images/providers/azure/new-rg.png new file mode 100644 index 0000000..b38e470 Binary files /dev/null and b/docs/images/providers/azure/new-rg.png differ diff --git a/docs/images/providers/azure/password-vm.png b/docs/images/providers/azure/password-vm.png index d829f3b..f35c96e 100644 Binary files a/docs/images/providers/azure/password-vm.png and b/docs/images/providers/azure/password-vm.png differ diff --git a/docs/images/providers/azure/size-vm.png b/docs/images/providers/azure/size-vm.png index ca10b9a..62468ed 100644 Binary files a/docs/images/providers/azure/size-vm.png and b/docs/images/providers/azure/size-vm.png differ diff --git a/docs/images/providers/azure/ubuntu-vm.png b/docs/images/providers/azure/ubuntu-vm.png index 48b7da7..450075e 100644 Binary files a/docs/images/providers/azure/ubuntu-vm.png and b/docs/images/providers/azure/ubuntu-vm.png differ diff --git a/docs/install/azure.rst b/docs/install/azure.rst index fac50df..11264bc 100644 --- a/docs/install/azure.rst +++ b/docs/install/azure.rst @@ -29,7 +29,7 @@ Step 1: Installing The Littlest JupyterHub We will start by creating the Virtual Machine in which we can run TLJH (The Littlest JupyterHub). #. Go to `Azure portal `_ and login with your Azure account. -#. Expand the left-hand panel, find the Virtual Machines tab and click on it. +#. Expand the left-hand panel by clicking on the ">>" button on the top left corner of your dashboard. Find the Virtual Machines tab and click on it. .. image:: ../images/providers/azure/azure-vms.png :alt: Virtual machines on Azure portal @@ -39,7 +39,7 @@ We will start by creating the Virtual Machine in which we can run TLJH (The Litt .. image:: ../images/providers/azure/add-vm.png :alt: Add a new virtual machine -#. Select **Create VM from Marketplace** in the next sreen. This will display a new screen with all the optiond for Virtual Machines in Azure. +#. Select **Create VM from Marketplace** in the next sreen. This will display a new screen with all the options for Virtual Machines in Azure. .. image:: ../images/providers/azure/create-vm.png :alt: Create VM from the marketplace @@ -52,7 +52,13 @@ We will start by creating the Virtual Machine in which we can run TLJH (The Litt #. Customise the Virtual Machine basics: * **Subscription**. Choose the "Free Trial" if this is what you're using. Otherwise, choose a different plan. This is the billing account that will be charged. - * **Resource group**. Resource groups let you bundle components that you request from Azure. If you already have one you'd like to use it select that resource. + * **Resource group**. Resource groups let you keep your Azure tools/resources together in an availability region (e.g. WestEurope). If you already have one you'd like to use it select that resource. + + .. note:: If you have never created a Resource Group, click on **Create new** + + .. image:: ../images/providers/azure/new-rg.png + :alt: Create new resource group + * **Name**. Use a descriptive name for your virtual machine (note that you cannot use spaces or special characters). * **Region**. Choose a location near where you expect your users to be located. * **Availability options**. Choose "No infrastructure redundancy required". @@ -76,15 +82,18 @@ We will start by creating the Virtual Machine in which we can run TLJH (The Litt .. note:: For more information about estimating memory, CPU and disk needs check `The memory section in the TLJH documentation `_ - * Select a suitable image (to check available images and prices in your region `click on this link `_. + * Select a suitable image (to check available images and prices in your region `click on this link `_). #. Disks (Storage): - * **Disk options**: slect the OS disk type there are options for SDD and HDD. **SSD persistent disk** gives you a faster but more expensive disk than HDD. + * **Disk options**: select the OS disk type there are options for SDD and HDD. **SSD persistent disk** gives you a faster but more expensive disk than HDD. * **Data disk**. Click on create and attach a new disk. Select an appropriate type and size and click ok. * Click "Next" + .. image:: ../images/providers/azure/create-disk.png + :alt: Create and attach disk + .. image:: ../images/providers/azure/disk-vm.png - :alt: Choose disk size + :alt: Choose disk size #. Networking * **Virtual network**. Leave the default values selected.