Merge remote-tracking branch 'origin/main' into gcp-dev

content/AWS/06_monitoring_costs.ipynb

@@ -2,7 +2,7 @@
  "cells": [
   {
    "cell_type": "markdown",
-   "id": "cddbc6bb",
+   "id": "1a410843",
    "metadata": {},
    "source": [
     "# Monitoring Costs\n",
@@ -28,7 +28,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "09fb6b50",
+   "id": "425a65dc",
    "metadata": {},
    "source": [
     "# Ways to monitor resources on your AWS account\n",
@@ -77,34 +77,48 @@
   },
   {
    "cell_type": "markdown",
-   "id": "4d497066",
+   "id": "5fc630c9",
    "metadata": {},
    "source": [
     "# The AWS billing dashboard"
    ]
   },
   {
    "cell_type": "markdown",
-   "id": "ab8830f7",
+   "id": "796a2f21",
    "metadata": {},
    "source": [
     "The AWS billing is disabled for AWS Academy. The granularity to which you can view your billing details varies by institution. However, if you are able to view the Billing Dashboard, AWS offers a detailed view of resources and estimated spend. The image below shows an example of the AWS Billing Dashboard. You can get to the Billing Dashboard by clicking your username on the top right corner of the navigation bar. \n",
     "\n",
-    "<img src=\"./images/billing_dashboard_1.png\" width=720 align=\"center\">"
+    "<img src=\"./images/billing_dashboard_1.png\" width=720 align=\"center\">\n",
+    "\n",
+    "If you had an account that was provided by your organization and could access the AWS billing dashboard, you may voiew the AWS cost management center that also includes a cost explorer. \n",
+    "\n",
+    "<img src=\"./images/billing_dashboard_2.png\" width=720 align=\"center\">"
    ]
   },
   {
    "cell_type": "markdown",
-   "id": "2e12259f",
+   "id": "ab687d69",
    "metadata": {},
    "source": [
     "# The AWS Calculator"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "id": "b0c11430",
+   "metadata": {},
+   "source": [
+    "AWS Pricing Calculator lets you explore AWS services and create an estimate for the cost of your use cases on AWS. You can model your solutions before building them, explore the price points and calculations behind your estimate, and find the available instance types and contract terms that meet your needs. This enables you to make informed decisions about using AWS. You can plan your AWS costs and usage or price out setting up a new set of instances and services. \n",
+    "\n",
+    "You can view the AWS pricing calculator here: https://calculator.aws/#/addService"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "01e4d87d",
+   "id": "43551c35",
    "metadata": {},
    "outputs": [],
    "source": []

content/intro.md

@@ -39,5 +39,8 @@ Contact [the CLASS team](mailto:class@internet2.edu?subject=Question%20about%20C
 
 Content for this site was authored by John Hicks, Tim Middelkoop, Ananya Ravipati and Amanda Tan at Internet2 in collaboration with the CLASS and research community. [Find out more here](https://internet2.edu/community/research-engagement/internet2-research-engagement-team/)!
 
+## License
+The Cloud Learning and Skills Sessions materials (“Materials”) were created by University Corporation for Advanced Internet Development dba Internet2 (“Internet2”) and are shared under the Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International license (“License”), avail. at https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode. This License permits you to share and modify the Materials, subject to important terms and conditions, which include, without limitation, that (1) you may only use the Materials for non-commercial purposes; (2) if you share the Materials, you must comply with the License’s attribution requirements; and (3), if you modify the Materials, you must distribute your contributions under the same license terms. You agree to review the full License text before accessing the Materials.
+
 
 <!-- #endregion -->