Merge branch 'oracle-livelabs:main' into main

vltabacaru · Aug 16, 2023 · f97dba4 · f97dba4
2 parents 87e8252 + 474a9c7
commit f97dba4
Show file tree

Hide file tree

Showing 16 changed files with 47 additions and 26 deletions.
diff --git a/mongo-api/cleanup-ocw/cleanup-free-ocw.md b/mongo-api/cleanup-ocw/cleanup-free-ocw.md
@@ -9,7 +9,7 @@ The main three elements that we will cleanup are the **Autonomous JSON Database*
 Estimated Time: 5 minutes
 
 Watch the video below for a quick walk-through of the lab.
-[Clean Up](videohub:1_m0vdw69z)
+[Clean up Content](videohub:1_pgtct6n7)
 
 ### Objectives
 
@@ -99,4 +99,4 @@ In this lab, you will:
 ## Acknowledgements
 * **Author** - Valentin Leonard Tabacaru, Database Product Management and Priscila Iruela, Technology Product Strategy Director
 * **Contributors** - Victor Martin Alvarez, Technology Product Strategy Director
-* **Last Updated By/Date** - Priscila Iruela, April 2023
+* **Last Updated By/Date** - Priscila Iruela, July 2023
diff --git a/mongo-api/cleanup-ocw/cleanup-ocw.md b/mongo-api/cleanup-ocw/cleanup-ocw.md
@@ -8,6 +8,9 @@ The main two elements that we will cleanup are the **Autonomous JSON Database**
 
 Estimated Time: 5 minutes
 
+Watch the video below for a quick walk-through of the lab.
+[Clean up Content](videohub:1_pgtct6n7)
+
 ### Objectives
 
 In this lab, you will:
@@ -69,4 +72,4 @@ In this lab, you will:
 ## Acknowledgements
 * **Author** - Valentin Leonard Tabacaru, Database Product Management and Priscila Iruela, Technology Product Strategy Director
 * **Contributors** - Victor Martin Alvarez, Technology Product Strategy Director
-* **Last Updated By/Date** - Priscila Iruela, April 2023
+* **Last Updated By/Date** - Priscila Iruela, July 2023
diff --git a/mongo-api/infra-ocw/images/creation-ajson-dashboard.png b/mongo-api/infra-ocw/images/creation-ajson-dashboard.png
diff --git a/mongo-api/infra-ocw/images/creation-ajson-license.png b/mongo-api/infra-ocw/images/creation-ajson-license.png
diff --git a/mongo-api/infra-ocw/infra-free-ocw.md b/mongo-api/infra-ocw/infra-free-ocw.md
@@ -11,7 +11,8 @@ We will prepare the documents to be capable of accessing to **SODA APIs**, in pa
 Estimated Time: 40 minutes
 
 Watch the video below for a quick walk-through of the lab.
-[Infrastructure Configuration](videohub:1_8a593q4e)
+[Infrastructure Configuration](videohub:1_pcbhdbtb)
+
 
 ### Objectives
 
@@ -220,7 +221,7 @@ On the Instance Details page, copy Public IP Address in your notes.
     <copy>AJDEV</copy>
     ```
     - Choose a workload type: JSON
-    - Choose a deployment type: Shared Infrastructure
+    - Choose a deployment type: Serverless
     - Choose database version: 19c
     - OCPU count: 1
     - Storage (TB): 1 or 0.02 if you are using a Trial account
@@ -252,9 +253,9 @@ On the Instance Details page, copy Public IP Address in your notes.
 
     ![Creation AJD Network](./images/creation-ajson-network-public-ip.png)
 
-6. Under **Choose a license type**:
+6. Under **Choose license and Oracle Datavase editiont**:
 
-    - License included
+    - This Database is provisioned with **License included** license type.
 
     ![Creation AJD License](./images/creation-ajson-license.png)
 
@@ -530,4 +531,4 @@ You may now **proceed to the next lab**.
 ## Acknowledgements
 * **Author** - Valentin Leonard Tabacaru, Database Product Management and Priscila Iruela, Technology Product Strategy Director
 * **Contributors** - Victor Martin Alvarez, Technology Product Strategy Director
-* **Last Updated By/Date** - Priscila Iruela, April 2023
+* **Last Updated By/Date** - Priscila Iruela, August 2023
diff --git a/mongo-api/infra-ocw/infra-ocw.md b/mongo-api/infra-ocw/infra-ocw.md
@@ -10,6 +10,9 @@ We will prepare the documents to be capable of accessing to **SODA APIs**, in pa
 
 Estimated Time: 30 minutes
 
+Watch the video below for a quick walk-through of the lab.
+[Infrastructure Configuration](videohub:1_pcbhdbtb)
+
 ### Objectives
 
 In this lab, you will:
@@ -153,7 +156,7 @@ On the Instance Details page, copy Public IP Address in your notes.
     <copy>XXX0AJD</copy>
     ```
     - Choose a workload type: JSON
-    - Choose a deployment type: Shared Infrastructure
+    - Choose a deployment type: Serverless
     - Choose database version: 19c
     - OCPU count: 1
     - Storage (TB): 1 or 0.02 if you are using a Trial account
@@ -187,7 +190,7 @@ On the Instance Details page, copy Public IP Address in your notes.
 
 6. Under **Choose a license type**:
 
-    - License included
+    - This Database is provisioned with **License included** license type.
 
     ![Creation AJD License](./images/creation-ajson-license.png)
 
@@ -452,4 +455,4 @@ You may now **proceed to the next lab**.
 ## Acknowledgements
 * **Author** - Valentin Leonard Tabacaru, Database Product Management and Priscila Iruela, Technology Product Strategy Director
 * **Contributors** - Victor Martin Alvarez, Technology Product Strategy Director
-* **Last Updated By/Date** - Priscila Iruela, April 2023
+* **Last Updated By/Date** - Priscila Iruela, July 2023
diff --git a/mongo-api/intro-ocw/intro-ocw.md b/mongo-api/intro-ocw/intro-ocw.md
@@ -37,4 +37,4 @@ Here is a video to help with the Oracle Trial Sign Up Process:
 ## Acknowledgements
 * **Author** - Valentin Leonard Tabacaru, Database Product Management and Priscila Iruela, Technology Product Strategy Director
 * **Contributors** - Victor Martin Alvarez, Technology Product Strategy Director
-* **Last Updated By/Date** - Priscila Iruela, April 2023
+* **Last Updated By/Date** - Priscila Iruela, August 2023
diff --git a/mongo-api/mongo-api-ocw/images/curl-company-five-six.png b/mongo-api/mongo-api-ocw/images/curl-company-five-six.png
diff --git a/mongo-api/mongo-api-ocw/images/database-actions-five-six.png b/mongo-api/mongo-api-ocw/images/database-actions-five-six.png
diff --git a/mongo-api/mongo-api-ocw/images/microservice-mongoapi-mongocollection.png b/mongo-api/mongo-api-ocw/images/microservice-mongoapi-mongocollection.png
diff --git a/mongo-api/mongo-api-ocw/mongo-api-free-ocw.md b/mongo-api/mongo-api-ocw/mongo-api-free-ocw.md
@@ -21,7 +21,7 @@ To learn more about this capability go to he following content:
 Estimated Time: 20 minutes
 
 Watch the video below for a quick walk-through of the lab.
-[Python micro-service with the new MongoAPI capability](videohub:1_44ff0wv1)
+[MongoApi app Content](videohub:1_8ras98s0)
 
 ### Objectives
 
@@ -312,7 +312,7 @@ In this lab, you will:
             --url http://localhost:5000/oracle/mongo/ \
             --header 'content-type: application/json' \
             --data '{
-        "company":"Company Nine",
+        "company":"Company Five",
         "address": {
             "street": "25 Severo Ochoa",
             "city": "Málaga",
@@ -325,7 +325,7 @@ In this lab, you will:
             --url http://localhost:5000/oracle/mongo/ \
             --header 'content-type: application/json' \
             --data '{
-        "company":"Company Ten",
+        "company":"Company Six",
         "address": {
             "street": "3 Victor Emanouil",
             "city": "Alexandria",
@@ -337,7 +337,7 @@ In this lab, you will:
     </copy>
     ````
 
-    ![POST company nine and ten curl](./images/curl-company-nine-ten.png)
+    ![POST company five and six curl](./images/curl-company-five-six.png)
 
 9. Use the **web browser** on your laptop to navigate to your micro-service to list JSON documents inserted into Oracle Autonomous Database using MongoAPI capability.
 
@@ -350,7 +350,7 @@ In this lab, you will:
 
 10. We can check that the **Two New Companies** (Nice and Ten) are being stored on our **Autonomous JSON Database**, on **MongoCollection** that we created in Task 3 of this Lab. Go to **Database Actions** again and click green **Play** button.
 
-    ![MongoDB Companies Added Database Actions](./images/database-actions-nine-ten.png)
+    ![MongoDB Companies Added Database Actions](./images/database-actions-five-six.png)
 
 11. Go to **cloud shell terminal.** We will **stop insert-mongoapi-app.py** running the following command.
 
@@ -367,4 +367,4 @@ You may now **proceed to the next lab**.
 ## Acknowledgements
 * **Author** - Valentin Leonard Tabacaru, Database Product Management and Priscila Iruela, Technology Product Strategy Director
 * **Contributors** - Victor Martin Alvarez, Technology Product Strategy Director
-* **Last Updated By/Date** - Priscila Iruela, April 2023
+* **Last Updated By/Date** - Priscila Iruela, July 2023
diff --git a/mongo-api/mongo-api-ocw/mongo-api-ocw.md b/mongo-api/mongo-api-ocw/mongo-api-ocw.md
@@ -20,6 +20,9 @@ To learn more about this capability go to he following content:
 
 Estimated Time: 20 minutes
 
+Watch the video below for a quick walk-through of the lab.
+[MongoApi app Content](videohub:1_8ras98s0)
+
 ### Objectives
 
 In this lab, you will:
@@ -304,7 +307,7 @@ In this lab, you will:
             --url http://localhost:5000/oracle/mongo/ \
             --header 'content-type: application/json' \
             --data '{
-        "company":"Company Nine",
+        "company":"Company Five",
         "address": {
             "street": "25 Severo Ochoa",
             "city": "Málaga",
@@ -317,7 +320,7 @@ In this lab, you will:
             --url http://localhost:5000/oracle/mongo/ \
             --header 'content-type: application/json' \
             --data '{
-        "company":"Company Ten",
+        "company":"Company Six",
         "address": {
             "street": "3 Victor Emanouil",
             "city": "Alexandria",
@@ -329,7 +332,7 @@ In this lab, you will:
     </copy>
     ````
 
-    ![POST company nine and ten curl](./images/curl-company-nine-ten.png)
+    ![POST company five and six curl](./images/curl-company-five-six.png)
 
 9. Use the **web browser** on your laptop to navigate to your micro-service to list JSON documents inserted into Oracle Autonomous Database using MongoAPI capability.
 
@@ -342,7 +345,7 @@ In this lab, you will:
 
 10. We can check that the **Two New Companies** (Nice and Ten) are being stored on our **Autonomous JSON Database**, on **MongoCollection** that we created in Task 3 of this Lab. Go to **Database Actions** again and click green **Play** button.
 
-    ![MongoDB Companies Added Database Actions](./images/database-actions-nine-ten.png)
+    ![MongoDB Companies Added Database Actions](./images/database-actions-five-six.png)
 
 11. Go to **cloud shell terminal.** We will **stop insert-mongoapi-app.py** running the following command.
 
@@ -359,4 +362,4 @@ You may now **proceed to the next lab**.
 ## Acknowledgements
 * **Author** - Valentin Leonard Tabacaru, Database Product Management and Priscila Iruela, Technology Product Strategy Director
 * **Contributors** - Victor Martin Alvarez, Technology Product Strategy Director
-* **Last Updated By/Date** - Priscila Iruela, April 2023
+* **Last Updated By/Date** - Priscila Iruela, July 2023
diff --git a/mongo-api/simple-app-ocw/simple-app-free-ocw.md b/mongo-api/simple-app-ocw/simple-app-free-ocw.md
@@ -11,7 +11,7 @@ SODA is a set of NoSQL-style APIs that let you create and store collections of d
 Estimated Time: 40 minutes
 
 Watch the video below for a quick walk-through of the lab.
-[Python SODA micro-service with Autonomous Database for JSON](videohub:1_2ugpfxe2)
+[Simple app Content](videohub:1_jruevt6y)
 
 ### Objectives
 
@@ -396,4 +396,4 @@ You may now **proceed to the next lab**.
 ## Acknowledgements
 * **Author** - Valentin Leonard Tabacaru, Database Product Management and Priscila Iruela, Technology Product Strategy Director
 * **Contributors** - Victor Martin Alvarez, Technology Product Strategy Director
-* **Last Updated By/Date** - Priscila Iruela, April 2023
+* **Last Updated By/Date** - Priscila Iruela, July 2023
diff --git a/mongo-api/simple-app-ocw/simple-app-ocw.md b/mongo-api/simple-app-ocw/simple-app-ocw.md
@@ -10,6 +10,9 @@ SODA is a set of NoSQL-style APIs that let you create and store collections of d
 
 Estimated Time: 30 minutes
 
+Watch the video below for a quick walk-through of the lab.
+[Simple app Content](videohub:1_jruevt6y)
+
 ### Objectives
 
 In this lab, you will:
@@ -395,4 +398,4 @@ You may now **proceed to the next lab**.
 ## Acknowledgements
 * **Author** - Valentin Leonard Tabacaru, Database Product Management and Priscila Iruela, Technology Product Strategy Director
 * **Contributors** - Victor Martin Alvarez, Technology Product Strategy Director
-* **Last Updated By/Date** - Priscila Iruela, April 2023
+* **Last Updated By/Date** - Priscila Iruela, July 2023
diff --git a/mongo-api/workshops/ocw23-sandbox/manifest.json b/mongo-api/workshops/ocw23-sandbox/manifest.json
@@ -26,6 +26,10 @@
             "description": "In this lab we will cleanup the infrastructure that we created in Lab 1 and used to run this workshop.",
             "filename": "./../../cleanup-ocw/cleanup-ocw.md"
         },
+        {
+            "title": "Need help",
+            "filename": "https://oracle-livelabs.github.io/common/labs/need-help/need-help-livelabs.md"
+        },
         {
             "title": "Oracle CloudWorld 2023 - Get Help",
             "filename": "https://oracle-livelabs.github.io/common/support/ocwsupportlab/ocwsupportlab.md"

diff --git a/mongo-api/workshops/ocw23-tenancy/manifest.json b/mongo-api/workshops/ocw23-tenancy/manifest.json
@@ -30,6 +30,10 @@
             "description": "In this lab we will cleanup the infrastructure that we created in Lab 1 and used to run this workshop.",
             "filename": "./../../cleanup-ocw/cleanup-free-ocw.md"
         },
+        {
+            "title": "Need help",
+            "filename": "https://oracle-livelabs.github.io/common/labs/need-help/need-help-livelabs.md"
+        },
         {
             "title": "Oracle CloudWorld 2023 - Get Help",
             "filename": "https://oracle-livelabs.github.io/common/support/ocwsupportlab/ocwsupportlab.md"