Merge branch 'oracle-livelabs:main' into main

vltabacaru · Apr 10, 2024 · 83e9a53 · 83e9a53
2 parents 016c59b + 1b8df99
commit 83e9a53
Show file tree

Hide file tree

Showing 16 changed files with 100 additions and 65 deletions.
diff --git a/ac-with-ucp/.vscode/settings.json b/ac-with-ucp/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "liveServer.settings.port": 5501
+}
diff --git a/ac-with-ucp/introduction/introduction.md b/ac-with-ucp/introduction/introduction.md
@@ -57,4 +57,4 @@ Here is a video to help with the Oracle Trial Sign Up Process:
 ## Acknowledgements
 * **Author** - François Pons, Senior Principal Product Manager
 * **Contributors** - Andrei Manoliu, Principal Product Manager
-* **Last Updated By/Date** - François Pons, September 2022
+* **Last Updated By/Date** - François Pons, March 2024
diff --git a/ac-with-ucp/lab1-provision-env/lab1-provision-env.md b/ac-with-ucp/lab1-provision-env/lab1-provision-env.md
@@ -111,4 +111,4 @@ Click on the link below to download the Resource Manager zip files you need to b
 ## Acknowledgements
 * **Author** - François Pons, Senior Principal Product Manager
 * **Contributors** - Andrei Manoliu, Principal Product Manager
-* **Last Updated By/Date** - François Pons, September,15th 2022
+* **Last Updated By/Date** - François Pons, March 2024
diff --git a/ac-with-ucp/lab2-configure-env/lab2-configure-env.md b/ac-with-ucp/lab2-configure-env/lab2-configure-env.md
@@ -8,7 +8,7 @@ In this lab, we will customize the environment that will be used to run the rest
 
 There are three main elements in our environment:
 
-* **VCN-DEMORAC** : a **Virtual Cloud Network (VCN)** has been pre-created with the required network topology components inside the Oracle Cloud (Subnets, Route Tables, Security Lists, Gateways, etc.)
+* **VCN-DEMORAC** (or another automatically generated name if you run in a sandbox environment): a **Virtual Cloud Network (VCN)** has been pre-created with the required network topology components inside the Oracle Cloud (Subnets, Route Tables, Security Lists, Gateways, etc.)
 * **dbrac** : a two-node Database Cloud Service (aka Oracle Base RAC Database) **RAC database** with **Grid Infrastructure** (which should have also been pre-created)
 * **demotac** : a **Compute instance** Virtual Machine hosting our demo application
 
@@ -23,7 +23,7 @@ In this lab, you will:
 * Complete the network configuration
 </if>
 <if type="sandbox">
-* Review the network configuration
+* Understand important points in the network configuration
 </if>
 * Configure RAC database services
 * Create a demo schema in the database
@@ -45,14 +45,14 @@ This lab assumes you have:
 
 ## Task 1: Configure the Network for Oracle Net
 
+<if type="sandbox">
+***As you are running in a sandbox environment, you should skip this task and go directly to Task 2. Security restrictions in sandbox environments do not allow the creation of Network Security Groups. However, all required ports are open for the workshop to work. You can read the instructions in this task to better understand which ports need to be open and for which purpose.***
+</if>
+
   1. Create a **Network Security Group** rule allowing Oracle Net connectivity
 
     * It is necessary to **open TCP port 1521** in the VCN to allow the demo application to connect to the database. We can do this by configuring a **Network Security Group Rule** and adding the NSG to the database.
 
-    <if type="sandbox">
-    * *As you are running this workshop in a sandbox environment, the configuration of the Virtual Cloud Network, Network Security Group, and the association between the NSG and the database have been completed automatically. For a better understanding of what was done, follow the instructions in this task without actually creating these components. Changing them will result in errors throughout the workshop.*
-    </if>
-
     * From the Oracle Cloud web console, go to **Networking** and select your VCN. It should be named **VCN-DEMORAC**.
 
       ![OCI console menu vcn](https://oracle-livelabs.github.io/common/images/console/networking-vcn.png " ")
@@ -134,6 +134,14 @@ This lab assumes you have:
 
   1. Connect to Cloud shell from the details page of database **dbrac**
 
+    * From the Oracle Cloud web console, go to **Oracle Database**
+
+      ![OCI console menu database](https://oracle-livelabs.github.io/common/images/console/database-basedb.png " ")
+
+    * Select database **dbrac**
+
+      ![Select dbrac database](./images/task1/select-dbrac-database.png " ")
+
     * Click on the Cloud Shell icon from the top right of the OCI console
 
         ![Cloud Shell icon](./images/task2/cloud-shell-icon.png " ")
@@ -205,7 +213,7 @@ This lab assumes you have:
     * It is necessary to **open TCP port 6200** in the VCN to allow **Fast Application Notification Events** to flow from the cluster database to the client application. We can do this by adding a **Network Security Group Rule** to the database NSG.
 
     <if type="sandbox">
-    * *As you are running this workshop in a sandbox, this network configuration has already been done automatically, but you should still follow the instructions in this step to review and understand what was done without actually creating the rule to open port 6200.*
+    * *As you are running this workshop in a sandbox, you should skip this step. The port is open by an automatically created Security List. You can read the instructions in this step to review and understand what normally needs to be done manually to open port 6200.*
     </if>
 
     * From the OCI console under **Networking** > **Virtual Cloud Networks**, select the VCN (**VCN-DEMORAC**)
@@ -423,6 +431,16 @@ This lab assumes you have:
   1. Understand the demo application directory structure
 
 
+  <if type="sandbox">
+  * ***As you are running this workshop in a sandbox environment, you will have to change the connect strings in SQL and Java files.
+    **.dnsdemorac.vcndemorac** will have to be replaced by **.pub.ll12345vcn** where **12345** is your LiveLab reservation ID. (Note the two lower case **L** followed by reservation number.)
+    The following command may help you to make this change in all the files of the current folder and its subfolders:***
+    ````
+    <copy>grep -lir dnsdemorac.vcndemorac | xargs -i@ sed -i 's/dnsdemorac.vcndemorac/pub.ll12345vcn/g' @</copy>
+    ````
+  </if>
+
+
     * Using noVNC, connect to the remote desktop of the client machine **demotac** as user **oracle**.
 
         ![Remote Desktop](./images/task4/remote-desktop.png " ")
@@ -441,7 +459,9 @@ This lab assumes you have:
         ac/sql       : SQL scripts to be used in next labs
         ```
 
-
+    <if type="sandbox">
+    * As you are running this workshop in a sandbox environment, you should change the connect strings in SQL and Java files before running them. Replace ***.dnsdemorac.vcndemorac*** by ***.pub.ll12345vcn*** where ***12345*** is your LiveLab reservation ID.
+    </if>
 
   2. Open a terminal window (as oracle) and change directory to $HOME/work/ac/ddl
 
@@ -612,6 +632,18 @@ This lab assumes you have:
 
     * Verify the value of strScan and change it in MyCUPDemo.java if necessary.
 
+    <if type="sandbox">
+    * ***As you are running this workshop in a sandbox environment, you should change the connect string in the application code. Replace **.dnsdemorac.vcndemorac** by **.pub.ll12345vcn** where **12345** is your LiveLab reservation ID. Note the two lower case L.
+    For instance:***
+
+    ```
+    //String strScan = "ruby-scan.dnsdemorac.vcndemorac.oraclevcn.com";
+    String strScan = "ruby-scan.pub.ll12345vcn.oraclevcn.com";
+    //String strService = strAlias + ".dnsdemorac.vcndemorac.oraclevcn.com";
+    String strService = strAlias + ".pub.ll12345vcn.oraclevcn.com";
+    ```
+    </if>
+
 
   4. Compile the demo application
 
@@ -635,4 +667,4 @@ This lab assumes you have:
 ## Acknowledgements
 * **Author** - François Pons, Senior Principal Product Manager
 * **Contributors** - Andrei Manoliu, Principal Product Manager
-* **Last Updated By/Date** - François Pons, September, 15th 2022
+* **Last Updated By/Date** - François Pons, March 2024
diff --git a/backup-recovery/database-backup-services/database-backup-services.md b/backup-recovery/database-backup-services/database-backup-services.md
@@ -47,7 +47,7 @@ Estimated Time: 2 hours
 4. You can download the backup module from [Oracle Cloud Backup Downloads](https://www.oracle.com/database/technologies/oracle-cloud-backup-downloads.html), however, to load the zip through Cloud Shell, you will use this `wget` command:
 
     ```
-    [oracle@workshop downloads]$ <copy>wget https://objectstorage.us-ashburn-1.oraclecloud.com/p/VEKec7t0mGwBkJX92Jn0nMptuXIlEpJ5XJA-A6C9PymRgY2LhKbjWqHeB5rVBbaV/n/c4u04/b/livelabsfiles/o/data-management-library-files/opc_installer.zip</copy>
+    [oracle@workshop downloads]$ <copy>wget https://c4u04.objectstorage.us-ashburn-1.oci.customer-oci.com/p/EcTjWk2IuZPZeNnD_fYMcgUhdNDIDA6rt9gaFj_WZMiL7VvxPBNMY60837hu5hga/n/c4u04/b/livelabsfiles/o/data-management-library-files/opc_installer.zip</copy>
     ```
 
 5. Extract the contents of the zip file. The file contains two directories: oci\_installer and opc\_installer, and a README file.
@@ -167,17 +167,17 @@ Run the installer, **oci\_install.jar** to install the backup module. This examp
 
 The following table lists the required and some optional parameters.
 
-| **Parameter**             | **Description**                                              | **Required or Optional**|
-| ------------------------- | ------------------------------------------------------------ |-------------------------|
-| -host                     | End point of the Oracle Cloud Infrastructure account. Constructed as https://objectstorage.`<region>`.oraclecloud.com. See [this reference](https://docs.cloud.oracle.com/en-us/iaas/Content/General/Concepts/regions.htm) for the region codes.       |Required                 |
-| -vtKeyFile               | File that contains the private key used to authenticate Oracle Cloud Infrastructure API requests. The key file must be in PEM format. |Required|
-| -pubFingerPrint           | Finger print of the public key paired with the specified private key. |Required|
-| -tOCID          | Tenancy OCID for the Oracle Cloud Infrastructure account.    |Required|
-| -uOCID          | User OCID for the Oracle Cloud Infrastructure account.       |Required|
-| -cOCID          | Resource compartment ID for the Oracle Cloud Infrastructure account. |Required|
-| -bucket         | Name of the bucket in which backups are stored. If this bucket does not exist, then the installer creates it. When this parameter is omitted, a default bucket is automatically created to store backups |Optional|
-| -walletDir      | Directory in which Oracle Cloud Infrastructure Object Storage credentials are stored. |Required|
-| -libDir         | Directory in which the system backup to tape (SBT) library used for backups and restores with Oracle Cloud Infrastructure is stored. |Required|
+| **Parameter**   | **Description**                                                                                                                                                                                                                                  | **Required or Optional** |
+| --------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------ |
+| -host           | End point of the Oracle Cloud Infrastructure account. Constructed as https://objectstorage.`<region>`.oraclecloud.com. See [this reference](https://docs.cloud.oracle.com/en-us/iaas/Content/General/Concepts/regions.htm) for the region codes. | Required                 |
+| -vtKeyFile      | File that contains the private key used to authenticate Oracle Cloud Infrastructure API requests. The key file must be in PEM format.                                                                                                            | Required                 |
+| -pubFingerPrint | Finger print of the public key paired with the specified private key.                                                                                                                                                                            | Required                 |
+| -tOCID          | Tenancy OCID for the Oracle Cloud Infrastructure account.                                                                                                                                                                                        | Required                 |
+| -uOCID          | User OCID for the Oracle Cloud Infrastructure account.                                                                                                                                                                                           | Required                 |
+| -cOCID          | Resource compartment ID for the Oracle Cloud Infrastructure account.                                                                                                                                                                             | Required                 |
+| -bucket         | Name of the bucket in which backups are stored. If this bucket does not exist, then the installer creates it. When this parameter is omitted, a default bucket is automatically created to store backups                                         | Optional                 |
+| -walletDir      | Directory in which Oracle Cloud Infrastructure Object Storage credentials are stored.                                                                                                                                                            | Required                 |
+| -libDir         | Directory in which the system backup to tape (SBT) library used for backups and restores with Oracle Cloud Infrastructure is stored.                                                                                                             | Required                 |
 
 
 The installation creates a configuration file *opcORCL.ora* and wallet directory *oci\_wallet* and places these in $ORACLE_HOME/dbs.

diff --git a/hybrid-adg/setup-environment/setup-environment.md b/hybrid-adg/setup-environment/setup-environment.md
@@ -18,7 +18,7 @@ This lab assumes you have already completed the following:
 
 Click on the link below to download the Resource Manager zip files you need to build your environment.
 
-- [db19c-primary-19.20.zip](https://objectstorage.us-ashburn-1.oraclecloud.com/p/VEKec7t0mGwBkJX92Jn0nMptuXIlEpJ5XJA-A6C9PymRgY2LhKbjWqHeB5rVBbaV/n/c4u04/b/livelabsfiles/o/data-management-library-files/db19c-primary-19.20.zip) - Packaged terraform primary database instance creation script.
+- [db19c-primary-19.20.zip](https://c4u04.objectstorage.us-ashburn-1.oci.customer-oci.com/p/EcTjWk2IuZPZeNnD_fYMcgUhdNDIDA6rt9gaFj_WZMiL7VvxPBNMY60837hu5hga/n/c4u04/b/livelabsfiles/o/data-management-library-files/db19c-primary-19.20.zip) - Packaged terraform primary database instance creation script.
 
 
 ## Task 1: Prepare the Primary Database

diff --git a/hybrid-adg/test-with-adg/test-with-adg.md b/hybrid-adg/test-with-adg/test-with-adg.md
@@ -204,8 +204,8 @@ There are several ways to check the lag between the primary and standby.
 
     ```
     <copy>
-    wget https://objectstorage.us-ashburn-1.oraclecloud.com/p/VEKec7t0mGwBkJX92Jn0nMptuXIlEpJ5XJA-A6C9PymRgY2LhKbjWqHeB5rVBbaV/n/c4u04/b/livelabsfiles/o/data-management-library-files/workload.sh
-    wget https://objectstorage.us-ashburn-1.oraclecloud.com/p/VEKec7t0mGwBkJX92Jn0nMptuXIlEpJ5XJA-A6C9PymRgY2LhKbjWqHeB5rVBbaV/n/c4u04/b/livelabsfiles/o/data-management-library-files/scn.sql
+    wget https://c4u04.objectstorage.us-ashburn-1.oci.customer-oci.com/p/EcTjWk2IuZPZeNnD_fYMcgUhdNDIDA6rt9gaFj_WZMiL7VvxPBNMY60837hu5hga/n/c4u04/b/livelabsfiles/o/data-management-library-files/workload.sh
+    wget https://c4u04.objectstorage.us-ashburn-1.oci.customer-oci.com/p/EcTjWk2IuZPZeNnD_fYMcgUhdNDIDA6rt9gaFj_WZMiL7VvxPBNMY60837hu5hga/n/c4u04/b/livelabsfiles/o/data-management-library-files/scn.sql
     </copy>
     ```
 
@@ -214,8 +214,8 @@ There are several ways to check the lag between the primary and standby.
 2. From on-premise side, run as **oracle** user, download scripts using the command you copied.
 
     ```
-    [oracle@primary ~]$ wget https://objectstorage.us-ashburn-1.oraclecloud.com/p/VEKec7t0mGwBkJX92Jn0nMptuXIlEpJ5XJA-A6C9PymRgY2LhKbjWqHeB5rVBbaV/n/c4u04/b/livelabsfiles/o/data-management-library-files/workload.sh
-    --2020-10-31 02:48:08--  https://objectstorage.us-ashburn-1.oraclecloud.com/p/VEKec7t0mGwBkJX92Jn0nMptuXIlEpJ5XJA-A6C9PymRgY2LhKbjWqHeB5rVBbaV/n/c4u04/b/livelabsfiles/o/data-management-library-files/workload.sh
+    [oracle@primary ~]$ wget https://c4u04.objectstorage.us-ashburn-1.oci.customer-oci.com/p/EcTjWk2IuZPZeNnD_fYMcgUhdNDIDA6rt9gaFj_WZMiL7VvxPBNMY60837hu5hga/n/c4u04/b/livelabsfiles/o/data-management-library-files/workload.sh
+    --2020-10-31 02:48:08--  https://c4u04.objectstorage.us-ashburn-1.oci.customer-oci.com/p/EcTjWk2IuZPZeNnD_fYMcgUhdNDIDA6rt9gaFj_WZMiL7VvxPBNMY60837hu5hga/n/c4u04/b/livelabsfiles/o/data-management-library-files/workload.sh
     Resolving objectstorage.us-ashburn-1.oraclecloud.com (objectstorage.us-ashburn-1.oraclecloud.com)... 134.70.31.247, 134.70.27.247, 134.70.35.189
     Connecting to objectstorage.us-ashburn-1.oraclecloud.com (objectstorage.us-ashburn-1.oraclecloud.com)|134.70.31.247|:443... connected.
     HTTP request sent, awaiting response... 200 OK
@@ -226,8 +226,8 @@ There are several ways to check the lag between the primary and standby.
     
     2020-10-31 02:48:09 (10.5 MB/s) - ‘workload.sh’ saved [1442/1442]
     
-    [oracle@primary ~]$ wget https://objectstorage.us-ashburn-1.oraclecloud.com/p/VEKec7t0mGwBkJX92Jn0nMptuXIlEpJ5XJA-A6C9PymRgY2LhKbjWqHeB5rVBbaV/n/c4u04/b/livelabsfiles/o/data-management-library-files/scn.sql
-    --2020-10-31 02:48:29--  https://objectstorage.us-ashburn-1.oraclecloud.com/p/VEKec7t0mGwBkJX92Jn0nMptuXIlEpJ5XJA-A6C9PymRgY2LhKbjWqHeB5rVBbaV/n/c4u04/b/livelabsfiles/o/data-management-library-files/scn.sql
+    [oracle@primary ~]$ wget https://c4u04.objectstorage.us-ashburn-1.oci.customer-oci.com/p/EcTjWk2IuZPZeNnD_fYMcgUhdNDIDA6rt9gaFj_WZMiL7VvxPBNMY60837hu5hga/n/c4u04/b/livelabsfiles/o/data-management-library-files/scn.sql
+    --2020-10-31 02:48:29--  https://c4u04.objectstorage.us-ashburn-1.oci.customer-oci.com/p/EcTjWk2IuZPZeNnD_fYMcgUhdNDIDA6rt9gaFj_WZMiL7VvxPBNMY60837hu5hga/n/c4u04/b/livelabsfiles/o/data-management-library-files/scn.sql
     Resolving objectstorage.us-ashburn-1.oraclecloud.com (objectstorage.us-ashburn-1.oraclecloud.com)... 134.70.35.189, 134.70.31.247, 134.70.27.247
     Connecting to objectstorage.us-ashburn-1.oraclecloud.com (objectstorage.us-ashburn-1.oraclecloud.com)|134.70.35.189|:443... connected.
     HTTP request sent, awaiting response... 200 OK