Merge remote-tracking branch 'upstream/main'

goldengate-microservices21c/create-replication/create-replication.md

@@ -84,7 +84,14 @@ This lab assumes you have:
 
     ![result of entering credentials](./images/ora-cred-result1.png " ")
 
-    You can see the login take place, and the section *TRANDATA* appear on the screen.
+    You can see the login takes place, and the section *TRANDATA* appears on the screen.
+
+    **Troubelshooting**: In case you get an error when testing the connection to the database, double-check your listener configuration is set up correctly, as already explained in the *Discover the Environment section*:
+
+    - In the terminal window, connect to the database as system: ```sqlplus system/Welcome#123 as sysdba```
+    - configure the listener: ```alter system set LOCAL_LISTENER='' scope=both;```
+    - exit sqlplus with ```end```
+    - restart the listener with ```lsnrctl stop``` followed by ```lsnrctl start```
 
 8. We now need to add a TRANDATA table to the database to acquire the transaction records in the database.
     - Click on the **+** symbol besides the *TRANDATA Information* title

goldengate-microservices21c/discover/discover.md

@@ -86,16 +86,25 @@ This lab assumes you have:
     - **monitor_kafka.sh**: read the kafka topic EMPLOYEES where we'll be inserting the changes coming from the Oracle Database.
     - **demo_reset.sh**: completely reset the lab environment to restart the lab execution.  You can use this script to restart the lab execution with a fresh setup.
 
-7. Access the Oracle database directly using **sqlplus** from the command line. Below 2 alternative database users at your disposal:
+7. Access the Oracle database directly using **sqlplus** from the command line:
+    ```
+    <copy>sqlplus system/Welcome#123 as sysdba </copy>
+    ```
 
+8. Make sure the listener is set up correctly, by issuing the following command:
     ```
-    <copy>sqlplus c##ggadmin/Welcome#123 </copy>
-    <copy>sqlplus sys/Welcome#123 as sysdba </copy>
+    <copy>alter system set LOCAL_LISTENER='' scope=both;</copy>
     ```
 
-    Use the ```exit``` command to quit your sqlplus session.
+    Now use the ```exit``` command to quit your sqlplus session.
+
+9. Make sure the listener is started properly, by issuing the following command:
+    ```
+    <copy>lsnrctl start</copy>
+    ```
+    You can use the command ```lsnrctl status``` to check the result
 
-8. List the available **kafka topics** with the below command:
+10. List the available **kafka topics** with the below command:
 
     ```
     <copy>/opt/kafka/bin/kafka-topics.sh --list --bootstrap-server localhost:9092</copy>

goldengate-microservices21c/prepare-setup/prepare-setup.md

@@ -21,20 +21,11 @@ This lab assumes you have:
 
 1. Click on the link below to download the Resource Manager zip file you need to build your environment:
 
-    - [ll-orm-mkplc-freetier.zip](https://objectstorage.us-ashburn-1.oraclecloud.com/p/Ei1_2QRw4M8tQpk59Qhao2JCvEivSAX8MGB9R6PfHZlqNkpkAcnVg4V3-GyTs1_t/n/c4u04/b/livelabsfiles/o/goldengate-library/ll-orm-mkplc-freetier.zip)
+    - [ll-orm-mkplc-freetier.zip](https://objectstorage.us-ashburn-1.oraclecloud.com/p/Oj2dZE8mmhbNfrqmDtE-8nm6f9eADGpf52xR3ctq1PAj4yYUiJWLyftG1np00_rM/n/c4u04/b/livelabsfiles/o/goldengate-library/gg21c-microservices.zip)
 
-2. Save in your downloads folder.
+2. Save the file in your downloads folder.
 
-    ***TEMPORARY ACTIVITIES AWAITING IMAGE AVAILABILITY ON MARKETPLACE***
-
-    As the lab image is not yet available on marketplace, some extra steps are required to run this lab.  It is assumed you are familiar with OCI to perform these steps, no detailed screenshots are provided:
-
-    - Unzip the stack zip file on you local machine
-    - Create a new Custom Compute image, importing it using [this Object Storage URL](https://objectstorage.eu-frankfurt-1.oraclecloud.com/p/siH5t5NlLNbwypWi8aDZiEPH_o_dKg4vmH5dYkql1rS4-yw845dK2dLdFoFkXqEk/n/oractdemeabdmautodb/b/bucket-20231204-1409/o/gg21c-livelab-image-20231221-1415)
-    - Copy the OCID of the new Custom Image you just created
-    - Edit the **variables.tf** file, and replace the OCID image ID on line 32 with the new one you just created
-    - Zip the altered stack definition into a new zip file
-    - You can now continue the lab from here, using the new zip file you just created
+    - You will use this file in the next lab section to start the Terraform Resource Manager, spinning up the Virtual Network and the Compute instance.
 
 We strongly recommend using this stack to create a self-contained/dedicated VCN with your instance(s). Skip to *Step 3* to follow our recommendations. If you would rather use an exiting VCN then proceed to the next step as indicated below to update your existing VCN with the required Egress rules.
 
@@ -46,7 +37,6 @@ This workshop requires a certain number of ports to be available, a requirement
 | :------------- | :------------------------------------ |
 | 22             | SSH                                   |
 | 443            | NGINX Proxy (https)                   |
-| 16000          | GGMA Admin Server                     |
 | 6080           | noVNC Remote Desktop                  |
 | 10000-10400    | GoldenGate consoles                   |
 
@@ -69,7 +59,7 @@ Using the details from the two steps above, proceed to the lab *Environment Setu
     or
 
 - **Task 1B: Create Stack: Compute only** with an existing VCN where security lists have been updated as per *Step 2* above
-    
+
 You may now **proceed to the next lab**.
 
 ## Acknowledgements

goldengate-microservices21c/prepare-setup/stack/ll-orm-mkplc-freetier/variables.tf

@@ -14,22 +14,22 @@ Marketplace UI Parameters (Update all default values)
 
 variable "use_marketplace_image" {
   # Set to false when testing a local image
-  default = false
+  default = true
 }
 
 variable "mp_listing_id" {
   #Provide the Listing OCID
-  default = "Enter valid listing OCID"
+  default = "ocid1.appcataloglisting.oc1..aaaaaaaa2fuvrqk2cqcarsxugamehrjyigpwwe3sgprpxp6u2ustmsljj3yq"
 }
 
 variable "mp_listing_resource_version" {
   #Provide the listing version
-  default = "Enter valid listing version"
+  default = "1.0"
 }
 
 variable "instance_image_id" {
   #Provide the image OCID
-  default = "ocid1.image.oc1.eu-frankfurt-1.aaaaaaaazxpcsobp2qgbn257gyoqerli6xlreieficwfkxmdpohjc52pnuia"
+  default = "ocid1.image.oc1..aaaaaaaazemy4groczrvfzllplftpwxrm4ocpu72qgckiwinycbppcyc5wwa"
 }
 
 /*