common changes (#253)

* Update variables.md

* Marty updated two scripts

These are the scripts used in the adb-dcat workshop that Marty updated.

* updates to Marty's two scripts

we don't need the add_adb_user procedure since it's now part of the workshop package. There were two copies of the standalone procedure, so I deleted both per Marty's instructions.

* Update load-analyze-rest.md

* adding common cleanup task

* add a building block to the common repo

* changed date in common block

* Update cleanup.md

* test common tasks

* Update generate-rsa-key-pair.md

* Update generate-rsa-key-pair.md

* formatting the new common task

* Update generate-rsa-key-pair.md

* Update cleanup.md

* Updated common from clone

---------

Co-authored-by: Dan Wiliams <[email protected]>

building-blocks/blocks/adb/cleanup/cleanup.md

@@ -1,7 +1,9 @@
 <!--
     {
         "name":"Delete your workshop resources",
-        "description":"Delete some or all of the resources that you created in the workshop"
+        "description":"Delete some or all of the resources that you created in the workshop",
+        "created by": "Lauran K. Serhal",
+        "created on": "February 2024"
     }
 -->
 

building-blocks/blocks/oac/provision/oac-provision.md

@@ -8,102 +8,93 @@
 
 ## Introduction
 
-In this lab, you provision an **Oracle Analytics Cloud (OAC)** instance on Oracle Cloud Infrastructure, which you will use in the final lab to analyze your data.
+> **Important:** _Oracle Analytics Cloud (OAC) is not available with Oracle Cloud Free Tier (Always Free), nor is it supported in Oracle LiveLabs Sandbox hosted environments (the Green button). If you run this workshop using an Always Free database or a LiveLabs Sandbox environment, you can review **Lab 1** and **Lab 5** **without provisioning and using OAC**, and later practice the two labs on **Oracle Autonomous Database** and **OAC** in your organization’s own tenancy._
+
+In this lab, you provision an **Oracle Analytics Cloud (OAC)** instance on Oracle Cloud Infrastructure, which you will use to analyze your data in the **Develop Self-Service Analytics Cloud Dashboards** lab in this workshop.
 
 You will provision your OAC instance with your Oracle Cloud paid or Free Tier **credits**; Oracle Analytics Cloud is not part of the **Always Free** cloud services.
 
-Provisioning an Oracle Analytics Cloud instance can take over **40 minutes**. We position this lab first, so that the OAC instance can provision while you proceed with the following labs. You will later use your OAC instance in the final lab of this workshop, "Develop Self-Service Analytics Cloud Dashboards."
+Provisioning an Oracle Analytics Cloud instance can take over **20+ minutes**. We position this lab first, so that the OAC instance can provision while you proceed with the following labs.
 
-> **Note**: Oracle Analytics Cloud (OAC) is not available with Oracle Cloud Free Tier (Always Free), nor is it supported in Oracle LiveLabs Sandbox hosted environments. If you run this workshop using an Always Free database or LiveLabs Sandbox environment, you can view Labs 1 and 5 on provisioning and using OAC, and later practice these steps on Oracle Autonomous Databases in your organization's tenancy.
+> **Note:** Oracle Analytics Cloud (OAC) is not available with Oracle Cloud Free Tier (Always Free), nor is it supported in Oracle LiveLabs Sandbox hosted environments (the Green button). If you run this workshop using an Always Free database or a LiveLabs Sandbox environment, you can view **Lab 1** and **Lab 5** _without provisioning and using OAC_, and later practice the two labs on **Oracle Autonomous Database** and **OAC** in your organization’s own tenancy.
 
 Also...
 
 > **Note**: If you attend this workshop at CloudWorld or another in-person instructor-led event, your instructor will direct you to skip this lab, providing you a link to  an already-provisioned OAC instance.
 
 Watch our short video that explains how to provision your Oracle Analytics Cloud instance:
 
-> Note: Please disregard the video's reference to "Lab 2."
+> Note: Please disregard the video's reference to **Lab 2**.
 
 [](youtube:ZAqXlhivQCg)
 
-Estimated Time: 40+ minutes.
+Estimated Time: 20+ minutes.
 
 ### Objectives
 - Create an Oracle Analytics Cloud Instance
 
 ## Task 1: Create an Oracle Analytics Cloud (OAC) Instance
 
-Access the Oracle Cloud Infrastructure Console from the **Oracle Home Page** (www.oracle.com) and sign in to your cloud account. Click **View Account** and **Sign in to Cloud**.
+1. Log in to the Oracle Cloud Console as the Cloud Administrator using the instructions in the **Get Started** lab in the **Contents** menu on the left.
 
-![Oracle Console SignIn](./images/cloud-signin.png)
+2. Click the **Profile** icon in the top right side of the banner. 
 
-1. Click the menu icon on the left. Verify that you are signed in as a **Single Sign On** (Federated user) by selecting the **Profile** icon in the top right side of your screen. If your username is shown as:
+    If your username is shown in the following format, then you are **connected** as a **Single Sign On** user.
 
     - oracleidentitycloudservice/<your username>
 
-    Then you are **connected** as a **Single Sign On** user.
-
-    ![Federated User](./images/federated-user.png)
-
-    If your username is shown as:
-
-    -  <your username>
+        ![Federated User](./images/federated-user.png)
 
-    Then you are **signed in** as an **Oracle Cloud Infrastructure** user.
+    If your username is shown in the following format, then you are **signed in** as an **Oracle Cloud Infrastructure** user.
 
-    ![OCI User](./images/oci-user.png)
+    - <your username>
 
-    If your user does not contain the identity provider (**oracleidentitycloudprovider**), please log out and select to authenticate
-    using **Single Sign On**.
-    > To enable using **Oracle Analytics Cloud**, we need to sign on as a **Single Sign-On** (SSO) user.
+    >**Note:** If your user does not contain the identity provider (**oracleidentitycloudprovider**), please log out and select to authenticate
+    using **Single Sign On**. To enable using **Oracle Analytics Cloud**, we need to sign on as a **Single Sign-On** (SSO) user. For more information about federated users, see the [User Provisioning for Federated Users](https://docs.cloud.oracle.com/en-us/iaas/Content/Identity/Tasks/usingscim.htm) documentation.
 
-    ![Oracle Console SignIn](./images/console-signin.png)
+3. Return to the **Console** Home page. Open the Navigation menu and click **Analytics & AI**. Under **Analytics**, click **Analytics Cloud**.
 
-    For more information about federated users, see [User Provisioning for Federated Users](https://docs.cloud.oracle.com/en-us/iaas/Content/Identity/Tasks/usingscim.htm).
-
-2. Return to the **Home Console Page** and navigate to the **Analytics & AI** section and then **Analytics Cloud**.
-
-    ![Oracle Analytics Console](https://oracle-livelabs.github.io/common/images/console/analytics-oac.png " ")
+    ![Navigate to Analytics Cloud.](./images/analytics-cloud.png)
 
     > **Note**: You must be connected as a **Single Sign On** (**Federated user**) user to a tenancy, which has available cloud credits to see this menu item. Local OCI users are not able to do this.
 
-3. Select **Create Instance**.
-
-    Complete the form using the following information:
-
-    - **Compartment**: Select a valid compartment in your tenancy
+4. On the **Analytics Instances** page, select your compartment from the **Compartment** drop-down list in the **List Scope** section. Next, click **Create Instance**.
 
-    - **Instance Name**: [](var:oac_instance_name)
+    ![Click create instance.](./images/create-instance.png)
 
-    - **Description**: `Analytics Instance for the cloud`
+5. On the **Create Analytics Instance** panel, specify the following: 
+    * **Compartment:** Select your compartment.
+    * **Instance Name:** [](var:oac_instance_name).
+    * **Description:** Analytics Instance for the cloud.
+    * **Capacity Type:** OCPU.
+    * **OCPU Count:** 1 (Non Production).
+    * **License Type:** License Included.
+    * **License Edition:** Enterprise Edition.
 
-    - **Feature Set**: Enterprise Analytics (important)
+        ![OAC Instance Creation](./images/create-analytics-instance.png)
 
-    - **Capacity**: 1 - Non Production
-
-    - **License Type**: "Subscribe to a new Analytics Cloud software > license and the Analytics Cloud." (You will use this service as part of the free Oracle Cloud trial that you requested for this workshop).
-
-4. Select **Create**.
-
-    ![OAC Instance Creation](./images/oac-creation-details-new.png)
-
-5. On the **Confirmation** screen, select **Create**.
-
-    The Analytics instance page will be displayed with a status of **CREATING**.
+6. Click **Create**. The Analytics instance page will be displayed with a status of **CREATING**.
 
     ![OAC Instance Creating](./images/oac-creating.png)
 
     ***Reminder***: Provisioning an Oracle Analytics Cloud instance can take over **40 minutes**.
 
-6. The Analytics instance page will be displayed with a status of **ACTIVE**.
+6. When provisioning is complete, the status of your Analytics instance changes to **ACTIVE**.
 
-    ![OAC Instance Active](./images/oac-active.png)
+    ![OAC Instance Active](./images/oac-created.png)
 
-Please proceed to the next lab.
+You may now proceed to the next lab.
 
 ## **Acknowledgements**
 
-- **Author** - Priscila Iruela - Technology Product Strategy Director, Juan Antonio Martin Pedro - Analytics Business Development
-- **Contributors** - Victor Martin, Melanie Ashworth-March, Andrea Zengin
-- **Updated By/Date** - Priscila Iruela, June 2022
-- **Last Updated By/Date** - Rick Green, Principal Developer, Database User Assistance, July 2022
+- **Authors:**
+    * Priscila Iruela - Technology Product Strategy Director
+    * Juan Antonio Martin Pedro - Analytics Business Development
+    * Lauran K. Serhal, Consulting User Assistance Developer
+
+- **Contributors:**
+    * Victor Martin
+    * Melanie Ashworth-March
+    * Andrea Zengin
+
+- **Last Updated By/Date:** Lauran K. Serhal, March 2024