WMS 11009 - Update to new DBActions screenshots - part 2 (#312)

* Adjustments * new dbactions screenshots and minor tweaking * removal of misplaced file .. that happens when you use UI based tools ..
oracle-livelabs · Apr 23, 2024 · 0427a26 · 0427a26
1 parent 8b5f280
commit 0427a26
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 33 deletions.
diff --git a/json/mongodb-api/dbactions/dbactions.md b/json/mongodb-api/dbactions/dbactions.md
@@ -64,7 +64,7 @@ In this lab, you will:
     ![database name](./images/database-name.png " ")
 
 
-7.  On the database page, choose __Database Actions__.
+7.  On the database page, choose __View all database actions__ in the __Database Actions__ menu.
 
     ![choose database actions from the menu](./images/dbactions-button.png " ")
 
@@ -76,12 +76,14 @@ In this lab, you will:
     * SQL - allows you to work with a relational, **SQL-based** view of your data
     * Charts - generate charts over data in Autonomous Database
 
+    All of these tools are under the __Development__ section
+
     ![menu for database actions](./images/dbactions-menu.png " ")
 
 
 ## Task 2: JSON in Database Actions
 
-1. You should be in the Database Actions panel. Click on the **JSON** card
+1. You should be in the Database Actions panel. Click on the **JSON** tool in the Development tab.
 
     ![choose JSON](./images/dbactions-menu-json.png " ")
 
@@ -182,7 +184,7 @@ Now we're going to look at a SQL view of the same data, showing how you can swap
 
     ![back to dbactions](./images/back-to-dbactions.png " ")
 
-    Now we want to open SQL. Click on the SQL panel in Database Actions
+    Now we want to open SQL. Select __SQL__ in the Development section.
 
     ![dbactions menu](./images/dbactions-menu-sql.png " ")
 
@@ -200,7 +202,7 @@ Now we're going to look at a SQL view of the same data, showing how you can swap
 
     ```
     <copy>
-    select * from emp
+    select * from emp;
     </copy>
     ```
     ![simple select command](./images/select-star.png " ")
@@ -216,7 +218,7 @@ Now we're going to look at a SQL view of the same data, showing how you can swap
 
     ```
     <copy>
-    select json_serialize(data) from emp
+    select json_serialize(data) from emp;
     </copy>
     ```
 
@@ -233,7 +235,7 @@ Now we're going to look at a SQL view of the same data, showing how you can swap
     select e.data.name,
            e.data.job,
            e.data.salary
-        from emp e
+        from emp e;
     </copy>
     ```
 
@@ -246,7 +248,7 @@ Now we're going to look at a SQL view of the same data, showing how you can swap
     select  avg (e.data.salary),
             e.data.job
         from emp e
-        group by e.data.job
+        group by e.data.job;
     </copy>
     ```
 
@@ -293,6 +295,7 @@ Now we're going to look at a SQL view of the same data, showing how you can swap
             dataguide => dg
         );
     end;
+    /
     </copy>
     ```
 
@@ -309,7 +312,7 @@ Now we're going to look at a SQL view of the same data, showing how you can swap
     select  sum("salary"),
             "job"
         from emp_view
-        group by "job"
+        group by "job";
     </copy>
     ``` 
 
@@ -340,7 +343,7 @@ Now we're going to look at a SQL view of the same data, showing how you can swap
     select  sum("salary"),
             "job"
         from emp_view
-        group by "job"
+        group by "job";
     </copy>
     ``` 
     On the right Choose "Pie Chart" in the "Chart type" drop-down. You can also select the "3D" option if you like. Click "Create" when done.
@@ -361,4 +364,4 @@ You may now proceed to the next lab to clean up your lab environment.
 
 - **Author** - Roger Ford, Principal Product Manager
 - **Contributors** - Kamryn Vinson, Andres Quintana
-- **Last Updated By/Date** - Hermann Baer, June 2023
+- **Last Updated By/Date** - Hermann Baer, April 2024
diff --git a/json/mongodb-api/dbactions/images/dbactions-button.png b/json/mongodb-api/dbactions/images/dbactions-button.png
diff --git a/json/mongodb-api/dbactions/images/dbactions-menu-charts.png b/json/mongodb-api/dbactions/images/dbactions-menu-charts.png
diff --git a/json/mongodb-api/dbactions/images/dbactions-menu-json.png b/json/mongodb-api/dbactions/images/dbactions-menu-json.png
diff --git a/json/mongodb-api/dbactions/images/dbactions-menu-sql.png b/json/mongodb-api/dbactions/images/dbactions-menu-sql.png
diff --git a/json/mongodb-api/dbactions/images/dbactions-menu.png b/json/mongodb-api/dbactions/images/dbactions-menu.png
diff --git a/json/mongodb-api/install/install.md b/json/mongodb-api/install/install.md
@@ -70,23 +70,23 @@ Copy **ONE** of the following *curl* commands and paste it to the command or ter
 
     ```
     <copy>
-    curl https://downloads.mongodb.com/compass/mongosh-1.9.1-darwin-x64.zip -o mongosh.zip
+    curl https://downloads.mongodb.com/compass/mongosh-2.2.4-darwin-x64.zip -o mongosh.zip
     </copy>
     ```
 
 2. For **Mac with Apple chip**:
 
     ```
     <copy>
-    curl https://downloads.mongodb.com/compass/mongosh-1.9.1-darwin-arm64.zip -o mongosh.zip
+    curl https://downloads.mongodb.com/compass/mongosh-2.2.4-darwin-arm64.zip -o mongosh.zip
     </copy>
     ```
 
 3. For **Windows**:
 
     ```
     <copy>
-    curl https://downloads.mongodb.com/compass/mongosh-1.9.1-win32-x64.zip -o mongosh.zip
+    curl https://downloads.mongodb.com/compass/mongosh-2.2.4-win32-x64.zip -o mongosh.zip
     </copy>
     ```
 
@@ -132,4 +132,4 @@ You may now **proceed to the next lab**.
 
 - **Author** - Roger Ford, Principal Product Manager, Oracle Database
 - **Contributors** - Kamryn Vinson, Andres Quintana
-- **Last Updated By/Date** - Hermann Baer, June 2023
+- **Last Updated By/Date** - Hermann Baer, April 2024
diff --git a/json/mongodb-api/mongoshell/mongoshell.md b/json/mongodb-api/mongoshell/mongoshell.md
@@ -111,16 +111,10 @@ You should now be in Mongo Shell. This is a command-line utility to interact wit
 
 	```
 	<copy>
-	db.emp.insertOne(
-		{ "name":"Smith", "job": "Programmer", "salary": 60000, "email" : "[email protected]" }
-	)
-	</copy>
-	```
-
-	```
-	<copy>
-	db.emp.insertOne(
+	db.emp.insertMany([
+		{ "name":"Smith", "job": "Programmer", "salary": 60000, "email" : "[email protected]" },
 		{ "name":"Miller", "job": "Programmer", "salary": 70000 }
+	]
 	)	
 	</copy>
 	```
@@ -201,4 +195,4 @@ You may now proceed to the next lab.
 
 - **Author** - Roger Ford, Principal Product Manager
 - **Contributors** - Kamryn Vinson, Andres Quintana
-- **Last Updated By/Date** - Hermann Baer, June 2023
+- **Last Updated By/Date** - Hermann Baer, April 2024
diff --git a/json/mongodb-api/provision/images/configuration.png b/json/mongodb-api/provision/images/configuration.png
diff --git a/json/mongodb-api/provision/images/workload-type2.png b/json/mongodb-api/provision/images/workload-type2.png
diff --git a/json/mongodb-api/provision/provision.md b/json/mongodb-api/provision/provision.md
@@ -26,7 +26,7 @@ In this lab, you will:
 
 <if type="freetier">
 
-2. If you are using a Free Trial or Always Free account, and you want to use Always Free Resources, you need to be in a region where Always Free Resources are available. You can see your current default **Region** in the top, right hand corner of the page.
+2. If you are using a Free Trial or Always Free account, and you want to use Always Free Resources, you need to be in the home region of the tenancy. Always Free Resources are only available in the home regions. You can see your current default **Region** in the top, right hand corner of the page.
 
     ![Select region on the far upper-right corner of the page.](./images/region.png " ")
 
@@ -87,16 +87,15 @@ In this lab, you will:
 
 4. Choose a workload type: Select the workload type for your database from the choices:
 
-    - __JSON__ - For this lab, choose __JSON__ as the workload type.
+    - __JSON__ - For this lab, choose __JSON__ as the workload type. Note that the MongoDB API is also available on Autonomous Transaction Processing and Autonomous Data Warehouse. However, Autonomous JSON database was purposely build, designed, and priced for JSON and document store workloads.
 
     ![Choose a workload type.](./images/workload-type2.png " ")
 
 5. Choose a deployment type: Select the deployment type for your database from the choices:
 
-    - __Shared Infrastructure__ - For this lab, choose __Shared Infrastructure__ as the deployment type.
-    - __Dedicated Infrastructure__ - Alternatively, you could have chosen Dedicated Infrastructure as the deployment type.
+    - __Serverless__ - For this lab, choose __Serverless__ as the deployment type. (Autonomous JSON Database is only available on Serverless)
 
-    ![Choose a deployment type.](./images/deployment-type.png " ")
+    ![Choose a deployment type.](./images/workload-type2.png " ")
 
 6. Configure the database:
 
@@ -107,12 +106,14 @@ In this lab, you will:
     - __Always Free__ - For this lab, we recommend you leave Always Free unchecked.
     </if>
     - __Choose database version__ - Select 19c from the database version. Note: This lab should work on 21c AJD database as well.
-    - __OCPU count__ - Number of OCPUs for your service. For this lab, leave the default __1 OCPU__. If you choose an Always Free database, it comes with 1 OCPU.
-    - __Storage (TB)__ - Select your storage capacity in terabytes. For this lab, leave the default __1 TB__ of storage. If you choose an Always Free database, it comes with 20 GB of storage.
-    - __Auto Scaling__ - For this lab, keep auto scaling enabled, to allow the system to automatically use up to three times more CPU and IO resources to meet workload demand.
+    - __ECPU count__ - Number of ECPUs for your service. For this lab, leave the default __2 ECPU__. If you choose an Always Free database, it comes with preconfigured and fixed cpu capabilities.
+    - __Storage__ - Select your storage capacity in gigabytes. For this lab you can reduce the storage to the minimum of __20 GB__ of storage. If you choose an Always Free database, it comes with 20 GB of storage by default.
+    - __Auto Scaling__ - For this lab, keep auto scaling enabled, to allow the system to automatically use up to three times more CPU and IO resources to meet workload demand. (While this will not happen as part of the workshop, we don't know what else you are going to experiment with.)
 
     *Note: You cannot scale up/down an Always Free autonomous database.*
 
+    If you are planning to use this autonomous database solely for the purpose of this workshop, you can reduce the backup retention also to the minimum of __1 day__.
+
     ![Choose the remaining parameters.](./images/configuration.png " ")
 
 7. Create administrator credentials:
@@ -137,6 +138,8 @@ In this lab, you will:
 
     You can then click "Add My IP Address" to allow access from your current IP address. You should avoid any VPN or proxy server access which may mask or change your actual IP address. 
 
+    If you are behind a proxy setup and have issues with access from your local IP address, you can set the CIDR block access to 0.0.0.0/0, which allows access from **everywhere**. This is not recommended for systems used in any production configuration, but sufficient for a workshop.
+
     ![add your IP address](./images/network-access.png " ")
 
 9. Choose a license type:
@@ -187,4 +190,4 @@ You may now **proceed to the next lab**.
 
 - **Author** - Roger Ford, Principal Product Manager, Oracle Database
 - **Contributors** - Kamryn Vinson, Andres Quintana
-- **Last Updated By/Date** - Hermann Baer, June 2023
+- **Last Updated By/Date** - Hermann Baer, April 2024