diff --git a/apps-cloud-adventure-cio/01-security/security.md b/apps-cloud-adventure-cio/01-security/security.md
index 2c1eb605d..43ead71ae 100644
--- a/apps-cloud-adventure-cio/01-security/security.md
+++ b/apps-cloud-adventure-cio/01-security/security.md
@@ -4,22 +4,25 @@
Welcome to Oracle’s Cloud Adventure. This is a fresh and unique way to offer you a chance for hands-on experience of highly differentiated and specifically curated content of numerous vignettes that are typically encountered in accounting and finance. We hope you will enjoy today’s adventure exploring a complete and unified solution for the office of the CIO.
+### Objectives
+
+During this adventure, you will perform a time sensitive task of granting permissions to a user.
+
Estimated Time: 15 minutes
+Do not forget to answer the Adventure Check Point questions at the end of the exercise!
-### Objectives
+## ERP & SCM: Extending Privileges to a User
-During this adventure, you will perform a time sensitive task of granting permissions to a user. These are the steps you will perform:
+1. During this adventure, you will perform a time sensitive task of granting permissions to a user. These are the steps you will perform:
At this point, you should be logged into your environment with a username CIO.xx where xx is a two number code assigned to your laptop.
-## Task 1: Extending Privileges to a User
-
-1. Oracle Cloud Applications are delivered with a complete set of roles which control access to application functions and data.
+2. Oracle Cloud Applications are delivered with a complete set of roles which control access to application functions and data.
To add a new privilege to a user, you will need to first copy an existing role.
@@ -28,7 +31,7 @@ At this point, you should be logged into your environment with a username CIO.xx
-2. Accessing Security Console
+3. Accessing Security Console
> Select the **Tools** tab menu.
@@ -37,13 +40,13 @@ At this point, you should be logged into your environment with a username CIO.xx
-3. You’ll be working from this single console for most of the examples today. By default, you are viewing the Roles tab of the console.
+4. You’ll be working from this single console for most of the examples today. By default, you are viewing the Roles tab of the console.
> Security Console - Roles.
-4. Notice how the search is dynamic and offers available options as you type.
+5. Notice how the search is dynamic and offers available options as you type.
> In the search field provided at the top, type: **Adventure**.
@@ -51,7 +54,7 @@ At this point, you should be logged into your environment with a username CIO.xx
-5. You can now see a list of the roles which are granted to a user when they are provided with the Accounts Payable Manager.
+6. You can now see a list of the roles which are granted to a user when they are provided with the Accounts Payable Manager.
> Notice that the table may be exported to Microsoft Excel using the button provided at the top right.
@@ -59,7 +62,7 @@ At this point, you should be logged into your environment with a username CIO.xx
-6. Always make changes to a copied role to ensure that your custom configurations are preserved on updates.
+7. Always make changes to a copied role to ensure that your custom configurations are preserved on updates.
> Tasks associated with the role are available from this pull-down menu. Select **Copy Role**.
@@ -71,7 +74,7 @@ At this point, you should be logged into your environment with a username CIO.xx
-7. Notice that you are provided with a list of ordered steps at the top. For this example, we will only provide answers to steps 1, 2 and 7.
+8. Notice that you are provided with a list of ordered steps at the top. For this example, we will only provide answers to steps 1, 2 and 7.
We start by giving our copied role a unique name.
@@ -83,13 +86,13 @@ At this point, you should be logged into your environment with a username CIO.xx
-8. Using Function Security Policy, you will add the privileges Brian Bell needs
+9. Using Function Security Policy, you will add the privileges Brian Bell needs
> Press the **Add + Function Security Policy** button.
-9. You will now find the required policy using the search form.
+10. You will now find the required policy using the search form.
> Type **Cancel Supplier Negotiation** in the search field and select the policy.
@@ -99,14 +102,14 @@ At this point, you should be logged into your environment with a username CIO.xx
-10. Note that the search window did not automatically dismiss. This is done so you can continue to add more policies in this process.
+11. Note that the search window did not automatically dismiss. This is done so you can continue to add more policies in this process.
> Press the **Cancel** button to continue.
-11. Note that the new policy has been added.
+12. Note that the new policy has been added.
You will skip the next three tasks until you arrive at ‘Users (7)’ in the Copy Role process.
@@ -114,7 +117,7 @@ At this point, you should be logged into your environment with a username CIO.xx
-12. Using a similar search tool, you will now search for Brian Bell and provide him with this new role and its associated privileges.
+13. Using a similar search tool, you will now search for Brian Bell and provide him with this new role and its associated privileges.
> Press the **Add User** button.
@@ -131,25 +134,25 @@ At this point, you should be logged into your environment with a username CIO.xx
-13. Again, the search box remains in case you want to add additional users.
+14. Again, the search box remains in case you want to add additional users.
> Press the **Cancel** button.
-14. Brian Bell has been added to this new role
+15. Brian Bell has been added to this new role
> Press the **Next** button.
-15. Note confirmation that we have added one Security Policy and one user
+16. Note confirmation that we have added one Security Policy and one user
> Press the **Submit and Close** button.
-16. Last screen confirms new role is added
+17. Last screen confirms new role is added
Success!
@@ -157,10 +160,7 @@ At this point, you should be logged into your environment with a username CIO.xx
-
-## Task 2: Compare Roles
-
-1. Using the compare roles feature, you can quickly identify changes you’ve made compared to the out of the box roles provided by Oracle or other custom roles.
+18. Using the compare roles feature, you can quickly identify changes you’ve made compared to the out of the box roles provided by Oracle or other custom roles.
This section uses your newly created role to do exactly this.
@@ -168,7 +168,7 @@ At this point, you should be logged into your environment with a username CIO.xx
-2. You will need to enter the name of your new role
+19. You will need to enter the name of your new role
> Press the **Search**  icon for the First Role
@@ -186,7 +186,7 @@ At this point, you should be logged into your environment with a username CIO.xx
- 3. Now you will repeat these steps for the original role
+ 20. Now you will repeat these steps for the original role
> Press the **Search** icon for the Second Role
@@ -206,13 +206,13 @@ At this point, you should be logged into your environment with a username CIO.xx
-4. Immediately you see that Cancel Supplier Negotiation has been added to the first role and does not exist in the second role.
+21. Immediately you see that Cancel Supplier Negotiation has been added to the first role and does not exist in the second role.
-5. Adventure awaits, click on the image, show what you know and rise to the top of the leader board!!!
+22. Adventure awaits, click on the image, show what you know and rise to the top of the leader board!!!
[](https://apex.oracle.com/pls/apex/f?p=159406:LOGIN_TEAM:::::CC:CIOADVENTURE)
@@ -223,7 +223,15 @@ Security Console is used to quickly manage user access to the entire Fusion appl
**You have successfully completed the Activity!**
+
+## Learn More
+
+* [Oracle Supply Chain & Manufacturing - Secure](https://docs.oracle.com/en/cloud/saas/supply-chain-and-manufacturing/24d/secure.html)
+* [Oracle Human Resources - Secure](https://docs.oracle.com/en/cloud/saas/human-resources/24b/secure.html)
+* [Oracle Documentation](http://docs.oracle.com)
+
+
## Acknowledgements
* **Author** - Nate Weinsaft, Cloud Technologist, Advanced Technology Services
* **Contributors** -
-* **Last Updated By/Date** - Nate Weinsaft, September 2024
+* **Last Updated By/Date** - Nate Weinsaft, November 2024
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/configure.md b/apps-cloud-adventure-cio/02-configure-hcm/configure.md
deleted file mode 100644
index f6c30dd32..000000000
--- a/apps-cloud-adventure-cio/02-configure-hcm/configure.md
+++ /dev/null
@@ -1,313 +0,0 @@
-# Configure
-
-## Introduction
-
-Oracle offers hundreds of prebuilt pages, workflows and forms “out of the box” as part of the Oracle Fusion Cloud. Many of our customers want to configure these pages and workflows to meet their specific business needs. You can unify your experience in our applications by using Redwood.
-
-Oracle Redwood is Oracle Fusion’s new design system that enhances the user experience through a visually stimulating, easy-to-use interface. By uniting customer-inspired design philosophies with industry-leading technology solutions, Oracle Redwood helps companies reduce costs, foster efficiency, revitalize the customer journey, and evolve continuously toward the future.
-
-In this exercise, you are the Redwood expert for your organization. You will use Redwood, Oracle’s next-generation design system, to quickly and efficiently design a Change Salary Interface for Non-HR mangers.
-
-Do not forget to answer the Adventure Check Point questions at the end of the exercise!
-
-
-Estimated Time: 15 minutes
-
-
-### Objectives
-
-In this activity, you will use Redwood to incorporate rules and define content surfaced in the application to tailor the user experience.
-
-
-
-## Task 1: Enhance the Change Salary Experience
-
-1. You are the Redwood expert for your organization. You will use Redwood, Oracle’s next-generation design system, to quickly and efficiently design a Change Salary Interface for Non-HR mangers. Change Salary is a dynamic form that allow you to create pages with user information that appears based on conditions you configure.
-
- You will first navigate to the Change Salary Page.
-
- > From the application home page, click on the **My Team** tab.
-
- .
-
- > Click on **Change Salary** under **Quick Actions**.
-
- 
-
- > Click on the  **Icon** to remove the Direct Reports Filter because your user does not have any direct reports. This action allows you to see other people.
-
- 
-
-
-2. Now you will enter the Change Salary Form so we can make the required changes using Visual Builder Studio. Now you will select a person so you can enter the Change Salary form.
-
- > (1) Search for **Barrett Reed** in the search field.
-
- > (2) Select **Barrett Reed** in the drop down.
-
-
- 
-
-3. You have entered the Change Salary Form. Now you will quickly review the current configuration of the Change Salary Form.
-
- > Click **Continue**.
-
- 
-
- > (1) Enter a **future date** for **When does the salary will start?**
-
- > (2) Select **Change Salary** for **What is the action name?**
-
- > (3) Select **Career Progression** for **why you are changing the salary for Barrett Reed?**
-
- > (4) Click **Continue** once complete.
-
- 
-
-
-
-
-4. You will now create new rule that hides Annualized Full-Time Salary because it is repetitive. You will also hide Compa-Raito since this is mainly used by HR. You also want to show the action reason in this section of the Change Salary Form.
-
- 
-
-5. Now you will enter the Visual Builder Studio.
-
- > (1) Click on the  **Image** in the top right corner of the screen.
-
- > (2) Then select **Edit Page in Visual Builder Studio** from the drop down options.
-
- 
-
- The following image appears as Visual Builder Studio is loading.
-
- 
-
-
-6. Welcome to Oracle Visual Builder Studio (VB Studio), a robust application development platform that helps your team effectively plan and manage your work throughout all stages of the app dev lifecycle: design, build, test, and deploy.
-
- Now we will use VB Studio to make the required changes to the Change Salary Form.
-
- > Click on **Configure Fields and Regions**.
-
- 
-
-
-7. First we will create a new form rule for change salary.
-
- > Click on the  **Icon** to add a new form rule.
-
- 
-
- > (1) Enter **Change Salary Non-HR** in label.
-
- > (2) Click on **Create**.
-
- 
-
-
-8. Note that rules are based on a hierarchy. The rules on top supersede the rules below .
-
- Now we will add the conditions that applies this rule to all non-HR personnel
-
-
- > Click on the **Edit button.**
-
- 
-
- > (1) Click on the middle box that has **contains** in the User Roles Row.
-
- > (2) Select **does not contain** from the drop down options.
-
- 
-
- > (1) Enter the **Human Resource Manager** role in the right most box of the **User Roles** row.
-
- > (2) Select the first **Human Resource Manager** role from the drop down options.
-
- 
-
- **Note:** This configuration displays this version of the Change Salary Form to all people who are not assigned to the Human Resource Manager Role
-
-
-9. Now you want to add and hide fields.
-
- > Click on the **Drop Down**  Icon to the left of Salary to expand the salary section.
-
- 
-
-
-
-10. First you want to the configure the form to hide the **Annualized Full-Time Salary** Field.
-
- > (1) Click in the Box in the **Hidden Column** for **Annualized Full-Time Salary Field** row.
-
- > (2) Then select **Hidden** from the options that appear.
-
- 
-
-
-11. Now you want to the configure the form to hide the **Compa-Ratio** field.
-
- > (1) Click in the Box in the **Hidden Column** for **Compa-Ratio** row.
-
- > (2) Then select **Hidden** from the options that appear.
-
- 
-
-12. Now you will configure the form to show the **Action Reason** field.
-
- > (1) Click in the Box in the **Hidden Column** for **Action Reason** row.
-
- > (2) Then select **Visible** from the options that appear.
-
- 
-
-
-
-13. Please verify that Action Reason is **Visible**, and Annualized Full-Time Salary Field and Compa-Ratio are **Hidden**.
-
- Now you will add a validation step for the Adjustment Percentage. You do not want users to enter in a Salary Percentage Greater than 15%
-
- > Click on **Validate Field Values**
-
- 
-
- > Click on **+ Validation**
-
- 
-
- > (1) Enter **Adjustment Percentage** in **Label** to name the validation.
-
- > (2) Then Click **Create**.
-
- 
-
-
-14. Now you will set the conditions for this rule so that the form will not accept any adjustment percentage greater than 15%.
-
- > Click on **Edit**.
-
- 
-
- > Click on **+ Condition**.
-
- 
-
- > (1) Enter **Adjustment Percentage** in the box below Country.
-
- > (2) Then select the first **Adjustment Percentage** under **Salary Details**.
-
- 
-
- > (1) In the new Adjustment Percentage row you just created, click the **middle box** that says **Equals**.
-
- > (2) Then select **greater than.**.
-
- 
-
- > Enter **15** in the right most box in the Adjustment Percentage row.
-
- 
-
- The form will not allow any user to enter an adjustment percentage greater than 15%.
-
-
-15. Now you will configure the error message users will see if they enter in an Adjustment Percentage greater than 15%.
-
- > (1) Under **Messages**, type in **Adjustment Percentage is too high** in **Summary**.
-
- > (2) Then type in **The Adjustment Percentage must be lower than 15%** in **Detail**.
-
- 
-
- > Click on **Warning** under **Severity**.
-
- > Then select **Error** from the drop-down options that appear.
-
- The error configuration will not allow any user who entered incorrect data to submit the change without fixing the error
-
- 
-
-
-
-16. Well done. You have configured a new rule for Non-HR personnel.
-
- Redwood offers a quick way to review your changes as they appear in the application.
-
- > (1) Click on the **Preview**  icon in the top right of the screen.
-
- > (2) A new window will pop up.
-
- 
-
-17. You have reentered the Change Salary Form. Let’s review the changes.
-
- > Click **Continue**.
-
- 
-
- You need to enter the required information before you can move to the next screen.
-
- > (1) Enter a **future date** for **When does the salary will start?**
-
- > (2) Select **Change Salary** for **What is the action name?**
-
- > (3) Select **Career Progression** for **why you are changing the salary for Barrett Reed?**
-
- > (4) Click **Continue** once complete.
-
- 
-
-
-18. Note that Annualized Full-Time Salary and Compa-Ratio are no longer visible while Action Reason is now Visible.
-
- Now we will test the validation for the Adjustment Amount Percentage.
-
- > Enter an Adjustment Percentage that is greater than 15%.
-
- 
-
-19. The system gives us a warning that the increase in salary is outside the worker’s salary range. You will ignore this warning.
-
- > Click **Continue.**
-
- 
-
-20. The system will not allow the user to continue because the Adjustment Percentage exceeds 15% due to the field validation we configured.
-
- 
-
- > Click on the **Home**  Icon.
-
- 
-
-
-
-
-21. Adventure awaits, click on the image, show what you know and rise to the top of the leader board!!!
-
- [](https://apex.oracle.com/pls/apex/f?p=159406:LOGIN_TEAM:::::CC:CIOADVENTURE)
-
-
-
-
-## Summary
-
-Oracle Redwood is Oracle Fusion’s new design system that enhances the user experience through a visually stimulating, easy-to-use interface. By uniting customer-inspired design philosophies with industry-leading technology solutions, Oracle Redwood helps companies reduce costs, foster efficiency, revitalize the customer journey, and evolve continuously toward the future.
-
-Oracle Visual Builder Studio (or VB Studio, for short) is an integrated development platform that helps your team effectively plan and manage your work throughout the application's lifecycle. It combines the simplicity of a visual development environment with powerful management tools to streamline application development and deliver modern, innovative user experiences.
-
-In this example, you used Redwood, Oracle’s next-generation design system, to quickly and efficiently enhance the Change Salary Form.
-
-
-**You have successfully completed the Activity!**
-
-
-
-## Acknowledgements
-* **Author** - Casey Doody, Cloud Technologist , Advanced Technology Services
-* **Contributors** - Sajid Saleem, Master Principal Cloud Technologist, Advanced Technology Services
-* **Last Updated By/Date** - Casey Doody, September 2024
-
-
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/configureobjs.png b/apps-cloud-adventure-cio/02-configure-hcm/images/configureobjs.png
deleted file mode 100644
index 82fbd5bca..000000000
Binary files a/apps-cloud-adventure-cio/02-configure-hcm/images/configureobjs.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/image001.png b/apps-cloud-adventure-cio/02-configure-hcm/images/image001.png
deleted file mode 100644
index 2ad35b64c..000000000
Binary files a/apps-cloud-adventure-cio/02-configure-hcm/images/image001.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/image002.png b/apps-cloud-adventure-cio/02-configure-hcm/images/image002.png
deleted file mode 100644
index f9ce7b549..000000000
Binary files a/apps-cloud-adventure-cio/02-configure-hcm/images/image002.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/image003.png b/apps-cloud-adventure-cio/02-configure-hcm/images/image003.png
deleted file mode 100644
index 7b5aba50c..000000000
Binary files a/apps-cloud-adventure-cio/02-configure-hcm/images/image003.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/image004.png b/apps-cloud-adventure-cio/02-configure-hcm/images/image004.png
deleted file mode 100644
index afe3ca45b..000000000
Binary files a/apps-cloud-adventure-cio/02-configure-hcm/images/image004.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/image005.png b/apps-cloud-adventure-cio/02-configure-hcm/images/image005.png
deleted file mode 100644
index 7fd7a92cc..000000000
Binary files a/apps-cloud-adventure-cio/02-configure-hcm/images/image005.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/image006.png b/apps-cloud-adventure-cio/02-configure-hcm/images/image006.png
deleted file mode 100644
index 2e01c241f..000000000
Binary files a/apps-cloud-adventure-cio/02-configure-hcm/images/image006.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/image007.png b/apps-cloud-adventure-cio/02-configure-hcm/images/image007.png
deleted file mode 100644
index d070a81c0..000000000
Binary files a/apps-cloud-adventure-cio/02-configure-hcm/images/image007.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/image008.png b/apps-cloud-adventure-cio/02-configure-hcm/images/image008.png
deleted file mode 100644
index 1846d455d..000000000
Binary files a/apps-cloud-adventure-cio/02-configure-hcm/images/image008.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/image009.png b/apps-cloud-adventure-cio/02-configure-hcm/images/image009.png
deleted file mode 100644
index f49bec032..000000000
Binary files a/apps-cloud-adventure-cio/02-configure-hcm/images/image009.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/image010.png b/apps-cloud-adventure-cio/02-configure-hcm/images/image010.png
deleted file mode 100644
index e12da46be..000000000
Binary files a/apps-cloud-adventure-cio/02-configure-hcm/images/image010.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/image011.png b/apps-cloud-adventure-cio/02-configure-hcm/images/image011.png
deleted file mode 100644
index 7cff63459..000000000
Binary files a/apps-cloud-adventure-cio/02-configure-hcm/images/image011.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/image012.png b/apps-cloud-adventure-cio/02-configure-hcm/images/image012.png
deleted file mode 100644
index 2629b5d00..000000000
Binary files a/apps-cloud-adventure-cio/02-configure-hcm/images/image012.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/image013.png b/apps-cloud-adventure-cio/02-configure-hcm/images/image013.png
deleted file mode 100644
index 74287bff2..000000000
Binary files a/apps-cloud-adventure-cio/02-configure-hcm/images/image013.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/image014.png b/apps-cloud-adventure-cio/02-configure-hcm/images/image014.png
deleted file mode 100644
index 3d5b93140..000000000
Binary files a/apps-cloud-adventure-cio/02-configure-hcm/images/image014.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/image015.png b/apps-cloud-adventure-cio/02-configure-hcm/images/image015.png
deleted file mode 100644
index 517df5cfc..000000000
Binary files a/apps-cloud-adventure-cio/02-configure-hcm/images/image015.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/image016.png b/apps-cloud-adventure-cio/02-configure-hcm/images/image016.png
deleted file mode 100644
index 43f2ed350..000000000
Binary files a/apps-cloud-adventure-cio/02-configure-hcm/images/image016.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/image017.png b/apps-cloud-adventure-cio/02-configure-hcm/images/image017.png
deleted file mode 100644
index 016c7da62..000000000
Binary files a/apps-cloud-adventure-cio/02-configure-hcm/images/image017.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/image018.png b/apps-cloud-adventure-cio/02-configure-hcm/images/image018.png
deleted file mode 100644
index 02c26af66..000000000
Binary files a/apps-cloud-adventure-cio/02-configure-hcm/images/image018.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/image019.png b/apps-cloud-adventure-cio/02-configure-hcm/images/image019.png
deleted file mode 100644
index ae412460e..000000000
Binary files a/apps-cloud-adventure-cio/02-configure-hcm/images/image019.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/image020.png b/apps-cloud-adventure-cio/02-configure-hcm/images/image020.png
deleted file mode 100644
index 8606428c9..000000000
Binary files a/apps-cloud-adventure-cio/02-configure-hcm/images/image020.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/image021.png b/apps-cloud-adventure-cio/02-configure-hcm/images/image021.png
deleted file mode 100644
index 1515d1b4c..000000000
Binary files a/apps-cloud-adventure-cio/02-configure-hcm/images/image021.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/image022.png b/apps-cloud-adventure-cio/02-configure-hcm/images/image022.png
deleted file mode 100644
index 3ca9996e8..000000000
Binary files a/apps-cloud-adventure-cio/02-configure-hcm/images/image022.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/image023.png b/apps-cloud-adventure-cio/02-configure-hcm/images/image023.png
deleted file mode 100644
index 073471641..000000000
Binary files a/apps-cloud-adventure-cio/02-configure-hcm/images/image023.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/image024.png b/apps-cloud-adventure-cio/02-configure-hcm/images/image024.png
deleted file mode 100644
index 1da4ac0a0..000000000
Binary files a/apps-cloud-adventure-cio/02-configure-hcm/images/image024.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/image025.png b/apps-cloud-adventure-cio/02-configure-hcm/images/image025.png
deleted file mode 100644
index ff37d6752..000000000
Binary files a/apps-cloud-adventure-cio/02-configure-hcm/images/image025.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/image026.png b/apps-cloud-adventure-cio/02-configure-hcm/images/image026.png
deleted file mode 100644
index 89ffb2c31..000000000
Binary files a/apps-cloud-adventure-cio/02-configure-hcm/images/image026.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/image027.png b/apps-cloud-adventure-cio/02-configure-hcm/images/image027.png
deleted file mode 100644
index 7847ee97a..000000000
Binary files a/apps-cloud-adventure-cio/02-configure-hcm/images/image027.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/image028.png b/apps-cloud-adventure-cio/02-configure-hcm/images/image028.png
deleted file mode 100644
index aad510125..000000000
Binary files a/apps-cloud-adventure-cio/02-configure-hcm/images/image028.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/image029.png b/apps-cloud-adventure-cio/02-configure-hcm/images/image029.png
deleted file mode 100644
index 2db4abf9d..000000000
Binary files a/apps-cloud-adventure-cio/02-configure-hcm/images/image029.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/image030.png b/apps-cloud-adventure-cio/02-configure-hcm/images/image030.png
deleted file mode 100644
index befc6ca17..000000000
Binary files a/apps-cloud-adventure-cio/02-configure-hcm/images/image030.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/image031.png b/apps-cloud-adventure-cio/02-configure-hcm/images/image031.png
deleted file mode 100644
index c969c68a4..000000000
Binary files a/apps-cloud-adventure-cio/02-configure-hcm/images/image031.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/image032.png b/apps-cloud-adventure-cio/02-configure-hcm/images/image032.png
deleted file mode 100644
index eb63a9dda..000000000
Binary files a/apps-cloud-adventure-cio/02-configure-hcm/images/image032.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/image033.png b/apps-cloud-adventure-cio/02-configure-hcm/images/image033.png
deleted file mode 100644
index ef8430606..000000000
Binary files a/apps-cloud-adventure-cio/02-configure-hcm/images/image033.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/image034.png b/apps-cloud-adventure-cio/02-configure-hcm/images/image034.png
deleted file mode 100644
index 227e73652..000000000
Binary files a/apps-cloud-adventure-cio/02-configure-hcm/images/image034.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/image035.png b/apps-cloud-adventure-cio/02-configure-hcm/images/image035.png
deleted file mode 100644
index 9baae793f..000000000
Binary files a/apps-cloud-adventure-cio/02-configure-hcm/images/image035.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/image036.png b/apps-cloud-adventure-cio/02-configure-hcm/images/image036.png
deleted file mode 100644
index 5929a3c29..000000000
Binary files a/apps-cloud-adventure-cio/02-configure-hcm/images/image036.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/image037.png b/apps-cloud-adventure-cio/02-configure-hcm/images/image037.png
deleted file mode 100644
index c1a61c5b2..000000000
Binary files a/apps-cloud-adventure-cio/02-configure-hcm/images/image037.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure-scm/configure-scm.md b/apps-cloud-adventure-cio/02-configure-scm/configure-scm.md
deleted file mode 100644
index 2a508eb68..000000000
--- a/apps-cloud-adventure-cio/02-configure-scm/configure-scm.md
+++ /dev/null
@@ -1,213 +0,0 @@
-# Configure
-
-## Introduction
-
-Oracle offers hundreds of prebuilt pages, workflows and forms “out of the box” as part of the Oracle Fusion Cloud. Many of our customers want to configure these pages and workflows to meet their specific business needs. You can unify your experience in our applications by using Redwood.
-
-Oracle Redwood is Oracle Fusion’s new design system that enhances the user experience through a visually stimulating, easy-to-use interface. By uniting customer-inspired design philosophies with industry-leading technology solutions, Oracle Redwood helps companies reduce costs, foster efficiency, revitalize the customer journey, and evolve continuously toward the future.
-
-In this exercise, you are the Redwood expert for your organization. You will use Redwood, Oracle’s next-generation design system, to quickly and efficiently design the Update Suppliers (New) listing page.
-
-Do not forget to answer the Adventure Check Point questions at the end of the exercise!
-
-
-Estimated Time: 15 minutes
-
-
-### Objectives
-
-In this activity, you will use Redwood to incorporate rules and define content surfaced in the application to tailor the user experience.
-
-.
-
-
-
-## Task 1: Update Suppliers (New) listing page
-
-1. You will use Redwood, Oracle’s next-generation design system, to quickly and efficiently update **Suppliers (New) listing page providing more visibility to Procurement Managers**. Suppliers (New) is a dynamic listing page that allows you to create role-based layouts based on configurable criteria.
-
- You will first navigate to the Suppliers (New) Listing Page.
-
- > From the application home page, click on the **Procurement** tab.
-
- .
-
- > Click on **Suppliers (New)** under **Quick Actions**.
-
- 
-
- > Click on the **Supplier Type** to display the Filter and click into the Search box **Supplier Type**.
-
- 
-
- > Click and select **Supplier (187)** to display list of suppliers.
-
- 
-
- > Click anywhere in the page away from the search filter **Supplier (187)**
-
- 
-
-
-
-
-2. Now you will enter the Suppliers (New) Page that displays lists of suppliers.
-
-
- > (1) Click on drop-down icon to expand a specific supplier row.
-
- 
-
-3. You can see the supplier information displayed is limited. We will update the page to display more fields for procurement managers.
Now you will leverage Visual Builder Studio to update the Suppliers (New) page.
-
-
- > (1) Click on the  **Image** in the top right corner of the screen.
-
- > (2) Then select Edit Page in Visual Builder Studio from the drop down options.
-
-
- 
-
-
-4. The following image appears as Visual Builder Studio is loading.
-
- 
-
-5. Welcome to Oracle Visual Builder Studio (VB Studio), a robust application development platform that helps your team effectively plan and manage your work throughout all stages of the application development lifecycle: design, build, test, and deploy.
Now we will use VB Studio to make the required changes to the Suppliers (New) page.
-
-
- > Click on **Configure Fields and Regions**.
-
- 
-
-
-
-6. First we will create a new role-based form rule for Suppliers (New) page
-
- > Click on the  **Icon** to add a new form rule.
-
- 
-
- > (1) Enter **procurementManagerLayout** in label.
-
- > (2) Click on **Create**.
-
- 
-
-
-7. Note that rules are based on a hierarchy. The rules on top supersede the rules below .
-
- > Click on the **Edit button.**
-
- 
-
-
-
-8. Now we will add the conditions that applies this rule to all Procurement Managers.
-
- > Click on the **Condition button**.
-
- 
-
- In the first box, enter **Roles** and select **Roles** from the drop-down.
-
- 
-
- > (1) Enter **Procurement Manager** in the right most box of the **User Roles** row.
-
- > (2) Select the first **Procurement Manager** role from the drop-down list. .
-
- 
-
-
-9. Now you want to add and hide fields.
-
- > Click on the  Icon to the left of Supplier Details to expand the section.
-
- 
-
-10. First you want to the configure the page to display the **Creation Source**.
-
- > (1) Click in the Box in the **Hidden Column** for **Creation Source Field** row.
-
- > (2) Then select **Visble** from the options that appear.
-
- 
-
-
-11. Now repeat the above steps for fields Creation Date, Parent Supplier Number and Tax Payer Country to make them visible.
-
- > (1) Click the Box in the **Hidden Column** for **each of these** rows.
-
- > (2) Then select **Visible** from the options that appear.
-
-
-
-
-12. Well done. You have configured a new role-based page layout for Procurement Managers. Redwood offers a quick way to review your changes as they appear in the application.
-
- > (1) Click on the **Preview**  icon in the upper right of the screen
-
- > (2) A new windows will pop up in a new browser tab.
-
- 
-
-13. You have reentered the Suppliers (New) page. Let’s review the changes.
-
- Click on the **Supplier Type** to display the Filter and click into the Search box **Supplier Type**.
-
-
-
-14. You need to select the search filter Supplier (187) again.
-
- > Click and select **Supplier (187)** to display list of suppliers.
-
-
-
-
-15.
-
- > Click anywhere in the page away from the search filter **Supplier (187)**
-
- 
-
-16. Now you will enter the Suppliers (New) Page that displays lists of suppliers.
-
- > Click on **drop-down icon** to expand a specific supplier row
-
- 
-
-17. You can see all the changes we just configured for displaying additional fields to Procurement Managers.
-
- > Click on the **Home**  Icon.
-
-
-18. Adventure awaits, click on the image, show what you know and rise to the top of the leader board!!!
-
- [](https://apex.oracle.com/pls/apex/f?p=159406:LOGIN_TEAM:::::CC:CIOADVENTURE)
-
-
-
-
-## Summary
-
-Oracle Redwood is Oracle Fusion’s new design system that enhances the user experience through a visually stimulating, easy-to-use interface. By uniting customer-inspired design philosophies with industry-leading technology solutions, Oracle Redwood helps companies reduce costs, foster efficiency, revitalize the customer journey, and evolve continuously toward the future.
-
-Oracle Visual Builder Studio (or VB Studio, for short) is an integrated development platform that helps your team effectively plan and manage your work throughout the application's lifecycle. It combines the simplicity of a visual development environment with powerful management tools to streamline application development and deliver modern, innovative user experiences.
-
-In this example, you used Redwood, Oracle’s next-generation design system, to quickly and efficiently design the Update Suppliers (New) listing page.
-
-
-**You have successfully completed the Activity!**
-
-
-
-## Acknowledgements
-* **Author** - Casey Doody, Cloud Technologist, Advanced Technology Services
-* **Contributors** - Sajid Saleem, Master Principal Cloud Technologist, Advanced Technology Services
-* **Last Updated By/Date** -Casey Doody, August 2024
-
-
-
-
-[def]: images/image013.png
\ No newline at end of file
diff --git a/apps-cloud-adventure-cio/02-configure-scm/images/cloud-adventure-checkpoint-image.png b/apps-cloud-adventure-cio/02-configure-scm/images/cloud-adventure-checkpoint-image.png
deleted file mode 100644
index 08774508a..000000000
Binary files a/apps-cloud-adventure-cio/02-configure-scm/images/cloud-adventure-checkpoint-image.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure-scm/images/icon01_x.png b/apps-cloud-adventure-cio/02-configure-scm/images/icon01_x.png
deleted file mode 100644
index be49b934a..000000000
Binary files a/apps-cloud-adventure-cio/02-configure-scm/images/icon01_x.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure-scm/images/icon02_co.png b/apps-cloud-adventure-cio/02-configure-scm/images/icon02_co.png
deleted file mode 100644
index cea09be31..000000000
Binary files a/apps-cloud-adventure-cio/02-configure-scm/images/icon02_co.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure-scm/images/icon03_dropdown.png b/apps-cloud-adventure-cio/02-configure-scm/images/icon03_dropdown.png
deleted file mode 100644
index c913f8fb7..000000000
Binary files a/apps-cloud-adventure-cio/02-configure-scm/images/icon03_dropdown.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure-scm/images/icon05_plus.png b/apps-cloud-adventure-cio/02-configure-scm/images/icon05_plus.png
deleted file mode 100644
index a173547b5..000000000
Binary files a/apps-cloud-adventure-cio/02-configure-scm/images/icon05_plus.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure-scm/images/icon06_box.png b/apps-cloud-adventure-cio/02-configure-scm/images/icon06_box.png
deleted file mode 100644
index 30f4606e9..000000000
Binary files a/apps-cloud-adventure-cio/02-configure-scm/images/icon06_box.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure-scm/images/icon07_home.png b/apps-cloud-adventure-cio/02-configure-scm/images/icon07_home.png
deleted file mode 100644
index b01696d1e..000000000
Binary files a/apps-cloud-adventure-cio/02-configure-scm/images/icon07_home.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure/configure.md b/apps-cloud-adventure-cio/02-configure/configure.md
index 76427cf8e..d76f303cf 100644
--- a/apps-cloud-adventure-cio/02-configure/configure.md
+++ b/apps-cloud-adventure-cio/02-configure/configure.md
@@ -6,25 +6,22 @@ Oracle offers hundreds of prebuilt pages, workflows and forms “out of the box
Oracle Redwood is Oracle Fusion’s new design system that enhances the user experience through a visually stimulating, easy-to-use interface. By uniting customer-inspired design philosophies with industry-leading technology solutions, Oracle Redwood helps companies reduce costs, foster efficiency, revitalize the customer journey, and evolve continuously toward the future.
-In this exercise, you are the Redwood expert for your organization. You will use Redwood, Oracle’s next-generation design system, to quickly and efficiently design a Change Salary Interface for Non-HR mangers.
-
-Do not forget to answer the Adventure Check Point questions at the end of the exercise!
+### Objectives
+In this lab, you will use Redwood to quickly and efficienty improve the user experience in Oracle Fusion Cloud.
Estimated Time: 15 minutes
+Do not forget to answer the Adventure Check Point questions at the end of the exercise!
-### Objectives
-
-In this activity, you will use Redwood to incorporate rules and define content surfaced in the application to tailor the user experience.
-
+## HCM: Enhance the Change Salary Experience
-## Task 1: Enhance the Change Salary Experience
+1. You will use Redwood, Oracle’s next-generation design system, to quickly and efficiently update Change Salary Page for Non-HR managers.
-1. You are the Redwood expert for your organization. You will use Redwood, Oracle’s next-generation design system, to quickly and efficiently design a Change Salary Interface for Non-HR mangers. Change Salary is a dynamic form that allow you to create pages with user information that appears based on conditions you configure.
+
- You will first navigate to the Change Salary Page.
+2. You will first navigate to the Change Salary Page.
> From the application home page, click on the **My Team** tab.
@@ -39,7 +36,7 @@ In this activity, you will use Redwood to incorporate rules and define content s
-2. Now you will enter the Change Salary Form so we can make the required changes using Visual Builder Studio. Now you will select a person so you can enter the Change Salary form.
+3. Now you will enter the Change Salary Form so we can make the required changes using Visual Builder Studio. Now you will select a person so you can enter the Change Salary form.
> (1) Search for **Barrett Reed** in the search field.
@@ -48,7 +45,7 @@ In this activity, you will use Redwood to incorporate rules and define content s
-3. You have entered the Change Salary Form. Now you will quickly review the current configuration of the Change Salary Form.
+4. You have entered the Change Salary Form. Now you will quickly review the current configuration of the Change Salary Form.
> Click **Continue**.
@@ -65,13 +62,11 @@ In this activity, you will use Redwood to incorporate rules and define content s
-
-
-4. You will now create new rule that hides Annualized Full-Time Salary because it is repetitive. You will also hide Compa-Raito since this is mainly used by HR. You also want to show the action reason in this section of the Change Salary Form.
+5. You will now create new rule that hides Annualized Full-Time Salary because it is repetitive. You will also hide Compa-Raito since this is mainly used by HR. You also want to show the action reason in this section of the Change Salary Form.
-5. Now you will enter the Visual Builder Studio.
+6. Now you will enter the Visual Builder Studio.
> (1) Click on the  **Image** in the top right corner of the screen.
@@ -84,7 +79,7 @@ In this activity, you will use Redwood to incorporate rules and define content s
-6. Welcome to Oracle Visual Builder Studio (VB Studio), a robust application development platform that helps your team effectively plan and manage your work throughout all stages of the app dev lifecycle: design, build, test, and deploy.
+7. Welcome to Oracle Visual Builder Studio (VB Studio), a robust application development platform that helps your team effectively plan and manage your work throughout all stages of the app dev lifecycle: design, build, test, and deploy.
Now we will use VB Studio to make the required changes to the Change Salary Form.
@@ -93,7 +88,7 @@ In this activity, you will use Redwood to incorporate rules and define content s
-7. First we will create a new form rule for change salary.
+8. First we will create a new form rule for change salary.
> Click on the  **Icon** to add a new form rule.
@@ -106,7 +101,7 @@ In this activity, you will use Redwood to incorporate rules and define content s
-8. Note that rules are based on a hierarchy. The rules on top supersede the rules below .
+9. Note that rules are based on a hierarchy. The rules on top supersede the rules below .
Now we will add the conditions that applies this rule to all non-HR personnel
@@ -130,7 +125,7 @@ In this activity, you will use Redwood to incorporate rules and define content s
**Note:** This configuration displays this version of the Change Salary Form to all people who are not assigned to the Human Resource Manager Role
-9. Now you want to add and hide fields.
+10. Now you want to add and hide fields.
> Click on the **Drop Down**  Icon to the left of Salary to expand the salary section.
@@ -138,7 +133,7 @@ In this activity, you will use Redwood to incorporate rules and define content s
-10. First you want to the configure the form to hide the **Annualized Full-Time Salary** Field.
+11. First you want to the configure the form to hide the **Annualized Full-Time Salary** Field.
> (1) Click in the Box in the **Hidden Column** for **Annualized Full-Time Salary Field** row.
@@ -147,7 +142,7 @@ In this activity, you will use Redwood to incorporate rules and define content s
-11. Now you want to the configure the form to hide the **Compa-Ratio** field.
+12. Now you want to the configure the form to hide the **Compa-Ratio** field.
> (1) Click in the Box in the **Hidden Column** for **Compa-Ratio** row.
@@ -155,7 +150,7 @@ In this activity, you will use Redwood to incorporate rules and define content s
-12. Now you will configure the form to show the **Action Reason** field.
+13. Now you will configure the form to show the **Action Reason** field.
> (1) Click in the Box in the **Hidden Column** for **Action Reason** row.
@@ -165,7 +160,7 @@ In this activity, you will use Redwood to incorporate rules and define content s
-13. Please verify that Action Reason is **Visible**, and Annualized Full-Time Salary Field and Compa-Ratio are **Hidden**.
+14. Please verify that Action Reason is **Visible**, and Annualized Full-Time Salary Field and Compa-Ratio are **Hidden**.
Now you will add a validation step for the Adjustment Percentage. You do not want users to enter in a Salary Percentage Greater than 15%
@@ -184,7 +179,7 @@ In this activity, you will use Redwood to incorporate rules and define content s
-14. Now you will set the conditions for this rule so that the form will not accept any adjustment percentage greater than 15%.
+15. Now you will set the conditions for this rule so that the form will not accept any adjustment percentage greater than 15%.
> Click on **Edit**.
@@ -213,7 +208,7 @@ In this activity, you will use Redwood to incorporate rules and define content s
The form will not allow any user to enter an adjustment percentage greater than 15%.
-15. Now you will configure the error message users will see if they enter in an Adjustment Percentage greater than 15%.
+16. Now you will configure the error message users will see if they enter in an Adjustment Percentage greater than 15%.
> (1) Under **Messages**, type in **Adjustment Percentage is too high** in **Summary**.
@@ -231,7 +226,7 @@ In this activity, you will use Redwood to incorporate rules and define content s
-16. Well done. You have configured a new rule for Non-HR personnel.
+17. Well done. You have configured a new rule for Non-HR personnel.
Redwood offers a quick way to review your changes as they appear in the application.
@@ -241,7 +236,7 @@ In this activity, you will use Redwood to incorporate rules and define content s
-17. You have reentered the Change Salary Form. Let’s review the changes.
+18. You have reentered the Change Salary Form. Let’s review the changes.
> Click **Continue**.
@@ -260,7 +255,7 @@ In this activity, you will use Redwood to incorporate rules and define content s
-18. Note that Annualized Full-Time Salary and Compa-Ratio are no longer visible while Action Reason is now Visible.
+19. Note that Annualized Full-Time Salary and Compa-Ratio are no longer visible while Action Reason is now Visible.
Now we will test the validation for the Adjustment Amount Percentage.
@@ -268,13 +263,13 @@ In this activity, you will use Redwood to incorporate rules and define content s
-19. The system gives us a warning that the increase in salary is outside the worker’s salary range. You will ignore this warning.
+20. The system gives us a warning that the increase in salary is outside the worker’s salary range. You will ignore this warning.
> Click **Continue.**
-20. The system will not allow the user to continue because the Adjustment Percentage exceeds 15% due to the field validation we configured.
+21. The system will not allow the user to continue because the Adjustment Percentage exceeds 15% due to the field validation we configured.
@@ -285,29 +280,193 @@ In this activity, you will use Redwood to incorporate rules and define content s
-21. Adventure awaits, click on the image, show what you know and rise to the top of the leader board!!!
+22. Adventure awaits, click on the image, show what you know and rise to the top of the leader board!!!
[](https://apex.oracle.com/pls/apex/f?p=159406:LOGIN_TEAM:::::CC:CIOADVENTURE)
+## ERP & SCM: Update Suppliers (New) Listing Page
+
+1. You will use Redwood, Oracle’s next-generation design system, to quickly and efficiently update the Suppliers (New) listing page providing more visibility to Procurement Managers. Suppliers (New) is a dynamic listing page that allows you to create role-based layouts based on configurable criteria.
+
+ 
+
+2. You will first navigate to the Suppliers (New) Listing Page.
+
+ > From the application home page, click on the **Procurement** tab.
+
+ .
+
+ > Click on **Suppliers (New)** under **Quick Actions**.
+
+ 
+
+ > Click on the **Supplier Type** to display the Filter and click into the Search box **Supplier Type**.
+
+ 
+
+ > Click and select **Supplier (187)** to display list of suppliers.
+
+ 
+
+ > Click anywhere in the page away from the search filter **Supplier (187)**
+
+ 
+
+
+
+
+3. Now you will enter the Suppliers (New) Page that displays lists of suppliers.
+
+
+ > (1) Click on drop-down icon to expand a specific supplier row.
+
+ 
+
+4. You can see the supplier information displayed is limited. We will update the page to display more fields for procurement managers.
Now you will leverage Visual Builder Studio to update the Suppliers (New) page.
+
+
+ > (1) Click on the  **Image** in the top right corner of the screen.
+
+ > (2) Then select Edit Page in Visual Builder Studio from the drop down options.
+
+
+ 
+
+
+5. The following image appears as Visual Builder Studio is loading.
+
+ 
+
+6. Welcome to Oracle Visual Builder Studio (VB Studio), a robust application development platform that helps your team effectively plan and manage your work throughout all stages of the application development lifecycle: design, build, test, and deploy.
Now we will use VB Studio to make the required changes to the Suppliers (New) page.
+
+
+ > Click on **Configure Fields and Regions**.
+
+ 
+
+
+
+7. First we will create a new role-based form rule for Suppliers (New) page
+
+ > Click on the  **Icon** to add a new form rule.
+
+ 
+
+ > (1) Enter **procurementManagerLayout** in label.
+
+ > (2) Click on **Create**.
+
+ 
+8. Note that rules are based on a hierarchy. The rules on top supersede the rules below .
+
+ > Click on the **Edit button.**
+
+ 
+
+
+
+9. Now we will add the conditions that applies this rule to all Procurement Managers.
+
+ > Click on the **Condition button**.
+
+ 
+
+ In the first box, enter **Roles** and select **Roles** from the drop-down.
+
+ 
+
+ > (1) Enter **Procurement Manager** in the right most box of the **User Roles** row.
+
+ > (2) Select the first **Procurement Manager** role from the drop-down list. .
+
+ 
+
+
+10. Now you want to add and hide fields.
+
+ > Click on the  Icon to the left of Supplier Details to expand the section.
+
+ 
+
+11. First you want to the configure the page to display the **Creation Source**.
+
+ > (1) Click in the Box in the **Hidden Column** for **Creation Source Field** row.
+
+ > (2) Then select **Visble** from the options that appear.
+
+ 
+
+
+12. Now repeat the above steps for fields Creation Date, Parent Supplier Number and Tax Payer Country to make them visible.
+
+ > (1) Click the Box in the **Hidden Column** for **each of these** rows.
+
+ > (2) Then select **Visible** from the options that appear.
+
+
+
+
+13. Well done. You have configured a new role-based page layout for Procurement Managers. Redwood offers a quick way to review your changes as they appear in the application.
+
+ > (1) Click on the **Preview**  icon in the upper right of the screen
+
+ > (2) A new windows will pop up in a new browser tab.
+
+ 
+
+14. You have reentered the Suppliers (New) page. Let’s review the changes.
+
+ Click on the **Supplier Type** to display the Filter and click into the Search box **Supplier Type**.
+
+
+
+15. You need to select the search filter Supplier (187) again.
+
+ > Click and select **Supplier (187)** to display list of suppliers.
+
+
+
+
+ > Click anywhere in the page away from the search filter **Supplier (187)**
+
+ 
+
+16. Now you will enter the Suppliers (New) Page that displays lists of suppliers.
+
+ > Click on **drop-down icon** to expand a specific supplier row
+
+ 
+
+17. You can see all the changes we just configured for displaying additional fields to Procurement Managers.
+
+ > Click on the **Home**  Icon.
+
+
+18. Adventure awaits, click on the image, show what you know and rise to the top of the leader board!!!
+
+ [](https://apex.oracle.com/pls/apex/f?p=159406:LOGIN_TEAM:::::CC:CIOADVENTURE)
## Summary
Oracle Redwood is Oracle Fusion’s new design system that enhances the user experience through a visually stimulating, easy-to-use interface. By uniting customer-inspired design philosophies with industry-leading technology solutions, Oracle Redwood helps companies reduce costs, foster efficiency, revitalize the customer journey, and evolve continuously toward the future.
-Oracle Visual Builder Studio (or VB Studio, for short) is an integrated development platform that helps your team effectively plan and manage your work throughout the application's lifecycle. It combines the simplicity of a visual development environment with powerful management tools to streamline application development and deliver modern, innovative user experiences.
-In this example, you used Redwood, Oracle’s next-generation design system, to quickly and efficiently enhance the Change Salary Form.
+**You have successfully completed the Activity!**
+## Learn More
-**You have successfully completed the Activity!**
+* [Overview of Redwood Application Extension](https://docs.oracle.com/en/cloud/saas/human-resources/24d/fauvb/overview-of-redwood-application-extensions.html)
+* [Configuring and Extending Applications](https://docs.oracle.com/en/cloud/saas/applications-common/24d/oaext/overview-of-using-visual-builder-studio.html#s20072861)
+* [Oracle Documentation](http://docs.oracle.com)
## Acknowledgements
-* **Author** - Casey Doody, Sales Consultant, Advanced Technology Services
-* **Contributors** - Sajid Saleem, Master Principal Sales Consultant, Advanced Technology Services
-* **Last Updated By/Date** - Casey Doody, September 2024
+* **Author** - Charlie Moff, Distinguished Cloud Technologist, Advanced Technology Services; Casey Doody, Cloud Technologist , Advanced Technology Services
+* **Contributors** - Sajid Saleem, Master Principal Cloud Technologist, Advanced Technology Services
+* **Last Updated By/Date** - Casey Doody, November 2024
+
diff --git a/apps-cloud-adventure-cio/02-configure-scm/images/configure_objs.png b/apps-cloud-adventure-cio/02-configure/images/configure_objs.png
similarity index 100%
rename from apps-cloud-adventure-cio/02-configure-scm/images/configure_objs.png
rename to apps-cloud-adventure-cio/02-configure/images/configure_objs.png
diff --git a/apps-cloud-adventure-cio/02-configure/images/configure_objs_hcm.png b/apps-cloud-adventure-cio/02-configure/images/configure_objs_hcm.png
new file mode 100644
index 000000000..47dd10829
Binary files /dev/null and b/apps-cloud-adventure-cio/02-configure/images/configure_objs_hcm.png differ
diff --git a/apps-cloud-adventure-cio/02-configure/images/configureobjs.png b/apps-cloud-adventure-cio/02-configure/images/configureobjs.png
deleted file mode 100644
index 82fbd5bca..000000000
Binary files a/apps-cloud-adventure-cio/02-configure/images/configureobjs.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/02-configure-scm/images/icon-expand.png b/apps-cloud-adventure-cio/02-configure/images/icon-expand.png
similarity index 100%
rename from apps-cloud-adventure-cio/02-configure-scm/images/icon-expand.png
rename to apps-cloud-adventure-cio/02-configure/images/icon-expand.png
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/icon011_x.png b/apps-cloud-adventure-cio/02-configure/images/icon101_x.png
similarity index 100%
rename from apps-cloud-adventure-cio/02-configure-hcm/images/icon011_x.png
rename to apps-cloud-adventure-cio/02-configure/images/icon101_x.png
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/icon012_co.png b/apps-cloud-adventure-cio/02-configure/images/icon102_co.png
similarity index 100%
rename from apps-cloud-adventure-cio/02-configure-hcm/images/icon012_co.png
rename to apps-cloud-adventure-cio/02-configure/images/icon102_co.png
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/icon013_dropdown.png b/apps-cloud-adventure-cio/02-configure/images/icon103_dropdown.png
similarity index 100%
rename from apps-cloud-adventure-cio/02-configure-hcm/images/icon013_dropdown.png
rename to apps-cloud-adventure-cio/02-configure/images/icon103_dropdown.png
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/icon014_preview.png b/apps-cloud-adventure-cio/02-configure/images/icon104_preview.png
similarity index 100%
rename from apps-cloud-adventure-cio/02-configure-hcm/images/icon014_preview.png
rename to apps-cloud-adventure-cio/02-configure/images/icon104_preview.png
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/icon015_plus.png b/apps-cloud-adventure-cio/02-configure/images/icon105_plus.png
similarity index 100%
rename from apps-cloud-adventure-cio/02-configure-hcm/images/icon015_plus.png
rename to apps-cloud-adventure-cio/02-configure/images/icon105_plus.png
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/icon016_box.png b/apps-cloud-adventure-cio/02-configure/images/icon106_box.png
similarity index 100%
rename from apps-cloud-adventure-cio/02-configure-hcm/images/icon016_box.png
rename to apps-cloud-adventure-cio/02-configure/images/icon106_box.png
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/icon017_home.png b/apps-cloud-adventure-cio/02-configure/images/icon107_home.png
similarity index 100%
rename from apps-cloud-adventure-cio/02-configure-hcm/images/icon017_home.png
rename to apps-cloud-adventure-cio/02-configure/images/icon107_home.png
diff --git a/apps-cloud-adventure-cio/02-configure-scm/images/image001.png b/apps-cloud-adventure-cio/02-configure/images/image101.png
similarity index 100%
rename from apps-cloud-adventure-cio/02-configure-scm/images/image001.png
rename to apps-cloud-adventure-cio/02-configure/images/image101.png
diff --git a/apps-cloud-adventure-cio/02-configure-scm/images/image002.png b/apps-cloud-adventure-cio/02-configure/images/image102.png
similarity index 100%
rename from apps-cloud-adventure-cio/02-configure-scm/images/image002.png
rename to apps-cloud-adventure-cio/02-configure/images/image102.png
diff --git a/apps-cloud-adventure-cio/02-configure-scm/images/image003.png b/apps-cloud-adventure-cio/02-configure/images/image103.png
similarity index 100%
rename from apps-cloud-adventure-cio/02-configure-scm/images/image003.png
rename to apps-cloud-adventure-cio/02-configure/images/image103.png
diff --git a/apps-cloud-adventure-cio/02-configure-scm/images/image004.png b/apps-cloud-adventure-cio/02-configure/images/image104.png
similarity index 100%
rename from apps-cloud-adventure-cio/02-configure-scm/images/image004.png
rename to apps-cloud-adventure-cio/02-configure/images/image104.png
diff --git a/apps-cloud-adventure-cio/02-configure-scm/images/image005.png b/apps-cloud-adventure-cio/02-configure/images/image105.png
similarity index 100%
rename from apps-cloud-adventure-cio/02-configure-scm/images/image005.png
rename to apps-cloud-adventure-cio/02-configure/images/image105.png
diff --git a/apps-cloud-adventure-cio/02-configure-scm/images/image006.png b/apps-cloud-adventure-cio/02-configure/images/image106.png
similarity index 100%
rename from apps-cloud-adventure-cio/02-configure-scm/images/image006.png
rename to apps-cloud-adventure-cio/02-configure/images/image106.png
diff --git a/apps-cloud-adventure-cio/02-configure-scm/images/image007.png b/apps-cloud-adventure-cio/02-configure/images/image107.png
similarity index 100%
rename from apps-cloud-adventure-cio/02-configure-scm/images/image007.png
rename to apps-cloud-adventure-cio/02-configure/images/image107.png
diff --git a/apps-cloud-adventure-cio/02-configure-scm/images/image008.png b/apps-cloud-adventure-cio/02-configure/images/image108.png
similarity index 100%
rename from apps-cloud-adventure-cio/02-configure-scm/images/image008.png
rename to apps-cloud-adventure-cio/02-configure/images/image108.png
diff --git a/apps-cloud-adventure-cio/02-configure-scm/images/image009.png b/apps-cloud-adventure-cio/02-configure/images/image109.png
similarity index 100%
rename from apps-cloud-adventure-cio/02-configure-scm/images/image009.png
rename to apps-cloud-adventure-cio/02-configure/images/image109.png
diff --git a/apps-cloud-adventure-cio/02-configure-scm/images/image010.png b/apps-cloud-adventure-cio/02-configure/images/image110.png
similarity index 100%
rename from apps-cloud-adventure-cio/02-configure-scm/images/image010.png
rename to apps-cloud-adventure-cio/02-configure/images/image110.png
diff --git a/apps-cloud-adventure-cio/02-configure-scm/images/image011.png b/apps-cloud-adventure-cio/02-configure/images/image111.png
similarity index 100%
rename from apps-cloud-adventure-cio/02-configure-scm/images/image011.png
rename to apps-cloud-adventure-cio/02-configure/images/image111.png
diff --git a/apps-cloud-adventure-cio/02-configure-scm/images/image012.png b/apps-cloud-adventure-cio/02-configure/images/image112.png
similarity index 100%
rename from apps-cloud-adventure-cio/02-configure-scm/images/image012.png
rename to apps-cloud-adventure-cio/02-configure/images/image112.png
diff --git a/apps-cloud-adventure-cio/02-configure-scm/images/image013.png b/apps-cloud-adventure-cio/02-configure/images/image113.png
similarity index 100%
rename from apps-cloud-adventure-cio/02-configure-scm/images/image013.png
rename to apps-cloud-adventure-cio/02-configure/images/image113.png
diff --git a/apps-cloud-adventure-cio/02-configure-scm/images/image014.png b/apps-cloud-adventure-cio/02-configure/images/image114.png
similarity index 100%
rename from apps-cloud-adventure-cio/02-configure-scm/images/image014.png
rename to apps-cloud-adventure-cio/02-configure/images/image114.png
diff --git a/apps-cloud-adventure-cio/02-configure-scm/images/image015.png b/apps-cloud-adventure-cio/02-configure/images/image115.png
similarity index 100%
rename from apps-cloud-adventure-cio/02-configure-scm/images/image015.png
rename to apps-cloud-adventure-cio/02-configure/images/image115.png
diff --git a/apps-cloud-adventure-cio/02-configure-scm/images/image016.png b/apps-cloud-adventure-cio/02-configure/images/image116.png
similarity index 100%
rename from apps-cloud-adventure-cio/02-configure-scm/images/image016.png
rename to apps-cloud-adventure-cio/02-configure/images/image116.png
diff --git a/apps-cloud-adventure-cio/02-configure-scm/images/image017.png b/apps-cloud-adventure-cio/02-configure/images/image117.png
similarity index 100%
rename from apps-cloud-adventure-cio/02-configure-scm/images/image017.png
rename to apps-cloud-adventure-cio/02-configure/images/image117.png
diff --git a/apps-cloud-adventure-cio/02-configure-scm/images/image018.png b/apps-cloud-adventure-cio/02-configure/images/image118.png
similarity index 100%
rename from apps-cloud-adventure-cio/02-configure-scm/images/image018.png
rename to apps-cloud-adventure-cio/02-configure/images/image118.png
diff --git a/apps-cloud-adventure-cio/02-configure-scm/images/image019.png b/apps-cloud-adventure-cio/02-configure/images/image119.png
similarity index 100%
rename from apps-cloud-adventure-cio/02-configure-scm/images/image019.png
rename to apps-cloud-adventure-cio/02-configure/images/image119.png
diff --git a/apps-cloud-adventure-cio/02-configure-scm/images/image020.png b/apps-cloud-adventure-cio/02-configure/images/image120.png
similarity index 100%
rename from apps-cloud-adventure-cio/02-configure-scm/images/image020.png
rename to apps-cloud-adventure-cio/02-configure/images/image120.png
diff --git a/apps-cloud-adventure-cio/02-configure-scm/images/image021.png b/apps-cloud-adventure-cio/02-configure/images/image121.png
similarity index 100%
rename from apps-cloud-adventure-cio/02-configure-scm/images/image021.png
rename to apps-cloud-adventure-cio/02-configure/images/image121.png
diff --git a/apps-cloud-adventure-cio/02-configure-scm/images/image022.png b/apps-cloud-adventure-cio/02-configure/images/image122.png
similarity index 100%
rename from apps-cloud-adventure-cio/02-configure-scm/images/image022.png
rename to apps-cloud-adventure-cio/02-configure/images/image122.png
diff --git a/apps-cloud-adventure-cio/02-configure-scm/images/image023.png b/apps-cloud-adventure-cio/02-configure/images/image123.png
similarity index 100%
rename from apps-cloud-adventure-cio/02-configure-scm/images/image023.png
rename to apps-cloud-adventure-cio/02-configure/images/image123.png
diff --git a/apps-cloud-adventure-cio/03-extend/extend.md b/apps-cloud-adventure-cio/03-extend/extend.md
index f3536657b..5946ed01a 100644
--- a/apps-cloud-adventure-cio/03-extend/extend.md
+++ b/apps-cloud-adventure-cio/03-extend/extend.md
@@ -2,24 +2,24 @@
## Introduction
-In this activity, you will learn how to build a new simplified user interface for specific user populations.
-
-Estimated Time: 15 minutes
-
+Oracle Cloud Applications include an embedded tool called Visual Builder. Visual Builder is the same tool that Oracle uses to develop application screens and it's available for you to create additional screens. These screens can leverage both Oracle Cloud Application data and, if necessary, data from external systems.
### Objectives
-In this lab, you will:
+In this lab, you will use Visual Builder to create additional screens
+
+Estimated Time: 15 minutes
-* Use Visual Builder to build a new Supplier Screen.
+Do not forget to answer the Adventure Check Point questions at the end of the exercise!
-
+## ERP & SCM: Create a simplified user interface using Redwood Design Patterns and Oracle Visual Builder.
-## Task 1: Create a simplified user interface using Redwood Design Patterns and Oracle Visual Builder.
+1. In this lab, you will Use Visual Builder to build a new Supplier Screen.
+
-1. We will now create a new application screen to allow editing of specific supplier information. Oracle Cloud Applications include an embedded tool called Visual Builder. Visual Builder is the same tool that Oracle uses to develop application screens and it's available for you to create additional screens. These screens can leverage both Oracle Cloud Application data and, if necessary, data from external systems.
+2. We will now create a new application screen to allow editing of specific supplier information. Oracle Cloud Applications include an embedded tool called Visual Builder. Visual Builder is the same tool that Oracle uses to develop application screens and it's available for you to create additional screens. These screens can leverage both Oracle Cloud Application data and, if necessary, data from external systems.
> (1) **Click** on the **‘Configuration’** tab.
@@ -27,28 +27,21 @@ In this lab, you will:
-2. After a successful login, you will land on the Oracle Analytics home page.
-
- > (1) Enter assigned username and Fusion Analytics Password
- > (2) **Click** on the **‘Visual Builder’** tile
-
- 
-
-2. We have pre-defined a Project. A project collects all the people, tools, and processes you need to complete a unit of work. You can use a project to host source code files, track issues, collaborate on code, and build and deploy your applications. If your team is extending Oracle Cloud Applications, you’ll probably want to set things up so that you have a single project dedicated to work with a single repository for each Application.
+3. We have pre-defined a Project. A project collects all the people, tools, and processes you need to complete a unit of work. You can use a project to host source code files, track issues, collaborate on code, and build and deploy your applications. If your team is extending Oracle Cloud Applications, you’ll probably want to set things up so that you have a single project dedicated to work with a single repository for each Application.
> **Click** on the **‘CloudAdventure’** project
-3. Workspaces allow you to segregate units of work within a Project.
+4. Workspaces allow you to segregate units of work within a Project.
> **Click** on the **‘Manage Workspaces’** link. If your Project has no pre-existing workspaces, you'll be presented with a **‘Go to Workspaces’** button to click instead. The following screenshots show both potential screens.
-4. We'll create a new workspace for our simplified supplier screen
+5. We'll create a new workspace for our simplified supplier screen
> (1) **Click** on the **‘New’**  dropdown
@@ -56,7 +49,7 @@ In this lab, you will:
-5. We'll name our new Extension.
+6. We'll name our new Extension.
> (1) **Enter** **‘QuickSupplier#’** in the "'Extension Name'" field.
@@ -64,31 +57,31 @@ In this lab, you will:
-6. We're now at the Visual Builder homepage. We can configure existing screens, create new ones, or build whole new applications. We can also leverage REST APIs to access Fusion SaaS Data. Supplier data from Oracle ERP/SCM Cloud, so we'll leverage the embedded integration via REST APIs.
+7. We're now at the Visual Builder homepage. We can configure existing screens, create new ones, or build whole new applications. We can also leverage REST APIs to access Fusion SaaS Data. Supplier data from Oracle ERP/SCM Cloud, so we'll leverage the embedded integration via REST APIs.
> (1) **Click** the **‘Services’**  icon on the left menu.
-7. We can add services from Oracle Cloud Applications or other accessible data sources.
+8. We can add services from Oracle Cloud Applications or other accessible data sources.
> (1) **Click** on the **‘+ Service Connection’** button.
-8. There are multiple ways to reference a service. We'll use the included catalog of Oracle Cloud Application services.
+9. There are multiple ways to reference a service. We'll use the included catalog of Oracle Cloud Application services.
> **Click** on the **‘Select from Catalog’** tile.
-9. Services are available for functionality across the Oracle Cloud Applications.
+10. Services are available for functionality across the Oracle Cloud Applications.
> **Click** on the **‘‘Enterprise Resource Planning and Supply Chain’** tile.
-10. We'll use the Supplier Service from the ERP/SCM Catalog.
+11. We'll use the Supplier Service from the ERP/SCM Catalog.
> (1) **Enter** ‘Suppliers’ in the 'Supplier Name' field.
> (2) Enter ‘Suppliers’ in the ‘Filter Objects/Endpoints’ field.
@@ -97,25 +90,25 @@ In this lab, you will:
-11. The resulting screen shows additional configuration options for our supplier service, but we'll just use the default settings. We can also see the Endpoints details related to our Suppliers service.
+12. The resulting screen shows additional configuration options for our supplier service, but we'll just use the default settings. We can also see the Endpoints details related to our Suppliers service.
> **Click** on the **‘Endpoints’** tab as shown.
-12. Here we see the various operations and data objects available. This includes Get, Post and Patch operations allowing for query, create and update actions Scrolling this window we can see that other related information is also available, including addresses, attachments, contacts, descriptive flexfields and more. Now we want to start creating our new screen.
+13. Here we see the various operations and data objects available. This includes Get, Post and Patch operations allowing for query, create and update actions Scrolling this window we can see that other related information is also available, including addresses, attachments, contacts, descriptive flexfields and more. Now we want to start creating our new screen.
> **Click** on the **‘App UIs’**  icon in the left toolbar
-13. You can now see the App UI panel on the left hand side. This allows you to create you new page.
+14. You can now see the App UI panel on the left hand side. This allows you to create you new page.
> **Click** on the **‘+ App UI’** button.
-14. You can name your App UI.
+15. You can name your App UI.
> (1) **Enter** **‘QuickSupplierUI’** in the "'App UI Name'" field.
@@ -123,14 +116,14 @@ In this lab, you will:
-15. Visual Builder has automatically created a default UI leveraging the Oracle provided Redwood template. Redwood is Oracle's design methodology and pre-defined templates, and design patterns are included in Visual Builder to allow you to create applications that look and function just like Oracle delivered applications.
+16. Visual Builder has automatically created a default UI leveraging the Oracle provided Redwood template. Redwood is Oracle's design methodology and pre-defined templates, and design patterns are included in Visual Builder to allow you to create applications that look and function just like Oracle delivered applications.
> **Double-Click** the **‘main-start’** object.
-16. Here we see our blank template and a list of some of the provided Redwood design components. We want to start by adding some components to the screen to hold our data.
+17. Here we see our blank template and a list of some of the provided Redwood design components. We want to start by adding some components to the screen to hold our data.
> (1) Confirm you’re in the **Components** tab.
@@ -140,7 +133,7 @@ In this lab, you will:
-17. Next, you'll add a component to the panel. The first component we add with be an Input Text field to allow for searching.
+18. Next, you'll add a component to the panel. The first component we add with be an Input Text field to allow for searching.
> (1) Confirm you’re in the **Components** tab.
@@ -150,7 +143,7 @@ In this lab, you will:
-18. In the next 2 steps, you'll add label to your search field and create a page variable. You can start with the label.
+19. In the next 2 steps, you'll add label to your search field and create a page variable. You can start with the label.
> (1) Type **Enter Supplier Name Search** in the **Label Hint** field on the **General** tab of the **Properties** panel on the right.
@@ -158,7 +151,7 @@ In this lab, you will:
-19. Create a page variable to save the contents of your new Input Text field
+20. Create a page variable to save the contents of your new Input Text field
> (1) Click the (x) icon on the top right of the Value field. If the (x) is not showing, move your cursor to the Value field and it will appear.
@@ -166,7 +159,7 @@ In this lab, you will:
-20. Name your page variable.
+21. Name your page variable.
> (1) Type **SupplierSearchString** in the ID Field.
@@ -174,7 +167,7 @@ In this lab, you will:
-21. You’ll now add a Table component to the Panel.
+22. You’ll now add a Table component to the Panel.
> (1) Enter **Table** in the **‘filter’** field.
@@ -182,7 +175,9 @@ In this lab, you will:
-22. You now have a table to hold the data. Next, you’ll add the Supplier data from our REST API. You can use the Quick Start feature to help with this task.
+23. You now have a table to hold the data. Next, you’ll add the Supplier data from our REST API. You can use the Quick Start feature to help with this task.
+
+
> (1) Click in the newly created **Table** region.
@@ -190,7 +185,7 @@ In this lab, you will:
-23. The Quick Start features simply common tasks. You can use the Add Data Quick Start feature to show data from the Supplier REST API.
+24. The Quick Start features simply common tasks. You can use the Add Data Quick Start feature to show data from the Supplier REST API.
> (1) Click the **'Quick Start'** table in the Table Properties area.
@@ -198,7 +193,7 @@ In this lab, you will:
-24. You can see the various Supplier related data available from the Supplier REST API. You’ll just use the Suppliers data for this scenario.
+25. You can see the various Supplier related data available from the Supplier REST API. You’ll just use the Suppliers data for this scenario.
> (1) Click **'Suppliers'** to expand the Suppliers region.
@@ -208,7 +203,7 @@ In this lab, you will:
-25. You’ll select a few fields to display on the new screen. This screen will be used to search for Suppliers and allow for quick update of a few pieces of Supplier Data.
+26. You’ll select a few fields to display on the new screen. This screen will be used to search for Suppliers and allow for quick update of a few pieces of Supplier Data.
> (1) Click **'Checkbox'** next to the following fields. You’ll need to scroll the Endpoint Structure to see the Supplier field:
- Alias
@@ -221,7 +216,7 @@ In this lab, you will:
-26. Here you can configure the search field.
+27. Here you can configure the search field.
> (1) Click on the **filterCriterion** field in the Target section of the screen. This will cause a **Click to add condition** option to appear at the bottom of the screen.
@@ -229,19 +224,19 @@ In this lab, you will:
-27. The next 3 steps will configure the Condition for the filterCriterion.
+28. The next 3 steps will configure the Condition for the filterCriterion.
> (1) Type **Supplier** in the first field and pick **Supplier** from the resulting pop-up list (2).
-28. Next you'll select the Operator
+29. Next you'll select the Operator
> (1) Click in the **Operator** field and select **contains ($co)** from the resulting pop-up list (2).
-29. And now you'll reference the page variable that we created earlier.
+30. And now you'll reference the page variable that we created earlier.
> (1) Click in the **Attribute** field and select **$variables.SupplierSearchString** from the resulting pop-up list (2).
> (3) Click in the **Finish** button.
@@ -249,7 +244,7 @@ In this lab, you will:
-30. Notice that the screen auto-queried Supplier Information. You can easily move between Design, Live and Code views of our application. But next, you want the ability to edit data. So, you’ll use the Quick Start again to add an edit page.
+31. Notice that the screen auto-queried Supplier Information. You can easily move between Design, Live and Code views of our application. But next, you want the ability to edit data. So, you’ll use the Quick Start again to add an edit page.
> (1) Confirm that you're on the **Quick Start** tab.
@@ -257,7 +252,7 @@ In this lab, you will:
-31. You can select the same or different fields for out Edit Page. Since the request was to create a simple page, you'll just add a few fields.
+32. You can select the same or different fields for out Edit Page. Since the request was to create a simple page, you'll just add a few fields.
> (1) Click **'Checkbox'** next to the following fields. Note that you will likely need to scroll the list of fields:
@@ -271,13 +266,13 @@ In this lab, you will:
-32. You're ready to try your new page.
+33. You're ready to try your new page.
> Click the **Preview**  icon on the top right of the screen.
-33. A new browser tab is launched showing our completed application. You now have a fully functioning screen that supports query and update capabilities.
+34. A new browser tab is launched showing our completed application. You now have a fully functioning screen that supports query and update capabilities.
> (1) Enter your search criteria by entering a string in the **Enter Supplier Name Search** field. You can use **Corp** like shown in the screenshot or enter your **user number (##)** to find the Supplier with your number included as part of the name.
@@ -287,7 +282,7 @@ In this lab, you will:
-34. You Edit Supplier screen allows you to update the information and save. The new screen leverages the security and business rules of the application via the standard REST API.
+35. You Edit Supplier screen allows you to update the information and save. The new screen leverages the security and business rules of the application via the standard REST API.
> (1) Note that the Supplier Number field is non-enterable. That field is non-updateable and that condition automatically carries through to our new screen.
> (2) The Taxpayer ID is enterable, but we’ll end here without doing the update.
@@ -296,7 +291,7 @@ In this lab, you will:
-35. Adventure awaits, click on the image and show what you know, and rise to the top of the leader board!!!
+36. Adventure awaits, click on the image and show what you know, and rise to the top of the leader board!!!
[](https://apex.oracle.com/pls/apex/f?p=159406:LOGIN_TEAM:::::CC:CIOADVENTURE)
@@ -315,12 +310,13 @@ So, check your with you team, double-check your racing harness and get ready for
## Learn More
-* [Oracle Documentation](http://docs.oracle.com)
+
* [Extending Oracle Cloud Applications with Visual Builder Studio](https://docs.oracle.com/en/cloud/paas/visual-builder/visualbuilder-building-appui)
* [Overview of Guided Journeys](https://docs.oracle.com/en/cloud/saas/human-resources/24c/faijh/overview-of-guided-journeys.html)
* [Configure User Defined Content Task Type for a Journey](https://docs.oracle.com/en/cloud/saas/human-resources/24c/faijh/configure-user-defined-content-task-type-for-a-journey.html)
+* [Oracle Documentation](http://docs.oracle.com)
## Acknowledgements
* **Author** - Charlie Moff, Distinguished Cloud Technologist, Advanced Technology Services; Stephen Chung, Principal SaaS Cloud Technologist, Advanced Technology Services
* **Contributors** - Sajid Saleem, Master Principal SaaS Cloud Technologist, Advanced Technology Services
-* **Last Updated By/Date** - Charlie Moff, September 2024
\ No newline at end of file
+* **Last Updated By/Date** - Charlie Moff, November 2024
\ No newline at end of file
diff --git a/apps-cloud-adventure-cio/04-extend-hcm-llm/extend-more-hcm.md b/apps-cloud-adventure-cio/04-extend-hcm-llm/extend-more-hcm.md
deleted file mode 100644
index f77ec4b17..000000000
--- a/apps-cloud-adventure-cio/04-extend-hcm-llm/extend-more-hcm.md
+++ /dev/null
@@ -1,186 +0,0 @@
-# Extend your SaaS Applications
-
-## Introduction
-
-In this activity you will learn how easily extend Fusion SaaS application to include external content to guide users to better decisions.
-
-Estimated Time: 15 minutes
-
-
-### Objectives
-
-In this lab, you will:
-
-* Create a Guided Journey that leverages an external LLM
-
-
-
-[](https://apex.oracle.com/pls/apex/f?p=159406:LOGIN_TEAM:::::CC:CIOADVENTURE)
-
-
-
-## Task 1: Guided Journeys with User Defined Content
-
-Guided Journeys allow you to configure business processes to support user tasks by providing guidance, such as additional information, tutorials, company policies, best practices and more. The User Defined Content feature of a Guided Journey Task allows users to define guided journey tasks and connect to a user defined REST API. The user defined REST API can retrieve data from external sources based on the context information passed from the calling user interface.
-
-As a Pit Crew member and the Oracle SaaS Business Process and Configuration expert for your organization, you’re up to the task.
-
-**Objectives**
-In this activity you will use HCM Guided Journey Task with User Defined Content and Visual Builder Studio to
- • Configure HCM Checklist Template with a Guided Journey Task with User Defined Content
- • Link the Guided Journey Task with User Defined Content with a pre-configured Generative AI endpoint
- • Configure HCM Compensation Info Page to include the configured Checklist Template
- • Preview your changes
-
-As you follow along, do not forget to answer the Adventure Check Point questions!
-
-1. The first step to creating our Guided Gourney is to setup a Checklist Template, which defines the tasks related to our Guided Journey.
-
- > (1) Enter **Checklist Templates** in the search field at the top of the home page.
- > (2) Select **Checklist Templates** from the resulting dropdown search results.
-
- 
-
-
-2. The first step is to configure a Checklist Template to include the Guided Journey Task. We’ve already setup Checklist Templates for each Cloud Adventure User, so you'll start by searching for your specific template.
-
- > (1) Enter **CA_##** in the **search** field, **where ## is your assigned user number**.
- 
-
- > (2) Click the **Magnifying Glass**  icon or press the **Enter** key to execute the search.
-
- 
-
-
-
- > Click your **Checklist Template name** (e.g. **CA_##**) to open the checklist.
-
- 
-
-
-3. You can see the general information for your Checklist. You’re now ready to add a Task.
-
- > **Click** on the **Tasks** tab.
-
- 
-
-
-4. You don’t have any tasks yet, so you can create one. The task is where you will define the connection to the external LLM.
-
- > (1) Click the  icon.
-
- > (2) Click **Create Task** from the resulting popup.
-
- 
-
-
-5. You can now define your new task and leverage the task type User Defined Content. This will allow you to reference the REST Integration that was discussed at the beginning of the adventure. It will link to a pre-configured Generative AI LLM endpoint.
-
- > Complete the following fields as shown:
- > • Name(1): Type **Get Additional Compensation Info**
- > • Task Type(2): Select **User Defined Content** from the dropdown
- > • Configuration(3): Select **HCM_GJ_GenAI_OCILlama3_Endpoint** from the dropdown
- > (4) Click the **Save and Close** button.
-
- 
-
-
-6. You have successfully configured a new Guided Journey Task with User Defined Content. Now you are ready to include this new change to the Compensation Info UI.
-
- > Click on **Save and Close** button again to finalize our Task setup.
-
- 
-
-
-7. The next step is the configuration the Compensation Info UI to leverage your Guided Journey. To do that, you can head back to the home page.
-
- > Click on the **Home**  icon on the top icon bar.
- 
-
-
-8. You can configure the Compensation Info page directly from within the application.
-
- > (1) Enter **Compensation Info** into the **search** field at the top of the page.
- > (2) Select **Compensation Info** from the resulting **dropdown** list.
-
- 
-
-
-9. There are no matching workers, so you can unselect Direct reports to broaden our search.
-
- > Click the  next to Direct Reports under the search field.
-
- 
-
-
-10. You can search for a worker and make the configuration directly from their Compensation Info page. Note that even though you’re searching for a specific user, this will be a system-wide configuration.
-
- > (1) Enter **Emily Heather** in the **Search** field.
- > (2) Select **Emily Heather** from the resulting **dropdown** list.
-
- 
-
-
-11. You will now use the embedded Visual Builder Studio tool to configure this page. The configuration will allow you to reference your previously defined Guided Journey and Task. Visual Builder is the tool that Oracle uses to develop Fusion Cloud Application screens. Customers can use these same tools to perform configurations or, as we saw in other adventures, create new screens using the same look and feel as the delivered applications.
-
-
- > (1) Click the **User Photo/User ID icon** on the top right corner of the screen.
- > (2) Select **Edit Page in Visual Builder Studio** from the resulting dropdown list.
-
- 
-
-
-12. You’re now in Visual Builder – Express Mode. This allows you to easily configure application screens. In this scenario, you’ll be referencing the Guided Journey/Task that you created earlier.
-
- > (1) Enter **Salary** in the **Page Properties Filter** field on the right. This will narrow the list of Page Properties available.
- > (2) Enter **CA_##** in the **CompensationInfoSalaryGuidedJourneyCode** field and press the **Enter** key. Be careful to enter this into the correct field as there are several similar fields available. If you searched as described in Step 1, it’s likely the 1st field listed below the filter.
-
- 
-
-
-13. You will now see the Get Additional Compensation Info link available on the screen. If you recall, this was the name of the Task we defined earlier and is your link to the User Defined Configuration call to the LLM.
-
- > Click the **Preview**  icon in the top right of the screen.
-
- 
-
-
-14. The Preview should open in a new browser tab. You can now see our screen in Preview Mode. It shows the standard screen layout, but also includes your Guided Journey configuration. Please note that these configurations are automatically maintained during the Oracle Release Update process. These are not Customizations.
-
- > (1) Click the **Get Additional Compensation Info** link.
-
- 
-
-
-15. The Guided Journey Task has called your User Defined Content integration. As discussed in the introduction to this adventure, it calls Oracle Integration to gather additional prompt information, such as Position and New York, prior to our Generative AI call to the external LLM. The results are then formatted and displayed as shown.
-
- > (1) When finished reviewing the result, you can close your browser tabs and exit the Oracle Cloud Application UI.
-
- 
-
-16. Adventure awaits, click on the image and show what you know, and rise to the top of the leader board!!!
-
- [](https://apex.oracle.com/pls/apex/f?p=159406:LOGIN_TEAM:::::CC:CIOADVENTURE)
-
-## Summary
-
-This Extension adventure introduced you to a few of the capabilities that customers can leverage to extend Oracle Fusion Cloud applications. These features allow you to fine tune your Oracle Fusion Cloud Applications for peak performance, business processes tailored to you requirements, and fast, efficient usage.
-
- You learned how to setup and defined a Guided Journey, which provies your users with the real-time, inline guidance and information required to complete their tasks.
-
-You also learned how to leverage 3rd party Generative AI capabilities by leveraging external LLMs directly from the Guided Journey feature of Oracle Fusion Cloud Applications.
-
-So, check your with you team, double-check your racing harness and get ready for our next Adventure.
-
-
-## Learn More
-
-
-* [Oracle Documentation](http://docs.oracle.com)
-* [Overview of Guided Journeys](https://docs.oracle.com/en/cloud/saas/human-resources/24c/faijh/overview-of-guided-journeys.html)
-* [Configure User Defined Content Task Type for a Journey](https://docs.oracle.com/en/cloud/saas/human-resources/24c/faijh/configure-user-defined-content-task-type-for-a-journey.html)
-
-## Acknowledgements
-* **Author** - Charlie Moff, Distinguished Cloud Technologist, Advanced Technology Services; Stephen Chung, Principal Cloud Technologist, Advanced Technology Services
-* **Contributors** - Sajid Saleem, Master Principal SaaS Cloud Technologist, Advanced Technology Services
-* **Last Updated By/Date** - Charlie Moff, September 2024
\ No newline at end of file
diff --git a/apps-cloud-adventure-cio/04-extend-hcm-llm/image.png b/apps-cloud-adventure-cio/04-extend-hcm-llm/image.png
deleted file mode 100644
index ecf1c5a9b..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-hcm-llm/image.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/cautionaboutusernumbers1.png b/apps-cloud-adventure-cio/04-extend-hcm-llm/images/cautionaboutusernumbers1.png
deleted file mode 100644
index 5f46dd654..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/cautionaboutusernumbers1.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/cautionflagsmalltransparent1.png b/apps-cloud-adventure-cio/04-extend-hcm-llm/images/cautionflagsmalltransparent1.png
deleted file mode 100644
index 8f9177c0e..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/cautionflagsmalltransparent1.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/cloud-adventure-checkpoint-image.png b/apps-cloud-adventure-cio/04-extend-hcm-llm/images/cloud-adventure-checkpoint-image.png
deleted file mode 100644
index 08774508a..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/cloud-adventure-checkpoint-image.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/icon016_preview.png b/apps-cloud-adventure-cio/04-extend-hcm-llm/images/icon016_preview.png
deleted file mode 100644
index 63e2ebdb8..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/icon016_preview.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image100.png b/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image100.png
deleted file mode 100644
index ecf1c5a9b..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image100.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image101.png b/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image101.png
deleted file mode 100644
index fa1ab636a..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image101.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image102.png b/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image102.png
deleted file mode 100644
index ca4dcd9dc..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image102.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image103.png b/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image103.png
deleted file mode 100644
index 117be4d33..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image103.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image104.png b/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image104.png
deleted file mode 100644
index b7b0f76e7..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image104.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image105.png b/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image105.png
deleted file mode 100644
index 48ed5893a..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image105.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image106.png b/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image106.png
deleted file mode 100644
index bb7ade837..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image106.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image107.png b/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image107.png
deleted file mode 100644
index ed45ba2d3..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image107.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image108.png b/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image108.png
deleted file mode 100644
index b44241528..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image108.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image109.png b/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image109.png
deleted file mode 100644
index f0e1d947a..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image109.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image110.png b/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image110.png
deleted file mode 100644
index eecccc73a..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image110.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image111.png b/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image111.png
deleted file mode 100644
index 0217ddb10..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image111.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image112.png b/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image112.png
deleted file mode 100644
index 2e8445562..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image112.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image113.png b/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image113.png
deleted file mode 100644
index 50362ff57..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image113.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image114.png b/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image114.png
deleted file mode 100644
index 154c1e2ea..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image114.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image115.png b/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image115.png
deleted file mode 100644
index fad810a46..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image115.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image116.png b/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image116.png
deleted file mode 100644
index 139d73f18..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/image116.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/llm objs01.png b/apps-cloud-adventure-cio/04-extend-hcm-llm/images/llm objs01.png
deleted file mode 100644
index abd547b78..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/llm objs01.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/supplierscreenobjs.png b/apps-cloud-adventure-cio/04-extend-hcm-llm/images/supplierscreenobjs.png
deleted file mode 100644
index 25c232271..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/supplierscreenobjs.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/yield.png b/apps-cloud-adventure-cio/04-extend-hcm-llm/images/yield.png
deleted file mode 100644
index 9af5083ce..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/yield.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/extend-more.md b/apps-cloud-adventure-cio/04-extend-more/extend-more.md
index 23a0cc992..138af907d 100644
--- a/apps-cloud-adventure-cio/04-extend-more/extend-more.md
+++ b/apps-cloud-adventure-cio/04-extend-more/extend-more.md
@@ -4,7 +4,9 @@
In this activity you will learn how easily extend Fusion SaaS application to include external content to guide users to better decisions.
-Estimated Time: 15 minutes
+Guided Journeys allow you to configure business processes to support user tasks by providing guidance, such as additional information, tutorials, company policies, best practices and more. The User Defined Content feature of a Guided Journey Task allows users to define guided journey tasks and connect to a user defined REST API. The user defined REST API can retrieve data from external sources based on the context information passed from the calling user interface.
+
+As a Pit Crew member and the Oracle SaaS Business Process and Configuration expert for your organization, you’re up to the task.
### Objectives
@@ -13,161 +15,315 @@ In this lab, you will:
* Create a Guided Journey that leverages an external LLM
-
+Estimated Time: 15 minutes
-[](https://apex.oracle.com/pls/apex/f?p=159406:LOGIN_TEAM:::::CC:CIOADVENTURE)
-
-
+As you follow along, do not forget to think about the Adventure Check Point questions you'll answer at the end of this adventure!
-## Task 1: Guided Journeys with User Defined Content
+## HCM: Guided Journey for Compensation Info
-Guided Journeys allow you to configure business processes to support user tasks by providing guidance, such as additional information, tutorials, company policies, best practices and more. The User Defined Content feature of a Guided Journey Task allows users to define guided journey tasks and connect to a user defined REST API. The user defined REST API can retrieve data from external sources based on the context information passed from the calling user interface.
+**Objectives**
+In this activity you will use HCM Guided Journey Task with User Defined Content and Visual Builder Studio to:
-As a Pit Crew member and the Oracle SaaS Business Process and Configuration expert for your organization, you’re up to the task.
+ • Configure HCM Checklist Template with a Guided Journey Task with User Defined Content
+ • Link the Guided Journey Task with User Defined Content with a pre-configured Generative AI endpoint
+ • Configure HCM Compensation Info Page to include the configured Checklist Template
+ • Preview your changes
-**Objectives**
-In this activity you will use HCM Guided Journey Task with User Defined Content and Visual Builder Studio to
- • Configure HCM Checklist Template with a Guided Journey Task with User Defined Content
- • Link the Guided Journey Task with User Defined Content with a pre-configured Generative AI endpoint
- • Configure HCM Compensation Info Page to include the configured Checklist Template
- • Preview your changes
+
-As you follow along, do not forget to answer the Adventure Check Point questions!
-1. The first step to creating our Guided Gourney is to setup a Checklist Template, which defines the tasks related to our Guided Journey.
+1. You'll start by going to the Guided Journey screen.
- > (1) Enter **Checklist Templates** in the search field at the top of the home page.
- > (2) Select **Checklist Templates** from the resulting dropdown search results.
+ > (1) Enter **Guided Journey** in the search field at the top of the home page.
+ > (2) Select **Guided Journey** from the resulting dropdown search results.
- 
+ 
-2. The first step is to configure a Checklist Template to include the Guided Journey Task. We’ve already setup Checklist Templates for each Cloud Adventure User, so you'll start by searching for your specific template.
+2. The first step is to configure a Task for the Guided Journey. We’ve already setup Guided Journeys for each Cloud Adventure User, so you'll start by searching for your specific template.
> (1) Enter **CA_##** in the **search** field, **where ## is your assigned user number**.
- 
+ 
- > (2) Click the **Magnifying Glass**  icon or press the **Enter** key to execute the search.
+ > (2) Click the **Magnifying Glass**  icon or press the **Enter** key to execute the search.
- 
+ 
3.
- > Click your **Checklist Template name** (e.g. **CA_##**) to open the checklist.
+ > Click your **Guided Journey name** (e.g. **CA_##**) to open the journey.
- 
+ 
-4. You can see the general information for your Checklist. You’re now ready to add a Task.
+4. You can see the general information for your Guided Journey, including Name, Code and Description. We'll use the Code later in this adventure. You’re now ready to add a Task.
- > **Click** on the **Tasks** tab.
-
- 
-
-
-5. You don’t have any tasks yet, so you can create one. The task is where you will define the connection to the external LLM.
-
- > (1) Click the  icon.
+ > **Click** on the **+ Add** button under the **Tasks** header.
- > (2) Click **Create Task** from the resulting popup.
-
- 
+ 
-6. You can now define your new task and leverage the task type User Defined Content. This will allow you to reference the REST Integration that was discussed at the beginning of the adventure. It will link to a pre-configured Generative AI LLM endpoint.
+5. You can now define your new task and leverage the task type User Defined Content. This will allow you to reference the REST Integration that was discussed at the beginning of the adventure. It will link to a pre-configured Generative AI LLM endpoint.
> Complete the following fields as shown:
> • Name(1): Type **Get Additional Compensation Info**
> • Task Type(2): Select **User Defined Content** from the dropdown
> • Configuration(3): Select **HCM_GJ_GenAI_OCILlama3_Endpoint** from the dropdown
- > (4) Click the **Save and Close** button.
+ > • (4) Click the **Save** button.
- 
+ 
-7. You have successfully configured a new Guided Journey Task with User Defined Content. Now you are ready to include this new change to the Compensation Info UI.
-
- > Click on **Save and Close** button again to finalize our Task setup.
-
- 
-
+6. The next step is the configuration the Compensation Info UI to leverage your Guided Journey. To do that, you can head back to the home page.
-8. The next step is the configuration the Compensation Info UI to leverage your Guided Journey. To do that, you can head back to the home page.
+ > Click on the **Home**  icon on the top icon bar.
- > Click on the **Home**  icon on the top icon bar.
- 
+ 
-9. You can configure the Compensation Info page directly from within the application.
+7. You can configure the Compensation Info page directly from within the application.
> (1) Enter **Compensation Info** into the **search** field at the top of the page.
> (2) Select **Compensation Info** from the resulting **dropdown** list.
- 
+ 
-10. There are no matching workers, so you can unselect Direct reports to broaden our search.
+8. There are no matching workers, so you can unselect Direct reports to broaden our search.
- > Click the  next to Direct Reports under the search field.
+ > Click the  next to Direct Reports under the search field.
- 
+ 
-11. You can search for a worker and make the configuration directly from their Compensation Info page. Note that even though you’re searching for a specific user, this will be a system-wide configuration.
+9. You can search for a worker and make the configuration directly from their Compensation Info page. Note that even though you’re searching for a specific user, this will be a system-wide configuration.
> (1) Enter **Emily Heather** in the **Search** field.
> (2) Select **Emily Heather** from the resulting **dropdown** list.
- 
+ 
-12. You will now use the embedded Visual Builder Studio tool to configure this page. The configuration will allow you to reference your previously defined Guided Journey and Task. Visual Builder is the tool that Oracle uses to develop Fusion Cloud Application screens. Customers can use these same tools to perform configurations or, as we saw in other adventures, create new screens using the same look and feel as the delivered applications.
+10. You will now use the embedded Visual Builder Studio tool to configure this page. The configuration will allow you to reference your previously defined Guided Journey and Task. Visual Builder is the tool that Oracle uses to develop Fusion Cloud Application screens. Customers can use these same tools to perform configurations or, as we saw in other adventures, create new screens using the same look and feel as the delivered applications.
> (1) Click the **User Photo/User ID icon** on the top right corner of the screen.
> (2) Select **Edit Page in Visual Builder Studio** from the resulting dropdown list.
- 
+ 
-13. You’re now in Visual Builder – Express Mode. This allows you to easily configure application screens. In this scenario, you’ll be referencing the Guided Journey/Task that you created earlier.
+11. You’re now in Visual Builder – Express Mode. This allows you to easily configure application screens. In this scenario, you’ll be referencing the Guided Journey/Task that you created earlier.
> (1) Enter **Salary** in the **Page Properties Filter** field on the right. This will narrow the list of Page Properties available.
> (2) Enter **CA_##** in the **CompensationInfoSalaryGuidedJourneyCode** field and press the **Enter** key. Be careful to enter this into the correct field as there are several similar fields available. If you searched as described in Step 1, it’s likely the 1st field listed below the filter.
- 
+ 
-14. You will now see the Get Additional Compensation Info link available on the screen. If you recall, this was the name of the Task we defined earlier and is your link to the User Defined Configuration call to the LLM.
+12. You will now see the Get Additional Compensation Info link available on the screen. If you recall, this was the name of the Task we defined earlier and is your link to the User Defined Configuration call to the LLM.
- > Click the **Preview**  icon in the top right of the screen.
+ > (1) Confirm (don't click, just confirm) that the **Get Additional Compensation Info** link now appears on the bottom left of the screen.
+ > (2) Click the **Preview**  icon in the top right of the screen.
- 
+ 
-15. The Preview should open in a new browser tab. You can now see our screen in Preview Mode. It shows the standard screen layout, but also includes your Guided Journey configuration. Please note that these configurations are automatically maintained during the Oracle Release Update process. These are not Customizations.
+13. The Preview should open in a new browser tab. You can now see our screen in Preview Mode. It shows the standard screen layout, but also includes your Guided Journey configuration. Please note that these configurations are automatically maintained during the Oracle Release Update process. These are not Customizations.
> (1) Click the **Get Additional Compensation Info** link.
- 
+ 
-16. The Guided Journey Task has called your User Defined Content integration. As discussed in the introduction to this adventure, it calls Oracle Integration to gather additional prompt information, such as Position and New York, prior to our Generative AI call to the external LLM. The results are then formatted and displayed as shown.
+14. The Guided Journey Task has called your User Defined Content integration. As discussed in the introduction to this adventure, it calls Oracle Integration to gather additional prompt information, such as Position and New York, prior to our Generative AI call to the external LLM. The results are then formatted and displayed as shown.
> (1) When finished reviewing the result, you can close your browser tabs and exit the Oracle Cloud Application UI.
- 
+ 
+
-17. Adventure awaits, click on the image and show what you know, and rise to the top of the leader board!!!
+15. Adventure awaits, click on the image and show what you know, and rise to the top of the leader board!!!
[](https://apex.oracle.com/pls/apex/f?p=159406:LOGIN_TEAM:::::CC:CIOADVENTURE)
+## ERP & SCM: Guided Journey for PO Requisition Item Reviews
+
+
+**Objectives**
+In this activity you will use a Guided Journey Task with User Defined Content and Visual Builder Studio. You will:
+
+ • Link the Guided Journey Task with User Defined Content with a pre-configured Generative AI endpoint
+ • Configure Self Service Procurement Shopping Cart to include the configured Checklist Template
+ • Preview your changes to see how you can now access real-time reviews from your cart.
+
+
+
+
+1. You'll start by going to the Guided Journey screen.
+
+ > (1) Enter **Guided Journey** in the search field at the top of the home page.
+ > (2) Select **Guided Journey** from the resulting dropdown search results.
+
+ 
+
+
+2. The first step is to configure a Task for the Guided Journey. We’ve already setup Guided Journeys for each Cloud Adventure User, so you'll start by searching for your specific template.
+
+ > (1) Enter **CA_##** in the **search** field, **where ## is your assigned user number**.
+ 
+
+ > (2) Click the **Magnifying Glass**  icon or press the **Enter** key to execute the search.
+
+ 
+
+
+3.
+
+ > Click your **Guided Journey name** (e.g. **CA_##**) to open it.
+
+ 
+
+
+4. You can see the general information for your Guided Journey, including Name, Code and Description. We'll use the Code later in this adventure. You’re now ready to add a Task.
+
+ > **Click** on the **+ Add** button under the **Tasks** header.
+
+ 
+
+
+5. You can now define your new task, which will leverage the Task Type of User Defined Content. This will allow you to reference the REST Integration that was discussed at the beginning of the adventure. It will link to a pre-configured Generative AI LLM endpoint.
+
+ > Complete the following fields as shown:
+ > • Task Name(1): Type **Product Items Review**
+ > • Task Type(2): Select **User Defined Content** from the dropdown
+ > • Configuration(3): Select **SCM_OCILlama3_Endpoint** from the dropdown
+ > • (4) Click the **Save** button.
+
+ 
+
+
+6. You have successfully configured a new Guided Journey Task with User Defined Content. Now you are ready to include this new change in Self-Service Procurement. The next step is to create a Requisition using Self-Service Procurement. To start this you can head back to the home page.
+
+ > Click on the **Home**  icon on the top icon bar.
+ 
+
+
+
+
+7. To start creating a Purchase Requisition:
+
+ > (1) Click the **Procurement** tab.
+ > (2) And then click the **Purchase Requisitions (New)** tile.
+
+ 
+
+
+8. You're going to purchase a couple of pieces of equipment for your office space. You need a headset for phone calls and a new printer. So, let's see what's available.
+
+ > Click the **Office Technology** tile on the bottom right.
+
+ 
+
+
+9. You can see a variety of headsets available. Let's pick one.
+
+ > Click the **Add to Cart** button for the **Logitech Zone Wireless Bluetooth Headset** tile.
+
+ 
+
+
+10. You've now added that item to the cart. You will receive a confirmation pop-up. You have the option of waiting a few seconds for the confirmation pop-up to disappear or you can click the **X** icon on the **Confirmation** pop-up to close it.
+
+ > Either wait for the pop-up to disappear or click the **X** icon on the **Confirmation** pop-up to close it.
+
+ 
+
+
+11. You want to add one more thing to this requisition. This time you'll use the search feature.
+
+ > Enter **LasetJet** in the **Search for items or services** field and hit Enter.
+
+ 
+
+
+12. There are a lot of options, but you decide to go with the one of the LaserJet Pro printers.
+
+ > Click the **Add to Cart** button for the **LaserJet Pro 400 M401n Laser Printer** tile.
+
+ 
+
+
+13. You've now added that item to the cart. You will receive a confirmation pop-up. You have the option of waiting a few seconds for the confirmation pop-up to disappear or you can click the **X** icon on the **Confirmation** pop-up to close it.
+
+ > Either wait for the pop-up to disappear or click the **X** icon on the **Confirmation** pop-up to close it.
+
+ 
+
+
+14. You're now ready to view your cart.
+
+ > Click the **Cart** icon on the bottom of the screen.
+
+ 
+
+
+15. You will now use the embedded Visual Builder Studio tool to configure this page. The configuration will allow you to reference your previously defined Guided Journey and Task. Visual Builder is the tool that Oracle uses to develop Fusion Cloud Application screens. Customers can use these same tools to perform configurations or, as we saw in other adventures, create new screens using the same look and feel as the delivered applications.
+
+
+ > (1) Click the **User Photo/User ID icon** on the top right corner of the screen.
+ > (2) Select **Edit Page in Visual Builder Studio** from the resulting dropdown list.
+
+ 
+
+
+
+16. You’re now in Visual Builder – Express mode. This allows you to easily configure application screens. In this scenario, you’ll be referencing the Guided Journey/Task that you created earlier.
+
+ > (1) Enter **Journey** in the **Page Properties Filter** field on the right. This will narrow the list of Page Properties available.
+ > (2) Enter **CA_##** in the **Shopping Cart Guided Journey Code** field and press the **Enter** key. Be careful to enter this into the correct field as there are several similar fields available. If you searched as described in Step 1, it’s likely the 1st field listed below the filter.
+
+ 
+
+
+17. You will now see the Product Items Review graphic on the screen. This was defined in the Category Template at the beginning of this adventure. You will now test this by running the screen in Preview mode.
+
+ > Click the **Preview**  icon in the top right of the screen.
+
+ 
+
+
+18. You are now back in Self-Service Procurement and you can see that your 2 items are in the cart. So, you will now open your cart.
+
+ > Click the **Cart** icon on the bottom of the screen.
+
+ 
+
+
+19. The **Product Items Review** image is prominently displayed. Clicking it will call an external Gen AI Service to gather review information about the items in your cart.
+
+ > Click the **Product Items Review** image.
+
+ 
+
+
+20. The Guided Journey Task has called your User Defined Content integration. As discussed in the introduction to this adventure, it calls Oracle Integration to gather additional prompt information, such as Position and New York, prior to our Generative AI call to the external LLM. The results are then formatted and displayed as shown.
+
+ > (1) When finished reviewing the result, you can close your browser tabs and exit the Oracle Cloud Application UI.
+
+ 
+
+21. Adventure awaits, click on the image and show what you know, and rise to the top of the leader board!!!
+
+ [](https://apex.oracle.com/pls/apex/f?p=159406:LOGIN_TEAM:::::CC:CIOADVENTURE)
+
+
## Summary
This Extension adventure introduced you to a few of the capabilities that customers can leverage to extend Oracle Fusion Cloud applications. These features allow you to fine tune your Oracle Fusion Cloud Applications for peak performance, business processes tailored to you requirements, and fast, efficient usage.
- You learned how to setup and defined a Guided Journey, which provies your users with the real-time, inline guidance and information required to complete their tasks.
+ You learned how to setup and defined a Guided Journey, which provides your users with the real-time, inline guidance and information required to complete their tasks.
You also learned how to leverage 3rd party Generative AI capabilities by leveraging external LLMs directly from the Guided Journey feature of Oracle Fusion Cloud Applications.
@@ -178,10 +334,10 @@ So, check your with you team, double-check your racing harness and get ready for
* [Oracle Documentation](http://docs.oracle.com)
-* [Overview of Guided Journeys](https://docs.oracle.com/en/cloud/saas/human-resources/24c/faijh/overview-of-guided-journeys.html)
-* [Configure User Defined Content Task Type for a Journey](https://docs.oracle.com/en/cloud/saas/human-resources/24c/faijh/configure-user-defined-content-task-type-for-a-journey.html)
+* [Overview of Guided Journeys](https://docs.oracle.com/en/cloud/saas/human-resources/24d/faijh/overview-of-guided-journeys.html)
+* [Configure User Defined Content Task Type for a Journey](https://docs.oracle.com/en/cloud/saas/human-resources/24d/faijh/configure-user-defined-content-task-type-for-a-journey.html)
## Acknowledgements
-* **Author** - Charlie Moff, Distinguished Sales Consultant, Advanced Technology Services; Stephen Chung, Principal SaaS Cloud Technologist, Advanced Technology Services
+* **Author** - Charlie Moff, Distinguished Cloud Technologist, Advanced Technology Services; Stephen Chung, Principal Cloud Technologist, Advanced Technology Services
* **Contributors** - Sajid Saleem, Master Principal SaaS Cloud Technologist, Advanced Technology Services
* **Last Updated By/Date** - Charlie Moff, September 2024
\ No newline at end of file
diff --git a/apps-cloud-adventure-cio/04-extend-more/image.png b/apps-cloud-adventure-cio/04-extend-more/image.png
deleted file mode 100644
index ecf1c5a9b..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-more/image.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-scm-llm/images/cautionaboutusernumbers.png b/apps-cloud-adventure-cio/04-extend-more/images/cautionaboutusernumbers.png
similarity index 100%
rename from apps-cloud-adventure-cio/04-extend-scm-llm/images/cautionaboutusernumbers.png
rename to apps-cloud-adventure-cio/04-extend-more/images/cautionaboutusernumbers.png
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/cautionaboutusernumbers1.png b/apps-cloud-adventure-cio/04-extend-more/images/cautionaboutusernumbers1.png
deleted file mode 100644
index 5f46dd654..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-more/images/cautionaboutusernumbers1.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-scm-llm/images/cautionflagsmalltransparent.png b/apps-cloud-adventure-cio/04-extend-more/images/cautionflagsmalltransparent.png
similarity index 100%
rename from apps-cloud-adventure-cio/04-extend-scm-llm/images/cautionflagsmalltransparent.png
rename to apps-cloud-adventure-cio/04-extend-more/images/cautionflagsmalltransparent.png
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/cautionflagsmalltransparent1.png b/apps-cloud-adventure-cio/04-extend-more/images/cautionflagsmalltransparent1.png
deleted file mode 100644
index 8f9177c0e..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-more/images/cautionflagsmalltransparent1.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/hcmimage001.jpg b/apps-cloud-adventure-cio/04-extend-more/images/hcmimage001.jpg
new file mode 100644
index 000000000..4ea90b151
Binary files /dev/null and b/apps-cloud-adventure-cio/04-extend-more/images/hcmimage001.jpg differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/hcmimage002.jpg b/apps-cloud-adventure-cio/04-extend-more/images/hcmimage002.jpg
new file mode 100644
index 000000000..8eca2ba3f
Binary files /dev/null and b/apps-cloud-adventure-cio/04-extend-more/images/hcmimage002.jpg differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/hcmimage003.jpg b/apps-cloud-adventure-cio/04-extend-more/images/hcmimage003.jpg
new file mode 100644
index 000000000..3ace9d34b
Binary files /dev/null and b/apps-cloud-adventure-cio/04-extend-more/images/hcmimage003.jpg differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/hcmimage004.jpg b/apps-cloud-adventure-cio/04-extend-more/images/hcmimage004.jpg
new file mode 100644
index 000000000..a52311b9a
Binary files /dev/null and b/apps-cloud-adventure-cio/04-extend-more/images/hcmimage004.jpg differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/hcmimage005.jpg b/apps-cloud-adventure-cio/04-extend-more/images/hcmimage005.jpg
new file mode 100644
index 000000000..30c7f95eb
Binary files /dev/null and b/apps-cloud-adventure-cio/04-extend-more/images/hcmimage005.jpg differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/hcmimage006.jpg b/apps-cloud-adventure-cio/04-extend-more/images/hcmimage006.jpg
new file mode 100644
index 000000000..404c4b0d6
Binary files /dev/null and b/apps-cloud-adventure-cio/04-extend-more/images/hcmimage006.jpg differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/hcmimage007.jpg b/apps-cloud-adventure-cio/04-extend-more/images/hcmimage007.jpg
new file mode 100644
index 000000000..b5883a667
Binary files /dev/null and b/apps-cloud-adventure-cio/04-extend-more/images/hcmimage007.jpg differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/hcmimage008.jpg b/apps-cloud-adventure-cio/04-extend-more/images/hcmimage008.jpg
new file mode 100644
index 000000000..355e265dd
Binary files /dev/null and b/apps-cloud-adventure-cio/04-extend-more/images/hcmimage008.jpg differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/hcmimage009.jpg b/apps-cloud-adventure-cio/04-extend-more/images/hcmimage009.jpg
new file mode 100644
index 000000000..1726c344b
Binary files /dev/null and b/apps-cloud-adventure-cio/04-extend-more/images/hcmimage009.jpg differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/hcmimage010.jpg b/apps-cloud-adventure-cio/04-extend-more/images/hcmimage010.jpg
new file mode 100644
index 000000000..96dbb656e
Binary files /dev/null and b/apps-cloud-adventure-cio/04-extend-more/images/hcmimage010.jpg differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/hcmimage011.jpg b/apps-cloud-adventure-cio/04-extend-more/images/hcmimage011.jpg
new file mode 100644
index 000000000..4d0bd7efe
Binary files /dev/null and b/apps-cloud-adventure-cio/04-extend-more/images/hcmimage011.jpg differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/hcmimage012.jpg b/apps-cloud-adventure-cio/04-extend-more/images/hcmimage012.jpg
new file mode 100644
index 000000000..936689111
Binary files /dev/null and b/apps-cloud-adventure-cio/04-extend-more/images/hcmimage012.jpg differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/hcmimage013.jpg b/apps-cloud-adventure-cio/04-extend-more/images/hcmimage013.jpg
new file mode 100644
index 000000000..daaaf56fb
Binary files /dev/null and b/apps-cloud-adventure-cio/04-extend-more/images/hcmimage013.jpg differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/hcmimage014.jpg b/apps-cloud-adventure-cio/04-extend-more/images/hcmimage014.jpg
new file mode 100644
index 000000000..6b7967e34
Binary files /dev/null and b/apps-cloud-adventure-cio/04-extend-more/images/hcmimage014.jpg differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/hcmllmobjs.jpg b/apps-cloud-adventure-cio/04-extend-more/images/hcmllmobjs.jpg
new file mode 100644
index 000000000..357aafba8
Binary files /dev/null and b/apps-cloud-adventure-cio/04-extend-more/images/hcmllmobjs.jpg differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/icon011_search.png b/apps-cloud-adventure-cio/04-extend-more/images/icon011_search.png
deleted file mode 100644
index 6e8dcf49a..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-more/images/icon011_search.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/icon012_Plus.png b/apps-cloud-adventure-cio/04-extend-more/images/icon012_Plus.png
deleted file mode 100644
index bf7976acb..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-more/images/icon012_Plus.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/icon013_home.png b/apps-cloud-adventure-cio/04-extend-more/images/icon013_home.png
deleted file mode 100644
index 2b8b3cfed..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-more/images/icon013_home.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/icon014_X.png b/apps-cloud-adventure-cio/04-extend-more/images/icon014_X.png
deleted file mode 100644
index 83c190e6f..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-more/images/icon014_X.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/icon016_preview.png b/apps-cloud-adventure-cio/04-extend-more/images/icon016_preview.png
deleted file mode 100644
index 63e2ebdb8..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-more/images/icon016_preview.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/icon10_searchdark.png b/apps-cloud-adventure-cio/04-extend-more/images/icon10_searchdark.png
new file mode 100644
index 000000000..f74b2f219
Binary files /dev/null and b/apps-cloud-adventure-cio/04-extend-more/images/icon10_searchdark.png differ
diff --git a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/icon011_search.png b/apps-cloud-adventure-cio/04-extend-more/images/icon11_search.png
similarity index 100%
rename from apps-cloud-adventure-cio/04-extend-hcm-llm/images/icon011_search.png
rename to apps-cloud-adventure-cio/04-extend-more/images/icon11_search.png
diff --git a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/icon012_Plus.png b/apps-cloud-adventure-cio/04-extend-more/images/icon12_Plus.png
similarity index 100%
rename from apps-cloud-adventure-cio/04-extend-hcm-llm/images/icon012_Plus.png
rename to apps-cloud-adventure-cio/04-extend-more/images/icon12_Plus.png
diff --git a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/icon013_home.png b/apps-cloud-adventure-cio/04-extend-more/images/icon13_home.png
similarity index 100%
rename from apps-cloud-adventure-cio/04-extend-hcm-llm/images/icon013_home.png
rename to apps-cloud-adventure-cio/04-extend-more/images/icon13_home.png
diff --git a/apps-cloud-adventure-cio/04-extend-hcm-llm/images/icon014_X.png b/apps-cloud-adventure-cio/04-extend-more/images/icon14_X.png
similarity index 100%
rename from apps-cloud-adventure-cio/04-extend-hcm-llm/images/icon014_X.png
rename to apps-cloud-adventure-cio/04-extend-more/images/icon14_X.png
diff --git a/apps-cloud-adventure-cio/02-configure-scm/images/icon04_preview.png b/apps-cloud-adventure-cio/04-extend-more/images/icon16_preview.png
similarity index 100%
rename from apps-cloud-adventure-cio/02-configure-scm/images/icon04_preview.png
rename to apps-cloud-adventure-cio/04-extend-more/images/icon16_preview.png
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/image100.png b/apps-cloud-adventure-cio/04-extend-more/images/image100.png
deleted file mode 100644
index ecf1c5a9b..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-more/images/image100.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/image101.png b/apps-cloud-adventure-cio/04-extend-more/images/image101.png
deleted file mode 100644
index fa1ab636a..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-more/images/image101.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/image102.png b/apps-cloud-adventure-cio/04-extend-more/images/image102.png
deleted file mode 100644
index ca4dcd9dc..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-more/images/image102.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/image103.png b/apps-cloud-adventure-cio/04-extend-more/images/image103.png
deleted file mode 100644
index 117be4d33..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-more/images/image103.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/image104.png b/apps-cloud-adventure-cio/04-extend-more/images/image104.png
deleted file mode 100644
index b7b0f76e7..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-more/images/image104.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/image105.png b/apps-cloud-adventure-cio/04-extend-more/images/image105.png
deleted file mode 100644
index 48ed5893a..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-more/images/image105.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/image106.png b/apps-cloud-adventure-cio/04-extend-more/images/image106.png
deleted file mode 100644
index bb7ade837..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-more/images/image106.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/image107.png b/apps-cloud-adventure-cio/04-extend-more/images/image107.png
deleted file mode 100644
index ed45ba2d3..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-more/images/image107.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/image108.png b/apps-cloud-adventure-cio/04-extend-more/images/image108.png
deleted file mode 100644
index b44241528..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-more/images/image108.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/image109.png b/apps-cloud-adventure-cio/04-extend-more/images/image109.png
deleted file mode 100644
index f0e1d947a..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-more/images/image109.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/image110.png b/apps-cloud-adventure-cio/04-extend-more/images/image110.png
deleted file mode 100644
index eecccc73a..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-more/images/image110.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/image111.png b/apps-cloud-adventure-cio/04-extend-more/images/image111.png
deleted file mode 100644
index 0217ddb10..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-more/images/image111.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/image112.png b/apps-cloud-adventure-cio/04-extend-more/images/image112.png
deleted file mode 100644
index 2e8445562..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-more/images/image112.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/image113.png b/apps-cloud-adventure-cio/04-extend-more/images/image113.png
deleted file mode 100644
index 50362ff57..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-more/images/image113.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/image114.png b/apps-cloud-adventure-cio/04-extend-more/images/image114.png
deleted file mode 100644
index 154c1e2ea..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-more/images/image114.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/image115.png b/apps-cloud-adventure-cio/04-extend-more/images/image115.png
deleted file mode 100644
index fad810a46..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-more/images/image115.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/image116.png b/apps-cloud-adventure-cio/04-extend-more/images/image116.png
deleted file mode 100644
index 139d73f18..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-more/images/image116.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-scm-llm/images/llm objs.png b/apps-cloud-adventure-cio/04-extend-more/images/llm objs.png
similarity index 100%
rename from apps-cloud-adventure-cio/04-extend-scm-llm/images/llm objs.png
rename to apps-cloud-adventure-cio/04-extend-more/images/llm objs.png
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/llm objs01.png b/apps-cloud-adventure-cio/04-extend-more/images/llm objs01.png
deleted file mode 100644
index abd547b78..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-more/images/llm objs01.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/poimage001.jpg b/apps-cloud-adventure-cio/04-extend-more/images/poimage001.jpg
new file mode 100644
index 000000000..4ea90b151
Binary files /dev/null and b/apps-cloud-adventure-cio/04-extend-more/images/poimage001.jpg differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/poimage002.jpg b/apps-cloud-adventure-cio/04-extend-more/images/poimage002.jpg
new file mode 100644
index 000000000..8eca2ba3f
Binary files /dev/null and b/apps-cloud-adventure-cio/04-extend-more/images/poimage002.jpg differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/poimage003.jpg b/apps-cloud-adventure-cio/04-extend-more/images/poimage003.jpg
new file mode 100644
index 000000000..3ace9d34b
Binary files /dev/null and b/apps-cloud-adventure-cio/04-extend-more/images/poimage003.jpg differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/poimage004.jpg b/apps-cloud-adventure-cio/04-extend-more/images/poimage004.jpg
new file mode 100644
index 000000000..a52311b9a
Binary files /dev/null and b/apps-cloud-adventure-cio/04-extend-more/images/poimage004.jpg differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/poimage005.jpg b/apps-cloud-adventure-cio/04-extend-more/images/poimage005.jpg
new file mode 100644
index 000000000..5905bb237
Binary files /dev/null and b/apps-cloud-adventure-cio/04-extend-more/images/poimage005.jpg differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/poimage006.jpg b/apps-cloud-adventure-cio/04-extend-more/images/poimage006.jpg
new file mode 100644
index 000000000..50a42341b
Binary files /dev/null and b/apps-cloud-adventure-cio/04-extend-more/images/poimage006.jpg differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/poimage007.jpg b/apps-cloud-adventure-cio/04-extend-more/images/poimage007.jpg
new file mode 100644
index 000000000..2a73b36db
Binary files /dev/null and b/apps-cloud-adventure-cio/04-extend-more/images/poimage007.jpg differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/poimage008.jpg b/apps-cloud-adventure-cio/04-extend-more/images/poimage008.jpg
new file mode 100644
index 000000000..a64c80c7f
Binary files /dev/null and b/apps-cloud-adventure-cio/04-extend-more/images/poimage008.jpg differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/poimage009.jpg b/apps-cloud-adventure-cio/04-extend-more/images/poimage009.jpg
new file mode 100644
index 000000000..4ce09400b
Binary files /dev/null and b/apps-cloud-adventure-cio/04-extend-more/images/poimage009.jpg differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/poimage010.jpg b/apps-cloud-adventure-cio/04-extend-more/images/poimage010.jpg
new file mode 100644
index 000000000..0cd94891b
Binary files /dev/null and b/apps-cloud-adventure-cio/04-extend-more/images/poimage010.jpg differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/poimage011.jpg b/apps-cloud-adventure-cio/04-extend-more/images/poimage011.jpg
new file mode 100644
index 000000000..c76bf4fd4
Binary files /dev/null and b/apps-cloud-adventure-cio/04-extend-more/images/poimage011.jpg differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/poimage012.jpg b/apps-cloud-adventure-cio/04-extend-more/images/poimage012.jpg
new file mode 100644
index 000000000..0962e7081
Binary files /dev/null and b/apps-cloud-adventure-cio/04-extend-more/images/poimage012.jpg differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/poimage013.jpg b/apps-cloud-adventure-cio/04-extend-more/images/poimage013.jpg
new file mode 100644
index 000000000..faab6190c
Binary files /dev/null and b/apps-cloud-adventure-cio/04-extend-more/images/poimage013.jpg differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/poimage014.jpg b/apps-cloud-adventure-cio/04-extend-more/images/poimage014.jpg
new file mode 100644
index 000000000..beab6789d
Binary files /dev/null and b/apps-cloud-adventure-cio/04-extend-more/images/poimage014.jpg differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/poimage015.jpg b/apps-cloud-adventure-cio/04-extend-more/images/poimage015.jpg
new file mode 100644
index 000000000..0d7b57935
Binary files /dev/null and b/apps-cloud-adventure-cio/04-extend-more/images/poimage015.jpg differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/poimage016.jpg b/apps-cloud-adventure-cio/04-extend-more/images/poimage016.jpg
new file mode 100644
index 000000000..f4fefc892
Binary files /dev/null and b/apps-cloud-adventure-cio/04-extend-more/images/poimage016.jpg differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/poimage017.jpg b/apps-cloud-adventure-cio/04-extend-more/images/poimage017.jpg
new file mode 100644
index 000000000..b77ae49f5
Binary files /dev/null and b/apps-cloud-adventure-cio/04-extend-more/images/poimage017.jpg differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/poimage018.jpg b/apps-cloud-adventure-cio/04-extend-more/images/poimage018.jpg
new file mode 100644
index 000000000..acf1324c6
Binary files /dev/null and b/apps-cloud-adventure-cio/04-extend-more/images/poimage018.jpg differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/poimage019.jpg b/apps-cloud-adventure-cio/04-extend-more/images/poimage019.jpg
new file mode 100644
index 000000000..a1259e1a4
Binary files /dev/null and b/apps-cloud-adventure-cio/04-extend-more/images/poimage019.jpg differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/poimage020.jpg b/apps-cloud-adventure-cio/04-extend-more/images/poimage020.jpg
new file mode 100644
index 000000000..f90eb234f
Binary files /dev/null and b/apps-cloud-adventure-cio/04-extend-more/images/poimage020.jpg differ
diff --git a/apps-cloud-adventure-cio/04-extend-more/images/pollmobj.jpg b/apps-cloud-adventure-cio/04-extend-more/images/pollmobj.jpg
new file mode 100644
index 000000000..7082f0cfb
Binary files /dev/null and b/apps-cloud-adventure-cio/04-extend-more/images/pollmobj.jpg differ
diff --git a/apps-cloud-adventure-cio/04-extend-scm-llm/extend-more-po.md b/apps-cloud-adventure-cio/04-extend-scm-llm/extend-more-po.md
deleted file mode 100644
index 94c0e5e0f..000000000
--- a/apps-cloud-adventure-cio/04-extend-scm-llm/extend-more-po.md
+++ /dev/null
@@ -1,226 +0,0 @@
-# Extend your SaaS Applications
-
-## Introduction
-
-In this activity you will learn how easily extend Fusion SaaS application to include external content to guide users to better decisions.
-
-Estimated Time: 15 minutes
-
-
-### Objectives
-
-In this lab, you will:
-
-* Create a Guided Journey that leverages an external LLM
-
-
-
-[](https://apex.oracle.com/pls/apex/f?p=159406:LOGIN_TEAM:::::CC:CIOADVENTURE)
-
-
-
-## Task 1: Guided Journeys with User Defined Content
-
-Guided Journeys allow you to configure business processes to support user tasks by providing guidance, such as additional information, tutorials, company policies, best practices and more. The User Defined Content feature of a Guided Journey Task allows users to define guided journey tasks and connect to a user defined REST API. The user defined REST API can retrieve data from external sources based on the context information passed from the calling user interface.
-
-As a Pit Crew member and the Oracle SaaS Business Process and Configuration expert for your organization, you’re up to the task.
-
-**Objectives**
-In this activity you will use a Guided Journey Task with USer Defined Content and and Visual Builder Studio. You will:
-
- • Link the Guided Journey Task with User Defined Content with a pre-configured Generative AI endpoint
- • Configure Self Service Procurement Shopping Cart to include the configured Checklist Template
- • Preview your changes to see how you can now access real-time reviews from your cart.
-
-As you follow along, do not forget to answer the Adventure Check Point questions!
-
-1. The first step to creating our Guided Journey is to setup a Checklist Template, which defines the tasks related to our Guided Journey.
-
- > (1) Enter **Checklist Templates** in the search field at the top of the home page.
- > (2) Select **Checklist Templates** from the resulting dropdown search results.
-
- 
-
-
-2. The first step is to configure a Checklist Template to include the Guided Journey Task. We’ve already setup Checklist Templates for each Cloud Adventure User, so you'll start by searching for your specific template.
-
- > (1) Enter **CA_##** in the **search** field, **where ## is your assigned user number**.
- 
-
- > (2) Click the **Magnifying Glass**  icon or press the **Enter** key to execute the search.
-
- 
-
-
- > Click your **Checklist Template name** (e.g. **CA_##**) to open the checklist.
-
- 
-
-
-3. You can see the general information for your Checklist. You’re now ready to add a Task.
-
- > **Click** on the **Tasks** tab.
-
- 
-
-
-4. You don’t have any tasks yet, so you can create one. The task is where you will define the connection to the external LLM.
-
- > (1) Click the  icon.
-
- > (2) Click **Create Task** from the resulting popup.
-
- 
-
-
-5. You can now define your new task and leverage the task type User Defined Content. This will allow you to reference the REST Integration that was discussed at the beginning of the adventure. It will link to a pre-configured Generative AI LLM endpoint.
-
- > Complete the following fields as shown:
- > • Name(1): Type **Product Items Review**
- > • Task Type(2): Select **User Defined Content** from the dropdown
- > • Configuration(3): Select **SCM_GJ_GenAI_OCILlama3_Endpoint** from the dropdown
- > • (4) Click the **Save and Close** button.
-
- 
-
-
-6. You have successfully configured a new Guided Journey Task with User Defined Content. Now you are ready to include this new change in Self-Service Procurement.
-
- > Click on **Save and Close** button again to finalize our Task setup.
-
- 
-
-
-7. The next step is to create a Requisition using Self-Service Procurement. To start this you can head back to the home page.
-
- > Click on the **Home**  icon on the top icon bar.
- 
-
-
-8. To start creating a Purchase Requisition:
-
- > (1) Enter **Purchase Requisitions** into the **search** field at the top of the page.
- > (2) Select **Purchase Requisitions** from the resulting **dropdown** list.
-
- 
-
-
-9. You're going to purchase a couple of pieces of equipment for our office space. You need a headset for phonecalls and a new printer. So, let's see what's available.
-
- > Click the **OFfice Technology** tile on the bottom right.
-
- 
-
-
-10. You can see a variety of headsets available. Let's pick one.
-
- > Click the **Add to Cart** button for the **Logitech Zone Wireless Bluetooth Headset** tile.
-
- 
-
-
-11. You've now added that item to the cart. You will receive a confirmation pop-up. You have the option of waiting a few seconds for the confirmation pop-up to disappear or you can click the **X** icon on the **Confirmation** pop-up to close it.
-
- > Either wait for the pop-up to disappear or click the **X** icon on the **Confirmation** pop-up to close it.
-
- 
-
-
-12. You want to add one more thing to this requisition. This time you'll use the search feature.
-
- > Enter **LasetJet** in the **Search for items or services** field
-
- 
-
-
-13. You want to add one more thing to this requisition. This time you'll use the search feature.
-
- > Click the **Add to Cart** button for the **LaserJet Pro 400 M401n Laser Printer** tile.
-
- 
-
-
-14. You've now added that item to the cart. You will receive a confirmation pop-up. You have the option of waiting a few seconds for the confirmation pop-up to disappear or you can click the **X** icon on the **Confirmation** pop-up to close it.
-
- > Either wait for the pop-up to disappear or click the **X** icon on the **Confirmation** pop-up to close it.
-
- 
-
-
-15. You're now ready to view your cart.
-
- > Click the **Cart** icon on the bottom of the screen.
-
- 
-
-
-16. You will now use the embedded Visual Builder Studio tool to configure this page. The configuration will allow you to reference your previously defined Guided Journey and Task. Visual Builder is the tool that Oracle uses to develop Fusion Cloud Application screens. Customers can use these same tools to perform configurations or, as we saw in other adventures, create new screens using the same look and feel as the delivered applications.
-
-
- > (1) Click the **User Photo/User ID icon** on the top right corner of the screen.
- > (2) Select **Edit Page in Visual Builder Studio** from the resulting dropdown list.
-
- 
-
-
-
-17. You’re now in Visual Builder – Express Mode. This allows you to easily configure application screens. In this scenario, you’ll be referencing the Guided Journey/Task that you created earlier.
-
- > (1) Enter **Journey** in the **Page Properties Filter** field on the right. This will narrow the list of Page Properties available.
- > (2) Enter **CA_##** in the **Shopping Cart Guided Journey Code** field and press the **Enter** key. Be careful to enter this into the correct field as there are several similar fields available. If you searched as described in Step 1, it’s likely the 1st field listed below the filter.
-
- 
-
-
-18. You will now see the Product Items Review graphic on the screen. This was defined in the Category Template at the beginning of this adventure. You will now test this by running the screen in Preview mode.
-
- > Click the **Preview**  icon in the top right of the screen.
-
- 
-
-19. You are now back in Self-Service Procurement and you can see that your 2 items are in the cart. So, you will now open your cart.
-
- > Click the **Cart** icon on the bottom of the screen.
-
- 
-
-
-20. The **Product Items Review** image is prominently displayed. Clicking it will call an external Gen AI Service to gather review information about the items in your cart.
-
- > Click the **Product Items Review** image.
-
- 
-
-
-21. The Guided Journey Task has called your User Defined Content integration. As discussed in the introduction to this adventure, it calls Oracle Integration to gather additional prompt information, such as Position and New York, prior to our Generative AI call to the external LLM. The results are then formatted and displayed as shown.
-
- > (1) When finished reviewing the result, you can close your browser tabs and exit the Oracle Cloud Application UI.
-
- 
-
-22. Adventure awaits, click on the image and show what you know, and rise to the top of the leader board!!!
-
- [](https://apex.oracle.com/pls/apex/f?p=159406:LOGIN_TEAM:::::CC:CIOADVENTURE)
-
-## Summary
-
-This Extension adventure introduced you to a few of the capabilities that customers can leverage to extend Oracle Fusion Cloud applications. These features allow you to fine tune your Oracle Fusion Cloud Applications for peak performance, business processes tailored to you requirements, and fast, efficient usage.
-
- You learned how to setup and defined a Guided Journey, which provies your users with the real-time, inline guidance and information required to complete their tasks.
-
-You also learned how to leverage 3rd party Generative AI capabilities by leveraging external LLMs directly from the Guided Journey feature of Oracle Fusion Cloud Applications.
-
-So, check your with you team, double-check your racing harness and get ready for our next Adventure.
-
-
-## Learn More
-
-
-* [Oracle Documentation](http://docs.oracle.com)
-* [Overview of Guided Journeys](https://docs.oracle.com/en/cloud/saas/human-resources/24c/faijh/overview-of-guided-journeys.html)
-* [Configure User Defined Content Task Type for a Journey](https://docs.oracle.com/en/cloud/saas/human-resources/24c/faijh/configure-user-defined-content-task-type-for-a-journey.html)
-
-## Acknowledgements
-* **Author** - Charlie Moff, Distinguished Cloud Technologist, Advanced Technology Services; Stephen Chung, Principal Cloud Technologist, Advanced Technology Services
-* **Contributors** - Sajid Saleem, Master Principal SaaS Cloud Technologist, Advanced Technology Services
-* **Last Updated By/Date** - Charlie Moff, September 2024
\ No newline at end of file
diff --git a/apps-cloud-adventure-cio/04-extend-scm-llm/image.png b/apps-cloud-adventure-cio/04-extend-scm-llm/image.png
deleted file mode 100644
index ecf1c5a9b..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-scm-llm/image.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-scm-llm/images/Icon01_search.png b/apps-cloud-adventure-cio/04-extend-scm-llm/images/Icon01_search.png
deleted file mode 100644
index 6e8dcf49a..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-scm-llm/images/Icon01_search.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-scm-llm/images/Icon02_Plus.png b/apps-cloud-adventure-cio/04-extend-scm-llm/images/Icon02_Plus.png
deleted file mode 100644
index bf7976acb..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-scm-llm/images/Icon02_Plus.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-scm-llm/images/Icon03_home.png b/apps-cloud-adventure-cio/04-extend-scm-llm/images/Icon03_home.png
deleted file mode 100644
index 2b8b3cfed..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-scm-llm/images/Icon03_home.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-scm-llm/images/Icon04_X.png b/apps-cloud-adventure-cio/04-extend-scm-llm/images/Icon04_X.png
deleted file mode 100644
index 83c190e6f..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-scm-llm/images/Icon04_X.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-scm-llm/images/Icon06_preview.png b/apps-cloud-adventure-cio/04-extend-scm-llm/images/Icon06_preview.png
deleted file mode 100644
index 63e2ebdb8..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-scm-llm/images/Icon06_preview.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-scm-llm/images/cloud-adventure-checkpoint-image.png b/apps-cloud-adventure-cio/04-extend-scm-llm/images/cloud-adventure-checkpoint-image.png
deleted file mode 100644
index 08774508a..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-scm-llm/images/cloud-adventure-checkpoint-image.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image100.png b/apps-cloud-adventure-cio/04-extend-scm-llm/images/image100.png
deleted file mode 100644
index ecf1c5a9b..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image100.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image101.png b/apps-cloud-adventure-cio/04-extend-scm-llm/images/image101.png
deleted file mode 100644
index fa1ab636a..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image101.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image102.png b/apps-cloud-adventure-cio/04-extend-scm-llm/images/image102.png
deleted file mode 100644
index ca4dcd9dc..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image102.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image103.png b/apps-cloud-adventure-cio/04-extend-scm-llm/images/image103.png
deleted file mode 100644
index 117be4d33..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image103.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image104.png b/apps-cloud-adventure-cio/04-extend-scm-llm/images/image104.png
deleted file mode 100644
index b7b0f76e7..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image104.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image105.png b/apps-cloud-adventure-cio/04-extend-scm-llm/images/image105.png
deleted file mode 100644
index 48ed5893a..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image105.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image106.png b/apps-cloud-adventure-cio/04-extend-scm-llm/images/image106.png
deleted file mode 100644
index af9f2aa4f..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image106.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image107.png b/apps-cloud-adventure-cio/04-extend-scm-llm/images/image107.png
deleted file mode 100644
index d095fe254..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image107.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image108.png b/apps-cloud-adventure-cio/04-extend-scm-llm/images/image108.png
deleted file mode 100644
index a76f40fa4..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image108.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image109.png b/apps-cloud-adventure-cio/04-extend-scm-llm/images/image109.png
deleted file mode 100644
index ed51b13c3..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image109.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image110.png b/apps-cloud-adventure-cio/04-extend-scm-llm/images/image110.png
deleted file mode 100644
index 6e1cd310a..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image110.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image111.png b/apps-cloud-adventure-cio/04-extend-scm-llm/images/image111.png
deleted file mode 100644
index 6a6649e06..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image111.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image112.png b/apps-cloud-adventure-cio/04-extend-scm-llm/images/image112.png
deleted file mode 100644
index a2aa320a8..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image112.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image113.png b/apps-cloud-adventure-cio/04-extend-scm-llm/images/image113.png
deleted file mode 100644
index 92a658427..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image113.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image114.png b/apps-cloud-adventure-cio/04-extend-scm-llm/images/image114.png
deleted file mode 100644
index 0957275b8..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image114.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image115.png b/apps-cloud-adventure-cio/04-extend-scm-llm/images/image115.png
deleted file mode 100644
index 6976d5e11..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image115.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image116.png b/apps-cloud-adventure-cio/04-extend-scm-llm/images/image116.png
deleted file mode 100644
index b621c860d..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image116.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image117.png b/apps-cloud-adventure-cio/04-extend-scm-llm/images/image117.png
deleted file mode 100644
index 1f82ce30e..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image117.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image118.png b/apps-cloud-adventure-cio/04-extend-scm-llm/images/image118.png
deleted file mode 100644
index e68031071..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image118.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image119.png b/apps-cloud-adventure-cio/04-extend-scm-llm/images/image119.png
deleted file mode 100644
index d4af9ffcc..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image119.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image120.png b/apps-cloud-adventure-cio/04-extend-scm-llm/images/image120.png
deleted file mode 100644
index 978a0bdbc..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image120.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image121.png b/apps-cloud-adventure-cio/04-extend-scm-llm/images/image121.png
deleted file mode 100644
index 39955ff35..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image121.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image122.png b/apps-cloud-adventure-cio/04-extend-scm-llm/images/image122.png
deleted file mode 100644
index 2cf75a789..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image122.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image123.png b/apps-cloud-adventure-cio/04-extend-scm-llm/images/image123.png
deleted file mode 100644
index 1928ec97c..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-scm-llm/images/image123.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-scm-llm/images/supplierscreenobjs.png b/apps-cloud-adventure-cio/04-extend-scm-llm/images/supplierscreenobjs.png
deleted file mode 100644
index 25c232271..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-scm-llm/images/supplierscreenobjs.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-extend-scm-llm/images/yield.png b/apps-cloud-adventure-cio/04-extend-scm-llm/images/yield.png
deleted file mode 100644
index 9af5083ce..000000000
Binary files a/apps-cloud-adventure-cio/04-extend-scm-llm/images/yield.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/Icon01_edit.png b/apps-cloud-adventure-cio/04-integration/images/Icon01_edit.png
deleted file mode 100644
index 03697fa23..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/Icon01_edit.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/Icon02_home.png b/apps-cloud-adventure-cio/04-integration/images/Icon02_home.png
deleted file mode 100644
index 2b8b3cfed..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/Icon02_home.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/Icon03_hamburger.png b/apps-cloud-adventure-cio/04-integration/images/Icon03_hamburger.png
deleted file mode 100644
index 2fcc9d40f..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/Icon03_hamburger.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/Icon04_downarrow.png b/apps-cloud-adventure-cio/04-integration/images/Icon04_downarrow.png
deleted file mode 100644
index df7b7054a..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/Icon04_downarrow.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/Integration_OBJs.png b/apps-cloud-adventure-cio/04-integration/images/Integration_OBJs.png
deleted file mode 100644
index 03568b1a2..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/Integration_OBJs.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/cloud-adventure-checkpoint-image.png b/apps-cloud-adventure-cio/04-integration/images/cloud-adventure-checkpoint-image.png
deleted file mode 100644
index 08774508a..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/cloud-adventure-checkpoint-image.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image001.png b/apps-cloud-adventure-cio/04-integration/images/image001.png
deleted file mode 100644
index b35566955..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image001.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image002.png b/apps-cloud-adventure-cio/04-integration/images/image002.png
deleted file mode 100644
index 35eb17b47..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image002.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image003.png b/apps-cloud-adventure-cio/04-integration/images/image003.png
deleted file mode 100644
index c1a5b1396..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image003.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image004.png b/apps-cloud-adventure-cio/04-integration/images/image004.png
deleted file mode 100644
index c99014f47..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image004.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image005.png b/apps-cloud-adventure-cio/04-integration/images/image005.png
deleted file mode 100644
index 033154818..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image005.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image006.png b/apps-cloud-adventure-cio/04-integration/images/image006.png
deleted file mode 100644
index 4440328c1..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image006.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image007.png b/apps-cloud-adventure-cio/04-integration/images/image007.png
deleted file mode 100644
index 99cc56a46..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image007.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image008.png b/apps-cloud-adventure-cio/04-integration/images/image008.png
deleted file mode 100644
index 712ac3c87..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image008.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image009.png b/apps-cloud-adventure-cio/04-integration/images/image009.png
deleted file mode 100644
index 04af25645..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image009.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image010.png b/apps-cloud-adventure-cio/04-integration/images/image010.png
deleted file mode 100644
index 8b14fd88e..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image010.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image011.png b/apps-cloud-adventure-cio/04-integration/images/image011.png
deleted file mode 100644
index 95f40402e..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image011.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image012.png b/apps-cloud-adventure-cio/04-integration/images/image012.png
deleted file mode 100644
index 6fce49c01..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image012.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image013.png b/apps-cloud-adventure-cio/04-integration/images/image013.png
deleted file mode 100644
index a8310ccfc..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image013.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image014.png b/apps-cloud-adventure-cio/04-integration/images/image014.png
deleted file mode 100644
index 2339c0122..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image014.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image015.png b/apps-cloud-adventure-cio/04-integration/images/image015.png
deleted file mode 100644
index 23505df35..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image015.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image016.png b/apps-cloud-adventure-cio/04-integration/images/image016.png
deleted file mode 100644
index 89e25a7c4..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image016.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image017.png b/apps-cloud-adventure-cio/04-integration/images/image017.png
deleted file mode 100644
index cc58b7092..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image017.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image018.png b/apps-cloud-adventure-cio/04-integration/images/image018.png
deleted file mode 100644
index f6d1e49c1..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image018.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image019.png b/apps-cloud-adventure-cio/04-integration/images/image019.png
deleted file mode 100644
index 6a81e2a51..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image019.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image020.png b/apps-cloud-adventure-cio/04-integration/images/image020.png
deleted file mode 100644
index 5f5695037..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image020.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image021.png b/apps-cloud-adventure-cio/04-integration/images/image021.png
deleted file mode 100644
index f945568a2..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image021.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image022.png b/apps-cloud-adventure-cio/04-integration/images/image022.png
deleted file mode 100644
index 53c904fcf..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image022.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image023.png b/apps-cloud-adventure-cio/04-integration/images/image023.png
deleted file mode 100644
index d1e0e8e5e..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image023.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image024.png b/apps-cloud-adventure-cio/04-integration/images/image024.png
deleted file mode 100644
index 8f1ee5695..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image024.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image025.png b/apps-cloud-adventure-cio/04-integration/images/image025.png
deleted file mode 100644
index 235db72aa..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image025.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image026.png b/apps-cloud-adventure-cio/04-integration/images/image026.png
deleted file mode 100644
index 490dbe69c..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image026.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image027.png b/apps-cloud-adventure-cio/04-integration/images/image027.png
deleted file mode 100644
index 84bd7ab6a..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image027.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image028.png b/apps-cloud-adventure-cio/04-integration/images/image028.png
deleted file mode 100644
index 20d0b2f6a..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image028.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image029.png b/apps-cloud-adventure-cio/04-integration/images/image029.png
deleted file mode 100644
index 14468801b..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image029.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image030.png b/apps-cloud-adventure-cio/04-integration/images/image030.png
deleted file mode 100644
index b08de03d1..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image030.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image031.png b/apps-cloud-adventure-cio/04-integration/images/image031.png
deleted file mode 100644
index ce683696a..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image031.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image032.png b/apps-cloud-adventure-cio/04-integration/images/image032.png
deleted file mode 100644
index 161524d3b..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image032.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image033.png b/apps-cloud-adventure-cio/04-integration/images/image033.png
deleted file mode 100644
index 98b44edd1..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image033.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image034.png b/apps-cloud-adventure-cio/04-integration/images/image034.png
deleted file mode 100644
index 97843bd30..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image034.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image035.png b/apps-cloud-adventure-cio/04-integration/images/image035.png
deleted file mode 100644
index 7601f90e1..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image035.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image036.png b/apps-cloud-adventure-cio/04-integration/images/image036.png
deleted file mode 100644
index 447aed232..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image036.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image037.png b/apps-cloud-adventure-cio/04-integration/images/image037.png
deleted file mode 100644
index 10153669e..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image037.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image038.png b/apps-cloud-adventure-cio/04-integration/images/image038.png
deleted file mode 100644
index eb48f8e19..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image038.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image039.png b/apps-cloud-adventure-cio/04-integration/images/image039.png
deleted file mode 100644
index 2378af526..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image039.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image040.png b/apps-cloud-adventure-cio/04-integration/images/image040.png
deleted file mode 100644
index 24a7c053d..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image040.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image041.png b/apps-cloud-adventure-cio/04-integration/images/image041.png
deleted file mode 100644
index aec254710..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image041.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image042.png b/apps-cloud-adventure-cio/04-integration/images/image042.png
deleted file mode 100644
index 4d695e472..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image042.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image043.png b/apps-cloud-adventure-cio/04-integration/images/image043.png
deleted file mode 100644
index 551cd056c..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image043.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image100.png b/apps-cloud-adventure-cio/04-integration/images/image100.png
deleted file mode 100644
index 339a9fd27..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image100.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image101.png b/apps-cloud-adventure-cio/04-integration/images/image101.png
deleted file mode 100644
index acf9f3b12..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image101.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image102.png b/apps-cloud-adventure-cio/04-integration/images/image102.png
deleted file mode 100644
index 472bd74de..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image102.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/image103.png b/apps-cloud-adventure-cio/04-integration/images/image103.png
deleted file mode 100644
index d101aae48..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/image103.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/images/stop.png b/apps-cloud-adventure-cio/04-integration/images/stop.png
deleted file mode 100644
index 02839f76f..000000000
Binary files a/apps-cloud-adventure-cio/04-integration/images/stop.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/04-integration/integration.md b/apps-cloud-adventure-cio/04-integration/integration.md
deleted file mode 100644
index b2b74850f..000000000
--- a/apps-cloud-adventure-cio/04-integration/integration.md
+++ /dev/null
@@ -1,340 +0,0 @@
-# Integration
-
-## Introduction
-
-We're delighted to take you on a journey that will uncover the incredible capabilities of Fusion Cloud's REST API integration tools for auditing supplier address changes. This adventure is designed to offer a holistic understanding of how these integration tools can facilitate your Oracle Fusion Cloud integration requirements and access to business object data via REST APIs.
-
-In the office of the Chief Information Officer (CIO), supply chain management is a complex web of interconnected processes. Our goal is to navigate this complexity and equip you with the skills to audit supplier address changes effectively. You'll learn how to leverage the power of Fusion Cloud's REST APIs, a game-changing solution that will revolutionize your operations.
-
-We've designed this journey to be interactive and engaging. Make sure to answer the Adventure Check Point questions along the way, ensuring you capture the full potential of this experience. These check points are your path to becoming a master auditor, so pay close attention!
-
-With your adventure hat on and a curious mind, prepare for an exhilarating exploration of Fusion Cloud's REST API integration features. Let's embark on this thrilling journey together!
-
-As you follow along, do not forget to ask questions if you get stuck and answer the Adventure Check Point questions!
-
-
-Estimated Time: 15 minutes
-
-
-### **Objectives**
-
-In this activity you will learn the power and ease of integrating Fusion SaaS application with upstream and downstream systems
-
-
-
-
-## **Task 1: Use REST API to pull Fusion SaaS Application audit data for use in any external system**
-
-
-1. We’re going to login to Fusion Cloud ERP
-
- > Navigate to your Oracle Fusion Cloud Demo Environment Instance and sign in with the Username and Password provided
-
- 
-
- 
-
- **Notice the Hybrid Login capabilities.**
-
- **Today, we will be logging in with username and password, but most customers elect to use SSO. You can also have hybrid setup.**
-
-
-
-2. Let’s navigate to the Suppliers work area to modify a supplier’s address information
-
- > Click the **Procurement** tab
-
- 
-
- > Click the **Show More** button
-
- 
-
- > Click the **Manage Suppliers** button
-
- 
-
-
-3. Next, we’re going to search for the Supplier you’ve been assigned, e.g. “01…”
-
- > Click in the **Keywords** search bar
-
- 
-
- > (1) **Search** for a supplier using the user id number (e.g. 01, 02).
-
- > (2) Click the **Search** button
-
- 
-
- > Click the **Edit**  button in the ‘Search Results’ area
-
- 
-
-
-4. We’re going to navigate to the Supplier’s addresses tab.
-
- > Click the **Addresses** tab
-
- 
-
- > Click the **Edit**  icon to edit the Supplier’s address
-
- 
-
-
-5. **Note:** We’ll only edit the Supplier’s second line of address information, i.e. ‘Address Line 2’ text entry field.
-
- We’re going to add a Suite (e.g. 123) to the Supplier’s address information that was missing before.
-
- > Click in the **Address Line 2** text entry field
-
- 
-
- > Type new address information into **Address Line 2**, e.g. ‘Suite 123’
-
- 
-
- > Click **Save and Close**
-
- 
-
- > Click **Submit**
-
- 
-
-6. **Note:** We’ve modified our demo environment’s approval workflow for internal supplier profile changes to be automatically approved for demonstration purposes, however this can be configured based on each customer’s business requirements
-
- > Click **OK** on the resulting confirmation box.
-
- 
-
- > Click **Done**
-
- 
-
-
-
-7. Let’s navigate back to the Oracle Fusion Cloud home screen.
-
- > Click the **Home**  button
-
- 
-
-
-
-8. Now, we’re going to discover how we can audit several pieces of information that’s relevant to our cloud adventure today: user access (sign in / sign out) as well as supplier address information changes via REST API integrations.
-
- > At the home screen, Navigate to **Integration** tab
-
- 
-
- > Click on **Audit Report REST Endpoints**
-
- 
-
- 
-
- **This is an example of a configuration. This tile links out to an external website.**
-
- **Take note of the detailed documentation. API endpoints, parameters, code examples, use cases, Oracle’s documentation is public and designed to be very useful.**
-
-
-9. Let’s review the REST API endpoints that we can use to review Auditable data that can be extracted from Fusion Cloud.
-
- 
-
- > Click on **Get an audit report** under **Audit Report**
-
- 
-
- > **Click** the drop-down menu icon **‘Jump to’** and select the **‘Examples’** menu option
-
- 
-
- > Scroll down the page, review the first **Example Request Payload** and **Example of Response Body**
-
- 
-
-
-
-10. Let’s now return to Oracle Fusion Cloud so we can audit the supplier address change we made previously using the Audit REST APIs we’ve just learned about.
-
- > Navigate back to the Fusion Cloud ERP browser tab.
-
- 
-
- > In the Integration tab: Click on the **API Integration** tile
-
- 
-
- 
-
- **This is another example of a configuration. This tile links out to an external application we’ve designed using Oracle APEX.**
-
- **This API integration Application is designed to simulate any 3rd party application you might be integrating with.**
-
-
-
-11. Now we’re going to use the Audit REST API we just reviewed to extract auditable information from Oracle Fusion Cloud via a custom Oracle APEX application that has been configured to be pre-integrated with our demo environment via Audit REST APIs.
-
- > Click on **Administration**
-
- 
-
- 
-
- **Notice the embedded link in the Administration screen ‘Cloud Adventure Welcome Site’.**
-
- **Click this link. Then, Copy the “ERP Instance” text and past in the API Integration Application**
-
-
-12. We’re going to authenticate our integration APEX application with the same ERP instance name and password we used to login into Fusion Cloud
-
- > Click the embedded link **‘Cloud Adventure Welcome Site’** below ‘Credentials’
-
- 
-
- > **Scroll down**, and Copy the **‘ERP Instance’** text from the new browser tab **‘Cloud Adventure: Office of the CIO’ Section 4 Integration’**
-
- 
-
- > **Return** to the API Integration Application browser tab
-
- > **Type in** or **Paste** the provided **‘ERP Instance’** and **‘ERP Password’** credentials you just copied from the new browser tab **‘Cloud Adventure: Office of the CIO’ Section ‘4 Integration’**
-
-
- 
-
- > Click the **Save** button
-
- 
-
- > Click **OK** when the **Connection is successful** message pop-up is displayed
-
- 
-
-
-13. After authenticating, we’ll navigate to the Sign on Audit area to review which users have been accessing Fusion Cloud, along with other pertinent audit details.
-
- > Click the **Hamburger, or triple bar**  menu button
-
- 
-
- > Click the **Sign on Audit** menu button
-
- 
-
- > Click the **Get Sign on Audit Events** button
-
- 
-
- > Review the results of the user access audit REST API GET command
-
- 
-
- > Scroll down, Click / Expand the **Demo Flow** drop-down tab
-
- 
-
- > Review the Demo Flow for the Sign on Audit REST API
-
- 
-
- > Click the **API Details** tab
-
- 
-
- > Review a sample of the Sign on Audit REST API, including the endpoint, method, and sample response.
-
- 
-
-
-14. Now let’s review Supplier address changes recently made in the corresponding Fusion Cloud business object with the ‘Audit History’
-
- > Click the **Audit History** menu button
-
- 
-
- > **Click** the **‘Business Object’**  drop-down menu icon.
-
- 
-
- > **Click** the **‘Supplier Address’** down-down menu option
-
- 
-
- > Click the **Get Audit History** button
-
- 
-
- > Review the results of the user access audit REST API GET command
-
- 
-
- > Scroll down, Click / Expand the **‘Demo Flow’ drop-down tab**
-
- 
-
- > Review the Demo Flow for the Audit History Audit REST API
-
- 
-
- > Click the **API Details** tab
-
- 
-
- > Review a sample of the Audit History Audit REST API, including the endpoint, method, and sample response.
-
- 
-
- 
-
- **Take a second to congratulate yourself. You’ve successfully used the included Oracle Fusion Cloud Integration toolset, specifically REST APIs, to get audit data out of Oracle Cloud and into a 3rd party system.**
-
- **You can leverage vast, out of the box functionality to manage integrations without vendor assistance. Oracle Fusion Cloud Applications integrate and interoperate with other cloud and on-premises applications using built-in File-based Loader, Spreadsheet Loader, SOAP- and REST-based Web Services, and Data Extract features.**
-
-
-15. Adventure awaits, click on the image, show what you know and rise to the top of the leader board!!!
-
- [](https://apex.oracle.com/pls/apex/f?p=159406:LOGIN_TEAM:::::CC:CIOADVENTURE)
-
-
-## Summary
-
-Throughout the Cloud Adventure for the office of the CIO, Integration activity guide, students are immersed in an interactive and engaging
-journey into the world of Fusion Cloud's REST API integration features. The primary goal of this instructional adventure was to empower
-students with the skills and knowledge necessary to effectively audit both user sign on activity as well as supplier address changes in Fusion
-Cloud Supply Chain Management (SCM). Throughout this exploration, they uncovered the potential of Fusion Cloud's integration tools,
-enhancing their understanding of supply chain security management integration and auditing processes.
-
-Within the activity, students embarked on a hands-on exploration, beginning with a login to the Fusion Cloud SCM system. They navigated with
-purpose to the Suppliers work area, where they were tasked with modifying a supplier's address information. This interactive modification set
-the stage for the upcoming auditing activities. Cloud adventurers then delved into the Integration tab, a powerhouse of auditing capabilities
-within the Fusion Cloud platform. Here, they uncovered the 'Audit Report REST Endpoints,' a revelation of the potential to extract valuable
-auditable data. With growing curiosity, they scrutinized example request payloads and response bodies, gaining insights into the structure and
-content of auditing information.
-
-The journey of Fusion Cloud integration exploration continued as students applied their newfound knowledge. They returned to the familiar
-grounds of the Fusion Cloud and audited the supplier address change they had made earlier. This practical application of REST API integration
-theory added a layer of depth to their practical understanding. As the adventure continued, the students ventured into the captivating world of
-Oracle APEX application integration, which simulated a 3rd party auditing application for the purposes of this cloud adventure. They skillfully
-authenticated their integration APEX application, utilizing the provided cloud adventure environment instance and password.
-
-With the connection established, adventurers delved deeper, exploring the ‘Sign-on’ Audit area, where they uncovered a treasure trove of user
-access details. They reviewed the corresponding REST API, gaining insights into the security and transparency of user access history. The journey
-then led them to the 'Audit History' section, a comprehensive record of supplier address changes. Here, they extracted historical data,
-witnessing firsthand the power of Fusion Cloud to meticulously track and record business object data modifications. By scrutinizing the demo
-flow and API details, students developed a profound understanding of the platform's capabilities and their newfound auditing skills.
-
-Throughout this immersive adventure, students not only acquired technical proficiency but also cultivated a deep appreciation for the potential
-of Fusion Cloud's REST API integration. They learned to navigate the intricate web of supply chain management integration, including how to
-audit user sign in activity, supplier address changes, and how to extract critical auditable information. With each step, they transformed from
-curious cloud adventurers to seasoned Fusion Cloud auditors, equipped with the knowledge and confidence to continue their Fusion Cloud
-
-**You have successfully completed the Activity!**
-
-## Acknowledgements
-* **Author** - Jamil Orfali, Senior Sales Consultant, Advanced Technology Services, Kris Holmgren, Senior Sales Consultant, Advanced Technology Services
-* **Contributors** -
-* **Last Updated By/Date** - Jamil Orfali, September 2024
diff --git a/apps-cloud-adventure-cio/05-analytics/analytics.md b/apps-cloud-adventure-cio/05-analytics/analytics.md
deleted file mode 100644
index 5619c93f2..000000000
--- a/apps-cloud-adventure-cio/05-analytics/analytics.md
+++ /dev/null
@@ -1,177 +0,0 @@
-# Analytics
-
-## Introduction
-
-Oracle Fusion Data Intelligence Platform is a family of prebuilt, cloud native analytics applications for Oracle Cloud Applications that provides line-of-business users with ready-to-use insights to improve decision-making.
-
-It is a Cloud application that delivers best-practice Key Performance Indicators (KPIs) and deep analyses to help decision-makers run their businesses and individual contributors to operate their businesses. Oracle Fusion Data Intelligence Platform is built on top of Oracle Analytics Cloud and Oracle Autonomous Data Warehouse. This packaged service starts with Oracle Fusion Cloud Applications which you can deploy rapidly, personalize, and extend. The service extracts data from your Oracle Fusion Cloud Applications and and loads it into an instance of Oracle Autonomous Data Warehouse. Business users can then create and customize dashboards in Oracle Analytics Cloud. It empowers business users with industry-leading, AI-powered, self-service analytics capabilities for data preparation, visualization, enterprise reporting, augmented analysis, and natural language processing.
-
-This activity guide helps business users to investigate and research data, ask relevant questions to understand Trends, Patterns and Outliers.
-
-
-
-Estimated Time: 15 minutes
-
-
-### Objectives
-
-In this activity, you will Create analytics across different lines of business to derive better business insight
-
-
-
-## Task 1: Create analytics across different lines of business to derive better business insight
-
-
-
-1. Oracle Fusion Data Intelligence Platform is a family of prebuilt, cloud-native analytics applications for Oracle Cloud Applications that provide line-of-business users with ready-to-use insights to improve decision-making.
-
- Login to your Fusion Data Intelligence Portal using the URL provided.
-
- > Open a web browser and enter the URL provided, then on the login screen, type in the Username and Password. Click Sign In.
-
- 
-
- After a successful login, you will land on the Oracle Analytics home page.
-
-
-2. A finance Watchlist comprising several Tiles is available on the home page.
-
- One metric that draws my attention is Margin, which is trending low.
-
- Two attributes that influence Margin are Revenue and Cost. Since revenue seems to be increasing, let's investigate Cost.
-
- > On the Margin Tile locate the **Open Workbook**  Icon on the top right corner and click on it.
-
- 
-
-
-3. This action expands the Tile and opens the workbook.
-
- Let's now set the workbook to design mode so that we can add cost elements.
-
- > Click on the Edit Icon  as shown in the image.
-
- Instead of building manually, let's use the Auto Insights feature.
-
-
- > Click on the Auto Insights Icon  as shown in the image.
-
- 
-
-
-4. Next, let’s expand the Auto Insights pane for better observability.
-
- > Click on the Expand / Shrink Icon  as shown in the image.
-
- 
-
-
-
-
-5. The Auto Insights function has crawled the data set and brought expense-related information critical to our analysis. Let’s use the Top 10 Expenses by expense categories.
-
- > (1) Locate the “Top 10 Expense Categories by Expenses” insight and click the Add Icon  shown in the image. This will add the Insight to the Canvas.
-
- > (2) Click on the **x** sign to close the Insights pane.
-
- 
-
-
-6. Now, we can compare margin and cost side by side.
-
- Payroll expenses emerge as the highest cost. We will delve deeper into payroll expenses to identify their components.
-
- Our next step involves integrating Human Resources data into our analysis.
-
- 
-
-
-7. Combining datasets from multiple “Lines of Business” allows an individual to conduct a deep dive into the actual problems.
-
- > (1) Expand the HCM Core transactions data set from the Data Panel on the left.
-
- > (2) At the bottom of the Page, click the plus icon  to add another Canvas, **Canvas 2**.
-
- > (3) While holding “Shift,” multi-select the Amount and Account columns and drag them onto Canvas 2.
-
- 
-
- > (1) Change the chart to a “Stacked Bar” type to visualize the data better.
-
- > (2) Follow steps 1 and 2 as shown in the picture 10.
-
- 
-
-
-8. We need to perform trend analysis to understand when the expense anomaly started occurring and whether it is consistent across all expense types.
-
- > Drag the **Accounts** column from the Categories section into the Color section.
-
- 
-
- > Next, expand the Fiscal Date folder in the Data Panel, locate the **Month** column, and drag and drop it into the Categories section.
-
- 
-
-9. We can now see expense amounts displayed across time and expense categories.
-
- On analyzing the trend, it appears that while Base Salary and Wages have remained constant, overtime and contract labor have increased since May.
-
- Let's explore and find out why overtime and contract labor have increased.
-
- 
-
-10. Overtime and Contract labor are typically associated with Turnover. Let's see if it had any impact.
-
- > (1) Expand the Fiscal Date folder in the Data Panel to locate the **Month** and **Turnover** columns.
-
- > (2) While holding “Ctrl,” multi-select the **Month** and **Turnover** columns and drag them below the current visual.
-
- 
-
-
-
-11. Another factor that impacts Overtime and Contract labor is employee absences.
-
- > Drag the **Absences** column from the data panel and drop it in the values section below the **Turnover** column.
-
- 
-
- 
-
-
-12. This brings all relevant columns onto the canvas. We can now co-relate several attributes and arrive at the correct conclusion. We can now see the pattern clearly. Beginning in March, absences and turnover started increasing, which led to an increase in overtime and the hiring of contract labor. This is ultimately reflected in the books of accounts in Finance.
-
-
-
-13. Let’s understand how the trend looks like in the future. We will use the built in Statistical Analysis function like forecast to under the future
-
- > Right click anywhere in the **Turnover**, **Absences** Chart choose **Add Statistics** then **Forecast**
-
- 
-
-14. With a few simple clicks, you were able to forecast and understand the future trend.
-
- 
-
-
-
-15. Adventure awaits, click on the image and show what you know, and rise to the top of the leader board!!!
-
- [](https://apex.oracle.com/pls/apex/f?p=159406:LOGIN_TEAM:::::CC:CIOADVENTURE)
-
-
-
-## Summary
-
-You discovered how effortlessly Fusion Analytics enables the creation of content and analysis of data. By integrating diverse data sources, you were able to delve deeper from summary information to detailed analysis, uncovering root causes. You then shared your discoveries with a broader audience, making the insights accessible and impactful.
-
-
-
-**You have successfully completed the Activity!**
-
-
-## Acknowledgements
-* **Author** - Sohel Jeelani, Analytics Solution Engineer, Advanced Technology Services
-* **Contributors** -
-* **Last Updated By/Date** - Sohel Jeelani, September 2024
diff --git a/apps-cloud-adventure-cio/05-analytics/images/cloud-adventure-checkpoint-image.png b/apps-cloud-adventure-cio/05-analytics/images/cloud-adventure-checkpoint-image.png
deleted file mode 100644
index 08774508a..000000000
Binary files a/apps-cloud-adventure-cio/05-analytics/images/cloud-adventure-checkpoint-image.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/05-integration/integration.md b/apps-cloud-adventure-cio/05-integration/integration.md
index c66851f7b..9da530ab2 100644
--- a/apps-cloud-adventure-cio/05-integration/integration.md
+++ b/apps-cloud-adventure-cio/05-integration/integration.md
@@ -2,7 +2,7 @@
## Introduction
-As you have seen in the previous Cloud Adventures, Oracle delivers a fine grained security model which allows companies to enforce tight controls over who has access to both application features and data. While these controls provide adminstrators with powerful tools, good corporate governance requires that application auditing is used to back up the security controls you implement.
+As you have seen in the previous Cloud Adventures, Oracle delivers a fine grained security model which allows companies to enforce tight controls over who has access to both application features and data. While these controls provide administrators with powerful tools, good corporate governance requires that application auditing is used to back up the security controls you implement.
For this Cloud Adventure, we have already used audit profiles to enable auditing on select fields in the applications.
You will begin the adventure by accessing the native application screens to update a supplier address. Each participant is assigned a supplier based on your login ID.
@@ -12,22 +12,24 @@ Included in your adventure is a quick tour of the REST API documentation. While
We've designed this journey to be interactive and engaging. Make sure to answer the Adventure Check Point questions at the end, ensuring you capture the full potential of this experience. These check points are your path to becoming a master auditor, so pay close attention!
-With your adventure hat on and a curious mind, prepare for an exhilarating exploration of Fusion Cloud data aduit and REST API integration features. Let's embark on this thrilling journey together!
+With your adventure hat on and a curious mind, prepare for an exhilarating exploration of Fusion Cloud data audit and REST API integration features. Let's embark on this thrilling journey together!
### **Objectives**
In this activity you will learn the power and ease of integrating Fusion SaaS application with upstream and downstream systems
-
+Estimated Time: 15 minutes
+Do not forget to answer the Adventure Check Point questions at the end of the exercise!
-## Task 1: Use REST API to pull Fusion SaaS Application audit data for use in any external system
+## ERP & SCM: Use REST API to pull Fusion SaaS Application audit data for use in any external system
+1. In this activity you will learn the power and ease of integrating Fusion SaaS application with upstream and downstream systems
+ 
-
-1. Let’s navigate to the Suppliers work area to modify a supplier’s address information
+2. Let’s navigate to the Suppliers work area to modify a supplier’s address information
> Click the **Procurement** tab
@@ -39,7 +41,7 @@ In this activity you will learn the power and ease of integrating Fusion SaaS ap
-2. Next, we’re going to search for the Supplier you’ve been assigned, e.g. “01…”
+3. Next, we’re going to search for the Supplier you’ve been assigned, e.g. “01…”
> Click in the **Keywords** search bar
@@ -56,7 +58,7 @@ In this activity you will learn the power and ease of integrating Fusion SaaS ap
-3. We’re going to navigate to the Supplier’s addresses tab.
+4. We’re going to navigate to the Supplier’s addresses tab.
> Click the **Addresses** tab
@@ -67,7 +69,7 @@ In this activity you will learn the power and ease of integrating Fusion SaaS ap
-4. **Note:** We’ll only edit the Supplier’s second line of address information, i.e. ‘Address Line 2’ text entry field.
+5. **Note:** We’ll only edit the Supplier’s second line of address information, i.e. ‘Address Line 2’ text entry field.
We’re going to add a Suite (e.g. 123) to the Supplier’s address information that was missing before.
@@ -87,7 +89,7 @@ In this activity you will learn the power and ease of integrating Fusion SaaS ap
-5. **Note:** We’ve modified our demo environment’s approval workflow for internal supplier profile changes to be automatically approved for demonstration purposes, however this can be configured based on each customer’s business requirements
+6. **Note:** We’ve modified our demo environment’s approval workflow for internal supplier profile changes to be automatically approved for demonstration purposes, however this can be configured based on each customer’s business requirements
> Click **OK** on the resulting confirmation box.
@@ -99,7 +101,7 @@ In this activity you will learn the power and ease of integrating Fusion SaaS ap
-6. Let’s navigate back to the Oracle Fusion Cloud home screen.
+7. Let’s navigate back to the Oracle Fusion Cloud home screen.
> Click the **Home**  button
@@ -107,7 +109,7 @@ In this activity you will learn the power and ease of integrating Fusion SaaS ap
-7. Now, we’re going to discover how we can audit several pieces of information that’s relevant to our cloud adventure today: user access (sign in / sign out) as well as supplier address information changes via REST API integrations.
+8. Now, we’re going to discover how we can audit several pieces of information that’s relevant to our cloud adventure today: user access (sign in / sign out) as well as supplier address information changes via REST API integrations.
> At the home screen, Navigate to **Integration** tab
@@ -124,7 +126,7 @@ In this activity you will learn the power and ease of integrating Fusion SaaS ap
**Take note of the detailed documentation. API endpoints, parameters, code examples, use cases, Oracle’s documentation is public and designed to be very useful.**
-8. Let’s review the REST API endpoints that we can use to review Auditable data that can be extracted from Fusion Cloud.
+9. Let’s review the REST API endpoints that we can use to review Auditable data that can be extracted from Fusion Cloud.
@@ -142,9 +144,8 @@ In this activity you will learn the power and ease of integrating Fusion SaaS ap
-
-14. Adventure awaits, click on the image, show what you know and rise to the top of the leader board!!!
+10. Adventure awaits, click on the image, show what you know and rise to the top of the leader board!!!
[](https://apex.oracle.com/pls/apex/f?p=159406:LOGIN_TEAM:::::CC:CIOADVENTURE)
@@ -153,11 +154,15 @@ In this activity you will learn the power and ease of integrating Fusion SaaS ap
As you have seen, the Oracle SaaS applications may be configured to capture who updates select fields, when the update was performed, the previous value and the updated value. Having this level of auditing serves a critical role in providing governance and controls over your enterprise applications. As an administrator, you will implement the controls your company chooses to enforce. The combination of fine grained applications security and application data audit provide the end to end controls you will need.
-This Cloud Adventure also featued the importance of having open REST intefaces for accessing and sharing data with external systems. In the case of audit data, you may want to send this data to a SIEM or data warehouse for analysis.
+This Cloud Adventure also featured the importance of having open REST interfaces for accessing and sharing data with external systems. In the case of audit data, you may want to send this data to a SIEM or data warehouse for analysis.
**You have successfully completed the Activity!**
+* [Oracle Supply Chain & Manufacturing - APIs & Schema](https://docs.oracle.com/en/cloud/saas/supply-chain-and-manufacturing/24b/api.html)
+* [Set Up Auditing for Oracle Fusion Applications](https://docs.oracle.com/en/cloud/saas/applications-common/24d/facia/set-up-auditing-for-oracle-fusion-applications.html)
+* [Oracle Documentation](http://docs.oracle.com)O
+
## Acknowledgements
* **Author** - Jamil Orfali, Senior Cloud Technologist, Advanced Technology Services, Kris Holmgren, Senior Cloud Technologist, Advanced Technology Services
* **Contributors** -
-* **Last Updated By/Date** - Jamil Orfali, September 2024
+* **Last Updated By/Date** - Jamil Orfali, November 2024
diff --git a/apps-cloud-adventure-cio/05-integration/integration - archive.md b/apps-cloud-adventure-cio/05-integration/integration_old.md
similarity index 100%
rename from apps-cloud-adventure-cio/05-integration/integration - archive.md
rename to apps-cloud-adventure-cio/05-integration/integration_old.md
diff --git a/apps-cloud-adventure-cio/06-analytics-hcm/analytics.md b/apps-cloud-adventure-cio/06-analytics-hcm/analytics.md
deleted file mode 100644
index 774c13940..000000000
--- a/apps-cloud-adventure-cio/06-analytics-hcm/analytics.md
+++ /dev/null
@@ -1,188 +0,0 @@
-# Analytics
-
-## Introduction
-
-Oracle Fusion Data Intelligence Platform is a family of prebuilt, cloud native analytics applications for Oracle Cloud Applications that provides line-of-business users with ready-to-use insights to improve decision-making.
-
-It is a Cloud application that delivers best-practice Key Performance Indicators (KPIs) and deep analyses to help decision-makers run their businesses and individual contributors to operate their businesses. Oracle Fusion Data Intelligence Platform is built on top of Oracle Analytics Cloud and Oracle Autonomous Data Warehouse. This packaged service starts with Oracle Fusion Cloud Applications which you can deploy rapidly, personalize, and extend. The service extracts data from your Oracle Fusion Cloud Applications and and loads it into an instance of Oracle Autonomous Data Warehouse. Business users can then create and customize dashboards in Oracle Analytics Cloud. It empowers business users with industry-leading, AI-powered, self-service analytics capabilities for data preparation, visualization, enterprise reporting, augmented analysis, and natural language processing.
-
-This activity guide helps business users to investigate and research data, ask relevant questions to understand Trends, Patterns and Outliers.
-
-
-
-Estimated Time: 15 minutes
-
-
-### Objectives
-
-In this activity, you will Create analytics across different lines of business to derive better business insight
-
-
-
-## Task 1: Create analytics across different lines of business to derive better business insight
-
-
-
-1. Oracle Fusion Data Intelligence Platform is a family of prebuilt, cloud-native analytics applications for Oracle Cloud Applications that provide line-of-business users with ready-to-use insights to improve decision-making.
-
- > (1) Click on the **‘Analytics’** tab
-
- > (2) Click on **‘Fusion – Analytics Data Intelligence’** icon
-
- 
-
-
-
-2. After a successful login, you will land on the Oracle Analytics home page.
-
- > (1) Enter assigned username and Fusion Analytics Password
-
- > (2) Click on the ‘Sign In’
-
- 
-
-
-
-
-
-3. A finance Watchlist comprising several Tiles is available on the home page.
-
- One metric that draws my attention is Margin, which is trending low.
-
- Two attributes that influence Margin are Revenue and Cost. Since revenue seems to be increasing, let's investigate Cost.
-
- > On the Margin Tile locate the **Open Workbook**  Icon on the top right corner and click on it.
-
- 
-
-
-4. This action expands the Tile and opens the workbook.
-
- Let's now set the workbook to design mode so that we can add cost elements.
-
- > Click on the Edit Icon  as shown in the image.
-
- Instead of building manually, let's use the Auto Insights feature.
-
-
- > Click on the Auto Insights Icon  as shown in the image.
-
- 
-
-
-5. Next, let’s expand the Auto Insights pane for better observability.
-
- > Click on the Expand / Shrink Icon  as shown in the image.
-
- 
-
-
-
-
-6. The Auto Insights function has crawled the data set and brought expense-related information critical to our analysis. Let’s use the Top 10 Expenses by expense categories.
-
- > (1) Locate the “Top 10 Expense Categories by Expenses” insight and click the Add Icon  shown in the image. This will add the Insight to the Canvas.
-
- > (2) Click on the **x** sign to close the Insights pane.
-
- 
-
-
-7. Now, we can compare margin and cost side by side.
-
- Payroll expenses emerge as the highest cost. We will delve deeper into payroll expenses to identify their components.
-
- Our next step involves integrating Human Resources data into our analysis.
-
- 
-
-
-8. Combining datasets from multiple “Lines of Business” allows an individual to conduct a deep dive into the actual problems.
-
- > (1) Expand the HCM Core transactions data set from the Data Panel on the left.
-
- > (2) At the bottom of the Page, click the plus icon  to add another Canvas, **Canvas 2**.
-
- > (3) While holding “Shift,” multi-select the Amount and Account columns and drag them onto Canvas 2.
-
- 
-
- > (1) Change the chart to a “Stacked Bar” type to visualize the data better.
-
- > (2) Follow steps 1 and 2 as shown in the picture 10.
-
- 
-
-
-9. We need to perform trend analysis to understand when the expense anomaly started occurring and whether it is consistent across all expense types.
-
- > Drag the **Accounts** column from the Categories section into the Color section.
-
- 
-
- > Next, expand the Fiscal Date folder in the Data Panel, locate the **Month** column, and drag and drop it into the Categories section.
-
- 
-
-10. We can now see expense amounts displayed across time and expense categories.
-
- On analyzing the trend, it appears that while Base Salary and Wages have remained constant, overtime and contract labor have increased since May.
-
- Let's explore and find out why overtime and contract labor have increased.
-
- 
-
-11. Overtime and Contract labor are typically associated with Turnover. Let's see if it had any impact.
-
- > (1) Expand the Fiscal Date folder in the Data Panel to locate the **Month** and **Turnover** columns.
-
- > (2) While holding “Ctrl,” multi-select the **Month** and **Turnover** columns and drag them below the current visual.
-
- 
-
-
-
-12. Another factor that impacts Overtime and Contract labor is employee absences.
-
- > Drag the **Absences** column from the data panel and drop it in the values section below the **Turnover** column.
-
- 
-
- 
-
-
-13. This brings all relevant columns onto the canvas. We can now co-relate several attributes and arrive at the correct conclusion. We can now see the pattern clearly. Beginning in March, absences and turnover started increasing, which led to an increase in overtime and the hiring of contract labor. This is ultimately reflected in the books of accounts in Finance.
-
-
-
-14. Let’s understand how the trend looks like in the future. We will use the built in Statistical Analysis function like forecast to under the future
-
- > Right click anywhere in the **Turnover**, **Absences** Chart choose **Add Statistics** then **Forecast**
-
- 
-
-15. With a few simple clicks, you were able to forecast and understand the future trend.
-
- 
-
-
-
-16. Adventure awaits, click on the image and show what you know, and rise to the top of the leader board!!!
-
- [](https://apex.oracle.com/pls/apex/f?p=159406:LOGIN_TEAM:::::CC:CIOADVENTURE)
-
-
-
-## Summary
-
-You discovered how effortlessly Fusion Analytics enables the creation of content and analysis of data. By integrating diverse data sources, you were able to delve deeper from summary information to detailed analysis, uncovering root causes. You then shared your discoveries with a broader audience, making the insights accessible and impactful.
-
-
-
-**You have successfully completed the Activity!**
-
-
-## Acknowledgements
-* **Author** - Sohel Jeelani, Analytics Solution Engineer, Advanced Technology Services
-* **Contributors** -
-* **Last Updated By/Date** - Sohel Jeelani, September 2024
diff --git a/apps-cloud-adventure-cio/06-analytics-hcm/images/analytics_objs1.png b/apps-cloud-adventure-cio/06-analytics-hcm/images/analytics_objs1.png
deleted file mode 100644
index 137432378..000000000
Binary files a/apps-cloud-adventure-cio/06-analytics-hcm/images/analytics_objs1.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/06-analytics-hcm/images/cloud-adventure-checkpoint-image.png b/apps-cloud-adventure-cio/06-analytics-hcm/images/cloud-adventure-checkpoint-image.png
deleted file mode 100644
index 08774508a..000000000
Binary files a/apps-cloud-adventure-cio/06-analytics-hcm/images/cloud-adventure-checkpoint-image.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/analytics.md b/apps-cloud-adventure-cio/06-analytics-scm/analytics.md
deleted file mode 100644
index f5a73a6ba..000000000
--- a/apps-cloud-adventure-cio/06-analytics-scm/analytics.md
+++ /dev/null
@@ -1,171 +0,0 @@
-# Analytics
-
-## Introduction
-
-Oracle Fusion Data Intelligence Platform is a family of prebuilt, cloud native analytics applications for Oracle Cloud Applications that provides line-of-business users with ready-to-use insights to improve decision-making.
-
-It is a Cloud application that delivers best-practice Key Performance Indicators (KPIs) and deep analyses to help decision-makers run their businesses and individual contributors to operate their businesses. Oracle Fusion Data Intelligence Platform is built on top of Oracle Analytics Cloud and Oracle Autonomous Data Warehouse. This packaged service starts with Oracle Fusion Cloud Applications which you can deploy rapidly, personalize, and extend. The service extracts data from your Oracle Fusion Cloud Applications and and loads it into an instance of Oracle Autonomous Data Warehouse. Business users can then create and customize dashboards in Oracle Analytics Cloud. It empowers business users with industry-leading, AI-powered, self-service analytics capabilities for data preparation, visualization, enterprise reporting, augmented analysis, and natural language processing.
-
-This activity guide helps business users to investigate and research data, ask relevant questions to understand Trends, Patterns and Outliers.
-
-
-
-Estimated Time: 15 minutes
-
-
-### Objectives
-
-In this activity, you will Create analytics across different lines of business to derive better business insight
-
-
-
-## Task 1: Create analytics across different lines of business to derive better business insight
-
-
-
-1. Oracle Fusion Data Intelligence Platform is a family of prebuilt, cloud-native analytics applications for Oracle Cloud Applications that provide line-of-business users with ready-to-use insights to improve decision-making.
-
- Login to your Fusion Data Intelligence Portal using the URL provided.
-
- > Open a web browser and enter the URL provided, then on the login screen, type in the Username and Password. Click Sign In.
-
- 
-
- After a successful login, you will land on the Oracle Analytics home page.
-
-
-2. A finance Watchlist comprising several Tiles is available on the home page.
-
- One metric that draws my attention is Margin, which is trending low.
-
- Two attributes that influence Margin are Revenue and Cost. Since revenue seems to be increasing, let's investigate Cost.
-
- > On the Margin Tile locate the **Open Workbook**  Icon on the top right corner and click on it.
-
- 
-
-
-3. This action expands the Tile and opens the workbook.
-
- Let's now set the workbook to design mode so that we can add cost elements.
-
- > Click on the Edit Icon  as shown in the image.
-
- Instead of building manually, let's use the Auto Insights feature.
-
-
- > Click on the Auto Insights Icon  as shown in the image.
-
- 
-
-
-4. Next, let’s expand the Auto Insights pane for better observability.
-
- > Click on the Expand / Shrink Icon  as shown in the image.
-
- 
-
-
-
-
-5. The Auto Insights function has crawled the data set and brought expense-related information critical to our analysis. Let’s use the Top 10 Expenses by expense categories.
-
- > (1) Locate the “Top 10 Expense Categories by Expenses” insight and click the Add Icon  shown in the image. This will add the Insight to the Canvas.
-
- > (2) Click on the **x** sign to close the Insights pane.
-
- 
-
-
-6. Let’s create a new Canvas to under the SCM issue
-
- > Locate the plus  icon at the bottom of the page and click it to create a new canvas.
-
-
-
-7. We will add Supply Chain data to the canvas
-
- > Expand the SCM Dataset by clicking on the Triangle icon. Expand the Fiscal Data folder and locate Month Column.
-
- > Next locate Total Cost. While keeping the “CTRL ” key pressed drag and drop them on to the canvas.
-
- > Your canvas should look like the image on the right.
-
- 
-
-
-8. Total cost has been varying over time. We need to understand what is causing the increase and decrease
-
- > Expand the Fiscal Data folder and locate Month Column.
-
- > Scroll down to locate Off Contract and Contract purchase columns.
-
- > While keeping the “CTRL ” key pressed drag and drop them on to the canvas under the existing chart.
-
- > Watch for the Green bar before you drop the columns.
-
- 
-
-9. Change the visualization type
-
- > In the Properties panel in the center. Click on the inverted triangle  to expand the Analytics Type panel and choose Bar Type.
-
- 
-
- > Move Contract Purchase from Color Section to Values section.
-
- 
-
-
-10. We need to understand what is causing the off contract purchasing.
-
- > Expand the Fiscal Data folder and locate Month Column.
-
- > Scroll down to locate Received Late Quantity columns.
-
- > While keeping the “CTRL ” key pressed drag and drop them on to the canvas under the existing chart.
-
- > Watch for the Green bar before you drop the columns.
-
- 
-
- > In the Properties panel in the center. Click on the inverted triangle  to expand the Analytics Type panel and choose Bar Type.
-
- 
-
-11. Lets find out which supplier is responsible for the issue.
-
- > Locate supplier and drop it into the color section.
-
- > Next delete Fiscal Data (Month) column
-
- 
-
- > In the Properties panel in the center. Click on the inverted triangle to expand the Analytics Type panel and choose Treemap Type.
-
- 
-
-12. Two suppliers are the cause of the issue.
-
- 
-
-
-13. Adventure awaits, click on the image and show what you know, and rise to the top of the leader board!!!
-
- [](https://apex.oracle.com/pls/apex/f?p=159406:LOGIN_TEAM:::::CC:CIOADVENTURE)
-
-
-
-## Summary
-
-You discovered how effortlessly Fusion Analytics enables the creation of content and analysis of data. By integrating diverse data sources, you were able to delve deeper from summary information to detailed analysis, uncovering root causes. You then shared your discoveries with a broader audience, making the insights accessible and impactful.
-
-
-
-**You have successfully completed the Activity!**
-
-
-## Acknowledgements
-* **Author** - Sohel Jeelani, Analytics Solution Engineer, Advanced Technology Services
-* **Contributors** -
-* **Last Updated By/Date** - Sohel Jeelani, September 2024
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/analytics_objs1.png b/apps-cloud-adventure-cio/06-analytics-scm/images/analytics_objs1.png
deleted file mode 100644
index 137432378..000000000
Binary files a/apps-cloud-adventure-cio/06-analytics-scm/images/analytics_objs1.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/cloud-adventure-checkpoint-image.png b/apps-cloud-adventure-cio/06-analytics-scm/images/cloud-adventure-checkpoint-image.png
deleted file mode 100644
index 08774508a..000000000
Binary files a/apps-cloud-adventure-cio/06-analytics-scm/images/cloud-adventure-checkpoint-image.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/icon001.png b/apps-cloud-adventure-cio/06-analytics-scm/images/icon001.png
deleted file mode 100644
index d939f6d04..000000000
Binary files a/apps-cloud-adventure-cio/06-analytics-scm/images/icon001.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/icon002.png b/apps-cloud-adventure-cio/06-analytics-scm/images/icon002.png
deleted file mode 100644
index c64a47c0f..000000000
Binary files a/apps-cloud-adventure-cio/06-analytics-scm/images/icon002.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/icon003.png b/apps-cloud-adventure-cio/06-analytics-scm/images/icon003.png
deleted file mode 100644
index ce1bd31cb..000000000
Binary files a/apps-cloud-adventure-cio/06-analytics-scm/images/icon003.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/icon004.png b/apps-cloud-adventure-cio/06-analytics-scm/images/icon004.png
deleted file mode 100644
index 3df7ea311..000000000
Binary files a/apps-cloud-adventure-cio/06-analytics-scm/images/icon004.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/icon005.png b/apps-cloud-adventure-cio/06-analytics-scm/images/icon005.png
deleted file mode 100644
index 4d3315e60..000000000
Binary files a/apps-cloud-adventure-cio/06-analytics-scm/images/icon005.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/icon006.png b/apps-cloud-adventure-cio/06-analytics-scm/images/icon006.png
deleted file mode 100644
index 5b477da78..000000000
Binary files a/apps-cloud-adventure-cio/06-analytics-scm/images/icon006.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/icon007.png b/apps-cloud-adventure-cio/06-analytics-scm/images/icon007.png
deleted file mode 100644
index 5ed605455..000000000
Binary files a/apps-cloud-adventure-cio/06-analytics-scm/images/icon007.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/icon008.png b/apps-cloud-adventure-cio/06-analytics-scm/images/icon008.png
deleted file mode 100644
index 8eeacffb4..000000000
Binary files a/apps-cloud-adventure-cio/06-analytics-scm/images/icon008.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/icon009.png b/apps-cloud-adventure-cio/06-analytics-scm/images/icon009.png
deleted file mode 100644
index 7a6b4d379..000000000
Binary files a/apps-cloud-adventure-cio/06-analytics-scm/images/icon009.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/image001.png b/apps-cloud-adventure-cio/06-analytics-scm/images/image001.png
deleted file mode 100644
index cda58bfcf..000000000
Binary files a/apps-cloud-adventure-cio/06-analytics-scm/images/image001.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/image002.png b/apps-cloud-adventure-cio/06-analytics-scm/images/image002.png
deleted file mode 100644
index beebe458c..000000000
Binary files a/apps-cloud-adventure-cio/06-analytics-scm/images/image002.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/image003.png b/apps-cloud-adventure-cio/06-analytics-scm/images/image003.png
deleted file mode 100644
index c06dd3dbf..000000000
Binary files a/apps-cloud-adventure-cio/06-analytics-scm/images/image003.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/image004.png b/apps-cloud-adventure-cio/06-analytics-scm/images/image004.png
deleted file mode 100644
index 0040d744e..000000000
Binary files a/apps-cloud-adventure-cio/06-analytics-scm/images/image004.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/image005.png b/apps-cloud-adventure-cio/06-analytics-scm/images/image005.png
deleted file mode 100644
index c29744716..000000000
Binary files a/apps-cloud-adventure-cio/06-analytics-scm/images/image005.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/image006.png b/apps-cloud-adventure-cio/06-analytics-scm/images/image006.png
deleted file mode 100644
index db919d9ee..000000000
Binary files a/apps-cloud-adventure-cio/06-analytics-scm/images/image006.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/image006a.png b/apps-cloud-adventure-cio/06-analytics-scm/images/image006a.png
deleted file mode 100644
index 212523bcc..000000000
Binary files a/apps-cloud-adventure-cio/06-analytics-scm/images/image006a.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/image007.png b/apps-cloud-adventure-cio/06-analytics-scm/images/image007.png
deleted file mode 100644
index 7d6a24c77..000000000
Binary files a/apps-cloud-adventure-cio/06-analytics-scm/images/image007.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/image008.png b/apps-cloud-adventure-cio/06-analytics-scm/images/image008.png
deleted file mode 100644
index 4d46139d1..000000000
Binary files a/apps-cloud-adventure-cio/06-analytics-scm/images/image008.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/image009.png b/apps-cloud-adventure-cio/06-analytics-scm/images/image009.png
deleted file mode 100644
index 5cf693dae..000000000
Binary files a/apps-cloud-adventure-cio/06-analytics-scm/images/image009.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/image010.png b/apps-cloud-adventure-cio/06-analytics-scm/images/image010.png
deleted file mode 100644
index 0c9b7ab76..000000000
Binary files a/apps-cloud-adventure-cio/06-analytics-scm/images/image010.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/image011.png b/apps-cloud-adventure-cio/06-analytics-scm/images/image011.png
deleted file mode 100644
index 08fee1f1a..000000000
Binary files a/apps-cloud-adventure-cio/06-analytics-scm/images/image011.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/image012.png b/apps-cloud-adventure-cio/06-analytics-scm/images/image012.png
deleted file mode 100644
index 70d9ecee5..000000000
Binary files a/apps-cloud-adventure-cio/06-analytics-scm/images/image012.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/image013.png b/apps-cloud-adventure-cio/06-analytics-scm/images/image013.png
deleted file mode 100644
index 59359a29c..000000000
Binary files a/apps-cloud-adventure-cio/06-analytics-scm/images/image013.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/image014.png b/apps-cloud-adventure-cio/06-analytics-scm/images/image014.png
deleted file mode 100644
index 501783bb5..000000000
Binary files a/apps-cloud-adventure-cio/06-analytics-scm/images/image014.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/image015.png b/apps-cloud-adventure-cio/06-analytics-scm/images/image015.png
deleted file mode 100644
index 675d6e0c9..000000000
Binary files a/apps-cloud-adventure-cio/06-analytics-scm/images/image015.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/image016.png b/apps-cloud-adventure-cio/06-analytics-scm/images/image016.png
deleted file mode 100644
index 1975de28d..000000000
Binary files a/apps-cloud-adventure-cio/06-analytics-scm/images/image016.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/image017.png b/apps-cloud-adventure-cio/06-analytics-scm/images/image017.png
deleted file mode 100644
index d8611d8ca..000000000
Binary files a/apps-cloud-adventure-cio/06-analytics-scm/images/image017.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/image018.png b/apps-cloud-adventure-cio/06-analytics-scm/images/image018.png
deleted file mode 100644
index 96eb15ca0..000000000
Binary files a/apps-cloud-adventure-cio/06-analytics-scm/images/image018.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/image019.png b/apps-cloud-adventure-cio/06-analytics-scm/images/image019.png
deleted file mode 100644
index f04c1589e..000000000
Binary files a/apps-cloud-adventure-cio/06-analytics-scm/images/image019.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/image020.png b/apps-cloud-adventure-cio/06-analytics-scm/images/image020.png
deleted file mode 100644
index a4bea0fb7..000000000
Binary files a/apps-cloud-adventure-cio/06-analytics-scm/images/image020.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/image021.png b/apps-cloud-adventure-cio/06-analytics-scm/images/image021.png
deleted file mode 100644
index 11be1719a..000000000
Binary files a/apps-cloud-adventure-cio/06-analytics-scm/images/image021.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/image022.png b/apps-cloud-adventure-cio/06-analytics-scm/images/image022.png
deleted file mode 100644
index 2a6b1772d..000000000
Binary files a/apps-cloud-adventure-cio/06-analytics-scm/images/image022.png and /dev/null differ
diff --git a/apps-cloud-adventure-cio/06-analytics/analytics.md b/apps-cloud-adventure-cio/06-analytics/analytics.md
index a7507dc30..6746d1849 100644
--- a/apps-cloud-adventure-cio/06-analytics/analytics.md
+++ b/apps-cloud-adventure-cio/06-analytics/analytics.md
@@ -4,41 +4,56 @@
Oracle Fusion Data Intelligence Platform is a family of prebuilt, cloud native analytics applications for Oracle Cloud Applications that provides line-of-business users with ready-to-use insights to improve decision-making.
-It is a Cloud application that delivers best-practice Key Performance Indicators (KPIs) and deep analyses to help decision-makers run their businesses and individual contributors to operate their businesses. Oracle Fusion Data Intelligence Platform is built on top of Oracle Analytics Cloud and Oracle Autonomous Data Warehouse. This packaged service starts with Oracle Fusion Cloud Applications which you can deploy rapidly, personalize, and extend. The service extracts data from your Oracle Fusion Cloud Applications and and loads it into an instance of Oracle Autonomous Data Warehouse. Business users can then create and customize dashboards in Oracle Analytics Cloud. It empowers business users with industry-leading, AI-powered, self-service analytics capabilities for data preparation, visualization, enterprise reporting, augmented analysis, and natural language processing.
+It is a Cloud application that delivers best-practice Key Performance Indicators (KPIs) and deep analyses to help decision-makers run their businesses and individual contributors to operate their businesses. Oracle Fusion Data Intelligence Platform is built on top of Oracle Analytics Cloud and Oracle Autonomous Data Warehouse. This packaged service starts with Oracle Fusion Cloud Applications which you can deploy rapidly, personalize, and extend. The service extracts data from your Oracle Fusion Cloud Applications and loads it into an instance of Oracle Autonomous Data Warehouse. Business users can then create and customize dashboards in Oracle Analytics Cloud. It empowers business users with industry-leading, AI-powered, self-service analytics capabilities for data preparation, visualization, enterprise reporting, augmented analysis, and natural language processing.
This activity guide helps business users to investigate and research data, ask relevant questions to understand Trends, Patterns and Outliers.
-Estimated Time: 15 minutes
-
-
### Objectives
In this activity, you will Create analytics across different lines of business to derive better business insight
+
+Estimated Time: 15 minutes
+
+Do not forget to answer the Adventure Check Point questions at the end of the exercise!
-
-## Task 1: Create analytics across different lines of business to derive better business insight
+## ERP & HCM: Unify finance and workforce-related data to understand changing workforce dynamics and gain comprehensive insights.
+
+
+
+1. In this activity, you will Create analytics across different lines of business to derive better business insights.
+
+ Cross-functional reporting analysis between ERP & HCM involves integrating data from core business operations finance with workforce-related data (such as employee performance, payroll, and workforce planning) providing comprehensive insights for decision-making, enabling organizations to align their human resource strategies with broader business objectives.
+
+ 
+
+
+
+2. Oracle Fusion Data Intelligence Platform is a family of prebuilt, cloud-native analytics applications for Oracle Cloud Applications that provide line-of-business users with ready-to-use insights to improve decision-making.
+ > (1) Click on the **‘Analytics’** tab
+ > (2) Click on **‘Fusion – Analytics Data Intelligence’** icon
-1. Oracle Fusion Data Intelligence Platform is a family of prebuilt, cloud-native analytics applications for Oracle Cloud Applications that provide line-of-business users with ready-to-use insights to improve decision-making.
+ 
-After a successful login, you will land on the Oracle Analytics home page.
-> Login to your Fusion Data Intelligence Portal using the URL provided.
+3. After a successful login, you will land on the Oracle Analytics home page.
-> Open a web browser and enter the URL provided, then on the login screen, type in the Username and Password. Click Sign In.
+ > (1) Enter assigned username and Fusion Analytics Password
+ > (2) Click on the ‘Sign In’
-
+ 
-2. A finance Watchlist comprising several Tiles is available on the home page.
+
+4. A finance Watchlist comprising several Tiles is available on the home page.
One metric that draws my attention is Margin, which is trending low.
@@ -49,7 +64,7 @@ After a successful login, you will land on the Oracle Analytics home page.
-3. This action expands the Tile and opens the workbook.
+5. This action expands the Tile and opens the workbook.
Let's now set the workbook to design mode so that we can add cost elements.
@@ -63,7 +78,7 @@ After a successful login, you will land on the Oracle Analytics home page.
-4. Next, let’s expand the Auto Insights pane for better observability.
+6. Next, let’s expand the Auto Insights pane for better observability.
> Click on the Expand / Shrink Icon  as shown in the image.
@@ -72,7 +87,7 @@ After a successful login, you will land on the Oracle Analytics home page.
-5. The Auto Insights function has crawled the data set and brought expense-related information critical to our analysis. Let’s use the Top 10 Expenses by expense categories.
+7. The Auto Insights function has crawled the data set and brought expense-related information critical to our analysis. Let’s use the Top 10 Expenses by expense categories.
> (1) Locate the “Top 10 Expense Categories by Expenses” insight and click the Add Icon  shown in the image. This will add the Insight to the Canvas.
@@ -81,7 +96,7 @@ After a successful login, you will land on the Oracle Analytics home page.
-6. Now, we can compare margin and cost side by side.
+8. Now, we can compare margin and cost side by side.
Payroll expenses emerge as the highest cost. We will delve deeper into payroll expenses to identify their components.
@@ -90,7 +105,7 @@ After a successful login, you will land on the Oracle Analytics home page.
-7. Combining datasets from multiple “Lines of Business” allows an individual to conduct a deep dive into the actual problems.
+9. Combining datasets from multiple “Lines of Business” allows an individual to conduct a deep dive into the actual problems.
> (1) Expand the HCM Core transactions data set from the Data Panel on the left.
@@ -107,7 +122,7 @@ After a successful login, you will land on the Oracle Analytics home page.
-8. We need to perform trend analysis to understand when the expense anomaly started occurring and whether it is consistent across all expense types.
+10. We need to perform trend analysis to understand when the expense anomaly started occurring and whether it is consistent across all expense types.
> Drag the **Accounts** column from the Categories section into the Color section.
@@ -117,7 +132,7 @@ After a successful login, you will land on the Oracle Analytics home page.
-9. We can now see expense amounts displayed across time and expense categories.
+11. We can now see expense amounts displayed across time and expense categories.
On analyzing the trend, it appears that while Base Salary and Wages have remained constant, overtime and contract labor have increased since May.
@@ -125,7 +140,7 @@ After a successful login, you will land on the Oracle Analytics home page.
-10. Overtime and Contract labor are typically associated with Turnover. Let's see if it had any impact.
+12. Overtime and Contract labor are typically associated with Turnover. Let's see if it had any impact.
> (1) Expand the Fiscal Date folder in the Data Panel to locate the **Month** and **Turnover** columns.
@@ -135,7 +150,7 @@ After a successful login, you will land on the Oracle Analytics home page.
-11. Another factor that impacts Overtime and Contract labor is employee absences.
+13. Another factor that impacts Overtime and Contract labor is employee absences.
> Drag the **Absences** column from the data panel and drop it in the values section below the **Turnover** column.
@@ -144,27 +159,176 @@ After a successful login, you will land on the Oracle Analytics home page.
-12. This brings all relevant columns onto the canvas. We can now co-relate several attributes and arrive at the correct conclusion. We can now see the pattern clearly. Beginning in March, absences and turnover started increasing, which led to an increase in overtime and the hiring of contract labor. This is ultimately reflected in the books of accounts in Finance.
+14. This brings all relevant columns onto the canvas. We can now co-relate several attributes and arrive at the correct conclusion. We can now see the pattern clearly. Beginning in March, absences and turnover started increasing, which led to an increase in overtime and the hiring of contract labor. This is ultimately reflected in the books of accounts in Finance.
-13. Let’s understand how the trend looks like in the future. We will use the built in Statistical Analysis function like forecast to under the future
+15. Let’s understand how the trend looks like in the future. We will use the built in Statistical Analysis function like forecast to under the future
> Right click anywhere in the **Turnover**, **Absences** Chart choose **Add Statistics** then **Forecast**
-14. With a few simple clicks, you were able to forecast and understand the future trend.
+16. With a few simple clicks, you were able to forecast and understand the future trend.
-15. Adventure awaits, click on the image and show what you know, and rise to the top of the leader board!!!
+17. Adventure awaits, click on the image and show what you know, and rise to the top of the leader board!!!
[](https://apex.oracle.com/pls/apex/f?p=159406:LOGIN_TEAM:::::CC:CIOADVENTURE)
+## ERP & SCM: Unify finance and supply chain data to identify bottlenecks and optimize resource allocation
+
+
+1. In this activity, you will Create analytics across different lines of business to derive better business insights.
+
+ ERP & SCM cross-functional reporting combines data from business processes like finance with supply chain operations. By providing a unified view of supply chain and enterprise operations, cross-functional reporting helps identify bottlenecks, optimize resource allocation, and improve supply chain resilience. Such insights are crucial for aligning supply chain strategies with overall business goals and achieving operational excellence.
+
+ 
+
+
+
+2. Oracle Fusion Data Intelligence Platform is a family of prebuilt, cloud-native analytics applications for Oracle Cloud Applications that provide line-of-business users with ready-to-use insights to improve decision-making.
+
+ > (1) Click on the **‘Analytics’** tab
+
+ > (2) Click on **‘Fusion – Analytics Data Intelligence’** icon
+
+ 
+
+
+
+3. After a successful login, you will land on the Oracle Analytics home page.
+
+ > (1) Enter assigned username and Fusion Analytics Password
+
+ > (2) Click on the ‘Sign In’
+
+ 
+
+
+4. A finance Watchlist comprising several Tiles is available on the home page.
+
+ One metric that draws my attention is Margin, which is trending low.
+
+ Two attributes that influence Margin are Revenue and Cost. Since revenue seems to be increasing, let's investigate Cost.
+
+ > On the Margin Tile locate the **Open Workbook**  Icon on the top right corner and click on it.
+
+ 
+
+
+5. This action expands the Tile and opens the workbook.
+
+ Let's now set the workbook to design mode so that we can add cost elements.
+
+ > Click on the Edit Icon  as shown in the image.
+
+ Instead of building manually, let's use the Auto Insights feature.
+
+
+ > Click on the Auto Insights Icon  as shown in the image.
+
+ 
+
+
+6. Next, let’s expand the Auto Insights pane for better observability.
+
+ > Click on the Expand / Shrink Icon  as shown in the image.
+
+ 
+
+
+
+
+7. The Auto Insights function has crawled the data set and brought expense-related information critical to our analysis. Let’s use the Top 10 Expenses by expense categories.
+
+ > (1) Locate the “Top 10 Expense Categories by Expenses” insight and click the Add Icon  shown in the image. This will add the Insight to the Canvas.
+
+ > (2) Click on the **x** sign to close the Insights pane.
+
+ 
+
+
+8. Let’s create a new Canvas to under the SCM issue
+
+ > Locate the plus  icon at the bottom of the page and click it to create a new canvas.
+
+
+
+9. We will add Supply Chain data to the canvas
+
+ > Expand the SCM Dataset by clicking on the Triangle icon. Expand the Fiscal Data folder and locate Month Column.
+
+ > Next locate Total Cost. While keeping the “CTRL ” key pressed drag and drop them on to the canvas.
+
+ > Your canvas should look like the image on the right.
+
+ 
+
+
+10. Total cost has been varying over time. We need to understand what is causing the increase and decrease
+
+ > Expand the Fiscal Data folder and locate Month Column.
+
+ > Scroll down to locate Off Contract and Contract purchase columns.
+
+ > While keeping the “CTRL ” key pressed drag and drop them on to the canvas under the existing chart.
+
+ > Watch for the Green bar before you drop the columns.
+
+ 
+
+11. Change the visualization type
+
+ > In the Properties panel in the center. Click on the inverted triangle  to expand the Analytics Type panel and choose Bar Type.
+
+ 
+
+ > Move Contract Purchase from Color Section to Values section.
+
+ 
+
+
+12. We need to understand what is causing the off contract purchasing.
+
+ > Expand the Fiscal Data folder and locate Month Column.
+
+ > Scroll down to locate Received Late Quantity columns.
+
+ > While keeping the “CTRL ” key pressed drag and drop them on to the canvas under the existing chart.
+
+ > Watch for the Green bar before you drop the columns.
+
+ 
+
+ > In the Properties panel in the center. Click on the inverted triangle  to expand the Analytics Type panel and choose Bar Type.
+
+ 
+
+13. Lets find out which supplier is responsible for the issue.
+
+ > Locate supplier and drop it into the color section.
+
+ > Next delete Fiscal Data (Month) column
+
+ 
+
+ > In the Properties panel in the center. Click on the inverted triangle to expand the Analytics Type panel and choose Treemap Type.
+
+ 
+
+14. Two suppliers are the cause of the issue.
+
+ 
+
+
+15. Adventure awaits, click on the image and show what you know, and rise to the top of the leader board!!!
+
+ [](https://apex.oracle.com/pls/apex/f?p=159406:LOGIN_TEAM:::::CC:CIOADVENTURE)
## Summary
@@ -174,8 +338,12 @@ You discovered how effortlessly Fusion Analytics enables the creation of content
**You have successfully completed the Activity!**
+## Learn More
+
+* [Get Started with Oracle Fusion Data Intelligence](https://docs.oracle.com/en/cloud/saas/analytics/24r3/index.html)
+* [Oracle Documentation](http://docs.oracle.com)
## Acknowledgements
* **Author** - Sohel Jeelani, Analytics Solution Engineer, Advanced Technology Services
* **Contributors** -
-* **Last Updated By/Date** - Sohel Jeelani, September 2024
+* **Last Updated By/Date** - Sohel Jeelani, November 2024
diff --git a/apps-cloud-adventure-cio/05-analytics/images/analytics_objs1.png b/apps-cloud-adventure-cio/06-analytics/images/analytics_objs1.png
similarity index 100%
rename from apps-cloud-adventure-cio/05-analytics/images/analytics_objs1.png
rename to apps-cloud-adventure-cio/06-analytics/images/analytics_objs1.png
diff --git a/apps-cloud-adventure-cio/02-configure-hcm/images/cloud-adventure-checkpoint-image.png b/apps-cloud-adventure-cio/06-analytics/images/cloud-adventure-checkpoint-image.png
similarity index 100%
rename from apps-cloud-adventure-cio/02-configure-hcm/images/cloud-adventure-checkpoint-image.png
rename to apps-cloud-adventure-cio/06-analytics/images/cloud-adventure-checkpoint-image.png
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/cplus.png b/apps-cloud-adventure-cio/06-analytics/images/cplus.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-scm/images/cplus.png
rename to apps-cloud-adventure-cio/06-analytics/images/cplus.png
diff --git a/apps-cloud-adventure-cio/05-analytics/images/icon001.png b/apps-cloud-adventure-cio/06-analytics/images/icon001.png
similarity index 100%
rename from apps-cloud-adventure-cio/05-analytics/images/icon001.png
rename to apps-cloud-adventure-cio/06-analytics/images/icon001.png
diff --git a/apps-cloud-adventure-cio/05-analytics/images/icon002.png b/apps-cloud-adventure-cio/06-analytics/images/icon002.png
similarity index 100%
rename from apps-cloud-adventure-cio/05-analytics/images/icon002.png
rename to apps-cloud-adventure-cio/06-analytics/images/icon002.png
diff --git a/apps-cloud-adventure-cio/05-analytics/images/icon003.png b/apps-cloud-adventure-cio/06-analytics/images/icon003.png
similarity index 100%
rename from apps-cloud-adventure-cio/05-analytics/images/icon003.png
rename to apps-cloud-adventure-cio/06-analytics/images/icon003.png
diff --git a/apps-cloud-adventure-cio/05-analytics/images/icon004.png b/apps-cloud-adventure-cio/06-analytics/images/icon004.png
similarity index 100%
rename from apps-cloud-adventure-cio/05-analytics/images/icon004.png
rename to apps-cloud-adventure-cio/06-analytics/images/icon004.png
diff --git a/apps-cloud-adventure-cio/05-analytics/images/icon005.png b/apps-cloud-adventure-cio/06-analytics/images/icon005.png
similarity index 100%
rename from apps-cloud-adventure-cio/05-analytics/images/icon005.png
rename to apps-cloud-adventure-cio/06-analytics/images/icon005.png
diff --git a/apps-cloud-adventure-cio/05-analytics/images/icon006.png b/apps-cloud-adventure-cio/06-analytics/images/icon006.png
similarity index 100%
rename from apps-cloud-adventure-cio/05-analytics/images/icon006.png
rename to apps-cloud-adventure-cio/06-analytics/images/icon006.png
diff --git a/apps-cloud-adventure-cio/05-analytics/images/icon007.png b/apps-cloud-adventure-cio/06-analytics/images/icon007.png
similarity index 100%
rename from apps-cloud-adventure-cio/05-analytics/images/icon007.png
rename to apps-cloud-adventure-cio/06-analytics/images/icon007.png
diff --git a/apps-cloud-adventure-cio/05-analytics/images/icon008.png b/apps-cloud-adventure-cio/06-analytics/images/icon008.png
similarity index 100%
rename from apps-cloud-adventure-cio/05-analytics/images/icon008.png
rename to apps-cloud-adventure-cio/06-analytics/images/icon008.png
diff --git a/apps-cloud-adventure-cio/05-analytics/images/icon009.png b/apps-cloud-adventure-cio/06-analytics/images/icon009.png
similarity index 100%
rename from apps-cloud-adventure-cio/05-analytics/images/icon009.png
rename to apps-cloud-adventure-cio/06-analytics/images/icon009.png
diff --git a/apps-cloud-adventure-cio/06-analytics-hcm/images/icon001.png b/apps-cloud-adventure-cio/06-analytics/images/icon101.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-hcm/images/icon001.png
rename to apps-cloud-adventure-cio/06-analytics/images/icon101.png
diff --git a/apps-cloud-adventure-cio/06-analytics-hcm/images/icon002.png b/apps-cloud-adventure-cio/06-analytics/images/icon102.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-hcm/images/icon002.png
rename to apps-cloud-adventure-cio/06-analytics/images/icon102.png
diff --git a/apps-cloud-adventure-cio/06-analytics-hcm/images/icon003.png b/apps-cloud-adventure-cio/06-analytics/images/icon103.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-hcm/images/icon003.png
rename to apps-cloud-adventure-cio/06-analytics/images/icon103.png
diff --git a/apps-cloud-adventure-cio/06-analytics-hcm/images/icon004.png b/apps-cloud-adventure-cio/06-analytics/images/icon104.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-hcm/images/icon004.png
rename to apps-cloud-adventure-cio/06-analytics/images/icon104.png
diff --git a/apps-cloud-adventure-cio/06-analytics-hcm/images/icon005.png b/apps-cloud-adventure-cio/06-analytics/images/icon105.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-hcm/images/icon005.png
rename to apps-cloud-adventure-cio/06-analytics/images/icon105.png
diff --git a/apps-cloud-adventure-cio/06-analytics-hcm/images/icon006.png b/apps-cloud-adventure-cio/06-analytics/images/icon106.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-hcm/images/icon006.png
rename to apps-cloud-adventure-cio/06-analytics/images/icon106.png
diff --git a/apps-cloud-adventure-cio/06-analytics-hcm/images/icon007.png b/apps-cloud-adventure-cio/06-analytics/images/icon107.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-hcm/images/icon007.png
rename to apps-cloud-adventure-cio/06-analytics/images/icon107.png
diff --git a/apps-cloud-adventure-cio/06-analytics-hcm/images/icon008.png b/apps-cloud-adventure-cio/06-analytics/images/icon108.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-hcm/images/icon008.png
rename to apps-cloud-adventure-cio/06-analytics/images/icon108.png
diff --git a/apps-cloud-adventure-cio/06-analytics-hcm/images/icon009.png b/apps-cloud-adventure-cio/06-analytics/images/icon109.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-hcm/images/icon009.png
rename to apps-cloud-adventure-cio/06-analytics/images/icon109.png
diff --git a/apps-cloud-adventure-cio/06-analytics-hcm/images/image001.png b/apps-cloud-adventure-cio/06-analytics/images/image001.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-hcm/images/image001.png
rename to apps-cloud-adventure-cio/06-analytics/images/image001.png
diff --git a/apps-cloud-adventure-cio/05-analytics/images/image002.png b/apps-cloud-adventure-cio/06-analytics/images/image002.png
similarity index 100%
rename from apps-cloud-adventure-cio/05-analytics/images/image002.png
rename to apps-cloud-adventure-cio/06-analytics/images/image002.png
diff --git a/apps-cloud-adventure-cio/05-analytics/images/image003.png b/apps-cloud-adventure-cio/06-analytics/images/image003.png
similarity index 100%
rename from apps-cloud-adventure-cio/05-analytics/images/image003.png
rename to apps-cloud-adventure-cio/06-analytics/images/image003.png
diff --git a/apps-cloud-adventure-cio/05-analytics/images/image004.png b/apps-cloud-adventure-cio/06-analytics/images/image004.png
similarity index 100%
rename from apps-cloud-adventure-cio/05-analytics/images/image004.png
rename to apps-cloud-adventure-cio/06-analytics/images/image004.png
diff --git a/apps-cloud-adventure-cio/05-analytics/images/image005.png b/apps-cloud-adventure-cio/06-analytics/images/image005.png
similarity index 100%
rename from apps-cloud-adventure-cio/05-analytics/images/image005.png
rename to apps-cloud-adventure-cio/06-analytics/images/image005.png
diff --git a/apps-cloud-adventure-cio/05-analytics/images/image006.png b/apps-cloud-adventure-cio/06-analytics/images/image006.png
similarity index 100%
rename from apps-cloud-adventure-cio/05-analytics/images/image006.png
rename to apps-cloud-adventure-cio/06-analytics/images/image006.png
diff --git a/apps-cloud-adventure-cio/05-analytics/images/image006a.png b/apps-cloud-adventure-cio/06-analytics/images/image006a.png
similarity index 100%
rename from apps-cloud-adventure-cio/05-analytics/images/image006a.png
rename to apps-cloud-adventure-cio/06-analytics/images/image006a.png
diff --git a/apps-cloud-adventure-cio/05-analytics/images/image007.png b/apps-cloud-adventure-cio/06-analytics/images/image007.png
similarity index 100%
rename from apps-cloud-adventure-cio/05-analytics/images/image007.png
rename to apps-cloud-adventure-cio/06-analytics/images/image007.png
diff --git a/apps-cloud-adventure-cio/05-analytics/images/image008.png b/apps-cloud-adventure-cio/06-analytics/images/image008.png
similarity index 100%
rename from apps-cloud-adventure-cio/05-analytics/images/image008.png
rename to apps-cloud-adventure-cio/06-analytics/images/image008.png
diff --git a/apps-cloud-adventure-cio/05-analytics/images/image009.png b/apps-cloud-adventure-cio/06-analytics/images/image009.png
similarity index 100%
rename from apps-cloud-adventure-cio/05-analytics/images/image009.png
rename to apps-cloud-adventure-cio/06-analytics/images/image009.png
diff --git a/apps-cloud-adventure-cio/05-analytics/images/image010.png b/apps-cloud-adventure-cio/06-analytics/images/image010.png
similarity index 100%
rename from apps-cloud-adventure-cio/05-analytics/images/image010.png
rename to apps-cloud-adventure-cio/06-analytics/images/image010.png
diff --git a/apps-cloud-adventure-cio/05-analytics/images/image011.png b/apps-cloud-adventure-cio/06-analytics/images/image011.png
similarity index 100%
rename from apps-cloud-adventure-cio/05-analytics/images/image011.png
rename to apps-cloud-adventure-cio/06-analytics/images/image011.png
diff --git a/apps-cloud-adventure-cio/05-analytics/images/image012.png b/apps-cloud-adventure-cio/06-analytics/images/image012.png
similarity index 100%
rename from apps-cloud-adventure-cio/05-analytics/images/image012.png
rename to apps-cloud-adventure-cio/06-analytics/images/image012.png
diff --git a/apps-cloud-adventure-cio/05-analytics/images/image013.png b/apps-cloud-adventure-cio/06-analytics/images/image013.png
similarity index 100%
rename from apps-cloud-adventure-cio/05-analytics/images/image013.png
rename to apps-cloud-adventure-cio/06-analytics/images/image013.png
diff --git a/apps-cloud-adventure-cio/05-analytics/images/image014.png b/apps-cloud-adventure-cio/06-analytics/images/image014.png
similarity index 100%
rename from apps-cloud-adventure-cio/05-analytics/images/image014.png
rename to apps-cloud-adventure-cio/06-analytics/images/image014.png
diff --git a/apps-cloud-adventure-cio/05-analytics/images/image015.png b/apps-cloud-adventure-cio/06-analytics/images/image015.png
similarity index 100%
rename from apps-cloud-adventure-cio/05-analytics/images/image015.png
rename to apps-cloud-adventure-cio/06-analytics/images/image015.png
diff --git a/apps-cloud-adventure-cio/05-analytics/images/image016.png b/apps-cloud-adventure-cio/06-analytics/images/image016.png
similarity index 100%
rename from apps-cloud-adventure-cio/05-analytics/images/image016.png
rename to apps-cloud-adventure-cio/06-analytics/images/image016.png
diff --git a/apps-cloud-adventure-cio/05-analytics/images/image017.png b/apps-cloud-adventure-cio/06-analytics/images/image017.png
similarity index 100%
rename from apps-cloud-adventure-cio/05-analytics/images/image017.png
rename to apps-cloud-adventure-cio/06-analytics/images/image017.png
diff --git a/apps-cloud-adventure-cio/05-analytics/images/image018.png b/apps-cloud-adventure-cio/06-analytics/images/image018.png
similarity index 100%
rename from apps-cloud-adventure-cio/05-analytics/images/image018.png
rename to apps-cloud-adventure-cio/06-analytics/images/image018.png
diff --git a/apps-cloud-adventure-cio/05-analytics/images/image019.png b/apps-cloud-adventure-cio/06-analytics/images/image019.png
similarity index 100%
rename from apps-cloud-adventure-cio/05-analytics/images/image019.png
rename to apps-cloud-adventure-cio/06-analytics/images/image019.png
diff --git a/apps-cloud-adventure-cio/05-analytics/images/image020.png b/apps-cloud-adventure-cio/06-analytics/images/image020.png
similarity index 100%
rename from apps-cloud-adventure-cio/05-analytics/images/image020.png
rename to apps-cloud-adventure-cio/06-analytics/images/image020.png
diff --git a/apps-cloud-adventure-cio/05-analytics/images/image021.png b/apps-cloud-adventure-cio/06-analytics/images/image021.png
similarity index 100%
rename from apps-cloud-adventure-cio/05-analytics/images/image021.png
rename to apps-cloud-adventure-cio/06-analytics/images/image021.png
diff --git a/apps-cloud-adventure-cio/05-analytics/images/image022.png b/apps-cloud-adventure-cio/06-analytics/images/image022.png
similarity index 100%
rename from apps-cloud-adventure-cio/05-analytics/images/image022.png
rename to apps-cloud-adventure-cio/06-analytics/images/image022.png
diff --git a/apps-cloud-adventure-cio/06-analytics-hcm/images/image101.png b/apps-cloud-adventure-cio/06-analytics/images/image023.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-hcm/images/image101.png
rename to apps-cloud-adventure-cio/06-analytics/images/image023.png
diff --git a/apps-cloud-adventure-cio/05-analytics/images/image001.png b/apps-cloud-adventure-cio/06-analytics/images/image101.png
similarity index 100%
rename from apps-cloud-adventure-cio/05-analytics/images/image001.png
rename to apps-cloud-adventure-cio/06-analytics/images/image101.png
diff --git a/apps-cloud-adventure-cio/06-analytics-hcm/images/image002.png b/apps-cloud-adventure-cio/06-analytics/images/image102.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-hcm/images/image002.png
rename to apps-cloud-adventure-cio/06-analytics/images/image102.png
diff --git a/apps-cloud-adventure-cio/06-analytics-hcm/images/image003.png b/apps-cloud-adventure-cio/06-analytics/images/image103.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-hcm/images/image003.png
rename to apps-cloud-adventure-cio/06-analytics/images/image103.png
diff --git a/apps-cloud-adventure-cio/06-analytics-hcm/images/image004.png b/apps-cloud-adventure-cio/06-analytics/images/image104.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-hcm/images/image004.png
rename to apps-cloud-adventure-cio/06-analytics/images/image104.png
diff --git a/apps-cloud-adventure-cio/06-analytics-hcm/images/image005.png b/apps-cloud-adventure-cio/06-analytics/images/image105.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-hcm/images/image005.png
rename to apps-cloud-adventure-cio/06-analytics/images/image105.png
diff --git a/apps-cloud-adventure-cio/06-analytics-hcm/images/image006.png b/apps-cloud-adventure-cio/06-analytics/images/image106.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-hcm/images/image006.png
rename to apps-cloud-adventure-cio/06-analytics/images/image106.png
diff --git a/apps-cloud-adventure-cio/06-analytics-hcm/images/image006a.png b/apps-cloud-adventure-cio/06-analytics/images/image106a.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-hcm/images/image006a.png
rename to apps-cloud-adventure-cio/06-analytics/images/image106a.png
diff --git a/apps-cloud-adventure-cio/06-analytics-hcm/images/image007.png b/apps-cloud-adventure-cio/06-analytics/images/image107.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-hcm/images/image007.png
rename to apps-cloud-adventure-cio/06-analytics/images/image107.png
diff --git a/apps-cloud-adventure-cio/06-analytics-hcm/images/image008.png b/apps-cloud-adventure-cio/06-analytics/images/image108.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-hcm/images/image008.png
rename to apps-cloud-adventure-cio/06-analytics/images/image108.png
diff --git a/apps-cloud-adventure-cio/06-analytics-hcm/images/image009.png b/apps-cloud-adventure-cio/06-analytics/images/image109.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-hcm/images/image009.png
rename to apps-cloud-adventure-cio/06-analytics/images/image109.png
diff --git a/apps-cloud-adventure-cio/06-analytics-hcm/images/image010.png b/apps-cloud-adventure-cio/06-analytics/images/image110.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-hcm/images/image010.png
rename to apps-cloud-adventure-cio/06-analytics/images/image110.png
diff --git a/apps-cloud-adventure-cio/06-analytics-hcm/images/image011.png b/apps-cloud-adventure-cio/06-analytics/images/image111.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-hcm/images/image011.png
rename to apps-cloud-adventure-cio/06-analytics/images/image111.png
diff --git a/apps-cloud-adventure-cio/06-analytics-hcm/images/image012.png b/apps-cloud-adventure-cio/06-analytics/images/image112.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-hcm/images/image012.png
rename to apps-cloud-adventure-cio/06-analytics/images/image112.png
diff --git a/apps-cloud-adventure-cio/06-analytics-hcm/images/image013.png b/apps-cloud-adventure-cio/06-analytics/images/image113.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-hcm/images/image013.png
rename to apps-cloud-adventure-cio/06-analytics/images/image113.png
diff --git a/apps-cloud-adventure-cio/06-analytics-hcm/images/image014.png b/apps-cloud-adventure-cio/06-analytics/images/image114.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-hcm/images/image014.png
rename to apps-cloud-adventure-cio/06-analytics/images/image114.png
diff --git a/apps-cloud-adventure-cio/06-analytics-hcm/images/image015.png b/apps-cloud-adventure-cio/06-analytics/images/image115.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-hcm/images/image015.png
rename to apps-cloud-adventure-cio/06-analytics/images/image115.png
diff --git a/apps-cloud-adventure-cio/06-analytics-hcm/images/image016.png b/apps-cloud-adventure-cio/06-analytics/images/image116.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-hcm/images/image016.png
rename to apps-cloud-adventure-cio/06-analytics/images/image116.png
diff --git a/apps-cloud-adventure-cio/06-analytics-hcm/images/image017.png b/apps-cloud-adventure-cio/06-analytics/images/image117.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-hcm/images/image017.png
rename to apps-cloud-adventure-cio/06-analytics/images/image117.png
diff --git a/apps-cloud-adventure-cio/06-analytics-hcm/images/image018.png b/apps-cloud-adventure-cio/06-analytics/images/image118.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-hcm/images/image018.png
rename to apps-cloud-adventure-cio/06-analytics/images/image118.png
diff --git a/apps-cloud-adventure-cio/06-analytics-hcm/images/image019.png b/apps-cloud-adventure-cio/06-analytics/images/image119.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-hcm/images/image019.png
rename to apps-cloud-adventure-cio/06-analytics/images/image119.png
diff --git a/apps-cloud-adventure-cio/06-analytics-hcm/images/image020.png b/apps-cloud-adventure-cio/06-analytics/images/image120.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-hcm/images/image020.png
rename to apps-cloud-adventure-cio/06-analytics/images/image120.png
diff --git a/apps-cloud-adventure-cio/06-analytics-hcm/images/image021.png b/apps-cloud-adventure-cio/06-analytics/images/image121.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-hcm/images/image021.png
rename to apps-cloud-adventure-cio/06-analytics/images/image121.png
diff --git a/apps-cloud-adventure-cio/06-analytics-hcm/images/image022.png b/apps-cloud-adventure-cio/06-analytics/images/image122.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-hcm/images/image022.png
rename to apps-cloud-adventure-cio/06-analytics/images/image122.png
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/invtriangle.png b/apps-cloud-adventure-cio/06-analytics/images/invtriangle.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-scm/images/invtriangle.png
rename to apps-cloud-adventure-cio/06-analytics/images/invtriangle.png
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/invtriangle2.png b/apps-cloud-adventure-cio/06-analytics/images/invtriangle2.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-scm/images/invtriangle2.png
rename to apps-cloud-adventure-cio/06-analytics/images/invtriangle2.png
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/scm-001.png b/apps-cloud-adventure-cio/06-analytics/images/scm-001.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-scm/images/scm-001.png
rename to apps-cloud-adventure-cio/06-analytics/images/scm-001.png
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/scm-002.png b/apps-cloud-adventure-cio/06-analytics/images/scm-002.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-scm/images/scm-002.png
rename to apps-cloud-adventure-cio/06-analytics/images/scm-002.png
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/scm-003.png b/apps-cloud-adventure-cio/06-analytics/images/scm-003.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-scm/images/scm-003.png
rename to apps-cloud-adventure-cio/06-analytics/images/scm-003.png
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/scm-004.png b/apps-cloud-adventure-cio/06-analytics/images/scm-004.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-scm/images/scm-004.png
rename to apps-cloud-adventure-cio/06-analytics/images/scm-004.png
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/scm-005.png b/apps-cloud-adventure-cio/06-analytics/images/scm-005.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-scm/images/scm-005.png
rename to apps-cloud-adventure-cio/06-analytics/images/scm-005.png
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/scm-006.png b/apps-cloud-adventure-cio/06-analytics/images/scm-006.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-scm/images/scm-006.png
rename to apps-cloud-adventure-cio/06-analytics/images/scm-006.png
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/scm-007.png b/apps-cloud-adventure-cio/06-analytics/images/scm-007.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-scm/images/scm-007.png
rename to apps-cloud-adventure-cio/06-analytics/images/scm-007.png
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/scm-008.png b/apps-cloud-adventure-cio/06-analytics/images/scm-008.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-scm/images/scm-008.png
rename to apps-cloud-adventure-cio/06-analytics/images/scm-008.png
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/scm-009.png b/apps-cloud-adventure-cio/06-analytics/images/scm-009.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-scm/images/scm-009.png
rename to apps-cloud-adventure-cio/06-analytics/images/scm-009.png
diff --git a/apps-cloud-adventure-cio/06-analytics-scm/images/scm-010.png b/apps-cloud-adventure-cio/06-analytics/images/scm-010.png
similarity index 100%
rename from apps-cloud-adventure-cio/06-analytics-scm/images/scm-010.png
rename to apps-cloud-adventure-cio/06-analytics/images/scm-010.png
diff --git a/apps-cloud-adventure-cio/workshops/tenancy/manifest.json b/apps-cloud-adventure-cio/workshops/tenancy/manifest.json
index d75cfe276..3ff678a0b 100644
--- a/apps-cloud-adventure-cio/workshops/tenancy/manifest.json
+++ b/apps-cloud-adventure-cio/workshops/tenancy/manifest.json
@@ -12,7 +12,7 @@
},
{
"title": "Lab 2: Configure",
- "filename": "../../02-configure-hcm/configure.md"
+ "filename": "../../02-configure/configure.md"
},
{
"title": "Lab 3: Extend",
@@ -20,7 +20,7 @@
},
{
"title": "Lab 4: Extend More",
- "filename": "../../04-extend-scm-llm/extend-more-po.md"
+ "filename": "../../04-extend-more/extend-more.md"
},
{
"title": "Lab 5: Audit",
@@ -29,9 +29,9 @@
{
"title": "Lab 6: Analytics",
- "filename": "../../06-analytics-hcm/analytics.md"
+ "filename": "../../06-analytics/analytics.md"
},
-
+
{
"title": "Need Help?",
"description": "Solutions to Common Problems and Directions for Receiving Live Help",
diff --git a/oci-apm-getstarted/00-introduction/introduction.md b/oci-apm-getstarted/00-introduction/introduction.md
index 194dda025..01cd8c727 100644
--- a/oci-apm-getstarted/00-introduction/introduction.md
+++ b/oci-apm-getstarted/00-introduction/introduction.md
@@ -12,6 +12,8 @@ Estimated Time: 80 minutes
Watch the video below for a quick walk-through of the lab.
[Exploring Oracle Cloud Infrastructure Application Performance Management](videohub:1_4814a932)
+## Task 1: Know before you run
+
### About Oracle Cloud Infrastructure Application Performance Management (OCI APM)
The diagram below provides an overview of the OCI APM Service, its features, components, and some of the other OCI services it integrates with.
@@ -52,4 +54,4 @@ In this workshop, you will:
- **Contributors** - Steven Lemme, Senior Principal Product Manager,
Anand Prabhu, Sr. Member of Technical Staff,
Avi Huber, Vice President, Product Management
-- **Last Updated By/Date** - Yutaka Takatsu, June 2024
+- **Last Updated By/Date** - Yutaka Takatsu, December 2024
diff --git a/oci-apm-getstarted/02-examine-alarms/examine-alarms.md b/oci-apm-getstarted/02-examine-alarms/examine-alarms.md
index f59e288af..8a4f360fa 100644
--- a/oci-apm-getstarted/02-examine-alarms/examine-alarms.md
+++ b/oci-apm-getstarted/02-examine-alarms/examine-alarms.md
@@ -60,4 +60,4 @@ You may now **proceed to the next lab**.
- **Contributors** - Steven Lemme, Senior Principal Product Manager,
Anand Prabhu, Sr. Member of Technical Staff,
Avi Huber, Vice President, Product Management
-* **Last Updated By/Date** - Yutaka Takatsu, June 2024
+* **Last Updated By/Date** - Yutaka Takatsu, December 2024
diff --git a/oci-apm-getstarted/03-examine-monitors/examine-monitors.md b/oci-apm-getstarted/03-examine-monitors/examine-monitors.md
index c02f8dd0d..94dc4a947 100644
--- a/oci-apm-getstarted/03-examine-monitors/examine-monitors.md
+++ b/oci-apm-getstarted/03-examine-monitors/examine-monitors.md
@@ -74,4 +74,4 @@ You may now **proceed to the next lab**.
- **Contributors** - Steven Lemme, Senior Principal Product Manager,
Anand Prabhu, Sr. Member of Technical Staff,
Avi Huber, Vice President, Product Management
-* **Last Updated By/Date** - Yutaka Takatsu, June 2024
+* **Last Updated By/Date** - Yutaka Takatsu, December 2024
diff --git a/oci-apm-getstarted/04-monitor-details/monitor-details.md b/oci-apm-getstarted/04-monitor-details/monitor-details.md
index 7501d1b7e..a9f57e341 100644
--- a/oci-apm-getstarted/04-monitor-details/monitor-details.md
+++ b/oci-apm-getstarted/04-monitor-details/monitor-details.md
@@ -93,4 +93,4 @@ You may now **proceed to the next lab**.
- **Contributors** - Steven Lemme, Senior Principal Product Manager,
Anand Prabhu, Sr. Member of Technical Staff,
Avi Huber, Vice President, Product Management
-* **Last Updated By/Date** - Yutaka Takatsu, June 2024
+* **Last Updated By/Date** - Yutaka Takatsu, December 2024
diff --git a/oci-apm-getstarted/05-explore-trace-data/explore-trace-data.md b/oci-apm-getstarted/05-explore-trace-data/explore-trace-data.md
index 42cc966f0..ca20c4f9e 100644
--- a/oci-apm-getstarted/05-explore-trace-data/explore-trace-data.md
+++ b/oci-apm-getstarted/05-explore-trace-data/explore-trace-data.md
@@ -144,10 +144,10 @@ Estimated time: 15 minutes
>**Note:** You can use in context drill down to the database services, by clicking the **OPSCI** or **PerfHub** buttons in the **Available Drill downs** section.
-9. Click **Close**, then click the **Trace Explorer** link from the breadcrumb to go back to the Trace Explorer main page.
+9. Click **Close** in the Span details view, then click another **Close** in the Trace details page to go back to the Trace Explorer main page.
- 
+ 
## Task 4: Inspect the SQL spans by executions
@@ -157,7 +157,7 @@ Estimated time: 15 minutes
-2. Verify that the SQL that comes at the top of the list, is the same SQL, which you found as a bottleneck in the previous steps. The view is sorted by the slowest average duration. Next, let's check whether the SQL is always slow or not. Click the **Count** column of the SQL on the top row.
+2. Verify that the SQL that comes at the top of the list, is the same update statement, which you found as a bottleneck in the previous steps. The view is sorted by the slowest average duration. Next, let's check whether the SQL is always slow or not. Click the **Count** column of the SQL on the top row.
3. You can see each of the individual executions of the SQL. Confirm that the SQL is not always slow when executed. Scroll down the list as needed.
@@ -220,4 +220,4 @@ You may now **proceed to the next lab**.
- **Contributors** - Steven Lemme, Senior Principal Product Manager,
Anand Prabhu, Sr. Member of Technical Staff,
Avi Huber, Vice President, Product Management
-* **Last Updated By/Date** - Yutaka Takatsu, June 2024
+* **Last Updated By/Date** - Yutaka Takatsu, December 2024
diff --git a/oci-apm-getstarted/05-explore-trace-data/images/1-22-click-tx-link.png b/oci-apm-getstarted/05-explore-trace-data/images/1-22-click-tx-link.png
deleted file mode 100644
index 5fcaf2462..000000000
Binary files a/oci-apm-getstarted/05-explore-trace-data/images/1-22-click-tx-link.png and /dev/null differ
diff --git a/oci-apm-getstarted/05-explore-trace-data/images/1-22-tracedetails-close.png b/oci-apm-getstarted/05-explore-trace-data/images/1-22-tracedetails-close.png
new file mode 100644
index 000000000..3ac03e1ab
Binary files /dev/null and b/oci-apm-getstarted/05-explore-trace-data/images/1-22-tracedetails-close.png differ
diff --git a/oci-apm-getstarted/06-save-search/save-search.md b/oci-apm-getstarted/06-save-search/save-search.md
index 5bf56e03c..48a1fbae3 100644
--- a/oci-apm-getstarted/06-save-search/save-search.md
+++ b/oci-apm-getstarted/06-save-search/save-search.md
@@ -123,4 +123,4 @@ You may now **proceed to the next lab**.
- **Contributors** - Steven Lemme, Senior Principal Product Manager,
Anand Prabhu, Sr. Member of Technical Staff,
Avi Huber, Vice President, Product Management
-* **Last Updated By/Date** - Yutaka Takatsu, June 2024
+* **Last Updated By/Date** - Yutaka Takatsu, December 2024
diff --git a/oci-apm-getstarted/07-create-dashboard/create-dashboard.md b/oci-apm-getstarted/07-create-dashboard/create-dashboard.md
index 673843eae..b72e2bf39 100644
--- a/oci-apm-getstarted/07-create-dashboard/create-dashboard.md
+++ b/oci-apm-getstarted/07-create-dashboard/create-dashboard.md
@@ -183,7 +183,8 @@ At present, the widget displays the default query. You can change the query depe
> **Note:** You can change the widget layout by pressing and holding the two bars icon of a widget and dragging and dropping to the desired location. 
-14. In the **Widgets** tab, **Widget label** field, change the label from CTDW Apdex to **Apdex**. Note that the Widget title also changes to Apdex.
+14. In the **Widgets** tab, expand **CTDW Apdex**, then in the **Widget label** field, change the label from CTDW Apdex to **Apdex**. Note that the Widget title also changes to Apdex.
+ 
15. In the **Configured Widget inputs** section, locate the first query **Show traces count(apdexLevel)..**. Click the pencil icon next to the query to edit this query.
@@ -320,4 +321,4 @@ At present, the widget displays the default query. You can change the query depe
- **Contributors** - Steven Lemme, Senior Principal Product Manager,
Anand Prabhu, Sr. Member of Technical Staff,
Avi Huber, Vice President, Product Management
-* **Last Updated By/Date** - Yutaka Takatsu, June 2024
+* **Last Updated By/Date** - Yutaka Takatsu, December 2024
diff --git a/oci-apm-getstarted/07-create-dashboard/images/7-5-13a-expand-ctdw-apdex.png b/oci-apm-getstarted/07-create-dashboard/images/7-5-13a-expand-ctdw-apdex.png
new file mode 100644
index 000000000..a5aa77b7e
Binary files /dev/null and b/oci-apm-getstarted/07-create-dashboard/images/7-5-13a-expand-ctdw-apdex.png differ
diff --git a/oci-apm-getstarted/08-construct-query/construct-query.md b/oci-apm-getstarted/08-construct-query/construct-query.md
index c341af9e5..35184156b 100644
--- a/oci-apm-getstarted/08-construct-query/construct-query.md
+++ b/oci-apm-getstarted/08-construct-query/construct-query.md
@@ -141,11 +141,7 @@ Queries can be also modified by adding a filter, to narrow down the traces to me
In the web-based shopping cart application that is monitored by APM, users are expected to run a transaction having a series of steps to complete the purchase. In this environment, the buying process is covered through Journey data. The customer journey steps are defined as the following.
- * 0-search
- * 1-logged-in
- * 2-addToCart
- * 3-checkedOut
- * 4-orderConfirmed
+ 0-search,1-logged-in, 2-addToCart, 3-checkedOut and 4-orderConfirmed
At present, the query retrieves all session data regardless of whether the user completed the transaction or aborted it.
@@ -195,12 +191,14 @@ To fix the invalidated data in the query, we can move out the condition that was
1. Update the query by inserting the below statement right before the **WHERE** clause.
-
+ ``` bash
+
,case when(
sum(case when (JourneyPhase = '4-orderConfirmed')
then 1 else 0 end)
)>0 then 'reached' else '0' end as step4
-
+
+ ```
Explanations:
* The **CASE** expression returns a value when the first condition is met.
@@ -213,7 +211,11 @@ To fix the invalidated data in the query, we can move out the condition that was
2. Next, insert a **HAVING** clause right before the **ORDER BY** statement.
- having sum(case when (JourneyPhase = '4-orderConfirmed') then 1 else 0 end) >0
+ ``` bash
+
+ having sum(case when (JourneyPhase = '4-orderConfirmed') then 1 else 0 end) >0
+
+ ```
Explanations:
* The **HAVING** statement filters the record from the group based on the specified condition.
@@ -251,9 +253,13 @@ In some cases, you may want to know whether a user made a click action on Web UI
1. Update the query by inserting the below statement right before the **WHERE** clause.
- , case when(
- sum(case when (ApmrumClickElementId='/html/body/app-root/app-prod-list/div/div[3]/div[4]/mat-card/mat-card-actions/button/span') then 1 else 0 end)
- )>0 then 'clicked' else '-' end as Button
+ ``` bash
+
+ , case when(
+ sum(case when (ApmrumClickElementId='/html/body/app-root/app-prod-list/div/div[3]/div[4]/mat-card/mat-card-actions/button/span') then 1 else 0 end)
+ )>0 then 'clicked' else '-' end as Button
+
+ ```
Explanations:
@@ -288,13 +294,17 @@ With the information on the button click, you may want to get an understanding o
1. Update the query by inserting the below statements right before the first **CASE** statement.
- min(case when(JourneyPhase = '2-addToCart')
- then TraceLatestSpanEndTime end) - min(TraceFirstSpanStartTime)
- as "time to addToCart",
+ ``` bash
+
+ min(case when(JourneyPhase = '2-addToCart')
+ then TraceLatestSpanEndTime end) - min(TraceFirstSpanStartTime)
+ as "time to addToCart",
- min(case when(JourneyPhase = '3-checkedOut')
- then TraceLatestSpanEndTime end) - min(TraceFirstSpanStartTime)
- as "time to checkOut",
+ min(case when(JourneyPhase = '3-checkedOut')
+ then TraceLatestSpanEndTime end) - min(TraceFirstSpanStartTime)
+ as "time to checkOut",
+
+ ```
Explanations:
* The **CASE** expression returns a value when the first condition is met.
@@ -303,7 +313,11 @@ With the information on the button click, you may want to get an understanding o
2. Next, modify the **ORDER BY** statement as shown below, so that the results are sorted based on the **Duration**.
- order by max(TraceLatestSpanEndTime) - min(TraceFirstSpanStartTime) desc
+ ``` bash
+
+ order by max(TraceLatestSpanEndTime) - min(TraceFirstSpanStartTime) desc
+
+ ```
Explanations:
* An expression **max(TraceLatestSpanEndTime) - min(TraceFirstSpanStartTime)** determines the duration of the session.
@@ -352,4 +366,4 @@ Anand Prabhu, Sr. Member of Technical Staff,
Robert Brouwer, Consulting Member of Technical Staff,
Jurgen Leijer, Senior Product Strategy Director, Management Cloud,
Avi Huber, Vice President, Product Management
-* **Last Updated By/Date** - Yutaka Takatsu, June 2024
+* **Last Updated By/Date** - Yutaka Takatsu, December 2024
diff --git a/oci-apm-getstarted/workshops/ocw23-sandbox/manifest.json b/oci-apm-getstarted/workshops/ocw23-sandbox/manifest.json
deleted file mode 100644
index 0a72124b0..000000000
--- a/oci-apm-getstarted/workshops/ocw23-sandbox/manifest.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
- "workshoptitle": "Get started with OCI APM for Kubernetes and microservices based applications",
- "help": "livelabs-help-em_us@oracle.com",
- "tutorials": [
- {
- "title": "Introduction",
- "description": "Introduction",
- "filename": "../../00-introduction/introduction.md"
- },
- {
- "title": "Get Started",
- "description": "This is the prerequisites for customers using Free Trial and Paid tenancies, and Always Free accounts (if applicable). The title of the lab and the Contents Menu title (the title above) match for Prerequisite lab. This lab is always first.",
- "filename": "https://oracle-livelabs.github.io/common/labs/cloud-login/cloud-login-livelabs2.md"
- },
- {
- "title": "Lab 1: Access the APM workshop environment",
- "description": "Access the APM workshop environment",
- "filename": "../../01-access-env/access-env.md"
- },
-
- {
- "title": "Lab 2: Examine APM Alarms",
- "description": "Examine APM Alarms",
- "filename": "../../02-examine-alarms/examine-alarms.md"
- },
- {
- "title": "Lab 3: Examine APM Monitors",
- "description": "Examine APM Monitors",
- "filename": "../../03-examine-monitors/examine-monitors.md"
- },
-
- {
- "title": "Lab 4: Explore Monitor Details and History",
- "description": "Explore Monitor Details and History",
- "filename": "../../04-monitor-details/monitor-details.md"
- },
- {
- "title": "Lab 5: Explore APM Trace Data",
- "description": "Explore APM Trace Data",
- "filename": "../../05-explore-trace-data/explore-trace-data.md"
- },
-
- {
- "title": "Lab 6: Save a custom query",
- "description": "Save the query and add to a query bar",
- "filename": "../../06-save-search/save-search.md"
- },
- {
- "title": "Lab 7: Create a custom dashboard",
- "description": "Create chart from the saved query and add it to a custom dashboard",
- "filename": "../../07-create-dashboard/create-dashboard.md"
- },
- {
- "title": "Lab 8: Construct complex queries",
- "description": "Construct complex queries",
- "filename": "../../08-construct-query/construct-query.md"
- },
- {
- "title": "Need Help?",
- "description": "Solutions to Common Problems and Directions for Receiving Live Help",
- "filename": "https://oracle-livelabs.github.io/common/labs/need-help/need-help-livelabs.md"
- },
- {
- "title": "Oracle CloudWorld 2023 - Support",
- "filename": "https://oracle-livelabs.github.io/common/support/ocwsupportlab/ocwsupportlab.md"
- }
-
- ]
-}
diff --git a/oci-apm-getstarted/workshops/ocw23-tenancy/index.html b/oci-apm-getstarted/workshops/ocw23-tenancy/index.html
deleted file mode 100644
index 6acdb69d1..000000000
--- a/oci-apm-getstarted/workshops/ocw23-tenancy/index.html
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
-
-
-
-
- Oracle LiveLabs
-
-
-
-
-
-
-
-
-
-
-
-
-
Oracle LiveLabs
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/oci-apm-getstarted/workshops/ocw23-tenancy/manifest.json b/oci-apm-getstarted/workshops/ocw23-tenancy/manifest.json
deleted file mode 100644
index aba77c090..000000000
--- a/oci-apm-getstarted/workshops/ocw23-tenancy/manifest.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
- "workshoptitle": "Get started with OCI APM for Kubernetes and microservices based applications",
- "help": "livelabs-help-em_us@oracle.com",
- "tutorials": [
- {
- "title": "Introduction",
- "description": "Introduction",
- "filename": "../../00-introduction/introduction.md"
- },
- {
- "title": "Get Started",
- "description": "This is the prerequisites for customers using Free Trial and Paid tenancies, and Always Free accounts (if applicable). The title of the lab and the Contents Menu title (the title above) match for Prerequisite lab. This lab is always first.",
- "filename": "https://oracle-livelabs.github.io/common/labs/cloud-login/cloud-login.md"
- },
- {
- "title": "Lab 1: Access the APM workshop environment",
- "description": "Access the APM workshop environment",
- "filename": "../../01-access-env/access-env.md"
- },
-
- {
- "title": "Lab 2: Examine APM Alarms",
- "description": "Examine APM Alarms",
- "filename": "../../02-examine-alarms/examine-alarms.md"
- },
- {
- "title": "Lab 3: Examine APM Monitors",
- "description": "Examine APM Monitors",
- "filename": "../../03-examine-monitors/examine-monitors.md"
- },
-
- {
- "title": "Lab 4: Explore Monitor Details and History",
- "description": "Explore Monitor Details and History",
- "filename": "../../04-monitor-details/monitor-details.md"
- },
- {
- "title": "Lab 5: Explore APM Trace Data",
- "description": "Explore APM Trace Data",
- "filename": "../../05-explore-trace-data/explore-trace-data.md"
- },
- {
- "title": "Lab 6: Save a custom query",
- "description": "Save the query and add to a query bar",
- "filename": "../../06-save-search/save-search.md"
- },
- {
- "title": "Lab 7: Create a custom dashboard",
- "description": "Create chart from the saved query and add it to a custom dashboard",
- "filename": "../../07-create-dashboard/create-dashboard.md"
- },
- {
- "title": "Lab 8: Construct complex queries",
- "description": "Construct complex queries",
- "filename": "../../08-construct-query/construct-query.md"
- },
- {
- "title": "Need Help?",
- "description": "Solutions to Common Problems and Directions for Receiving Live Help",
- "filename": "https://oracle-livelabs.github.io/common/labs/need-help/need-help-livelabs.md"
- },
- {
- "title": "Oracle CloudWorld 2023 - Support",
- "filename": "https://oracle-livelabs.github.io/common/support/ocwsupportlab/ocwsupportlab.md"
- }
- ]
-}
diff --git a/oci-apm-helidon/0-introduction/introduction.md b/oci-apm-helidon/0-introduction/introduction.md
index 245e213e8..26a917462 100644
--- a/oci-apm-helidon/0-introduction/introduction.md
+++ b/oci-apm-helidon/0-introduction/introduction.md
@@ -4,17 +4,19 @@
This workshop walks you through how to:
-* Enable OpenTracing for a Java microservice-based Helidon SE application using Oracle Application Performance Monitoring (APM)
+* Enable OpenTracing for a Java microservice-based Helidon SE application using Oracle Application Performance Monitoring (APM)
* Trace the workflow within a service and across multiple services
-* Use the Helidon SE application and its build instructions, described in the **[Helidon SE Tracing Guide](https://helidon.io/docs/latest/#/se/guides/06_tracing)**.
+* Use the Helidon SE application and its build instructions, described in the **[Helidon SE Tracing Guide](https://helidon.io/docs/v4/se/guides/tracing)**.
-Estimated Workshop Time: 60 minutes
+Estimated Workshop Time: 40 minutes
+
+## Task 1: Know before you run
### About Oracle Cloud Infrastructure Application Performance Management (OCI APM)
The diagram below provides an overview of the OCI APM Service, its features, components, and some of the other OCI services it integrates with.
- 
+ 
Among other capabilities, OCI APM includes an implementation of a Distributed Tracing system. It collects and processes transaction trace data (spans) from the monitored application and makes it available for viewing, dashboarding, exploration, alerts, etc. For more information on APM and Trace Explorer please refer to Application Performance Monitoring > **[Use Trace Explorer](https://docs.oracle.com/en-us/iaas/application-performance-monitoring/doc/use-trace-explorer.html)** section in the OCI Documentation.
@@ -36,17 +38,12 @@ In this workshop, you will:
* An Oracle Cloud Account
### Reference
-* Helidon SE Tracing Guide, Helidon Documentation Version:(2.3.3), URL: https://helidon.io/docs/latest/#/se/guides/06_tracing
+* Helidon SE Tracing Guide, Helidon Documentation Version:(4.1.5), URL: https://helidon.io/docs/v4/se/guides/tracing
-### More APM Workshops
-* Please visit: **[APM LiveLabs workshops](https://livelabs.oracle.com/pls/apex/f?p=133:100:111996377805307::::SEARCH:application+Performance+monitoring)**.
-### Learn More
-- **[Create an APM Domain](https://docs.oracle.com/en-us/iaas/application-performance-monitoring/doc/create-apm-domain.html)**
-- **[Obtain Data Upload Endpoint and Data Keys](https://docs.oracle.com/en-us/iaas/application-performance-monitoring/doc/obtain-data-upload-endpoint-and-data-keys.html)**
-- **[Configure Application Performance Monitoring Data Sources](https://docs.oracle.com/en-us/iaas/application-performance-monitoring/doc/configure-application-performance-monitoring-data-sources.html)**
-- **[Use Trace Explorer](https://docs.oracle.com/en-us/iaas/application-performance-monitoring/doc/use-trace-explorer.html)**
+### More APM Workshops
+* Please visit: **[APM LiveLabs workshops](https://livelabs.oracle.com/pls/apex/f?p=133:100:111996377805307::::SEARCH:application+Performance+monitoring)**.
You may now **proceed to the next lab**.
@@ -57,4 +54,4 @@ You may now **proceed to the next lab**.
- **Contributors** - Steven Lemme, Senior Principal Product Manager,
Anand Prabhu, Sr. Member of Technical Staff,
Avi Huber, Vice President, Product Management
-- **Last Updated By/Date** - Yutaka Takatsu, December, 2022
+- **Last Updated By/Date** - Yutaka Takatsu, December 2024
diff --git a/oci-apm-helidon/09-learn-more/learn-more.md b/oci-apm-helidon/09-learn-more/learn-more.md
deleted file mode 100644
index e1927b619..000000000
--- a/oci-apm-helidon/09-learn-more/learn-more.md
+++ /dev/null
@@ -1,67 +0,0 @@
-# Learn more about APM
-
-## Introduction
-
-Congratulations! You have completed the workshop.
-
-To learn more about APM, please visit **Get started with Oracle Cloud Application Performance Monitoring** workshop.
-
- 
- 
-
-In this workshop, you will learn how to use Oracle Cloud APM to examine critical performance alarms, view synthetic monitors in a dashboard to analyze the trend and identify spikes, observe the monitor's client-side details in HTTP Archive (HAR) file, and explore the server-side details by tracing data in APM Trace Explorer.
-
-### Objectives
-
-* Review APM alarms
-* Examine APM synthetic monitors
-* Explore monitor details and their history
-* Perform exploration of application trace data
-
-### Prerequisites
-
-* Familiarity with distributed tracing is helpful, but not required
-* Familiarity with Oracle Cloud is helpful
-
-## Task 1: Access the workshop
-
-1. Click the link following URL to access the workshop: **[Get started with Oracle Cloud APM](https://livelabs.oracle.com/pls/apex/r/dbpm/livelabs/view-workshop?wec=2681-VVAB-USGL-IJWF)** Workshop.
-Alternatively, open a new browser tab, copy the following URL, paste it to the address bar, and hit enter.
-
- ``` bash
-
- https://livelabs.oracle.com/pls/apex/r/dbpm/livelabs/view-workshop?wec=2681-VVAB-USGL-IJWF
-
- ```
-
-2. Login with an Oracle account.
-
- 
-
- >**Note:** If you do not have an account or forgot your Oracle account credentials, please refer to the next lab, **Oracle CloudWorld 2022 - Get Help**, section **Your Oracle Account**.
-
-3. Enter the code you got for two-factor authentication.
-
- 
-
-4. Workshop home page opens. Click the **Start** button.
-
- 
-
- >**Note:** The event code for the workshop is **2681-VVAB-USGL-IJWF**, however, you do not need to re-enter it, because it is already included in the URL.
-
-5. Click **Run on LiveLabs SandBox**.
-
- 
-
-6. Check the checkbox, click **Submit Reservation**, and follow the instructions to reserve the workshop.
-
- 
-
-## Acknowledgements
-
-* **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
-- **Contributors** - Steven Lemme, Senior Principal Product Manager,
-Anand Prabhu, Sr. Member of Technical Staff,
-Avi Huber, Vice President, Product Management
-* **Last Updated By/Date** - Yutaka Takatsu, October 2022
diff --git a/oci-apm-helidon/1-create-domain/create-domain.md b/oci-apm-helidon/1-create-domain/create-domain.md
index bcd90a8c8..0ff74a292 100644
--- a/oci-apm-helidon/1-create-domain/create-domain.md
+++ b/oci-apm-helidon/1-create-domain/create-domain.md
@@ -72,4 +72,4 @@ You may now **proceed to the next lab**.
- **Contributors** - Steven Lemme, Senior Principal Product Manager,
Anand Prabhu, Sr. Member of Technical Staff,
Avi Huber, Vice President, Product Management
-* **Last Updated By/Date** - Yutaka Takatsu, August 2022
+* **Last Updated By/Date** - Yutaka Takatsu, December 2024
diff --git a/oci-apm-helidon/1-create-domain/images/1-1-compartments.png b/oci-apm-helidon/1-create-domain/images/1-1-compartments.png
index 33a07053d..fb80d85c0 100644
Binary files a/oci-apm-helidon/1-create-domain/images/1-1-compartments.png and b/oci-apm-helidon/1-create-domain/images/1-1-compartments.png differ
diff --git a/oci-apm-helidon/1-create-domain/images/1-2-compartments.png b/oci-apm-helidon/1-create-domain/images/1-2-compartments.png
index 4e394df0d..80f5f21e8 100644
Binary files a/oci-apm-helidon/1-create-domain/images/1-2-compartments.png and b/oci-apm-helidon/1-create-domain/images/1-2-compartments.png differ
diff --git a/oci-apm-helidon/1-create-domain/images/1-3-compartments.png b/oci-apm-helidon/1-create-domain/images/1-3-compartments.png
index 447b5d682..1399fd117 100644
Binary files a/oci-apm-helidon/1-create-domain/images/1-3-compartments.png and b/oci-apm-helidon/1-create-domain/images/1-3-compartments.png differ
diff --git a/oci-apm-helidon/1-create-domain/images/1-4-compartments.png b/oci-apm-helidon/1-create-domain/images/1-4-compartments.png
index d0aefcd0b..d43476138 100644
Binary files a/oci-apm-helidon/1-create-domain/images/1-4-compartments.png and b/oci-apm-helidon/1-create-domain/images/1-4-compartments.png differ
diff --git a/oci-apm-helidon/1-create-domain/images/2-1-domain.png b/oci-apm-helidon/1-create-domain/images/2-1-domain.png
index 782aef2b9..140b9b29b 100644
Binary files a/oci-apm-helidon/1-create-domain/images/2-1-domain.png and b/oci-apm-helidon/1-create-domain/images/2-1-domain.png differ
diff --git a/oci-apm-helidon/1-create-domain/images/2-3-domain.png b/oci-apm-helidon/1-create-domain/images/2-3-domain.png
index e31629bd8..901dc020f 100644
Binary files a/oci-apm-helidon/1-create-domain/images/2-3-domain.png and b/oci-apm-helidon/1-create-domain/images/2-3-domain.png differ
diff --git a/oci-apm-helidon/1-create-domain/images/2-4-domain.png b/oci-apm-helidon/1-create-domain/images/2-4-domain.png
index 4fecedfa0..76e569064 100644
Binary files a/oci-apm-helidon/1-create-domain/images/2-4-domain.png and b/oci-apm-helidon/1-create-domain/images/2-4-domain.png differ
diff --git a/oci-apm-helidon/1-create-domain/images/2-5-domain.png b/oci-apm-helidon/1-create-domain/images/2-5-domain.png
index 1e9ccdef0..4290cbe79 100644
Binary files a/oci-apm-helidon/1-create-domain/images/2-5-domain.png and b/oci-apm-helidon/1-create-domain/images/2-5-domain.png differ
diff --git a/oci-apm-helidon/1-create-domain/images/3-1-domain.png b/oci-apm-helidon/1-create-domain/images/3-1-domain.png
index 8982ad017..1dd4ed31a 100644
Binary files a/oci-apm-helidon/1-create-domain/images/3-1-domain.png and b/oci-apm-helidon/1-create-domain/images/3-1-domain.png differ
diff --git a/oci-apm-helidon/1-create-domain/images/3-2-domain.png b/oci-apm-helidon/1-create-domain/images/3-2-domain.png
index 454810a58..571b5edaa 100644
Binary files a/oci-apm-helidon/1-create-domain/images/3-2-domain.png and b/oci-apm-helidon/1-create-domain/images/3-2-domain.png differ
diff --git a/oci-apm-helidon/2-setup-helidon/images/1-2-cloudshell-check-versions.png b/oci-apm-helidon/2-setup-helidon/images/1-2-cloudshell-check-versions.png
index 7aae6e150..3c2932a8f 100644
Binary files a/oci-apm-helidon/2-setup-helidon/images/1-2-cloudshell-check-versions.png and b/oci-apm-helidon/2-setup-helidon/images/1-2-cloudshell-check-versions.png differ
diff --git a/oci-apm-helidon/2-setup-helidon/images/1-3-cloudshell-menu.png b/oci-apm-helidon/2-setup-helidon/images/1-3-cloudshell-menu.png
deleted file mode 100644
index 46de26b22..000000000
Binary files a/oci-apm-helidon/2-setup-helidon/images/1-3-cloudshell-menu.png and /dev/null differ
diff --git a/oci-apm-helidon/2-setup-helidon/images/1-4-cloudshell-switch-architecture.png b/oci-apm-helidon/2-setup-helidon/images/1-4-cloudshell-switch-architecture.png
deleted file mode 100644
index e87b85b67..000000000
Binary files a/oci-apm-helidon/2-setup-helidon/images/1-4-cloudshell-switch-architecture.png and /dev/null differ
diff --git a/oci-apm-helidon/2-setup-helidon/images/1-5-cloudshell-switch-confirm.png b/oci-apm-helidon/2-setup-helidon/images/1-5-cloudshell-switch-confirm.png
deleted file mode 100644
index 45b43e66d..000000000
Binary files a/oci-apm-helidon/2-setup-helidon/images/1-5-cloudshell-switch-confirm.png and /dev/null differ
diff --git a/oci-apm-helidon/2-setup-helidon/images/2-1-java.png b/oci-apm-helidon/2-setup-helidon/images/2-1-java.png
deleted file mode 100644
index c558c5023..000000000
Binary files a/oci-apm-helidon/2-setup-helidon/images/2-1-java.png and /dev/null differ
diff --git a/oci-apm-helidon/2-setup-helidon/images/2-4-java-version.png b/oci-apm-helidon/2-setup-helidon/images/2-4-java-version.png
new file mode 100644
index 000000000..f2cf885f5
Binary files /dev/null and b/oci-apm-helidon/2-setup-helidon/images/2-4-java-version.png differ
diff --git a/oci-apm-helidon/2-setup-helidon/images/3-1-generat-helidon.png b/oci-apm-helidon/2-setup-helidon/images/3-1-generat-helidon.png
new file mode 100644
index 000000000..9a341eeae
Binary files /dev/null and b/oci-apm-helidon/2-setup-helidon/images/3-1-generat-helidon.png differ
diff --git a/oci-apm-helidon/2-setup-helidon/images/3-1-helidon.png b/oci-apm-helidon/2-setup-helidon/images/3-1-helidon.png
deleted file mode 100644
index 39e72f604..000000000
Binary files a/oci-apm-helidon/2-setup-helidon/images/3-1-helidon.png and /dev/null differ
diff --git a/oci-apm-helidon/2-setup-helidon/images/3-2-helidon.png b/oci-apm-helidon/2-setup-helidon/images/3-2-helidon.png
deleted file mode 100644
index 8acc97a59..000000000
Binary files a/oci-apm-helidon/2-setup-helidon/images/3-2-helidon.png and /dev/null differ
diff --git a/oci-apm-helidon/2-setup-helidon/images/3-3-helidon.png b/oci-apm-helidon/2-setup-helidon/images/3-3-helidon.png
deleted file mode 100644
index 65bbc3c95..000000000
Binary files a/oci-apm-helidon/2-setup-helidon/images/3-3-helidon.png and /dev/null differ
diff --git a/oci-apm-helidon/2-setup-helidon/images/3-3-maven-package.png b/oci-apm-helidon/2-setup-helidon/images/3-3-maven-package.png
new file mode 100644
index 000000000..8f36798b3
Binary files /dev/null and b/oci-apm-helidon/2-setup-helidon/images/3-3-maven-package.png differ
diff --git a/oci-apm-helidon/2-setup-helidon/images/3-4-maven-version.png b/oci-apm-helidon/2-setup-helidon/images/3-4-maven-version.png
new file mode 100644
index 000000000..8108bd6a1
Binary files /dev/null and b/oci-apm-helidon/2-setup-helidon/images/3-4-maven-version.png differ
diff --git a/oci-apm-helidon/2-setup-helidon/images/3-5-verify-message.png b/oci-apm-helidon/2-setup-helidon/images/3-5-verify-message.png
new file mode 100644
index 000000000..8302e282e
Binary files /dev/null and b/oci-apm-helidon/2-setup-helidon/images/3-5-verify-message.png differ
diff --git a/oci-apm-helidon/2-setup-helidon/images/4-1-helidon.png b/oci-apm-helidon/2-setup-helidon/images/4-1-helidon.png
deleted file mode 100644
index b1237fea0..000000000
Binary files a/oci-apm-helidon/2-setup-helidon/images/4-1-helidon.png and /dev/null differ
diff --git a/oci-apm-helidon/2-setup-helidon/images/4-1-hello-joe.png b/oci-apm-helidon/2-setup-helidon/images/4-1-hello-joe.png
new file mode 100644
index 000000000..08d910f34
Binary files /dev/null and b/oci-apm-helidon/2-setup-helidon/images/4-1-hello-joe.png differ
diff --git a/oci-apm-helidon/2-setup-helidon/setup-helidon.md b/oci-apm-helidon/2-setup-helidon/setup-helidon.md
index d85eb11e6..955044b0b 100644
--- a/oci-apm-helidon/2-setup-helidon/setup-helidon.md
+++ b/oci-apm-helidon/2-setup-helidon/setup-helidon.md
@@ -23,7 +23,7 @@ Watch the video below for a quick walk-through of the lab.
* An Oracle Free Tier, Always Free, or a Paid Cloud Account
-## Task 1: Launch the Cloud Shell and verify Helidon prerequisites
+## Task 1: Launch the Cloud Shell and install Helidon prerequisites
1. Launch the Oracle Cloud Shell from the Oracle Cloud Console by selecting the **Developer tools** icon, then select **Cloud Shell**.
@@ -31,71 +31,78 @@ Watch the video below for a quick walk-through of the lab.
-2. Helidon requires Java 11 (or newer) and Maven 3.6.1. Verify the versions by running the following commands.
+2. Helidon 4.1.5 requires Java 21+ and Maven 3.8+. Verify the versions by running the following commands.
``` bash
- java -version
-
- ```
- ``` bash
-
- mvn -version
+ java -version; mvn -v
```
- If the Maven version is not 3.6.1, you can install it in the next task.
-
- >**Note:** Paid tier users can switch the Cloud shell architecture from the default ARM to **X64\_64**, with Maven 3.6.1 and Java 11 preinstalled. Select **Actions** from the menu, then select **Architecture**.
-
-Select **x86_64** and click **Confirm and Restart**
-
-Vefify the Java and Maven versions.
-
-You can skip the Task 2 and go to the Task 3.
-
+ As of December 2024, ARM Cloud Shell has Maven 3.5.0, and Java 11. You can install required versions of Java and Maven manually to complete this workshop in the next task.
+## Task 2: Install Java 23
-## Task 2: Install Maven 3.6.1
-
-As of June 2024, ARM Cloud Shell has Maven 3.5.0, and Java 11. Free tier users can install Maven 3.6.1 manually to complete this workshop.
+1. Download Java 23 (JDK Development Kit 23.01 for ARM 64)
+ ``` bash
+
+ curl -sLO https://download.oracle.com/java/23/latest/jdk-23_linux-aarch64_bin.tar.gz
+
+ ```
+2. Unzip the file and install Java
+ ``` bash
+
+ tar zxvf jdk-23_linux-aarch64_bin.tar.gz
+
+ ```
+3. Add to the Path
+ ``` bash
+
+ export JAVA_HOME=~/jdk-23.0.1
+ export PATH="$JAVA_HOME/bin:$PATH"
+
+ ```
-1. Download Maven 3.6.1
+4. Check the Java version to ensure it is 23.
``` bash
- curl -sLO https://archive.apache.org/dist/maven/maven-3/3.6.1/binaries/apache-maven-3.6.1-bin.tar.gz
+ java -version
```
-2. Unzip the file
+ 
+## Task 3: Install Maven 3.9.9
+
+1. Download Maven 3.9.9
``` bash
- gunzip apache-maven-3.6.1-bin.tar.gz
+ curl -sLO https://archive.apache.org/dist/maven/maven-3/3.9.9/binaries/apache-maven-3.9.9-bin.tar.gz
```
-3. Install Maven
+2. Unzip the file and install Java
``` bash
- tar xvf apache-maven-3.6.1-bin.tar
+ tar zxvf apache-maven-3.9.9-bin.tar.gz
```
-4. Add to the Path
+3. Add to the Path
``` bash
- export MVN_HOME=~/apache-maven-3.6.1
+ export MVN_HOME=~/apache-maven-3.9.9
export PATH="$MVN_HOME/bin:$PATH"
```
- e.g., export PATH="/home/labuser/apache-maven-3.6.1/bin:$PATH".
-5. Check the maven version to ensure it is 3.6.1.
+4. Check the maven version to ensure it is 3.9.9.
``` bash
mvn -v
```
+ 
+
## Task 3: Build a Helidon SE application
1. From the home directory, run the Helidon Maven archetypes to generate the Maven project.
@@ -105,13 +112,13 @@ As of June 2024, ARM Cloud Shell has Maven 3.5.0, and Java 11. Free tier users c
mvn -U archetype:generate -DinteractiveMode=false \
-DarchetypeGroupId=io.helidon.archetypes \
-DarchetypeArtifactId=helidon-quickstart-se \
- -DarchetypeVersion=2.3.2 \
+ -DarchetypeVersion=4.1.5 \
-DgroupId=io.helidon.examples \
-DartifactId=helidon-quickstart-se \
-Dpackage=io.helidon.examples.quickstart.se
```
- 
+ 
2. The archetype generates a Maven project (helidon-quickstart-se) in your current directory. Change to this directory.
@@ -123,11 +130,11 @@ As of June 2024, ARM Cloud Shell has Maven 3.5.0, and Java 11. Free tier users c
3. Build the application by running the command below:
``` bash
- mvn package
+ mvn clean package
```
The project builds an application jar for the example and saves all runtime dependencies in the target/libs directory.
- 
+ 
4. Start the application by running the application jar file.
``` bash
@@ -144,7 +151,7 @@ As of June 2024, ARM Cloud Shell has Maven 3.5.0, and Java 11. Free tier users c
more nohup.out
```
- 
+ 
## Task 4: Verify the application
@@ -157,9 +164,9 @@ As of June 2024, ARM Cloud Shell has Maven 3.5.0, and Java 11. Free tier users c
```
It should return a greeting message as in the below image.
- {"message":"Hello Joe!"}
+ {"message":"Hello Joe!"}
- 
+ 
>**Note:** For more information on Helidon prerequisites, application setup details, and test command examples, please see the Helidon Documentation, [Helidon QuickStart guide](https://helidon.io/docs/latest/#/se/guides/02_quickstart).
@@ -173,4 +180,4 @@ You may now **proceed to the next lab**.
- **Contributors** - Steven Lemme, Senior Principal Product Manager,
Anand Prabhu, Sr. Member of Technical Staff,
Avi Huber, Vice President, Product Management
-- **Last Updated By/Date** - Yutaka Takatsu, July 2024
+- **Last Updated By/Date** - Yutaka Takatsu, December 2024
diff --git a/oci-apm-helidon/3-monitor-traces/images/1-1-pomxml.png b/oci-apm-helidon/3-monitor-traces/images/1-1-pomxml.png
deleted file mode 100644
index 26e802f26..000000000
Binary files a/oci-apm-helidon/3-monitor-traces/images/1-1-pomxml.png and /dev/null differ
diff --git a/oci-apm-helidon/3-monitor-traces/images/1-2-pomxml.png b/oci-apm-helidon/3-monitor-traces/images/1-2-pomxml.png
deleted file mode 100644
index ac847ef12..000000000
Binary files a/oci-apm-helidon/3-monitor-traces/images/1-2-pomxml.png and /dev/null differ
diff --git a/oci-apm-helidon/3-monitor-traces/images/1-4-pomxml.png b/oci-apm-helidon/3-monitor-traces/images/1-4-pomxml.png
new file mode 100644
index 000000000..a44024bcf
Binary files /dev/null and b/oci-apm-helidon/3-monitor-traces/images/1-4-pomxml.png differ
diff --git a/oci-apm-helidon/3-monitor-traces/images/2-1-applicationyaml.png b/oci-apm-helidon/3-monitor-traces/images/2-1-applicationyaml.png
index c0bfc41ee..bdb36beb6 100644
Binary files a/oci-apm-helidon/3-monitor-traces/images/2-1-applicationyaml.png and b/oci-apm-helidon/3-monitor-traces/images/2-1-applicationyaml.png differ
diff --git a/oci-apm-helidon/3-monitor-traces/images/3-1-main_java.png b/oci-apm-helidon/3-monitor-traces/images/3-1-main_java.png
deleted file mode 100644
index 46be706b0..000000000
Binary files a/oci-apm-helidon/3-monitor-traces/images/3-1-main_java.png and /dev/null differ
diff --git a/oci-apm-helidon/3-monitor-traces/images/3-2-mvn-package.png b/oci-apm-helidon/3-monitor-traces/images/3-2-mvn-package.png
new file mode 100644
index 000000000..a9008fe11
Binary files /dev/null and b/oci-apm-helidon/3-monitor-traces/images/3-2-mvn-package.png differ
diff --git a/oci-apm-helidon/3-monitor-traces/images/3-4-verify-webserver-status.png b/oci-apm-helidon/3-monitor-traces/images/3-4-verify-webserver-status.png
new file mode 100644
index 000000000..e3fdbd229
Binary files /dev/null and b/oci-apm-helidon/3-monitor-traces/images/3-4-verify-webserver-status.png differ
diff --git a/oci-apm-helidon/3-monitor-traces/images/3-5-hello-joe.png b/oci-apm-helidon/3-monitor-traces/images/3-5-hello-joe.png
new file mode 100644
index 000000000..eb8fd3368
Binary files /dev/null and b/oci-apm-helidon/3-monitor-traces/images/3-5-hello-joe.png differ
diff --git a/oci-apm-helidon/3-monitor-traces/images/4-1-error-mvn.png b/oci-apm-helidon/3-monitor-traces/images/4-1-error-mvn.png
deleted file mode 100644
index ceb657e93..000000000
Binary files a/oci-apm-helidon/3-monitor-traces/images/4-1-error-mvn.png and /dev/null differ
diff --git a/oci-apm-helidon/3-monitor-traces/images/4-1-mvn.png b/oci-apm-helidon/3-monitor-traces/images/4-1-mvn.png
deleted file mode 100644
index 40a44730d..000000000
Binary files a/oci-apm-helidon/3-monitor-traces/images/4-1-mvn.png and /dev/null differ
diff --git a/oci-apm-helidon/3-monitor-traces/images/4-2-mvn.png b/oci-apm-helidon/3-monitor-traces/images/4-2-mvn.png
deleted file mode 100644
index 62fc86213..000000000
Binary files a/oci-apm-helidon/3-monitor-traces/images/4-2-mvn.png and /dev/null differ
diff --git a/oci-apm-helidon/3-monitor-traces/images/4-3-mvn.png b/oci-apm-helidon/3-monitor-traces/images/4-3-mvn.png
deleted file mode 100644
index 342f0d1cb..000000000
Binary files a/oci-apm-helidon/3-monitor-traces/images/4-3-mvn.png and /dev/null differ
diff --git a/oci-apm-helidon/3-monitor-traces/images/4-4-mvn.png b/oci-apm-helidon/3-monitor-traces/images/4-4-mvn.png
deleted file mode 100644
index 2e4a9fc19..000000000
Binary files a/oci-apm-helidon/3-monitor-traces/images/4-4-mvn.png and /dev/null differ
diff --git a/oci-apm-helidon/3-monitor-traces/images/5-1-oci_menu.png b/oci-apm-helidon/3-monitor-traces/images/5-1-oci_menu.png
index bcc0e066b..b91f6fbf5 100644
Binary files a/oci-apm-helidon/3-monitor-traces/images/5-1-oci_menu.png and b/oci-apm-helidon/3-monitor-traces/images/5-1-oci_menu.png differ
diff --git a/oci-apm-helidon/3-monitor-traces/images/5-2-trace_explorer.png b/oci-apm-helidon/3-monitor-traces/images/5-2-trace_explorer.png
deleted file mode 100644
index 3288ae94b..000000000
Binary files a/oci-apm-helidon/3-monitor-traces/images/5-2-trace_explorer.png and /dev/null differ
diff --git a/oci-apm-helidon/3-monitor-traces/images/5-3-trace_explorer.png b/oci-apm-helidon/3-monitor-traces/images/5-3-trace_explorer.png
deleted file mode 100644
index 8b4470b3c..000000000
Binary files a/oci-apm-helidon/3-monitor-traces/images/5-3-trace_explorer.png and /dev/null differ
diff --git a/oci-apm-helidon/3-monitor-traces/images/5-4-trace_explorer.png b/oci-apm-helidon/3-monitor-traces/images/5-4-trace_explorer.png
index d2d35406d..f004ad320 100644
Binary files a/oci-apm-helidon/3-monitor-traces/images/5-4-trace_explorer.png and b/oci-apm-helidon/3-monitor-traces/images/5-4-trace_explorer.png differ
diff --git a/oci-apm-helidon/3-monitor-traces/images/5-6-trace_details.png b/oci-apm-helidon/3-monitor-traces/images/5-6-trace_details.png
new file mode 100644
index 000000000..5c87ed406
Binary files /dev/null and b/oci-apm-helidon/3-monitor-traces/images/5-6-trace_details.png differ
diff --git a/oci-apm-helidon/3-monitor-traces/images/5-7-span-details.png b/oci-apm-helidon/3-monitor-traces/images/5-7-span-details.png
new file mode 100644
index 000000000..5cb4b0f7d
Binary files /dev/null and b/oci-apm-helidon/3-monitor-traces/images/5-7-span-details.png differ
diff --git a/oci-apm-helidon/3-monitor-traces/monitor-traces.md b/oci-apm-helidon/3-monitor-traces/monitor-traces.md
index a31f5cf49..2e6fc9616 100644
--- a/oci-apm-helidon/3-monitor-traces/monitor-traces.md
+++ b/oci-apm-helidon/3-monitor-traces/monitor-traces.md
@@ -2,34 +2,35 @@
## Introduction
-In this lab, you will configure APM Tracer to monitor the Helidon SE application, which you created in Lab2.
+In this lab, you will configure APM Tracer to monitor the Helidon SE application, which you created in Lab2.
-Estimated time: 15 minutes
+By default, Helidon automatically activates tracing when detects the feature is enabled in the class-path. In this lab, you will edit application's configuration files and enable tracing using APM Java Tracer. You can see the traces in the APM Trace Explorer without modifying the java code, once you re-build and access the application.
+
+Estimated time: 10 minutes
Watch the video below for a quick walk-through of the lab.
[Monitor traces and spans of the application with APM Trace Explorer](videohub:1_5ffnikzh)
### Objectives
-* Modify the pom.xml file in the Helidon application
-* Modify application.yaml file
-* Modify Main.java file
-* Rebuild application with APM Tracer configurations
-* View traces in the APM Trace Explorer
+* Modify pom.xml file in the Helidon application
+* Edit application.yaml file
+* Rebuild the application with APM Tracer configurations
+* View traces in the APM Trace Explorer
### Prerequisites
* This lab requires the completion of Lab 1 and Lab 2
-## Task 1:Modify pom.xml file in the Helidon application
+## Task 1: Modify pom.xml
1. Launch OCI Cloud Shell if not opened already.
-2. Ensure the Maven version in the path is 3.6.1.
+2. Ensure the Java version is 23 and Maven version in the path is 3.9.9. If not, run the export commands in the previous lab to add directories to the PATH variable.
``` bash
- mvn -version
+ java -version; mvn -v
```
@@ -45,27 +46,35 @@ Watch the video below for a quick walk-through of the lab.
4. At the end of the dependencies section, find a line **</dependencies>** and add the following before that line:
-
- io.helidon.tracing
- helidon-tracing
-
-
- com.oracle.apm.agent.java
- apm-java-agent-tracer
- [1.5.2118,)
-
-
- com.oracle.apm.agent.java
- apm-java-agent-helidon
- [1.0.1389,)
-
-
- 
+ ``` bash
+
+
+ io.helidon.tracing
+ helidon-tracing
+
+
+ io.helidon.webserver.observe
+ helidon-webserver-observe-tracing
+ runtime
+
+
+ io.helidon.tracing.providers
+ helidon-tracing-providers-opentracing
+
+
+ com.oracle.apm.agent.java
+ apm-java-agent-helidon4
+ [1.15.0.516,)
+
+
+ ```
+
+ 
>**Note:** Alternatively, you can use a built-in code editor to edit files. To use the code editor, select the **Developer tools** icon from the toolbar> select **Code Editor**.
-## Task 2: Modify application.yaml file
+## Task 2: Edit application.yaml
1. Change to **src/main/resources** directory, then open the **application.yaml** file with an editor tool.
@@ -84,6 +93,8 @@ Watch the video below for a quick walk-through of the lab.
private-data-key:
collect-metrics: true
collect-resources: true
+ path: /api/traces
+ enabled: true
properties:
- key: com.oracle.apm.agent.log.level
value: INFO
@@ -97,37 +108,7 @@ Watch the video below for a quick walk-through of the lab.
-
-
-## Task 3: Modify Main.java file
-
-1. Open **Main.java** with any editor.
- ``` bash
-
- vi ~/helidon-quickstart-se/src/main/java/io/helidon/examples/quickstart/se/Main.java
-
- ```
-
-2. Add the following to configure the tracer with the Helidon application.
-
- a. Add the import statement below:
- ``` bash
-
- import io.helidon.tracing.TracerBuilder;
-
- ```
- b. In the startServer method, find a line **.addMediaSupport(JsonpSupport.create())** (Line 47). Add the following above that line:
- ``` bash
-
- .tracer(TracerBuilder.create(config.get("tracing")).build())
-
- ```
-Refer to the sample image below:
-
- 
-
-
-## Task 4: Rebuild the application
+## Task 3: Rebuild the application
1. Close the previous session if running.
``` bash
@@ -149,7 +130,7 @@ Refer to the sample image below:
```
- 
+ 
3. Start the application by running the application jar file.
@@ -164,7 +145,7 @@ Refer to the sample image below:
more nohup.out
```
- 
+ 
5. Type the following command to try the application.
@@ -174,22 +155,22 @@ Refer to the sample image below:
```
Ensure it returns the greeting response as shown in the image below.
- 
+ 
## Task 5: Verify traces in APM Trace Explorer
1. From the OCI menu, select **Observability & Management** then **Trace Explorer**
-2. In the **Trace Explorer** page > **Compartment**, select **apmworkshop** from the **Compartment** and the **APM Domain** fields.
+2. In the **Trace Explorer** page, select the **Compartment** and the **APM Domain** used in the lab.
3. Under **Traces**, find a trace from the Helidon application.
4. Click the service name: **helidon-http: HTTP Request**.
- 
-5. In the **Trace Details** page, review the trace in the **Topology** view, and each span duration in the **Spans** view.
-6. Click the span: **helidon-http: HTTP Request**.
- 
-7. Examine the span parameters in the **Span Details** view.
+5. In the **Trace Details** page, observe that there are two spans. Review the trace in the **Topology** view, and each span duration in the **Spans** view.
+6. In the **Spans** section, click the root span: **helidon-http: HTTP Request**.
+ 
+7. Examine the span parameters in the **Span Details** view.
+ 
You may now **proceed to the next lab**.
@@ -200,4 +181,4 @@ You may now **proceed to the next lab**.
- **Contributors** - Steven Lemme, Senior Principal Product Manager,
Anand Prabhu, Sr. Member of Technical Staff,
Avi Huber, Vice President, Product Management
-- **Last Updated By/Date** - Yutaka Takatsu, July 2024
+- **Last Updated By/Date** - Yutaka Takatsu, December 2024
diff --git a/oci-apm-helidon/4-create-second-childspan/create-second-childspan.md b/oci-apm-helidon/4-create-second-childspan/create-second-childspan.md
new file mode 100644
index 000000000..59f70b974
--- /dev/null
+++ b/oci-apm-helidon/4-create-second-childspan/create-second-childspan.md
@@ -0,0 +1,138 @@
+# Create a Custom Span
+
+## Introduction
+
+Helidon automataically enables tracing and adds a trace each time you access the application's service endpoints. You can also add a custom trace by manually editing the Java code. In this lab, you will use a Helidon tracing API to create an additional child span, and view it in the APM Trace Explorer.
+
+Estimated time: 10 minutes
+
+
+### Objectives
+
+* Create additional child span to demonstrate tracking of the requests using APM Trace Explorer.
+
+### Prerequisites
+
+* This Lab requires the completion of Labs 1, 2 and 3
+
+## Task 1: Verify the prerequisites
+
+1. Launch OCI Cloud Shell, if not opened already.
+
+2. Ensure the Java version is 23 and Maven version in the path is 3.9.9. If not, run the export commands in the previous lab to add directories to the PATH variable.
+ ``` bash
+
+ java -version; mvn -v
+
+ ```
+
+
+## Task 2: Add custom span to GreetService class
+
+1. Open **GreetService.java** file with an editor
+ ``` bash
+
+ vi ~/helidon-quickstart-se/src/main/java/io/helidon/examples/quickstart/se/GreetService.java
+
+ ```
+
+2. Edit the file.
+
+ a. Add the import statement below:
+ ``` bash
+
+ import io.helidon.tracing.SpanContext;
+ import io.helidon.tracing.Tracer;
+ import io.helidon.tracing.Scope;
+
+ ```
+
+ 
+ b. Replace the **getDefaultMessageHandler** method (Line 68 before inserting import statements) with the following:
+
+ ``` bash
+
+ private void getDefaultMessageHandler(ServerRequest request,
+ ServerResponse response) {
+ var spanBuilder = Tracer.global().spanBuilder("secondchildSpan");
+ request.context().get(SpanContext.class).ifPresent(sc -> sc.asParent(spanBuilder));
+ var span = spanBuilder.start();
+
+ try (Scope scope = span.activate()) {
+ sendResponse(response, "World");
+ span.end();
+ } catch (Throwable t) {
+ span.end(t);
+ }
+ }
+
+ ```
+ Before the change:
+ 
+ After the change:
+ 
+3. Save and close the file.
+
+## Task 3: Build and start the application
+
+1. Close the previous session if running.
+ ``` bash
+
+ fuser -k 8080/tcp
+
+ ```
+
+2. From the **helidon-quickstart-se-2** directory, run the MVN package, skipping unit tests.
+
+ ``` bash
+
+ cd ~/helidon-quickstart-se; mvn package
+
+ ```
+
+ 
+
+ >**Note:** If your build fails with an error, run the mvn -version and make sure it points to maven 3.9.9 If it does not, go back to Lab 2, Task 2 and re-run the commands to install the required Maven version. This can happen when a session is interrupted during the lab exercise.
+
+
+3. Start the application by running the application jar file
+
+ ``` bash
+
+ cd ~/helidon-quickstart-se; nohup java -jar target/helidon-quickstart-se.jar&
+
+ ```
+
+4. Test the application by running the curl command and verify the response.
+ ``` bash
+
+ curl http://localhost:8080/greet
+
+ ```
+
+ 
+
+
+## Task 4: Verify the second child span in APM Trace Explorer
+
+1. From the OCI menu, select **Observability & Management**, then **Trace Explorer**.
+
+2. Under the Traces section, verify the **Spans** column indicates there are 3 spans included in the trace. Previously, there were 2 spans. Click the service name: **helidon-http: HTTP Request**.
+ 
+
+3. In the **Toplogy View**, notice that there is an additional icon that is connected with an arrow. Also in the **Spans View**, now the trace has 3 spans shown in different rows.In the **Spans** section, click: **helidon-http: secondchildSpan**.
+ 
+7. Examine the span parameters in the **Span Details** view.
+ 
+
+
+## Conclusions
+This is the end of the workshop. You learned how to add the APM tracers to Helidon-based microservices by editing the configuring files such as pom.xml and application.yaml, and how to use APM Trace Explorer to trace the workflow within a service. For more information on APM, refer to the OCI documentation, **[Application Performance Monitoring](https://docs.oracle.com/en-us/iaas/application-performance-monitoring/index.html)**.
+
+## Acknowledgements
+
+* **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
+- **Contributors** - Steven Lemme, Senior Principal Product Manager,
+Anand Prabhu, Sr. Member of Technical Staff,
+Avi Huber, Vice President, Product Management
+* **Last Updated By/Date** - Yutaka Takatsu, December 2024
diff --git a/oci-apm-helidon/4-create-second-childspan/images/2-2-editclass-after.png b/oci-apm-helidon/4-create-second-childspan/images/2-2-editclass-after.png
new file mode 100644
index 000000000..0ff3a5d09
Binary files /dev/null and b/oci-apm-helidon/4-create-second-childspan/images/2-2-editclass-after.png differ
diff --git a/oci-apm-helidon/4-create-second-childspan/images/2-2-editclass-before.png b/oci-apm-helidon/4-create-second-childspan/images/2-2-editclass-before.png
new file mode 100644
index 000000000..d25244e2b
Binary files /dev/null and b/oci-apm-helidon/4-create-second-childspan/images/2-2-editclass-before.png differ
diff --git a/oci-apm-helidon/4-create-second-childspan/images/2-2-greetservice-import.png b/oci-apm-helidon/4-create-second-childspan/images/2-2-greetservice-import.png
new file mode 100644
index 000000000..0b98f30b1
Binary files /dev/null and b/oci-apm-helidon/4-create-second-childspan/images/2-2-greetservice-import.png differ
diff --git a/oci-apm-helidon/4-create-second-childspan/images/3-1-mvn-package.png b/oci-apm-helidon/4-create-second-childspan/images/3-1-mvn-package.png
new file mode 100644
index 000000000..f371eb6ea
Binary files /dev/null and b/oci-apm-helidon/4-create-second-childspan/images/3-1-mvn-package.png differ
diff --git a/oci-apm-helidon/4-create-second-childspan/images/3-3-greet_test.png b/oci-apm-helidon/4-create-second-childspan/images/3-3-greet_test.png
new file mode 100644
index 000000000..99bb09c0c
Binary files /dev/null and b/oci-apm-helidon/4-create-second-childspan/images/3-3-greet_test.png differ
diff --git a/oci-apm-helidon/4-create-second-childspan/images/4-1-trace_explorer.png b/oci-apm-helidon/4-create-second-childspan/images/4-1-trace_explorer.png
new file mode 100644
index 000000000..06892e7d5
Binary files /dev/null and b/oci-apm-helidon/4-create-second-childspan/images/4-1-trace_explorer.png differ
diff --git a/oci-apm-helidon/4-create-second-childspan/images/4-3-trace_details.png b/oci-apm-helidon/4-create-second-childspan/images/4-3-trace_details.png
new file mode 100644
index 000000000..1b4c6485e
Binary files /dev/null and b/oci-apm-helidon/4-create-second-childspan/images/4-3-trace_details.png differ
diff --git a/oci-apm-helidon/4-create-second-childspan/images/4-4-span-details.png b/oci-apm-helidon/4-create-second-childspan/images/4-4-span-details.png
new file mode 100644
index 000000000..77c5a8b11
Binary files /dev/null and b/oci-apm-helidon/4-create-second-childspan/images/4-4-span-details.png differ
diff --git a/oci-apm-helidon/4-create-second-service/create-second-service.md b/oci-apm-helidon/4-create-second-service/create-second-service.md
deleted file mode 100644
index 30860a538..000000000
--- a/oci-apm-helidon/4-create-second-service/create-second-service.md
+++ /dev/null
@@ -1,228 +0,0 @@
-# Create a Second Service
-
-## Introduction
-
-In this lab, you will create a second Maven project, where the server listens on port 8081. You will configure APM tracer on this service, with similar steps to Lab 2 and 3.
-
-Estimated time: 10 minutes
-
-Watch the video below for a quick walk-through of the lab.
-[Create a Second Service](videohub:1_sxwdhhww)
-
-### Objectives
-
-* Create another Maven project to demonstrate tracking of the requests that go from one service to another using APM Explorer.
-
-### Prerequisites
-
-* This Lab requires the completion of Labs 1, 2 and 3
-
-## Task 1: Build another Maven project
-
-1. Launch OCI Cloud Shell, if not opened already.
-
-2. Ensure the Maven version in the path is 3.6.1.
- ``` bash
-
- mvn -version
-
- ```
-
-
-2. From the home directory, run the Maven archetype:
-
- ``` bash
-
- cd ~
- mvn -U archetype:generate -DinteractiveMode=false \
- -DarchetypeGroupId=io.helidon.archetypes \
- -DarchetypeArtifactId=helidon-quickstart-se \
- -DarchetypeVersion=2.3.2 \
- -DgroupId=io.helidon.examples \
- -DartifactId=helidon-quickstart-se-2 \
- -Dpackage=io.helidon.examples.quickstart.se
-
- ```
- The project will be built and created in a directory; **helidon-quickstart-se-2**
-
-## Task 2: Modify the pom.xml file in the Helidon application
-
-1. From the **helidon-quickstart-se-2** directory, open **pom.xml** file with an editor tool (e.g., vi tool)
- ``` bash
-
- vi ~/helidon-quickstart-se-2/pom.xml
-
- ```
- >**Note:** For how to use the vi editor, refer to the Lab3, Task1, step 3
-
-3. At the end of the dependencies section, find a line **</dependencies>** (Line 56) and add the following before that line:
-
-
- io.helidon.tracing
- helidon-tracing
-
-
- com.oracle.apm.agent.java
- apm-java-agent-tracer
- [1.5.2118,)
-
-
- com.oracle.apm.agent.java
- apm-java-agent-helidon
- [1.0.1389,)
-
- 
-4. Save and close the file.
-
-## Task 3: Modify application.yaml file
-
-1. Open the application.yaml file with an editor.
- ``` bash
-
- vi ~/helidon-quickstart-se-2/src/main/resources/application.yaml
-
- ```
-2. Update the application.yaml file as in the below example. Note the port number is **8081**. Ensure to replace **<data upload endpoint>** and **<private data key>** with the values collected from the Oracle Cloud console in the earlier steps.
-
- app:
- greeting: "Hello from SE-2"
-
- server:
- port: 8081
- host: 0.0.0.0
-
- tracing:
- name: "Helidon APM Tracer"
- service: "helidon-http2"
- data-upload-endpoint:
- private-data-key:
- collect-metrics: true
- collect-resources: true
- properties:
- - key: com.oracle.apm.agent.log.level
- value: INFO
-
- 
-
-3. Save and close the file.
-
-## Task 4: Modify Main.java file
-
-1. Open **Main.java** file with an editor of your choice.
- ``` bash
-
- vi ~/helidon-quickstart-se-2/src/main/java/io/helidon/examples/quickstart/se/Main.java
-
- ```
-2. Edit the file to configure the tracer.
-
- a. Add the import statement below:
- ``` bash
-
- import io.helidon.tracing.TracerBuilder;
-
- ```
-
- b. In the startServer method, find a line **.addMediaSupport(JsonpSupport.create())** (Line 47). Add the following above that line:
- ``` bash
-
- .tracer(TracerBuilder.create(config.get("tracing")).build())
-
- ```
-Refer to the sample image below:
-
- 
-
-3. Save and close the file.
-
-## Task 5: Add custom span to GreetService class
-
-1. Open **GreetService.java** file with an editor
- ``` bash
-
- vi ~/helidon-quickstart-se-2/src/main/java/io/helidon/examples/quickstart/se/GreetService.java
-
- ```
-
-2. Edit the file.
-
- a. Add the import statement below:
- ``` bash
-
- import io.opentracing.Span;
-
- ```
-
- 
- b. Replace the **getDefaultMessageHandler** method (Line 68) with the following:
- ``` bash
-
-
-
- private void getDefaultMessageHandler(ServerRequest request,
- ServerResponse response) {
- var spanBuilder = request.tracer()
- .buildSpan("getDefaultMessageHandler");
- request.spanContext().ifPresent(spanBuilder::asChildOf);
- Span span = spanBuilder.start();
- try {
- sendResponse(response, "World");
- } finally {
- span.finish();
- }
- }
-
-
- ```
-
- 
-3. Save and close the file.
-
-## Task 6: Build and start the application
-
-1. From the **helidon-quickstart-se-2** directory, run the MVN package, skipping unit tests.
-
- ``` bash
-
- cd ~/helidon-quickstart-se-2/; mvn package -DskipTests=true
-
- ```
-
- 
-
- >**Note:** If your build fails with an error, run the mvn -version and make sure it points to maven 3.6.1. If it does not, go back to Lab 2, Task 2 and re-run the commands to install the required Maven version. This can happen when a session is interrupted during the lab exercise.
-
-
-2. Start the application by running the application jar file
-
- ``` bash
-
- nohup java -jar target/helidon-quickstart-se-2.jar&
-
- ```
-3. Open a command shell in a new browser window. Test the application by running the curl command and verify the response. Note that the port number is 8081, not 8080.
- ``` bash
-
- curl http://localhost:8081/greet
-
- ```
-
- 
-
-
-## Task 7: Verify the traces of the second service in APM Trace Explorer
-
-1. From the OCI menu, select **Observability & Management**, then **Trace Explorer**. Verify that there is a trace with the service name **helidon-http2**.
- 
-
- In the next Lab, you will modify the first service to call the second service.
-
-You may now **proceed to the next lab**.
-
-## Acknowledgements
-
-* **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
-- **Contributors** - Steven Lemme, Senior Principal Product Manager,
-Anand Prabhu, Sr. Member of Technical Staff,
-Avi Huber, Vice President, Product Management
-* **Last Updated By/Date** - Yutaka Takatsu, July 2024
diff --git a/oci-apm-helidon/4-create-second-service/images/1-1-java.png b/oci-apm-helidon/4-create-second-service/images/1-1-java.png
deleted file mode 100644
index 61d88835b..000000000
Binary files a/oci-apm-helidon/4-create-second-service/images/1-1-java.png and /dev/null differ
diff --git a/oci-apm-helidon/4-create-second-service/images/1-1-pomxml.png b/oci-apm-helidon/4-create-second-service/images/1-1-pomxml.png
deleted file mode 100644
index 26e802f26..000000000
Binary files a/oci-apm-helidon/4-create-second-service/images/1-1-pomxml.png and /dev/null differ
diff --git a/oci-apm-helidon/4-create-second-service/images/1-2-pomxml.png b/oci-apm-helidon/4-create-second-service/images/1-2-pomxml.png
deleted file mode 100644
index ac847ef12..000000000
Binary files a/oci-apm-helidon/4-create-second-service/images/1-2-pomxml.png and /dev/null differ
diff --git a/oci-apm-helidon/4-create-second-service/images/3-1-applicationyaml.png b/oci-apm-helidon/4-create-second-service/images/3-1-applicationyaml.png
deleted file mode 100644
index 79a63d169..000000000
Binary files a/oci-apm-helidon/4-create-second-service/images/3-1-applicationyaml.png and /dev/null differ
diff --git a/oci-apm-helidon/4-create-second-service/images/3-1-main_java.png b/oci-apm-helidon/4-create-second-service/images/3-1-main_java.png
deleted file mode 100644
index 46be706b0..000000000
Binary files a/oci-apm-helidon/4-create-second-service/images/3-1-main_java.png and /dev/null differ
diff --git a/oci-apm-helidon/4-create-second-service/images/4-1-error-mvn.png b/oci-apm-helidon/4-create-second-service/images/4-1-error-mvn.png
deleted file mode 100644
index ceb657e93..000000000
Binary files a/oci-apm-helidon/4-create-second-service/images/4-1-error-mvn.png and /dev/null differ
diff --git a/oci-apm-helidon/4-create-second-service/images/5-1-greetservice.png b/oci-apm-helidon/4-create-second-service/images/5-1-greetservice.png
deleted file mode 100644
index 0af6bf6ca..000000000
Binary files a/oci-apm-helidon/4-create-second-service/images/5-1-greetservice.png and /dev/null differ
diff --git a/oci-apm-helidon/4-create-second-service/images/5-2-greetservice.png b/oci-apm-helidon/4-create-second-service/images/5-2-greetservice.png
deleted file mode 100644
index 7ef4cbd1c..000000000
Binary files a/oci-apm-helidon/4-create-second-service/images/5-2-greetservice.png and /dev/null differ
diff --git a/oci-apm-helidon/4-create-second-service/images/6-1-mvn.png b/oci-apm-helidon/4-create-second-service/images/6-1-mvn.png
deleted file mode 100644
index 6ce7db33b..000000000
Binary files a/oci-apm-helidon/4-create-second-service/images/6-1-mvn.png and /dev/null differ
diff --git a/oci-apm-helidon/4-create-second-service/images/6-2-greet_test.png b/oci-apm-helidon/4-create-second-service/images/6-2-greet_test.png
deleted file mode 100644
index 653db0a9d..000000000
Binary files a/oci-apm-helidon/4-create-second-service/images/6-2-greet_test.png and /dev/null differ
diff --git a/oci-apm-helidon/4-create-second-service/images/7-1-trace_explorer.png b/oci-apm-helidon/4-create-second-service/images/7-1-trace_explorer.png
deleted file mode 100644
index 12cdb9dc5..000000000
Binary files a/oci-apm-helidon/4-create-second-service/images/7-1-trace_explorer.png and /dev/null differ
diff --git a/oci-apm-helidon/5-clean-up-environment/clean-up-environment.md b/oci-apm-helidon/5-clean-up-environment/clean-up-environment.md
new file mode 100644
index 000000000..5af847fe7
--- /dev/null
+++ b/oci-apm-helidon/5-clean-up-environment/clean-up-environment.md
@@ -0,0 +1,48 @@
+# Clean up the workshop environment
+
+## Introduction
+
+In this lab, you will stop the running application and remove the files that are used in the workshop.
+
+Estimated time: 3 minutes
+
+
+### Objectives
+
+* Cleanup of the workshop environment
+
+
+### Prerequisites
+
+* This tutorial requires the completion of Labs 1,2,3 and 4.
+
+## Task 1: Clean up the workshop environment
+
+1. Close any running sessions.
+
+
+ ``` bash
+
+ fuser -k 8080/tcp;fuser -k 8081/tcp;
+
+ ```
+
+ 
+
+2. Remove the workshop files from the Cloud Shell.
+
+ ``` bash
+
+ cd ~/; rm -rf helidon* apache-maven* jdk*
+
+ ```
+
+
+
+## Acknowledgements
+
+- **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
+- **Contributors** - Steven Lemme, Senior Principal Product Manager,
+Anand Prabhu, Sr. Member of Technical Staff,
+Avi Huber, Vice President, Product Management
+- **Last Updated By/Date** - Yutaka Takatsu, December 2024
diff --git a/oci-apm-helidon/5-view-multiple-services/images/1-1-pomxml.png b/oci-apm-helidon/5-clean-up-environment/images/1-1-pomxml.png
similarity index 100%
rename from oci-apm-helidon/5-view-multiple-services/images/1-1-pomxml.png
rename to oci-apm-helidon/5-clean-up-environment/images/1-1-pomxml.png
diff --git a/oci-apm-helidon/5-view-multiple-services/images/3-1-cloudshell.png b/oci-apm-helidon/5-clean-up-environment/images/3-1-cloudshell.png
similarity index 100%
rename from oci-apm-helidon/5-view-multiple-services/images/3-1-cloudshell.png
rename to oci-apm-helidon/5-clean-up-environment/images/3-1-cloudshell.png
diff --git a/oci-apm-helidon/5-view-multiple-services/images/4-1-trace_explorer.png b/oci-apm-helidon/5-clean-up-environment/images/4-1-trace_explorer.png
similarity index 100%
rename from oci-apm-helidon/5-view-multiple-services/images/4-1-trace_explorer.png
rename to oci-apm-helidon/5-clean-up-environment/images/4-1-trace_explorer.png
diff --git a/oci-apm-helidon/5-view-multiple-services/images/4-2-trace_explorer.png b/oci-apm-helidon/5-clean-up-environment/images/4-2-trace_explorer.png
similarity index 100%
rename from oci-apm-helidon/5-view-multiple-services/images/4-2-trace_explorer.png
rename to oci-apm-helidon/5-clean-up-environment/images/4-2-trace_explorer.png
diff --git a/oci-apm-helidon/5-view-multiple-services/images/6-1-cloudshell.png b/oci-apm-helidon/5-clean-up-environment/images/6-1-cloudshell.png
similarity index 100%
rename from oci-apm-helidon/5-view-multiple-services/images/6-1-cloudshell.png
rename to oci-apm-helidon/5-clean-up-environment/images/6-1-cloudshell.png
diff --git a/oci-apm-helidon/5-view-multiple-services/images/6-2-cloudshell.png b/oci-apm-helidon/5-clean-up-environment/images/6-2-cloudshell.png
similarity index 100%
rename from oci-apm-helidon/5-view-multiple-services/images/6-2-cloudshell.png
rename to oci-apm-helidon/5-clean-up-environment/images/6-2-cloudshell.png
diff --git a/oci-apm-helidon/5-view-multiple-services/view-multiple-services.md b/oci-apm-helidon/5-view-multiple-services/view-multiple-services.md
index d13bc9ccd..50725735c 100644
--- a/oci-apm-helidon/5-view-multiple-services/view-multiple-services.md
+++ b/oci-apm-helidon/5-view-multiple-services/view-multiple-services.md
@@ -1,248 +1,22 @@
-# View the trace having multiple services
+# Clean up the workshop environment
## Introduction
-In this lab, you will modify the original service to call the second service, which you created in Lab 4. Then verify the trace that is distributed among the services, in the APM Trace Explorer.
+In this lab, you will stop the running application and remove the files that are used in the workshop.
-Estimated time: 15 minutes
+Estimated time: 5 minutes
-Watch the video below for a quick walk-through of the lab.
-[View the trace having multiple services](videohub:1_wl7efqpu)
### Objectives
-* Implement Jersey client in the Maven project
-* Create and start a span that invokes the second service
-* Rebuild the application
-* Use APM Trace Explorer to verify the trace has multiple services
+* Cleanup of the workshop environment
### Prerequisites
* This tutorial requires the completion of Labs 1,2,3 and 4.
-## Task 1: Modify the pom.xml file in the Helidon application
-
-1. Launch OCI Cloud Shell if not opened already.
-
-2. Ensure the Maven version in the path is 3.6.1.
- ``` bash
-
- mvn -version
-
- ```
-
-## Task 2:Modify pom.xml
-
-1. Change to **helidon-quickstart-se** directory, open **pom.xml** in an editor.
-
- ``` bash
-
- vi ~/helidon-quickstart-se/pom.xml
-
- ```
- >**Note:** For how to use the vi editor, refer to the Lab3, Task1, step 3
-
-2. At the end of the dependencies section, find a line **</dependencies>** (Line 70) and add the following before that line:
-
-
- io.helidon.security.integration
- helidon-security-integration-jersey
-
-
- io.helidon.tracing
- helidon-tracing-jersey-client
-
-
- org.glassfish.jersey.core
- jersey-client
-
-
- org.glassfish.jersey.inject
- jersey-hk2
-
- 
-
-## Task 3: Replace GreetService Class
-
-1. Change to **quickstart/se** directory where the **GreetService.java** file resides.
-
- ``` bash
-
- cd ~/helidon-quickstart-se/src/main/java/io/helidon/examples/quickstart/se
-
- ```
-2. Rename the **GreetService.java** to **GreetService.javaorg**.
-
- ``` bash
-
- mv GreetService.java GreetService.javaorg
-
- ```
-
-3. Create and open a new file, **GreetService.java**.
-
- ``` bash
-
- vi GreetService.java
-
- ```
-4. Copy the code below and paste it into the file.
- ``` bash
-
-
- package io.helidon.examples.quickstart.se;
-
- import io.helidon.common.http.Http;
- import io.helidon.config.Config;
- import io.helidon.tracing.jersey.client.ClientTracingFilter;
- import io.helidon.webserver.Routing;
- import io.helidon.webserver.ServerRequest;
- import io.helidon.webserver.ServerResponse;
- import io.helidon.webserver.Service;
- import io.opentracing.Span;
- import java.util.Collections;
- import java.util.concurrent.atomic.AtomicReference;
- import javax.json.Json;
- import javax.json.JsonBuilderFactory;
- import javax.json.JsonObject;
- import javax.ws.rs.client.Client;
- import javax.ws.rs.client.ClientBuilder;
- import javax.ws.rs.client.Invocation;
- import javax.ws.rs.client.WebTarget;
-
- public class GreetService implements Service {
-
- private final AtomicReference greeting = new AtomicReference<>();
- private WebTarget webTarget;
- private static final JsonBuilderFactory JSON = Json.createBuilderFactory(Collections.emptyMap());
-
- GreetService(Config config) {
- greeting.set(config.get("app.greeting").asString().orElse("Ciao"));
- Client jaxRsClient = ClientBuilder.newBuilder().build();
- webTarget = jaxRsClient.target("http://localhost:8081/greet");
- }
-
- @Override
- public void update(Routing.Rules rules) {
- rules
- .get("/", this::getDefaultMessageHandler)
- .get("/outbound", this::outboundMessageHandler)
- .put("/greeting", this::updateGreetingHandler);
- }
-
- private void getDefaultMessageHandler(ServerRequest request, ServerResponse response) {
- var spanBuilder = request.tracer()
- .buildSpan("getDefaultMessageHandler");
- request.spanContext().ifPresent(spanBuilder::asChildOf);
- Span span = spanBuilder.start();
- try {
- sendResponse(response, "World");
- } finally {
- span.finish();
- }
- }
-
- private void sendResponse(ServerResponse response, String name) {
- String msg = String.format("%s %s!", greeting.get(), name);
-
- JsonObject returnObject = JSON.createObjectBuilder().add("message", msg).build();
- response.send(returnObject);
- }
-
- private void updateGreetingFromJson(JsonObject jo, ServerResponse response) {
-
- if (!jo.containsKey("greeting")) {
- JsonObject jsonErrorObject =
- JSON.createObjectBuilder().add("error", "No greeting provided").build();
- response.status(Http.Status.BAD_REQUEST_400).send(jsonErrorObject);
- return;
- }
- greeting.set(jo.getString("greeting"));
- response.status(Http.Status.NO_CONTENT_204).send();
- }
-
- private void outboundMessageHandler(ServerRequest request, ServerResponse response) {
- Invocation.Builder requestBuilder = webTarget.request();
-
- var spanBuilder = request.tracer()
- .buildSpan("outboundMessageHandler");
- request.spanContext().ifPresent(spanBuilder::asChildOf);
- Span span = spanBuilder.start();
-
- try {
- requestBuilder.property(
- ClientTracingFilter.CURRENT_SPAN_CONTEXT_PROPERTY_NAME, request.spanContext());
- requestBuilder
- .rx()
- .get(String.class)
- .thenAccept(response::send)
- .exceptionally(
- throwable -> {
- response.status(Http.Status.INTERNAL_SERVER_ERROR_500);
- response.send("Failed with: " + throwable);
- return null;
- });
- } finally {
- span.finish();
- }
- }
-
- private void updateGreetingHandler(ServerRequest request, ServerResponse response) {
- request.content().as(JsonObject.class).thenAccept(jo -> updateGreetingFromJson(jo, response));
- }
- }
-
- ```
- >**Note:** Scroll to the top of the file and make sure the entire text is copied into the file.
-
-## Task 4: Build and start the application
-
-1. Kill the existing session using port 8080.
-
- ``` bash
-
- fuser -k 8080/tcp
-
- ```
-
-2. From the **helidon-quickstart-se** directory, run the mvn package, skipping unit tests.
-
- ``` bash
-
- cd ~/helidon-quickstart-se/; mvn package -DskipTests=true
-
- ```
-3. Start the application by running the application jar file.
-
- ``` bash
-
- nohup java -jar target/helidon-quickstart-se.jar&
-
-```
-
-4. Test the application by running the following command
-
- ``` bash
-
- curl -i http://localhost:8080/greet/outbound
-
- ```
- 
-
-## Task 5: View the trace in the APM Trace Explorer
-
-1. From the OCI menu, select **Observability & Management**, then **Trace Explorer**. Click a link to the trace that ran most recently. It should have 7 spans.
-
-
- 
-
-2. On the **Trace Details** page, verify that the trace includes 7 spans from two services. Examine the topology to understand how the two services are connected. Services are displayed in different colors. Review the flow in the **Spans** view and notice how the spans are distributed.
-
- 
-
-
-## Task 6: Clean up the workshop environment
+## Task 1: Clean up the workshop environment
1. Close any running sessions.
@@ -259,18 +33,11 @@ Watch the video below for a quick walk-through of the lab.
``` bash
- cd ~/; rm -rf helidon* apache-maven*
+ cd ~/; rm -rf helidon* apache-maven* jdk*
```
-
-## Conclusions
-This is the end of the workshop. You have learned how to add the APM tracers to Helidon-based microservices by editing the configuring files such as pom.xml and application.yaml, and how to use APM Trace Explorer to trace the workflow within a service and across multiple services. For more information on APM, refer to the OCI documentation, **[Application Performance Monitoring](https://docs.oracle.com/en-us/iaas/application-performance-monitoring/index.html)**.
-
-
-
-
## Acknowledgements
- **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
diff --git a/oci-apm-helidon/09-learn-more/images/1-1-2-get-started.png b/oci-apm-helidon/6-learn-more/images/1-1-2-get-started.png
similarity index 100%
rename from oci-apm-helidon/09-learn-more/images/1-1-2-get-started.png
rename to oci-apm-helidon/6-learn-more/images/1-1-2-get-started.png
diff --git a/oci-apm-helidon/09-learn-more/images/1-1-get-started.png b/oci-apm-helidon/6-learn-more/images/1-1-get-started.png
similarity index 100%
rename from oci-apm-helidon/09-learn-more/images/1-1-get-started.png
rename to oci-apm-helidon/6-learn-more/images/1-1-get-started.png
diff --git a/oci-apm-helidon/6-learn-more/learn-more.md b/oci-apm-helidon/6-learn-more/learn-more.md
new file mode 100644
index 000000000..e98d174e5
--- /dev/null
+++ b/oci-apm-helidon/6-learn-more/learn-more.md
@@ -0,0 +1,45 @@
+# Learn more about APM
+
+## Introduction
+
+Congratulations! You have completed the workshop.
+
+To learn more about APM, please visit **Get started with Oracle Cloud Application Performance Monitoring** workshop.
+
+ 
+ 
+
+In this workshop, you will learn how to use Oracle Cloud APM to examine critical performance alarms, view synthetic monitors in a dashboard to analyze the trend and identify spikes, observe the monitor's client-side details in HTTP Archive (HAR) file, and explore the server-side details by tracing data in APM Trace Explorer.
+
+### Objectives
+
+* Review APM alarms
+* Examine APM synthetic monitors
+* Explore monitor details and their history
+* Perform exploration of application trace data
+
+### Prerequisites
+
+* Familiarity with distributed tracing is helpful, but not required
+* Familiarity with Oracle Cloud is helpful
+
+## Task 1: Access the workshop
+
+1. Click the link following URL to access the workshop: **[Get started with Oracle Cloud APM](https://livelabs.oracle.com/pls/apex/r/dbpm/livelabs/view-workshop?wid=3350)** Workshop.
+Alternatively, open a new browser tab, copy the following URL, paste it to the address bar, and hit enter.
+
+ ``` bash
+
+ https://livelabs.oracle.com/pls/apex/r/dbpm/livelabs/view-workshop?wid=3350
+
+ ```
+
+
+
+## Acknowledgements
+
+* **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
+- **Contributors** - Steven Lemme, Senior Principal Product Manager,
+Anand Prabhu, Sr. Member of Technical Staff,
+Avi Huber, Vice President, Product Management
+* **Last Updated By/Date** - Yutaka Takatsu, December, 2024
diff --git a/oci-apm-helidon/workshops/freetier/manifest.json b/oci-apm-helidon/workshops/freetier/manifest.json
index af957f4ba..79038b437 100644
--- a/oci-apm-helidon/workshops/freetier/manifest.json
+++ b/oci-apm-helidon/workshops/freetier/manifest.json
@@ -1,5 +1,5 @@
{
- "workshoptitle": "Use OpenTracing for Helidon Microservices with Oracle Application Performance Monitoring",
+ "workshoptitle": "Instrument Helidon Microservices with Oracle Application Performance Monitoring",
"help": "livelabs-help-em_us@oracle.com",
"tutorials": [
{
@@ -13,13 +13,13 @@
"filename": "https://oracle-livelabs.github.io/common/labs/cloud-login/cloud-login.md"
},
{
- "title": "Lab 1: Create an APM Domain and obtain Data Upload Endpoint and Private Data Key ",
- "description": "Create an APM Domain and obtain Data Upload Endpoint and Private Data Key ",
+ "title": "Lab 1: Create an APM Domain and obtain Data Upload Endpoint and Private Data Key",
+ "description": "Create an APM Domain and obtain Data Upload Endpoint and Private Data Key",
"filename": "../../1-create-domain/create-domain.md"
},
{
- "title": "Lab 2: Setup a Helidon SE Application ",
- "description": "Setup a Helidon SE Application ",
+ "title": "Lab 2: Setup a Helidon SE Application",
+ "description": "Setup a Helidon SE Application",
"filename": "../../2-setup-helidon/setup-helidon.md"
},
{
@@ -28,16 +28,20 @@
"filename": "../../3-monitor-traces/monitor-traces.md"
},
{
- "title": "Lab 4: Create a second Service",
- "description": "Create a second Service",
- "filename": "../../4-create-second-service/create-second-service.md"
+ "title": "Lab 4: Create a second child span (Optional)",
+ "description": "Create a second child span",
+ "filename": "../../4-create-second-childspan/create-second-childspan.md"
},
{
- "title": "Lab 5: View the trace with multiple services",
- "description": "View the trace with multiple services",
- "filename": "../../5-view-multiple-services/view-multiple-services.md"
+ "title": "Lab 5: Clean up the workshop environment",
+ "description": "Clean up the workshop environment",
+ "filename": "../../5-clean-up-environment/clean-up-environment.md"
+ },
+ {
+ "title": "Lab 6: Learn more about APM (Optional)",
+ "description": "Learn more about APM",
+ "filename": "../../6-learn-more/learn-more.md"
},
-
{
"title": "Need Help?",
"description": "Solutions to Common Problems and Directions for Receiving Live Help",
diff --git a/oci-apm-helidon/workshops/livelabs/manifest.json b/oci-apm-helidon/workshops/livelabs/manifest.json
index 14183df0b..fdf141178 100644
--- a/oci-apm-helidon/workshops/livelabs/manifest.json
+++ b/oci-apm-helidon/workshops/livelabs/manifest.json
@@ -1,5 +1,5 @@
{
- "workshoptitle": "Use OpenTracing for Helidon Microservices with Oracle Application Performance Monitoring",
+ "workshoptitle": "Instrument Helidon Microservices with Oracle Application Performance Monitoring",
"help": "livelabs-help-em_us@oracle.com",
"tutorials": [
{
@@ -10,16 +10,16 @@
{
"title": "Get Started",
"description": "This is the prerequisites for customers using Free Trial and Paid tenancies, and Always Free accounts (if applicable). The title of the lab and the Contents Menu title (the title above) match for Prerequisite lab. This lab is always first.",
- "filename": "https://oracle-livelabs.github.io/common/labs/cloud-login/cloud-login-livelabs2.md"
+ "filename": "https://oracle-livelabs.github.io/common/labs/cloud-login/cloud-login-livelabs.md"
},
{
- "title": "Lab 1: Create an APM Domain and obtain Data Upload Endpoint and Private Data Key ",
- "description": "Create an APM Domain and obtain Data Upload Endpoint and Private Data Key ",
+ "title": "Lab 1: Create an APM Domain and obtain Data Upload Endpoint and Private Data Key",
+ "description": "Create an APM Domain and obtain Data Upload Endpoint and Private Data Key",
"filename": "../../1-create-domain/create-domain.md"
},
{
- "title": "Lab 2: Setup a Helidon SE Application ",
- "description": "Setup a Helidon SE Application ",
+ "title": "Lab 2: Setup a Helidon SE Application",
+ "description": "Setup a Helidon SE Application",
"filename": "../../2-setup-helidon/setup-helidon.md"
},
{
@@ -28,16 +28,20 @@
"filename": "../../3-monitor-traces/monitor-traces.md"
},
{
- "title": "Lab 4: Create a second Service",
- "description": "Create a second Service",
- "filename": "../../4-create-second-service/create-second-service.md"
+ "title": "Lab 4: Create a second child span (Optional)",
+ "description": "Create a second child span",
+ "filename": "../../4-create-second-childspan/create-second-childspan.md"
},
{
- "title": "Lab 5: View the trace with multiple services",
- "description": "View the trace with multiple services",
- "filename": "../../5-view-multiple-services/view-multiple-services.md"
+ "title": "Lab 5: Clean up the workshop environment",
+ "description": "Clean up the workshop environment",
+ "filename": "../../5-clean-up-environment/clean-up-environment.md"
+ },
+ {
+ "title": "Lab 6: Learn more about APM (Optional)",
+ "description": "Learn more about APM",
+ "filename": "../../6-learn-more/learn-more.md"
},
-
{
"title": "Need Help?",
"description": "Solutions to Common Problems and Directions for Receiving Live Help",
diff --git a/oci-apm-helidon/workshops/ocw-freetier/index.html b/oci-apm-helidon/workshops/ocw-freetier/index.html
deleted file mode 100644
index 6acdb69d1..000000000
--- a/oci-apm-helidon/workshops/ocw-freetier/index.html
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
-
-
-
-
- Oracle LiveLabs
-
-
-
-
-
-
-
-
-
-
-
-
-
Oracle LiveLabs
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/oci-apm-helidon/workshops/ocw-freetier/manifest.json b/oci-apm-helidon/workshops/ocw-freetier/manifest.json
deleted file mode 100644
index 5567467e7..000000000
--- a/oci-apm-helidon/workshops/ocw-freetier/manifest.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
- "workshoptitle": "Setup OpenTracing for Microservices with Helidon",
- "help": "livelabs-help-em_us@oracle.com",
- "tutorials": [
- {
- "title": "Introduction",
- "description": "Introduction",
- "filename": "../../0-introduction/introduction.md"
- },
- {
- "title": "Get Started",
- "description": "This is the prerequisites for customers using Free Trial and Paid tenancies, and Always Free accounts (if applicable). The title of the lab and the Contents Menu title (the title above) match for Prerequisite lab. This lab is always first.",
- "filename": "https://oracle-livelabs.github.io/common/labs/cloud-login/cloud-login.md"
- },
- {
- "title": "Lab 1: Create an APM Domain and obtain Data Upload Endpoint and Private Data Key ",
- "description": "Create an APM Domain and obtain Data Upload Endpoint and Private Data Key ",
- "filename": "../../1-create-domain/create-domain.md"
- },
- {
- "title": "Lab 2: Setup a Helidon SE Application ",
- "description": "Setup a Helidon SE Application ",
- "filename": "../../2-setup-helidon/setup-helidon.md"
- },
- {
- "title": "Lab 3: Monitor traces and spans of the Application with APM Trace Explorer",
- "description": "Monitor traces and spans of the Application with APM Trace Explorer",
- "filename": "../../3-monitor-traces/monitor-traces.md"
- },
- {
- "title": "Lab 4: Create a second Service",
- "description": "Create a second Service",
- "filename": "../../4-create-second-service/create-second-service.md"
- },
- {
- "title": "Lab 5: View the trace with multiple services",
- "description": "View the trace with multiple services",
- "filename": "../../5-view-multiple-services/view-multiple-services.md"
- },
- {
- "title": "Lab 6: Learn more about APM (optional)",
- "description": "Learn more about APM",
- "filename": "../../09-learn-more/learn-more.md"
- },
- {
- "title": "Oracle CloudWorld 2022 - Get Help",
- "filename": "https://oracle-livelabs.github.io/common/support/ocwsupportlab/ocwsupportlab.md"
- }
- ]
-}
diff --git a/oci-apm-helidon/workshops/ocw-livelabs/index.html b/oci-apm-helidon/workshops/ocw-livelabs/index.html
deleted file mode 100644
index 6acdb69d1..000000000
--- a/oci-apm-helidon/workshops/ocw-livelabs/index.html
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
-
-
-
-
- Oracle LiveLabs
-
-
-
-
-
-
-
-
-
-
-
-
-
Oracle LiveLabs
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/oci-apm-helidon/workshops/ocw-livelabs/manifest.json b/oci-apm-helidon/workshops/ocw-livelabs/manifest.json
deleted file mode 100644
index 204c8d804..000000000
--- a/oci-apm-helidon/workshops/ocw-livelabs/manifest.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
- "workshoptitle": "Setup OpenTracing for Microservices with Helidon",
- "help": "livelabs-help-em_us@oracle.com",
- "tutorials": [
- {
- "title": "Introduction",
- "description": "Introduction",
- "filename": "../../0-introduction/introduction.md"
- },
- {
- "title": "Get Started",
- "description": "This is the prerequisites for customers using Free Trial and Paid tenancies, and Always Free accounts (if applicable). The title of the lab and the Contents Menu title (the title above) match for Prerequisite lab. This lab is always first.",
- "filename": "https://oracle-livelabs.github.io/common/labs/cloud-login/cloud-login-livelabs2.md"
- },
- {
- "title": "Lab 1: Create an APM Domain and obtain Data Upload Endpoint and Private Data Key ",
- "description": "Create an APM Domain and obtain Data Upload Endpoint and Private Data Key ",
- "filename": "../../1-create-domain/create-domain.md"
- },
- {
- "title": "Lab 2: Setup a Helidon SE Application ",
- "description": "Setup a Helidon SE Application ",
- "filename": "../../2-setup-helidon/setup-helidon.md"
- },
- {
- "title": "Lab 3: Monitor traces and spans of the Application with APM Trace Explorer",
- "description": "Monitor traces and spans of the Application with APM Trace Explorer",
- "filename": "../../3-monitor-traces/monitor-traces.md"
- },
- {
- "title": "Lab 4: Create a second Service",
- "description": "Create a second Service",
- "filename": "../../4-create-second-service/create-second-service.md"
- },
- {
- "title": "Lab 5: View the trace with multiple services",
- "description": "View the trace with multiple services",
- "filename": "../../5-view-multiple-services/view-multiple-services.md"
- },
- {
- "title": "Lab 6: Learn more about APM (optional)",
- "description": "Learn more about APM",
- "filename": "../../09-learn-more/learn-more.md"
- },
- {
- "title": "Oracle CloudWorld 2022 - Get Help",
- "filename": "https://oracle-livelabs.github.io/common/support/ocwsupportlab/ocwsupportlab.md"
- }
- ]
-}
diff --git a/oci-apm-springboot/a-introduction/images/apm_diagram.png b/oci-apm-springboot/00-introduction/images/apm_diagram.png
similarity index 100%
rename from oci-apm-springboot/a-introduction/images/apm_diagram.png
rename to oci-apm-springboot/00-introduction/images/apm_diagram.png
diff --git a/oci-apm-springboot/a-introduction/images/apm_microservices_setup.png b/oci-apm-springboot/00-introduction/images/apm_microservices_setup.png
similarity index 100%
rename from oci-apm-springboot/a-introduction/images/apm_microservices_setup.png
rename to oci-apm-springboot/00-introduction/images/apm_microservices_setup.png
diff --git a/oci-apm-springboot/00-introduction/introduction.md b/oci-apm-springboot/00-introduction/introduction.md
new file mode 100644
index 000000000..796e9fc3b
--- /dev/null
+++ b/oci-apm-springboot/00-introduction/introduction.md
@@ -0,0 +1,56 @@
+# Introduction
+
+## About this workshop
+This workshop walks you through how to configure Spring Boot microservices deployed on Kubernetes for monitoring with the Oracle Application Performance Monitoring (APM) service. This enables automatic OpenTracing instrumentation and metrics collection that is used to provide full, end-to-end monitoring and diagnostics for the application.
+
+In this workshop, you will instrument the application using the OpenTelemetry (OTEL) Operator, which automatically inject and configure APM Java Agent to the Kubernetes cluster, instrument the APM Browser agent by inserting JavaScript code to a webpage and view traces and spans in APM Trace Explorer.
+
+>**Note:** The same approach demonstrated for Spring Boot Java microservices on Kubernetes can be used to configure other types of java application servers, such as WebLogic, deployed on Kubernetes.
+
+Estimated Time: 45 minutes
+
+## Task 1: Know before you run
+
+### About Oracle Cloud Infrastructure Application Performance Management (OCI APM)
+
+The diagram below provides an overview of the OCI APM Service, its features, components, and some of the other OCI services it integrates with.
+
+ 
+
+Among other capabilities, OCI APM includes an implementation of a Distributed Tracing system. It collects and processes transaction trace data (spans) from the monitored application and makes it available for viewing, dash boarding, exploration, alerts, etc. For more information on APM and Trace Explorer please refer to Application Performance Monitoring > **[Use Trace Explorer](https://docs.oracle.com/en-us/iaas/application-performance-monitoring/doc/use-trace-explorer.html)** section in the OCI Documentation.
+
+In the workshop, you will learn how to automatically instrument a Java micro services application deployed on a Kubernetes cluster with APM agents. You will also learn how to create an APM domain in the Oracle Cloud and use Trace Explorer to search and view traces/spans in the APM User Interface.
+
+
+### Objectives
+
+In this workshop, you will:
+* Create an APM domain, obtain Data Upload Endpoint and Data Keys
+* Install OpenTelemetry Operator and deploy the APM Java agent
+* Configure Kubernetes custom resource to automatically inject APM Browser Agent
+* Use APM Trace Explorer to view traces, spans, and span dimensions
+
+### Prerequisites
+
+* An Oracle Free Tier with a 30-day free trial or Paid Cloud Account - Please view this workshop's LiveLabs landing page to see which environments are supported.
+
+
+>**Note:** If you have a **Free Trial** account when your Free Trial expires, your account will be converted to an **Always Free** account. You will not be able to conduct Free Tier workshops unless the Always Free environment is available.
+**[Click here for the Free Tier FAQ page.](https://www.oracle.com/cloud/free/faq.html)**
+
+If you are running the workshop in a Paid Cloud Account, ensure you have the permissions below:
+
+* Oracle Cloud Account Administrator role or manage apm-domains permission in the target compartment. See **[Perform Oracle Cloud Infrastructure Prerequisites (APM)](https://docs.oracle.com/en-us/iaas/application-performance-monitoring/doc/perform-oracle-cloud-infrastructure-prerequisite-tasks.html)** in the Oracle Cloud documentation.
+
+### More APM Workshops
+
+* Please visit: **[APM LiveLabs workshops](https://livelabs.oracle.com/pls/apex/f?p=133:100:111996377805307::::SEARCH:application+Performance+monitoring)**.
+
+
+## Acknowledgements
+
+- **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
+- **Contributors** - Steven Lemme, Senior Principal Product Manager,
+Anand Prabhu, Sr. Member of Technical Staff,
+Avi Huber, Vice President, Product Management
+- **Last Updated By/Date** - Yutaka Takatsu, November, 2024
diff --git a/oci-apm-springboot/01-create-oke/create-oke.md b/oci-apm-springboot/01-create-oke/create-oke.md
new file mode 100644
index 000000000..942175ab8
--- /dev/null
+++ b/oci-apm-springboot/01-create-oke/create-oke.md
@@ -0,0 +1,78 @@
+# Create a Kubernetes cluster
+
+## Introduction
+
+This workshop uses Spring Boot-based Java microservices as a target application to trace against. In this lab, first, you will use the Oracle Cloud console to set up an OCI compartment, second, create an Oracle container engine for Kubernetes (OKE) cluster in your tenancy. In Lab 3, you will deploy the application to the OKE.
+
+Estimated time: 5 minutes
+
+Watch the video below for a quick walk-through of the lab.
+[Create a Kubernetes cluster](videohub:1_4f64eivu)
+
+### Objectives
+
+* Create a compartment
+* Create a Kubernetes cluster
+
+### Prerequisites
+
+* This lab requires an [Oracle Cloud account](https://www.oracle.com/cloud/free/). You may use your cloud account, or a Free tier account, a cloud account that you obtained through a trial.
+
+
+## Task 1: Create an OCI compartment
+
+1. Open the navigation menu from the top-left corner (aka. hamburger menu) of the Oracle Cloud console and select **Identity & Security** > **Compartments**.
+ 
+2. Click **Create Compartments**
+ 
+3. Enter the following parameters:
+* Compartment name: **apmworkshop**
+* Description: **APM workshop compartment**
+* Accept the default values for the other fields, and click, **Create Compartment**
+ 
+* Verify that your apmworkshop compartment is created in the table
+ 
+
+## Task 2: Create an OKE
+
+1. Open the navigation menu from the top left corner (aka. hamburger menu) in the Oracle Cloud console, and select **Developer Services** > **Kubernetes Clusters (OKE)**.
+
+ 
+
+2. Make sure the **apmworkshop** is selected in the Compartment field, then click **Create cluster**
+
+ 
+
+3. Quick Create pane is pre-selected. Keep the default selection and click **Submit**.
+
+ 
+
+4. Name the cluster as **apmlab-cluser1**. Accept the default setting for other fields and click **Next**.
+
+ 
+ 
+
+5. Review the configuration, and click **Create cluster**.
+
+ 
+
+6. Make sure all verification steps are cleared. Click **Close**.
+
+ 
+
+7. This will start to create a cluster, and takes 7 to 10 minutes to complete. While waiting for the creation of the cluster, you can proceed to the next lab to create an APM domain. In Lab 3, we will resume the steps to build the application.
+
+ 
+
+
+
+
+You may now **proceed to the next lab**.
+
+## Acknowledgements
+
+* **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
+- **Contributors** - Steven Lemme, Senior Principal Product Manager,
+Anand Prabhu, Sr. Member of Technical Staff,
+Avi Huber, Vice President, Product Management
+* **Last Updated By/Date** - Yutaka Takatsu, November, 2024
diff --git a/oci-apm-springboot/01-create-oke/images/1-1-compartments.png b/oci-apm-springboot/01-create-oke/images/1-1-compartments.png
new file mode 100644
index 000000000..fb80d85c0
Binary files /dev/null and b/oci-apm-springboot/01-create-oke/images/1-1-compartments.png differ
diff --git a/oci-apm-springboot/01-create-oke/images/1-1-menu.png b/oci-apm-springboot/01-create-oke/images/1-1-menu.png
new file mode 100644
index 000000000..1952ba10d
Binary files /dev/null and b/oci-apm-springboot/01-create-oke/images/1-1-menu.png differ
diff --git a/oci-apm-springboot/01-create-oke/images/1-2-compartments.png b/oci-apm-springboot/01-create-oke/images/1-2-compartments.png
new file mode 100644
index 000000000..80f5f21e8
Binary files /dev/null and b/oci-apm-springboot/01-create-oke/images/1-2-compartments.png differ
diff --git a/oci-apm-springboot/01-create-oke/images/1-2-oke.png b/oci-apm-springboot/01-create-oke/images/1-2-oke.png
new file mode 100644
index 000000000..1e5306845
Binary files /dev/null and b/oci-apm-springboot/01-create-oke/images/1-2-oke.png differ
diff --git a/oci-apm-springboot/01-create-oke/images/1-3-compartments.png b/oci-apm-springboot/01-create-oke/images/1-3-compartments.png
new file mode 100644
index 000000000..1399fd117
Binary files /dev/null and b/oci-apm-springboot/01-create-oke/images/1-3-compartments.png differ
diff --git a/oci-apm-springboot/01-create-oke/images/1-3-oke.png b/oci-apm-springboot/01-create-oke/images/1-3-oke.png
new file mode 100644
index 000000000..f1a759819
Binary files /dev/null and b/oci-apm-springboot/01-create-oke/images/1-3-oke.png differ
diff --git a/oci-apm-springboot/01-create-oke/images/1-4-compartments.png b/oci-apm-springboot/01-create-oke/images/1-4-compartments.png
new file mode 100644
index 000000000..d43476138
Binary files /dev/null and b/oci-apm-springboot/01-create-oke/images/1-4-compartments.png differ
diff --git a/oci-apm-springboot/01-create-oke/images/1-4-oke.png b/oci-apm-springboot/01-create-oke/images/1-4-oke.png
new file mode 100644
index 000000000..e6beceee1
Binary files /dev/null and b/oci-apm-springboot/01-create-oke/images/1-4-oke.png differ
diff --git a/oci-apm-springboot/01-create-oke/images/1-5-oke.png b/oci-apm-springboot/01-create-oke/images/1-5-oke.png
new file mode 100644
index 000000000..3b274dc70
Binary files /dev/null and b/oci-apm-springboot/01-create-oke/images/1-5-oke.png differ
diff --git a/oci-apm-springboot/01-create-oke/images/1-6-oke.png b/oci-apm-springboot/01-create-oke/images/1-6-oke.png
new file mode 100644
index 000000000..8f68bcea5
Binary files /dev/null and b/oci-apm-springboot/01-create-oke/images/1-6-oke.png differ
diff --git a/oci-apm-springboot/01-create-oke/images/1-7-oke.png b/oci-apm-springboot/01-create-oke/images/1-7-oke.png
new file mode 100644
index 000000000..f830dd8fc
Binary files /dev/null and b/oci-apm-springboot/01-create-oke/images/1-7-oke.png differ
diff --git a/oci-apm-springboot/01-create-oke/images/1-8-oke.png b/oci-apm-springboot/01-create-oke/images/1-8-oke.png
new file mode 100644
index 000000000..691e27f41
Binary files /dev/null and b/oci-apm-springboot/01-create-oke/images/1-8-oke.png differ
diff --git a/oci-apm-springboot/02-create-domain/create-domain.md b/oci-apm-springboot/02-create-domain/create-domain.md
new file mode 100644
index 000000000..191105af0
--- /dev/null
+++ b/oci-apm-springboot/02-create-domain/create-domain.md
@@ -0,0 +1,74 @@
+# Create an APM Domain and obtain Data Upload Endpoint and Private Data Key
+
+## Introduction
+
+In this lab, you will create an APM Domain. You will acquire a Data Upload Endpoint and a Private Data Key, which are needed to configure the APM Tracer on the application.
+
+Estimated time: 10 minutes
+
+Watch the video below for a quick walk-through of the lab.
+[Create an APM Domain and obtain Data Upload Endpoint and Private Data Key](videohub:1_jxkk5vpb)
+
+### Objectives
+
+* Create an APM Domain
+* Obtain a Data Upload Endpoint and a Private Data Key
+
+
+### Prerequisites
+
+* This lab requires an [Oracle Cloud account](https://www.oracle.com/cloud/free/). You may use your cloud account, or a Free tier account, a cloud account that you obtained through a trial.
+* To create an APM domain, you will need an Oracle Cloud Account Administrator role or manage apm-domains permission in the target compartment. For more details, refer to the OCI Documentation, [Create an APM Domain](https://docs.oracle.com/en-us/iaas/application-performance-monitoring/doc/create-apm-domain.html).
+
+## Task 1: Create an APM domain
+
+1. From the OCI menu, select **Observability & Management**, then **Administration**.
+ 
+
+2. Select the **apmworkshop** compartment from the pulldown menu. Then click **Create APM Domain**.
+ 
+
+
+4. Name your APM domain as **apmworkshop** and select the compartment you created. Add a check to the **“Create as Always Free Domain”**, then click **Create**.
+ 
+
+
+5. Press the refresh button periodically to check the status. This may take a few minutes.
+ 
+6. Once the job is completed, the status turns to Active with a green icon.
+ 
+ For more details on how to create an APM Domain, refer to the OCI documentation, [Create an APM Domain](https://docs.oracle.com/en-us/iaas/application-performance-monitoring/doc/create-apm-domain.html).
+
+## Task 2: Obtain Data Upload Endpoint and Private and Public Data Keys
+
+To upload tracing data to an APM domain, Data Upload Endpoint and both Private and Public Data Keys must be configured in the application’s configuration files. Next, you are going to obtain the values for them and then enter them into the Oracle Cloud console.
+
+1. Click the link to the APM domain.
+ 
+
+
+
+2. Under **Resources**, click **Data Keys**.
+
+ 
+
+3. In the **APM Domain Information** tab, find **Data Upload Endpoint**, then click **Copy**. Paste the copied value to a text file and save. You will need this value in the later steps in the workshop.
+
+
+4. Under **Data Keys**, find **auto\_generated\_private_data\_key**. Click **Copy** and save the value to the text file.
+
+5. In the same section, find **auto\_generated\_public_data\_key**. Click **Copy** and save the value to the text file.
+ 
+
+For more details on Data Upload Endpoint and Data keys, refer to the OCI documentation, [Obtaining Data Upload Endpoint and Data keys](https://docs.oracle.com/en-us/iaas/application-performance-monitoring/doc/obtain-data-upload-endpoint-and-data-keys.html).
+
+You may now **proceed to the next lab**.
+
+## Acknowledgements
+
+* **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
+- **Contributors** -
+Steven Lemme, Senior Principal Product Manager,
+Anand Prabhu, Sr. Member of Technical Staff,
+Avi Huber, Vice President, Product Management
+* **Last Updated By/Date** - Yutaka Takatsu, November, 2024
diff --git a/oci-apm-springboot/02-create-domain/images/2-1-2-domain.png b/oci-apm-springboot/02-create-domain/images/2-1-2-domain.png
new file mode 100644
index 000000000..f98bae7ac
Binary files /dev/null and b/oci-apm-springboot/02-create-domain/images/2-1-2-domain.png differ
diff --git a/oci-apm-springboot/02-create-domain/images/2-1-domain.png b/oci-apm-springboot/02-create-domain/images/2-1-domain.png
new file mode 100644
index 000000000..140b9b29b
Binary files /dev/null and b/oci-apm-springboot/02-create-domain/images/2-1-domain.png differ
diff --git a/oci-apm-springboot/c-lab-two-create-domain/images/2-2-domain.png b/oci-apm-springboot/02-create-domain/images/2-2-domain.png
similarity index 100%
rename from oci-apm-springboot/c-lab-two-create-domain/images/2-2-domain.png
rename to oci-apm-springboot/02-create-domain/images/2-2-domain.png
diff --git a/oci-apm-springboot/02-create-domain/images/2-3-domain.png b/oci-apm-springboot/02-create-domain/images/2-3-domain.png
new file mode 100644
index 000000000..901dc020f
Binary files /dev/null and b/oci-apm-springboot/02-create-domain/images/2-3-domain.png differ
diff --git a/oci-apm-springboot/02-create-domain/images/2-4-domain.png b/oci-apm-springboot/02-create-domain/images/2-4-domain.png
new file mode 100644
index 000000000..76e569064
Binary files /dev/null and b/oci-apm-springboot/02-create-domain/images/2-4-domain.png differ
diff --git a/oci-apm-springboot/02-create-domain/images/2-5-domain.png b/oci-apm-springboot/02-create-domain/images/2-5-domain.png
new file mode 100644
index 000000000..4290cbe79
Binary files /dev/null and b/oci-apm-springboot/02-create-domain/images/2-5-domain.png differ
diff --git a/oci-apm-springboot/02-create-domain/images/3-1-2-domain.png b/oci-apm-springboot/02-create-domain/images/3-1-2-domain.png
new file mode 100644
index 000000000..6077a4638
Binary files /dev/null and b/oci-apm-springboot/02-create-domain/images/3-1-2-domain.png differ
diff --git a/oci-apm-springboot/02-create-domain/images/3-1-domain.png b/oci-apm-springboot/02-create-domain/images/3-1-domain.png
new file mode 100644
index 000000000..1dd4ed31a
Binary files /dev/null and b/oci-apm-springboot/02-create-domain/images/3-1-domain.png differ
diff --git a/oci-apm-springboot/02-create-domain/images/3-2-domain.png b/oci-apm-springboot/02-create-domain/images/3-2-domain.png
new file mode 100644
index 000000000..571b5edaa
Binary files /dev/null and b/oci-apm-springboot/02-create-domain/images/3-2-domain.png differ
diff --git a/oci-apm-springboot/03-build-app/build-app.md b/oci-apm-springboot/03-build-app/build-app.md
new file mode 100644
index 000000000..5515e1aa8
--- /dev/null
+++ b/oci-apm-springboot/03-build-app/build-app.md
@@ -0,0 +1,222 @@
+# Build a microservices application
+
+## Introduction
+
+This workshop uses Spring Boot-based Java microservices as a target application to trace against. In this lab, you will deploy the application to the Kubernetes cluster you created in Lab 1.
+
+Estimated time: 10 minutes
+
+### Objectives
+
+* Build a microservices application for monitoring
+
+### Prerequisites
+
+* Completion of the preceding labs in this workshop
+
+## Task 1: Verify OKE
+
+1. Go back to the Kubernetes cluster page where you left Lab 1, and check the status of the cluster. Open the navigation menu from the top left corner (aka. hamburger menu) in the Oracle Cloud console, and select **Developer Services** > **Kubernetes Clusters (OKE)**.
+
+ 
+
+2. Click the **apmlab-cluser1** link from the table.
+
+ 
+
+3. If the status of the cluster is **Active**, creation was successful. If it is still in a **Creating** status, it may take a few more minutes to complete. (Usually, it takes 7 to 10 minutes to finish the jobs to create a cluster).
+
+ 
+
+## Task 2: Access the OKE in the Oracle Cloud shell
+
+
+1. Click **Access Cluster** on the cluster details page.
+
+ 
+
+2. Make sure the **Cloud Shell Access** is selected. Click the **Copy** link from the command to access kubeconfig for the cluster.
+
+ 
+
+3. Then click **Launch Cloud Shell**.
+
+ 
+
+4. Oracle Cloud Shell window opens at the lower side of the browser screen.
+
+ 
+
+5. Paste the copied command to the command shell prompt. Then hit enter.
+
+ 
+
+ >**Note:** Save the command to a text file on your laptop, and execute it whenever you start a new Cloud Shell session while working in the labs in this workshop.
+
+## Task 3: Create a configuration file
+
+1. In the Cloud Shell, type down the command below to create a work directory.
+
+ ``` bash
+
+ mkdir ~/sb-hol;cd ~/sb-hol
+
+ ```
+
+ 
+
+2. Use text editor (such as the vi editor tool) to create a configuration file within the directory.
+
+ ``` bash
+
+ vi wstore.yaml
+
+ ```
+ 
+
+ >**Note**: If you are using the vi editor, type i to enter Insert mode, and make the text editable. Use allow keys to navigate the text and make changes to where you set the cursor. To save a file, press the Esc key, then type :wq to write and quit the file. If you do not wish a change, press Esc then type :q! to discard your changes. Please refer to the editor's references for more usage.
+
+
+3. Copy the content below and paste it into the configuration file.
+
+ ``` bash
+
+ apiVersion: v1
+ kind: Service
+ metadata:
+ name: wstore-frontend
+ spec:
+ type: LoadBalancer
+ selector:
+ app: wstore-front
+ ports:
+ - protocol: TCP
+ port: 80
+ targetPort: 8080
+ externalTrafficPolicy: Local
+ ---
+ apiVersion: v1
+ kind: Service
+ metadata:
+ name: wstore-backend
+ spec:
+ type: NodePort
+ selector:
+ app: wstore-back
+ ports:
+ - protocol: TCP
+ port: 8080
+ targetPort: 8080
+ ---
+ apiVersion: apps/v1
+ kind: StatefulSet
+ metadata:
+ name: wstore-front
+ spec:
+ serviceName: "wstore-frontend"
+ replicas: 1
+ selector:
+ matchLabels:
+ app: wstore-front
+ template:
+ metadata:
+ labels:
+ app: wstore-front
+ spec:
+ containers:
+ - name: wstore
+ image: iad.ocir.io/axfo51x8x2ap/p-winestore:latest
+ command: ["java", "-jar", "./wineStore.jar", "--spring.config.location=file:/spring/wstore.properties"]
+ ports:
+ - containerPort: 8080
+ imagePullSecrets:
+ - name: ocirsecret
+ ---
+ apiVersion: apps/v1
+ kind: StatefulSet
+ metadata:
+ name: wstore-back
+ spec:
+ serviceName: "wstore-backend"
+ replicas: 2
+ selector:
+ matchLabels:
+ app: wstore-back
+ template:
+ metadata:
+ labels:
+ app: wstore-back
+ spec:
+ containers:
+ - name: wstore
+ image: iad.ocir.io/axfo51x8x2ap/p-winestore:latest
+ command: ["java", "-jar", "./wineStore.jar", "--spring.config.location=file:/spring/wstore.properties"]
+ ports:
+ - containerPort: 8080
+ imagePullSecrets:
+ - name: ocirsecret
+
+
+ ```
+ 
+
+ >**Note**: Make sure to keep the same space indentation when pasting the code into the file.
+
+
+
+## Task 4: Deploy the application
+
+1. Execute the command below to deploy the application to the cluster.
+ ``` bash
+
+ kubectl apply -f ~/sb-hol/wstore.yaml
+
+ ```
+
+ Verify the 2 services and 2 stateful sets are created.
+
+ 
+
+
+2. Run the kubectl command below to display the status of the pod creation. Wait until the statuses become 'Running'. This may take a few minutes.
+
+ ``` bash
+
+ kubectl get pods
+
+ ```
+
+ 
+
+3. Run the kubectl command below to display the deployed services.
+
+ ``` bash
+
+ kubectl get svc
+
+ ```
+
+4. Copy the External IP of the wstore-frontend service
+
+ 
+
+5. Refer to the below example and construct a URL, and paste it into a browser's address bar. If you see the WineCellar content as in the below screenshot, the deployment was successful.
+
+ ``` bash
+
+ http:///winestore/
+
+ ```
+ 
+
+ >**Note:** It may take a few minutes to complete the deployment and start loading the page content on the screen for the first time.
+
+You may now **proceed to the next lab**.
+
+## Acknowledgements
+
+* **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
+- **Contributors** - Steven Lemme, Senior Principal Product Manager,
+Anand Prabhu, Sr. Member of Technical Staff,
+Avi Huber, Vice President, Product Management
+* **Last Updated By/Date** - Yutaka Takatsu, November, 2024
diff --git a/oci-apm-springboot/03-build-app/images/1-1-menu.png b/oci-apm-springboot/03-build-app/images/1-1-menu.png
new file mode 100644
index 000000000..1952ba10d
Binary files /dev/null and b/oci-apm-springboot/03-build-app/images/1-1-menu.png differ
diff --git a/oci-apm-springboot/03-build-app/images/1-2-menu.png b/oci-apm-springboot/03-build-app/images/1-2-menu.png
new file mode 100644
index 000000000..b8602a9b0
Binary files /dev/null and b/oci-apm-springboot/03-build-app/images/1-2-menu.png differ
diff --git a/oci-apm-springboot/03-build-app/images/1-9-oke.png b/oci-apm-springboot/03-build-app/images/1-9-oke.png
new file mode 100644
index 000000000..ad6ee836e
Binary files /dev/null and b/oci-apm-springboot/03-build-app/images/1-9-oke.png differ
diff --git a/oci-apm-springboot/03-build-app/images/2-1-oke.png b/oci-apm-springboot/03-build-app/images/2-1-oke.png
new file mode 100644
index 000000000..2e81092fe
Binary files /dev/null and b/oci-apm-springboot/03-build-app/images/2-1-oke.png differ
diff --git a/oci-apm-springboot/03-build-app/images/2-2-2-oke.png b/oci-apm-springboot/03-build-app/images/2-2-2-oke.png
new file mode 100644
index 000000000..4d47152ca
Binary files /dev/null and b/oci-apm-springboot/03-build-app/images/2-2-2-oke.png differ
diff --git a/oci-apm-springboot/03-build-app/images/2-2-oke.png b/oci-apm-springboot/03-build-app/images/2-2-oke.png
new file mode 100644
index 000000000..ca3cb448b
Binary files /dev/null and b/oci-apm-springboot/03-build-app/images/2-2-oke.png differ
diff --git a/oci-apm-springboot/03-build-app/images/2-3-oke.png b/oci-apm-springboot/03-build-app/images/2-3-oke.png
new file mode 100644
index 000000000..644984a06
Binary files /dev/null and b/oci-apm-springboot/03-build-app/images/2-3-oke.png differ
diff --git a/oci-apm-springboot/03-build-app/images/2-4-oke.png b/oci-apm-springboot/03-build-app/images/2-4-oke.png
new file mode 100644
index 000000000..0eed913e7
Binary files /dev/null and b/oci-apm-springboot/03-build-app/images/2-4-oke.png differ
diff --git a/oci-apm-springboot/03-build-app/images/3-1-mkdir.png b/oci-apm-springboot/03-build-app/images/3-1-mkdir.png
new file mode 100644
index 000000000..e06b6a05e
Binary files /dev/null and b/oci-apm-springboot/03-build-app/images/3-1-mkdir.png differ
diff --git a/oci-apm-springboot/03-build-app/images/3-2-wstore.png b/oci-apm-springboot/03-build-app/images/3-2-wstore.png
new file mode 100644
index 000000000..69318612b
Binary files /dev/null and b/oci-apm-springboot/03-build-app/images/3-2-wstore.png differ
diff --git a/oci-apm-springboot/03-build-app/images/3-3-wstore-content.png b/oci-apm-springboot/03-build-app/images/3-3-wstore-content.png
new file mode 100644
index 000000000..ffcd2a006
Binary files /dev/null and b/oci-apm-springboot/03-build-app/images/3-3-wstore-content.png differ
diff --git a/oci-apm-springboot/03-build-app/images/4-1-apply.png b/oci-apm-springboot/03-build-app/images/4-1-apply.png
new file mode 100644
index 000000000..f467b9ef7
Binary files /dev/null and b/oci-apm-springboot/03-build-app/images/4-1-apply.png differ
diff --git a/oci-apm-springboot/03-build-app/images/4-2-pods.png b/oci-apm-springboot/03-build-app/images/4-2-pods.png
new file mode 100644
index 000000000..2a49f865d
Binary files /dev/null and b/oci-apm-springboot/03-build-app/images/4-2-pods.png differ
diff --git a/oci-apm-springboot/03-build-app/images/4-3-svc.png b/oci-apm-springboot/03-build-app/images/4-3-svc.png
new file mode 100644
index 000000000..4b3f7777e
Binary files /dev/null and b/oci-apm-springboot/03-build-app/images/4-3-svc.png differ
diff --git a/oci-apm-springboot/03-build-app/images/4-4-app.png b/oci-apm-springboot/03-build-app/images/4-4-app.png
new file mode 100644
index 000000000..7caba76a9
Binary files /dev/null and b/oci-apm-springboot/03-build-app/images/4-4-app.png differ
diff --git a/oci-apm-springboot/04-deploy-apm-agent/deploy-apm-agent.md b/oci-apm-springboot/04-deploy-apm-agent/deploy-apm-agent.md
new file mode 100644
index 000000000..5e2248a33
--- /dev/null
+++ b/oci-apm-springboot/04-deploy-apm-agent/deploy-apm-agent.md
@@ -0,0 +1,157 @@
+# Instrument the server with OpenTelemetry Operator
+
+## Introduction
+
+In this lab, you will instrument the application using the OpenTelemetry (OTEL) Operator, which automatically inject and configure APM Java Agent to the Kubernetes cluster.
+
+The OCI APM Java agent is designed to monitor Java applications and supports multiple deployment options across Kubernetes and other environments. The latest addition to these options is the OTEL operator, a Kubernetes operator that simplifies the automatic injection of Java agents into JVMs running in Kubernetes Pods.
+
+ 
+
+
+You will also enable automatic APM Browser agent injection, which captures traces and spans generated by the browser, as part of the custom resource configuration.
+
+Estimated time: 5 minutes
+
+
+### Objectives
+
+* Install cert-manager and the OpenTelemetry Operator.
+* Use Kubernetes custom resources and annotations to deploy the APM agent to the cluster.
+* Enable APM Browser Agent injection for real-time user session monitoring.
+
+
+
+### Prerequisites
+
+* Completion of the preceding labs in this workshop
+
+## Task 1: Install cert-manager and OpenTelemetry Operator
+
+As a pre-requisite to automatically deploy APM Java agent in the Kubernetes, cert-manager and OpenTelemetry Operator must to be installed.
+
+1. Run the command below to install cert-manager.
+
+ ``` bash
+
+ kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.14.2/cert-manager.yaml
+
+ ```
+ 
+
+2. Once the command is complete, wait for 20 seconds to complete the configurations in the background. Then install the **[OpenTelemetry Operator](https://github.com/open-telemetry/opentelemetry-operator)** into the Kubernetes cluster by running the command below.
+
+ ``` bash
+
+ kubectl apply -f https://github.com/open-telemetry/opentelemetry-operator/releases/latest/download/opentelemetry-operator.yaml
+
+ ```
+
+ 
+
+ >**Note:** if you see an error, **no endpoints available for service "cert-manager-webhook"**, re-run the command to install OpenTelemetry Operator.
+
+## Task 2: Create Kubernetes custom resource definition
+
+To manage automatic instrumentation, the operator must have information about the agent and its configuration.
+
+The first requirement is addressed using a Custom Resource Definition (CRD). The Custom Resource will be used by the operator to copy the agent into the pod with required configuration. The OpenTelemetry operator uses Kubernetes annotations to determine which pods should be automatically injected with the OCI APM Java agent.
+
+In the custom resource, you can add parameters to enable APM Browser Agent Injection. This configures the APM Java Agent to automatically inject the browser agent, enabling real-time user session monitoring for the application.
+
+
+
+1. To create a custom resource definition, use text editor (such as the vi editor tool) to create a configuration file within the workshop directory.
+
+ ``` bash
+
+ vi ~/sb-hol/customapmresource.yaml
+
+ ```
+
+2. Copy the content below and paste it into the configuration file. Replace **Data Upload Endpoint**, **Private Data key** and the **Public Data key** (copied from the APM domain administration page in the previous labs) and save the file.
+
+
+ ``` bash
+
+ apiVersion: opentelemetry.io/v1alpha1
+ kind: Instrumentation
+ metadata:
+ name: inst-apm-java
+ namespace: opentelemetry-operator-system
+ spec:
+ java:
+ image: container-registry.oracle.com/oci_observability_management/oci-apm-java-agent:latest
+ env:
+ - name: OTEL_com_oracle_apm_agent_data_upload_endpoint
+ value:
+ - name: OTEL_com_oracle_apm_agent_private_data_key
+ value:
+ - name: OTEL_com_oracle_apm_agent_public_data_key
+ value:
+ - name: OTEL_com_oracle_apm_agent_rum_enable_injection
+ value: "true"
+ - name: OTEL_com_oracle_apm_agent_rum_service_name
+ value: wstore-web
+ - name: OTEL_com_oracle_apm_agent_rum_web_application
+ value: "Wstore WebApp"
+
+
+ ```
+ 
+
+ 3. Execute the command below to create a custom resource to the cluster.
+
+ ``` bash
+
+ kubectl apply -f ~/sb-hol/customapmresource.yaml
+
+ ```
+
+ 
+
+ >**Note:** You can ignore the warning.
+
+## Task 3: Add an annotation to the namespace
+
+Another requirement to manage automatic instrumentation is to specify which pods should be instrumented. This is handed by special annotations. Annotations can be added to a namespace to inject all pods within that namespace. Alternatively, annotations can be applied to individual PodSpec objects, such as those in Deployment, StatefulSet, and other resources. In this lab, annotation is applied to the entire namespace for the learning purposes.
+
+1. Open the namespace to edit.
+
+ ``` bash
+
+ kubectl edit namespace default
+
+ ```
+ Copy the below lines below and insert them as shown in the example image. Ensure the indentation matches the level of the "labels:" key.
+ ``` bash
+
+ annotations:
+ instrumentation.opentelemetry.io/inject-java: "opentelemetry-operator-system/inst-apm-java"
+
+ ```
+ 
+
+## Task 4: Redeploy the application
+
+1. Run the command below to restart the stafulsets. This will redeploy the application.
+
+ ``` bash
+
+ kubectl rollout restart statefulset
+
+ ```
+
+ 
+
+
+You may now **proceed to the next lab**.
+
+## Acknowledgements
+
+* **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
+- **Contributors** - Steven Lemme, Senior Principal Product Manager,
+Anand Prabhu, Sr. Member of Technical Staff,
+Mike Mu, Principal Member of Technical Staff
+Avi Huber, Vice President, Product Management
+* **Last Updated By/Date** - Yutaka Takatsu, November 2024
diff --git a/oci-apm-springboot/04-deploy-apm-agent/images/00-intro-otel-diagram.png b/oci-apm-springboot/04-deploy-apm-agent/images/00-intro-otel-diagram.png
new file mode 100644
index 000000000..bac2ebf4e
Binary files /dev/null and b/oci-apm-springboot/04-deploy-apm-agent/images/00-intro-otel-diagram.png differ
diff --git a/oci-apm-springboot/04-deploy-apm-agent/images/1-1-cert-manager.png b/oci-apm-springboot/04-deploy-apm-agent/images/1-1-cert-manager.png
new file mode 100644
index 000000000..b342c500c
Binary files /dev/null and b/oci-apm-springboot/04-deploy-apm-agent/images/1-1-cert-manager.png differ
diff --git a/oci-apm-springboot/04-deploy-apm-agent/images/1-2-otel-operator.png b/oci-apm-springboot/04-deploy-apm-agent/images/1-2-otel-operator.png
new file mode 100644
index 000000000..512780d22
Binary files /dev/null and b/oci-apm-springboot/04-deploy-apm-agent/images/1-2-otel-operator.png differ
diff --git a/oci-apm-springboot/04-deploy-apm-agent/images/2-1-create-cr.png b/oci-apm-springboot/04-deploy-apm-agent/images/2-1-create-cr.png
new file mode 100644
index 000000000..548fd2a39
Binary files /dev/null and b/oci-apm-springboot/04-deploy-apm-agent/images/2-1-create-cr.png differ
diff --git a/oci-apm-springboot/04-deploy-apm-agent/images/2-2-apply-cr.png b/oci-apm-springboot/04-deploy-apm-agent/images/2-2-apply-cr.png
new file mode 100644
index 000000000..6178e39ce
Binary files /dev/null and b/oci-apm-springboot/04-deploy-apm-agent/images/2-2-apply-cr.png differ
diff --git a/oci-apm-springboot/04-deploy-apm-agent/images/3-1-annotation.png b/oci-apm-springboot/04-deploy-apm-agent/images/3-1-annotation.png
new file mode 100644
index 000000000..b9ab8d884
Binary files /dev/null and b/oci-apm-springboot/04-deploy-apm-agent/images/3-1-annotation.png differ
diff --git a/oci-apm-springboot/04-deploy-apm-agent/images/4-1-restart-app.png b/oci-apm-springboot/04-deploy-apm-agent/images/4-1-restart-app.png
new file mode 100644
index 000000000..c8ef02aca
Binary files /dev/null and b/oci-apm-springboot/04-deploy-apm-agent/images/4-1-restart-app.png differ
diff --git a/oci-apm-springboot/04-deploy-apm-agent/images/4-2-obtain-ipaddress.png b/oci-apm-springboot/04-deploy-apm-agent/images/4-2-obtain-ipaddress.png
new file mode 100644
index 000000000..dba9ad5d2
Binary files /dev/null and b/oci-apm-springboot/04-deploy-apm-agent/images/4-2-obtain-ipaddress.png differ
diff --git a/oci-apm-springboot/04-deploy-apm-agent/images/5-1-open-app-withbrowser.png b/oci-apm-springboot/04-deploy-apm-agent/images/5-1-open-app-withbrowser.png
new file mode 100644
index 000000000..30305e221
Binary files /dev/null and b/oci-apm-springboot/04-deploy-apm-agent/images/5-1-open-app-withbrowser.png differ
diff --git a/oci-apm-springboot/04-deploy-apm-agent/images/5-2-trace-explorer-menu.png b/oci-apm-springboot/04-deploy-apm-agent/images/5-2-trace-explorer-menu.png
new file mode 100644
index 000000000..c42f82ba7
Binary files /dev/null and b/oci-apm-springboot/04-deploy-apm-agent/images/5-2-trace-explorer-menu.png differ
diff --git a/oci-apm-springboot/04-deploy-apm-agent/images/5-2-wstore-menu.png b/oci-apm-springboot/04-deploy-apm-agent/images/5-2-wstore-menu.png
new file mode 100644
index 000000000..ec35eff82
Binary files /dev/null and b/oci-apm-springboot/04-deploy-apm-agent/images/5-2-wstore-menu.png differ
diff --git a/oci-apm-springboot/04-deploy-apm-agent/images/5-3-trace-explorer.png b/oci-apm-springboot/04-deploy-apm-agent/images/5-3-trace-explorer.png
new file mode 100644
index 000000000..f5d34d42c
Binary files /dev/null and b/oci-apm-springboot/04-deploy-apm-agent/images/5-3-trace-explorer.png differ
diff --git a/oci-apm-springboot/04-deploy-apm-agent/images/5-3-wstore-source.png b/oci-apm-springboot/04-deploy-apm-agent/images/5-3-wstore-source.png
new file mode 100644
index 000000000..6cf05a425
Binary files /dev/null and b/oci-apm-springboot/04-deploy-apm-agent/images/5-3-wstore-source.png differ
diff --git a/oci-apm-springboot/j-lab-seven-view-traces/images/6-1-2-wstore.png b/oci-apm-springboot/04-deploy-apm-agent/images/6-1-2-wstore.png
similarity index 100%
rename from oci-apm-springboot/j-lab-seven-view-traces/images/6-1-2-wstore.png
rename to oci-apm-springboot/04-deploy-apm-agent/images/6-1-2-wstore.png
diff --git a/oci-apm-springboot/j-lab-seven-view-traces/images/6-1-4-demoapp.png b/oci-apm-springboot/04-deploy-apm-agent/images/6-1-4-demoapp.png
similarity index 100%
rename from oci-apm-springboot/j-lab-seven-view-traces/images/6-1-4-demoapp.png
rename to oci-apm-springboot/04-deploy-apm-agent/images/6-1-4-demoapp.png
diff --git a/oci-apm-springboot/j-lab-seven-view-traces/images/6-1-5-demoapp.png b/oci-apm-springboot/04-deploy-apm-agent/images/6-1-5-demoapp.png
similarity index 100%
rename from oci-apm-springboot/j-lab-seven-view-traces/images/6-1-5-demoapp.png
rename to oci-apm-springboot/04-deploy-apm-agent/images/6-1-5-demoapp.png
diff --git a/oci-apm-springboot/j-lab-seven-view-traces/images/6-1-6-demoapp.png b/oci-apm-springboot/04-deploy-apm-agent/images/6-1-6-demoapp.png
similarity index 100%
rename from oci-apm-springboot/j-lab-seven-view-traces/images/6-1-6-demoapp.png
rename to oci-apm-springboot/04-deploy-apm-agent/images/6-1-6-demoapp.png
diff --git a/oci-apm-springboot/j-lab-seven-view-traces/images/6-1-7-demoapp.png b/oci-apm-springboot/04-deploy-apm-agent/images/6-1-7-demoapp.png
similarity index 100%
rename from oci-apm-springboot/j-lab-seven-view-traces/images/6-1-7-demoapp.png
rename to oci-apm-springboot/04-deploy-apm-agent/images/6-1-7-demoapp.png
diff --git a/oci-apm-springboot/05-verify-agent/images/4-2-obtain-ipaddress.png b/oci-apm-springboot/05-verify-agent/images/4-2-obtain-ipaddress.png
new file mode 100644
index 000000000..dba9ad5d2
Binary files /dev/null and b/oci-apm-springboot/05-verify-agent/images/4-2-obtain-ipaddress.png differ
diff --git a/oci-apm-springboot/05-verify-agent/images/5-1-open-app-withbrowser.png b/oci-apm-springboot/05-verify-agent/images/5-1-open-app-withbrowser.png
new file mode 100644
index 000000000..30305e221
Binary files /dev/null and b/oci-apm-springboot/05-verify-agent/images/5-1-open-app-withbrowser.png differ
diff --git a/oci-apm-springboot/05-verify-agent/images/5-2-trace-explorer-menu.png b/oci-apm-springboot/05-verify-agent/images/5-2-trace-explorer-menu.png
new file mode 100644
index 000000000..c42f82ba7
Binary files /dev/null and b/oci-apm-springboot/05-verify-agent/images/5-2-trace-explorer-menu.png differ
diff --git a/oci-apm-springboot/05-verify-agent/images/5-2-wstore-menu.png b/oci-apm-springboot/05-verify-agent/images/5-2-wstore-menu.png
new file mode 100644
index 000000000..ec35eff82
Binary files /dev/null and b/oci-apm-springboot/05-verify-agent/images/5-2-wstore-menu.png differ
diff --git a/oci-apm-springboot/05-verify-agent/images/5-3-trace-explorer.png b/oci-apm-springboot/05-verify-agent/images/5-3-trace-explorer.png
new file mode 100644
index 000000000..f5d34d42c
Binary files /dev/null and b/oci-apm-springboot/05-verify-agent/images/5-3-trace-explorer.png differ
diff --git a/oci-apm-springboot/05-verify-agent/images/5-3-wstore-source.png b/oci-apm-springboot/05-verify-agent/images/5-3-wstore-source.png
new file mode 100644
index 000000000..6cf05a425
Binary files /dev/null and b/oci-apm-springboot/05-verify-agent/images/5-3-wstore-source.png differ
diff --git a/oci-apm-springboot/05-verify-agent/images/6-1-2-wstore.png b/oci-apm-springboot/05-verify-agent/images/6-1-2-wstore.png
new file mode 100644
index 000000000..0ad880c6e
Binary files /dev/null and b/oci-apm-springboot/05-verify-agent/images/6-1-2-wstore.png differ
diff --git a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-1-4-demoapp.png b/oci-apm-springboot/05-verify-agent/images/6-1-4-demoapp.png
similarity index 100%
rename from oci-apm-weblogic/i-lab-eight-view-traces/images/6-1-4-demoapp.png
rename to oci-apm-springboot/05-verify-agent/images/6-1-4-demoapp.png
diff --git a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-1-5-demoapp.png b/oci-apm-springboot/05-verify-agent/images/6-1-5-demoapp.png
similarity index 100%
rename from oci-apm-weblogic/i-lab-eight-view-traces/images/6-1-5-demoapp.png
rename to oci-apm-springboot/05-verify-agent/images/6-1-5-demoapp.png
diff --git a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-1-6-demoapp.png b/oci-apm-springboot/05-verify-agent/images/6-1-6-demoapp.png
similarity index 100%
rename from oci-apm-weblogic/i-lab-eight-view-traces/images/6-1-6-demoapp.png
rename to oci-apm-springboot/05-verify-agent/images/6-1-6-demoapp.png
diff --git a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-1-7-demoapp.png b/oci-apm-springboot/05-verify-agent/images/6-1-7-demoapp.png
similarity index 100%
rename from oci-apm-weblogic/i-lab-eight-view-traces/images/6-1-7-demoapp.png
rename to oci-apm-springboot/05-verify-agent/images/6-1-7-demoapp.png
diff --git a/oci-apm-springboot/05-verify-agent/verify-agent.md b/oci-apm-springboot/05-verify-agent/verify-agent.md
new file mode 100644
index 000000000..562117d0f
--- /dev/null
+++ b/oci-apm-springboot/05-verify-agent/verify-agent.md
@@ -0,0 +1,109 @@
+# Verify APM Agent setup and data collection
+
+## Introduction
+
+In the previous lab, you instrumented the application with an APM java agent, which captures traces and spans generated by the server, using OpenTelemetry Operator. You have also added browser injection that is automatically configured by the APM Java agent. In this lab, you will ensure the APM agents are added to the application and collects traces and spans.
+
+Estimated time: 5 minutes
+
+### Objectives
+
+* Verify the APM Browser Agent injection in the WineCellar application.
+* Generate workload on the application by navigating through the pages.
+* Verify data collection on APM Trace Explorer page.
+
+### Prerequisites
+
+* Completion of the preceding labs in this workshop
+
+## Task 1: Verify the APM Browser Agent injection
+
+1. If you are starting a new Oracle Cloud Shell session, run the oci ce (Container Engine) command that you saved in Lab 3, Task 2, step 5.
+
+2. From the Oracle Cloud shell, enter the following command.
+
+ ``` bash
+
+ kubectl get svc
+
+ ```
+
+ From the output, find the wstore-frontend service. Note down the External-IP.
+
+ 
+
+
+ >**Note:**
+
+ - The IP may be different from the last time when you accessed the WinCellar app because the pods are regenerated.
+ - If the application is not starting up, run the **kubectl get pods** command and check the status. It may take a few minutes to see the pods in the running state.
+
+3. On your laptop, start a browser and access the application with the URL pattern:
+
+ ``` bash
+
+ http:///winestore/
+
+ ```
+4. WinCellar application launches.
+
+ 
+
+
+5. Right mouse click on the browser and select a menu item to view the page source.
+
+ 
+
+6. Verify the Browser Agent JavaScript is in the page source.
+
+ 
+
+
+ >**Note:** If you do not see the Browser Agent JavaScript in the source, remove the browser cache, or try with a different browser.
+
+7. Close the page source.
+
+## Task 2: Generate workload by navigating to the app
+
+
+1. Click **Login**.
+
+ 
+
+
+2. Enter your name (or john) as username, leave the password blank, and click **Login**.
+
+ 
+
+
+3. Then click around the buttons in the pages, as in the example flow shown below.
+
+ >**Note:** Do not worry if you see the "Failed" messages, or if it takes a long time for the pages to respond. Those are expected because the app is designed to fail every once and often for demo purposes.
+
+ Click **Add** on a couple of products then hit **Shopping Cart**. Then Click **Checkout**.
+ 
+ Click **Confirm Order**, then **Logout**.
+ 
+
+## Task 3: Verify the collection of traces and spans
+
+1. Navigate through the page content to generate some workload. For example, add a few products to the cart and view the shopping cart.
+
+2. Open the OCI navigation menu, select **Observability and Management**, and then choose **Trace Explorer** under **Application Performance Monitoring**.
+
+ 
+
+3. Select the compartment and the APM domain used for the lab. Verify that the traces are collected and displayed on the screen.
+ 
+
+
+
+You may now **proceed to the next lab**.
+
+## Acknowledgements
+
+* **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
+- **Contributors** - Steven Lemme, Senior Principal Product Manager,
+Anand Prabhu, Sr. Member of Technical Staff,
+Avi Huber, Vice President, Product Management
+* **Last Updated By/Date** - Yutaka Takatsu, November, 2024
diff --git a/oci-apm-springboot/06-view-traces/images/1-10-span-details.png b/oci-apm-springboot/06-view-traces/images/1-10-span-details.png
new file mode 100644
index 000000000..fe1b2e7d4
Binary files /dev/null and b/oci-apm-springboot/06-view-traces/images/1-10-span-details.png differ
diff --git a/oci-apm-springboot/06-view-traces/images/1-11-span-details-db.png b/oci-apm-springboot/06-view-traces/images/1-11-span-details-db.png
new file mode 100644
index 000000000..fce0bf71a
Binary files /dev/null and b/oci-apm-springboot/06-view-traces/images/1-11-span-details-db.png differ
diff --git a/oci-apm-springboot/06-view-traces/images/1-13-close.png b/oci-apm-springboot/06-view-traces/images/1-13-close.png
new file mode 100644
index 000000000..28a474972
Binary files /dev/null and b/oci-apm-springboot/06-view-traces/images/1-13-close.png differ
diff --git a/oci-apm-springboot/06-view-traces/images/1-2-trace-explorer.png b/oci-apm-springboot/06-view-traces/images/1-2-trace-explorer.png
new file mode 100644
index 000000000..65056154b
Binary files /dev/null and b/oci-apm-springboot/06-view-traces/images/1-2-trace-explorer.png differ
diff --git a/oci-apm-springboot/06-view-traces/images/1-3-trace-explorer-sort.png b/oci-apm-springboot/06-view-traces/images/1-3-trace-explorer-sort.png
new file mode 100644
index 000000000..54e118107
Binary files /dev/null and b/oci-apm-springboot/06-view-traces/images/1-3-trace-explorer-sort.png differ
diff --git a/oci-apm-springboot/06-view-traces/images/1-4-trace-explorer-services.png b/oci-apm-springboot/06-view-traces/images/1-4-trace-explorer-services.png
new file mode 100644
index 000000000..edd0bd8e9
Binary files /dev/null and b/oci-apm-springboot/06-view-traces/images/1-4-trace-explorer-services.png differ
diff --git a/oci-apm-springboot/06-view-traces/images/1-5-trace-explorer-link.png b/oci-apm-springboot/06-view-traces/images/1-5-trace-explorer-link.png
new file mode 100644
index 000000000..dce94505d
Binary files /dev/null and b/oci-apm-springboot/06-view-traces/images/1-5-trace-explorer-link.png differ
diff --git a/oci-apm-springboot/06-view-traces/images/1-6-trace-details.png b/oci-apm-springboot/06-view-traces/images/1-6-trace-details.png
new file mode 100644
index 000000000..cc57924ec
Binary files /dev/null and b/oci-apm-springboot/06-view-traces/images/1-6-trace-details.png differ
diff --git a/oci-apm-springboot/06-view-traces/images/1-7-toplogy-arrows.png b/oci-apm-springboot/06-view-traces/images/1-7-toplogy-arrows.png
new file mode 100644
index 000000000..7d8c1823b
Binary files /dev/null and b/oci-apm-springboot/06-view-traces/images/1-7-toplogy-arrows.png differ
diff --git a/oci-apm-springboot/06-view-traces/images/1-8-waterfalls.png b/oci-apm-springboot/06-view-traces/images/1-8-waterfalls.png
new file mode 100644
index 000000000..435c95d97
Binary files /dev/null and b/oci-apm-springboot/06-view-traces/images/1-8-waterfalls.png differ
diff --git a/oci-apm-springboot/06-view-traces/images/1-9-waterfall-jdbc.png b/oci-apm-springboot/06-view-traces/images/1-9-waterfall-jdbc.png
new file mode 100644
index 000000000..1eafedc1d
Binary files /dev/null and b/oci-apm-springboot/06-view-traces/images/1-9-waterfall-jdbc.png differ
diff --git a/oci-apm-springboot/06-view-traces/images/2-1-trace-ex.png b/oci-apm-springboot/06-view-traces/images/2-1-trace-ex.png
new file mode 100644
index 000000000..2951eec23
Binary files /dev/null and b/oci-apm-springboot/06-view-traces/images/2-1-trace-ex.png differ
diff --git a/oci-apm-springboot/06-view-traces/images/2-2-attributes.png b/oci-apm-springboot/06-view-traces/images/2-2-attributes.png
new file mode 100644
index 000000000..ee9c79238
Binary files /dev/null and b/oci-apm-springboot/06-view-traces/images/2-2-attributes.png differ
diff --git a/oci-apm-springboot/06-view-traces/images/2-3-dimention.png b/oci-apm-springboot/06-view-traces/images/2-3-dimention.png
new file mode 100644
index 000000000..6a390bc94
Binary files /dev/null and b/oci-apm-springboot/06-view-traces/images/2-3-dimention.png differ
diff --git a/oci-apm-springboot/06-view-traces/images/2-4-apdex-query.png b/oci-apm-springboot/06-view-traces/images/2-4-apdex-query.png
new file mode 100644
index 000000000..f2dfb6b45
Binary files /dev/null and b/oci-apm-springboot/06-view-traces/images/2-4-apdex-query.png differ
diff --git a/oci-apm-springboot/06-view-traces/images/2-5-apdex-results.png b/oci-apm-springboot/06-view-traces/images/2-5-apdex-results.png
new file mode 100644
index 000000000..7638e9381
Binary files /dev/null and b/oci-apm-springboot/06-view-traces/images/2-5-apdex-results.png differ
diff --git a/oci-apm-springboot/06-view-traces/view-traces.md b/oci-apm-springboot/06-view-traces/view-traces.md
new file mode 100644
index 000000000..ded391cf7
--- /dev/null
+++ b/oci-apm-springboot/06-view-traces/view-traces.md
@@ -0,0 +1,119 @@
+# View traces and spans in APM Trace Explorer
+
+## Introduction
+
+In this lab, you will learn how to use the APM Trace Explorer to trace the workload generated with the WineCellar demo application.
+
+Estimated time: 10 minutes
+
+Watch the video below for a quick walk-through of the lab.
+[View traces and spans in APM Trace Explorer](videohub:1_ax6iqqu1)
+
+### Objectives
+
+* Examine values in the span dimensions for the frontend browser and the backend Spring Boot server
+* Use dimensions to automatically update the query and filter the selection
+
+### Prerequisites
+
+* Completion of preceding labs in this workshop.
+
+
+## Task 1: Examine traces in APM Trace Explorer
+
+1. From the OCI menu, From the OCI menu, select **Observability & Management** > **Trace Explorer**
+
+2. On the Trace Explorer page, select **apmworkshop** for the **Compartment** and the **APM Domain**.
+
+ 
+
+3. By default, traces are displayed in the order by the start time. Right mouse click on the **Duration** column, select **Sort Descending** to show the traces by duration in descending order. This will bring the slowest trace to the top of the list.
+
+ 
+
+4. Hover the mouse over the bar in the **Spans** column at the top row. Verify three services are included in the trace, and each color represents a service, wstore-back, wstore-front, and wstore-web, which you defined in the previous labs.
+
+ 
+
+5. Click the trace link at the **Service:Operationame** column.
+
+ 
+
+ >**Note:** If you do not see a slow trace with a duration of 10 seconds or more, you can navigate the WineStore demo app a few times until you see the programmed slowness in the checkout service.
+
+6. **Trace Details** page opens. Review the trace information on the upper screen. E.g., Status, Trace ID, Whether it has an error or not, how many spans and services are involved, or the duration of the trace.
+ 
+
+7. In the **Topology** view, you can see how the operations are connected within the trace. Different colors indicate different services. Hover the mouse on the icons and the arrows that connect the icons. Review the information in the callouts.
+ 
+
+ In this example, it seems that the checkout service is where the most time was spent in the trace.
+
+ >**Note:** The operations may look differently in the trace you selected.
+
+8. Scroll down the page to show the **Spans** view. Spans in the trace are displayed in a Gantt chart. A span at the top of the list is the root span, and the child spans are nested below the root span.
+
+ 
+
+ In this example, one of the operations is taking 5 seconds alone, out of the total duration of 6 seconds. This seems to be the bottleneck of the slowness.
+
+9. Click the operation name link.
+
+ 
+
+10. This opens a **Span Details** view. Review the span information, such as the operation name, which service it belongs to, start date and time, start time after the trace started, duration of the span, Trace ID, and Span ID.
+
+ 
+
+ From the operation name, this is a JDBC span that is generated by requesting a call to the database.
+
+11. Scroll down and review the collected dimension values. In this example, there are 67 dimensions collected. E.g., App server, Host, Kubernetes, and performance information. In addition, it has database information, because this is a JDBC span.
+
+ 
+
+12. Click **Close** to close the **Span Details** view.
+
+13. Click the **Close** to close the **Trace Details** view.. This will bring you back to the Trace Explore the main view.
+
+ 
+
+## Task 2: Filter traces with dimensions
+
+1. Click **Attributes** from the left side of the Trace Explorer main screen. This will slide out the Attribute pane.
+
+ 
+
+2. Type '**apdex**' into the search field. Then click **ApdexLevel** from the list.
+
+ 
+
+3. **Dimension ApdexLevel Values** window opens. Apdex or Application Performance Index measures customer satisfaction based on applications' page or service performance. Review the values and counts. In this example, there are 8 frustrated traces, 8 tolerating traces, and 62 satisfied traces.
+
+ 
+
+ Select **frustrated** from the list, then click **Add to Query**.
+
+4. Notice that the condition **("ApdexLevel" = 'frustrated')** has been inserted to the query.
+
+ 
+
+5. Traces view is refreshed and shows only traces that **ApdexLevel** is frustrated.
+
+ 
+
+
+
+
+
+## Conclusions
+
+In this workshop, you learned how to use the Kubernetes OpenTelemetry Operator to automatically deploy an APM Java agent to a microservices web application. You also explored how to configure the APM Browser agent within a custom resource definition and use the APM Trace Explorer to view traces and spans. For more information on APM, refer to the OCI documentation, **[Application Performance Monitoring](https://docs.oracle.com/en-us/iaas/application-performance-monitoring/index.html)**.
+
+
+## Acknowledgements
+
+* **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
+- **Contributors** - Steven Lemme, Senior Principal Product Manager,
+Anand Prabhu, Sr. Member of Technical Staff,
+Avi Huber, Vice President, Product Management
+* **Last Updated By/Date** - Yutaka Takatsu, November, 2024
diff --git a/oci-apm-springboot/07-cleanup/cleanup.md b/oci-apm-springboot/07-cleanup/cleanup.md
new file mode 100644
index 000000000..5872c6cf6
--- /dev/null
+++ b/oci-apm-springboot/07-cleanup/cleanup.md
@@ -0,0 +1,135 @@
+# Clean up the workshop environment
+
+## Introduction
+
+In this lab, you will clean up the workshop environment by running commands from the Cloud shell, also manually removing the Oracle cloud resources using the Oracle Cloud console.
+
+Estimated time: 10 minutes
+
+Watch the video below for a quick walk-through of the lab.
+[Clean up the workshop environment](videohub:1_lnwo2eyw)
+
+### Objectives
+
+* Remove the lab configurations and setups
+
+### Prerequisites
+
+* Completion of preceding labs in this workshop.
+
+## Task 1: Clean Up the application setup
+
+To delete the workshop setup from your tenancy, follow the steps below.
+
+1. Run the oci ce (Container Engine) command that you saved in Lab 3, Task 2, step 5.
+
+2. Remove the application deployment.
+
+ ``` bash
+
+ kubectl delete -f ~/sb-hol/wstore.yaml
+
+ ```
+ 
+
+2. Remove the the **[OpenTelemetry Operator](https://github.com/open-telemetry/opentelemetry-operator)** from the Kubernetes cluster.
+
+ ``` bash
+
+ kubectl delete -f https://github.com/open-telemetry/opentelemetry-operator/releases/latest/download/opentelemetry-operator.yaml
+
+ ```
+
+ 
+
+3. Run the command below to delete cert-manager.
+
+ ``` bash
+
+ kubectl delete -f https://github.com/cert-manager/cert-manager/releases/download/v1.14.2/cert-manager.yaml
+
+ ```
+ 
+
+## Task 2: Remove the container
+
+1. From the navigation menu in the Oracle Cloud console, select **Developer Services** > **Kubernetes Container(OKE)**. Then click the link to the Cluster configured in the workshop.
+
+ 
+
+2. In the **Cluster Details** page, click **Delete**. In the confirmation window, enter the name of the cluster, then click **Delete**.
+
+ 
+
+3. Deletion of the File System starts and completes.
+
+ 
+
+## Task 3: Remove the VCN
+
+1. From the navigation menu in the Oracle Cloud console, select **Networking** > **Virtual Cloud Networks**. Then click the link to the VCN configured in the workshop.
+
+ 
+
+2. In the **Virtual Cloud Network Details** page, scroll down to locate the **Subnets** section. Select one of the subnets and click the three-dot icon on the right-hand side of the row.
+
+ 
+
+3. From the pulldown menu, select **Terminate**. In the confirmation window, click **Terminate**.
+
+ 
+
+4. Repeat to terminate other subnets. Once all the subnets are deleted, from the upper side of the VCN details page, click **Terminate** to remove the VCN.
+
+ 
+
+5. **Delete Virtual Cloud Network** dialog opens. Click **Scan**.
+
+
+ 
+
+
+
+6. Click the **Terminate All** button when activated. Termination of the resources begins. Once the message **Virtual Cloud Network termination complete** shows, click **Close**.
+ 
+
+## Task 4: Remove the workshop directory
+
+1. Open the Oracle Cloud shell, and run the following commands to remove the files and the workshop directory.
+
+ ``` bash
+
+ cd ~;rm -r sb-hol;rm sb-hol.zip
+
+ ```
+ 
+
+## Task 5: Remove the APM domain and compartment
+
+ 1. From the navigation menu in the Oracle Cloud console, select **Observability & Management** > **Administration**. Then click the link to the APM domain which you created in the workshop.
+ 
+
+ 2. In the **Domain details** page, click **Delete**. In the confirmation window, enter the name of the APM domain, then click **Delete**.
+ 
+
+ 3. Deletion of the APM domain starts and completes. This may take a few minutes. Refresh the screen periodically and check the status.
+ 
+
+ 4. From the navigation menu in the Oracle Cloud console, select **Identity & Security** > **Compartment**. Then click the link to the compartment which you created in the workshop.
+ 
+
+ 5. In the **Compartment details** page, click **Delete**. In the confirmation window, click **Delete**.
+ 
+
+ 6. Deletion of the compartment starts and completes. This may take a few minutes.
+ 
+
+
+
+## Acknowledgements
+
+* **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
+- **Contributors** - Steven Lemme, Senior Principal Product Manager,
+Anand Prabhu, Sr. Member of Technical Staff,
+Avi Huber, Vice President, Product Management
+* **Last Updated By/Date** - Yutaka Takatsu, November, 2024
diff --git a/oci-apm-springboot/07-cleanup/images/1-1-remove-app.png b/oci-apm-springboot/07-cleanup/images/1-1-remove-app.png
new file mode 100644
index 000000000..1dd10161d
Binary files /dev/null and b/oci-apm-springboot/07-cleanup/images/1-1-remove-app.png differ
diff --git a/oci-apm-springboot/07-cleanup/images/1-2-remove-otel.png b/oci-apm-springboot/07-cleanup/images/1-2-remove-otel.png
new file mode 100644
index 000000000..b4e6d3775
Binary files /dev/null and b/oci-apm-springboot/07-cleanup/images/1-2-remove-otel.png differ
diff --git a/oci-apm-springboot/07-cleanup/images/1-3-remove-cert-manager.png b/oci-apm-springboot/07-cleanup/images/1-3-remove-cert-manager.png
new file mode 100644
index 000000000..bf3d070ce
Binary files /dev/null and b/oci-apm-springboot/07-cleanup/images/1-3-remove-cert-manager.png differ
diff --git a/oci-apm-springboot/k-lab-eight-cleanup/images/4-1-cleanup.png b/oci-apm-springboot/07-cleanup/images/4-1-cleanup.png
similarity index 100%
rename from oci-apm-springboot/k-lab-eight-cleanup/images/4-1-cleanup.png
rename to oci-apm-springboot/07-cleanup/images/4-1-cleanup.png
diff --git a/oci-apm-springboot/k-lab-eight-cleanup/images/4-10-cleanup.png b/oci-apm-springboot/07-cleanup/images/4-10-cleanup.png
similarity index 100%
rename from oci-apm-springboot/k-lab-eight-cleanup/images/4-10-cleanup.png
rename to oci-apm-springboot/07-cleanup/images/4-10-cleanup.png
diff --git a/oci-apm-springboot/k-lab-eight-cleanup/images/4-11-cleanup.png b/oci-apm-springboot/07-cleanup/images/4-11-cleanup.png
similarity index 100%
rename from oci-apm-springboot/k-lab-eight-cleanup/images/4-11-cleanup.png
rename to oci-apm-springboot/07-cleanup/images/4-11-cleanup.png
diff --git a/oci-apm-springboot/k-lab-eight-cleanup/images/4-12-cleanup.png b/oci-apm-springboot/07-cleanup/images/4-12-cleanup.png
similarity index 100%
rename from oci-apm-springboot/k-lab-eight-cleanup/images/4-12-cleanup.png
rename to oci-apm-springboot/07-cleanup/images/4-12-cleanup.png
diff --git a/oci-apm-springboot/k-lab-eight-cleanup/images/4-13-cleanup.png b/oci-apm-springboot/07-cleanup/images/4-13-cleanup.png
similarity index 100%
rename from oci-apm-springboot/k-lab-eight-cleanup/images/4-13-cleanup.png
rename to oci-apm-springboot/07-cleanup/images/4-13-cleanup.png
diff --git a/oci-apm-springboot/k-lab-eight-cleanup/images/4-14-2-cleanup.png b/oci-apm-springboot/07-cleanup/images/4-14-2-cleanup.png
similarity index 100%
rename from oci-apm-springboot/k-lab-eight-cleanup/images/4-14-2-cleanup.png
rename to oci-apm-springboot/07-cleanup/images/4-14-2-cleanup.png
diff --git a/oci-apm-springboot/k-lab-eight-cleanup/images/4-14-cleanup.png b/oci-apm-springboot/07-cleanup/images/4-14-cleanup.png
similarity index 100%
rename from oci-apm-springboot/k-lab-eight-cleanup/images/4-14-cleanup.png
rename to oci-apm-springboot/07-cleanup/images/4-14-cleanup.png
diff --git a/oci-apm-springboot/k-lab-eight-cleanup/images/4-15-cleanup.png b/oci-apm-springboot/07-cleanup/images/4-15-cleanup.png
similarity index 100%
rename from oci-apm-springboot/k-lab-eight-cleanup/images/4-15-cleanup.png
rename to oci-apm-springboot/07-cleanup/images/4-15-cleanup.png
diff --git a/oci-apm-springboot/k-lab-eight-cleanup/images/4-16-cleanup.png b/oci-apm-springboot/07-cleanup/images/4-16-cleanup.png
similarity index 100%
rename from oci-apm-springboot/k-lab-eight-cleanup/images/4-16-cleanup.png
rename to oci-apm-springboot/07-cleanup/images/4-16-cleanup.png
diff --git a/oci-apm-springboot/k-lab-eight-cleanup/images/4-2-cleanup.png b/oci-apm-springboot/07-cleanup/images/4-2-cleanup.png
similarity index 100%
rename from oci-apm-springboot/k-lab-eight-cleanup/images/4-2-cleanup.png
rename to oci-apm-springboot/07-cleanup/images/4-2-cleanup.png
diff --git a/oci-apm-springboot/k-lab-eight-cleanup/images/4-3-cleanup.png b/oci-apm-springboot/07-cleanup/images/4-3-cleanup.png
similarity index 100%
rename from oci-apm-springboot/k-lab-eight-cleanup/images/4-3-cleanup.png
rename to oci-apm-springboot/07-cleanup/images/4-3-cleanup.png
diff --git a/oci-apm-springboot/k-lab-eight-cleanup/images/4-4-cleanup.png b/oci-apm-springboot/07-cleanup/images/4-4-cleanup.png
similarity index 100%
rename from oci-apm-springboot/k-lab-eight-cleanup/images/4-4-cleanup.png
rename to oci-apm-springboot/07-cleanup/images/4-4-cleanup.png
diff --git a/oci-apm-springboot/k-lab-eight-cleanup/images/4-5-cleanup.png b/oci-apm-springboot/07-cleanup/images/4-5-cleanup.png
similarity index 100%
rename from oci-apm-springboot/k-lab-eight-cleanup/images/4-5-cleanup.png
rename to oci-apm-springboot/07-cleanup/images/4-5-cleanup.png
diff --git a/oci-apm-springboot/k-lab-eight-cleanup/images/4-6-cleanup.png b/oci-apm-springboot/07-cleanup/images/4-6-cleanup.png
similarity index 100%
rename from oci-apm-springboot/k-lab-eight-cleanup/images/4-6-cleanup.png
rename to oci-apm-springboot/07-cleanup/images/4-6-cleanup.png
diff --git a/oci-apm-springboot/k-lab-eight-cleanup/images/4-7-cleanup.png b/oci-apm-springboot/07-cleanup/images/4-7-cleanup.png
similarity index 100%
rename from oci-apm-springboot/k-lab-eight-cleanup/images/4-7-cleanup.png
rename to oci-apm-springboot/07-cleanup/images/4-7-cleanup.png
diff --git a/oci-apm-springboot/k-lab-eight-cleanup/images/4-8-cleanup.png b/oci-apm-springboot/07-cleanup/images/4-8-cleanup.png
similarity index 100%
rename from oci-apm-springboot/k-lab-eight-cleanup/images/4-8-cleanup.png
rename to oci-apm-springboot/07-cleanup/images/4-8-cleanup.png
diff --git a/oci-apm-springboot/k-lab-eight-cleanup/images/4-9-cleanup.png b/oci-apm-springboot/07-cleanup/images/4-9-cleanup.png
similarity index 100%
rename from oci-apm-springboot/k-lab-eight-cleanup/images/4-9-cleanup.png
rename to oci-apm-springboot/07-cleanup/images/4-9-cleanup.png
diff --git a/oci-apm-springboot/k-lab-eight-cleanup/images/6-1-cleanup.png b/oci-apm-springboot/07-cleanup/images/6-1-cleanup.png
similarity index 100%
rename from oci-apm-springboot/k-lab-eight-cleanup/images/6-1-cleanup.png
rename to oci-apm-springboot/07-cleanup/images/6-1-cleanup.png
diff --git a/oci-apm-springboot/k-lab-eight-cleanup/images/6-2-cleanup.png b/oci-apm-springboot/07-cleanup/images/6-2-cleanup.png
similarity index 100%
rename from oci-apm-springboot/k-lab-eight-cleanup/images/6-2-cleanup.png
rename to oci-apm-springboot/07-cleanup/images/6-2-cleanup.png
diff --git a/oci-apm-springboot/k-lab-eight-cleanup/images/6-3-cleanup.png b/oci-apm-springboot/07-cleanup/images/6-3-cleanup.png
similarity index 100%
rename from oci-apm-springboot/k-lab-eight-cleanup/images/6-3-cleanup.png
rename to oci-apm-springboot/07-cleanup/images/6-3-cleanup.png
diff --git a/oci-apm-springboot/k-lab-eight-cleanup/images/6-4-cleanup.png b/oci-apm-springboot/07-cleanup/images/6-4-cleanup.png
similarity index 100%
rename from oci-apm-springboot/k-lab-eight-cleanup/images/6-4-cleanup.png
rename to oci-apm-springboot/07-cleanup/images/6-4-cleanup.png
diff --git a/oci-apm-springboot/k-lab-eight-cleanup/images/6-5-cleanup.png b/oci-apm-springboot/07-cleanup/images/6-5-cleanup.png
similarity index 100%
rename from oci-apm-springboot/k-lab-eight-cleanup/images/6-5-cleanup.png
rename to oci-apm-springboot/07-cleanup/images/6-5-cleanup.png
diff --git a/oci-apm-springboot/k-lab-eight-cleanup/images/6-6-cleanup.png b/oci-apm-springboot/07-cleanup/images/6-6-cleanup.png
similarity index 100%
rename from oci-apm-springboot/k-lab-eight-cleanup/images/6-6-cleanup.png
rename to oci-apm-springboot/07-cleanup/images/6-6-cleanup.png
diff --git a/oci-apm-springboot/l-lab-nine-learn-more/images/1-1-2-get-started.png b/oci-apm-springboot/08-learn-more/images/1-1-2-get-started.png
similarity index 100%
rename from oci-apm-springboot/l-lab-nine-learn-more/images/1-1-2-get-started.png
rename to oci-apm-springboot/08-learn-more/images/1-1-2-get-started.png
diff --git a/oci-apm-springboot/08-learn-more/images/1-1-get-started.png b/oci-apm-springboot/08-learn-more/images/1-1-get-started.png
new file mode 100644
index 000000000..d10b38428
Binary files /dev/null and b/oci-apm-springboot/08-learn-more/images/1-1-get-started.png differ
diff --git a/oci-apm-helidon/09-learn-more/images/1-2-get-started.png b/oci-apm-springboot/08-learn-more/images/1-2-get-started.png
similarity index 100%
rename from oci-apm-helidon/09-learn-more/images/1-2-get-started.png
rename to oci-apm-springboot/08-learn-more/images/1-2-get-started.png
diff --git a/oci-apm-helidon/09-learn-more/images/1-3-get-started.png b/oci-apm-springboot/08-learn-more/images/1-3-get-started.png
similarity index 100%
rename from oci-apm-helidon/09-learn-more/images/1-3-get-started.png
rename to oci-apm-springboot/08-learn-more/images/1-3-get-started.png
diff --git a/oci-apm-helidon/09-learn-more/images/1-4-get-started.png b/oci-apm-springboot/08-learn-more/images/1-4-get-started.png
similarity index 100%
rename from oci-apm-helidon/09-learn-more/images/1-4-get-started.png
rename to oci-apm-springboot/08-learn-more/images/1-4-get-started.png
diff --git a/oci-apm-helidon/09-learn-more/images/1-5-get-started.png b/oci-apm-springboot/08-learn-more/images/1-5-get-started.png
similarity index 100%
rename from oci-apm-helidon/09-learn-more/images/1-5-get-started.png
rename to oci-apm-springboot/08-learn-more/images/1-5-get-started.png
diff --git a/oci-apm-helidon/09-learn-more/images/1-6-get-started.png b/oci-apm-springboot/08-learn-more/images/1-6-get-started.png
similarity index 100%
rename from oci-apm-helidon/09-learn-more/images/1-6-get-started.png
rename to oci-apm-springboot/08-learn-more/images/1-6-get-started.png
diff --git a/oci-apm-springboot/08-learn-more/learn-more.md b/oci-apm-springboot/08-learn-more/learn-more.md
new file mode 100644
index 000000000..faab99cf1
--- /dev/null
+++ b/oci-apm-springboot/08-learn-more/learn-more.md
@@ -0,0 +1,45 @@
+# Learn more about APM
+
+## Introduction
+
+Congratulations! You have completed the workshop.
+
+To learn more about APM, please visit **Get started with Oracle Cloud Application Performance Monitoring** workshop.
+
+ 
+ 
+
+In this workshop, you will learn how to use Oracle Cloud APM to examine critical performance alarms, view synthetic monitors in a dashboard to analyze the trend and identify spikes, observe the monitor's client-side details in HTTP Archive (HAR) file, and explore the server-side details by tracing data in APM Trace Explorer.
+
+### Objectives
+
+* Review APM alarms
+* Examine APM synthetic monitors
+* Explore monitor details and their history
+* Perform exploration of application trace data
+
+### Prerequisites
+
+* Familiarity with distributed tracing is helpful, but not required
+* Familiarity with Oracle Cloud is helpful
+
+## Task 1: Access the workshop
+
+1. Click the link following URL to access the workshop: **[Get started with Oracle Cloud APM](https://livelabs.oracle.com/pls/apex/r/dbpm/livelabs/view-workshop?wid=3350)** Workshop.
+Alternatively, open a new browser tab, copy the following URL, paste it to the address bar, and hit enter.
+
+ ``` bash
+
+ https://livelabs.oracle.com/pls/apex/r/dbpm/livelabs/view-workshop?wid=3350
+
+ ```
+
+
+
+## Acknowledgements
+
+* **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
+- **Contributors** - Steven Lemme, Senior Principal Product Manager,
+Anand Prabhu, Sr. Member of Technical Staff,
+Avi Huber, Vice President, Product Management
+* **Last Updated By/Date** - Yutaka Takatsu, November, 2024
diff --git a/oci-apm-springboot/a-introduction/introduction.md b/oci-apm-springboot/a-introduction/introduction.md
deleted file mode 100644
index 72981dc82..000000000
--- a/oci-apm-springboot/a-introduction/introduction.md
+++ /dev/null
@@ -1,62 +0,0 @@
-# Introduction
-
-## About this Workshop
-
-This workshop walks you through how to configure Spring Boot microservices deployed on Kubernetes for monitoring with the Oracle Application Performance Monitoring (APM) service. This enables automatic OpenTracing instrumentation and metrics collection that is used to provide full, end-to-end monitoring and diagnostics for the application.
-
-In this workshop, you will provision the APM Java agent in either a file system (Paid Oracle account) or block volumes (Paid or Free tier account) mounted in the Oracle Cloud, deploy the agent to the Kubernetes cluster, instrument the APM Browser agent by inserting JavaScript code to a webpage and view traces and spans in APM Trace Explorer.
-
->**Note:** The same approach demonstrated for Spring Boot Java microservices on Kubernetes can be used to configure other types of java application servers, such as WebLogic, deployed on Kubernetes.
-
-
-
-Estimated Time: 75 minutes
-
-### About Oracle Cloud Infrastructure Application Performance Management (OCI APM)
-
-The diagram below provides an overview of the OCI APM Service, its features, components, and some of the other OCI services it integrates with.
-
- 
-
-Among other capabilities, OCI APM includes an implementation of a Distributed Tracing system. It collects and processes transaction trace data (spans) from the monitored application and makes it available for viewing, dashboarding, exploration, alerts, etc. For more information on APM and Trace Explorer please refer to Application Performance Monitoring > **[Use Trace Explorer](https://docs.oracle.com/en-us/iaas/application-performance-monitoring/doc/use-trace-explorer.html)** section in the OCI Documentation.
-
-In the workshop, you will learn how to instrument a Java microservices application deployed on a Kubernetes cluster with APM agents. You will also learn how to create an APM domain in the Oracle Cloud and use Trace Explorer to search and view traces/spans in the APM User Interface.
-
->**Note:** Creating a file system requires OCI quota and permissions. If you are running the workshop in a free tier with 30 day free trial, please select to create block volumes. After completion of Lab 3, select **Lab 4 (Free Trial) "Create and configure block volumes"**, then proceed to **Lab 5 (Free Trial) "Instrument server monitoring on the block volumes"**.
-
-### Objectives
-
-In this workshop, you will:
-* Create an APM domain, obtain Data Upload Endpoint and Data Keys
-* Create a file system or block volumes in the Oracle Cloud Infrastructure, and mount it in the Kubernetes pods
-* Download, provision and deploy the APM Java agent
-* Apply custom storage configuration to the Kubernetes pods
-* Instrument APM Browser agent
-* Use APM Trace Explorer to view traces, spans, and span dimensions
-
-### Prerequisites
-
-
-* An Oracle Free Tier with a 30-day free trial or Paid Cloud Account - Please view this workshop's LiveLabs landing page to see which environments are supported.
-
-
->**Note:** If you have a **Free Trial** account when your Free Trial expires, your account will be converted to an **Always Free** account. You will not be able to conduct Free Tier workshops unless the Always Free environment is available.
-**[Click here for the Free Tier FAQ page.](https://www.oracle.com/cloud/free/faq.html)**
-
-If you are running the workshop in a Paid Cloud Account, ensure you have the permissions below:
-* Oracle Cloud resources and permissions to create a file system. See **[Creating File Systems](https://docs.oracle.com/en-us/iaas/Content/File/Tasks/creatingfilesystems.htm)** and **[Service Limits](https://docs.oracle.com/en-us/iaas/Content/General/Concepts/servicelimits.htm#top)** in the Oracle Cloud documentation.
-* Oracle Cloud Account Administrator role or manage apm-domains permission in the target compartment. See **[Perform Oracle Cloud Infrastructure Prerequisites (APM)](https://docs.oracle.com/en-us/iaas/application-performance-monitoring/doc/perform-oracle-cloud-infrastructure-prerequisite-tasks.html)** in the Oracle Cloud documentation.
-
-
-### More APM Workshops
-
-* Please visit: **[APM LiveLabs workshops](https://livelabs.oracle.com/pls/apex/f?p=133:100:111996377805307::::SEARCH:application+Performance+monitoring)**.
-
-
-## Acknowledgements
-
-- **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
-- **Contributors** - Steven Lemme, Senior Principal Product Manager,
-Anand Prabhu, Sr. Member of Technical Staff,
-Avi Huber, Vice President, Product Management
-- **Last Updated By/Date** - Yutaka Takatsu, March 2023
diff --git a/oci-apm-springboot/b-lab-one-create-oke/create-oke.md b/oci-apm-springboot/b-lab-one-create-oke/create-oke.md
deleted file mode 100644
index 45b447281..000000000
--- a/oci-apm-springboot/b-lab-one-create-oke/create-oke.md
+++ /dev/null
@@ -1,78 +0,0 @@
-# Create a Kubernetes cluster
-
-## Introduction
-
-This workshop uses Spring Boot-based Java microservices as a target application to trace against. In this lab, first, you will use the Oracle Cloud console to set up an OCI compartment, second, create an Oracle container engine for Kubernetes (OKE) cluster in your tenancy. In Lab 3, you will deploy the application to the OKE.
-
-Estimated time: 5 minutes
-
-Watch the video below for a quick walk-through of the lab.
-[Create a Kubernetes cluster](videohub:1_4f64eivu)
-
-### Objectives
-
-* Create a compartment
-* Create a Kubernetes cluster
-
-### Prerequisites
-
-* This lab requires an [Oracle Cloud account](https://www.oracle.com/cloud/free/). You may use your cloud account, or a Free tier account, a cloud account that you obtained through a trial.
-
-
-## Task 1: Create an OCI compartment
-
-1. Open the navigation menu from the top-left corner (aka. hamburger menu) of the Oracle Cloud console and select **Identity & Security** > **Compartments**.
- 
-2. Click **Create Compartments**
- 
-3. Enter the following parameters:
-* Compartment name: **apmworkshop**
-* Description: **APM workshop compartment**
-* Accept the default values for the other fields, and click, **Create Compartment**
- 
-* Verify that your apmworkshop compartment is created in the table
- 
-
-## Task 2: Create an OKE
-
-1. Open the navigation menu from the top left corner (aka. hamburger menu) in the Oracle Cloud console, and select **Developer Services** > **Kubernetes Clusters (OKE)**.
-
- 
-
-2. Make sure the **apmworkshop** is selected in the Compartment field, then click **Create cluster**
-
- 
-
-3. Quick Create pane is pre-selected. Keep the default selection and click **Submit**.
-
- 
-
-4. Name the cluster as **apmlab-cluser1**. Accept the default setting for other fields and click **Next**.
-
- 
- 
-
-5. Review the configuration, and click **Create cluster**.
-
- 
-
-6. Make sure all verification steps are cleared. Click **Close**.
-
- 
-
-7. This will start to create a cluster, and takes 7 to 10 minutes to complete. While waiting for the creation of the cluster, you can proceed to the next lab to create an APM domain. In Lab 3, we will resume the steps to build the application.
-
- 
-
-
-
-
-You may now **proceed to the next lab**.
-
-## Acknowledgements
-
-* **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
-- **Contributors** - Steven Lemme, Senior Principal Product Manager,
-Anand Prabhu, Sr. Member of Technical Staff,
-Avi Huber, Vice President, Product Management
-* **Last Updated By/Date** - Yutaka Takatsu, August 2022
diff --git a/oci-apm-springboot/b-lab-one-create-oke/images/1-1-compartments.png b/oci-apm-springboot/b-lab-one-create-oke/images/1-1-compartments.png
deleted file mode 100644
index 436dbcd04..000000000
Binary files a/oci-apm-springboot/b-lab-one-create-oke/images/1-1-compartments.png and /dev/null differ
diff --git a/oci-apm-springboot/b-lab-one-create-oke/images/1-1-menu.png b/oci-apm-springboot/b-lab-one-create-oke/images/1-1-menu.png
deleted file mode 100644
index a784d907b..000000000
Binary files a/oci-apm-springboot/b-lab-one-create-oke/images/1-1-menu.png and /dev/null differ
diff --git a/oci-apm-springboot/b-lab-one-create-oke/images/1-2-OKE.png b/oci-apm-springboot/b-lab-one-create-oke/images/1-2-OKE.png
deleted file mode 100644
index 96317ab1b..000000000
Binary files a/oci-apm-springboot/b-lab-one-create-oke/images/1-2-OKE.png and /dev/null differ
diff --git a/oci-apm-springboot/b-lab-one-create-oke/images/1-2-compartments.png b/oci-apm-springboot/b-lab-one-create-oke/images/1-2-compartments.png
deleted file mode 100644
index 3cffdf62c..000000000
Binary files a/oci-apm-springboot/b-lab-one-create-oke/images/1-2-compartments.png and /dev/null differ
diff --git a/oci-apm-springboot/b-lab-one-create-oke/images/1-3-OKE.png b/oci-apm-springboot/b-lab-one-create-oke/images/1-3-OKE.png
deleted file mode 100644
index e7763ec06..000000000
Binary files a/oci-apm-springboot/b-lab-one-create-oke/images/1-3-OKE.png and /dev/null differ
diff --git a/oci-apm-springboot/b-lab-one-create-oke/images/1-3-compartments.png b/oci-apm-springboot/b-lab-one-create-oke/images/1-3-compartments.png
deleted file mode 100644
index e15717b48..000000000
Binary files a/oci-apm-springboot/b-lab-one-create-oke/images/1-3-compartments.png and /dev/null differ
diff --git a/oci-apm-springboot/b-lab-one-create-oke/images/1-4-OKE.png b/oci-apm-springboot/b-lab-one-create-oke/images/1-4-OKE.png
deleted file mode 100644
index 1cfaaf3f5..000000000
Binary files a/oci-apm-springboot/b-lab-one-create-oke/images/1-4-OKE.png and /dev/null differ
diff --git a/oci-apm-springboot/b-lab-one-create-oke/images/1-4-compartments.png b/oci-apm-springboot/b-lab-one-create-oke/images/1-4-compartments.png
deleted file mode 100644
index 8dcc12c0a..000000000
Binary files a/oci-apm-springboot/b-lab-one-create-oke/images/1-4-compartments.png and /dev/null differ
diff --git a/oci-apm-springboot/b-lab-one-create-oke/images/1-5-OKE.png b/oci-apm-springboot/b-lab-one-create-oke/images/1-5-OKE.png
deleted file mode 100644
index 1486af1be..000000000
Binary files a/oci-apm-springboot/b-lab-one-create-oke/images/1-5-OKE.png and /dev/null differ
diff --git a/oci-apm-springboot/b-lab-one-create-oke/images/1-6-OKE.png b/oci-apm-springboot/b-lab-one-create-oke/images/1-6-OKE.png
deleted file mode 100644
index 01559ea97..000000000
Binary files a/oci-apm-springboot/b-lab-one-create-oke/images/1-6-OKE.png and /dev/null differ
diff --git a/oci-apm-springboot/b-lab-one-create-oke/images/1-7-OKE.png b/oci-apm-springboot/b-lab-one-create-oke/images/1-7-OKE.png
deleted file mode 100644
index d8f2dd4a5..000000000
Binary files a/oci-apm-springboot/b-lab-one-create-oke/images/1-7-OKE.png and /dev/null differ
diff --git a/oci-apm-springboot/b-lab-one-create-oke/images/1-8-OKE.png b/oci-apm-springboot/b-lab-one-create-oke/images/1-8-OKE.png
deleted file mode 100644
index 3127aa3a3..000000000
Binary files a/oci-apm-springboot/b-lab-one-create-oke/images/1-8-OKE.png and /dev/null differ
diff --git a/oci-apm-springboot/b-lab-one-create-oke/images/1-9-OKE.png b/oci-apm-springboot/b-lab-one-create-oke/images/1-9-OKE.png
deleted file mode 100644
index 54ea57c46..000000000
Binary files a/oci-apm-springboot/b-lab-one-create-oke/images/1-9-OKE.png and /dev/null differ
diff --git a/oci-apm-springboot/b-lab-one-create-oke/images/2-1-OKE.png b/oci-apm-springboot/b-lab-one-create-oke/images/2-1-OKE.png
deleted file mode 100644
index eff037a4c..000000000
Binary files a/oci-apm-springboot/b-lab-one-create-oke/images/2-1-OKE.png and /dev/null differ
diff --git a/oci-apm-springboot/b-lab-one-create-oke/images/2-2-2-OKE.png b/oci-apm-springboot/b-lab-one-create-oke/images/2-2-2-OKE.png
deleted file mode 100644
index ea12ba657..000000000
Binary files a/oci-apm-springboot/b-lab-one-create-oke/images/2-2-2-OKE.png and /dev/null differ
diff --git a/oci-apm-springboot/b-lab-one-create-oke/images/2-2-OKE.png b/oci-apm-springboot/b-lab-one-create-oke/images/2-2-OKE.png
deleted file mode 100644
index 7e689aa5e..000000000
Binary files a/oci-apm-springboot/b-lab-one-create-oke/images/2-2-OKE.png and /dev/null differ
diff --git a/oci-apm-springboot/b-lab-one-create-oke/images/2-3-OKE.png b/oci-apm-springboot/b-lab-one-create-oke/images/2-3-OKE.png
deleted file mode 100644
index 67ea9c668..000000000
Binary files a/oci-apm-springboot/b-lab-one-create-oke/images/2-3-OKE.png and /dev/null differ
diff --git a/oci-apm-springboot/b-lab-one-create-oke/images/2-4-OKE.png b/oci-apm-springboot/b-lab-one-create-oke/images/2-4-OKE.png
deleted file mode 100644
index 92c61e51d..000000000
Binary files a/oci-apm-springboot/b-lab-one-create-oke/images/2-4-OKE.png and /dev/null differ
diff --git a/oci-apm-springboot/b-lab-one-create-oke/images/4-1-cloudshell.png b/oci-apm-springboot/b-lab-one-create-oke/images/4-1-cloudshell.png
deleted file mode 100644
index 297aef0ff..000000000
Binary files a/oci-apm-springboot/b-lab-one-create-oke/images/4-1-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/b-lab-one-create-oke/images/4-2-cloudshell.png b/oci-apm-springboot/b-lab-one-create-oke/images/4-2-cloudshell.png
deleted file mode 100644
index 54b4a6fb0..000000000
Binary files a/oci-apm-springboot/b-lab-one-create-oke/images/4-2-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/b-lab-one-create-oke/images/4-3-cloudshell.png b/oci-apm-springboot/b-lab-one-create-oke/images/4-3-cloudshell.png
deleted file mode 100644
index 3e1685873..000000000
Binary files a/oci-apm-springboot/b-lab-one-create-oke/images/4-3-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/b-lab-one-create-oke/images/4-4-winestore.png b/oci-apm-springboot/b-lab-one-create-oke/images/4-4-winestore.png
deleted file mode 100644
index 577683b21..000000000
Binary files a/oci-apm-springboot/b-lab-one-create-oke/images/4-4-winestore.png and /dev/null differ
diff --git a/oci-apm-springboot/c-lab-two-create-domain/create-domain.md b/oci-apm-springboot/c-lab-two-create-domain/create-domain.md
deleted file mode 100644
index ea648df66..000000000
--- a/oci-apm-springboot/c-lab-two-create-domain/create-domain.md
+++ /dev/null
@@ -1,74 +0,0 @@
-# Create an APM Domain and obtain Data Upload Endpoint and Private Data Key
-
-## Introduction
-
-In this lab, you will create an APM Domain. You will acquire a Data Upload Endpoint and a Private Data Key, which are needed to configure the APM Tracer on the application.
-
-Estimated time: 10 minutes
-
-Watch the video below for a quick walk-through of the lab.
-[Create an APM Domain and obtain Data Upload Endpoint and Private Data Key](videohub:1_jxkk5vpb)
-
-### Objectives
-
-* Create an APM Domain
-* Obtain a Data Upload Endpoint and a Private Data Key
-
-
-### Prerequisites
-
-* This lab requires an [Oracle Cloud account](https://www.oracle.com/cloud/free/). You may use your cloud account, or a Free tier account, a cloud account that you obtained through a trial.
-* To create an APM domain, you will need an Oracle Cloud Account Administrator role or manage apm-domains permission in the target compartment. For more details, refer to the OCI Documentation, [Create an APM Domain](https://docs.oracle.com/en-us/iaas/application-performance-monitoring/doc/create-apm-domain.html).
-
-## Task 1: Create an APM domain
-
-1. From the OCI menu, select **Observability & Management**, then **Administration**.
- 
-
-2. Select the **apmworkshop** compartment from the pulldown menu.
- 
-3. Click **Create APM Domain**.
- 
-4. Name your APM domain as **apmworkshop** and select the compartment you created. Add a check to the **“Create as Always Free Domain”**, then click **Create**.
- 
-
-
-5. Press the refresh button periodically to check the status. This may take a few minutes.
- 
-6. Once the job is completed, the status turns to Active with a green icon.
- 
- For more details on how to create an APM Domain, refer to the OCI documentation, [Create an APM Domain](https://docs.oracle.com/en-us/iaas/application-performance-monitoring/doc/create-apm-domain.html).
-
-## Task 2: Obtain Data Upload Endpoint and Private and Public Data Keys
-
-To upload tracing data to an APM domain, Data Upload Endpoint and both Private and Public Data Keys must be configured in the application’s configuration files. Next, you are going to obtain the values for them and then enter them into the Oracle Cloud console.
-
-1. Click the link to the APM domain.
- 
-
-
-
-2. Under **Resources**, click **Data Keys**.
-
- 
-
-3. In the **APM Domain Information** tab, find **Data Upload Endpoint**, then click **Copy**. Paste the copied value to a text file and save. You will need this value in the later steps in the workshop.
-
-
-4. Under **Data Keys**, find **auto\_generated\_private_data\_key**. Click **Copy** and save the value to the text file.
-
-5. In the same section, find **auto\_generated\_public_data\_key**. Click **Copy** and save the value to the text file.
- 
-
-For more details on Data Upload Endpoint and Data keys, refer to the OCI documentation, [Obtaining Data Upload Endpoint and Data keys](https://docs.oracle.com/en-us/iaas/application-performance-monitoring/doc/obtain-data-upload-endpoint-and-data-keys.html).
-
-You may now **proceed to the next lab**.
-
-## Acknowledgements
-
-* **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
-- **Contributors** -
-Steven Lemme, Senior Principal Product Manager,
-Anand Prabhu, Sr. Member of Technical Staff,
-Avi Huber, Vice President, Product Management
-* **Last Updated By/Date** - Yutaka Takatsu, December 2022
diff --git a/oci-apm-springboot/c-lab-two-create-domain/images/2-1-2-domain.png b/oci-apm-springboot/c-lab-two-create-domain/images/2-1-2-domain.png
deleted file mode 100644
index 40c618963..000000000
Binary files a/oci-apm-springboot/c-lab-two-create-domain/images/2-1-2-domain.png and /dev/null differ
diff --git a/oci-apm-springboot/c-lab-two-create-domain/images/2-1-domain.png b/oci-apm-springboot/c-lab-two-create-domain/images/2-1-domain.png
deleted file mode 100644
index 6d5e27e62..000000000
Binary files a/oci-apm-springboot/c-lab-two-create-domain/images/2-1-domain.png and /dev/null differ
diff --git a/oci-apm-springboot/c-lab-two-create-domain/images/2-3-domain.png b/oci-apm-springboot/c-lab-two-create-domain/images/2-3-domain.png
deleted file mode 100644
index e31629bd8..000000000
Binary files a/oci-apm-springboot/c-lab-two-create-domain/images/2-3-domain.png and /dev/null differ
diff --git a/oci-apm-springboot/c-lab-two-create-domain/images/2-4-domain.png b/oci-apm-springboot/c-lab-two-create-domain/images/2-4-domain.png
deleted file mode 100644
index 4fecedfa0..000000000
Binary files a/oci-apm-springboot/c-lab-two-create-domain/images/2-4-domain.png and /dev/null differ
diff --git a/oci-apm-springboot/c-lab-two-create-domain/images/2-5-domain.png b/oci-apm-springboot/c-lab-two-create-domain/images/2-5-domain.png
deleted file mode 100644
index 1e9ccdef0..000000000
Binary files a/oci-apm-springboot/c-lab-two-create-domain/images/2-5-domain.png and /dev/null differ
diff --git a/oci-apm-springboot/c-lab-two-create-domain/images/3-1-2-domain.png b/oci-apm-springboot/c-lab-two-create-domain/images/3-1-2-domain.png
deleted file mode 100644
index 6c987834f..000000000
Binary files a/oci-apm-springboot/c-lab-two-create-domain/images/3-1-2-domain.png and /dev/null differ
diff --git a/oci-apm-springboot/c-lab-two-create-domain/images/3-1-domain.png b/oci-apm-springboot/c-lab-two-create-domain/images/3-1-domain.png
deleted file mode 100644
index 8982ad017..000000000
Binary files a/oci-apm-springboot/c-lab-two-create-domain/images/3-1-domain.png and /dev/null differ
diff --git a/oci-apm-springboot/c-lab-two-create-domain/images/3-2-domain.png b/oci-apm-springboot/c-lab-two-create-domain/images/3-2-domain.png
deleted file mode 100644
index d1370b379..000000000
Binary files a/oci-apm-springboot/c-lab-two-create-domain/images/3-2-domain.png and /dev/null differ
diff --git a/oci-apm-springboot/d-lab-three-build-app/build-app.md b/oci-apm-springboot/d-lab-three-build-app/build-app.md
deleted file mode 100644
index 8d18b24d2..000000000
--- a/oci-apm-springboot/d-lab-three-build-app/build-app.md
+++ /dev/null
@@ -1,148 +0,0 @@
-# Build a microservices application
-
-## Introduction
-
-This workshop uses Spring Boot-based Java microservices as a target application to trace against. In this lab, you will deploy the application to the Kubernetes cluster you created in Lab 1.
-
-Estimated time: 10 minutes
-
-Watch the video below for a quick walk-through of the lab.
-[Build a microservices application](videohub:1_94bv1d35)
-
-### Objectives
-
-* Build a microservices application for monitoring
-
-### Prerequisites
-
-* Completion of the preceding labs in this workshop
-
-## Task 1: Verify OKE
-
-1. Go back to the Kubernetes cluster page where you left Lab 1, and check the status of the cluster. Open the navigation menu from the top left corner (aka. hamburger menu) in the Oracle Cloud console, and select **Developer Services** > **Kubernetes Clusters (OKE)**.
-
- 
-
-2. Click the **apmlab-cluser1** link from the table.
-
- 
-
-3. If the status of the cluster is **Active**, creation was successful. If it is still in a **Creating** status, it may take a few more minutes to complete. (Usually, it takes 7 to 10 minutes to finish the jobs to create a cluster).
-
- 
-
-## Task 2: Access the OKE in the Oracle Cloud shell
-
-
-1. Click **Access Cluster** on the cluster details page.
-
- 
-
-2. Make sure the **Cloud Shell Access** is selected. Click the **Copy** link from the command to access kubeconfig for the cluster.
-
- 
-
-3. Then click **Launch Cloud Shell**.
-
- 
-
-4. Oracle Cloud Shell window opens at the lower side of the browser screen.
-
- 
-
-5. Paste the copied command to the command shell prompt. Then hit enter.
-
- 
-
- >**Note:** Save the command to a text file on your laptop, and execute it whenever you start a new Cloud Shell session while working in the labs in this workshop.
-
-## Task 3: Download configuration files
-
-1. Download the zip file to the home directory in the Cloud Shell.
-
- ``` bash
-
- cd ~; wget https://objectstorage.us-phoenix-1.oraclecloud.com/n/axfo51x8x2ap/b/apmocw-bucket-2022/o/sb-hol.zip
-
- ```
- 
-
-3. Unzip the file. This will create a directory **sb-hol**.
-
- ``` bash
-
- unzip ~/sb-hol.zip
-
- ```
-
- 
-
-## Task 4: Deploy the application
-
-1. Execute the following command from the Cloud Shell.
-
- ``` bash
-
- cd ~/sb-hol;ls
-
- ```
- 
-
- >**Note:** Verify there are the following files in the folder.
- - apmlab-fss.yaml
- - wstore.yaml
- - wstore-add-storage.yaml
- - wstore-deploy-agent.yaml
-
-3. Execute the command below to deploy the application to the cluster.
- ``` bash
-
- kubectl apply -f ~/sb-hol/wstore.yaml --validate=false
-
- ```
-
-4. Verify the 2 services and 2 stateful sets are created.
-
- 
-
-
-5. Run the kubectl command below to display the status of the pod creation. Wait until the statuses become 'Running'. This may take a few minutes.
-
- ``` bash
-
- kubectl get pods
-
- ```
- 
-
-5. Run the kubectl command below to display the deployed services.
-
- ``` bash
-
- kubectl get svc
-
- ```
-5. Copy the External IP of the wstore-frontend service
-
- 
-
-6. Refer to the below example and construct a URL, and paste it into a browser's address bar. If you see the WineCellar content as in the below screenshot, the deployment was successful.
-
- ``` bash
-
- http:///winestore/
-
- ```
- 
-
- >**Note:** It may take a few minutes to complete the deployment and start loading the page content on the screen for the first time.
-
-You may now **proceed to the next lab**.
-
-## Acknowledgements
-
-* **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
-- **Contributors** - Steven Lemme, Senior Principal Product Manager,
-Anand Prabhu, Sr. Member of Technical Staff,
-Avi Huber, Vice President, Product Management
-* **Last Updated By/Date** - Yutaka Takatsu, August 2022
diff --git a/oci-apm-springboot/d-lab-three-build-app/images/1-1-menu.png b/oci-apm-springboot/d-lab-three-build-app/images/1-1-menu.png
deleted file mode 100644
index a784d907b..000000000
Binary files a/oci-apm-springboot/d-lab-three-build-app/images/1-1-menu.png and /dev/null differ
diff --git a/oci-apm-springboot/d-lab-three-build-app/images/1-2-menu.png b/oci-apm-springboot/d-lab-three-build-app/images/1-2-menu.png
deleted file mode 100644
index c7bd864c3..000000000
Binary files a/oci-apm-springboot/d-lab-three-build-app/images/1-2-menu.png and /dev/null differ
diff --git a/oci-apm-springboot/d-lab-three-build-app/images/1-9-OKE.png b/oci-apm-springboot/d-lab-three-build-app/images/1-9-OKE.png
deleted file mode 100644
index ec4692f37..000000000
Binary files a/oci-apm-springboot/d-lab-three-build-app/images/1-9-OKE.png and /dev/null differ
diff --git a/oci-apm-springboot/d-lab-three-build-app/images/2-1-OKE.png b/oci-apm-springboot/d-lab-three-build-app/images/2-1-OKE.png
deleted file mode 100644
index eff037a4c..000000000
Binary files a/oci-apm-springboot/d-lab-three-build-app/images/2-1-OKE.png and /dev/null differ
diff --git a/oci-apm-springboot/d-lab-three-build-app/images/2-2-2-OKE.png b/oci-apm-springboot/d-lab-three-build-app/images/2-2-2-OKE.png
deleted file mode 100644
index ea12ba657..000000000
Binary files a/oci-apm-springboot/d-lab-three-build-app/images/2-2-2-OKE.png and /dev/null differ
diff --git a/oci-apm-springboot/d-lab-three-build-app/images/2-2-OKE.png b/oci-apm-springboot/d-lab-three-build-app/images/2-2-OKE.png
deleted file mode 100644
index 7e689aa5e..000000000
Binary files a/oci-apm-springboot/d-lab-three-build-app/images/2-2-OKE.png and /dev/null differ
diff --git a/oci-apm-springboot/d-lab-three-build-app/images/2-3-OKE.png b/oci-apm-springboot/d-lab-three-build-app/images/2-3-OKE.png
deleted file mode 100644
index 67ea9c668..000000000
Binary files a/oci-apm-springboot/d-lab-three-build-app/images/2-3-OKE.png and /dev/null differ
diff --git a/oci-apm-springboot/d-lab-three-build-app/images/2-4-OKE.png b/oci-apm-springboot/d-lab-three-build-app/images/2-4-OKE.png
deleted file mode 100644
index 92c61e51d..000000000
Binary files a/oci-apm-springboot/d-lab-three-build-app/images/2-4-OKE.png and /dev/null differ
diff --git a/oci-apm-springboot/d-lab-three-build-app/images/3-1-cloudshell.png b/oci-apm-springboot/d-lab-three-build-app/images/3-1-cloudshell.png
deleted file mode 100644
index cdf336682..000000000
Binary files a/oci-apm-springboot/d-lab-three-build-app/images/3-1-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/d-lab-three-build-app/images/3-2-cloudshell.png b/oci-apm-springboot/d-lab-three-build-app/images/3-2-cloudshell.png
deleted file mode 100644
index e654e06a2..000000000
Binary files a/oci-apm-springboot/d-lab-three-build-app/images/3-2-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/d-lab-three-build-app/images/4-1-cloudshell.png b/oci-apm-springboot/d-lab-three-build-app/images/4-1-cloudshell.png
deleted file mode 100644
index 62e59035e..000000000
Binary files a/oci-apm-springboot/d-lab-three-build-app/images/4-1-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/d-lab-three-build-app/images/4-2-1-cloudshell.png b/oci-apm-springboot/d-lab-three-build-app/images/4-2-1-cloudshell.png
deleted file mode 100644
index 08729d1b6..000000000
Binary files a/oci-apm-springboot/d-lab-three-build-app/images/4-2-1-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/d-lab-three-build-app/images/4-2-cloudshell.png b/oci-apm-springboot/d-lab-three-build-app/images/4-2-cloudshell.png
deleted file mode 100644
index bcea07bf0..000000000
Binary files a/oci-apm-springboot/d-lab-three-build-app/images/4-2-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/d-lab-three-build-app/images/4-3-cloudshell.png b/oci-apm-springboot/d-lab-three-build-app/images/4-3-cloudshell.png
deleted file mode 100644
index f31086ee8..000000000
Binary files a/oci-apm-springboot/d-lab-three-build-app/images/4-3-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/d-lab-three-build-app/images/4-4-winestore.png b/oci-apm-springboot/d-lab-three-build-app/images/4-4-winestore.png
deleted file mode 100644
index 577683b21..000000000
Binary files a/oci-apm-springboot/d-lab-three-build-app/images/4-4-winestore.png and /dev/null differ
diff --git a/oci-apm-springboot/e-lab-four-create-file-system/create-file-system.md b/oci-apm-springboot/e-lab-four-create-file-system/create-file-system.md
deleted file mode 100755
index e75836e52..000000000
--- a/oci-apm-springboot/e-lab-four-create-file-system/create-file-system.md
+++ /dev/null
@@ -1,370 +0,0 @@
-# Create and configure a file system
-
-## Introduction
-
-In this lab, you will create a file system in the Oracle Cloud Infrastructure. You will also create security rules to allow network traffic and mount the file system to the Kubernetes pods.
-
-***This lab requires OCI quota and permissions to create a file system in your tenancy. If you are using a FREE TRIAL, please go to the next Lab 4 (Free Trial): "Create and configure block volumes", which does not require a paid OCI quota.***
-
-Estimated time: 15 minutes
-
-Watch the video below for a quick walk-through of the lab.
-[Create and configure a file system](videohub:1_nuemqknc)
-
-### Objectives
-
-* Create a file system in the Oracle Cloud
-* Create security rules in the network
-* Create a YAML file, which defines Storage Class, Persistent Volume, and Persistent Volume Claim
-* Mount the volume to the Kubernetes cluster by applying the YAML, which recreates the Kubernetes pods with the new storage configuration
-
-### Prerequisites
-
-* OCI quota and permissions to create a file system and associated resources. See **[Creating File Systems](https://docs.oracle.com/en-us/iaas/Content/File/Tasks/creatingfilesystems.htm)** and **[Service Limits](https://docs.oracle.com/en-us/iaas/Content/General/Concepts/servicelimits.htm#top)** in the Oracle Cloud documentation.
-* Completion of the preceding labs in this workshop
-
-## Task 1: Create a file system in the Oracle Cloud
-
-1. Minimize the Cloud Shell window by clicking the Minimize button.
-
- 
-
-2. From the OCI menu, select **Storage** > **File Systems**.
-
- 
-
-3. Make sure you are in the compartment **apmworkshop**. If not, select it from the pulldown menu.
-
- 
-
-4. Click **Create File System**
-
- 
-
-5. On the **Create File System** page, ensure the **File System for NFS** is selected. In the **File System Information** section, click **Edit Details**.
-
- 
-
-6. On the Create File System page, enter **apmlab-fss** into the **Name** field.
-
- Make sure the **apmworkshop** is selected in the **Compartment**. Leave the other fields in the section with default values.
- ***Do NOT click the Create button yet.***
-
- 
-
-7. Scroll down the **Create File System** page and find the **Export Information** section. Verify that the **Export Path** is set to **/apmlab-fss**. This is where the file system will be mounted. You will provision the APM Java agent at this location. In the **Mount Target Information** section, click **Edit Details** to expand the section.
-
- 
-
-8. In the **Mount Target Information** section, click the link **Click here to enable compartment selections**.
-
- 
-
-9. In the Mount Target Information section, ensure that the **Create New Mount Target** is selected. Then locate the **Create in Compartment** field, and ensure the **apmworkshop** compartment is selected.
- 
-10. Leave the other fields by default and click **Create**.
-
- 
-
-11. A new File System is created. Scroll down to find the **Exports** section. Click the link to the **Mount Target** just created.
-
- 
-
-12. Click **Copy** next to the **OCID**. Save the value in a text file on your computer. Also, take note of the **IP Address** as you will need these values in the next steps.
-
- 
-
-## Task 2: Create security rules in the network
-
-1. In the Mount Target Information section point your mouse cursor over the **“i”** icon next to **Subnet** and review the message. As the message indicates, security rules must be configured before mounting the file system, and that is what you will be doing next.
-
- 
-
-2. Click the **Subnet** link to open the Subnet page.
-
- 
-
-
-3. In the **Subnet Details page**, scroll down and find the **Security Lists** section, then click the link to the security list.
-
- 
-
-4. Click the **Add Ingress Rules** button
-
- 
-
-5. In the **Add Ingress Rules** dialog, enter the following information:
-
- * Stateless: **No**
- * Source Type: **CIDR**
- * Source CIDR: **0.0.0.0/0**
- * IP Protocol: **TCP**
- * Source Port Range: leave as default (All)
- * Destination Port Range: **111,2048-2050**
- * Description: **Ingress security rule for apmlab-fss**
-
- 
-
-6. Click the **+ Another Ingress Rule** button and create an additional rule for **UDP**, with the destination port range **111,2048**. Use the same values with the rule created above for the rest of the fields.
-
- Click the **Add Ingress Rules** button which creates 4 ingress rules in the security list.
-
- 
-
-7. After the configuration, your **Ingress Rules** have 4 additional security rules as in the image below.
-
- 
-
-8. Click **Egress Rules**, which is located on the left side of the screen.
-
- 
-
-9. Click the **Add Egress Rules** button.
-
- 
-
-10. In the **Add Egress Rules** dialog, enter the following information:
-
-
- * Stateless: **No**
- * Source Type: **CIDR**
- * Source CIDR: **0.0.0.0/0**
- * IP Protocol: **TCP**
- * Source Port Range: leave as default (All)
- * Destination Port Range: **111,2048-2050**
- * Description: **Egress security rule for apmlab-fss**
-
- 
-
-11. Click the **+ Another Egress Rule** button and create an additional rule for **UDP**, with the destination port **111**. Use the same values with the rule created above for the rest of the fields.
Click **Add Egress Rules** button which creates 3 egress rules in the security list.
-
- 
-
-12. After the configuration, your **Egress Rules** have 3 additional security rules as in the image below.
-
- 
-
-## Task 3: Mount the file system to Kubernetes pods
-
-1. Click the **Developer tools** icon from the top right corner in the Oracle Cloud console menu bar, then select **Cloud shell** to start a Cloud Shell environment which will appear at the bottom of your page.
- 
-
- > **Note:** If the Cloud Shell is already running but the window is minimized, you can restore the window by clicking the **Restore** icon on the toolbar.
- 
-
-
-2. If the previous Cloud Shell session is expired, run the oci ce (Container Engine) command that you saved in Lab 3, Task 2, step 5.
-
-
- 
-
-3. Use any text editor (such as the vi editor tool) to open the **apmlab-fss.yaml** file for editing.
-
- ``` bash
-
- vi ~/sb-hol/apmlab-fss.yaml
-
- ```
-
- >**Note:** If you are using the vi editor, type ***i*** to enter Insert mode, and make the text editable. Use allow keys to navigate the text and make changes to where you set the cursor. To save a file, press the Esc key, then type ***:wq*** to write and quit the file. If you do not wish a change, press Esc then type ***:q!*** to discard your changes. Please refer to the editor's references for more usage.
- Alternatively, you can use a built-in code editor to edit files. To use the code editor, select the **Developer tools** icon from the toolbar> select **Code Editor**.
- 
-
-4. Review the file contents that create Kubernetes objects (StorageClass, PersistentVolume, PersistentVolumeClaim) in your OKE. Replace the **mntTargetID** and **server IP** with the values copied in Lab 3, Task 1, step 11 in this Workshop. Save the change and close the file.
-
- apiVersion: storage.k8s.io/v1
- kind: StorageClass
- metadata:
- name: apmlab-fss
- provisioner: oracle.com/apmlab-fss
- parameters:
- mntTargetId:
- ---
- apiVersion: v1
- kind: PersistentVolume
- metadata:
- name: apmlab-fsspv
- spec:
- storageClassName: apmlab-fss
- capacity:
- storage: 10Gi
- accessModes:
- - ReadWriteMany
- mountOptions:
- - nosuid
- nfs:
- server:
- path: "/apmlab-fss"
- readOnly: false
- ---
- apiVersion: v1
- kind: PersistentVolumeClaim
- metadata:
- name: apmlab-fsspv
- spec:
- storageClassName: apmlab-fss
- accessModes:
- - ReadWriteMany
- resources:
- requests:
- storage: 10Gi
- volumeName: apmlab-fsspv
-
- >**Note:** Refer to the screenshot image below to see what it should look like after the file is modified. Verify that the Kubernetes objects, such as StorageClass, PersistentVolume, and PersistentVolumeClass are configured in the YAML file.
- 
-
-
-## Task 4: Apply changes to the container
-
-1. Execute the following command to add the storage objects to the Kubernetes cluster.
-
- ``` bash
-
- kubectl apply -f ~/sb-hol/apmlab-fss.yaml
-
- ```
-2. Verify the Storage Class, PV and PVC are created.
-
- 
-
- >**Note:** If you need to modify the YAML file after once applied, first run the command below to remove the objects, modify the file, then rerun the above command to re-apply the YAML.
- kubectl delete -f ~/sb-hol/apmlab-fss.yaml
-
-## Task 5: Add volumes to Kubernetes pods
-
-1. Next, you will need to map the PV to the pods. Open **wstore.yaml** file with an editor.
-
- ``` bash
-
- vi ~/sb-hol/wstore.yaml
-
- ```
-
-2. Scroll down the file. You will see there are two statefulsets, **wstore-front** and **wstore-back**, defined in the YAML file.
-
-3. Within each statefulset, find a line that defines the container port: "**- containerPort: 8080**" (line 51 and line 75).
-
- 
-
-4. Hit **i** to enter the edit mode. Carefully insert the following code below the **containerPort**. Note that the same changes have to be made in both statefulsets, **wstore-back** and **wstore-front**.
-
-
- volumeMounts:
- - mountPath: "/apmlab-fss"
- name: apmlab-nfs
- volumes:
- - name: apmlab-nfs
- persistentVolumeClaim:
- claimName: apmlab-fsspv
-
-
-
- > ***Suggested Editing Tips:***
- - Use your mouse to select the text above, and manually copy and paste it into a text file.
- - Auto copy is not provided as it may break the indentation.
- - Copy the entire area from the text box, including the space preceding the text.
- - In the yaml file, place your mouse cursor at the beginning of the line, then paste the code.
- - Make sure to keep the same space indentation when pasting the code into the file.
- - "VolumeMounts:" aligns with "ports:"
- - "Volumes:" aligns with "imagePullSecrets:"
- - Refer to the screenshot image below to see how it should look, after the file is modified.
- 
- - Also refer to the below code change made to one of the statefulsets, **wstore-back**.
-
- apiVersion: apps/v1
- kind: StatefulSet
- metadata:
- name: wstore-back
- spec:
- serviceName: "wstore-backend"
- replicas: 2
- selector:
- matchLabels:
- app: wstore-back
- template:
- metadata:
- labels:
- app: wstore-back
- spec:
- containers:
- - name: wstore
- image: iad.ocir.io/axfo51x8x2ap/p-winestore:latest
- command: ["java", "-jar", "./wineStore.jar", "--spring.config.location=file:/spring/wstore.properties"]
- ports:
- - containerPort: 8080
- volumeMounts:
- - mountPath: "/apmlab-fss"
- name: apmlab-nfs
- volumes:
- - name: apmlab-nfs
- persistentVolumeClaim:
- claimName: apmlab-fsspv
- imagePullSecrets:
- - name: ocirsecret
-
-
-
-5. Run the following command. This will recreate the pods, with the new object configurations.
-
- ``` bash
-
- kubectl apply -f ~/sb-hol/wstore.yaml --validate=false
-
- ```
- Verify that the service for wstore-frontend and both statefulsets are configured.
-
- 
-
-
-6. Run the following command to ensure the pods are in the running state. Verify the **AGE** column to ensure the pods are restarted.
-
- ``` bash
-
- kubectl get pods
-
- ```
-
- 
-
-
-7. ***Troubleshooting:*** If the pods do not come back with the running state in a minute or two, review the configuration in the file to make sure they have the right indentation. For learning purposes, we have preconfigured the volume mapping in the **wstore-add-storage.yaml** file. Run the following command to view what it looks like after the successful file editing.
-
- ``` bash
-
- vi ~/sb-hol/wstore-add-storage.yaml
-
- ```
-
- > If the problem persists, optionally, you can run the preconfigured YAML file to regenerate the file with the volume mapping.
- - First, run the following command to delete the failing configurations:
- kubectl delete -f ~/sb-hol/wstore.yaml
- - Then run the following to apply the preconfigured settings:
- kubectl apply -f ~/sb-hol/wstore-add-storage.yaml --validate=false
-
-
-
-8. Execute the following command to access the Kubernetes pods.
-
- ``` bash
-
- kubectl exec -it wstore-front-0 -- bash -c "cd / && ls "
-
- ```
-
- Make sure that you see the ***apmlab-fss*** directory that is the file system mounted to this location.
-
- 
-
-
- >***Debugging TIPS***: If you cannot find the apmlab-fss directory, or the pods do not start running, execute the following command from the Cloud Shell to troubleshoot.
- kubectl get events --sort-by=.metadata.creationTimestamp
-
-You may now **proceed to Lab 5 (Paid Tenancy): Instrument server monitoring on the file system**.
-
-## Acknowledgements
-
-* **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
-- **Contributors** - Steven Lemme, Senior Principal Product Manager,
-Anand Prabhu, Sr. Member of Technical Staff,
-Avi Huber, Vice President, Product Management
-* **Last Updated By/Date** - Yutaka Takatsu, March 2023
diff --git a/oci-apm-springboot/e-lab-four-create-file-system/images/1-7-cloudshell.png b/oci-apm-springboot/e-lab-four-create-file-system/images/1-7-cloudshell.png
deleted file mode 100644
index 4429064a9..000000000
Binary files a/oci-apm-springboot/e-lab-four-create-file-system/images/1-7-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/e-lab-four-create-file-system/images/3-1-0-cloushell.png b/oci-apm-springboot/e-lab-four-create-file-system/images/3-1-0-cloushell.png
deleted file mode 100644
index d5a7f1399..000000000
Binary files a/oci-apm-springboot/e-lab-four-create-file-system/images/3-1-0-cloushell.png and /dev/null differ
diff --git a/oci-apm-springboot/e-lab-four-create-file-system/images/3-1-1-2-filesystem.png b/oci-apm-springboot/e-lab-four-create-file-system/images/3-1-1-2-filesystem.png
deleted file mode 100644
index 50a5693e1..000000000
Binary files a/oci-apm-springboot/e-lab-four-create-file-system/images/3-1-1-2-filesystem.png and /dev/null differ
diff --git a/oci-apm-springboot/e-lab-four-create-file-system/images/3-1-1-menu.png b/oci-apm-springboot/e-lab-four-create-file-system/images/3-1-1-menu.png
deleted file mode 100644
index 5aa57d007..000000000
Binary files a/oci-apm-springboot/e-lab-four-create-file-system/images/3-1-1-menu.png and /dev/null differ
diff --git a/oci-apm-springboot/e-lab-four-create-file-system/images/3-1-2-filesystem.png b/oci-apm-springboot/e-lab-four-create-file-system/images/3-1-2-filesystem.png
deleted file mode 100644
index cbf01d5e3..000000000
Binary files a/oci-apm-springboot/e-lab-four-create-file-system/images/3-1-2-filesystem.png and /dev/null differ
diff --git a/oci-apm-springboot/e-lab-four-create-file-system/images/3-1-3-filesystem.png b/oci-apm-springboot/e-lab-four-create-file-system/images/3-1-3-filesystem.png
deleted file mode 100644
index ca106278b..000000000
Binary files a/oci-apm-springboot/e-lab-four-create-file-system/images/3-1-3-filesystem.png and /dev/null differ
diff --git a/oci-apm-springboot/e-lab-four-create-file-system/images/3-1-4-1-filesystem.png b/oci-apm-springboot/e-lab-four-create-file-system/images/3-1-4-1-filesystem.png
deleted file mode 100644
index 046cc96a9..000000000
Binary files a/oci-apm-springboot/e-lab-four-create-file-system/images/3-1-4-1-filesystem.png and /dev/null differ
diff --git a/oci-apm-springboot/e-lab-four-create-file-system/images/3-1-4-filesystem.png b/oci-apm-springboot/e-lab-four-create-file-system/images/3-1-4-filesystem.png
deleted file mode 100644
index 390c96c67..000000000
Binary files a/oci-apm-springboot/e-lab-four-create-file-system/images/3-1-4-filesystem.png and /dev/null differ
diff --git a/oci-apm-springboot/e-lab-four-create-file-system/images/3-1-5-1-filesystem.png b/oci-apm-springboot/e-lab-four-create-file-system/images/3-1-5-1-filesystem.png
deleted file mode 100644
index a934bfc99..000000000
Binary files a/oci-apm-springboot/e-lab-four-create-file-system/images/3-1-5-1-filesystem.png and /dev/null differ
diff --git a/oci-apm-springboot/e-lab-four-create-file-system/images/3-1-5-filesystem.png b/oci-apm-springboot/e-lab-four-create-file-system/images/3-1-5-filesystem.png
deleted file mode 100644
index c94233d38..000000000
Binary files a/oci-apm-springboot/e-lab-four-create-file-system/images/3-1-5-filesystem.png and /dev/null differ
diff --git a/oci-apm-springboot/e-lab-four-create-file-system/images/3-1-6-filesystem.png b/oci-apm-springboot/e-lab-four-create-file-system/images/3-1-6-filesystem.png
deleted file mode 100644
index b58e984ce..000000000
Binary files a/oci-apm-springboot/e-lab-four-create-file-system/images/3-1-6-filesystem.png and /dev/null differ
diff --git a/oci-apm-springboot/e-lab-four-create-file-system/images/3-1-7-filesystem.png b/oci-apm-springboot/e-lab-four-create-file-system/images/3-1-7-filesystem.png
deleted file mode 100644
index 37943522d..000000000
Binary files a/oci-apm-springboot/e-lab-four-create-file-system/images/3-1-7-filesystem.png and /dev/null differ
diff --git a/oci-apm-springboot/e-lab-four-create-file-system/images/3-1-8-filesystem.png b/oci-apm-springboot/e-lab-four-create-file-system/images/3-1-8-filesystem.png
deleted file mode 100644
index 58ae07693..000000000
Binary files a/oci-apm-springboot/e-lab-four-create-file-system/images/3-1-8-filesystem.png and /dev/null differ
diff --git a/oci-apm-springboot/e-lab-four-create-file-system/images/3-1-9-filesystem.png b/oci-apm-springboot/e-lab-four-create-file-system/images/3-1-9-filesystem.png
deleted file mode 100644
index b47b979dc..000000000
Binary files a/oci-apm-springboot/e-lab-four-create-file-system/images/3-1-9-filesystem.png and /dev/null differ
diff --git a/oci-apm-springboot/e-lab-four-create-file-system/images/3-2-10-securityrules.png b/oci-apm-springboot/e-lab-four-create-file-system/images/3-2-10-securityrules.png
deleted file mode 100644
index 789be6e61..000000000
Binary files a/oci-apm-springboot/e-lab-four-create-file-system/images/3-2-10-securityrules.png and /dev/null differ
diff --git a/oci-apm-springboot/e-lab-four-create-file-system/images/3-2-11-2-securityrules.png b/oci-apm-springboot/e-lab-four-create-file-system/images/3-2-11-2-securityrules.png
deleted file mode 100644
index c870580d4..000000000
Binary files a/oci-apm-springboot/e-lab-four-create-file-system/images/3-2-11-2-securityrules.png and /dev/null differ
diff --git a/oci-apm-springboot/e-lab-four-create-file-system/images/3-2-11-securityrules.png b/oci-apm-springboot/e-lab-four-create-file-system/images/3-2-11-securityrules.png
deleted file mode 100644
index a53926b84..000000000
Binary files a/oci-apm-springboot/e-lab-four-create-file-system/images/3-2-11-securityrules.png and /dev/null differ
diff --git a/oci-apm-springboot/e-lab-four-create-file-system/images/3-2-12-securityrules.png b/oci-apm-springboot/e-lab-four-create-file-system/images/3-2-12-securityrules.png
deleted file mode 100644
index a67c048de..000000000
Binary files a/oci-apm-springboot/e-lab-four-create-file-system/images/3-2-12-securityrules.png and /dev/null differ
diff --git a/oci-apm-springboot/e-lab-four-create-file-system/images/3-2-2-securityrules.png b/oci-apm-springboot/e-lab-four-create-file-system/images/3-2-2-securityrules.png
deleted file mode 100644
index 1191aad7c..000000000
Binary files a/oci-apm-springboot/e-lab-four-create-file-system/images/3-2-2-securityrules.png and /dev/null differ
diff --git a/oci-apm-springboot/e-lab-four-create-file-system/images/3-2-3-securityrules.png b/oci-apm-springboot/e-lab-four-create-file-system/images/3-2-3-securityrules.png
deleted file mode 100644
index f941b91d6..000000000
Binary files a/oci-apm-springboot/e-lab-four-create-file-system/images/3-2-3-securityrules.png and /dev/null differ
diff --git a/oci-apm-springboot/e-lab-four-create-file-system/images/3-2-4-securityrules.png b/oci-apm-springboot/e-lab-four-create-file-system/images/3-2-4-securityrules.png
deleted file mode 100644
index 0afbbaf71..000000000
Binary files a/oci-apm-springboot/e-lab-four-create-file-system/images/3-2-4-securityrules.png and /dev/null differ
diff --git a/oci-apm-springboot/e-lab-four-create-file-system/images/3-2-5-securityrules.png b/oci-apm-springboot/e-lab-four-create-file-system/images/3-2-5-securityrules.png
deleted file mode 100644
index 5a1eb4c04..000000000
Binary files a/oci-apm-springboot/e-lab-four-create-file-system/images/3-2-5-securityrules.png and /dev/null differ
diff --git a/oci-apm-springboot/e-lab-four-create-file-system/images/3-2-6-securityrules.png b/oci-apm-springboot/e-lab-four-create-file-system/images/3-2-6-securityrules.png
deleted file mode 100644
index 9f95f4562..000000000
Binary files a/oci-apm-springboot/e-lab-four-create-file-system/images/3-2-6-securityrules.png and /dev/null differ
diff --git a/oci-apm-springboot/e-lab-four-create-file-system/images/3-2-7-securityrules.png b/oci-apm-springboot/e-lab-four-create-file-system/images/3-2-7-securityrules.png
deleted file mode 100644
index 77a2767ff..000000000
Binary files a/oci-apm-springboot/e-lab-four-create-file-system/images/3-2-7-securityrules.png and /dev/null differ
diff --git a/oci-apm-springboot/e-lab-four-create-file-system/images/3-2-8-securityrules.png b/oci-apm-springboot/e-lab-four-create-file-system/images/3-2-8-securityrules.png
deleted file mode 100644
index c15a062ad..000000000
Binary files a/oci-apm-springboot/e-lab-four-create-file-system/images/3-2-8-securityrules.png and /dev/null differ
diff --git a/oci-apm-springboot/e-lab-four-create-file-system/images/3-2-9-securityrules.png b/oci-apm-springboot/e-lab-four-create-file-system/images/3-2-9-securityrules.png
deleted file mode 100644
index 580d4555c..000000000
Binary files a/oci-apm-springboot/e-lab-four-create-file-system/images/3-2-9-securityrules.png and /dev/null differ
diff --git a/oci-apm-springboot/e-lab-four-create-file-system/images/3-3-10-cloudshell.png b/oci-apm-springboot/e-lab-four-create-file-system/images/3-3-10-cloudshell.png
deleted file mode 100644
index c82b06fe8..000000000
Binary files a/oci-apm-springboot/e-lab-four-create-file-system/images/3-3-10-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/e-lab-four-create-file-system/images/3-3-3-1-cloudshell.png b/oci-apm-springboot/e-lab-four-create-file-system/images/3-3-3-1-cloudshell.png
deleted file mode 100644
index 56147058d..000000000
Binary files a/oci-apm-springboot/e-lab-four-create-file-system/images/3-3-3-1-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/e-lab-four-create-file-system/images/3-3-3-2-cloudshell.png b/oci-apm-springboot/e-lab-four-create-file-system/images/3-3-3-2-cloudshell.png
deleted file mode 100644
index b802df0c8..000000000
Binary files a/oci-apm-springboot/e-lab-four-create-file-system/images/3-3-3-2-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/e-lab-four-create-file-system/images/3-3-3-cloudshell.png b/oci-apm-springboot/e-lab-four-create-file-system/images/3-3-3-cloudshell.png
deleted file mode 100644
index ac9a2c938..000000000
Binary files a/oci-apm-springboot/e-lab-four-create-file-system/images/3-3-3-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/e-lab-four-create-file-system/images/3-3-6-cloudshell.png b/oci-apm-springboot/e-lab-four-create-file-system/images/3-3-6-cloudshell.png
deleted file mode 100644
index 25f7648f0..000000000
Binary files a/oci-apm-springboot/e-lab-four-create-file-system/images/3-3-6-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/e-lab-four-create-file-system/images/3-3-7-cloudshell.png b/oci-apm-springboot/e-lab-four-create-file-system/images/3-3-7-cloudshell.png
deleted file mode 100644
index 239635b0f..000000000
Binary files a/oci-apm-springboot/e-lab-four-create-file-system/images/3-3-7-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/e-lab-four-create-file-system/images/3-3-8-cloudshell.png b/oci-apm-springboot/e-lab-four-create-file-system/images/3-3-8-cloudshell.png
deleted file mode 100644
index ba6ed67b1..000000000
Binary files a/oci-apm-springboot/e-lab-four-create-file-system/images/3-3-8-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/e-lab-four-create-file-system/images/3-3-9-cloudshell.png b/oci-apm-springboot/e-lab-four-create-file-system/images/3-3-9-cloudshell.png
deleted file mode 100644
index 75a142c9d..000000000
Binary files a/oci-apm-springboot/e-lab-four-create-file-system/images/3-3-9-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/f-lab-four-b-create-block-volume/create-block-volume.md b/oci-apm-springboot/f-lab-four-b-create-block-volume/create-block-volume.md
deleted file mode 100644
index fd3fbd433..000000000
--- a/oci-apm-springboot/f-lab-four-b-create-block-volume/create-block-volume.md
+++ /dev/null
@@ -1,251 +0,0 @@
-# Create and configure Block Volumes
-
-## Introduction
-
-In this lab, you will create block volumes in the Oracle Cloud Infrastructure, and mount the volumes to the Kubernetes pods. ***Select this lab if you are using Free Trial.***
-
-Estimated time: 15 minutes
-
-
-### Objectives
-
-* Create block volumes in the Oracle Cloud
-* Create a YAML file, which defines Storage Class and Persistent Volume Claim
-* Mount the volume to the Kubernetes cluster by applying the YAML, which recreates the Kubernetes pods with the new storage configuration
-
-### Prerequisites
-
-* If you are using a Free Trial, select this lab, because creating 2 Block Volumes storage is included in the Oracle Free Tier.
-* Completion of the preceding labs in this workshop
-
-
-
-
-## Task 1: Mount the file system to Kubernetes pods
-
- 1. If you closed the Oracle Cloud shell window, please re-open it. Click the **Developer tools** icon from the top right corner in the Oracle Cloud console menu bar, then select **Cloud shell** to start a Cloud Shell environment which will appear at the bottom of your page.
- 
-
- > **Note:** If the Cloud Shell is already running but the window is minimized, you can restore the window by clicking the **Restore** icon on the toolbar.
- 
-
-
- 2. If the previous Cloud Shell session is expired, run the oci ce (Container Engine) command that you saved in Lab 3, Task 2, step 5.
-
-
- 
-
- 3. Create a YAML file, **apmlab-pvc.yaml** using an editor such as the vi editor tool.
-
- ``` bash
-
- vi ~/sb-hol/apmlab-pvc.yaml
-
- ```
-
- >**Note:** If you are using the vi editor, type ***i*** to enter Insert mode, and make the text editable. Use allow keys to navigate the text and make changes to where you set the cursor. To save a file, press the Esc key, then type ***:wq*** to write and quit the file. If you do not wish a change, press Esc then type ***:q!*** to discard your changes. Please refer to the editor's references for more usage.
- Alternatively, you can use a built-in code editor to edit files. To use the code editor, select the **Developer tools** icon from the toolbar> select **Code Editor**.
- 
-
- 4. Hit **i** to enter the editing mode. Copy the below contents that create Kubernetes objects (StorageClass, PersistentVolumeClaim) in your OKE, and paste it into the file. Then save the file.
-
-
-
- apiVersion: v1
- kind: PersistentVolumeClaim
- metadata:
- name: apmlab-fsspv
- spec:
- storageClassName: "oci-bv"
- accessModes:
- - ReadWriteOnce
- resources:
- requests:
- storage: 50Gi
- ---
- apiVersion: v1
- kind: PersistentVolumeClaim
- metadata:
- name: apmlab-fsspv2
- spec:
- storageClassName: "oci-bv"
- accessModes:
- - ReadWriteOnce
- resources:
- requests:
- storage: 50Gi
-
-
-
- >**Note:** Refer to the screenshot image below to see what it should look like after the file is modified. Verify that the Kubernetes objects, such as StorageClass and PersistentVolumeClass are configured in the YAML file.
- 
-
-## Task 2: Apply changes to the container
-
-1. Execute the following command to add the storage objects to the Kubernetes cluster.
-
- ``` bash
-
- kubectl create -f apmlab-pvc.yaml
-
- ```
-2. Verify the Storage Class, PV and PVC are created.
-
- 
-
- >**Note:** If you need to modify the YAML file after once applied, first run the command below to remove the objects, modify the file, then rerun the above command to re-apply the YAML.
- kubectl delete -f ~/sb-hol/apmlab-pvc.yaml
-
-
-## Task 3: Add volumes to Kubernetes pods
-
-1. Next, you will need to map the PV to the pods. Open **wstore.yaml** file with an editor.
-
- ``` bash
-
- vi ~/sb-hol/wstore.yaml
-
- ```
-
-2. Scroll down the file. You will see there are two statefulsets, **wstore-front** and **wstore-back**, defined in the YAML file.
-
-3. Within each statefulset, find a line that defines the container port: "**- containerPort: 8080**" (line 51 and line 75).
-
- 
-
-4. Hit **i** to enter the edit mode. Carefully insert the following code below the **containerPort**. Note that the changes have to be made in both statefulsets, **wstore-back** and **wstore-front**.
-
-
-
- * Insert below under “- containerPort: 8080” (line 51)
-
-
-
- volumeMounts:
- - name: data
- mountPath: /apmlab-fss
- volumes:
- - name: data
- persistentVolumeClaim:
- claimName: apmlab-fsspv
-
-
- * Insert below under “- containerPort: 8080” (line 75).
-
- NOTE the contents are different from the above.
-
-
- volumeMounts:
- - name: data
- mountPath: /apmlab-fss2
- volumes:
- - name: data
- persistentVolumeClaim:
- claimName: apmlab-fsspv2
-
-
-
- * Change the replicas of backend from 2 to 1.
-
-
- serviceName: "wstore-backend"
- replicas: 1
-
- Save the file.
-
-
-
- > ***Suggested Editing Tips:***
- - Use your mouse to select the text above, and manually copy and paste it into a text file.
- - Auto copy is not provided as it may break the indentation.
- - Copy the entire area from the text box, including the space preceding the text.
- - In the yaml file, place your mouse cursor at the beginning of the line, then paste the code.
- - Make sure to keep the same space indentation when pasting the code into the file.
- - "VolumeMounts:" aligns with "ports:"
- - "Volumes:" aligns with "imagePullSecrets:"
- - Refer to the screenshot image below to see how it should look, after the file is modified.
- 
-
-
-
-5. Run the following command. This will recreate the pods, with the new object configurations.
-
- ``` bash
-
- kubectl apply -f ~/sb-hol/wstore.yaml --validate=false
-
- ```
- Verify that the service for wstore-frontend and both statefulsets are configured.
-
- 
-
-6. Check the status of the PVCs.
-
- ``` bash
-
- kubectl get pvc
-
- ```
- 
-
-7. Run the following commands to ensure the pods are in the running state. Verify the **AGE** column to ensure the pods are restarted.
-
- ``` bash
-
- kubectl get pods
-
-
- ```
-
- 
-
-
- >**Note:** Troubleshooting: If the pods do not come back with the running state in a minute or two, review the configuration in the file to make sure they have the right indentation.
-
-9. Execute the following command to access the Kubernetes pods.
-
- ``` bash
-
- kubectl exec -it wstore-front-0 -- bash -c "cd / && ls "
-
- ```
-
- Make sure that you see the ***apmlab-fss*** directory that is the file system mounted to this location.
-
- 
-
-
- >***Debugging TIPS***: If you cannot find the apmlab-fss directory, or the pods do not start running, execute the following command from the Cloud Shell to troubleshoot.
- kubectl get events --sort-by=.metadata.creationTimestamp
-
-10. Run the following command and copy the EXTERNAL-IP from the frontend service.
-
- ``` bash
-
- kubectl get svc
-
- ```
- 
-
-11. Run the following URL and verify the application is running.
- ``` bash
-
- http:///winestore/
-
- ```
-
- 
-
-
-
-
-You may now **proceed to Lab 5 (Free Trial): Instrument server monitoring on the block volumes**.
-
-
-## Acknowledgements
-
-* **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
-- **Contributors** - Steven Lemme, Senior Principal Product Manager,
-Anand Prabhu, Sr. Member of Technical Staff,
-Avi Huber, Vice President, Product Management
-* **Last Updated By/Date** - Yutaka Takatsu, March 2023
diff --git a/oci-apm-springboot/f-lab-four-b-create-block-volume/images/2-1-createpvc.png b/oci-apm-springboot/f-lab-four-b-create-block-volume/images/2-1-createpvc.png
deleted file mode 100644
index 875183514..000000000
Binary files a/oci-apm-springboot/f-lab-four-b-create-block-volume/images/2-1-createpvc.png and /dev/null differ
diff --git a/oci-apm-springboot/f-lab-four-b-create-block-volume/images/3-1-wstore.yaml.png b/oci-apm-springboot/f-lab-four-b-create-block-volume/images/3-1-wstore.yaml.png
deleted file mode 100644
index b4a7fdc24..000000000
Binary files a/oci-apm-springboot/f-lab-four-b-create-block-volume/images/3-1-wstore.yaml.png and /dev/null differ
diff --git a/oci-apm-springboot/f-lab-four-b-create-block-volume/images/3-3-1-menu.png b/oci-apm-springboot/f-lab-four-b-create-block-volume/images/3-3-1-menu.png
deleted file mode 100644
index d55efd60f..000000000
Binary files a/oci-apm-springboot/f-lab-four-b-create-block-volume/images/3-3-1-menu.png and /dev/null differ
diff --git a/oci-apm-springboot/f-lab-four-b-create-block-volume/images/3-3-2-1-yaml.png b/oci-apm-springboot/f-lab-four-b-create-block-volume/images/3-3-2-1-yaml.png
deleted file mode 100644
index 461993389..000000000
Binary files a/oci-apm-springboot/f-lab-four-b-create-block-volume/images/3-3-2-1-yaml.png and /dev/null differ
diff --git a/oci-apm-springboot/f-lab-four-b-create-block-volume/images/3-3-2-cloudshell.png b/oci-apm-springboot/f-lab-four-b-create-block-volume/images/3-3-2-cloudshell.png
deleted file mode 100644
index 5845c778d..000000000
Binary files a/oci-apm-springboot/f-lab-four-b-create-block-volume/images/3-3-2-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/f-lab-four-b-create-block-volume/images/3-3-2-menu.png b/oci-apm-springboot/f-lab-four-b-create-block-volume/images/3-3-2-menu.png
deleted file mode 100644
index 271344024..000000000
Binary files a/oci-apm-springboot/f-lab-four-b-create-block-volume/images/3-3-2-menu.png and /dev/null differ
diff --git a/oci-apm-springboot/f-lab-four-b-create-block-volume/images/3-3-2-yaml.png b/oci-apm-springboot/f-lab-four-b-create-block-volume/images/3-3-2-yaml.png
deleted file mode 100644
index 276821b9e..000000000
Binary files a/oci-apm-springboot/f-lab-four-b-create-block-volume/images/3-3-2-yaml.png and /dev/null differ
diff --git a/oci-apm-springboot/f-lab-four-b-create-block-volume/images/3-3-3-1-cloudshell.png b/oci-apm-springboot/f-lab-four-b-create-block-volume/images/3-3-3-1-cloudshell.png
deleted file mode 100644
index 56147058d..000000000
Binary files a/oci-apm-springboot/f-lab-four-b-create-block-volume/images/3-3-3-1-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/f-lab-four-b-create-block-volume/images/3-3-6-cloudshell.png b/oci-apm-springboot/f-lab-four-b-create-block-volume/images/3-3-6-cloudshell.png
deleted file mode 100644
index 25f7648f0..000000000
Binary files a/oci-apm-springboot/f-lab-four-b-create-block-volume/images/3-3-6-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/f-lab-four-b-create-block-volume/images/3-3-8-cloudshell.png b/oci-apm-springboot/f-lab-four-b-create-block-volume/images/3-3-8-cloudshell.png
deleted file mode 100644
index ba6ed67b1..000000000
Binary files a/oci-apm-springboot/f-lab-four-b-create-block-volume/images/3-3-8-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/f-lab-four-b-create-block-volume/images/3-3-cloudshell.png b/oci-apm-springboot/f-lab-four-b-create-block-volume/images/3-3-cloudshell.png
deleted file mode 100644
index ac0b41e80..000000000
Binary files a/oci-apm-springboot/f-lab-four-b-create-block-volume/images/3-3-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/f-lab-four-b-create-block-volume/images/3-4-cloudshell.png b/oci-apm-springboot/f-lab-four-b-create-block-volume/images/3-4-cloudshell.png
deleted file mode 100644
index bfba50a7e..000000000
Binary files a/oci-apm-springboot/f-lab-four-b-create-block-volume/images/3-4-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/f-lab-four-b-create-block-volume/images/3-5-cloudshell.png b/oci-apm-springboot/f-lab-four-b-create-block-volume/images/3-5-cloudshell.png
deleted file mode 100644
index 5f67325e1..000000000
Binary files a/oci-apm-springboot/f-lab-four-b-create-block-volume/images/3-5-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/f-lab-four-b-create-block-volume/images/3-6-wstore-home.png b/oci-apm-springboot/f-lab-four-b-create-block-volume/images/3-6-wstore-home.png
deleted file mode 100644
index 8ee3324f7..000000000
Binary files a/oci-apm-springboot/f-lab-four-b-create-block-volume/images/3-6-wstore-home.png and /dev/null differ
diff --git a/oci-apm-springboot/g-lab-five-configure-apm-agent/configure-apm-agent.md b/oci-apm-springboot/g-lab-five-configure-apm-agent/configure-apm-agent.md
deleted file mode 100644
index 3566ba11d..000000000
--- a/oci-apm-springboot/g-lab-five-configure-apm-agent/configure-apm-agent.md
+++ /dev/null
@@ -1,206 +0,0 @@
-# Instrument the server monitoring on the file system
-
-## Introduction
-
-In this lab, you will download the APM Java Agent installer file from the Oracle Cloud console, upload it to the Oracle Cloud shell, transfer it to the Kubernetes container, provision the Java Agent to the file system, and finally, deploy the Agent to the Kubernetes pods.
-
-***Please run this lab only if you completed Lab 4 (Paid Tenancy): "Create and configure a file system".***
-
-***For users who completed Lab 4 (Free Trial): "Create and configure block volumes", please go to the next lab, Lab 5 (Free Trial): "Instrument server monitoring for block volumes".***
-
-This lab requires OCI quota and permissions to create a file system in your tenancy. If you are using a FREE TRIAL, please go to the next Lab 4 (Free Trial): Create and configure block volumes, which does not require a paid OCI quota.***
-
-
-Estimated time: 10 minutes
-
-Watch the video below for a quick walk-through of the lab.
-[Instrument the server monitoring](videohub:1_2mpynh0j)
-
-### Objectives
-
-* Download the APM Java Agent from the Oracle Cloud console
-* Upload the APM Java Agent to the Cloud shell
-* Copy the Java Agent installer from the Cloud shell to the file system
-* Provision the APM Java Agent in the shared file system directory
-* Deploy the Java Agent to the Kubernetes pods
-
-### Prerequisites
-
-* Completion of the preceding labs in this workshop
-
-## Task 1: Obtain APM Java Agent download link
-
-1. Open navigation menu from the Oracle Cloud console, select **Observability & Management** > **Administration**.
-
- 
-
-2. Under **Resources** at the lower left side of the screen, click **Download APM Agent**
-
- 
-
-3. Manually copy the **Agent Version** and paste it to a text file.
-
- 
-
-4. Open the Cloud Shell by clicking the **Developer tools** icon > select **Cloud shell** from the top right corner of the Oracle Cloud console. Restore the Cloud Shell if minimized.
-
- 
-
-
-## Task 2: Download the APM Java Agent to the Cloud shell
-
-1. Type the following command into the Cloud Shell. Make sure to ***replace*** the **Agent version** with the copied text from the previous steps.
-
- ``` bash
-
- cd ~/; wget https://repo1.maven.org/maven2/com/oracle/apm/agent/java/apm-java-agent-installer//apm-java-agent-installer-.jar
-
- ```
-
- E.g., cd ~/; wget https://repo1.maven.org/maven2/com/oracle/apm/agent/java/apm-java-agent-installer/1.8.3326/apm-java-agent-installer-1.8.3326.jar
-
- >**Note:** If you received **No such file or directory** error, it may be a new version of the agent is being updated. Please run the following URL on a browser and find the Agent version available at the Maven central.
- ``` bash
-
- https://repo1.maven.org/maven2/com/oracle/apm/agent/java/apm-java-agent-installer
-
- ```
- 
-
-2. Hit the enter key and verify the message to ensure the successful file transfer.
-
-3. Type the ls command. Confirm that the java agent file installer is in the home directory.
-
- ``` bash
-
- ls ~
-
- ```
- 
-
-## Task 3: Copy the Java Agent installer to the file system
-
-1. Run the command below to copy the Java Agent installer file to the file system. Ensure to ***replace*** the **apm-agent-version** with that of the APM Java Agent you have, before the command execution.
-
- ``` bash
-
- kubectl cp apm-java-agent-installer-.jar wstore-front-0:/apmlab-fss/
-
- ```
-
- > - e.g., kubectl cp apm-java-agent-installer-1.8.3326.jar wstore-front-0:/apmlab-fss/
- - The command copies the Agent installer to the **wstore-front**, but it can be copied to any pod as the way we set up, all pods share the same file system.
-
-
-2. Use the kubectl command below to remotely run the ls command in the container in the Kubernetes pod.
-
- ``` bash
-
- kubectl exec -it wstore-front-0 -- bash -c "cd /apmlab-fss && ls "
-
- ```
-
- If you see the java agent installer file in the location, the file transfer was successful.
-
- 
-
- >**Note:** The APM version may be different from what is shown in the example.
-
-## Task 4: Provision of the APM Java Agent
-
-
-1. Execute the command below to provision the APM Java agent. ***Replace*** the **APM Domain Private key** and **APM Domain Endpoint**, with the values saved in Lab2, Task2. Please also ***change*** the **apm-agent-version** in the file name to the version of the agent you have.
-
- ``` bash
-
- kubectl exec -it wstore-front-0 -- bash -c "cd /apmlab-fss && java -jar ./apm-java-agent-installer-.jar provision-agent -service-name=WS-svc -destination=. -private-data-key= -data-upload-endpoint="
-
- ```
- E.g., kubectl exec -it wstore-front-0 -- bash -c "cd /apmlab-fss && java -jar apm-java-agent-installer-1.8.3326.jar provision-agent -service-name=WS-svc -destination=. -private-data-key=ABCDEFG12345ABCDEF123456ABCDE -data-upload-endpoint=https://abcdefgt12345aaaaaaaaabcdef.apm-agt.us-phoenix-1.oci.oraclecloud.com"
-
- With a successful installation, you should see the output similar to below.
-
- 
-
-2. Execute the below command to verify ***oracle-apm-agent*** directory is created under the apmlab-fss directory.
-
- ``` bash
-
- kubectl exec -it wstore-front-0 -- bash -c "cd /apmlab-fss && ls "
-
- ```
-
- 
-
-## Task 5: Deploy the Java Agent
-
-The next step is to deploy the Java Agent. First, update the **wstore.yaml** file by adding the java runtime argument that points to the APM Agent jar file bootstrap location, then apply to the Kubernetes pods. Notice that the service names, **wstore-front** and **wstore-back**, that are used to display in the APM Trace Explorer, are also added to the command for the statefulsets.
-
-1. Use any editor to open the wstore.yaml file.
-
- ``` bash
-
- vi ~/sb-hol/wstore.yaml
-
- ```
-2. Find the following line in each statefulset, where Java runtime arguments are set. (Look for lines 49 and 80, assuming the volumes were added as expected in the previous steps).
-
- >command: ["java", "-jar", "./wineStore.jar", "--spring.config.location=file:/spring/wstore.properties"]
-
-
-3. Hit **i**. Locate line 49, then insert the following arguments after the **command: ["java",**.
-
- ``` bash
-
- "-javaagent:/apmlab-fss/oracle-apm-agent/bootstrap/ApmAgent.jar", "-Dcom.oracle.apm.agent.service.name=wstore-front",
-
- ```
-
-4. Next, locate line 80, and insert the following arguments after the **command: ["java",**.
-
- ``` bash
-
- "-javaagent:/apmlab-fss/oracle-apm-agent/bootstrap/ApmAgent.jar", "-Dcom.oracle.apm.agent.service.name=wstore-back",
-
- ```
- The image below shows the **wstore-back** statefulset after the successful editing, for example. Please note that you will need to add the arguments to both statefulsets, **wstore-front** and **wstore-back**, and the service names have to be configured differently.
-
- 
-
-
- > ***Troubleshooting***: For learning purposes, we have preconfigured the java argument editing in the **wstore-deploy-agent.yaml** file. If you encounter any issues run the following command to review how the changes are expected to be done.
- - vi ~/sb-hol/wstore-deploy-agent.yaml
-
-
-5. Recreate the Kubernetes pods by applying the **wstore-deploy-agent.yaml** file.
-
- ```bash
-
- kubectl apply -f ~/sb-hol/wstore.yaml --validate=false
-
- ```
-
- Verify the service and the statefulsets are configured.
-
- 
-
-6. Run the following command to check the status of the pods. Make sure they are in the Running state and Ready. If the status is pending, re-run the command. If they do not come back after a few minutes, review the file to ensure the editing was done correctly.
-
- ```bash
-
- kubectl get pods
-
- ```
- 
-
- Once the pods are in the Running state, the APM Java Agent is active and listening to the WineCellar application. It captures backend traces and spans which you can view in the APM Trace Explorer.
-
-You may now **proceed to the next lab**.
-
-## Acknowledgements
-
-* **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
-- **Contributors** - Steven Lemme, Senior Principal Product Manager,
-Anand Prabhu, Sr. Member of Technical Staff,
-Avi Huber, Vice President, Product Management
-* **Last Updated By/Date** - Yutaka Takatsu, March 2023
diff --git a/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-1-1-menu.png b/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-1-1-menu.png
deleted file mode 100644
index 451036ffc..000000000
Binary files a/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-1-1-menu.png and /dev/null differ
diff --git a/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-1-10-cloudshell.png b/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-1-10-cloudshell.png
deleted file mode 100644
index 42ab98d21..000000000
Binary files a/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-1-10-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-1-11-cloudshell.png b/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-1-11-cloudshell.png
deleted file mode 100644
index 406227d09..000000000
Binary files a/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-1-11-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-1-2-apmdomain.png b/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-1-2-apmdomain.png
deleted file mode 100644
index 408998c53..000000000
Binary files a/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-1-2-apmdomain.png and /dev/null differ
diff --git a/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-1-3-apmdomain.png b/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-1-3-apmdomain.png
deleted file mode 100644
index 8bb2a3811..000000000
Binary files a/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-1-3-apmdomain.png and /dev/null differ
diff --git a/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-1-5-browse.png b/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-1-5-browse.png
deleted file mode 100644
index 02a1048cc..000000000
Binary files a/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-1-5-browse.png and /dev/null differ
diff --git a/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-1-5-cloudshell.png b/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-1-5-cloudshell.png
deleted file mode 100644
index 35eff85df..000000000
Binary files a/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-1-5-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-1-6-cloudshell.png b/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-1-6-cloudshell.png
deleted file mode 100644
index 9ff170a32..000000000
Binary files a/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-1-6-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-1-6-upload.png b/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-1-6-upload.png
deleted file mode 100644
index b8ee0b064..000000000
Binary files a/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-1-6-upload.png and /dev/null differ
diff --git a/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-1-7-1-cloudshell.png b/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-1-7-1-cloudshell.png
deleted file mode 100644
index 7c2e3d52c..000000000
Binary files a/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-1-7-1-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-1-7-2-cloudshell.png b/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-1-7-2-cloudshell.png
deleted file mode 100644
index 2e20063bf..000000000
Binary files a/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-1-7-2-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-1-7-cloudshell.png b/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-1-7-cloudshell.png
deleted file mode 100644
index ea48c47d4..000000000
Binary files a/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-1-7-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-1-8-cloudshell.png b/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-1-8-cloudshell.png
deleted file mode 100644
index 7a14df8f5..000000000
Binary files a/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-1-8-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-1-9-cloudshell.png b/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-1-9-cloudshell.png
deleted file mode 100644
index 78371dd60..000000000
Binary files a/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-1-9-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-5-1-cloudshell.png b/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-5-1-cloudshell.png
deleted file mode 100644
index 4eaed2b98..000000000
Binary files a/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-5-1-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-5-2-cloudshell.png b/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-5-2-cloudshell.png
deleted file mode 100644
index f53a97507..000000000
Binary files a/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-5-2-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-5-3-cloudshell.png b/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-5-3-cloudshell.png
deleted file mode 100644
index ec47249e7..000000000
Binary files a/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-5-3-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-6-1-1-cloudshell.png b/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-6-1-1-cloudshell.png
deleted file mode 100644
index a81b30b30..000000000
Binary files a/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-6-1-1-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-6-1-cloudshell.png b/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-6-1-cloudshell.png
deleted file mode 100644
index eb9897710..000000000
Binary files a/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-6-1-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-6-2-cloudshell.png b/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-6-2-cloudshell.png
deleted file mode 100644
index 82c8eaf36..000000000
Binary files a/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-6-2-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-6-3-cloudshell.png b/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-6-3-cloudshell.png
deleted file mode 100644
index 2e46dee30..000000000
Binary files a/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-6-3-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/h-lab-five-b-configure-apm-agent/b-configure-apm-agent.md b/oci-apm-springboot/h-lab-five-b-configure-apm-agent/b-configure-apm-agent.md
deleted file mode 100644
index 6c7e815d5..000000000
--- a/oci-apm-springboot/h-lab-five-b-configure-apm-agent/b-configure-apm-agent.md
+++ /dev/null
@@ -1,232 +0,0 @@
-# Instrument the server monitoring on the block volumes
-
-## Introduction
-
-In this lab, you will download the APM Java Agent installer file from the Oracle Cloud console, upload it to the Oracle Cloud shell, transfer it to the Kubernetes container, provision the Java Agent to the block volumes, and finally, deploy the Agent to the Kubernetes pods.
-
-***Please proceed to this lab only if you completed Lab 4 (Free Trial): "Create and configure block volumes".***
-
-***For users who completed Lab 4 (Free Trial): "Create and configure a file system", please complete the previous lab, Lab 5 (Paid Tenancy): "Instrument server monitoring for the file system".***
-
-Estimated time: 10 minutes
-
-
-### Objectives
-
-* Download the APM Java Agent from the Oracle Cloud console
-* Upload the APM Java Agent to the Cloud shell
-* Copy the Java Agent installer from the Cloud shell to the block volumes
-* Provision the APM Java Agent in the block volumes
-* Deploy the Java Agent to the Kubernetes pods
-
-### Prerequisites
-
-* Completion of the preceding labs in this workshop
-
-## Task 1: Obtain APM Java Agent download link
-
-1. Open the navigation menu from the Oracle Cloud console, and select **Observability & Management** > **Administration**.
-
- 
-
-2. Under **Resources** at the lower left side of the screen, click **Download APM Agent**
-
- 
-
-3. Manually copy the **Agent Version** and paste it to a text file.
-
- 
-
-4. Open the Cloud Shell by clicking the **Developer tools** icon > select **Cloud shell** from the top right corner of the Oracle Cloud console. Restore the Cloud Shell if minimized.
-
- 
-
-
-## Task 2: Download the APM Java Agent to the Cloud shell
-
-1. Type the following command into the Cloud Shell. Make sure to ***replace*** the **Agent version** with the copied text from the previous steps.
-
- ``` bash
-
- cd ~/; wget https://repo1.maven.org/maven2/com/oracle/apm/agent/java/apm-java-agent-installer//apm-java-agent-installer-.jar
-
- ```
-
- E.g., cd ~/; wget https://repo1.maven.org/maven2/com/oracle/apm/agent/java/apm-java-agent-installer/1.8.3326/apm-java-agent-installer-1.8.3326.jar
-
-
-
- >**Note:** If you received **No such file or directory** error, it may be a new version of the agent is being updated. Please run the following URL on a browser and find the Agent version available at the Maven central.
- ``` bash
-
- https://repo1.maven.org/maven2/com/oracle/apm/agent/java/apm-java-agent-installer
-
- ```
- 
-
-
-2. Hit the enter key and verify the message to ensure the successful file transfer.
-
-3. Type the ls command. Confirm that the java agent file installer is in the home directory.
-
- ``` bash
-
- ls ~
-
- ```
- 
-
-## Task 3: Copy the Java Agent installer to the file system
-
-1. Run the commands below to copy the Java Agent installer file to the block volumes. Ensure to ***replace*** the **apm-agent-version** with that of the APM Java Agent you have, before the command execution. Note that you created PVCs in two different Block Volumes, so you will need to copy the agent installer file to both volumes.
-
- a) Copy the installer file to the volume **apmlab-fss**
-
- ``` bash
-
- kubectl cp apm-java-agent-installer-.jar wstore-front-0:/apmlab-fss/
-
- ```
- b) Repeat to Copy the installer file to the volume **apmlab-fss2**
-
- ``` bash
-
- kubectl cp apm-java-agent-installer-.jar wstore-back-0:/apmlab-fss2/
-
- ```
-
-
- > - e.g., kubectl cp apm-java-agent-installer-1.8.3326.jar wstore-front-0:/apmlab-fss/
- - The command copies the Agent installer to the **wstore-front**, but it can be copied to any pod as the way we set up, all pods share the same file system.
-
-
-2. Use the kubectl commands below to remotely run the ls command in the containers in the Kubernetes pods.
-
- ``` bash
-
- kubectl exec -it wstore-front-0 -- bash -c "cd /apmlab-fss && ls "
-
- ```
-
- ``` bash
-
- kubectl exec -it wstore-back-0 -- bash -c "cd /apmlab-fss2 && ls "
-
- ```
-
- If you see the java agent installer file in the location, the file transfer was successful.
-
- 
-
- >**Note:** The APM version may be different from what is shown in the example.
-
-## Task 4: Provision of the APM Java Agent
-
-
-1. Execute the command below to provision the APM Java agent. ***Replace*** the **APM Domain Private key** and **APM Domain Endpoint**, with the values saved in Lab2, Task2. Please also ***change*** the **apm-agent-version** in the file name to the version of the agent you have. Note that you will need to provision the agent in both volumes, **apmlab-fss** and **apmlab-fss2**.
-
- a) Provision the Java agent to the frontend volume **apmlab-fss**
- ``` bash
-
- kubectl exec -it wstore-front-0 -- bash -c "cd /apmlab-fss && java -jar ./apm-java-agent-installer-.jar provision-agent -service-name=WS-svc -destination=. -private-data-key= -data-upload-endpoint="
-
- ```
- b) Provision the Java agent to the backend volume **apmlab-fss2**
- ``` bash
-
- kubectl exec -it wstore-back-0 -- bash -c "cd /apmlab-fss2 && java -jar ./apm-java-agent-installer-.jar provision-agent -service-name=WS-svc -destination=. -private-data-key= -data-upload-endpoint="
-
- ```
-
-
- E.g., kubectl exec -it wstore-front-0 -- bash -c "cd /apmlab-fss && java -jar apm-java-agent-installer-1.8.3326.jar provision-agent -service-name=WS-svc -destination=. -private-data-key=ABCDEFG12345ABCDEF123456ABCDE -data-upload-endpoint=https://abcdefgt12345aaaaaaaaabcdef.apm-agt.us-phoenix-1.oci.oraclecloud.com"
-
- With a successful installation, you should see the output similar to below.
-
- 
-
-
-
-2. Execute the below command to verify ***oracle-apm-agent*** directory is created under the **apmlab-fss** and **apmlab-fss2** directories.
-
- ``` bash
-
- kubectl exec -it wstore-front-0 -- bash -c "cd /apmlab-fss && ls "
-
- ```
- ``` bash
-
- kubectl exec -it wstore-back-0 -- bash -c "cd /apmlab-fss2 && ls "
-
- ```
- 
-
-## Task 5: Deploy the Java Agent
-
-The next step is to deploy the Java Agent. First, update the **wstore.yaml** file by adding the java runtime argument that points to the APM Agent jar file bootstrap location, then apply to the Kubernetes pods. Notice that the service names, **wstore-front** and **wstore-back**, that are used to display in the APM Trace Explorer, are also added to the command for the statefulsets.
-
-1. Use any editor to open the wstore.yaml file.
-
- ``` bash
-
- vi ~/sb-hol/wstore.yaml
-
- ```
-2. Find the following line in each statefulset, where Java runtime arguments are set. (Look for lines 49 and 80, assuming the volumes were added as expected in the previous steps).
-
- >command: ["java", "-jar", "./wineStore.jar", "--spring.config.location=file:/spring/wstore.properties"]
-
-
-3. Hit **i**. Locate line 49, then insert the following arguments after the **command: ["java",**.
-
- ``` bash
-
- "-javaagent:/apmlab-fss/oracle-apm-agent/bootstrap/ApmAgent.jar", "-Dcom.oracle.apm.agent.service.name=wstore-front",
-
- ```
-
-4. Next, locate line 80, and insert the following arguments after the **command: ["java",**.
-
- ``` bash
-
- "-javaagent:/apmlab-fss2/oracle-apm-agent/bootstrap/ApmAgent.jar", "-Dcom.oracle.apm.agent.service.name=wstore-back",
-
- ```
- The image below shows the **wstore-back** statefulset after the successful editing, for example. Please note that you will need to add the arguments to both statefulsets, **wstore-front** and **wstore-back**, and the service names have to be configured differently.
-
- 
-
-
-
-5. Recreate the Kubernetes pods by applying the **wstore-deploy-agent.yaml** file.
-
- ```bash
-
- kubectl apply -f ~/sb-hol/wstore.yaml --validate=false
-
- ```
-
- Verify the service and the statefulsets are configured.
-
- 
-
-6. Run the following command to check the status of the pods. Make sure they are in the Running state and Ready. If the status is pending, re-run the command. If they do not come back after a few minutes, review the file to ensure the editing was done correctly.
-
- ```bash
-
- kubectl get pods
-
- ```
- 
-
- Once the pods are in the Running state, the APM Java Agent is active and listening to the WineCellar application. It captures backend traces and spans which you can view in the APM Trace Explorer.
-
-You may now **proceed to the next lab**.
-
-## Acknowledgements
-
-* **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
-- **Contributors** - Steven Lemme, Senior Principal Product Manager,
-Anand Prabhu, Sr. Member of Technical Staff,
-Avi Huber, Vice President, Product Management
-* **Last Updated By/Date** - Yutaka Takatsu, March 2023
diff --git a/oci-apm-springboot/h-lab-five-b-configure-apm-agent/images/2-1-mavencentral.png b/oci-apm-springboot/h-lab-five-b-configure-apm-agent/images/2-1-mavencentral.png
deleted file mode 100644
index 3ad361053..000000000
Binary files a/oci-apm-springboot/h-lab-five-b-configure-apm-agent/images/2-1-mavencentral.png and /dev/null differ
diff --git a/oci-apm-springboot/h-lab-five-b-configure-apm-agent/images/4-1-1-menu.png b/oci-apm-springboot/h-lab-five-b-configure-apm-agent/images/4-1-1-menu.png
deleted file mode 100644
index 451036ffc..000000000
Binary files a/oci-apm-springboot/h-lab-five-b-configure-apm-agent/images/4-1-1-menu.png and /dev/null differ
diff --git a/oci-apm-springboot/h-lab-five-b-configure-apm-agent/images/4-1-10-cloudshell.png b/oci-apm-springboot/h-lab-five-b-configure-apm-agent/images/4-1-10-cloudshell.png
deleted file mode 100644
index 42ab98d21..000000000
Binary files a/oci-apm-springboot/h-lab-five-b-configure-apm-agent/images/4-1-10-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/h-lab-five-b-configure-apm-agent/images/4-1-11-cloudshell.png b/oci-apm-springboot/h-lab-five-b-configure-apm-agent/images/4-1-11-cloudshell.png
deleted file mode 100644
index 406227d09..000000000
Binary files a/oci-apm-springboot/h-lab-five-b-configure-apm-agent/images/4-1-11-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/h-lab-five-b-configure-apm-agent/images/4-1-2-apmdomain.png b/oci-apm-springboot/h-lab-five-b-configure-apm-agent/images/4-1-2-apmdomain.png
deleted file mode 100644
index 408998c53..000000000
Binary files a/oci-apm-springboot/h-lab-five-b-configure-apm-agent/images/4-1-2-apmdomain.png and /dev/null differ
diff --git a/oci-apm-springboot/h-lab-five-b-configure-apm-agent/images/4-1-3-apmdomain.png b/oci-apm-springboot/h-lab-five-b-configure-apm-agent/images/4-1-3-apmdomain.png
deleted file mode 100644
index 8bb2a3811..000000000
Binary files a/oci-apm-springboot/h-lab-five-b-configure-apm-agent/images/4-1-3-apmdomain.png and /dev/null differ
diff --git a/oci-apm-springboot/h-lab-five-b-configure-apm-agent/images/4-1-4-cloudshell.png b/oci-apm-springboot/h-lab-five-b-configure-apm-agent/images/4-1-4-cloudshell.png
deleted file mode 100644
index e737c335b..000000000
Binary files a/oci-apm-springboot/h-lab-five-b-configure-apm-agent/images/4-1-4-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/h-lab-five-b-configure-apm-agent/images/4-1-6-cloudshell.png b/oci-apm-springboot/h-lab-five-b-configure-apm-agent/images/4-1-6-cloudshell.png
deleted file mode 100644
index 9ff170a32..000000000
Binary files a/oci-apm-springboot/h-lab-five-b-configure-apm-agent/images/4-1-6-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/h-lab-five-b-configure-apm-agent/images/4-1-8-cloudshell.png b/oci-apm-springboot/h-lab-five-b-configure-apm-agent/images/4-1-8-cloudshell.png
deleted file mode 100644
index 99463727a..000000000
Binary files a/oci-apm-springboot/h-lab-five-b-configure-apm-agent/images/4-1-8-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/h-lab-five-b-configure-apm-agent/images/4-6-2-cloudshell.png b/oci-apm-springboot/h-lab-five-b-configure-apm-agent/images/4-6-2-cloudshell.png
deleted file mode 100644
index 82c8eaf36..000000000
Binary files a/oci-apm-springboot/h-lab-five-b-configure-apm-agent/images/4-6-2-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/h-lab-five-b-configure-apm-agent/images/4-6-3-cloudshell.png b/oci-apm-springboot/h-lab-five-b-configure-apm-agent/images/4-6-3-cloudshell.png
deleted file mode 100644
index dcdca52ea..000000000
Binary files a/oci-apm-springboot/h-lab-five-b-configure-apm-agent/images/4-6-3-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/h-lab-five-b-configure-apm-agent/images/5b-deployagent.png b/oci-apm-springboot/h-lab-five-b-configure-apm-agent/images/5b-deployagent.png
deleted file mode 100644
index c8491e4f8..000000000
Binary files a/oci-apm-springboot/h-lab-five-b-configure-apm-agent/images/5b-deployagent.png and /dev/null differ
diff --git a/oci-apm-springboot/i-lab-six-configure-browser-agent/configure-browser-agent.md b/oci-apm-springboot/i-lab-six-configure-browser-agent/configure-browser-agent.md
deleted file mode 100644
index 9fd922270..000000000
--- a/oci-apm-springboot/i-lab-six-configure-browser-agent/configure-browser-agent.md
+++ /dev/null
@@ -1,112 +0,0 @@
-# Instrument the browser monitoring
-
-## Introduction
-
-In the previous lab, you instrumented the application with an APM java agent, which captures traces and spans generated by the server. In this lab, you will configure an APM browser agent that captures traces and spans generated by the browser. You will insert a javascript to the application's index.html file to deploy the APM browser agent.
-
-To simplify the application setup process in this workshop, the webpage to instrument (index.html) is located in a Kubernetes pod. You will copy the file from the container, edit the file by injecting the JavaScript, then copy it back into the container.
-
-
-Please note that these changes will be lost when the pods are recreated. This setup is only to keep the lab steps simple. In the real use cases, you will need the changes preconfigured in the image, or deploy the static content to the shared location so that the changes will be kept when Kubernetes pods are recreated.
-
-
-Estimated time: 5 minutes
-
-Watch the video below for a quick walk-through of the lab.
-[Instrument the browser monitoring](videohub:1_qrehxy3o)
-
-### Objectives
-
-* Instrument browser by injecting JavaScript code to the webpage
-
-### Prerequisites
-
-* Completion of the preceding labs in this workshop
-
-## Task 1: Copy a webpage from the container
-
-
-1. Run the oci ce (Container Engine) command that you saved in Lab 3, Task 2, step 5.
-
-2. Execute the following command to copy ***index.html*** from the container to the home directory.
-
- ``` bash
-
- cd ~/;kubectl cp wstore-front-0:static/index.html ./index.html
-
- ```
-
-3. Run the "ls" command in the home directory, to verify that the file is transferred to the Cloud Shell.
-
- ``` bash
-
- ls
-
- ```
-
- 
-
-## Task 2: Update the webpage with APM browser agent injection
-1. Open the index.html with an editor.
-
- ```bash
-
- vi ~/index.html
-
- ```
-
-2. Insert the following JavaScript to the index.html file, just below the </head> tag. Replace **Data Upload Endpoint** and the **Public Data key**. Note that there are two locations you will need to replace the Data Upload Endpoint.
-
-
- ```bash
-
-
-
-
- ```
- Save the changes and close the file.
-
- 
-
-## Task 3: Copy the webpage back to the container
-
-1. Execute the following command to copy the ***index.html*** file back to the container.
-
- ``` bash
-
- cd ~/;kubectl cp ./index.html wstore-front-0:static/index.html
-
- ```
- 
-
-2. Verify the successful file transfer, by running the following command.
-
-
- ``` bash
-
- kubectl exec -it wstore-front-0 -- bash -c "cd static && cat index.html "
-
- ```
- Ensure you see the changes made in the previous step.
-
- 
-
- In the next lab, you will verify the JavaScript from the source page in the browser.
-
-
-You may now **proceed to the next lab**.
-
-## Acknowledgements
-
-* **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
-- **Contributors** - Steven Lemme, Senior Principal Product Manager,
-Anand Prabhu, Sr. Member of Technical Staff,
-Avi Huber, Vice President, Product Management
-* **Last Updated By/Date** - Yutaka Takatsu, December 2022
diff --git a/oci-apm-springboot/i-lab-six-configure-browser-agent/images/5-1-1-cloudshell.png b/oci-apm-springboot/i-lab-six-configure-browser-agent/images/5-1-1-cloudshell.png
deleted file mode 100644
index 166ed23ab..000000000
Binary files a/oci-apm-springboot/i-lab-six-configure-browser-agent/images/5-1-1-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/i-lab-six-configure-browser-agent/images/5-1-2-cloudshell.png b/oci-apm-springboot/i-lab-six-configure-browser-agent/images/5-1-2-cloudshell.png
deleted file mode 100644
index adee5a740..000000000
Binary files a/oci-apm-springboot/i-lab-six-configure-browser-agent/images/5-1-2-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/i-lab-six-configure-browser-agent/images/5-1-3-cloudshell.png b/oci-apm-springboot/i-lab-six-configure-browser-agent/images/5-1-3-cloudshell.png
deleted file mode 100644
index 17e5b830a..000000000
Binary files a/oci-apm-springboot/i-lab-six-configure-browser-agent/images/5-1-3-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/i-lab-six-configure-browser-agent/images/5-1-4-cloudshell.png b/oci-apm-springboot/i-lab-six-configure-browser-agent/images/5-1-4-cloudshell.png
deleted file mode 100644
index ca11aab04..000000000
Binary files a/oci-apm-springboot/i-lab-six-configure-browser-agent/images/5-1-4-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/i-lab-six-configure-browser-agent/images/5-3-1-cloudshell.png b/oci-apm-springboot/i-lab-six-configure-browser-agent/images/5-3-1-cloudshell.png
deleted file mode 100644
index 46b20a59f..000000000
Binary files a/oci-apm-springboot/i-lab-six-configure-browser-agent/images/5-3-1-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/i-lab-six-configure-browser-agent/images/5-3-2-cloudshell.png b/oci-apm-springboot/i-lab-six-configure-browser-agent/images/5-3-2-cloudshell.png
deleted file mode 100644
index 963f21338..000000000
Binary files a/oci-apm-springboot/i-lab-six-configure-browser-agent/images/5-3-2-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/j-lab-seven-view-traces/images/6-1-1-cloudshell.png b/oci-apm-springboot/j-lab-seven-view-traces/images/6-1-1-cloudshell.png
deleted file mode 100644
index f80be5e89..000000000
Binary files a/oci-apm-springboot/j-lab-seven-view-traces/images/6-1-1-cloudshell.png and /dev/null differ
diff --git a/oci-apm-springboot/j-lab-seven-view-traces/images/6-2-1-menu.png b/oci-apm-springboot/j-lab-seven-view-traces/images/6-2-1-menu.png
deleted file mode 100644
index 4229aa093..000000000
Binary files a/oci-apm-springboot/j-lab-seven-view-traces/images/6-2-1-menu.png and /dev/null differ
diff --git a/oci-apm-springboot/j-lab-seven-view-traces/images/6-2-10-traceexplorer.png b/oci-apm-springboot/j-lab-seven-view-traces/images/6-2-10-traceexplorer.png
deleted file mode 100644
index f8c9b0c34..000000000
Binary files a/oci-apm-springboot/j-lab-seven-view-traces/images/6-2-10-traceexplorer.png and /dev/null differ
diff --git a/oci-apm-springboot/j-lab-seven-view-traces/images/6-2-11-traceexplorer.png b/oci-apm-springboot/j-lab-seven-view-traces/images/6-2-11-traceexplorer.png
deleted file mode 100644
index 1e55c4ec4..000000000
Binary files a/oci-apm-springboot/j-lab-seven-view-traces/images/6-2-11-traceexplorer.png and /dev/null differ
diff --git a/oci-apm-springboot/j-lab-seven-view-traces/images/6-2-12-traceexplorer.png b/oci-apm-springboot/j-lab-seven-view-traces/images/6-2-12-traceexplorer.png
deleted file mode 100644
index b2ae6bddb..000000000
Binary files a/oci-apm-springboot/j-lab-seven-view-traces/images/6-2-12-traceexplorer.png and /dev/null differ
diff --git a/oci-apm-springboot/j-lab-seven-view-traces/images/6-2-2-traceexplorer.png b/oci-apm-springboot/j-lab-seven-view-traces/images/6-2-2-traceexplorer.png
deleted file mode 100644
index 43325c76b..000000000
Binary files a/oci-apm-springboot/j-lab-seven-view-traces/images/6-2-2-traceexplorer.png and /dev/null differ
diff --git a/oci-apm-springboot/j-lab-seven-view-traces/images/6-2-3-traceexplorer.png b/oci-apm-springboot/j-lab-seven-view-traces/images/6-2-3-traceexplorer.png
deleted file mode 100644
index d5cf5566a..000000000
Binary files a/oci-apm-springboot/j-lab-seven-view-traces/images/6-2-3-traceexplorer.png and /dev/null differ
diff --git a/oci-apm-springboot/j-lab-seven-view-traces/images/6-2-4-traceexplorer.png b/oci-apm-springboot/j-lab-seven-view-traces/images/6-2-4-traceexplorer.png
deleted file mode 100644
index f5524c286..000000000
Binary files a/oci-apm-springboot/j-lab-seven-view-traces/images/6-2-4-traceexplorer.png and /dev/null differ
diff --git a/oci-apm-springboot/j-lab-seven-view-traces/images/6-2-5-traceexplorer.png b/oci-apm-springboot/j-lab-seven-view-traces/images/6-2-5-traceexplorer.png
deleted file mode 100644
index 7a6e23d95..000000000
Binary files a/oci-apm-springboot/j-lab-seven-view-traces/images/6-2-5-traceexplorer.png and /dev/null differ
diff --git a/oci-apm-springboot/j-lab-seven-view-traces/images/6-2-6-traceexplorer.png b/oci-apm-springboot/j-lab-seven-view-traces/images/6-2-6-traceexplorer.png
deleted file mode 100644
index b947f4640..000000000
Binary files a/oci-apm-springboot/j-lab-seven-view-traces/images/6-2-6-traceexplorer.png and /dev/null differ
diff --git a/oci-apm-springboot/j-lab-seven-view-traces/images/6-2-7-traceexplorer.png b/oci-apm-springboot/j-lab-seven-view-traces/images/6-2-7-traceexplorer.png
deleted file mode 100644
index bce3ed116..000000000
Binary files a/oci-apm-springboot/j-lab-seven-view-traces/images/6-2-7-traceexplorer.png and /dev/null differ
diff --git a/oci-apm-springboot/j-lab-seven-view-traces/images/6-2-8-traceexplorer.png b/oci-apm-springboot/j-lab-seven-view-traces/images/6-2-8-traceexplorer.png
deleted file mode 100644
index 70225ea01..000000000
Binary files a/oci-apm-springboot/j-lab-seven-view-traces/images/6-2-8-traceexplorer.png and /dev/null differ
diff --git a/oci-apm-springboot/j-lab-seven-view-traces/images/6-2-9-traceexplorer.png b/oci-apm-springboot/j-lab-seven-view-traces/images/6-2-9-traceexplorer.png
deleted file mode 100644
index a3d76322c..000000000
Binary files a/oci-apm-springboot/j-lab-seven-view-traces/images/6-2-9-traceexplorer.png and /dev/null differ
diff --git a/oci-apm-springboot/j-lab-seven-view-traces/images/6-3-1-traceexplorer.png b/oci-apm-springboot/j-lab-seven-view-traces/images/6-3-1-traceexplorer.png
deleted file mode 100644
index faffdc0fb..000000000
Binary files a/oci-apm-springboot/j-lab-seven-view-traces/images/6-3-1-traceexplorer.png and /dev/null differ
diff --git a/oci-apm-springboot/j-lab-seven-view-traces/images/6-3-2-traceexplorer.png b/oci-apm-springboot/j-lab-seven-view-traces/images/6-3-2-traceexplorer.png
deleted file mode 100644
index 55512cadd..000000000
Binary files a/oci-apm-springboot/j-lab-seven-view-traces/images/6-3-2-traceexplorer.png and /dev/null differ
diff --git a/oci-apm-springboot/j-lab-seven-view-traces/images/6-3-3-traceexplorer.png b/oci-apm-springboot/j-lab-seven-view-traces/images/6-3-3-traceexplorer.png
deleted file mode 100644
index be833e0a2..000000000
Binary files a/oci-apm-springboot/j-lab-seven-view-traces/images/6-3-3-traceexplorer.png and /dev/null differ
diff --git a/oci-apm-springboot/j-lab-seven-view-traces/images/6-3-4-traceexplorer.png b/oci-apm-springboot/j-lab-seven-view-traces/images/6-3-4-traceexplorer.png
deleted file mode 100644
index 2cbf25954..000000000
Binary files a/oci-apm-springboot/j-lab-seven-view-traces/images/6-3-4-traceexplorer.png and /dev/null differ
diff --git a/oci-apm-springboot/j-lab-seven-view-traces/images/6-4-1-traceexplorer.png b/oci-apm-springboot/j-lab-seven-view-traces/images/6-4-1-traceexplorer.png
deleted file mode 100644
index 6c5c95fb4..000000000
Binary files a/oci-apm-springboot/j-lab-seven-view-traces/images/6-4-1-traceexplorer.png and /dev/null differ
diff --git a/oci-apm-springboot/j-lab-seven-view-traces/images/6-4-2-traceexplorer.png b/oci-apm-springboot/j-lab-seven-view-traces/images/6-4-2-traceexplorer.png
deleted file mode 100644
index ec72faa0c..000000000
Binary files a/oci-apm-springboot/j-lab-seven-view-traces/images/6-4-2-traceexplorer.png and /dev/null differ
diff --git a/oci-apm-springboot/j-lab-seven-view-traces/images/6-4-3-traceexplorer.png b/oci-apm-springboot/j-lab-seven-view-traces/images/6-4-3-traceexplorer.png
deleted file mode 100644
index 8fcea77eb..000000000
Binary files a/oci-apm-springboot/j-lab-seven-view-traces/images/6-4-3-traceexplorer.png and /dev/null differ
diff --git a/oci-apm-springboot/j-lab-seven-view-traces/images/7-1-1-wstore.png b/oci-apm-springboot/j-lab-seven-view-traces/images/7-1-1-wstore.png
deleted file mode 100644
index 31aa9fdf2..000000000
Binary files a/oci-apm-springboot/j-lab-seven-view-traces/images/7-1-1-wstore.png and /dev/null differ
diff --git a/oci-apm-springboot/j-lab-seven-view-traces/images/7-1-2-wstore.png b/oci-apm-springboot/j-lab-seven-view-traces/images/7-1-2-wstore.png
deleted file mode 100644
index 6256f71d3..000000000
Binary files a/oci-apm-springboot/j-lab-seven-view-traces/images/7-1-2-wstore.png and /dev/null differ
diff --git a/oci-apm-springboot/j-lab-seven-view-traces/images/7-1-3-wstore.png b/oci-apm-springboot/j-lab-seven-view-traces/images/7-1-3-wstore.png
deleted file mode 100644
index 621b49c24..000000000
Binary files a/oci-apm-springboot/j-lab-seven-view-traces/images/7-1-3-wstore.png and /dev/null differ
diff --git a/oci-apm-springboot/j-lab-seven-view-traces/images/7-1-4-wstore.png b/oci-apm-springboot/j-lab-seven-view-traces/images/7-1-4-wstore.png
deleted file mode 100644
index 396f13a47..000000000
Binary files a/oci-apm-springboot/j-lab-seven-view-traces/images/7-1-4-wstore.png and /dev/null differ
diff --git a/oci-apm-springboot/j-lab-seven-view-traces/view-traces.md b/oci-apm-springboot/j-lab-seven-view-traces/view-traces.md
deleted file mode 100644
index 065c8708d..000000000
--- a/oci-apm-springboot/j-lab-seven-view-traces/view-traces.md
+++ /dev/null
@@ -1,194 +0,0 @@
-# View traces and spans in APM Trace Explorer
-
-## Introduction
-
-In this lab, you will learn how to use the APM Trace Explorer to trace the workload generated with the WineCellar demo application.
-
-Estimated time: 10 minutes
-
-Watch the video below for a quick walk-through of the lab.
-[View traces and spans in APM Trace Explorer](videohub:1_ax6iqqu1)
-
-### Objectives
-
-* Open APM Trace Explorer from the Oracle Cloud console
-* Verify traces and spans generated by the APM agents configured in Lab 5 and 6
-* Examine values in the span dimensions for the frontend browser and the backend Spring Boot server
-* Use dimensions to automatically update the query and filter the selection
-
-### Prerequisites
-
-* Completion of preceding labs in this workshop.
-
-
-## Task 1: Verify the Browser Agent instrumentation in the WineCellar app
-
-
-
-1. If you are starting a new Oracle Cloud Shell session, run the oci ce (Container Engine) command that you saved in Lab 3, Task 2, step 5.
-
-2. From the Oracle Cloud shell, enter the following command.
-
- ``` bash
-
- kubectl get svc
-
- ```
-
- From the output, find the wstore-frontend service. Note down the External-IP.
-
- 
-
-
-
- >**Note:**
-
- - The IP may be different from the last time when you accessed the WinCellar app because the pods are regenerated.
- - If the application is not starting up, run the **kubectl get pods** command and check the status. It may take a few minutes to see the pods in the running state.
-
-3. On your laptop, start a browser and access the application with the URL pattern:
-
- ``` bash
-
- http:///winestore/
-
- ```
-4. WinCellar application launches.
-
- 
-
-5. Right mouse click on the browser and select a menu item to view the page source.
-
- 
-
-6. Verify the Browser Agent JavaScript is in the page source.
-
- 
-
-
- >**Note:** If you do not see the Browser Agent JavaScript in the source, remove the browser cache, or try with a different browser.
-
-7. Close the page source.
-
- 
-
-
-## Task 2: Generate workload by navigating to the app
-
-
-1. Click **Login**.
-
- 
-
-
-2. Enter your name (or john) as username, leave the password blank, and click **Login**.
-
- 
-
-
-3. Then click around the buttons in the pages, as in the example flow shown below.
-
- >**Note:** Do not worry if you see the "Failed" messages, or if it takes a long time for the pages to respond. Those are expected because the app is designed to fail every once and often for demo purposes.
-
- Click **Add** on a couple of products then hit **Shopping Cart**. Then Click **Checkout**.
- 
- Click **Confirm Order**, then **Logout**.
- 
-
-
-## Task 3: Examine traces in APM Trace Explorer
-
-1. From the OCI menu, select **Observability & Management** > **Trace Explorer**
-
- 
-
-2. On the Trace Explorer page, select **apmworkshop** for the **Compartment** and the **APM Domain**.
-
- 
-
-3. By default, traces are displayed in the order by the start time. Right mouse click on the **Duration** column, select **Sort Descending** to show the traces by duration in descending order. This will bring the slowest trace to the top of the list.
-
- 
-
-4. Hover the mouse over the bar in the **Spans** column at the top row. Verify three services are included in the trace, and each color represents a service, wstore-back, wstore-front, and wstore-web, which you defined in the previous labs.
-
- 
-
-5. Click the trace link at the **Service:Operationame** column.
-
- 
-
- >**Note:** If you do not see a slow trace with a duration of 10 seconds or more, you can navigate the WineStore demo app a few times until you see the programmed slowness in the checkout service.
-
-6. **Trace Details** page opens. Review the trace information on the upper screen. E.g., Status, Trace ID, Whether it has an error or not, how many spans and services are involved, or the duration of the trace.
- 
-
-7. In the **Topology** view, you can see how the operations are connected within the trace. Different colors indicate different services. Hover the mouse on the icons and the arrows that connect the icons. Review the information in the callouts.
- 
-
- In this example, it seems that the checkout service is where the most time was spent in the trace.
-
- >**Note:** The operations may look differently in the trace you selected.
-
-8. Scroll down the page to show the **Spans** view. Spans in the trace are displayed in a Gantt chart. A span at the top of the list is the root span, and the child spans are nested below the root span.
-
- 
-
- In this example, one of the operations is taking 9 seconds alone, out of the total duration of 10 seconds. This seems to be the bottleneck of the slowness.
-
-9. Click the operation name link.
-
- 
-
-10. This opens a **Span Details** view. Review the span information, such as the operation name, which service it belongs to, start date and time, start time after the trace started, duration of the span, Trace ID, and Span ID.
-
- 
-
- From the operation name, this is a JDBC span that is generated by requesting a call to the database.
-
-11. Scroll down and review the collected dimension values. In this example, there are 54 dimensions collected. E.g., App server, Host, Kubernetes, and performance information. In addition, it has database information, because this is a JDBC span.
-
- 
-
-12. Click **Close** at the lower left corner of the window to close the **Span Details** view.
-
-13. Click the **Trace Explorer** link from the breadcrumbs. This will bring you back to the Trace Explore the main view.
-
- 
-
-## Task 4: Filter traces with dimensions
-
-1. Type '**apdex**' into the search field in the **Fields** section. Then click **ApdexLevel** from the list.
-
- 
-
-2. **Dimension ApdexLevel Values** window opens. Apdex or Application Performance Index measures customer satisfaction based on applications' page or service performance. Review the values and counts. In this example, there are 10 frustrated traces, 69 satisfied traces, and 4 tolerating traces.
-
- 
-
- Select **frustrated** from the list, then click **Add to Query**.
-
-3. Notice that the condition **("ApdexLevel" = 'frustrated')** has been inserted to the query. Hit **Run**.
-
- 
-
-4. Traces view is refreshed and shows only traces **ApdexLevel** is frustrated.
-
- 
-
-
-
-
-
-## Conclusions
-
-In this workshop, you’ve learned how to use a file system by adding the APM Java agent to the microservices web application. You have also learned how to configure the APM Browser agent, and how to use APM Trace Explorer to view traces and spans. For more information on APM, refer to the OCI documentation, **[Application Performance Monitoring](https://docs.oracle.com/en-us/iaas/application-performance-monitoring/index.html)**.
-
-
-## Acknowledgements
-
-* **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
-- **Contributors** - Steven Lemme, Senior Principal Product Manager,
-Anand Prabhu, Sr. Member of Technical Staff,
-Avi Huber, Vice President, Product Management
-* **Last Updated By/Date** - Yutaka Takatsu, December 2022
diff --git a/oci-apm-springboot/k-lab-eight-cleanup/cleanup.md b/oci-apm-springboot/k-lab-eight-cleanup/cleanup.md
deleted file mode 100644
index 45e51d04b..000000000
--- a/oci-apm-springboot/k-lab-eight-cleanup/cleanup.md
+++ /dev/null
@@ -1,166 +0,0 @@
-# Clean up the workshop environment
-
-## Introduction
-
-In this lab, you will clean up the workshop environment by running commands from the Cloud shell, also manually removing the Oracle cloud resources using the Oracle Cloud console.
-
-Estimated time: 10 minutes
-
-Watch the video below for a quick walk-through of the lab.
-[Clean up the workshop environment](videohub:1_lnwo2eyw)
-
-### Objectives
-
-* Remove the lab configurations and setups
-
-### Prerequisites
-
-* Completion of preceding labs in this workshop.
-
-## Task 1: Clean Up the application setup
-
-To delete the workshop setup from your tenancy, follow the steps below.
-
-1. Run the oci ce (Container Engine) command that you saved in Lab 3, Task 2, step 5.
-
-2. Remove the application deployment.
-
- ``` bash
-
- kubectl delete -f ~/sb-hol/wstore.yaml
-
- ```
-
-3. Remove the storage configuration from the cluster.
-
- a) If you created a file system, run the command below.
- ``` bash
-
- kubectl delete -f ~/sb-hol/apmlab-fss.yaml
-
- ```
- 
-
- b) If you created block volumes, run the command below.
-
- ``` bash
-
- kubectl delete -f ~/sb-hol/apmlab-pvc.yaml
-
- ```
-
-
-## Task 2: Remove the Target Mount and the File System
-
-If you created a file system, complete steps 1 - 6 below. If you created block volumes instead, please proceed to the next Task.
-
-1. From the navigation menu in the Oracle Cloud console, select **Storage** > **Mount Target**.
- Then click the link to the MountTarget configured in the workshop.
-
- 
-
-2. In the **Mount Target Details** page, click **Delete**. In the confirmation window, click **Delete**.
-
- 
-
-3. Deletion of the Mount Target starts and completes.
-
- 
-
-4. From the navigation menu in the Oracle Cloud console, select **Storage** > **File Systems**. Then click the link to the File System configured in the workshop.
-
- 
-
-5. In the **File System Details** page, click **Delete**. In the confirmation window, click **Delete**.
-
- 
-
-6. Deletion of the File System starts and completes.
-
- 
-
-
-
-
-## Task 3: Remove the container
-
-1. From the navigation menu in the Oracle Cloud console, select **Developer Services** > **Kubernetes Container(OKE)**. Then click the link to the Cluster configured in the workshop.
-
- 
-
-2. In the **Cluster Details** page, click **Delete**. In the confirmation window, enter the name of the cluster, then click **Delete**.
-
- 
-
-3. Deletion of the File System starts and completes.
-
- 
-
-## Task 4: Remove the VCN
-
-1. From the navigation menu in the Oracle Cloud console, select **Networking** > **Virtual Cloud Networks**. Then click the link to the VCN configured in the workshop.
-
- 
-
-2. In the **Virtual Cloud Network Details** page, scroll down to locate the **Subnets** section. Select one of the subnets and click the three-dot icon on the right-hand side of the row.
-
- 
-
-3. From the pulldown menu, select **Terminate**. In the confirmation window, click **Terminate**.
-
- 
-
-4. Repeat to terminate other subnets. Once all the subnets are deleted, from the upper side of the VCN details page, click **Terminate** to remove the VCN.
-
- 
-
-5. **Delete Virtual Cloud Network** dialog opens. Click **Scan**.
-
-
- 
-
-
-
-6. Click the **Terminate All** button when activated. Termination of the resources begins. Once the message **Virtual Cloud Network termination complete** shows, click **Close**.
- 
-
-## Task 5: Remove the workshop directory
-
-1. Open the Oracle Cloud shell, and run the following commands to remove the files and the workshop directory.
-
- ``` bash
-
- cd ~; rm apm-java-agent-installer-*.jar; rm index.html; rm -r sb-hol;rm sb-hol.zip
-
- ```
- 
-
-## Task 6: Remove the APM domain and compartment
-
- 1. From the navigation menu in the Oracle Cloud console, select **Observability & Management** > **Administration**. Then click the link to the APM domain which you created in the workshop.
- 
-
- 2. In the **Domain details** page, click **Delete**. In the confirmation window, enter the name of the APM domain, then click **Delete**.
- 
-
- 3. Deletion of the APM domain starts and completes. This may take a few minutes. Refresh the screen periodically and check the status.
- 
-
- 4. From the navigation menu in the Oracle Cloud console, select **Identity & Security** > **Compartment**. Then click the link to the compartment which you created in the workshop.
- 
-
- 5. In the **Compartment details** page, click **Delete**. In the confirmation window, click **Delete**.
- 
-
- 6. Deletion of the compartment starts and completes. This may take a few minutes.
- 
-
-
-
-## Acknowledgements
-
-* **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
-- **Contributors** - Steven Lemme, Senior Principal Product Manager,
-Anand Prabhu, Sr. Member of Technical Staff,
-Avi Huber, Vice President, Product Management
-* **Last Updated By/Date** - Yutaka Takatsu, March 2023
diff --git a/oci-apm-springboot/l-lab-nine-learn-more/images/1-2-get-started.png b/oci-apm-springboot/l-lab-nine-learn-more/images/1-2-get-started.png
deleted file mode 100644
index e4b519223..000000000
Binary files a/oci-apm-springboot/l-lab-nine-learn-more/images/1-2-get-started.png and /dev/null differ
diff --git a/oci-apm-springboot/l-lab-nine-learn-more/images/1-3-get-started.png b/oci-apm-springboot/l-lab-nine-learn-more/images/1-3-get-started.png
deleted file mode 100644
index 8cbb7ea83..000000000
Binary files a/oci-apm-springboot/l-lab-nine-learn-more/images/1-3-get-started.png and /dev/null differ
diff --git a/oci-apm-springboot/l-lab-nine-learn-more/images/1-4-get-started.png b/oci-apm-springboot/l-lab-nine-learn-more/images/1-4-get-started.png
deleted file mode 100644
index a9bcc313b..000000000
Binary files a/oci-apm-springboot/l-lab-nine-learn-more/images/1-4-get-started.png and /dev/null differ
diff --git a/oci-apm-springboot/l-lab-nine-learn-more/images/1-5-get-started.png b/oci-apm-springboot/l-lab-nine-learn-more/images/1-5-get-started.png
deleted file mode 100644
index 5e716924e..000000000
Binary files a/oci-apm-springboot/l-lab-nine-learn-more/images/1-5-get-started.png and /dev/null differ
diff --git a/oci-apm-springboot/l-lab-nine-learn-more/images/1-6-get-started.png b/oci-apm-springboot/l-lab-nine-learn-more/images/1-6-get-started.png
deleted file mode 100644
index 52fd1ac4f..000000000
Binary files a/oci-apm-springboot/l-lab-nine-learn-more/images/1-6-get-started.png and /dev/null differ
diff --git a/oci-apm-springboot/l-lab-nine-learn-more/learn-more.md b/oci-apm-springboot/l-lab-nine-learn-more/learn-more.md
deleted file mode 100644
index e1927b619..000000000
--- a/oci-apm-springboot/l-lab-nine-learn-more/learn-more.md
+++ /dev/null
@@ -1,67 +0,0 @@
-# Learn more about APM
-
-## Introduction
-
-Congratulations! You have completed the workshop.
-
-To learn more about APM, please visit **Get started with Oracle Cloud Application Performance Monitoring** workshop.
-
- 
- 
-
-In this workshop, you will learn how to use Oracle Cloud APM to examine critical performance alarms, view synthetic monitors in a dashboard to analyze the trend and identify spikes, observe the monitor's client-side details in HTTP Archive (HAR) file, and explore the server-side details by tracing data in APM Trace Explorer.
-
-### Objectives
-
-* Review APM alarms
-* Examine APM synthetic monitors
-* Explore monitor details and their history
-* Perform exploration of application trace data
-
-### Prerequisites
-
-* Familiarity with distributed tracing is helpful, but not required
-* Familiarity with Oracle Cloud is helpful
-
-## Task 1: Access the workshop
-
-1. Click the link following URL to access the workshop: **[Get started with Oracle Cloud APM](https://livelabs.oracle.com/pls/apex/r/dbpm/livelabs/view-workshop?wec=2681-VVAB-USGL-IJWF)** Workshop.
-Alternatively, open a new browser tab, copy the following URL, paste it to the address bar, and hit enter.
-
- ``` bash
-
- https://livelabs.oracle.com/pls/apex/r/dbpm/livelabs/view-workshop?wec=2681-VVAB-USGL-IJWF
-
- ```
-
-2. Login with an Oracle account.
-
- 
-
- >**Note:** If you do not have an account or forgot your Oracle account credentials, please refer to the next lab, **Oracle CloudWorld 2022 - Get Help**, section **Your Oracle Account**.
-
-3. Enter the code you got for two-factor authentication.
-
- 
-
-4. Workshop home page opens. Click the **Start** button.
-
- 
-
- >**Note:** The event code for the workshop is **2681-VVAB-USGL-IJWF**, however, you do not need to re-enter it, because it is already included in the URL.
-
-5. Click **Run on LiveLabs SandBox**.
-
- 
-
-6. Check the checkbox, click **Submit Reservation**, and follow the instructions to reserve the workshop.
-
- 
-
-## Acknowledgements
-
-* **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
-- **Contributors** - Steven Lemme, Senior Principal Product Manager,
-Anand Prabhu, Sr. Member of Technical Staff,
-Avi Huber, Vice President, Product Management
-* **Last Updated By/Date** - Yutaka Takatsu, October 2022
diff --git a/oci-apm-springboot/workshops/freetier/manifest.json b/oci-apm-springboot/workshops/freetier/manifest.json
index c6937024b..342f6316c 100644
--- a/oci-apm-springboot/workshops/freetier/manifest.json
+++ b/oci-apm-springboot/workshops/freetier/manifest.json
@@ -5,7 +5,7 @@
{
"title": "Introduction",
"description": "Introduction",
- "filename": "../../a-introduction/introduction.md"
+ "filename": "../../00-introduction/introduction.md"
},
{
"title": "Get Started",
@@ -15,54 +15,44 @@
{
"title": "Lab 1: Create a Kubernetes cluster",
"description": "Create a Kubernetes cluster",
- "filename": "../../b-lab-one-create-oke/create-oke.md"
+ "filename": "../../01-create-oke/create-oke.md"
},
{
"title": "Lab 2: Create an APM Domain and obtain Data Upload Endpoint and Private Data Key ",
"description": "Create an APM Domain and obtain Data Upload Endpoint and Private Data Key ",
- "filename": "../../c-lab-two-create-domain/create-domain.md"
+ "filename": "../../02-create-domain/create-domain.md"
},
{
"title": "Lab 3: Build a microservices application",
"description": "Build a microservices application",
- "filename": "../../d-lab-three-build-app/build-app.md"
+ "filename": "../../03-build-app/build-app.md"
},
{
- "title": "Lab 4 (Paid Tenancy): Create and configure a file system",
- "description": "Create and configure a file system (Paid Tenancy)",
- "filename": "../../e-lab-four-create-file-system/create-file-system.md"
+ "title": "Lab 4: Instrument server with OTEL operator",
+ "description": "Instrument server with OTEL operator",
+ "filename": "../../04-deploy-apm-agent/deploy-apm-agent.md"
},
{
- "title": "Lab 4 (Free Trial): Create and configure block volumes",
- "description": "Create and configure block volumes (Free Trial)",
- "filename": "../../f-lab-four-b-create-block-volume/create-block-volume.md"
+ "title": "Lab 5: Verify APM Agent setup and data collection",
+ "description": "Verify APM Agent setup and data collection",
+ "filename": "../../05-verify-agent/verify-agent.md"
},
{
- "title": "Lab 5 (Paid Tenancy): Instrument server monitoring on the file system",
- "description": "Instrumentation for server monitoring",
- "filename": "../../g-lab-five-configure-apm-agent/configure-apm-agent.md"
- },
- {
- "title": "Lab 5 (Free Trial): Instrument server monitoring on the block volumes",
- "description": "Instrumentation for server monitoring",
- "filename": "../../h-lab-five-b-configure-apm-agent/b-configure-apm-agent.md"
- },
- {
- "title": "Lab 6: Instrument browser monitoring",
- "description": "Instrumentation for browser monitoring",
- "filename": "../../i-lab-six-configure-browser-agent/configure-browser-agent.md"
- },
- {
- "title": "Lab 7: View traces and spans in APM Trace Explorer",
+ "title": "Lab 6: View traces and spans in APM Trace Explorer",
"description": "View traces and spans in APM Trace Explorer",
- "filename": "../../j-lab-seven-view-traces/view-traces.md"
+ "filename": "../../06-view-traces/view-traces.md"
},
{
- "title": "Lab 8: Clean up the workshop environment",
+ "title": "Lab 7: Clean up the workshop environment",
"description": "Clean up the workshop environment",
- "filename": "../../k-lab-eight-cleanup/cleanup.md"
+ "filename": "../../07-cleanup/cleanup.md"
+ },
+ {
+ "title": "Lab 8: Learn more about APM (optional)",
+ "description": "Learn more about APM",
+ "filename": "../../08-learn-more/learn-more.md"
},
{
"title": "Need Help?",
diff --git a/oci-apm-springboot/workshops/livelabs/manifest.json b/oci-apm-springboot/workshops/livelabs/manifest.json
index f6a19cf2b..0bce2ff60 100644
--- a/oci-apm-springboot/workshops/livelabs/manifest.json
+++ b/oci-apm-springboot/workshops/livelabs/manifest.json
@@ -5,64 +5,54 @@
{
"title": "Introduction",
"description": "Introduction",
- "filename": "../../a-introduction/introduction.md"
+ "filename": "../../00-introduction/introduction.md"
},
{
"title": "Get Started",
"description": "This is the prerequisites for customers using Free Trial and Paid tenancies, and Always Free accounts (if applicable). The title of the lab and the Contents Menu title (the title above) match for Prerequisite lab. This lab is always first.",
- "filename": "https://oracle-livelabs.github.io/common/labs/cloud-login/cloud-login-livelabs2.md"
+ "filename": "https://oracle-livelabs.github.io/common/labs/cloud-login/cloud-login-livelabs.md"
},
{
"title": "Lab 1: Create a Kubernetes cluster",
"description": "Create a Kubernetes cluster",
- "filename": "../../b-lab-one-create-oke/create-oke.md"
+ "filename": "../../01-create-oke/create-oke.md"
},
{
"title": "Lab 2: Create an APM Domain and obtain Data Upload Endpoint and Private Data Key ",
"description": "Create an APM Domain and obtain Data Upload Endpoint and Private Data Key ",
- "filename": "../../c-lab-two-create-domain/create-domain.md"
+ "filename": "../../02-create-domain/create-domain.md"
},
{
"title": "Lab 3: Build a microservices application",
"description": "Build a microservices application",
- "filename": "../../d-lab-three-build-app/build-app.md"
+ "filename": "../../03-build-app/build-app.md"
},
{
- "title": "Lab 4 (Paid Tenancy): Create and configure a file system",
- "description": "Create and configure a file system (Paid Tenancy)",
- "filename": "../../e-lab-four-create-file-system/create-file-system.md"
+ "title": "Lab 4: Instrument server with OTEL operator",
+ "description": "Instrument server with OTEL operator",
+ "filename": "../../04-deploy-apm-agent/deploy-apm-agent.md"
},
{
- "title": "Lab 4 (Free Trial): Create and configure block volumes",
- "description": "Create and configure block volumes (Free Trial)",
- "filename": "../../f-lab-four-b-create-block-volume/create-block-volume.md"
+ "title": "Lab 5: Verify APM Agent setup and data collection",
+ "description": "Verify APM Agent setup and data collection",
+ "filename": "../../05-verify-agent/verify-agent.md"
},
{
- "title": "Lab 5 (Paid Tenancy): Instrument server monitoring on the file system",
- "description": "Instrumentation for server monitoring",
- "filename": "../../g-lab-five-configure-apm-agent/configure-apm-agent.md"
- },
- {
- "title": "Lab 5 (Free Trial): Instrument server monitoring on the block volumes",
- "description": "Instrumentation for server monitoring",
- "filename": "../../h-lab-five-b-configure-apm-agent/b-configure-apm-agent.md"
- },
- {
- "title": "Lab 6: Instrument browser monitoring",
- "description": "Instrumentation for browser monitoring",
- "filename": "../../i-lab-six-configure-browser-agent/configure-browser-agent.md"
- },
- {
- "title": "Lab 7: View traces and spans in APM Trace Explorer",
+ "title": "Lab 6: View traces and spans in APM Trace Explorer",
"description": "View traces and spans in APM Trace Explorer",
- "filename": "../../j-lab-seven-view-traces/view-traces.md"
+ "filename": "../../06-view-traces/view-traces.md"
},
{
- "title": "Lab 8: Clean up the workshop environment",
+ "title": "Lab 7: Clean up the workshop environment",
"description": "Clean up the workshop environment",
- "filename": "../../k-lab-eight-cleanup/cleanup.md"
+ "filename": "../../07-cleanup/cleanup.md"
+ },
+ {
+ "title": "Lab 8: Learn more about APM (optional)",
+ "description": "Learn more about APM",
+ "filename": "../../08-learn-more/learn-more.md"
},
{
"title": "Need Help?",
diff --git a/oci-apm-springboot/workshops/ocw-freetier/index.html b/oci-apm-springboot/workshops/ocw-freetier/index.html
deleted file mode 100644
index 6acdb69d1..000000000
--- a/oci-apm-springboot/workshops/ocw-freetier/index.html
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
-
-
-
-
- Oracle LiveLabs
-
-
-
-
-
-
-
-
-
-
-
-
-
Oracle LiveLabs
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/oci-apm-springboot/workshops/ocw-freetier/manifest.json b/oci-apm-springboot/workshops/ocw-freetier/manifest.json
deleted file mode 100644
index f691a9a8d..000000000
--- a/oci-apm-springboot/workshops/ocw-freetier/manifest.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
- "workshoptitle": "Automatically instrument Java microservices on Kubernetes with Oracle Application Performance Monitoring",
- "help": "livelabs-help-em_us@oracle.com",
- "tutorials": [
- {
- "title": "Introduction",
- "description": "Introduction",
- "filename": "../../a-introduction/introduction.md"
- },
- {
- "title": "Get Started",
- "description": "This is the prerequisites for customers using Free Trial and Paid tenancies, and Always Free accounts (if applicable). The title of the lab and the Contents Menu title (the title above) match for Prerequisite lab. This lab is always first.",
- "filename": "https://oracle-livelabs.github.io/common/labs/cloud-login/cloud-login.md"
- },
- {
- "title": "Lab 1: Create a Kubernetes cluster",
- "description": "Create a Kubernetes cluster",
- "filename": "../../b-lab-one-create-oke/create-oke.md"
- },
-
- {
- "title": "Lab 2: Create an APM Domain and obtain Data Upload Endpoint and Private Data Key ",
- "description": "Create an APM Domain and obtain Data Upload Endpoint and Private Data Key ",
- "filename": "../../c-lab-two-create-domain/create-domain.md"
- },
- {
- "title": "Lab 3: Build a microservices application",
- "description": "Build a microservices application",
- "filename": "../../d-lab-three-build-app/build-app.md"
- },
-
- {
- "title": "Lab 4 (Paid Tenancy): Create and configure a file system",
- "description": "Create and configure a file system (Paid Tenancy)",
- "filename": "../../e-lab-four-create-file-system/create-file-system.md"
- },
- {
- "title": "Lab 4 (Free Trial): Create and configure block volumes",
- "description": "Create and configure block volumes (Free Trial)",
- "filename": "../../f-lab-four-b-create-block-volume/create-block-volume.md"
- },
- {
- "title": "Lab 5 (Paid Tenancy): Instrument server monitoring on the file system",
- "description": "Instrumentation for server monitoring",
- "filename": "../../g-lab-five-configure-apm-agent/configure-apm-agent.md"
- },
- {
- "title": "Lab 5 (Free Trial): Instrument server monitoring on the block volumes",
- "description": "Instrumentation for server monitoring",
- "filename": "../../h-lab-five-b-configure-apm-agent/b-configure-apm-agent.md"
- },
- {
- "title": "Lab 6: Instrument browser monitoring",
- "description": "Instrumentation for browser monitoring",
- "filename": "../../i-lab-six-configure-browser-agent/configure-browser-agent.md"
- },
- {
- "title": "Lab 7: View traces and spans in APM Trace Explorer",
- "description": "View traces and spans in APM Trace Explorer",
- "filename": "../../j-lab-seven-view-traces/view-traces.md"
- },
- {
- "title": "Lab 8: Clean up the workshop environment",
- "description": "Clean up the workshop environment",
- "filename": "../../k-lab-eight-cleanup/cleanup.md"
- },
- {
- "title": "Lab 9: Learn more about APM (optional)",
- "description": "Learn more about APM",
- "filename": "../../l-lab-nine-learn-more/learn-more.md"
- },
- {
- "title": "Oracle CloudWorld 2022 - Get Help",
- "filename": "https://oracle-livelabs.github.io/common/support/ocwsupportlab/ocwsupportlab.md"
- }
- ]
-}
diff --git a/oci-apm-springboot/workshops/ocw-livelabs/index.html b/oci-apm-springboot/workshops/ocw-livelabs/index.html
deleted file mode 100644
index 6acdb69d1..000000000
--- a/oci-apm-springboot/workshops/ocw-livelabs/index.html
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
-
-
-
-
- Oracle LiveLabs
-
-
-
-
-
-
-
-
-
-
-
-
-
Oracle LiveLabs
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/oci-apm-springboot/workshops/ocw-livelabs/manifest.json b/oci-apm-springboot/workshops/ocw-livelabs/manifest.json
deleted file mode 100644
index d65fed40e..000000000
--- a/oci-apm-springboot/workshops/ocw-livelabs/manifest.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
- "workshoptitle": "Automatically instrument Java microservices on Kubernetes with Oracle Application Performance Monitoring",
- "help": "livelabs-help-em_us@oracle.com",
- "tutorials": [
- {
- "title": "Introduction",
- "description": "Introduction",
- "filename": "../../a-introduction/introduction.md"
- },
- {
- "title": "Get Started",
- "description": "This is the prerequisites for customers using Free Trial and Paid tenancies, and Always Free accounts (if applicable). The title of the lab and the Contents Menu title (the title above) match for Prerequisite lab. This lab is always first.",
- "filename": "https://oracle-livelabs.github.io/common/labs/cloud-login/cloud-login-livelabs2.md"
- },
- {
- "title": "Lab 1: Create a Kubernetes cluster",
- "description": "Create a Kubernetes cluster",
- "filename": "../../b-lab-one-create-oke/create-oke.md"
- },
-
- {
- "title": "Lab 2: Create an APM Domain and obtain Data Upload Endpoint and Private Data Key ",
- "description": "Create an APM Domain and obtain Data Upload Endpoint and Private Data Key ",
- "filename": "../../c-lab-two-create-domain/create-domain.md"
- },
- {
- "title": "Lab 3: Build a microservices application",
- "description": "Build a microservices application",
- "filename": "../../d-lab-three-build-app/build-app.md"
- },
-
- {
- "title": "Lab 4 (Paid Tenancy): Create and configure a file system",
- "description": "Create and configure a file system (Paid Tenancy)",
- "filename": "../../e-lab-four-create-file-system/create-file-system.md"
- },
- {
- "title": "Lab 4 (Free Trial): Create and configure block volumes",
- "description": "Create and configure block volumes (Free Trial)",
- "filename": "../../f-lab-four-b-create-block-volume/create-block-volume.md"
- },
- {
- "title": "Lab 5 (Paid Tenancy): Instrument server monitoring on the file system",
- "description": "Instrumentation for server monitoring",
- "filename": "../../g-lab-five-configure-apm-agent/configure-apm-agent.md"
- },
- {
- "title": "Lab 5 (Free Trial): Instrument server monitoring on the block volumes",
- "description": "Instrumentation for server monitoring",
- "filename": "../../h-lab-five-b-configure-apm-agent/b-configure-apm-agent.md"
- },
- {
- "title": "Lab 6: Instrument browser monitoring",
- "description": "Instrumentation for browser monitoring",
- "filename": "../../i-lab-six-configure-browser-agent/configure-browser-agent.md"
- },
- {
- "title": "Lab 7: View traces and spans in APM Trace Explorer",
- "description": "View traces and spans in APM Trace Explorer",
- "filename": "../../j-lab-seven-view-traces/view-traces.md"
- },
- {
- "title": "Lab 8: Clean up the workshop environment",
- "description": "Clean up the workshop environment",
- "filename": "../../k-lab-eight-cleanup/cleanup.md"
- },
- {
- "title": "Lab 9: Learn more about APM (optional)",
- "description": "Learn more about APM",
- "filename": "../../l-lab-nine-learn-more/learn-more.md"
- },
- {
- "title": "Oracle CloudWorld 2022 - Get Help",
- "filename": "https://oracle-livelabs.github.io/common/support/ocwsupportlab/ocwsupportlab.md"
- }
- ]
-}
diff --git a/oci-apm-weblogic/a-introduction/images/apm_diagram.png b/oci-apm-weblogic/00-introduction/images/apm_diagram.png
similarity index 100%
rename from oci-apm-weblogic/a-introduction/images/apm_diagram.png
rename to oci-apm-weblogic/00-introduction/images/apm_diagram.png
diff --git a/oci-apm-weblogic/a-introduction/images/apm_wls_setup.png b/oci-apm-weblogic/00-introduction/images/apm_wls_setup.png
similarity index 100%
rename from oci-apm-weblogic/a-introduction/images/apm_wls_setup.png
rename to oci-apm-weblogic/00-introduction/images/apm_wls_setup.png
diff --git a/oci-apm-weblogic/00-introduction/introduction.md b/oci-apm-weblogic/00-introduction/introduction.md
new file mode 100644
index 000000000..8c2e350df
--- /dev/null
+++ b/oci-apm-weblogic/00-introduction/introduction.md
@@ -0,0 +1,59 @@
+# Introduction
+
+## About this Workshop
+
+This workshop walks you through how to configure a WebLogic-on-Kubernetes for monitoring with the Oracle Application Performance Monitoring (APM) service. This enables automatic OpenTracing instrumentation and metrics collection that is used to provide full, end-to-end monitoring and diagnostics for the application.
+
+In this workshop, you will provision the APM Java agent in a file system mounted in the Oracle Cloud, deploy the agent to the Kubernetes cluster, instrument the APM Browser agent by inserting JavaScript code to a webpage and view traces and spans in APM Trace Explorer.
+
+> **Note:** The same approach demonstrated for WLS on Kubernetes can be used to configure other types of java application servers, such as Spring Boot, deployed on Kubernetes.
+
+ 
+
+Estimated Workshop Time: 80 minutes
+
+## Task 1: Know before you run
+
+### About Oracle Cloud Infrastructure Application Performance Management (OCI APM)
+
+The diagram below provides an overview of the OCI APM Service, its features, components, and some of the other OCI services it integrates with.
+
+ 
+
+Among other capabilities, OCI APM includes an implementation of a Distributed Tracing system. It collects and processes transaction trace data (spans) from the monitored application and makes it available for viewing, dashboarding, exploration, alerts, etc. For more information on APM and Trace Explorer please refer to Application Performance Monitoring > **[Use Trace Explorer](https://docs.oracle.com/en-us/iaas/application-performance-monitoring/doc/use-trace-explorer.html)** section in the OCI Documentation.
+
+In the workshop, you will learn how to instrument the WebLogic application deployed on a Kubernetes cluster with APM agents. You will also learn how to create an APM domain in the Oracle Cloud and use Trace Explorer to search and view traces/spans in the APM User Interface.
+
+### Objectives
+
+In this workshop, you will:
+* Create an APM domain, obtain Data Upload Endpoint and Data Keys
+* Create a file system in the Oracle Cloud Infrastructure, and mount it in the Kubernetes pods
+* Download, provision and deploy the APM Java agent
+* Apply custom storage configuration to the Kubernetes pods
+* Change the display name format of the spans by editing the agent configuration file
+* Instrument APM Browser agent by automatic injection
+* Use APM Trace Explorer to view traces, spans, and span dimensions
+
+### Prerequisites
+
+
+* A paid Cloud Account. Please ensure you have the permissions below:
+* Oracle Cloud resources and permissions to create a file system. See **[Creating File Systems](https://docs.oracle.com/en-us/iaas/Content/File/Tasks/creatingfilesystems.htm)** and **[Service Limits](https://docs.oracle.com/en-us/iaas/Content/General/Concepts/servicelimits.htm#top)** in the Oracle Cloud documentation.
+* Oracle Cloud Account Administrator role or manage apm-domains permission in the target compartment. See **[Perform Oracle Cloud Infrastructure Prerequisites (APM)](https://docs.oracle.com/en-us/iaas/application-performance-monitoring/doc/perform-oracle-cloud-infrastructure-prerequisite-tasks.html)** in the Oracle Cloud documentation.
+
+> **Note:** ***This workshop cannot be completed with a Free Trial account. You will need a paid cloud account with permission to create a file system.***
+
+### More APM Workshops
+
+* Please visit: **[APM LiveLabs workshops](https://livelabs.oracle.com/pls/apex/f?p=133:100:111996377805307::::SEARCH:application+Performance+monitoring)**.
+
+
+
+## Acknowledgements
+
+- **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
+- **Contributors** - Steven Lemme, Senior Principal Product Manager,
+Anand Prabhu, Sr. Member of Technical Staff,
+Avi Huber, Vice President, Product Management
+- **Last Updated By/Date** - Yutaka Takatsu, December, 2024
diff --git a/oci-apm-weblogic/01-create-oke/create-oke.md b/oci-apm-weblogic/01-create-oke/create-oke.md
new file mode 100644
index 000000000..13890d885
--- /dev/null
+++ b/oci-apm-weblogic/01-create-oke/create-oke.md
@@ -0,0 +1,75 @@
+# Create a Kubernetes cluster
+
+## Introduction
+
+This workshop uses a WebLogic application as a target application to trace against. In this lab, first, you will use the Oracle Cloud console to set up an OCI compartment, second, create an Oracle container engine for Kubernetes (OKE) cluster in your tenancy. In Lab 3, you will deploy the application to the OKE.
+
+Estimated time: 5 minutes
+
+### Objectives
+
+* Create a compartment
+* Create a Kubernetes cluster
+
+### Prerequisites
+
+* This lab requires an [Oracle Cloud account](https://www.oracle.com/cloud/free/). You may use your cloud account, or a Free tier account, a cloud account that you obtained through a trial.
+
+
+## Task 1: Create an OCI compartment
+
+1. Open the navigation menu from the top-left corner (aka. hamburger menu) of the Oracle Cloud console and select **Identity & Security** > **Compartments**.
+ 
+2. Click **Create Compartments**
+ 
+3. Enter the following parameters:
+* Compartment name: **apmworkshop**
+* Description: **APM workshop compartment**
+* Accept the default values for the other fields, and click, **Create Compartment**
+ 
+* Verify that your apmworkshop compartment is created in the table
+ 
+
+## Task 2: Create an OKE
+
+1. Open the navigation menu from the top left corner (aka. hamburger menu) in the Oracle Cloud console, and select **Developer Services** > **Kubernetes Clusters (OKE)**.
+
+ 
+
+2. Make sure the **apmworkshop** is selected in the Compartment field, then click **Create cluster**
+
+ 
+
+3. Quick Create pane is pre-selected. Keep the default selection and click **Submit**.
+
+ 
+
+4. Name the cluster as **apmlab-cluser1**. Accept the default setting for other fields and click **Next**.
+
+ 
+ 
+
+5. Review the configuration, and click **Create cluster**.
+
+ 
+
+6. Make sure all verification steps are cleared. Click **Close**.
+
+ 
+
+7. This will start to create a cluster, and takes 7 to 10 minutes to complete. While waiting for the creation of the cluster, you can proceed to the next lab to create an APM domain. In Lab 3, we will resume the steps to build the application.
+
+ 
+
+
+
+
+You may now **proceed to the next lab**.
+
+## Acknowledgements
+
+* **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
+- **Contributors** - Steven Lemme, Senior Principal Product Manager,
+Anand Prabhu, Sr. Member of Technical Staff,
+Avi Huber, Vice President, Product Management
+* **Last Updated By/Date** - Yutaka Takatsu, December 2024
diff --git a/oci-apm-weblogic/01-create-oke/images/1-1-compartments.png b/oci-apm-weblogic/01-create-oke/images/1-1-compartments.png
new file mode 100644
index 000000000..fb80d85c0
Binary files /dev/null and b/oci-apm-weblogic/01-create-oke/images/1-1-compartments.png differ
diff --git a/oci-apm-weblogic/01-create-oke/images/1-1-menu.png b/oci-apm-weblogic/01-create-oke/images/1-1-menu.png
new file mode 100644
index 000000000..1952ba10d
Binary files /dev/null and b/oci-apm-weblogic/01-create-oke/images/1-1-menu.png differ
diff --git a/oci-apm-weblogic/01-create-oke/images/1-2-compartments.png b/oci-apm-weblogic/01-create-oke/images/1-2-compartments.png
new file mode 100644
index 000000000..80f5f21e8
Binary files /dev/null and b/oci-apm-weblogic/01-create-oke/images/1-2-compartments.png differ
diff --git a/oci-apm-weblogic/01-create-oke/images/1-2-oke.png b/oci-apm-weblogic/01-create-oke/images/1-2-oke.png
new file mode 100644
index 000000000..1e5306845
Binary files /dev/null and b/oci-apm-weblogic/01-create-oke/images/1-2-oke.png differ
diff --git a/oci-apm-weblogic/01-create-oke/images/1-3-compartments.png b/oci-apm-weblogic/01-create-oke/images/1-3-compartments.png
new file mode 100644
index 000000000..1399fd117
Binary files /dev/null and b/oci-apm-weblogic/01-create-oke/images/1-3-compartments.png differ
diff --git a/oci-apm-weblogic/01-create-oke/images/1-3-oke.png b/oci-apm-weblogic/01-create-oke/images/1-3-oke.png
new file mode 100644
index 000000000..f1a759819
Binary files /dev/null and b/oci-apm-weblogic/01-create-oke/images/1-3-oke.png differ
diff --git a/oci-apm-weblogic/01-create-oke/images/1-4-compartments.png b/oci-apm-weblogic/01-create-oke/images/1-4-compartments.png
new file mode 100644
index 000000000..d43476138
Binary files /dev/null and b/oci-apm-weblogic/01-create-oke/images/1-4-compartments.png differ
diff --git a/oci-apm-weblogic/01-create-oke/images/1-4-oke.png b/oci-apm-weblogic/01-create-oke/images/1-4-oke.png
new file mode 100644
index 000000000..e6beceee1
Binary files /dev/null and b/oci-apm-weblogic/01-create-oke/images/1-4-oke.png differ
diff --git a/oci-apm-weblogic/01-create-oke/images/1-5-oke.png b/oci-apm-weblogic/01-create-oke/images/1-5-oke.png
new file mode 100644
index 000000000..3b274dc70
Binary files /dev/null and b/oci-apm-weblogic/01-create-oke/images/1-5-oke.png differ
diff --git a/oci-apm-weblogic/01-create-oke/images/1-6-oke.png b/oci-apm-weblogic/01-create-oke/images/1-6-oke.png
new file mode 100644
index 000000000..8f68bcea5
Binary files /dev/null and b/oci-apm-weblogic/01-create-oke/images/1-6-oke.png differ
diff --git a/oci-apm-weblogic/01-create-oke/images/1-7-oke.png b/oci-apm-weblogic/01-create-oke/images/1-7-oke.png
new file mode 100644
index 000000000..f830dd8fc
Binary files /dev/null and b/oci-apm-weblogic/01-create-oke/images/1-7-oke.png differ
diff --git a/oci-apm-weblogic/01-create-oke/images/1-8-oke.png b/oci-apm-weblogic/01-create-oke/images/1-8-oke.png
new file mode 100644
index 000000000..691e27f41
Binary files /dev/null and b/oci-apm-weblogic/01-create-oke/images/1-8-oke.png differ
diff --git a/oci-apm-weblogic/02-create-domain/create-domain.md b/oci-apm-weblogic/02-create-domain/create-domain.md
new file mode 100644
index 000000000..459ba83d2
--- /dev/null
+++ b/oci-apm-weblogic/02-create-domain/create-domain.md
@@ -0,0 +1,71 @@
+# Create an APM Domain and obtain Data Upload Endpoint and Private Data Key
+
+## Introduction
+
+In this lab, you will create an APM Domain. You will acquire a Data Upload Endpoint and a Private Data Key, which are needed to configure the APM Tracer on the application.
+
+Estimated time: 10 minutes
+
+### Objectives
+
+* Create an APM Domain
+* Obtain a Data Upload Endpoint and a Private Data Key
+
+
+### Prerequisites
+
+* This lab requires an [Oracle Cloud account](https://www.oracle.com/cloud/free/). You may use your cloud account, or a Free tier account, a cloud account that you obtained through a trial.
+* To create an APM domain, you will need an Oracle Cloud Account Administrator role or manage apm-domains permission in the target compartment. For more details, refer to the OCI Documentation, [Create an APM Domain](https://docs.oracle.com/en-us/iaas/application-performance-monitoring/doc/create-apm-domain.html).
+
+## Task 1: Create an APM domain
+
+1. From the OCI menu, select **Observability & Management**, then **Administration**.
+ 
+
+2. Select the **apmworkshop** compartment from the pulldown menu. Then click **Create APM Domain**.
+ 
+
+
+4. Name your APM domain as **apmworkshop** and select the compartment you created. Add a check to the **“Create as Always Free Domain”**, then click **Create**.
+ 
+
+
+5. Press the refresh button periodically to check the status. This may take a few minutes.
+ 
+6. Once the job is completed, the status turns to Active with a green icon.
+ 
+ For more details on how to create an APM Domain, refer to the OCI documentation, [Create an APM Domain](https://docs.oracle.com/en-us/iaas/application-performance-monitoring/doc/create-apm-domain.html).
+
+## Task 2: Obtain Data Upload Endpoint and Private and Public Data Keys
+
+To upload tracing data to an APM domain, Data Upload Endpoint and both Private and Public Data Keys must be configured in the application’s configuration files. Next, you are going to obtain the values for them and then enter them into the Oracle Cloud console.
+
+1. Click the link to the APM domain.
+ 
+
+
+
+2. Under **Resources**, click **Data Keys**.
+
+ 
+
+3. In the **APM Domain Information** tab, find **Data Upload Endpoint**, then click **Copy**. Paste the copied value to a text file and save. You will need this value in the later steps in the workshop.
+
+
+4. Under **Data Keys**, find **auto\_generated\_private_data\_key**. Click **Copy** and save the value to the text file.
+
+5. In the same section, find **auto\_generated\_public_data\_key**. Click **Copy** and save the value to the text file.
+ 
+
+For more details on Data Upload Endpoint and Data keys, refer to the OCI documentation, [Obtaining Data Upload Endpoint and Data keys](https://docs.oracle.com/en-us/iaas/application-performance-monitoring/doc/obtain-data-upload-endpoint-and-data-keys.html).
+
+You may now **proceed to the next lab**.
+
+## Acknowledgements
+
+* **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
+- **Contributors** -
+Steven Lemme, Senior Principal Product Manager,
+Anand Prabhu, Sr. Member of Technical Staff,
+Avi Huber, Vice President, Product Management
+* **Last Updated By/Date** - Yutaka Takatsu, December, 2024
diff --git a/oci-apm-weblogic/02-create-domain/images/2-1-2-domain.png b/oci-apm-weblogic/02-create-domain/images/2-1-2-domain.png
new file mode 100644
index 000000000..f98bae7ac
Binary files /dev/null and b/oci-apm-weblogic/02-create-domain/images/2-1-2-domain.png differ
diff --git a/oci-apm-weblogic/02-create-domain/images/2-1-domain.png b/oci-apm-weblogic/02-create-domain/images/2-1-domain.png
new file mode 100644
index 000000000..140b9b29b
Binary files /dev/null and b/oci-apm-weblogic/02-create-domain/images/2-1-domain.png differ
diff --git a/oci-apm-weblogic/c-lab-two-create-domain/images/2-2-domain.png b/oci-apm-weblogic/02-create-domain/images/2-2-domain.png
similarity index 100%
rename from oci-apm-weblogic/c-lab-two-create-domain/images/2-2-domain.png
rename to oci-apm-weblogic/02-create-domain/images/2-2-domain.png
diff --git a/oci-apm-weblogic/02-create-domain/images/2-3-domain.png b/oci-apm-weblogic/02-create-domain/images/2-3-domain.png
new file mode 100644
index 000000000..901dc020f
Binary files /dev/null and b/oci-apm-weblogic/02-create-domain/images/2-3-domain.png differ
diff --git a/oci-apm-weblogic/02-create-domain/images/2-4-domain.png b/oci-apm-weblogic/02-create-domain/images/2-4-domain.png
new file mode 100644
index 000000000..76e569064
Binary files /dev/null and b/oci-apm-weblogic/02-create-domain/images/2-4-domain.png differ
diff --git a/oci-apm-weblogic/02-create-domain/images/2-5-domain.png b/oci-apm-weblogic/02-create-domain/images/2-5-domain.png
new file mode 100644
index 000000000..4290cbe79
Binary files /dev/null and b/oci-apm-weblogic/02-create-domain/images/2-5-domain.png differ
diff --git a/oci-apm-weblogic/02-create-domain/images/3-1-2-domain.png b/oci-apm-weblogic/02-create-domain/images/3-1-2-domain.png
new file mode 100644
index 000000000..6077a4638
Binary files /dev/null and b/oci-apm-weblogic/02-create-domain/images/3-1-2-domain.png differ
diff --git a/oci-apm-weblogic/02-create-domain/images/3-1-domain.png b/oci-apm-weblogic/02-create-domain/images/3-1-domain.png
new file mode 100644
index 000000000..1dd4ed31a
Binary files /dev/null and b/oci-apm-weblogic/02-create-domain/images/3-1-domain.png differ
diff --git a/oci-apm-weblogic/02-create-domain/images/3-2-domain.png b/oci-apm-weblogic/02-create-domain/images/3-2-domain.png
new file mode 100644
index 000000000..571b5edaa
Binary files /dev/null and b/oci-apm-weblogic/02-create-domain/images/3-2-domain.png differ
diff --git a/oci-apm-weblogic/03-build-app/build-app.md b/oci-apm-weblogic/03-build-app/build-app.md
new file mode 100644
index 000000000..d442a5e03
--- /dev/null
+++ b/oci-apm-weblogic/03-build-app/build-app.md
@@ -0,0 +1,167 @@
+# Build a microservices application
+
+## Introduction
+
+This workshop uses a WebLogic demo application as a target application to trace against. In this lab, you will deploy the application to the Kubernetes cluster you created in Lab 1.
+
+
+Estimated time: 10 minutes
+
+### Objectives
+
+* Build a microservices application for monitoring
+
+### Prerequisites
+
+* Completion of the preceding labs in this workshop
+
+## Task 1: Verify OKE
+
+1. Go back to the Kubernetes cluster page where you left Lab 1, and check the status of the cluster. Open the navigation menu from the top left corner (aka. hamburger menu) in the Oracle Cloud console, and select **Developer Services** > **Kubernetes Clusters (OKE)**.
+
+ 
+
+2. Click the **apmlab-cluser1** link from the table.
+
+ 
+
+3. If the status of the cluster is **Active**, creation was successful. If it is still in a **Creating** status, it may take a few more minutes to complete. (Usually, it takes 7 to 10 minutes to finish the jobs to create a cluster).
+
+ 
+
+## Task 2: Access the OKE in the Oracle Cloud shell
+
+
+1. Click **Access Cluster** on the cluster details page.
+
+ 
+
+2. Make sure the **Cloud Shell Access** is selected. Click the **Copy** link from the command to access kubeconfig for the cluster.
+
+ 
+
+3. Then click **Launch Cloud Shell**.
+
+ 
+
+4. Oracle Cloud Shell window opens at the lower side of the browser screen.
+
+ 
+
+5. Paste the copied command to the command shell prompt. Then hit enter.
+
+ 
+
+ >**Note:** Save the command to a text file on your laptop, and execute it whenever you start a new Cloud Shell session, while working in the labs in this workshop.
+
+## Task3: Download configuration files
+
+1. Download the zip file to the home directory in the Cloud Shell.
+
+ ``` bash
+
+ cd ~; wget https://objectstorage.us-phoenix-1.oraclecloud.com/n/axfo51x8x2ap/b/apmocw-bucket-2022/o/wls-hol.zip
+
+ ```
+ 
+
+3. Unzip the file. This will create a directory **wls-hol**.
+
+ ``` bash
+
+ unzip ~/wls-hol.zip
+
+ ```
+
+ 
+
+## Task4: Set up the WebLogic Domain and a demo application on the OKE
+
+1. Execute the following command from the Cloud Shell.
+
+ ``` bash
+
+ ls ~/wls-hol
+
+ ```
+ 
+
+ >**Note:** Verify there are the following files in the folder.
+ - apmlab-fss.yaml
+ - deleteWls.sh
+ - deployWls.sh
+ - domain.yaml
+ - traefik-config.yaml
+ - traefik-values.yaml
+
+2. Add executable permission to the shell script files in the folder by running the following command.
+
+ ``` bash
+
+ chmod +x ~/wls-hol/*.sh
+
+ ```
+ 
+
+3. Execute the command below to run a shell script from the **wls-hol** directory. This will create a WebLogic domain on the OKE in your tenancy. The process may take a few minutes to complete.
+
+ ``` bash
+
+ cd ~/wls-hol; ./deployWls.sh
+
+ ```
+
+ 
+
+ Ensure that you see the message 'Cluster configuration complete!' and the URL to launch a demo application.
+
+ 
+
+4. Run the kubectl command below to display the information of the services created.
+
+ ``` bash
+
+ kubectl get svc --all-namespaces
+
+ ```
+ The output will be similar to the image below. The namespace of the WebLogic Server services in this workshop is **sample-domain1-ns**. It may take a few minutes to see all services.
+
+ 
+
+5. Run the command below to display the statuses of the pods. Wait for all pods are Ready and in the Running state.
+
+ ``` bash
+
+ kubectl get pod -n sample-domain1-ns
+
+ ```
+
+ 
+
+
+6. From the command output from the step 4 above, locate the LoadBalancer service. Note down the External-IP.
+
+ 
+
+7. On your computer, open a new browser tab and access the application with the following URL pattern:
+
+ ``` bash
+
+ http:///opdemo/?dsname=testDatasource
+
+ ```
+ Make sure the WebLogic Operator Demo application launches as in the image below. This is the target web application you will use to configure the APM Java Agent in this workshop.
+
+ 
+
+
+
+You may now **proceed to the next lab**.
+
+## Acknowledgements
+
+* **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
+- **Contributors** - Steven Lemme, Senior Principal Product Manager,
+Anand Prabhu, Sr. Member of Technical Staff,
+Avi Huber, Vice President, Product Management
+* **Last Updated By/Date** - Yutaka Takatsu, December 2024
diff --git a/oci-apm-weblogic/03-build-app/images/1-1-menu.png b/oci-apm-weblogic/03-build-app/images/1-1-menu.png
new file mode 100644
index 000000000..1952ba10d
Binary files /dev/null and b/oci-apm-weblogic/03-build-app/images/1-1-menu.png differ
diff --git a/oci-apm-weblogic/03-build-app/images/1-2-menu.png b/oci-apm-weblogic/03-build-app/images/1-2-menu.png
new file mode 100644
index 000000000..b8602a9b0
Binary files /dev/null and b/oci-apm-weblogic/03-build-app/images/1-2-menu.png differ
diff --git a/oci-apm-weblogic/03-build-app/images/1-3-oke.png b/oci-apm-weblogic/03-build-app/images/1-3-oke.png
new file mode 100644
index 000000000..ad6ee836e
Binary files /dev/null and b/oci-apm-weblogic/03-build-app/images/1-3-oke.png differ
diff --git a/oci-apm-weblogic/03-build-app/images/2-1-oke.png b/oci-apm-weblogic/03-build-app/images/2-1-oke.png
new file mode 100644
index 000000000..2e81092fe
Binary files /dev/null and b/oci-apm-weblogic/03-build-app/images/2-1-oke.png differ
diff --git a/oci-apm-weblogic/03-build-app/images/2-2-oke.png b/oci-apm-weblogic/03-build-app/images/2-2-oke.png
new file mode 100644
index 000000000..ca3cb448b
Binary files /dev/null and b/oci-apm-weblogic/03-build-app/images/2-2-oke.png differ
diff --git a/oci-apm-weblogic/03-build-app/images/2-3-oke.png b/oci-apm-weblogic/03-build-app/images/2-3-oke.png
new file mode 100644
index 000000000..4d47152ca
Binary files /dev/null and b/oci-apm-weblogic/03-build-app/images/2-3-oke.png differ
diff --git a/oci-apm-weblogic/03-build-app/images/2-4-oke.png b/oci-apm-weblogic/03-build-app/images/2-4-oke.png
new file mode 100644
index 000000000..644984a06
Binary files /dev/null and b/oci-apm-weblogic/03-build-app/images/2-4-oke.png differ
diff --git a/oci-apm-weblogic/03-build-app/images/2-5-oke.png b/oci-apm-weblogic/03-build-app/images/2-5-oke.png
new file mode 100644
index 000000000..0eed913e7
Binary files /dev/null and b/oci-apm-weblogic/03-build-app/images/2-5-oke.png differ
diff --git a/oci-apm-weblogic/d-lab-three-build-app/images/3-1-cloudshell.png b/oci-apm-weblogic/03-build-app/images/3-1-cloudshell.png
similarity index 100%
rename from oci-apm-weblogic/d-lab-three-build-app/images/3-1-cloudshell.png
rename to oci-apm-weblogic/03-build-app/images/3-1-cloudshell.png
diff --git a/oci-apm-weblogic/d-lab-three-build-app/images/3-2-cloudshell.png b/oci-apm-weblogic/03-build-app/images/3-2-cloudshell.png
similarity index 100%
rename from oci-apm-weblogic/d-lab-three-build-app/images/3-2-cloudshell.png
rename to oci-apm-weblogic/03-build-app/images/3-2-cloudshell.png
diff --git a/oci-apm-weblogic/d-lab-three-build-app/images/4-1-cloudshell.png b/oci-apm-weblogic/03-build-app/images/4-1-cloudshell.png
similarity index 100%
rename from oci-apm-weblogic/d-lab-three-build-app/images/4-1-cloudshell.png
rename to oci-apm-weblogic/03-build-app/images/4-1-cloudshell.png
diff --git a/oci-apm-weblogic/d-lab-three-build-app/images/4-2-cloudshell.png b/oci-apm-weblogic/03-build-app/images/4-2-cloudshell.png
similarity index 100%
rename from oci-apm-weblogic/d-lab-three-build-app/images/4-2-cloudshell.png
rename to oci-apm-weblogic/03-build-app/images/4-2-cloudshell.png
diff --git a/oci-apm-weblogic/d-lab-three-build-app/images/4-3-cloudshell.png b/oci-apm-weblogic/03-build-app/images/4-3-cloudshell.png
similarity index 100%
rename from oci-apm-weblogic/d-lab-three-build-app/images/4-3-cloudshell.png
rename to oci-apm-weblogic/03-build-app/images/4-3-cloudshell.png
diff --git a/oci-apm-weblogic/d-lab-three-build-app/images/4-4-cloudshell.png b/oci-apm-weblogic/03-build-app/images/4-3a-cloudshell.png
similarity index 100%
rename from oci-apm-weblogic/d-lab-three-build-app/images/4-4-cloudshell.png
rename to oci-apm-weblogic/03-build-app/images/4-3a-cloudshell.png
diff --git a/oci-apm-weblogic/d-lab-three-build-app/images/4-2-2-cloudshell.png b/oci-apm-weblogic/03-build-app/images/4-4-cloudshell.png
similarity index 100%
rename from oci-apm-weblogic/d-lab-three-build-app/images/4-2-2-cloudshell.png
rename to oci-apm-weblogic/03-build-app/images/4-4-cloudshell.png
diff --git a/oci-apm-weblogic/d-lab-three-build-app/images/4-5-cloudshell.png b/oci-apm-weblogic/03-build-app/images/4-5-cloudshell.png
similarity index 100%
rename from oci-apm-weblogic/d-lab-three-build-app/images/4-5-cloudshell.png
rename to oci-apm-weblogic/03-build-app/images/4-5-cloudshell.png
diff --git a/oci-apm-weblogic/d-lab-three-build-app/images/4-2-1-cloudshell.png b/oci-apm-weblogic/03-build-app/images/4-6-cloudshell.png
similarity index 100%
rename from oci-apm-weblogic/d-lab-three-build-app/images/4-2-1-cloudshell.png
rename to oci-apm-weblogic/03-build-app/images/4-6-cloudshell.png
diff --git a/oci-apm-weblogic/d-lab-three-build-app/images/4-3-demoapp.png b/oci-apm-weblogic/03-build-app/images/4-7-demoapp.png
similarity index 100%
rename from oci-apm-weblogic/d-lab-three-build-app/images/4-3-demoapp.png
rename to oci-apm-weblogic/03-build-app/images/4-7-demoapp.png
diff --git a/oci-apm-weblogic/04-create-file-system/create-file-system.md b/oci-apm-weblogic/04-create-file-system/create-file-system.md
new file mode 100644
index 000000000..26c8b6200
--- /dev/null
+++ b/oci-apm-weblogic/04-create-file-system/create-file-system.md
@@ -0,0 +1,315 @@
+# Create and configure a file system
+
+## Introduction
+
+In this lab, you will create a file system in the Oracle Cloud Infrastructure. You will also create security rules to allow network traffic and mount the file system to the Kubernetes pods.
+
+Estimated time: 15 minutes
+
+### Objectives
+
+* Create a file system in the Oracle Cloud
+* Create security rules in the network
+* Create a YAML file, which defines Storage Class, Persistent Volume, and Persistent Volume Claim
+* Mount the volume to the Kubernetes cluster by applying the YAML, which recreates the Kubernetes pods with the new storage configuration
+
+### Prerequisites
+
+* OCI quota and permissions to create a file system and associated resources. See **[Creating File Systems](https://docs.oracle.com/en-us/iaas/Content/File/Tasks/creatingfilesystems.htm)** and **[Service Limits](https://docs.oracle.com/en-us/iaas/Content/General/Concepts/servicelimits.htm#top)** in the Oracle Cloud documentation.
+* Completion of the preceding labs in this workshop
+
+## Task1: Create a file system in the Oracle Cloud
+
+1. Minimize the Cloud Shell window by clicking the Minimize button. Close the **Access Your Cluster window** if still open.
+
+ 
+
+2. From the OCI menu, select **Storage** > **File Systems**.
+
+ 
+
+3. Make sure you are in the compartment **apmworkshop**. If not, select it from the pulldown menu.
+
+ 
+
+4. Click **Create File System**
+
+ 
+
+5. On the **Create File System** page, ensure the **File System for NFS** is selected. In the **File System Information** section, click **Edit Details**.
+
+ 
+
+6. On the Create File System page, enter **apmlab-fss** into the **Name** field.
+
+ Make sure the **apmworkshop** is selected in the **Compartment**. Leave the other fields in the section with default values.
+ ***Do NOT click the Create button yet.***
+
+ 
+
+7. Scroll down the **Create File System** page and find the **Export Information** section. Verify that the **Export Path** is set to **/apmlab-fss**. This is where the file system will be mounted. You will provision an APM Java agent at this location. In the **Mount Target Information** section, click **Edit Details** to expand the section.
+
+ 
+
+8. In the **Mount Target Information** section, click the link **Click here to enable compartment selections**.
+
+ 
+
+9. In the Mount Target Information section, ensure that the **Create New Mount Target** is selected. Then locate the **Create in Compartment** field, and ensure the **apmworkshop** compartment is selected.
+ 
+10. Leave the other fields by default and click **Create**.
+
+ 
+
+11. A new File System is created. Scroll down to find the **Exports** section. Click the link to the **Mount Target** just created.
+
+ 
+
+12. Click **Copy** next to the **OCID**. Save the value in a text file on your computer. Also, take note of the **IP Address** as you will need these values in the next steps.
+
+ 
+
+## Task2: Create security rules in the network
+
+1. In the Mount Target Information section point your mouse cursor over the **“i”** icon next to **Subnet** and review the message. As the message indicates, security rules must be configured before mounting the file system, and that is what you will be doing next.
+
+ 
+
+2. Click the **Subnet** link to open the Subnet page.
+
+ 
+
+
+3. In the **Subnet Details page**, scroll down and find the **Security Lists** section, then click the link to the security list.
+
+ 
+
+4. Click the **Add Ingress Rules** button
+
+ 
+
+5. In the **Add Ingress Rules** dialog, enter the following information:
+
+ * Stateless: **No**
+ * Source Type: **CIDR**
+ * Source CIDR: **0.0.0.0/0**
+ * IP Protocol: **TCP**
+ * Source Port Range: leave as default (All)
+ * Destination Port Range: **111,2048-2050**
+ * Description: **Ingress security rule for apmlab-fss**
+
+ 
+
+6. Click the **+ Another Ingress Rule** button and create an additional rule for **UDP**, with the destination port range **111,2048**. Use the same values with the rule created above for the rest of the fields.
+
+ Click the **Add Ingress Rules** button which creates 4 ingress rules in the security list.
+
+ 
+
+7. After the configuration, your **Ingress Rules** have 4 additional security rules as in the image below.
+
+ 
+
+8. Click **Egress Rules**, which is located on the left side of the screen.
+
+ 
+
+9. Click the **Add Egress Rules** button.
+
+ 
+
+10. In the **Add Egress Rules** dialog, enter the following information:
+
+ * Stateless: **No**
+ * Source Type: **CIDR**
+ * Source CIDR: **0.0.0.0/0**
+ * IP Protocol: **TCP**
+ * Source Port Range: leave as default (All)
+ * Destination Port Range: **111,2048-2050**
+ * Description: **Egress security rule for apmlab-fss**
+
+ 
+
+11. Click the **+ Another Egress Rule** button and create an additional rule for **UDP**, with the destination port **111**. Use the same values with the rule created above for the rest of the fields.
Click **Add Egress Rules** button which creates 3 egress rules in the security list.
+
+ 
+
+12. After the configuration, your **Egress Rules** have 3 additional security rules as in the image below.
+
+ 
+
+## Task3: Mount the file system to Kubernetes pods
+
+1. Click the **Developer tools** icon from the top right corner in the Oracle Cloud console menu bar, then select **Cloud shell** to start a Cloud Shell environment which will appear at the bottom of your page.
+ 
+
+ >**Note:** If the Cloud Shell is already running but the window is minimized, you can restore the window by clicking the **Restore** icon on the toolbar.
+ 
+
+
+2. If the previous Cloud Shell session is expired, run the oci ce (Container Engine) command that you saved in Lab 3, Task 2, step 5.
+
+
+ 
+
+3. Use any text editor (such as the vi editor tool) to open the **apmlab-fss.yaml** file for editing.
+
+ ``` bash
+
+ vi ~/wls-hol/apmlab-fss.yaml
+
+ ```
+
+ >**Note:** If you are using the vi editor, type ***i*** to enter Insert mode, and make the text editable. Use allow keys to navigate the text and make changes to where you set the cursor. To save a file, press the Esc key, then type ***:wq*** to write and quit the file. If you do not wish a change, press Esc then type ***:q!*** to discard your changes. Please refer to the editor's references for more usage. Alternatively, you can use a built-in code editor to edit files. To use the code editor, select the **Developer tools** icon from the toolbar> select **Code Editor**.
+ 
+
+4. Review the file contents that create Kubernetes objects (StorageClass, PersistentVolume, PersistentVolumeClaim) in your OKE. Replace the **mntTargetID** and **server IP** with the values copied in Lab 3, Task 1, step 11 in this Workshop. Save the change and close the file.
+
+ apiVersion: storage.k8s.io/v1
+ kind: StorageClass
+ metadata:
+ name: apmlab-fss
+ provisioner: oracle.com/apmlab-fss
+ parameters:
+ mntTargetId:
+ ---
+ apiVersion: v1
+ kind: PersistentVolume
+ metadata:
+ name: apmlab-fsspv
+ spec:
+ storageClassName: apmlab-fss
+ capacity:
+ storage: 10Gi
+ accessModes:
+ - ReadWriteMany
+ mountOptions:
+ - nosuid
+ nfs:
+ server:
+ path: "/apmlab-fss"
+ readOnly: false
+ ---
+ apiVersion: v1
+ kind: PersistentVolumeClaim
+ metadata:
+ name: apmlab-fsspv
+ spec:
+ storageClassName: apmlab-fss
+ accessModes:
+ - ReadWriteMany
+ resources:
+ requests:
+ storage: 10Gi
+ volumeName: apmlab-fsspv
+
+ >**Note:** Refer to the screenshot image below to see what it should look like after the file is modified. Verify that the Kubernetes objects, such as StorageClass, PersistentVolume, and PersistentVolumeClass are configured in the YAML file.
+ 
+
+
+## Task4: Apply changes to the container
+
+1. Execute the following command to add the storage objects to the Kubernetes cluster.
+
+ ``` bash
+
+ kubectl apply -f ~/wls-hol/apmlab-fss.yaml -n sample-domain1-ns
+
+ ```
+
+2. Verify the Storage Class, PV and PVC are created.
+
+ 
+
+ >**Note:** If you need to modify the YAML file after once applied, first run the command below to remove the objects, modify the file, then rerun the above command to re-apply the YAML.
+ kubectl delete -f ~/wls-hol/apmlab-fss.yaml
+
+
+## Task5: Add volumes to Kubernetes pods
+
+1. Open the **domain.yaml** file that locates in the home directory, with any editor, such as the vi tool.
+
+ ``` bash
+
+ vi ~/wls-hol/domain.yaml
+
+ ```
+
+2. Find the **volumes:** section (line 79). At this point, the section is commented out.
+
+ 
+
+3. Hit **i** to enter the edit mode. Create a new line above **volumes:** and carefully insert the following code below.
+
+ volumes:
+ - name: apmlab-nfs
+ persistentVolumeClaim:
+ claimName: apmlab-fsspv
+ volumeMounts:
+ - mountPath: "/apmlab-fss"
+ name: apmlab-nfs
+
+
+ > ***Suggested Editing Tips:***
+ - Use your mouse to select the text above, and manually copy and paste it into a text file.
+ - Auto copy is not provided as it may break the indentation.
+ - Copy the entire area from the text box, including the space preceding the text.
+ - In the yaml file, place your mouse cursor at the beginning of the line, then paste the code.
+ - Make sure to keep the same space indentation when pasting the code into the file.
+ - The lines “volumes:” and "volumeMounts:" align with the line “env:”.
+ - Refer to the screenshot image below to see how it should look after the file is modified.
+ 
+
+
+4. Run the following command. This will recreate the pods, with the new object configurations.
+
+ ``` bash
+
+ kubectl apply -f ~/wls-hol/domain.yaml -n sample-domain1-ns
+
+ ```
+
+ 
+
+5. Run the following command to ensure the pods are in the running state. You may need to wait for a few minutes to see if all the pods are restarted and their status updated.
+
+ ``` bash
+
+ kubectl get pods -n sample-domain1-ns
+
+ ```
+
+ 
+
+ >**Note:** Verify the **AGE** column to ensure the pods are restarted. It may take a few minutes to have all the pods restarted.
+
+
+
+
+6. Execute the following command to access the Kubernetes pods.
+
+ ``` bash
+
+ kubectl exec -it sample-domain1-admin-server -n sample-domain1-ns -- bash -c "cd / && ls "
+
+ ```
+
+ Make sure that you see the ***apmlab-fss*** directory that is the file system mounted to this location.
+
+ 
+
+
+ >***Debugging TIPS***: If you cannot find the apmlab-fss directory, or the pods do not start running, execute the following command from the Cloud Shell to troubleshoot.
+ kubectl get events --sort-by=.metadata.creationTimestamp
+
+
+
+You may now **proceed to the next lab**.
+
+## Acknowledgements
+
+* **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
+- **Contributors** - Steven Lemme, Senior Principal Product Manager,
+Anand Prabhu, Sr. Member of Technical Staff,
+Avi Huber, Vice President, Product Management
+* **Last Updated By/Date** - Yutaka Takatsu, December 2024
diff --git a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-1-0-cloushell.png b/oci-apm-weblogic/04-create-file-system/images/1-1-cloushell.png
similarity index 100%
rename from oci-apm-weblogic/e-lab-four-create-file-system/images/3-1-0-cloushell.png
rename to oci-apm-weblogic/04-create-file-system/images/1-1-cloushell.png
diff --git a/oci-apm-weblogic/04-create-file-system/images/1-10-filesystem.png b/oci-apm-weblogic/04-create-file-system/images/1-10-filesystem.png
new file mode 100644
index 000000000..ac397d89b
Binary files /dev/null and b/oci-apm-weblogic/04-create-file-system/images/1-10-filesystem.png differ
diff --git a/oci-apm-weblogic/04-create-file-system/images/1-11-filesystem.png b/oci-apm-weblogic/04-create-file-system/images/1-11-filesystem.png
new file mode 100644
index 000000000..e92cb8cb4
Binary files /dev/null and b/oci-apm-weblogic/04-create-file-system/images/1-11-filesystem.png differ
diff --git a/oci-apm-weblogic/04-create-file-system/images/1-12-filesystem.png b/oci-apm-weblogic/04-create-file-system/images/1-12-filesystem.png
new file mode 100644
index 000000000..781f70138
Binary files /dev/null and b/oci-apm-weblogic/04-create-file-system/images/1-12-filesystem.png differ
diff --git a/oci-apm-weblogic/04-create-file-system/images/1-2-menu.png b/oci-apm-weblogic/04-create-file-system/images/1-2-menu.png
new file mode 100644
index 000000000..a682d24cc
Binary files /dev/null and b/oci-apm-weblogic/04-create-file-system/images/1-2-menu.png differ
diff --git a/oci-apm-weblogic/04-create-file-system/images/1-3-filesystem.png b/oci-apm-weblogic/04-create-file-system/images/1-3-filesystem.png
new file mode 100644
index 000000000..bbc70489d
Binary files /dev/null and b/oci-apm-weblogic/04-create-file-system/images/1-3-filesystem.png differ
diff --git a/oci-apm-weblogic/04-create-file-system/images/1-4-filesystem.png b/oci-apm-weblogic/04-create-file-system/images/1-4-filesystem.png
new file mode 100644
index 000000000..bfc606c04
Binary files /dev/null and b/oci-apm-weblogic/04-create-file-system/images/1-4-filesystem.png differ
diff --git a/oci-apm-weblogic/04-create-file-system/images/1-5-filesystem.png b/oci-apm-weblogic/04-create-file-system/images/1-5-filesystem.png
new file mode 100644
index 000000000..306956223
Binary files /dev/null and b/oci-apm-weblogic/04-create-file-system/images/1-5-filesystem.png differ
diff --git a/oci-apm-weblogic/04-create-file-system/images/1-6-filesystem.png b/oci-apm-weblogic/04-create-file-system/images/1-6-filesystem.png
new file mode 100644
index 000000000..724a41837
Binary files /dev/null and b/oci-apm-weblogic/04-create-file-system/images/1-6-filesystem.png differ
diff --git a/oci-apm-weblogic/04-create-file-system/images/1-7-filesystem.png b/oci-apm-weblogic/04-create-file-system/images/1-7-filesystem.png
new file mode 100644
index 000000000..6c9dcd61e
Binary files /dev/null and b/oci-apm-weblogic/04-create-file-system/images/1-7-filesystem.png differ
diff --git a/oci-apm-weblogic/04-create-file-system/images/1-8-filesystem.png b/oci-apm-weblogic/04-create-file-system/images/1-8-filesystem.png
new file mode 100644
index 000000000..e3999d7e9
Binary files /dev/null and b/oci-apm-weblogic/04-create-file-system/images/1-8-filesystem.png differ
diff --git a/oci-apm-weblogic/04-create-file-system/images/1-9-filesystem.png b/oci-apm-weblogic/04-create-file-system/images/1-9-filesystem.png
new file mode 100644
index 000000000..383ebae00
Binary files /dev/null and b/oci-apm-weblogic/04-create-file-system/images/1-9-filesystem.png differ
diff --git a/oci-apm-springboot/e-lab-four-create-file-system/images/3-2-1-securityrules.png b/oci-apm-weblogic/04-create-file-system/images/2-1-securityrules.png
similarity index 100%
rename from oci-apm-springboot/e-lab-four-create-file-system/images/3-2-1-securityrules.png
rename to oci-apm-weblogic/04-create-file-system/images/2-1-securityrules.png
diff --git a/oci-apm-weblogic/04-create-file-system/images/2-10-securityrules.png b/oci-apm-weblogic/04-create-file-system/images/2-10-securityrules.png
new file mode 100644
index 000000000..c9a21658d
Binary files /dev/null and b/oci-apm-weblogic/04-create-file-system/images/2-10-securityrules.png differ
diff --git a/oci-apm-weblogic/04-create-file-system/images/2-11-securityrules.png b/oci-apm-weblogic/04-create-file-system/images/2-11-securityrules.png
new file mode 100644
index 000000000..0426d4759
Binary files /dev/null and b/oci-apm-weblogic/04-create-file-system/images/2-11-securityrules.png differ
diff --git a/oci-apm-weblogic/04-create-file-system/images/2-12-securityrules.png b/oci-apm-weblogic/04-create-file-system/images/2-12-securityrules.png
new file mode 100644
index 000000000..674f210cc
Binary files /dev/null and b/oci-apm-weblogic/04-create-file-system/images/2-12-securityrules.png differ
diff --git a/oci-apm-weblogic/04-create-file-system/images/2-2-securityrules.png b/oci-apm-weblogic/04-create-file-system/images/2-2-securityrules.png
new file mode 100644
index 000000000..740b44d37
Binary files /dev/null and b/oci-apm-weblogic/04-create-file-system/images/2-2-securityrules.png differ
diff --git a/oci-apm-weblogic/04-create-file-system/images/2-3-securityrules.png b/oci-apm-weblogic/04-create-file-system/images/2-3-securityrules.png
new file mode 100644
index 000000000..104876602
Binary files /dev/null and b/oci-apm-weblogic/04-create-file-system/images/2-3-securityrules.png differ
diff --git a/oci-apm-weblogic/04-create-file-system/images/2-4-securityrules.png b/oci-apm-weblogic/04-create-file-system/images/2-4-securityrules.png
new file mode 100644
index 000000000..811f312f2
Binary files /dev/null and b/oci-apm-weblogic/04-create-file-system/images/2-4-securityrules.png differ
diff --git a/oci-apm-weblogic/04-create-file-system/images/2-5-securityrules.png b/oci-apm-weblogic/04-create-file-system/images/2-5-securityrules.png
new file mode 100644
index 000000000..e9c483e80
Binary files /dev/null and b/oci-apm-weblogic/04-create-file-system/images/2-5-securityrules.png differ
diff --git a/oci-apm-weblogic/04-create-file-system/images/2-6-securityrules.png b/oci-apm-weblogic/04-create-file-system/images/2-6-securityrules.png
new file mode 100644
index 000000000..8a518462e
Binary files /dev/null and b/oci-apm-weblogic/04-create-file-system/images/2-6-securityrules.png differ
diff --git a/oci-apm-weblogic/04-create-file-system/images/2-7-securityrules.png b/oci-apm-weblogic/04-create-file-system/images/2-7-securityrules.png
new file mode 100644
index 000000000..d3cea83f4
Binary files /dev/null and b/oci-apm-weblogic/04-create-file-system/images/2-7-securityrules.png differ
diff --git a/oci-apm-weblogic/04-create-file-system/images/2-8-securityrules.png b/oci-apm-weblogic/04-create-file-system/images/2-8-securityrules.png
new file mode 100644
index 000000000..071a41de9
Binary files /dev/null and b/oci-apm-weblogic/04-create-file-system/images/2-8-securityrules.png differ
diff --git a/oci-apm-weblogic/04-create-file-system/images/2-9-securityrules.png b/oci-apm-weblogic/04-create-file-system/images/2-9-securityrules.png
new file mode 100644
index 000000000..dc929a7f5
Binary files /dev/null and b/oci-apm-weblogic/04-create-file-system/images/2-9-securityrules.png differ
diff --git a/oci-apm-springboot/e-lab-four-create-file-system/images/3-3-2-menu.png b/oci-apm-weblogic/04-create-file-system/images/3-1-menu-notes.png
similarity index 100%
rename from oci-apm-springboot/e-lab-four-create-file-system/images/3-3-2-menu.png
rename to oci-apm-weblogic/04-create-file-system/images/3-1-menu-notes.png
diff --git a/oci-apm-springboot/e-lab-four-create-file-system/images/3-3-1-menu.png b/oci-apm-weblogic/04-create-file-system/images/3-1-menu.png
similarity index 100%
rename from oci-apm-springboot/e-lab-four-create-file-system/images/3-3-1-menu.png
rename to oci-apm-weblogic/04-create-file-system/images/3-1-menu.png
diff --git a/oci-apm-springboot/e-lab-four-create-file-system/images/3-3-2-cloudshell.png b/oci-apm-weblogic/04-create-file-system/images/3-2-cloudshell.png
similarity index 100%
rename from oci-apm-springboot/e-lab-four-create-file-system/images/3-3-2-cloudshell.png
rename to oci-apm-weblogic/04-create-file-system/images/3-2-cloudshell.png
diff --git a/oci-apm-springboot/e-lab-four-create-file-system/images/3-3-2-1-yaml.png b/oci-apm-weblogic/04-create-file-system/images/3-3-yaml.png
similarity index 100%
rename from oci-apm-springboot/e-lab-four-create-file-system/images/3-3-2-1-yaml.png
rename to oci-apm-weblogic/04-create-file-system/images/3-3-yaml.png
diff --git a/oci-apm-springboot/e-lab-four-create-file-system/images/3-3-2-yaml.png b/oci-apm-weblogic/04-create-file-system/images/3-4-yaml.png
similarity index 100%
rename from oci-apm-springboot/e-lab-four-create-file-system/images/3-3-2-yaml.png
rename to oci-apm-weblogic/04-create-file-system/images/3-4-yaml.png
diff --git a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-3-3-cloudshell.png b/oci-apm-weblogic/04-create-file-system/images/4-1-cloudshell.png
similarity index 100%
rename from oci-apm-weblogic/e-lab-four-create-file-system/images/3-3-3-cloudshell.png
rename to oci-apm-weblogic/04-create-file-system/images/4-1-cloudshell.png
diff --git a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-3-4-cloudshell.png b/oci-apm-weblogic/04-create-file-system/images/5-2-cloudshell.png
similarity index 100%
rename from oci-apm-weblogic/e-lab-four-create-file-system/images/3-3-4-cloudshell.png
rename to oci-apm-weblogic/04-create-file-system/images/5-2-cloudshell.png
diff --git a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-3-5-cloudshell.png b/oci-apm-weblogic/04-create-file-system/images/5-3-cloudshell.png
similarity index 100%
rename from oci-apm-weblogic/e-lab-four-create-file-system/images/3-3-5-cloudshell.png
rename to oci-apm-weblogic/04-create-file-system/images/5-3-cloudshell.png
diff --git a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-3-6-cloudshell.png b/oci-apm-weblogic/04-create-file-system/images/5-4-cloudshell.png
similarity index 100%
rename from oci-apm-weblogic/e-lab-four-create-file-system/images/3-3-6-cloudshell.png
rename to oci-apm-weblogic/04-create-file-system/images/5-4-cloudshell.png
diff --git a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-3-7-cloudshell.png b/oci-apm-weblogic/04-create-file-system/images/5-5-cloudshell.png
similarity index 100%
rename from oci-apm-weblogic/e-lab-four-create-file-system/images/3-3-7-cloudshell.png
rename to oci-apm-weblogic/04-create-file-system/images/5-5-cloudshell.png
diff --git a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-3-8-cloudshell.png b/oci-apm-weblogic/04-create-file-system/images/5-6-cloudshell.png
similarity index 100%
rename from oci-apm-weblogic/e-lab-four-create-file-system/images/3-3-8-cloudshell.png
rename to oci-apm-weblogic/04-create-file-system/images/5-6-cloudshell.png
diff --git a/oci-apm-weblogic/05-configure-apm-agent/configure-apm-agent.md b/oci-apm-weblogic/05-configure-apm-agent/configure-apm-agent.md
new file mode 100644
index 000000000..e00fd3418
--- /dev/null
+++ b/oci-apm-weblogic/05-configure-apm-agent/configure-apm-agent.md
@@ -0,0 +1,243 @@
+# Instrument the server monitoring
+
+## Introduction
+
+In this lab, you will download the APM Java Agent installer file from the Oracle Cloud console, upload it to the Oracle Cloud shell, transfer it to the Kubernetes container, provision the Java Agent to the file system, and finally, deploy the Agent to the Kubernetes pods.
+
+Estimated time: 10 minutes
+
+### Objectives
+
+* Download the APM Java Agent from the Oracle Cloud console
+* Upload the APM Java Agent to the Cloud shell
+* Copy the Java Agent installer from the Cloud shell to the file system
+* Provision the APM Java Agent in the shared file system directory
+* Deploy the Java Agent to the Kubernetes pods
+
+### Prerequisites
+
+* Completion of the preceding labs in this workshop
+
+## Task1: Obtain APM Java Agent download link
+
+1. Open navigation menu from the Oracle Cloud console, select **Observability & Management** > **Administration**.
+
+ 
+
+2. Under **Resources** at the lower left side of the screen, click **Download APM Agent**
+
+ 
+
+ 3. Manually copy the **Agent Version** and paste it to a text file.
+
+ 
+
+ 4. Open the Cloud Shell by clicking the **Developer tools** icon > select **Cloud shell** from the top right corner of the Oracle Cloud console. Restore the Cloud Shell if minimized.
+
+ 
+
+
+
+## Task2: Download the APM Java Agent to the Cloud shell
+
+1. Type the following command into the Cloud Shell. Make sure to ***replace*** the **Agent version** with the copied text from the previous steps.
+
+ ``` bash
+
+ cd ~/; wget https://repo1.maven.org/maven2/com/oracle/apm/agent/java/apm-java-agent-installer//apm-java-agent-installer-.jar
+
+ ```
+
+ E.g., cd ~/; wget https://repo1.maven.org/maven2/com/oracle/apm/agent/java/apm-java-agent-installer/1.8.3326/apm-java-agent-installer-1.8.3326.jar
+
+ >**Note:** If you received **No such file or directory** error, it may be a new version of the agent is being updated. Please run the following URL on a browser and find the Agent version available at the Maven central.
+ ``` bash
+
+ https://repo1.maven.org/maven2/com/oracle/apm/agent/java/apm-java-agent-installer
+
+ ```
+ 
+
+2. Hit the enter key and verify the message to ensure the successful file transfer.
+
+ 
+
+3. Type the ls command. Confirm that the java agent file installer is in the home directory.
+
+ ``` bash
+
+ ls ~
+
+ ```
+ 
+
+## Task3: Copy the Java Agent installer to the file system
+
+1. Run the command below to copy the Java Agent installer file to the file system. Ensure to ***replace*** the **apm-agent-version** with that of the APM Java Agent you have, before the command execution.
+
+ ``` bash
+
+ kubectl cp apm-java-agent-installer-.jar sample-domain1-ns/sample-domain1-admin-server:/apmlab-fss/
+
+ ```
+
+ > - e.g., kubectl cp apm-java-agent-installer-1.8.3326.jar sample-domain1-ns/sample-domain1-admin-server:/apmlab-fss/
+
+2. Use the kubectl command below to remotely run the ls command in the container in the Kubernetes pod.
+
+ ``` bash
+
+ kubectl exec -it sample-domain1-admin-server -n sample-domain1-ns -- bash -c "cd /apmlab-fss && ls "
+
+ ```
+
+ If you see the java agent installer file in the location, the file transfer was successful.
+
+ 
+
+ >**Note:** The APM version may be different from what is shown in the example.
+
+## Task4: Provision of the APM Java Agent
+
+
+1. Execute the command below to provision the APM Java agent. ***Replace*** the **APM Domain Private key** and **APM Domain Endpoint**, with the values saved in Lab2, Task2. Please also ***change*** the **apm-agent-version** in the file name to the version of the agent you have.
+
+ ``` bash
+
+ kubectl exec -it sample-domain1-admin-server -n sample-domain1-ns -- bash -c "cd /apmlab-fss && java -jar ./apm-java-agent-installer-.jar provision-agent -service-name=WLS-server -destination=. -private-data-key= -data-upload-endpoint="
+
+ ```
+ E.g., kubectl exec -it sample-domain1-admin-server -n sample-domain1-ns -- bash -c "cd /apmlab-fss && java -jar apm-java-agent-installer-1.8.3326.jar provision-agent -service-name=WLS-server -destination=. -private-data-key=ABCDEFG12345ABCDEF123456ABCDE -data-upload-endpoint=https://abcdefgt12345aaaaaaaaabcdef.apm-agt.us-phoenix-1.oci.oraclecloud.com"
+
+ With a successful installation, you should see the output similar to below.
+
+ 
+
+2. Execute the below command to verify ***oracle-apm-agent*** directory is created under the apmlab-fss directory.
+
+ ``` bash
+
+ kubectl exec -it sample-domain1-admin-server -n sample-domain1-ns -- bash -c "cd /apmlab-fss && ls "
+
+ ```
+
+ 
+
+
+
+## Task5: Disable the maintenance spans
+
+In this task, you will add exclusions to the data capture in the APM Agent, for the JAXRS server probe that generates static spans in this particular WebLogic setup. This is an optional task if you are monitoring the real-life environment, but for the lab purpose, we would like to suppress the spans generated from the server maintenance, so that you can focus on the spans related to the browser navigations.
+
+Because there is no editing tool inside the container, you will copy an APM agent configuration file from the container to the Cloud Shell, edit the file, then copy it back to the container. We plan to add the exclusion by default, to the product in the future.
+
+1. Copy **ProbeConfig.acml** from the container. ***Replace*** the apm-agent-version before running the command.
+
+ ``` bash
+
+ kubectl cp sample-domain1-ns/sample-domain1-admin-server:/apmlab-fss/oracle-apm-agent/config//ProbeConfig.acml ~/ProbeConfig.acml
+
+ ```
+
+ >**Note:** The file path includes the APM Java Agent version. Change the directory name to the Agent version you have.
+ E.g., kubectl cp sample-domain1-ns/sample-domain1-admin-server:/apmlab-fss/oracle-apm-agent/config/**1.8.3326**/ProbeConfig.acml ~/ProbeConfig.acml
+
+ run the "ls" command from the Home directory and confirm the file was transferred.
+ ```bash
+
+ ls ~
+
+ ```
+
+ 
+
+2. Open **ProbeConfig.acml** with an editor
+
+ ```bash
+
+ vi ~/ProbeConfig.acml
+
+ ```
+
+3. Make the following changes and save the file.
+
+ - Find **JAXRS\_SERVER** under the **enabled\_probes** section (line 11),
+ - change
+ JAXRS\_SERVER : **true** to
+ JAXRS\_SERVER : **false**
+
+ 
+
+4. Copy **ProbeConfig.acml** back to the container. Ensure to ***change*** the directory name to the Agent apm-agent-version you have before running the command.
+
+ ```bash
+
+ kubectl cp ~/ProbeConfig.acml sample-domain1-ns/sample-domain1-admin-server:/apmlab-fss/oracle-apm-agent/config//ProbeConfig.acml
+
+ ```
+
+ >**Note:** kubectl cp ~/ProbeConfig.acml sample-domain1-ns/sample-domain1-admin-server:/apmlab-fss/oracle-apm-agent/config/**1.8.3326**/ProbeConfig.acml
+
+ 
+
+## Task6: Deploy the Java Agent
+
+Next, you will deploy the Java Agent by modifying the domain.yaml file to point to the APM Agent jar file bootstrap location.
+
+1. Open the Cloud shell, if not opened. Open the ***domain.yaml*** from the home directory with any editor.
+
+ ```bash
+
+ vi ~/wls-hol/domain.yaml
+
+ ```
+
+2. Find the **JAVA_OPTIONS** section (line 69). You will see a java runtime parameter **"-Dweblogic.StdoutDebugEnabled=false"** is set (line 70).
+
+ 
+
+3. Add the Java Agent jar location by replacing the value to:
+
+ ```bash
+
+ "-javaagent:/apmlab-fss/oracle-apm-agent/bootstrap/ApmAgent.jar -Dweblogic.StdoutDebugEnabled=false"
+
+ ```
+
+ 
+
+ Save and close the file.
+
+4. Recreate the Kubernetes pod by applying the yaml.
+
+ ```bash
+
+ kubectl apply -f ~/wls-hol/domain.yaml -n sample-domain1-ns
+
+ ```
+
+ 
+
+5. Run the following command to check the status of the pods. Carefully look at the **AGE** column, and make sure they are restarted, and in the Running state and Ready.
+
+ ```bash
+
+ kubectl get pods -n sample-domain1-ns
+
+ ```
+ 
+
+ Once the pods are in the Running state, the APM Java Agent is active and listening to the WebLogic Server. It captures backend traces and spans which you can view in the APM Trace Explorer. Verify the AGE column to ensure they are restarted. It may take 5 or more minutes to have all servers restarted.
+
+
+
+
+You may now **proceed to the next lab**.
+
+## Acknowledgements
+
+* **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
+- **Contributors** - Steven Lemme, Senior Principal Product Manager,
+Anand Prabhu, Sr. Member of Technical Staff,
+Avi Huber, Vice President, Product Management
+* **Last Updated By/Date** - Yutaka Takatsu, March, 2023
diff --git a/oci-apm-weblogic/05-configure-apm-agent/images/4-1-1-menu.png b/oci-apm-weblogic/05-configure-apm-agent/images/4-1-1-menu.png
new file mode 100644
index 000000000..c1aed0eee
Binary files /dev/null and b/oci-apm-weblogic/05-configure-apm-agent/images/4-1-1-menu.png differ
diff --git a/oci-apm-weblogic/05-configure-apm-agent/images/4-1-2-apmdomain.png b/oci-apm-weblogic/05-configure-apm-agent/images/4-1-2-apmdomain.png
new file mode 100644
index 000000000..4cc3116ec
Binary files /dev/null and b/oci-apm-weblogic/05-configure-apm-agent/images/4-1-2-apmdomain.png differ
diff --git a/oci-apm-weblogic/05-configure-apm-agent/images/4-1-3-apmdomain.png b/oci-apm-weblogic/05-configure-apm-agent/images/4-1-3-apmdomain.png
new file mode 100644
index 000000000..fd794524c
Binary files /dev/null and b/oci-apm-weblogic/05-configure-apm-agent/images/4-1-3-apmdomain.png differ
diff --git a/oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-1-4-cloudshell.png b/oci-apm-weblogic/05-configure-apm-agent/images/4-1-4-cloudshell.png
similarity index 100%
rename from oci-apm-springboot/g-lab-five-configure-apm-agent/images/4-1-4-cloudshell.png
rename to oci-apm-weblogic/05-configure-apm-agent/images/4-1-4-cloudshell.png
diff --git a/oci-apm-springboot/g-lab-five-configure-apm-agent/images/2-1-mavencentral.png b/oci-apm-weblogic/05-configure-apm-agent/images/4-2-1-mavencentral.png
similarity index 100%
rename from oci-apm-springboot/g-lab-five-configure-apm-agent/images/2-1-mavencentral.png
rename to oci-apm-weblogic/05-configure-apm-agent/images/4-2-1-mavencentral.png
diff --git a/oci-apm-weblogic/05-configure-apm-agent/images/4-2-2-cloudshell.png b/oci-apm-weblogic/05-configure-apm-agent/images/4-2-2-cloudshell.png
new file mode 100644
index 000000000..4af2fe5f9
Binary files /dev/null and b/oci-apm-weblogic/05-configure-apm-agent/images/4-2-2-cloudshell.png differ
diff --git a/oci-apm-weblogic/05-configure-apm-agent/images/4-2-3-cloudshell.png b/oci-apm-weblogic/05-configure-apm-agent/images/4-2-3-cloudshell.png
new file mode 100644
index 000000000..29ba3e245
Binary files /dev/null and b/oci-apm-weblogic/05-configure-apm-agent/images/4-2-3-cloudshell.png differ
diff --git a/oci-apm-weblogic/05-configure-apm-agent/images/4-3-2-cloudshell.png b/oci-apm-weblogic/05-configure-apm-agent/images/4-3-2-cloudshell.png
new file mode 100644
index 000000000..e24ad0f6d
Binary files /dev/null and b/oci-apm-weblogic/05-configure-apm-agent/images/4-3-2-cloudshell.png differ
diff --git a/oci-apm-weblogic/05-configure-apm-agent/images/4-4-1-cloudshell.png b/oci-apm-weblogic/05-configure-apm-agent/images/4-4-1-cloudshell.png
new file mode 100644
index 000000000..c99ff9839
Binary files /dev/null and b/oci-apm-weblogic/05-configure-apm-agent/images/4-4-1-cloudshell.png differ
diff --git a/oci-apm-weblogic/05-configure-apm-agent/images/4-4-2-cloudshell.png b/oci-apm-weblogic/05-configure-apm-agent/images/4-4-2-cloudshell.png
new file mode 100644
index 000000000..f0d859b5c
Binary files /dev/null and b/oci-apm-weblogic/05-configure-apm-agent/images/4-4-2-cloudshell.png differ
diff --git a/oci-apm-weblogic/05-configure-apm-agent/images/4-5-1-cloudshell.png b/oci-apm-weblogic/05-configure-apm-agent/images/4-5-1-cloudshell.png
new file mode 100644
index 000000000..3001108cf
Binary files /dev/null and b/oci-apm-weblogic/05-configure-apm-agent/images/4-5-1-cloudshell.png differ
diff --git a/oci-apm-weblogic/05-configure-apm-agent/images/4-5-2-cloudshell.png b/oci-apm-weblogic/05-configure-apm-agent/images/4-5-2-cloudshell.png
new file mode 100644
index 000000000..a07400415
Binary files /dev/null and b/oci-apm-weblogic/05-configure-apm-agent/images/4-5-2-cloudshell.png differ
diff --git a/oci-apm-weblogic/05-configure-apm-agent/images/4-5-3-cloudshell.png b/oci-apm-weblogic/05-configure-apm-agent/images/4-5-3-cloudshell.png
new file mode 100644
index 000000000..c0d541537
Binary files /dev/null and b/oci-apm-weblogic/05-configure-apm-agent/images/4-5-3-cloudshell.png differ
diff --git a/oci-apm-weblogic/05-configure-apm-agent/images/4-6-2-cloudshell.png b/oci-apm-weblogic/05-configure-apm-agent/images/4-6-2-cloudshell.png
new file mode 100644
index 000000000..7b9056cf1
Binary files /dev/null and b/oci-apm-weblogic/05-configure-apm-agent/images/4-6-2-cloudshell.png differ
diff --git a/oci-apm-weblogic/05-configure-apm-agent/images/4-6-3-cloudshell.png b/oci-apm-weblogic/05-configure-apm-agent/images/4-6-3-cloudshell.png
new file mode 100644
index 000000000..a1c76175e
Binary files /dev/null and b/oci-apm-weblogic/05-configure-apm-agent/images/4-6-3-cloudshell.png differ
diff --git a/oci-apm-weblogic/05-configure-apm-agent/images/4-6-4-cloudshell.png b/oci-apm-weblogic/05-configure-apm-agent/images/4-6-4-cloudshell.png
new file mode 100644
index 000000000..ada53231c
Binary files /dev/null and b/oci-apm-weblogic/05-configure-apm-agent/images/4-6-4-cloudshell.png differ
diff --git a/oci-apm-weblogic/05-configure-apm-agent/images/4-6-5-cloudshell.png b/oci-apm-weblogic/05-configure-apm-agent/images/4-6-5-cloudshell.png
new file mode 100644
index 000000000..93d6a7ab4
Binary files /dev/null and b/oci-apm-weblogic/05-configure-apm-agent/images/4-6-5-cloudshell.png differ
diff --git a/oci-apm-weblogic/g-lab-six-change-displayname/change-displayname.md b/oci-apm-weblogic/06-change-displayname/change-displayname.md
similarity index 88%
rename from oci-apm-weblogic/g-lab-six-change-displayname/change-displayname.md
rename to oci-apm-weblogic/06-change-displayname/change-displayname.md
index 0d2169106..93c0f8ed5 100644
--- a/oci-apm-weblogic/g-lab-six-change-displayname/change-displayname.md
+++ b/oci-apm-weblogic/06-change-displayname/change-displayname.md
@@ -43,7 +43,7 @@ Estimated time: 5 minutes
```
- 
+ 
3. Open **AgentConfig.properties** with an editor
@@ -61,7 +61,7 @@ Estimated time: 5 minutes
```
- 
+ 
5. Copy **AgentConfig.properties** back to the container. ***Change*** to the apm-agent-version you have.
@@ -73,7 +73,7 @@ Estimated time: 5 minutes
>**Note:** kubectl cp ~/AgentConfig.properties sample-domain1-ns/sample-domain1-admin-server:/apmlab-fss/oracle-apm-agent/config/**1.8.3326**/AgentConfig.properties
- 
+ 
6. Verify the successful file transfer, by running the following command. ***Change*** the apm-agent-version.
@@ -84,11 +84,11 @@ Estimated time: 5 minutes
```
Review the file content.
- 
+ 
Ensure you see the changes made in the previous step.
- 
+ 
No restart on the Agent or the application is necessary, because the changes made on the configuration files in the directory will be picked up dynamically by the APM Agent.
@@ -100,4 +100,4 @@ Estimated time: 5 minutes
- **Contributors** - Steven Lemme, Senior Principal Product Manager,
Anand Prabhu, Sr. Member of Technical Staff,
Avi Huber, Vice President, Product Management
-* **Last Updated By/Date** - Yutaka Takatsu, December 2022
+* **Last Updated By/Date** - Yutaka Takatsu, December 2024
diff --git a/oci-apm-weblogic/06-change-displayname/images/1-2-cloudshell.png b/oci-apm-weblogic/06-change-displayname/images/1-2-cloudshell.png
new file mode 100644
index 000000000..4697a2c77
Binary files /dev/null and b/oci-apm-weblogic/06-change-displayname/images/1-2-cloudshell.png differ
diff --git a/oci-apm-weblogic/06-change-displayname/images/1-4-cloudshell.png b/oci-apm-weblogic/06-change-displayname/images/1-4-cloudshell.png
new file mode 100644
index 000000000..fa2714eb5
Binary files /dev/null and b/oci-apm-weblogic/06-change-displayname/images/1-4-cloudshell.png differ
diff --git a/oci-apm-weblogic/06-change-displayname/images/1-5-cloudshell.png b/oci-apm-weblogic/06-change-displayname/images/1-5-cloudshell.png
new file mode 100644
index 000000000..7588b4b3b
Binary files /dev/null and b/oci-apm-weblogic/06-change-displayname/images/1-5-cloudshell.png differ
diff --git a/oci-apm-weblogic/g-lab-six-change-displayname/images/6-1b-cloudshell.png b/oci-apm-weblogic/06-change-displayname/images/1-6-cloudshell.png
similarity index 100%
rename from oci-apm-weblogic/g-lab-six-change-displayname/images/6-1b-cloudshell.png
rename to oci-apm-weblogic/06-change-displayname/images/1-6-cloudshell.png
diff --git a/oci-apm-weblogic/06-change-displayname/images/1-7-cloudshell.png b/oci-apm-weblogic/06-change-displayname/images/1-7-cloudshell.png
new file mode 100644
index 000000000..d9e87c37f
Binary files /dev/null and b/oci-apm-weblogic/06-change-displayname/images/1-7-cloudshell.png differ
diff --git a/oci-apm-weblogic/07-configure-browser-agent/configure-browser-agent.md b/oci-apm-weblogic/07-configure-browser-agent/configure-browser-agent.md
new file mode 100644
index 000000000..11437dfb6
--- /dev/null
+++ b/oci-apm-weblogic/07-configure-browser-agent/configure-browser-agent.md
@@ -0,0 +1,138 @@
+# Instrument the browser monitoring
+
+## Introduction
+
+In the previous labs, you instrumented the application with an APM java agent, which captures traces and spans generated by the server. In this lab, you will configure an APM browser agent that captures traces and spans generated by the browser. You will configure a java agent configuration file to add an automatic injection of a javascript to the application's webpage that deploys the APM browser agent.
+
+The automatic injection is an APM feature that automates the Browser Agent instrumentation for Java applications.
+
+In this lab, you will configure **AgentConfig.properties**. In production, you can do this task together with the previous lab, where you configure display names for spans/operations because you will be editing the same file. But for learning purposes, adding browser injection is called out as a dedicated lab in this workshop.
+
+Estimated time: 5 minutes
+
+### Objectives
+
+* Instrument browser by injecting JavaScript code to the webpage
+
+### Prerequisites
+
+* Completion of the preceding labs in this workshop
+
+## Task1: Configure the Java Agent configuration file to enable the injection
+
+
+1. If the Oracle Cloud shell session is expired, run the oci ce (Container Engine) command that you saved in Lab 3, Task 2, step 5.
+
+
+2. Execute the following command to copy **AgentConfig.properties** from the container to the home directory. Ensure to ***change*** the directory name to the Agent apm-agent-version you have before running the command.
+
+
+ ``` bash
+
+ kubectl cp sample-domain1-ns/sample-domain1-admin-server:/apmlab-fss/oracle-apm-agent/config//AgentConfig.properties ~/AgentConfig.properties
+
+ ```
+
+ >**Note:** The file path includes the APM Java Agent version. Change the directory name to the Agent version you have.
+ E.g., kubectl cp sample-domain1-ns/sample-domain1-admin-server:/apmlab-fss/oracle-apm-agent/config/**1.8.3326**/AgentConfig.properties ~/AgentConfig.properties
+
+ run the "ls" command from the Home directory and confirm the file was transferred.
+ ```bash
+
+ ls ~
+
+ ```
+
+ 
+
+3. Open **AgentConfig.properties** with an editor
+
+ ```bash
+
+ vi ~/AgentConfig.properties
+
+ ```
+
+4. Find a section **Start of Browser Agent (RUM) Injection Properties**
+
+ 
+
+ - Hit **i** to enter the edit mode, uncomment the following properties, and make changes as suggested below.
+ - com.oracle.apm.agent.rum.enable.injection=**true**
+ - com.oracle.apm.agent.public.data.key= **<Public data key of your APM domain>**
+ - Ensure to enter the ***Public key***, not the Private key of your domain.
+ - com.oracle.apm.agent.rum.web.application=**WLS WebApp**
+ - com.oracle.apm.agent.rum.service.name=**WLS-web**
+
+ - Save and close the file with **esc + :wq**.
+
+ 
+
+5. Copy **AgentConfig.properties** back to the container. ***Change*** the directory name to the Agent apm-agent-version you have before running the command.
+
+ ```bash
+
+ kubectl cp ~/AgentConfig.properties sample-domain1-ns/sample-domain1-admin-server:/apmlab-fss/oracle-apm-agent/config//AgentConfig.properties
+
+ ```
+
+ >**Note:** kubectl cp ~/AgentConfig.properties sample-domain1-ns/sample-domain1-admin-server:/apmlab-fss/oracle-apm-agent/config/**1.8.3326**/AgentConfig.properties
+
+ 
+
+6. Verify the successful file transfer, by running the following command. ***Change*** the apm-agent-version before running the command.
+
+ ``` bash
+
+ kubectl exec -it sample-domain1-admin-server -n sample-domain1-ns -- bash -c "cd /apmlab-fss/oracle-apm-agent/config/ && cat AgentConfig.properties "
+
+ ```
+ Review the file content.
+
+ 
+
+ Ensure you see the changes made in the previous step.
+
+ 
+
+## Task2: Verify the JavaScript in the browser source page
+
+1. Type the following command and note down the external IP of the **traefik operator** service.
+
+ ``` bash
+
+ kubectl get svc -n traefik
+
+ ```
+ 
+
+2. On your computer, open a new browser tab and access the application with the following URL pattern:
+
+ ``` bash
+
+ http:///opdemo/?dsname=testDatasource
+
+ ```
+ WebLogic Operator Demo application launches.
+
+ 
+
+3. Right mouse click on the page and select a menu item to view the page source
+
+ 
+
+4. Verify JavaScript with parameters, which are configured in the previous steps, is inserted into the page.
+
+ 
+
+5. Close the browser window.
+
+You may now **proceed to the next lab**.
+
+## Acknowledgements
+
+* **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
+- **Contributors** - Steven Lemme, Senior Principal Product Manager,
+Anand Prabhu, Sr. Member of Technical Staff,
+Avi Huber, Vice President, Product Management
+* **Last Updated By/Date** - Yutaka Takatsu, December 2024
diff --git a/oci-apm-weblogic/07-configure-browser-agent/images/6-1-cloudshell.png b/oci-apm-weblogic/07-configure-browser-agent/images/6-1-cloudshell.png
new file mode 100644
index 000000000..ee58cfbf3
Binary files /dev/null and b/oci-apm-weblogic/07-configure-browser-agent/images/6-1-cloudshell.png differ
diff --git a/oci-apm-weblogic/h-lab-seven-configure-browser-agent/images/6-10-demoapp.png b/oci-apm-weblogic/07-configure-browser-agent/images/6-10-demoapp.png
similarity index 100%
rename from oci-apm-weblogic/h-lab-seven-configure-browser-agent/images/6-10-demoapp.png
rename to oci-apm-weblogic/07-configure-browser-agent/images/6-10-demoapp.png
diff --git a/oci-apm-weblogic/07-configure-browser-agent/images/6-2-cloudshell.png b/oci-apm-weblogic/07-configure-browser-agent/images/6-2-cloudshell.png
new file mode 100644
index 000000000..5f93b6308
Binary files /dev/null and b/oci-apm-weblogic/07-configure-browser-agent/images/6-2-cloudshell.png differ
diff --git a/oci-apm-weblogic/07-configure-browser-agent/images/6-3-cloudshell.png b/oci-apm-weblogic/07-configure-browser-agent/images/6-3-cloudshell.png
new file mode 100644
index 000000000..30a1b4e95
Binary files /dev/null and b/oci-apm-weblogic/07-configure-browser-agent/images/6-3-cloudshell.png differ
diff --git a/oci-apm-weblogic/07-configure-browser-agent/images/6-4-cloudshell.png b/oci-apm-weblogic/07-configure-browser-agent/images/6-4-cloudshell.png
new file mode 100644
index 000000000..062e56241
Binary files /dev/null and b/oci-apm-weblogic/07-configure-browser-agent/images/6-4-cloudshell.png differ
diff --git a/oci-apm-weblogic/07-configure-browser-agent/images/6-5-cloudshell.png b/oci-apm-weblogic/07-configure-browser-agent/images/6-5-cloudshell.png
new file mode 100644
index 000000000..85207b909
Binary files /dev/null and b/oci-apm-weblogic/07-configure-browser-agent/images/6-5-cloudshell.png differ
diff --git a/oci-apm-weblogic/07-configure-browser-agent/images/6-6-cloudshell.png b/oci-apm-weblogic/07-configure-browser-agent/images/6-6-cloudshell.png
new file mode 100644
index 000000000..d37bf9e4e
Binary files /dev/null and b/oci-apm-weblogic/07-configure-browser-agent/images/6-6-cloudshell.png differ
diff --git a/oci-apm-weblogic/07-configure-browser-agent/images/6-7-cloudshell.png b/oci-apm-weblogic/07-configure-browser-agent/images/6-7-cloudshell.png
new file mode 100644
index 000000000..945149753
Binary files /dev/null and b/oci-apm-weblogic/07-configure-browser-agent/images/6-7-cloudshell.png differ
diff --git a/oci-apm-weblogic/h-lab-seven-configure-browser-agent/images/6-8-demoapp.png b/oci-apm-weblogic/07-configure-browser-agent/images/6-8-demoapp.png
similarity index 100%
rename from oci-apm-weblogic/h-lab-seven-configure-browser-agent/images/6-8-demoapp.png
rename to oci-apm-weblogic/07-configure-browser-agent/images/6-8-demoapp.png
diff --git a/oci-apm-weblogic/h-lab-seven-configure-browser-agent/images/6-9-demoapp.png b/oci-apm-weblogic/07-configure-browser-agent/images/6-9-demoapp.png
similarity index 100%
rename from oci-apm-weblogic/h-lab-seven-configure-browser-agent/images/6-9-demoapp.png
rename to oci-apm-weblogic/07-configure-browser-agent/images/6-9-demoapp.png
diff --git a/oci-apm-weblogic/08-view-traces/images/8-1-1-menu.png b/oci-apm-weblogic/08-view-traces/images/8-1-1-menu.png
new file mode 100644
index 000000000..b91f6fbf5
Binary files /dev/null and b/oci-apm-weblogic/08-view-traces/images/8-1-1-menu.png differ
diff --git a/oci-apm-weblogic/08-view-traces/images/8-1-2-1-menu.png b/oci-apm-weblogic/08-view-traces/images/8-1-2-1-menu.png
new file mode 100644
index 000000000..73bd5a0a2
Binary files /dev/null and b/oci-apm-weblogic/08-view-traces/images/8-1-2-1-menu.png differ
diff --git a/oci-apm-weblogic/08-view-traces/images/8-1-2-menu.png b/oci-apm-weblogic/08-view-traces/images/8-1-2-menu.png
new file mode 100644
index 000000000..3007d4e76
Binary files /dev/null and b/oci-apm-weblogic/08-view-traces/images/8-1-2-menu.png differ
diff --git a/oci-apm-weblogic/08-view-traces/images/8-1-3-menu.png b/oci-apm-weblogic/08-view-traces/images/8-1-3-menu.png
new file mode 100644
index 000000000..55ac30c4e
Binary files /dev/null and b/oci-apm-weblogic/08-view-traces/images/8-1-3-menu.png differ
diff --git a/oci-apm-weblogic/08-view-traces/images/8-1-4-menu.png b/oci-apm-weblogic/08-view-traces/images/8-1-4-menu.png
new file mode 100644
index 000000000..f9a43e010
Binary files /dev/null and b/oci-apm-weblogic/08-view-traces/images/8-1-4-menu.png differ
diff --git a/oci-apm-weblogic/08-view-traces/images/8-2-1-menu.png b/oci-apm-weblogic/08-view-traces/images/8-2-1-menu.png
new file mode 100644
index 000000000..74cff8cf1
Binary files /dev/null and b/oci-apm-weblogic/08-view-traces/images/8-2-1-menu.png differ
diff --git a/oci-apm-weblogic/08-view-traces/images/8-2-2-menu.png b/oci-apm-weblogic/08-view-traces/images/8-2-2-menu.png
new file mode 100644
index 000000000..e776277e9
Binary files /dev/null and b/oci-apm-weblogic/08-view-traces/images/8-2-2-menu.png differ
diff --git a/oci-apm-weblogic/08-view-traces/images/8-2-3-menu.png b/oci-apm-weblogic/08-view-traces/images/8-2-3-menu.png
new file mode 100644
index 000000000..aae9979a1
Binary files /dev/null and b/oci-apm-weblogic/08-view-traces/images/8-2-3-menu.png differ
diff --git a/oci-apm-weblogic/08-view-traces/images/8-2-4-menu.png b/oci-apm-weblogic/08-view-traces/images/8-2-4-menu.png
new file mode 100644
index 000000000..1b2af852f
Binary files /dev/null and b/oci-apm-weblogic/08-view-traces/images/8-2-4-menu.png differ
diff --git a/oci-apm-weblogic/08-view-traces/view-traces.md b/oci-apm-weblogic/08-view-traces/view-traces.md
new file mode 100644
index 000000000..5606ef072
--- /dev/null
+++ b/oci-apm-weblogic/08-view-traces/view-traces.md
@@ -0,0 +1,90 @@
+# View traces and spans in APM Trace Explorer
+
+## Introduction
+
+In this lab, you will learn how to use the APM Trace Explorer to trace the workload generated with the WebLogic Kubernetes Operator demo application.
+
+Estimated time: 10 minutes
+
+### Objectives
+
+* Open APM Trace Explorer from the Oracle Cloud console
+* Verify traces and spans generated by the APM Java agent and the APM Browser agent
+* Examine values in the span dimensions for the WebLogic Server and browser
+* Confirm the changes to the display names of the spans that are configured in Lab 6
+
+### Prerequisites
+
+* Completion of preceding labs in this workshop.
+
+
+## Task1: Open APM Trace Explorer in the Oracle Cloud console
+
+
+
+1. If the Oracle Cloud shell session is expired, run the oci ce (Container Engine) command that you saved in Lab 3, Task 2, step 5.
+
+
+2. From the navigation menu in the Oracle Cloud console, select **Observability & Management** > **Trace Explorer**.
+
+ 
+
+
+3. On the Trace Explorer page, select the **Compartment** and the **APM Domain**. Review the traces captured. Operation
+
+ 
+
+4. In the **Traces** view, review the **service: Operation: Operation** column of the traces. The traces with **WLS-Server** are the server-side traces. They are captured by the APM Java agent. The traces with **WLS-web** are the client-side traces, which are captured by the APM Browser agent.
+
+ 
+
+5. In the query box, add **DisplayName,** (Including the comma) at the end of the first line, as in the screenshot example. Then click Run on the right side of the field.
+
+ ``` bash
+
+ DisplayName,
+
+ ```
+
+ 
+
+6. A new column, **DispalyName** is added to the table, and values are added to the server-side traces. The format is DomainName + Server as configured in Lab 6.
+
+ 
+
+ >**Note:** Browser traces do not have values as the configuration was applied to the server traces.
+
+## Task2: Verify spans and dimensions on the Trace Details page
+
+1. In the Traces pane, click the link to the trace with the Operation name **opdemo/index.jsp** from the table.
+
+ 
+
+2. On the **Trace Details** page, click the triangle icon next to **Topology**.
+
+ 
+
+3. Click the span in the **Spans** view.
+
+ 
+
+4. Review the backend dimensions and values, including the WebLogic, Kubernetes, and Oracle Cloud information.
+
+ 
+
+
+
+
+
+## Conclusions
+
+In this workshop, you’ve learned how to use a file system by adding the APM Java agent to the microservices web application. You have also learned how to configure the APM Browser agent, and how to use APM Trace Explorer to view traces and spans. For more information on APM, refer to the OCI documentation, **[Application Performance Monitoring](https://docs.oracle.com/en-us/iaas/application-performance-monitoring/index.html)**.
+
+
+## Acknowledgements
+
+* **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
+- **Contributors** - Steven Lemme, Senior Principal Product Manager,
+Anand Prabhu, Sr. Member of Technical Staff,
+Avi Huber, Vice President, Product Management
+* **Last Updated By/Date** - Yutaka Takatsu, August 2024
diff --git a/oci-apm-weblogic/09-cleanup/cleanup.md b/oci-apm-weblogic/09-cleanup/cleanup.md
new file mode 100644
index 000000000..5c5759f9f
--- /dev/null
+++ b/oci-apm-weblogic/09-cleanup/cleanup.md
@@ -0,0 +1,157 @@
+# Clean up the workshop environment
+
+## Introduction
+
+In this lab, you will clean up the workshop environment by running commands from the Cloud shell, also manually removing the Oracle cloud resources using the Oracle Cloud console.
+
+Estimated time: 10 minutes
+
+### Objectives
+
+* Remove the lab configurations and setups
+
+### Prerequisites
+
+* Completion of preceding labs in this workshop.
+
+## Task1: Clean Up the application setup
+
+To delete the workshop setup from your tenancy, follow the steps below.
+
+1. Run the oci ce (Container Engine) command that you saved in Lab 3, Task 2, step 5.
+
+
+2. Remove the application deployment.
+
+ ``` bash
+
+ kubectl delete -f ~/wls-hol/domain.yaml -n sample-domain1-ns
+
+ ```
+
+3. Remove the storage configuration from the cluster.
+
+ ``` bash
+
+ kubectl delete -f ~/wls-hol/apmlab-fss.yaml -n sample-domain1-ns
+
+ ```
+ 
+
+
+4. Remove the WebLogic domain
+
+ ``` bash
+
+ cd ~/wls-hol; ./deleteWls.sh
+
+ ```
+
+
+
+
+## Task2: Remove the Target Mount and the File System
+
+1. From the navigation menu in the Oracle Cloud console, select **Storage** > **Mount Target**.
+ Then click the link to the MountTarget configured in the workshop.
+
+ 
+
+2. In the **Mount Target Details** page, click **Delete**. In the confirmation window, click **Delete**.
+
+ 
+
+3. Deletion of the Mount Target starts and completes.
+
+ 
+
+4. From the navigation menu in the Oracle Cloud console, select **Storage** > **File Systems**. Then click the link to the File System configured in the workshop.
+
+ 
+
+5. In the **File System Details** page, click **Delete**. In the confirmation window, click **Delete**.
+
+ 
+
+6. Deletion of the File System starts and completes.
+
+ 
+
+## Task3: Remove the container
+
+1. From the navigation menu in the Oracle Cloud console, select **Developer Services** > **Kubernetes Container(OKE)**. Then click the link to the Cluster configured in the workshop.
+
+ 
+
+2. In the **Cluster Details** page, click **Delete**. In the confirmation window, enter the name of the cluster, then click **Delete**.
+
+ 
+
+3. Deletion of the File System starts and completes.
+
+ 
+
+## Task4: Remove the VCN
+
+1. From the navigation menu in the Oracle Cloud console, select **Networking** > **Virtual Cloud Networks**. Then click the link to the VCN configured in the workshop.
+
+ 
+
+2. In the **Virtual Cloud Network Details** page, scroll down to locate the **Subnets** section. Select one of the subnets and click the three-dot icon on the right-hand side of the row.
+
+ 
+
+3. From the pulldown menu, select **Terminate**. In the confirmation window, click **Terminate**.
+
+ 
+
+4. Repeat to terminate other subnets. Once all the subnets are deleted, from the upper side of the VCN details page, click **Terminate** to remove the VCN.
+
+ 
+
+
+5. **Delete Virtual Cloud Network** dialog opens. Click **Scan**.
+
+ 
+
+6. Click the **Terminate All** button when activated. Termination of the resources begins. Once the message **Virtual Cloud Network termination complete** shows, click **Close**.
+ 
+
+## Task5: Remove the workshop directory
+
+1. Open the Oracle Cloud shell, and run the following commands to remove the files and the workshop directory.
+
+ ``` bash
+
+ cd ~; rm apm-java-agent-installer-*.jar; rm ProbeConfig.acml; rm AgentConfig.properties; rm -r wls-hol;rm wls-hol.zip
+
+ ```
+ 
+
+## Task 6: Remove the APM domain and compartment
+
+1. From the navigation menu in the Oracle Cloud console, select **Observability & Management** > **Administration**. Then click the link to the APM domain which you created in the workshop.
+ 
+
+2. In the **Domain details** page, click **Delete**. In the confirmation window, enter the name of the APM domain, then click **Delete**.
+ 
+
+3. Deletion of the APM domain starts and completes. This may take a few minutes. Refresh the screen periodically and check the status.
+ 
+
+4. From the navigation menu in the Oracle Cloud console, select **Identity & Security** > **Compartment**. Then click the link to the compartment which you created in the workshop.
+ 
+
+5. In the **Compartment details** page, click **Delete**. In the confirmation window, click **Delete**.
+ 
+
+6. Deletion of the compartment starts and completes. This may take a few minutes.
+ 
+
+## Acknowledgements
+
+* **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
+- **Contributors** - Steven Lemme, Senior Principal Product Manager,
+Anand Prabhu, Sr. Member of Technical Staff,
+Avi Huber, Vice President, Product Management
+* **Last Updated By/Date** - Yutaka Takatsu, August 2024
diff --git a/oci-apm-weblogic/j-lab-nine-cleanup/images/4-1-cleanup.png b/oci-apm-weblogic/09-cleanup/images/4-1-cleanup.png
similarity index 100%
rename from oci-apm-weblogic/j-lab-nine-cleanup/images/4-1-cleanup.png
rename to oci-apm-weblogic/09-cleanup/images/4-1-cleanup.png
diff --git a/oci-apm-weblogic/09-cleanup/images/4-10-cleanup.png b/oci-apm-weblogic/09-cleanup/images/4-10-cleanup.png
new file mode 100644
index 000000000..1174cc5eb
Binary files /dev/null and b/oci-apm-weblogic/09-cleanup/images/4-10-cleanup.png differ
diff --git a/oci-apm-weblogic/j-lab-nine-cleanup/images/4-11-cleanup.png b/oci-apm-weblogic/09-cleanup/images/4-11-cleanup.png
similarity index 100%
rename from oci-apm-weblogic/j-lab-nine-cleanup/images/4-11-cleanup.png
rename to oci-apm-weblogic/09-cleanup/images/4-11-cleanup.png
diff --git a/oci-apm-weblogic/09-cleanup/images/4-12-cleanup.png b/oci-apm-weblogic/09-cleanup/images/4-12-cleanup.png
new file mode 100644
index 000000000..695b00c9e
Binary files /dev/null and b/oci-apm-weblogic/09-cleanup/images/4-12-cleanup.png differ
diff --git a/oci-apm-weblogic/09-cleanup/images/4-13-cleanup.png b/oci-apm-weblogic/09-cleanup/images/4-13-cleanup.png
new file mode 100644
index 000000000..81970ef79
Binary files /dev/null and b/oci-apm-weblogic/09-cleanup/images/4-13-cleanup.png differ
diff --git a/oci-apm-weblogic/j-lab-nine-cleanup/images/4-14-2-cleanup.png b/oci-apm-weblogic/09-cleanup/images/4-14-2-cleanup.png
similarity index 100%
rename from oci-apm-weblogic/j-lab-nine-cleanup/images/4-14-2-cleanup.png
rename to oci-apm-weblogic/09-cleanup/images/4-14-2-cleanup.png
diff --git a/oci-apm-weblogic/09-cleanup/images/4-14-cleanup.png b/oci-apm-weblogic/09-cleanup/images/4-14-cleanup.png
new file mode 100644
index 000000000..377309d3c
Binary files /dev/null and b/oci-apm-weblogic/09-cleanup/images/4-14-cleanup.png differ
diff --git a/oci-apm-weblogic/j-lab-nine-cleanup/images/4-15-cleanup.png b/oci-apm-weblogic/09-cleanup/images/4-15-cleanup.png
similarity index 100%
rename from oci-apm-weblogic/j-lab-nine-cleanup/images/4-15-cleanup.png
rename to oci-apm-weblogic/09-cleanup/images/4-15-cleanup.png
diff --git a/oci-apm-weblogic/j-lab-nine-cleanup/images/4-16-cleanup.png b/oci-apm-weblogic/09-cleanup/images/4-16-cleanup.png
similarity index 100%
rename from oci-apm-weblogic/j-lab-nine-cleanup/images/4-16-cleanup.png
rename to oci-apm-weblogic/09-cleanup/images/4-16-cleanup.png
diff --git a/oci-apm-weblogic/09-cleanup/images/4-2-cleanup.png b/oci-apm-weblogic/09-cleanup/images/4-2-cleanup.png
new file mode 100644
index 000000000..a55359ca0
Binary files /dev/null and b/oci-apm-weblogic/09-cleanup/images/4-2-cleanup.png differ
diff --git a/oci-apm-weblogic/09-cleanup/images/4-3-cleanup.png b/oci-apm-weblogic/09-cleanup/images/4-3-cleanup.png
new file mode 100644
index 000000000..f4eb6937c
Binary files /dev/null and b/oci-apm-weblogic/09-cleanup/images/4-3-cleanup.png differ
diff --git a/oci-apm-weblogic/09-cleanup/images/4-4-cleanup.png b/oci-apm-weblogic/09-cleanup/images/4-4-cleanup.png
new file mode 100644
index 000000000..8f0f713dc
Binary files /dev/null and b/oci-apm-weblogic/09-cleanup/images/4-4-cleanup.png differ
diff --git a/oci-apm-weblogic/09-cleanup/images/4-5-cleanup.png b/oci-apm-weblogic/09-cleanup/images/4-5-cleanup.png
new file mode 100644
index 000000000..419eb44f3
Binary files /dev/null and b/oci-apm-weblogic/09-cleanup/images/4-5-cleanup.png differ
diff --git a/oci-apm-weblogic/j-lab-nine-cleanup/images/4-6-cleanup.png b/oci-apm-weblogic/09-cleanup/images/4-6-cleanup.png
similarity index 100%
rename from oci-apm-weblogic/j-lab-nine-cleanup/images/4-6-cleanup.png
rename to oci-apm-weblogic/09-cleanup/images/4-6-cleanup.png
diff --git a/oci-apm-weblogic/09-cleanup/images/4-7-cleanup.png b/oci-apm-weblogic/09-cleanup/images/4-7-cleanup.png
new file mode 100644
index 000000000..771223176
Binary files /dev/null and b/oci-apm-weblogic/09-cleanup/images/4-7-cleanup.png differ
diff --git a/oci-apm-weblogic/j-lab-nine-cleanup/images/4-8-cleanup.png b/oci-apm-weblogic/09-cleanup/images/4-8-cleanup.png
similarity index 96%
rename from oci-apm-weblogic/j-lab-nine-cleanup/images/4-8-cleanup.png
rename to oci-apm-weblogic/09-cleanup/images/4-8-cleanup.png
index e092a6c29..c3b94cce5 100644
Binary files a/oci-apm-weblogic/j-lab-nine-cleanup/images/4-8-cleanup.png and b/oci-apm-weblogic/09-cleanup/images/4-8-cleanup.png differ
diff --git a/oci-apm-weblogic/j-lab-nine-cleanup/images/4-9-cleanup.png b/oci-apm-weblogic/09-cleanup/images/4-9-cleanup.png
similarity index 100%
rename from oci-apm-weblogic/j-lab-nine-cleanup/images/4-9-cleanup.png
rename to oci-apm-weblogic/09-cleanup/images/4-9-cleanup.png
diff --git a/oci-apm-weblogic/09-cleanup/images/6-1-cleanup.png b/oci-apm-weblogic/09-cleanup/images/6-1-cleanup.png
new file mode 100644
index 000000000..30feb18dc
Binary files /dev/null and b/oci-apm-weblogic/09-cleanup/images/6-1-cleanup.png differ
diff --git a/oci-apm-weblogic/j-lab-nine-cleanup/images/6-2-cleanup.png b/oci-apm-weblogic/09-cleanup/images/6-2-cleanup.png
similarity index 100%
rename from oci-apm-weblogic/j-lab-nine-cleanup/images/6-2-cleanup.png
rename to oci-apm-weblogic/09-cleanup/images/6-2-cleanup.png
diff --git a/oci-apm-weblogic/j-lab-nine-cleanup/images/6-3-cleanup.png b/oci-apm-weblogic/09-cleanup/images/6-3-cleanup.png
similarity index 100%
rename from oci-apm-weblogic/j-lab-nine-cleanup/images/6-3-cleanup.png
rename to oci-apm-weblogic/09-cleanup/images/6-3-cleanup.png
diff --git a/oci-apm-weblogic/j-lab-nine-cleanup/images/6-4-cleanup.png b/oci-apm-weblogic/09-cleanup/images/6-4-cleanup.png
similarity index 100%
rename from oci-apm-weblogic/j-lab-nine-cleanup/images/6-4-cleanup.png
rename to oci-apm-weblogic/09-cleanup/images/6-4-cleanup.png
diff --git a/oci-apm-weblogic/09-cleanup/images/6-5-cleanup.png b/oci-apm-weblogic/09-cleanup/images/6-5-cleanup.png
new file mode 100644
index 000000000..2f3465a6a
Binary files /dev/null and b/oci-apm-weblogic/09-cleanup/images/6-5-cleanup.png differ
diff --git a/oci-apm-weblogic/09-cleanup/images/6-6-cleanup.png b/oci-apm-weblogic/09-cleanup/images/6-6-cleanup.png
new file mode 100644
index 000000000..16318776c
Binary files /dev/null and b/oci-apm-weblogic/09-cleanup/images/6-6-cleanup.png differ
diff --git a/oci-apm-weblogic/k-learn-more/images/1-1-2-get-started.png b/oci-apm-weblogic/10-learn-more/images/1-1-2-get-started.png
similarity index 100%
rename from oci-apm-weblogic/k-learn-more/images/1-1-2-get-started.png
rename to oci-apm-weblogic/10-learn-more/images/1-1-2-get-started.png
diff --git a/oci-apm-springboot/l-lab-nine-learn-more/images/1-1-get-started.png b/oci-apm-weblogic/10-learn-more/images/1-1-get-started.png
similarity index 100%
rename from oci-apm-springboot/l-lab-nine-learn-more/images/1-1-get-started.png
rename to oci-apm-weblogic/10-learn-more/images/1-1-get-started.png
diff --git a/oci-apm-weblogic/10-learn-more/learn-more.md b/oci-apm-weblogic/10-learn-more/learn-more.md
new file mode 100644
index 000000000..e98d174e5
--- /dev/null
+++ b/oci-apm-weblogic/10-learn-more/learn-more.md
@@ -0,0 +1,45 @@
+# Learn more about APM
+
+## Introduction
+
+Congratulations! You have completed the workshop.
+
+To learn more about APM, please visit **Get started with Oracle Cloud Application Performance Monitoring** workshop.
+
+ 
+ 
+
+In this workshop, you will learn how to use Oracle Cloud APM to examine critical performance alarms, view synthetic monitors in a dashboard to analyze the trend and identify spikes, observe the monitor's client-side details in HTTP Archive (HAR) file, and explore the server-side details by tracing data in APM Trace Explorer.
+
+### Objectives
+
+* Review APM alarms
+* Examine APM synthetic monitors
+* Explore monitor details and their history
+* Perform exploration of application trace data
+
+### Prerequisites
+
+* Familiarity with distributed tracing is helpful, but not required
+* Familiarity with Oracle Cloud is helpful
+
+## Task 1: Access the workshop
+
+1. Click the link following URL to access the workshop: **[Get started with Oracle Cloud APM](https://livelabs.oracle.com/pls/apex/r/dbpm/livelabs/view-workshop?wid=3350)** Workshop.
+Alternatively, open a new browser tab, copy the following URL, paste it to the address bar, and hit enter.
+
+ ``` bash
+
+ https://livelabs.oracle.com/pls/apex/r/dbpm/livelabs/view-workshop?wid=3350
+
+ ```
+
+
+
+## Acknowledgements
+
+* **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
+- **Contributors** - Steven Lemme, Senior Principal Product Manager,
+Anand Prabhu, Sr. Member of Technical Staff,
+Avi Huber, Vice President, Product Management
+* **Last Updated By/Date** - Yutaka Takatsu, December, 2024
diff --git a/oci-apm-weblogic/a-introduction/introduction.md b/oci-apm-weblogic/a-introduction/introduction.md
deleted file mode 100644
index cc1623d43..000000000
--- a/oci-apm-weblogic/a-introduction/introduction.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# Introduction
-
-## About this Workshop
-
-This workshop walks you through how to configure a WebLogic-on-Kubernetes for monitoring with the Oracle Application Performance Monitoring (APM) service. This enables automatic OpenTracing instrumentation and metrics collection that is used to provide full, end-to-end monitoring and diagnostics for the application.
-
-In this workshop, you will provision the APM Java agent in a file system mounted in the Oracle Cloud, deploy the agent to the Kubernetes cluster, instrument the APM Browser agent by inserting JavaScript code to a webpage and view traces and spans in APM Trace Explorer.
-
-> **Note:** The same approach demonstrated for WLS on Kubernetes can be used to configure other types of java application servers, such as Spring Boot, deployed on Kubernetes.
-
- 
-
-Estimated Workshop Time: 80 minutes
-
-### About Oracle Cloud Infrastructure Application Performance Management (OCI APM)
-
-The diagram below provides an overview of the OCI APM Service, its features, components, and some of the other OCI services it integrates with.
-
- 
-
-Among other capabilities, OCI APM includes an implementation of a Distributed Tracing system. It collects and processes transaction trace data (spans) from the monitored application and makes it available for viewing, dashboarding, exploration, alerts, etc. For more information on APM and Trace Explorer please refer to Application Performance Monitoring > **[Use Trace Explorer](https://docs.oracle.com/en-us/iaas/application-performance-monitoring/doc/use-trace-explorer.html)** section in the OCI Documentation.
-
-In the workshop, you will learn how to instrument the WebLogic application deployed on a Kubernetes cluster with APM agents. You will also learn how to create an APM domain in the Oracle Cloud and use Trace Explorer to search and view traces/spans in the APM User Interface.
-
-### Objectives
-
-In this workshop, you will:
-* Create an APM domain, obtain Data Upload Endpoint and Data Keys
-* Create a file system in the Oracle Cloud Infrastructure, and mount it in the Kubernetes pods
-* Download, provision and deploy the APM Java agent
-* Apply custom storage configuration to the Kubernetes pods
-* Change the display name format of the spans by editing the agent configuration file
-* Instrument APM Browser agent by automatic injection
-* Use APM Trace Explorer to view traces, spans, and span dimensions
-
-### Prerequisites
-
-
-* A paid Cloud Account. Please ensure you have the permissions below:
-* Oracle Cloud resources and permissions to create a file system. See **[Creating File Systems](https://docs.oracle.com/en-us/iaas/Content/File/Tasks/creatingfilesystems.htm)** and **[Service Limits](https://docs.oracle.com/en-us/iaas/Content/General/Concepts/servicelimits.htm#top)** in the Oracle Cloud documentation.
-* Oracle Cloud Account Administrator role or manage apm-domains permission in the target compartment. See **[Perform Oracle Cloud Infrastructure Prerequisites (APM)](https://docs.oracle.com/en-us/iaas/application-performance-monitoring/doc/perform-oracle-cloud-infrastructure-prerequisite-tasks.html)** in the Oracle Cloud documentation.
-
-> **Note:** ***This workshop cannot be completed with a Free Trial account. You will need a paid cloud account with permission to create a file system.***
-
-### More APM Workshops
-
-* Please visit: **[APM LiveLabs workshops](https://livelabs.oracle.com/pls/apex/f?p=133:100:111996377805307::::SEARCH:application+Performance+monitoring)**.
-
-
-
-## Acknowledgements
-
-- **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
-- **Contributors** - Steven Lemme, Senior Principal Product Manager,
-Anand Prabhu, Sr. Member of Technical Staff,
-Avi Huber, Vice President, Product Management
-- **Last Updated By/Date** - Yutaka Takatsu, March, 2023
diff --git a/oci-apm-weblogic/b-lab-one-create-oke/create-oke.md b/oci-apm-weblogic/b-lab-one-create-oke/create-oke.md
deleted file mode 100644
index bcbd8a10c..000000000
--- a/oci-apm-weblogic/b-lab-one-create-oke/create-oke.md
+++ /dev/null
@@ -1,75 +0,0 @@
-# Create a Kubernetes cluster
-
-## Introduction
-
-This workshop uses a WebLogic application as a target application to trace against. In this lab, first, you will use the Oracle Cloud console to set up an OCI compartment, second, create an Oracle container engine for Kubernetes (OKE) cluster in your tenancy. In Lab 3, you will deploy the application to the OKE.
-
-Estimated time: 5 minutes
-
-### Objectives
-
-* Create a compartment
-* Create a Kubernetes cluster
-
-### Prerequisites
-
-* This lab requires an [Oracle Cloud account](https://www.oracle.com/cloud/free/). You may use your own cloud account, or a Free tier account, a cloud account that you obtained through a trial.
-
-
-## Task1: Create an OCI compartment
-
-1. Open the navigation menu from the top-left corner (aka. hamburger menu) of the Oracle Cloud console and select **Identity & Security** > **Compartments**.
- 
-2. Click **Create Compartments**
- 
-3. Enter the following parameters:
-* Compartment name: **apmworkshop**
-* Description: **APM workshop compartment**
-* Accept the default values for the other fields, and click, **Create Compartment**
- 
-* Verify that your apmworkshop compartment is created in the table
- 
-
-## Task2: Create an OKE
-
-1. Open the navigation menu from the top left corner (aka. hamburger menu) in the Oracle Cloud console, and select **Developer Services** > **Kubernetes Clusters (OKE)**.
-
- 
-
-2. Make sure the **apmworkshop** is selected in the Compartment field, then click **Create cluster**
-
- 
-
-3. Quick Create pane is pre-selected. Keep the default selection and click **Submit**.
-
- 
-
-4. Name the cluster as **apmlab-cluser1**. Accept the default setting for other fields and click **Next**.
-
- 
- 
-
-5. Review the configuration, and click **Create cluster**.
-
- 
-
-6. Make sure all verification steps are cleared. Click **Close**.
-
- 
-
-7. This will start to create a cluster, and takes 7 to 10 minutes to complete. While waiting for the creation of the cluster, you can proceed to the next lab to create an APM domain. In Lab 3, we will resume the steps to build the application.
-
- 
-
-
-
-
-You may now **proceed to the next lab**.
-
-## Acknowledgements
-
-* **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
-- **Contributors** - Steven Lemme, Senior Principal Product Manager,
-Anand Prabhu, Sr. Member of Technical Staff,
-Avi Huber, Vice President, Product Management
-* **Last Updated By/Date** - Yutaka Takatsu, August 2022
diff --git a/oci-apm-weblogic/b-lab-one-create-oke/images/1-1-compartments.png b/oci-apm-weblogic/b-lab-one-create-oke/images/1-1-compartments.png
deleted file mode 100644
index 436dbcd04..000000000
Binary files a/oci-apm-weblogic/b-lab-one-create-oke/images/1-1-compartments.png and /dev/null differ
diff --git a/oci-apm-weblogic/b-lab-one-create-oke/images/1-1-menu.png b/oci-apm-weblogic/b-lab-one-create-oke/images/1-1-menu.png
deleted file mode 100644
index a784d907b..000000000
Binary files a/oci-apm-weblogic/b-lab-one-create-oke/images/1-1-menu.png and /dev/null differ
diff --git a/oci-apm-weblogic/b-lab-one-create-oke/images/1-2-OKE.png b/oci-apm-weblogic/b-lab-one-create-oke/images/1-2-OKE.png
deleted file mode 100644
index 96317ab1b..000000000
Binary files a/oci-apm-weblogic/b-lab-one-create-oke/images/1-2-OKE.png and /dev/null differ
diff --git a/oci-apm-weblogic/b-lab-one-create-oke/images/1-2-compartments.png b/oci-apm-weblogic/b-lab-one-create-oke/images/1-2-compartments.png
deleted file mode 100644
index 3cffdf62c..000000000
Binary files a/oci-apm-weblogic/b-lab-one-create-oke/images/1-2-compartments.png and /dev/null differ
diff --git a/oci-apm-weblogic/b-lab-one-create-oke/images/1-3-OKE.png b/oci-apm-weblogic/b-lab-one-create-oke/images/1-3-OKE.png
deleted file mode 100644
index e7763ec06..000000000
Binary files a/oci-apm-weblogic/b-lab-one-create-oke/images/1-3-OKE.png and /dev/null differ
diff --git a/oci-apm-weblogic/b-lab-one-create-oke/images/1-3-compartments.png b/oci-apm-weblogic/b-lab-one-create-oke/images/1-3-compartments.png
deleted file mode 100644
index e15717b48..000000000
Binary files a/oci-apm-weblogic/b-lab-one-create-oke/images/1-3-compartments.png and /dev/null differ
diff --git a/oci-apm-weblogic/b-lab-one-create-oke/images/1-4-OKE.png b/oci-apm-weblogic/b-lab-one-create-oke/images/1-4-OKE.png
deleted file mode 100644
index 1cfaaf3f5..000000000
Binary files a/oci-apm-weblogic/b-lab-one-create-oke/images/1-4-OKE.png and /dev/null differ
diff --git a/oci-apm-weblogic/b-lab-one-create-oke/images/1-4-compartments.png b/oci-apm-weblogic/b-lab-one-create-oke/images/1-4-compartments.png
deleted file mode 100644
index 8dcc12c0a..000000000
Binary files a/oci-apm-weblogic/b-lab-one-create-oke/images/1-4-compartments.png and /dev/null differ
diff --git a/oci-apm-weblogic/b-lab-one-create-oke/images/1-5-OKE.png b/oci-apm-weblogic/b-lab-one-create-oke/images/1-5-OKE.png
deleted file mode 100644
index 1486af1be..000000000
Binary files a/oci-apm-weblogic/b-lab-one-create-oke/images/1-5-OKE.png and /dev/null differ
diff --git a/oci-apm-weblogic/b-lab-one-create-oke/images/1-6-OKE.png b/oci-apm-weblogic/b-lab-one-create-oke/images/1-6-OKE.png
deleted file mode 100644
index 01559ea97..000000000
Binary files a/oci-apm-weblogic/b-lab-one-create-oke/images/1-6-OKE.png and /dev/null differ
diff --git a/oci-apm-weblogic/b-lab-one-create-oke/images/1-7-OKE.png b/oci-apm-weblogic/b-lab-one-create-oke/images/1-7-OKE.png
deleted file mode 100644
index d8f2dd4a5..000000000
Binary files a/oci-apm-weblogic/b-lab-one-create-oke/images/1-7-OKE.png and /dev/null differ
diff --git a/oci-apm-weblogic/b-lab-one-create-oke/images/1-8-OKE.png b/oci-apm-weblogic/b-lab-one-create-oke/images/1-8-OKE.png
deleted file mode 100644
index 3127aa3a3..000000000
Binary files a/oci-apm-weblogic/b-lab-one-create-oke/images/1-8-OKE.png and /dev/null differ
diff --git a/oci-apm-weblogic/b-lab-one-create-oke/images/1-9-OKE.png b/oci-apm-weblogic/b-lab-one-create-oke/images/1-9-OKE.png
deleted file mode 100644
index 54ea57c46..000000000
Binary files a/oci-apm-weblogic/b-lab-one-create-oke/images/1-9-OKE.png and /dev/null differ
diff --git a/oci-apm-weblogic/b-lab-one-create-oke/images/2-1-OKE.png b/oci-apm-weblogic/b-lab-one-create-oke/images/2-1-OKE.png
deleted file mode 100644
index eff037a4c..000000000
Binary files a/oci-apm-weblogic/b-lab-one-create-oke/images/2-1-OKE.png and /dev/null differ
diff --git a/oci-apm-weblogic/b-lab-one-create-oke/images/2-2-2-OKE.png b/oci-apm-weblogic/b-lab-one-create-oke/images/2-2-2-OKE.png
deleted file mode 100644
index ea12ba657..000000000
Binary files a/oci-apm-weblogic/b-lab-one-create-oke/images/2-2-2-OKE.png and /dev/null differ
diff --git a/oci-apm-weblogic/b-lab-one-create-oke/images/2-2-OKE.png b/oci-apm-weblogic/b-lab-one-create-oke/images/2-2-OKE.png
deleted file mode 100644
index 7e689aa5e..000000000
Binary files a/oci-apm-weblogic/b-lab-one-create-oke/images/2-2-OKE.png and /dev/null differ
diff --git a/oci-apm-weblogic/b-lab-one-create-oke/images/2-3-OKE.png b/oci-apm-weblogic/b-lab-one-create-oke/images/2-3-OKE.png
deleted file mode 100644
index 67ea9c668..000000000
Binary files a/oci-apm-weblogic/b-lab-one-create-oke/images/2-3-OKE.png and /dev/null differ
diff --git a/oci-apm-weblogic/b-lab-one-create-oke/images/2-4-OKE.png b/oci-apm-weblogic/b-lab-one-create-oke/images/2-4-OKE.png
deleted file mode 100644
index 92c61e51d..000000000
Binary files a/oci-apm-weblogic/b-lab-one-create-oke/images/2-4-OKE.png and /dev/null differ
diff --git a/oci-apm-weblogic/b-lab-one-create-oke/images/4-1-cloudshell.png b/oci-apm-weblogic/b-lab-one-create-oke/images/4-1-cloudshell.png
deleted file mode 100644
index 297aef0ff..000000000
Binary files a/oci-apm-weblogic/b-lab-one-create-oke/images/4-1-cloudshell.png and /dev/null differ
diff --git a/oci-apm-weblogic/b-lab-one-create-oke/images/4-2-cloudshell.png b/oci-apm-weblogic/b-lab-one-create-oke/images/4-2-cloudshell.png
deleted file mode 100644
index 54b4a6fb0..000000000
Binary files a/oci-apm-weblogic/b-lab-one-create-oke/images/4-2-cloudshell.png and /dev/null differ
diff --git a/oci-apm-weblogic/b-lab-one-create-oke/images/4-3-cloudshell.png b/oci-apm-weblogic/b-lab-one-create-oke/images/4-3-cloudshell.png
deleted file mode 100644
index 3e1685873..000000000
Binary files a/oci-apm-weblogic/b-lab-one-create-oke/images/4-3-cloudshell.png and /dev/null differ
diff --git a/oci-apm-weblogic/b-lab-one-create-oke/images/4-4-winestore.png b/oci-apm-weblogic/b-lab-one-create-oke/images/4-4-winestore.png
deleted file mode 100644
index 577683b21..000000000
Binary files a/oci-apm-weblogic/b-lab-one-create-oke/images/4-4-winestore.png and /dev/null differ
diff --git a/oci-apm-weblogic/c-lab-two-create-domain/create-domain.md b/oci-apm-weblogic/c-lab-two-create-domain/create-domain.md
deleted file mode 100644
index 2b997cace..000000000
--- a/oci-apm-weblogic/c-lab-two-create-domain/create-domain.md
+++ /dev/null
@@ -1,68 +0,0 @@
-# Create an APM Domain and obtain Data Upload Endpoint and Private Data Key
-
-## Introduction
-
-In this lab, you will create an APM Domain. You will acquire a Data Upload Endpoint and a Private Data Key, which are needed to configure the APM Tracer on the application.
-
-Estimated time: 10 minutes
-
-### Objectives
-
-* Create an APM Domain
-* Obtain a Data Upload Endpoint and a Private Data Key
-
-
-### Prerequisites
-
-* To create an APM domain, you will need an Oracle Cloud Account Administrator role or manage apm-domains permission in the target compartment. For more details, refer to the OCI Documentation, [Create an APM Domain](https://docs.oracle.com/en-us/iaas/application-performance-monitoring/doc/create-apm-domain.html).
-
-## Task1: Create an APM domain
-
-1. From the OCI menu, select **Observability & Management**, then **Administration**.
- 
-
-2. Select the **apmworkshop** compartment from the pulldown menu.
- 
-
-3. Click **Create APM Domain**.
- 
-4. Name your APM domain as **apmworkshop** and select the compartment you created. Add a check to the **Create as Always Free Domain**, then click **Create**.
- 
-
-
-5. Press the refresh button periodically to check the status. This may take a few minutes.
- 
-6. Once the job is completed, the status turns to Active with a green icon.
- 
- For more details on how to create an APM Domain, refer to the OCI documentation, [Create an APM Domain](https://docs.oracle.com/en-us/iaas/application-performance-monitoring/doc/create-apm-domain.html).
-
-## Task2: Obtain Data Upload Endpoint and Private and Public Data Keys
-
-To upload tracing data to an APM domain, Data Upload Endpoint and both Private and Public Data Keys must be configured in the application’s configuration files. Next, you are going to obtain the values for them and then enter them into the Oracle Cloud console.
-
-1. Click the link to the APM domain.
- 
-
-2. Under **Resources**, click **Data Keys**.
-
- 
-
-3. In the **APM Domain Information** tab, find **Data Upload Endpoint**, then click **Copy**. Paste the copied value to a text file and save. You will need this value in the later steps in the workshop.
-
-4. Under **Data Keys**, find **auto\_generated\_private_data\_key**. Click **Copy** and save the value to the text file.
-
-5. In the same section, find **auto\_generated\_public_data\_key**. Click **Copy** and save the value to the text file.
- 
-
-For more details on Data Upload Endpoint and Data keys, refer to the OCI documentation, [Obtaining Data Upload Endpoint and Data keys](https://docs.oracle.com/en-us/iaas/application-performance-monitoring/doc/obtain-data-upload-endpoint-and-data-keys.html).
-
-You may now **proceed to the next lab**.
-
-## Acknowledgements
-
-* **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
-- **Contributors** -
-Steven Lemme, Senior Principal Product Manager,
-Anand Prabhu, Sr. Member of Technical Staff,
-Avi Huber, Vice President, Product Management
-* **Last Updated By/Date** - Yutaka Takatsu, March 2023
diff --git a/oci-apm-weblogic/c-lab-two-create-domain/images/2-1-2-domain.png b/oci-apm-weblogic/c-lab-two-create-domain/images/2-1-2-domain.png
deleted file mode 100644
index 40c618963..000000000
Binary files a/oci-apm-weblogic/c-lab-two-create-domain/images/2-1-2-domain.png and /dev/null differ
diff --git a/oci-apm-weblogic/c-lab-two-create-domain/images/2-1-domain.png b/oci-apm-weblogic/c-lab-two-create-domain/images/2-1-domain.png
deleted file mode 100644
index 6d5e27e62..000000000
Binary files a/oci-apm-weblogic/c-lab-two-create-domain/images/2-1-domain.png and /dev/null differ
diff --git a/oci-apm-weblogic/c-lab-two-create-domain/images/2-3-domain.png b/oci-apm-weblogic/c-lab-two-create-domain/images/2-3-domain.png
deleted file mode 100644
index e31629bd8..000000000
Binary files a/oci-apm-weblogic/c-lab-two-create-domain/images/2-3-domain.png and /dev/null differ
diff --git a/oci-apm-weblogic/c-lab-two-create-domain/images/2-4-domain.png b/oci-apm-weblogic/c-lab-two-create-domain/images/2-4-domain.png
deleted file mode 100644
index 4fecedfa0..000000000
Binary files a/oci-apm-weblogic/c-lab-two-create-domain/images/2-4-domain.png and /dev/null differ
diff --git a/oci-apm-weblogic/c-lab-two-create-domain/images/2-5-domain.png b/oci-apm-weblogic/c-lab-two-create-domain/images/2-5-domain.png
deleted file mode 100644
index 1e9ccdef0..000000000
Binary files a/oci-apm-weblogic/c-lab-two-create-domain/images/2-5-domain.png and /dev/null differ
diff --git a/oci-apm-weblogic/c-lab-two-create-domain/images/3-1-2-domain.png b/oci-apm-weblogic/c-lab-two-create-domain/images/3-1-2-domain.png
deleted file mode 100644
index 6c987834f..000000000
Binary files a/oci-apm-weblogic/c-lab-two-create-domain/images/3-1-2-domain.png and /dev/null differ
diff --git a/oci-apm-weblogic/c-lab-two-create-domain/images/3-1-domain.png b/oci-apm-weblogic/c-lab-two-create-domain/images/3-1-domain.png
deleted file mode 100644
index 8982ad017..000000000
Binary files a/oci-apm-weblogic/c-lab-two-create-domain/images/3-1-domain.png and /dev/null differ
diff --git a/oci-apm-weblogic/c-lab-two-create-domain/images/3-2-domain.png b/oci-apm-weblogic/c-lab-two-create-domain/images/3-2-domain.png
deleted file mode 100644
index d1370b379..000000000
Binary files a/oci-apm-weblogic/c-lab-two-create-domain/images/3-2-domain.png and /dev/null differ
diff --git a/oci-apm-weblogic/d-lab-three-build-app/build-app.md b/oci-apm-weblogic/d-lab-three-build-app/build-app.md
deleted file mode 100644
index 71cb6c65b..000000000
--- a/oci-apm-weblogic/d-lab-three-build-app/build-app.md
+++ /dev/null
@@ -1,167 +0,0 @@
-# Build a microservices application
-
-## Introduction
-
-This workshop uses a WebLogic demo application as a target application to trace against. In this lab, you will deploy the application to the Kubernetes cluster you created in Lab 1.
-
-
-Estimated time: 10 minutes
-
-### Objectives
-
-* Build a microservices application for monitoring
-
-### Prerequisites
-
-* Completion of the preceding labs in this workshop
-
-## Task1: Verify OKE
-
-1. Go back to the Kubernetes cluster page where you left Lab 1, and check the status of the cluster. Open the navigation menu from the top left corner (aka. hamburger menu) in the Oracle Cloud console, and select **Developer Services** > **Kubernetes Clusters (OKE)**.
-
- 
-
-2. Click the **apmlab-cluser1** link from the table.
-
- 
-
-3. If the status of the cluster is **Active**, creation was successful. If it is still in a **Creating** status, it may take a few more minutes to complete. (Usually, it takes 7 to 10 minutes to finish the jobs to create a cluster).
-
- 
-
-## Task2: Access the OKE in the Oracle Cloud shell
-
-
-1. Click **Access Cluster** on the cluster details page.
-
- 
-
-2. Make sure the **Cloud Shell Access** is selected. Click the **Copy** link from the command to access kubeconfig for the cluster.
-
- 
-
-3. Then click **Launch Cloud Shell**.
-
- 
-
-4. Oracle Cloud Shell window opens at the lower side of the browser screen.
-
- 
-
-5. Paste the copied command to the command shell prompt. Then hit enter.
-
- 
-
- >**Note:** Save the command to a text file on your laptop, and execute it whenever you start a new Cloud Shell session, while working in the labs in this workshop.
-
-## Task3: Download configuration files
-
-1. Download the zip file to the home directory in the Cloud Shell.
-
- ``` bash
-
- cd ~; wget https://objectstorage.us-phoenix-1.oraclecloud.com/n/axfo51x8x2ap/b/apmocw-bucket-2022/o/wls-hol.zip
-
- ```
- 
-
-3. Unzip the file. This will create a directory **wls-hol**.
-
- ``` bash
-
- unzip ~/wls-hol.zip
-
- ```
-
- 
-
-## Task4: Set up the WebLogic Domain and a demo application on the OKE
-
-1. Execute the following command from the Cloud Shell.
-
- ``` bash
-
- ls ~/wls-hol
-
- ```
- 
-
- >**Note:** Verify there are the following files in the folder.
- - apmlab-fss.yaml
- - deleteWls.sh
- - deployWls.sh
- - domain.yaml
- - traefik-config.yaml
- - traefik-values.yaml
-
-2. Add executable permission to the shell script files in the folder by running the following command.
-
- ``` bash
-
- chmod +x ~/wls-hol/*.sh
-
- ```
- 
-
-3. Execute the command below to run a shell script from the **wls-hol** directory. This will create a WebLogic domain on the OKE in your tenancy. The process may take a few minutes to complete.
-
- ``` bash
-
- cd ~/wls-hol; ./deployWls.sh
-
- ```
-
- 
-
- Ensure that you see the message 'Cluster configuration complete!' and the URL to launch a demo application.
-
- 
-
-4. Run the kubectl command below to display the information of the services created.
-
- ``` bash
-
- kubectl get svc --all-namespaces
-
- ```
- The output will be similar to the image below. The namespace of the WebLogic Server services in this workshop is **sample-domain1-ns**. It may take a few minutes to see all services.
-
- 
-
-5. Run the command below to display the statuses of the pods. Wait for all pods are Ready and in the Running state.
-
- ``` bash
-
- kubectl get pod -n sample-domain1-ns
-
- ```
-
- 
-
-
-5. From the command output from the step 4 above, locate the LoadBalancer service. Note down the External-IP.
-
- 
-
-6. On your computer, open a new browser tab and access the application with the following URL pattern:
-
- ``` bash
-
- http:///opdemo/?dsname=testDatasource
-
- ```
- Make sure the WebLogic Operator Demo application launches as in the image below. This is the target web application you will use to configure the APM Java Agent in this workshop.
-
- 
-
-
-
-You may now **proceed to the next lab**.
-
-## Acknowledgements
-
-* **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
-- **Contributors** - Steven Lemme, Senior Principal Product Manager,
-Anand Prabhu, Sr. Member of Technical Staff,
-Avi Huber, Vice President, Product Management
-* **Last Updated By/Date** - Yutaka Takatsu, August 2022
diff --git a/oci-apm-weblogic/d-lab-three-build-app/images/1-1-menu.png b/oci-apm-weblogic/d-lab-three-build-app/images/1-1-menu.png
deleted file mode 100644
index a784d907b..000000000
Binary files a/oci-apm-weblogic/d-lab-three-build-app/images/1-1-menu.png and /dev/null differ
diff --git a/oci-apm-weblogic/d-lab-three-build-app/images/1-2-menu.png b/oci-apm-weblogic/d-lab-three-build-app/images/1-2-menu.png
deleted file mode 100644
index c7bd864c3..000000000
Binary files a/oci-apm-weblogic/d-lab-three-build-app/images/1-2-menu.png and /dev/null differ
diff --git a/oci-apm-weblogic/d-lab-three-build-app/images/1-9-OKE.png b/oci-apm-weblogic/d-lab-three-build-app/images/1-9-OKE.png
deleted file mode 100644
index ec4692f37..000000000
Binary files a/oci-apm-weblogic/d-lab-three-build-app/images/1-9-OKE.png and /dev/null differ
diff --git a/oci-apm-weblogic/d-lab-three-build-app/images/2-1-OKE.png b/oci-apm-weblogic/d-lab-three-build-app/images/2-1-OKE.png
deleted file mode 100644
index eff037a4c..000000000
Binary files a/oci-apm-weblogic/d-lab-three-build-app/images/2-1-OKE.png and /dev/null differ
diff --git a/oci-apm-weblogic/d-lab-three-build-app/images/2-2-2-OKE.png b/oci-apm-weblogic/d-lab-three-build-app/images/2-2-2-OKE.png
deleted file mode 100644
index ea12ba657..000000000
Binary files a/oci-apm-weblogic/d-lab-three-build-app/images/2-2-2-OKE.png and /dev/null differ
diff --git a/oci-apm-weblogic/d-lab-three-build-app/images/2-2-OKE.png b/oci-apm-weblogic/d-lab-three-build-app/images/2-2-OKE.png
deleted file mode 100644
index 7e689aa5e..000000000
Binary files a/oci-apm-weblogic/d-lab-three-build-app/images/2-2-OKE.png and /dev/null differ
diff --git a/oci-apm-weblogic/d-lab-three-build-app/images/2-3-OKE.png b/oci-apm-weblogic/d-lab-three-build-app/images/2-3-OKE.png
deleted file mode 100644
index 67ea9c668..000000000
Binary files a/oci-apm-weblogic/d-lab-three-build-app/images/2-3-OKE.png and /dev/null differ
diff --git a/oci-apm-weblogic/d-lab-three-build-app/images/2-4-OKE.png b/oci-apm-weblogic/d-lab-three-build-app/images/2-4-OKE.png
deleted file mode 100644
index 92c61e51d..000000000
Binary files a/oci-apm-weblogic/d-lab-three-build-app/images/2-4-OKE.png and /dev/null differ
diff --git a/oci-apm-weblogic/d-lab-three-build-app/images/4-2-3-cloudshell.png b/oci-apm-weblogic/d-lab-three-build-app/images/4-2-3-cloudshell.png
deleted file mode 100644
index ec5e02486..000000000
Binary files a/oci-apm-weblogic/d-lab-three-build-app/images/4-2-3-cloudshell.png and /dev/null differ
diff --git a/oci-apm-weblogic/d-lab-three-build-app/images/4-4-winestore.png b/oci-apm-weblogic/d-lab-three-build-app/images/4-4-winestore.png
deleted file mode 100644
index 577683b21..000000000
Binary files a/oci-apm-weblogic/d-lab-three-build-app/images/4-4-winestore.png and /dev/null differ
diff --git a/oci-apm-weblogic/e-lab-four-create-file-system/create-file-system.md b/oci-apm-weblogic/e-lab-four-create-file-system/create-file-system.md
deleted file mode 100644
index dbbebb7c2..000000000
--- a/oci-apm-weblogic/e-lab-four-create-file-system/create-file-system.md
+++ /dev/null
@@ -1,315 +0,0 @@
-# Create and configure a file system
-
-## Introduction
-
-In this lab, you will create a file system in the Oracle Cloud Infrastructure. You will also create security rules to allow network traffic and mount the file system to the Kubernetes pods.
-
-Estimated time: 15 minutes
-
-### Objectives
-
-* Create a file system in the Oracle Cloud
-* Create security rules in the network
-* Create a YAML file, which defines Storage Class, Persistent Volume, and Persistent Volume Claim
-* Mount the volume to the Kubernetes cluster by applying the YAML, which recreates the Kubernetes pods with the new storage configuration
-
-### Prerequisites
-
-* OCI quota and permissions to create a file system and associated resources. See **[Creating File Systems](https://docs.oracle.com/en-us/iaas/Content/File/Tasks/creatingfilesystems.htm)** and **[Service Limits](https://docs.oracle.com/en-us/iaas/Content/General/Concepts/servicelimits.htm#top)** in the Oracle Cloud documentation.
-* Completion of the preceding labs in this workshop
-
-## Task1: Create a file system in the Oracle Cloud
-
-1. Minimize the Cloud Shell window by clicking the Minimize button. Close the **Access Your Cluster window** if still open.
-
- 
-
-2. From the OCI menu, select **Storage** > **File Systems**.
-
- 
-
-3. Make sure you are in the compartment **apmworkshop**. If not, select it from the pulldown menu.
-
- 
-
-4. Click **Create File System**
-
- 
-
-5. On the **Create File System** page, ensure the **File System for NFS** is selected. In the **File System Information** section, click **Edit Details**.
-
- 
-
-6. On the Create File System page, enter **apmlab-fss** into the **Name** field.
-
- Make sure the **apmworkshop** is selected in the **Compartment**. Leave the other fields in the section with default values.
- ***Do NOT click the Create button yet.***
-
- 
-
-7. Scroll down the **Create File System** page and find the **Export Information** section. Verify that the **Export Path** is set to **/apmlab-fss**. This is where the file system will be mounted. You will provision an APM Java agent at this location. In the **Mount Target Information** section, click **Edit Details** to expand the section.
-
- 
-
-8. In the **Mount Target Information** section, click the link **Click here to enable compartment selections**.
-
- 
-
-9. In the Mount Target Information section, ensure that the **Create New Mount Target** is selected. Then locate the **Create in Compartment** field, and ensure the **apmworkshop** compartment is selected.
- 
-10. Leave the other fields by default and click **Create**.
-
- 
-
-11. A new File System is created. Scroll down to find the **Exports** section. Click the link to the **Mount Target** just created.
-
- 
-
-12. Click **Copy** next to the **OCID**. Save the value in a text file on your computer. Also, take note of the **IP Address** as you will need these values in the next steps.
-
- 
-
-## Task2: Create security rules in the network
-
-1. In the Mount Target Information section point your mouse cursor over the **“i”** icon next to **Subnet** and review the message. As the message indicates, security rules must be configured before mounting the file system, and that is what you will be doing next.
-
- 
-
-2. Click the **Subnet** link to open the Subnet page.
-
- 
-
-
-3. In the **Subnet Details page**, scroll down and find the **Security Lists** section, then click the link to the security list.
-
- 
-
-4. Click the **Add Ingress Rules** button
-
- 
-
-5. In the **Add Ingress Rules** dialog, enter the following information:
-
- * Stateless: **No**
- * Source Type: **CIDR**
- * Source CIDR: **0.0.0.0/0**
- * IP Protocol: **TCP**
- * Source Port Range: leave as default (All)
- * Destination Port Range: **111,2048-2050**
- * Description: **Ingress security rule for apmlab-fss**
-
- 
-
-6. Click the **+ Another Ingress Rule** button and create an additional rule for **UDP**, with the destination port range **111,2048**. Use the same values with the rule created above for the rest of the fields.
-
- Click the **Add Ingress Rules** button which creates 4 ingress rules in the security list.
-
- 
-
-7. After the configuration, your **Ingress Rules** have 4 additional security rules as in the image below.
-
- 
-
-8. Click **Egress Rules**, which is located on the left side of the screen.
-
- 
-
-9. Click the **Add Egress Rules** button.
-
- 
-
-10. In the **Add Egress Rules** dialog, enter the following information:
-
- * Stateless: **No**
- * Source Type: **CIDR**
- * Source CIDR: **0.0.0.0/0**
- * IP Protocol: **TCP**
- * Source Port Range: leave as default (All)
- * Destination Port Range: **111,2048-2050**
- * Description: **Egress security rule for apmlab-fss**
-
- 
-
-11. Click the **+ Another Egress Rule** button and create an additional rule for **UDP**, with the destination port **111**. Use the same values with the rule created above for the rest of the fields.
Click **Add Egress Rules** button which creates 3 egress rules in the security list.
-
- 
-
-12. After the configuration, your **Egress Rules** have 3 additional security rules as in the image below.
-
- 
-
-## Task3: Mount the file system to Kubernetes pods
-
-1. Click the **Developer tools** icon from the top right corner in the Oracle Cloud console menu bar, then select **Cloud shell** to start a Cloud Shell environment which will appear at the bottom of your page.
- 
-
- >**Note:** If the Cloud Shell is already running but the window is minimized, you can restore the window by clicking the **Restore** icon on the toolbar.
- 
-
-
-2. If the previous Cloud Shell session is expired, run the oci ce (Container Engine) command that you saved in Lab 3, Task 2, step 5.
-
-
- 
-
-3. Use any text editor (such as the vi editor tool) to open the **apmlab-fss.yaml** file for editing.
-
- ``` bash
-
- vi ~/wls-hol/apmlab-fss.yaml
-
- ```
-
- >**Note:** If you are using the vi editor, type ***i*** to enter Insert mode, and make the text editable. Use allow keys to navigate the text and make changes to where you set the cursor. To save a file, press the Esc key, then type ***:wq*** to write and quit the file. If you do not wish a change, press Esc then type ***:q!*** to discard your changes. Please refer to the editor's references for more usage. Alternatively, you can use a built-in code editor to edit files. To use the code editor, select the **Developer tools** icon from the toolbar> select **Code Editor**.
- 
-
-4. Review the file contents that create Kubernetes objects (StorageClass, PersistentVolume, PersistentVolumeClaim) in your OKE. Replace the **mntTargetID** and **server IP** with the values copied in Lab 3, Task 1, step 11 in this Workshop. Save the change and close the file.
-
- apiVersion: storage.k8s.io/v1
- kind: StorageClass
- metadata:
- name: apmlab-fss
- provisioner: oracle.com/apmlab-fss
- parameters:
- mntTargetId:
- ---
- apiVersion: v1
- kind: PersistentVolume
- metadata:
- name: apmlab-fsspv
- spec:
- storageClassName: apmlab-fss
- capacity:
- storage: 10Gi
- accessModes:
- - ReadWriteMany
- mountOptions:
- - nosuid
- nfs:
- server:
- path: "/apmlab-fss"
- readOnly: false
- ---
- apiVersion: v1
- kind: PersistentVolumeClaim
- metadata:
- name: apmlab-fsspv
- spec:
- storageClassName: apmlab-fss
- accessModes:
- - ReadWriteMany
- resources:
- requests:
- storage: 10Gi
- volumeName: apmlab-fsspv
-
- >**Note:** Refer to the screenshot image below to see what it should look like after the file is modified. Verify that the Kubernetes objects, such as StorageClass, PersistentVolume, and PersistentVolumeClass are configured in the YAML file.
- 
-
-
-## Task4: Apply changes to the container
-
-1. Execute the following command to add the storage objects to the Kubernetes cluster.
-
- ``` bash
-
- kubectl apply -f ~/wls-hol/apmlab-fss.yaml -n sample-domain1-ns
-
- ```
-
-2. Verify the Storage Class, PV and PVC are created.
-
- 
-
- >**Note:** If you need to modify the YAML file after once applied, first run the command below to remove the objects, modify the file, then rerun the above command to re-apply the YAML.
- kubectl delete -f ~/wls-hol/apmlab-fss.yaml
-
-
-## Task5: Add volumes to Kubernetes pods
-
-1. Open the **domain.yaml** file that locates in the home directory, with any editor, such as the vi tool.
-
- ``` bash
-
- vi ~/wls-hol/domain.yaml
-
- ```
-
-2. Find the **volumes:** section (line 79). At this point, the section is commented out.
-
- 
-
-3. Hit **i** to enter the edit mode. Create a new line above **volumes:** and carefully insert the following code below.
-
- volumes:
- - name: apmlab-nfs
- persistentVolumeClaim:
- claimName: apmlab-fsspv
- volumeMounts:
- - mountPath: "/apmlab-fss"
- name: apmlab-nfs
-
-
- > ***Suggested Editing Tips:***
- - Use your mouse to select the text above, and manually copy and paste it into a text file.
- - Auto copy is not provided as it may break the indentation.
- - Copy the entire area from the text box, including the space preceding the text.
- - In the yaml file, place your mouse cursor at the beginning of the line, then paste the code.
- - Make sure to keep the same space indentation when pasting the code into the file.
- - The lines “volumes:” and "volumeMounts:" align with the line “env:”.
- - Refer to the screenshot image below to see how it should look after the file is modified.
- 
-
-
-4. Run the following command. This will recreate the pods, with the new object configurations.
-
- ``` bash
-
- kubectl apply -f ~/wls-hol/domain.yaml -n sample-domain1-ns
-
- ```
-
- 
-
-5. Run the following command to ensure the pods are in the running state. You may need to wait for a few minutes to see if all the pods are restarted and their status updated.
-
- ``` bash
-
- kubectl get pods -n sample-domain1-ns
-
- ```
-
- 
-
- >**Note:** Verify the **AGE** column to ensure the pods are restarted. It may take a few minutes to have all the pods restarted.
-
-
-
-
-6. Execute the following command to access the Kubernetes pods.
-
- ``` bash
-
- kubectl exec -it sample-domain1-admin-server -n sample-domain1-ns -- bash -c "cd / && ls "
-
- ```
-
- Make sure that you see the ***apmlab-fss*** directory that is the file system mounted to this location.
-
- 
-
-
- >***Debugging TIPS***: If you cannot find the apmlab-fss directory, or the pods do not start running, execute the following command from the Cloud Shell to troubleshoot.
- kubectl get events --sort-by=.metadata.creationTimestamp
-
-
-
-You may now **proceed to the next lab**.
-
-## Acknowledgements
-
-* **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
-- **Contributors** - Steven Lemme, Senior Principal Product Manager,
-Anand Prabhu, Sr. Member of Technical Staff,
-Avi Huber, Vice President, Product Management
-* **Last Updated By/Date** - Yutaka Takatsu, March 2023
diff --git a/oci-apm-weblogic/e-lab-four-create-file-system/images/1-7-cloudshell.png b/oci-apm-weblogic/e-lab-four-create-file-system/images/1-7-cloudshell.png
deleted file mode 100644
index 4429064a9..000000000
Binary files a/oci-apm-weblogic/e-lab-four-create-file-system/images/1-7-cloudshell.png and /dev/null differ
diff --git a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-1-1-2-filesystem.png b/oci-apm-weblogic/e-lab-four-create-file-system/images/3-1-1-2-filesystem.png
deleted file mode 100644
index 2465b03ef..000000000
Binary files a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-1-1-2-filesystem.png and /dev/null differ
diff --git a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-1-1-menu.png b/oci-apm-weblogic/e-lab-four-create-file-system/images/3-1-1-menu.png
deleted file mode 100644
index 5aa57d007..000000000
Binary files a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-1-1-menu.png and /dev/null differ
diff --git a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-1-2-filesystem.png b/oci-apm-weblogic/e-lab-four-create-file-system/images/3-1-2-filesystem.png
deleted file mode 100644
index cbf01d5e3..000000000
Binary files a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-1-2-filesystem.png and /dev/null differ
diff --git a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-1-3-filesystem.png b/oci-apm-weblogic/e-lab-four-create-file-system/images/3-1-3-filesystem.png
deleted file mode 100644
index ca106278b..000000000
Binary files a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-1-3-filesystem.png and /dev/null differ
diff --git a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-1-4-1-filesystem.png b/oci-apm-weblogic/e-lab-four-create-file-system/images/3-1-4-1-filesystem.png
deleted file mode 100644
index 046cc96a9..000000000
Binary files a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-1-4-1-filesystem.png and /dev/null differ
diff --git a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-1-4-filesystem.png b/oci-apm-weblogic/e-lab-four-create-file-system/images/3-1-4-filesystem.png
deleted file mode 100644
index 390c96c67..000000000
Binary files a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-1-4-filesystem.png and /dev/null differ
diff --git a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-1-5-1-filesystem.png b/oci-apm-weblogic/e-lab-four-create-file-system/images/3-1-5-1-filesystem.png
deleted file mode 100644
index a934bfc99..000000000
Binary files a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-1-5-1-filesystem.png and /dev/null differ
diff --git a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-1-5-filesystem.png b/oci-apm-weblogic/e-lab-four-create-file-system/images/3-1-5-filesystem.png
deleted file mode 100644
index c94233d38..000000000
Binary files a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-1-5-filesystem.png and /dev/null differ
diff --git a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-1-6-filesystem.png b/oci-apm-weblogic/e-lab-four-create-file-system/images/3-1-6-filesystem.png
deleted file mode 100644
index b58e984ce..000000000
Binary files a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-1-6-filesystem.png and /dev/null differ
diff --git a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-1-7-filesystem.png b/oci-apm-weblogic/e-lab-four-create-file-system/images/3-1-7-filesystem.png
deleted file mode 100644
index 37943522d..000000000
Binary files a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-1-7-filesystem.png and /dev/null differ
diff --git a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-1-8-filesystem.png b/oci-apm-weblogic/e-lab-four-create-file-system/images/3-1-8-filesystem.png
deleted file mode 100644
index 58ae07693..000000000
Binary files a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-1-8-filesystem.png and /dev/null differ
diff --git a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-1-9-filesystem.png b/oci-apm-weblogic/e-lab-four-create-file-system/images/3-1-9-filesystem.png
deleted file mode 100644
index b47b979dc..000000000
Binary files a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-1-9-filesystem.png and /dev/null differ
diff --git a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-2-1-securityrules.png b/oci-apm-weblogic/e-lab-four-create-file-system/images/3-2-1-securityrules.png
deleted file mode 100644
index 060197a1a..000000000
Binary files a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-2-1-securityrules.png and /dev/null differ
diff --git a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-2-10-securityrules.png b/oci-apm-weblogic/e-lab-four-create-file-system/images/3-2-10-securityrules.png
deleted file mode 100644
index 789be6e61..000000000
Binary files a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-2-10-securityrules.png and /dev/null differ
diff --git a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-2-11-2-securityrules.png b/oci-apm-weblogic/e-lab-four-create-file-system/images/3-2-11-2-securityrules.png
deleted file mode 100644
index c870580d4..000000000
Binary files a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-2-11-2-securityrules.png and /dev/null differ
diff --git a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-2-11-securityrules.png b/oci-apm-weblogic/e-lab-four-create-file-system/images/3-2-11-securityrules.png
deleted file mode 100644
index a53926b84..000000000
Binary files a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-2-11-securityrules.png and /dev/null differ
diff --git a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-2-12-securityrules.png b/oci-apm-weblogic/e-lab-four-create-file-system/images/3-2-12-securityrules.png
deleted file mode 100644
index a67c048de..000000000
Binary files a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-2-12-securityrules.png and /dev/null differ
diff --git a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-2-2-securityrules.png b/oci-apm-weblogic/e-lab-four-create-file-system/images/3-2-2-securityrules.png
deleted file mode 100644
index 1191aad7c..000000000
Binary files a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-2-2-securityrules.png and /dev/null differ
diff --git a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-2-3-securityrules.png b/oci-apm-weblogic/e-lab-four-create-file-system/images/3-2-3-securityrules.png
deleted file mode 100644
index f941b91d6..000000000
Binary files a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-2-3-securityrules.png and /dev/null differ
diff --git a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-2-4-securityrules.png b/oci-apm-weblogic/e-lab-four-create-file-system/images/3-2-4-securityrules.png
deleted file mode 100644
index 0afbbaf71..000000000
Binary files a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-2-4-securityrules.png and /dev/null differ
diff --git a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-2-5-securityrules.png b/oci-apm-weblogic/e-lab-four-create-file-system/images/3-2-5-securityrules.png
deleted file mode 100644
index 5a1eb4c04..000000000
Binary files a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-2-5-securityrules.png and /dev/null differ
diff --git a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-2-6-securityrules.png b/oci-apm-weblogic/e-lab-four-create-file-system/images/3-2-6-securityrules.png
deleted file mode 100644
index 9f95f4562..000000000
Binary files a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-2-6-securityrules.png and /dev/null differ
diff --git a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-2-7-securityrules.png b/oci-apm-weblogic/e-lab-four-create-file-system/images/3-2-7-securityrules.png
deleted file mode 100644
index 77a2767ff..000000000
Binary files a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-2-7-securityrules.png and /dev/null differ
diff --git a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-2-8-securityrules.png b/oci-apm-weblogic/e-lab-four-create-file-system/images/3-2-8-securityrules.png
deleted file mode 100644
index c15a062ad..000000000
Binary files a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-2-8-securityrules.png and /dev/null differ
diff --git a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-2-9-securityrules.png b/oci-apm-weblogic/e-lab-four-create-file-system/images/3-2-9-securityrules.png
deleted file mode 100644
index 580d4555c..000000000
Binary files a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-2-9-securityrules.png and /dev/null differ
diff --git a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-3-1-menu.png b/oci-apm-weblogic/e-lab-four-create-file-system/images/3-3-1-menu.png
deleted file mode 100644
index d55efd60f..000000000
Binary files a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-3-1-menu.png and /dev/null differ
diff --git a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-3-10-cloudshell.png b/oci-apm-weblogic/e-lab-four-create-file-system/images/3-3-10-cloudshell.png
deleted file mode 100644
index c82b06fe8..000000000
Binary files a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-3-10-cloudshell.png and /dev/null differ
diff --git a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-3-2-1-yaml.png b/oci-apm-weblogic/e-lab-four-create-file-system/images/3-3-2-1-yaml.png
deleted file mode 100644
index 461993389..000000000
Binary files a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-3-2-1-yaml.png and /dev/null differ
diff --git a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-3-2-cloudshell.png b/oci-apm-weblogic/e-lab-four-create-file-system/images/3-3-2-cloudshell.png
deleted file mode 100644
index 5845c778d..000000000
Binary files a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-3-2-cloudshell.png and /dev/null differ
diff --git a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-3-2-menu.png b/oci-apm-weblogic/e-lab-four-create-file-system/images/3-3-2-menu.png
deleted file mode 100644
index 271344024..000000000
Binary files a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-3-2-menu.png and /dev/null differ
diff --git a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-3-2-yaml.png b/oci-apm-weblogic/e-lab-four-create-file-system/images/3-3-2-yaml.png
deleted file mode 100644
index 5387d4149..000000000
Binary files a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-3-2-yaml.png and /dev/null differ
diff --git a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-3-3-1-cloudshell.png b/oci-apm-weblogic/e-lab-four-create-file-system/images/3-3-3-1-cloudshell.png
deleted file mode 100644
index 56147058d..000000000
Binary files a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-3-3-1-cloudshell.png and /dev/null differ
diff --git a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-3-3-2-cloudshell.png b/oci-apm-weblogic/e-lab-four-create-file-system/images/3-3-3-2-cloudshell.png
deleted file mode 100644
index b802df0c8..000000000
Binary files a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-3-3-2-cloudshell.png and /dev/null differ
diff --git a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-3-9-cloudshell.png b/oci-apm-weblogic/e-lab-four-create-file-system/images/3-3-9-cloudshell.png
deleted file mode 100644
index 75a142c9d..000000000
Binary files a/oci-apm-weblogic/e-lab-four-create-file-system/images/3-3-9-cloudshell.png and /dev/null differ
diff --git a/oci-apm-weblogic/f-lab-five-configure-apm-agent/configure-apm-agent.md b/oci-apm-weblogic/f-lab-five-configure-apm-agent/configure-apm-agent.md
deleted file mode 100644
index 008c2a9e3..000000000
--- a/oci-apm-weblogic/f-lab-five-configure-apm-agent/configure-apm-agent.md
+++ /dev/null
@@ -1,243 +0,0 @@
-# Instrument the server monitoring
-
-## Introduction
-
-In this lab, you will download the APM Java Agent installer file from the Oracle Cloud console, upload it to the Oracle Cloud shell, transfer it to the Kubernetes container, provision the Java Agent to the file system, and finally, deploy the Agent to the Kubernetes pods.
-
-Estimated time: 10 minutes
-
-### Objectives
-
-* Download the APM Java Agent from the Oracle Cloud console
-* Upload the APM Java Agent to the Cloud shell
-* Copy the Java Agent installer from the Cloud shell to the file system
-* Provision the APM Java Agent in the shared file system directory
-* Deploy the Java Agent to the Kubernetes pods
-
-### Prerequisites
-
-* Completion of the preceding labs in this workshop
-
-## Task1: Obtain APM Java Agent download link
-
-1. Open navigation menu from the Oracle Cloud console, select **Observability & Management** > **Administration**.
-
- 
-
-2. Under **Resources** at the lower left side of the screen, click **Download APM Agent**
-
- 
-
- 3. Manually copy the **Agent Version** and paste it to a text file.
-
- 
-
- 4. Open the Cloud Shell by clicking the **Developer tools** icon > select **Cloud shell** from the top right corner of the Oracle Cloud console. Restore the Cloud Shell if minimized.
-
- 
-
-
-
-## Task2: Download the APM Java Agent to the Cloud shell
-
-1. Type the following command into the Cloud Shell. Make sure to ***replace*** the **Agent version** with the copied text from the previous steps.
-
- ``` bash
-
- cd ~/; wget https://repo1.maven.org/maven2/com/oracle/apm/agent/java/apm-java-agent-installer//apm-java-agent-installer-.jar
-
- ```
-
- E.g., cd ~/; wget https://repo1.maven.org/maven2/com/oracle/apm/agent/java/apm-java-agent-installer/1.8.3326/apm-java-agent-installer-1.8.3326.jar
-
- >**Note:** If you received **No such file or directory** error, it may be a new version of the agent is being updated. Please run the following URL on a browser and find the Agent version available at the Maven central.
- ``` bash
-
- https://repo1.maven.org/maven2/com/oracle/apm/agent/java/apm-java-agent-installer
-
- ```
- 
-
-2. Hit the enter key and verify the message to ensure the successful file transfer.
-
- 
-
-3. Type the ls command. Confirm that the java agent file installer is in the home directory.
-
- ``` bash
-
- ls ~
-
- ```
- 
-
-## Task3: Copy the Java Agent installer to the file system
-
-1. Run the command below to copy the Java Agent installer file to the file system. Ensure to ***replace*** the **apm-agent-version** with that of the APM Java Agent you have, before the command execution.
-
- ``` bash
-
- kubectl cp apm-java-agent-installer-.jar sample-domain1-ns/sample-domain1-admin-server:/apmlab-fss/
-
- ```
-
- > - e.g., kubectl cp apm-java-agent-installer-1.8.3326.jar sample-domain1-ns/sample-domain1-admin-server:/apmlab-fss/
-
-2. Use the kubectl command below to remotely run the ls command in the container in the Kubernetes pod.
-
- ``` bash
-
- kubectl exec -it sample-domain1-admin-server -n sample-domain1-ns -- bash -c "cd /apmlab-fss && ls "
-
- ```
-
- If you see the java agent installer file in the location, the file transfer was successful.
-
- 
-
- >**Note:** The APM version may be different from what is shown in the example.
-
-## Task4: Provision of the APM Java Agent
-
-
-1. Execute the command below to provision the APM Java agent. ***Replace*** the **APM Domain Private key** and **APM Domain Endpoint**, with the values saved in Lab2, Task2. Please also ***change*** the **apm-agent-version** in the file name to the version of the agent you have.
-
- ``` bash
-
- kubectl exec -it sample-domain1-admin-server -n sample-domain1-ns -- bash -c "cd /apmlab-fss && java -jar ./apm-java-agent-installer-.jar provision-agent -service-name=WLS-server -destination=. -private-data-key= -data-upload-endpoint="
-
- ```
- E.g., kubectl exec -it sample-domain1-admin-server -n sample-domain1-ns -- bash -c "cd /apmlab-fss && java -jar apm-java-agent-installer-1.8.3326.jar provision-agent -service-name=WLS-server -destination=. -private-data-key=ABCDEFG12345ABCDEF123456ABCDE -data-upload-endpoint=https://abcdefgt12345aaaaaaaaabcdef.apm-agt.us-phoenix-1.oci.oraclecloud.com"
-
- With a successful installation, you should see the output similar to below.
-
- 
-
-2. Execute the below command to verify ***oracle-apm-agent*** directory is created under the apmlab-fss directory.
-
- ``` bash
-
- kubectl exec -it sample-domain1-admin-server -n sample-domain1-ns -- bash -c "cd /apmlab-fss && ls "
-
- ```
-
- 
-
-
-
-## Task5: Disable the maintenance spans
-
-In this task, you will add exclusions to the data capture in the APM Agent, for the JAXRS server probe that generates static spans in this particular WebLogic setup. This is an optional task if you are monitoring the real-life environment, but for the lab purpose, we would like to suppress the spans generated from the server maintenance, so that you can focus on the spans related to the browser navigations.
-
-Because there is no editing tool inside the container, you will copy an APM agent configuration file from the container to the Cloud Shell, edit the file, then copy it back to the container. We plan to add the exclusion by default, to the product in the future.
-
-1. Copy **ProbeConfig.acml** from the container. ***Replace*** the apm-agent-version before running the command.
-
- ``` bash
-
- kubectl cp sample-domain1-ns/sample-domain1-admin-server:/apmlab-fss/oracle-apm-agent/config//ProbeConfig.acml ~/ProbeConfig.acml
-
- ```
-
- >**Note:** The file path includes the APM Java Agent version. Change the directory name to the Agent version you have.
- E.g., kubectl cp sample-domain1-ns/sample-domain1-admin-server:/apmlab-fss/oracle-apm-agent/config/**1.8.3326**/ProbeConfig.acml ~/ProbeConfig.acml
-
- run the "ls" command from the Home directory and confirm the file was transferred.
- ```bash
-
- ls ~
-
- ```
-
- 
-
-2. Open **ProbeConfig.acml** with an editor
-
- ```bash
-
- vi ~/ProbeConfig.acml
-
- ```
-
-3. Make the following changes and save the file.
-
- - Find **JAXRS\_SERVER** under the **enabled\_probes** section (line 11),
- - change
- JAXRS\_SERVER : **true** to
- JAXRS\_SERVER : **false**
-
- 
-
-4. Copy **ProbeConfig.acml** back to the container. Ensure to ***change*** the directory name to the Agent apm-agent-version you have before running the command.
-
- ```bash
-
- kubectl cp ~/ProbeConfig.acml sample-domain1-ns/sample-domain1-admin-server:/apmlab-fss/oracle-apm-agent/config//ProbeConfig.acml
-
- ```
-
- >**Note:** kubectl cp ~/ProbeConfig.acml sample-domain1-ns/sample-domain1-admin-server:/apmlab-fss/oracle-apm-agent/config/**1.8.3326**/ProbeConfig.acml
-
- 
-
-## Task6: Deploy the Java Agent
-
-Next, you will deploy the Java Agent by modifying the domain.yaml file to point to the APM Agent jar file bootstrap location.
-
-1. Open the Cloud shell, if not opened. Open the ***domain.yaml*** from the home directory with any editor.
-
- ```bash
-
- vi ~/wls-hol/domain.yaml
-
- ```
-
-2. Find the **JAVA_OPTIONS** section (line 69). You will see a java runtime parameter **"-Dweblogic.StdoutDebugEnabled=false"** is set (line 70).
-
- 
-
-3. Add the Java Agent jar location by replacing the value to:
-
- ```bash
-
- "-javaagent:/apmlab-fss/oracle-apm-agent/bootstrap/ApmAgent.jar -Dweblogic.StdoutDebugEnabled=false"
-
- ```
-
- 
-
- Save and close the file.
-
-4. Recreate the Kubernetes pod by applying the yaml.
-
- ```bash
-
- kubectl apply -f ~/wls-hol/domain.yaml -n sample-domain1-ns
-
- ```
-
- 
-
-5. Run the following command to check the status of the pods. Carefully look at the **AGE** column, and make sure they are restarted, and in the Running state and Ready.
-
- ```bash
-
- kubectl get pods -n sample-domain1-ns
-
- ```
- 
-
- Once the pods are in the Running state, the APM Java Agent is active and listening to the WebLogic Server. It captures backend traces and spans which you can view in the APM Trace Explorer. Verify the AGE column to ensure they are restarted. It may take 5 or more minutes to have all servers restarted.
-
-
-
-
-You may now **proceed to the next lab**.
-
-## Acknowledgements
-
-* **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
-- **Contributors** - Steven Lemme, Senior Principal Product Manager,
-Anand Prabhu, Sr. Member of Technical Staff,
-Avi Huber, Vice President, Product Management
-* **Last Updated By/Date** - Yutaka Takatsu, March, 2023
diff --git a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/2-1-mavencentral.png b/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/2-1-mavencentral.png
deleted file mode 100644
index 3ad361053..000000000
Binary files a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/2-1-mavencentral.png and /dev/null differ
diff --git a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-1-1-menu.png b/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-1-1-menu.png
deleted file mode 100644
index 451036ffc..000000000
Binary files a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-1-1-menu.png and /dev/null differ
diff --git a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-1-10-cloudshell.png b/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-1-10-cloudshell.png
deleted file mode 100644
index ffe1eb0c4..000000000
Binary files a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-1-10-cloudshell.png and /dev/null differ
diff --git a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-1-11-cloudshell.png b/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-1-11-cloudshell.png
deleted file mode 100644
index 311dbb506..000000000
Binary files a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-1-11-cloudshell.png and /dev/null differ
diff --git a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-1-2-apmdomain.png b/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-1-2-apmdomain.png
deleted file mode 100644
index 408998c53..000000000
Binary files a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-1-2-apmdomain.png and /dev/null differ
diff --git a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-1-3-apmdomain.png b/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-1-3-apmdomain.png
deleted file mode 100644
index 8bb2a3811..000000000
Binary files a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-1-3-apmdomain.png and /dev/null differ
diff --git a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-1-4-cloudshell.png b/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-1-4-cloudshell.png
deleted file mode 100644
index e737c335b..000000000
Binary files a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-1-4-cloudshell.png and /dev/null differ
diff --git a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-1-5-browse.png b/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-1-5-browse.png
deleted file mode 100644
index 02a1048cc..000000000
Binary files a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-1-5-browse.png and /dev/null differ
diff --git a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-1-5-cloudshell.png b/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-1-5-cloudshell.png
deleted file mode 100644
index 35eff85df..000000000
Binary files a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-1-5-cloudshell.png and /dev/null differ
diff --git a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-1-6-cloudshell.png b/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-1-6-cloudshell.png
deleted file mode 100644
index 0ad601b45..000000000
Binary files a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-1-6-cloudshell.png and /dev/null differ
diff --git a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-1-6-upload.png b/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-1-6-upload.png
deleted file mode 100644
index b8ee0b064..000000000
Binary files a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-1-6-upload.png and /dev/null differ
diff --git a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-1-7-1-cloudshell.png b/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-1-7-1-cloudshell.png
deleted file mode 100644
index 7c2e3d52c..000000000
Binary files a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-1-7-1-cloudshell.png and /dev/null differ
diff --git a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-1-7-2-cloudshell.png b/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-1-7-2-cloudshell.png
deleted file mode 100644
index 2e20063bf..000000000
Binary files a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-1-7-2-cloudshell.png and /dev/null differ
diff --git a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-1-7-cloudshell.png b/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-1-7-cloudshell.png
deleted file mode 100644
index ea48c47d4..000000000
Binary files a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-1-7-cloudshell.png and /dev/null differ
diff --git a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-1-8-cloudshell.png b/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-1-8-cloudshell.png
deleted file mode 100644
index 3db9515b1..000000000
Binary files a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-1-8-cloudshell.png and /dev/null differ
diff --git a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-1-9-cloudshell.png b/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-1-9-cloudshell.png
deleted file mode 100644
index 78371dd60..000000000
Binary files a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-1-9-cloudshell.png and /dev/null differ
diff --git a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-5-1-cloudshell.png b/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-5-1-cloudshell.png
deleted file mode 100644
index 5b0766446..000000000
Binary files a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-5-1-cloudshell.png and /dev/null differ
diff --git a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-5-2-cloudshell.png b/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-5-2-cloudshell.png
deleted file mode 100644
index 4b065df98..000000000
Binary files a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-5-2-cloudshell.png and /dev/null differ
diff --git a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-5-3-cloudshell.png b/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-5-3-cloudshell.png
deleted file mode 100644
index f0d004101..000000000
Binary files a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-5-3-cloudshell.png and /dev/null differ
diff --git a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-6-1-1-cloudshell.png b/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-6-1-1-cloudshell.png
deleted file mode 100644
index cd6c8739a..000000000
Binary files a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-6-1-1-cloudshell.png and /dev/null differ
diff --git a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-6-1-cloudshell.png b/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-6-1-cloudshell.png
deleted file mode 100644
index 73ce1d7dd..000000000
Binary files a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-6-1-cloudshell.png and /dev/null differ
diff --git a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-6-2-cloudshell.png b/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-6-2-cloudshell.png
deleted file mode 100644
index 1f99bc6a8..000000000
Binary files a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-6-2-cloudshell.png and /dev/null differ
diff --git a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-6-3-cloudshell.png b/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-6-3-cloudshell.png
deleted file mode 100644
index a5d8b8248..000000000
Binary files a/oci-apm-weblogic/f-lab-five-configure-apm-agent/images/4-6-3-cloudshell.png and /dev/null differ
diff --git a/oci-apm-weblogic/g-lab-six-change-displayname/images/5-1-1-cloudshell.png b/oci-apm-weblogic/g-lab-six-change-displayname/images/5-1-1-cloudshell.png
deleted file mode 100644
index 4714740a0..000000000
Binary files a/oci-apm-weblogic/g-lab-six-change-displayname/images/5-1-1-cloudshell.png and /dev/null differ
diff --git a/oci-apm-weblogic/g-lab-six-change-displayname/images/5-1-2-cloudshell.png b/oci-apm-weblogic/g-lab-six-change-displayname/images/5-1-2-cloudshell.png
deleted file mode 100644
index 4dad93341..000000000
Binary files a/oci-apm-weblogic/g-lab-six-change-displayname/images/5-1-2-cloudshell.png and /dev/null differ
diff --git a/oci-apm-weblogic/g-lab-six-change-displayname/images/5-3-1-cloudshell.png b/oci-apm-weblogic/g-lab-six-change-displayname/images/5-3-1-cloudshell.png
deleted file mode 100644
index 46b20a59f..000000000
Binary files a/oci-apm-weblogic/g-lab-six-change-displayname/images/5-3-1-cloudshell.png and /dev/null differ
diff --git a/oci-apm-weblogic/g-lab-six-change-displayname/images/5-3-2-cloudshell.png b/oci-apm-weblogic/g-lab-six-change-displayname/images/5-3-2-cloudshell.png
deleted file mode 100644
index 963f21338..000000000
Binary files a/oci-apm-weblogic/g-lab-six-change-displayname/images/5-3-2-cloudshell.png and /dev/null differ
diff --git a/oci-apm-weblogic/g-lab-six-change-displayname/images/6-1-cloudshell.png b/oci-apm-weblogic/g-lab-six-change-displayname/images/6-1-cloudshell.png
deleted file mode 100644
index 5f6e39242..000000000
Binary files a/oci-apm-weblogic/g-lab-six-change-displayname/images/6-1-cloudshell.png and /dev/null differ
diff --git a/oci-apm-weblogic/g-lab-six-change-displayname/images/6-1a-cloudshell.png b/oci-apm-weblogic/g-lab-six-change-displayname/images/6-1a-cloudshell.png
deleted file mode 100644
index ac674b66f..000000000
Binary files a/oci-apm-weblogic/g-lab-six-change-displayname/images/6-1a-cloudshell.png and /dev/null differ
diff --git a/oci-apm-weblogic/g-lab-six-change-displayname/images/6-1c-cloudshell.png b/oci-apm-weblogic/g-lab-six-change-displayname/images/6-1c-cloudshell.png
deleted file mode 100644
index 06dd9d767..000000000
Binary files a/oci-apm-weblogic/g-lab-six-change-displayname/images/6-1c-cloudshell.png and /dev/null differ
diff --git a/oci-apm-weblogic/g-lab-six-change-displayname/images/6-4-cloudshell.png b/oci-apm-weblogic/g-lab-six-change-displayname/images/6-4-cloudshell.png
deleted file mode 100644
index 6f4b58583..000000000
Binary files a/oci-apm-weblogic/g-lab-six-change-displayname/images/6-4-cloudshell.png and /dev/null differ
diff --git a/oci-apm-weblogic/h-lab-seven-configure-browser-agent/configure-browser-agent.md b/oci-apm-weblogic/h-lab-seven-configure-browser-agent/configure-browser-agent.md
deleted file mode 100644
index d4caacb2a..000000000
--- a/oci-apm-weblogic/h-lab-seven-configure-browser-agent/configure-browser-agent.md
+++ /dev/null
@@ -1,138 +0,0 @@
-# Instrument the browser monitoring
-
-## Introduction
-
-In the previous labs, you instrumented the application with an APM java agent, which captures traces and spans generated by the server. In this lab, you will configure an APM browser agent that captures traces and spans generated by the browser. You will configure a java agent configuration file to add an automatic injection of a javascript to the application's webpage that deploys the APM browser agent.
-
-The automatic injection is an APM feature that automates the Browser Agent instrumentation for Java applications.
-
-In this lab, you will configure **AgentConfig.properties**. In production, you can do this task together with the previous lab, where you configure display names for spans/operations because you will be editing the same file. But for learning purposes, adding browser injection is called out as a dedicated lab in this workshop.
-
-Estimated time: 5 minutes
-
-### Objectives
-
-* Instrument browser by injecting JavaScript code to the webpage
-
-### Prerequisites
-
-* Completion of the preceding labs in this workshop
-
-## Task1: Configure the Java Agent configuration file to enable the injection
-
-
-1. If the Oracle Cloud shell session is expired, run the oci ce (Container Engine) command that you saved in Lab 3, Task 2, step 5.
-
-
-2. Execute the following command to copy **AgentConfig.properties** from the container to the home directory. Ensure to ***change*** the directory name to the Agent apm-agent-version you have before running the command.
-
-
- ``` bash
-
- kubectl cp sample-domain1-ns/sample-domain1-admin-server:/apmlab-fss/oracle-apm-agent/config//AgentConfig.properties ~/AgentConfig.properties
-
- ```
-
- >**Note:** The file path includes the APM Java Agent version. Change the directory name to the Agent version you have.
- E.g., kubectl cp sample-domain1-ns/sample-domain1-admin-server:/apmlab-fss/oracle-apm-agent/config/**1.8.3326**/AgentConfig.properties ~/AgentConfig.properties
-
- run the "ls" command from the Home directory and confirm the file was transferred.
- ```bash
-
- ls ~
-
- ```
-
- 
-
-3. Open **AgentConfig.properties** with an editor
-
- ```bash
-
- vi ~/AgentConfig.properties
-
- ```
-
-4. Find a section **Start of Browser Agent (RUM) Injection Properties**
-
- 
-
- - Hit **i** to enter the edit mode, uncomment the following properties, and make changes as suggested below.
- - com.oracle.apm.agent.rum.enable.injection=**true**
- - com.oracle.apm.agent.public.data.key= **<Public data key of your APM domain>**
- - Ensure to enter the ***Public key***, not the Private key of your domain.
- - com.oracle.apm.agent.rum.web.application=**WLS WebApp**
- - com.oracle.apm.agent.rum.service.name=**WLS-web**
-
- - Save and close the file with **esc + :wq**.
-
- 
-
-5. Copy **AgentConfig.properties** back to the container. ***Change*** the directory name to the Agent apm-agent-version you have before running the command.
-
- ```bash
-
- kubectl cp ~/AgentConfig.properties sample-domain1-ns/sample-domain1-admin-server:/apmlab-fss/oracle-apm-agent/config//AgentConfig.properties
-
- ```
-
- >**Note:** kubectl cp ~/AgentConfig.properties sample-domain1-ns/sample-domain1-admin-server:/apmlab-fss/oracle-apm-agent/config/**1.8.3326**/AgentConfig.properties
-
- 
-
-6. Verify the successful file transfer, by running the following command. ***Change*** the apm-agent-version before running the command.
-
- ``` bash
-
- kubectl exec -it sample-domain1-admin-server -n sample-domain1-ns -- bash -c "cd /apmlab-fss/oracle-apm-agent/config/ && cat AgentConfig.properties "
-
- ```
- Review the file content.
-
- 
-
- Ensure you see the changes made in the previous step.
-
- 
-
-## Task2: Verify the JavaScript in the browser source page
-
-1. Type the following command and note down the external IP of the **traefik operator** service.
-
- ``` bash
-
- kubectl get svc -n traefik
-
- ```
- 
-
-2. On your computer, open a new browser tab and access the application with the following URL pattern:
-
- ``` bash
-
- http:///opdemo/?dsname=testDatasource
-
- ```
- WebLogic Operator Demo application launches.
-
- 
-
-3. Right mouse click on the page and select a menu item to view the page source
-
- 
-
-4. Verify JavaScript with parameters, which are configured in the previous steps, is inserted into the page.
-
- 
-
-5. Close the browser window.
-
-You may now **proceed to the next lab**.
-
-## Acknowledgements
-
-* **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
-- **Contributors** - Steven Lemme, Senior Principal Product Manager,
-Anand Prabhu, Sr. Member of Technical Staff,
-Avi Huber, Vice President, Product Management
-* **Last Updated By/Date** - Yutaka Takatsu, December 2022
diff --git a/oci-apm-weblogic/h-lab-seven-configure-browser-agent/images/6-1-cloudshell.png b/oci-apm-weblogic/h-lab-seven-configure-browser-agent/images/6-1-cloudshell.png
deleted file mode 100644
index 5f6e39242..000000000
Binary files a/oci-apm-weblogic/h-lab-seven-configure-browser-agent/images/6-1-cloudshell.png and /dev/null differ
diff --git a/oci-apm-weblogic/h-lab-seven-configure-browser-agent/images/6-2-cloudshell.png b/oci-apm-weblogic/h-lab-seven-configure-browser-agent/images/6-2-cloudshell.png
deleted file mode 100644
index c97f3d30a..000000000
Binary files a/oci-apm-weblogic/h-lab-seven-configure-browser-agent/images/6-2-cloudshell.png and /dev/null differ
diff --git a/oci-apm-weblogic/h-lab-seven-configure-browser-agent/images/6-3-cloudshell.png b/oci-apm-weblogic/h-lab-seven-configure-browser-agent/images/6-3-cloudshell.png
deleted file mode 100644
index cc9152362..000000000
Binary files a/oci-apm-weblogic/h-lab-seven-configure-browser-agent/images/6-3-cloudshell.png and /dev/null differ
diff --git a/oci-apm-weblogic/h-lab-seven-configure-browser-agent/images/6-4-cloudshell.png b/oci-apm-weblogic/h-lab-seven-configure-browser-agent/images/6-4-cloudshell.png
deleted file mode 100644
index 6f4b58583..000000000
Binary files a/oci-apm-weblogic/h-lab-seven-configure-browser-agent/images/6-4-cloudshell.png and /dev/null differ
diff --git a/oci-apm-weblogic/h-lab-seven-configure-browser-agent/images/6-5-cloudshell.png b/oci-apm-weblogic/h-lab-seven-configure-browser-agent/images/6-5-cloudshell.png
deleted file mode 100644
index 6b6bede6b..000000000
Binary files a/oci-apm-weblogic/h-lab-seven-configure-browser-agent/images/6-5-cloudshell.png and /dev/null differ
diff --git a/oci-apm-weblogic/h-lab-seven-configure-browser-agent/images/6-6-cloudshell.png b/oci-apm-weblogic/h-lab-seven-configure-browser-agent/images/6-6-cloudshell.png
deleted file mode 100644
index fcf68d7a2..000000000
Binary files a/oci-apm-weblogic/h-lab-seven-configure-browser-agent/images/6-6-cloudshell.png and /dev/null differ
diff --git a/oci-apm-weblogic/h-lab-seven-configure-browser-agent/images/6-7-cloudshell.png b/oci-apm-weblogic/h-lab-seven-configure-browser-agent/images/6-7-cloudshell.png
deleted file mode 100644
index c9ca88fb9..000000000
Binary files a/oci-apm-weblogic/h-lab-seven-configure-browser-agent/images/6-7-cloudshell.png and /dev/null differ
diff --git a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-1-1-cloudshell.png b/oci-apm-weblogic/i-lab-eight-view-traces/images/6-1-1-cloudshell.png
deleted file mode 100644
index f80be5e89..000000000
Binary files a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-1-1-cloudshell.png and /dev/null differ
diff --git a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-1-2-wstore.png b/oci-apm-weblogic/i-lab-eight-view-traces/images/6-1-2-wstore.png
deleted file mode 100644
index 409ac13a9..000000000
Binary files a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-1-2-wstore.png and /dev/null differ
diff --git a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-2-1-menu.png b/oci-apm-weblogic/i-lab-eight-view-traces/images/6-2-1-menu.png
deleted file mode 100644
index 4229aa093..000000000
Binary files a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-2-1-menu.png and /dev/null differ
diff --git a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-2-10-traceexplorer.png b/oci-apm-weblogic/i-lab-eight-view-traces/images/6-2-10-traceexplorer.png
deleted file mode 100644
index f8c9b0c34..000000000
Binary files a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-2-10-traceexplorer.png and /dev/null differ
diff --git a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-2-11-traceexplorer.png b/oci-apm-weblogic/i-lab-eight-view-traces/images/6-2-11-traceexplorer.png
deleted file mode 100644
index 1e55c4ec4..000000000
Binary files a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-2-11-traceexplorer.png and /dev/null differ
diff --git a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-2-12-traceexplorer.png b/oci-apm-weblogic/i-lab-eight-view-traces/images/6-2-12-traceexplorer.png
deleted file mode 100644
index b2ae6bddb..000000000
Binary files a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-2-12-traceexplorer.png and /dev/null differ
diff --git a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-2-2-traceexplorer.png b/oci-apm-weblogic/i-lab-eight-view-traces/images/6-2-2-traceexplorer.png
deleted file mode 100644
index 43325c76b..000000000
Binary files a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-2-2-traceexplorer.png and /dev/null differ
diff --git a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-2-3-traceexplorer.png b/oci-apm-weblogic/i-lab-eight-view-traces/images/6-2-3-traceexplorer.png
deleted file mode 100644
index 4dfd8c8ef..000000000
Binary files a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-2-3-traceexplorer.png and /dev/null differ
diff --git a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-2-4-traceexplorer.png b/oci-apm-weblogic/i-lab-eight-view-traces/images/6-2-4-traceexplorer.png
deleted file mode 100644
index f5524c286..000000000
Binary files a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-2-4-traceexplorer.png and /dev/null differ
diff --git a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-2-5-traceexplorer.png b/oci-apm-weblogic/i-lab-eight-view-traces/images/6-2-5-traceexplorer.png
deleted file mode 100644
index 7a6e23d95..000000000
Binary files a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-2-5-traceexplorer.png and /dev/null differ
diff --git a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-2-6-traceexplorer.png b/oci-apm-weblogic/i-lab-eight-view-traces/images/6-2-6-traceexplorer.png
deleted file mode 100644
index b947f4640..000000000
Binary files a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-2-6-traceexplorer.png and /dev/null differ
diff --git a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-2-7-traceexplorer.png b/oci-apm-weblogic/i-lab-eight-view-traces/images/6-2-7-traceexplorer.png
deleted file mode 100644
index bce3ed116..000000000
Binary files a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-2-7-traceexplorer.png and /dev/null differ
diff --git a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-2-8-traceexplorer.png b/oci-apm-weblogic/i-lab-eight-view-traces/images/6-2-8-traceexplorer.png
deleted file mode 100644
index 70225ea01..000000000
Binary files a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-2-8-traceexplorer.png and /dev/null differ
diff --git a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-2-9-traceexplorer.png b/oci-apm-weblogic/i-lab-eight-view-traces/images/6-2-9-traceexplorer.png
deleted file mode 100644
index a3d76322c..000000000
Binary files a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-2-9-traceexplorer.png and /dev/null differ
diff --git a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-3-1-traceexplorer.png b/oci-apm-weblogic/i-lab-eight-view-traces/images/6-3-1-traceexplorer.png
deleted file mode 100644
index faffdc0fb..000000000
Binary files a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-3-1-traceexplorer.png and /dev/null differ
diff --git a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-3-2-traceexplorer.png b/oci-apm-weblogic/i-lab-eight-view-traces/images/6-3-2-traceexplorer.png
deleted file mode 100644
index 55512cadd..000000000
Binary files a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-3-2-traceexplorer.png and /dev/null differ
diff --git a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-3-3-traceexplorer.png b/oci-apm-weblogic/i-lab-eight-view-traces/images/6-3-3-traceexplorer.png
deleted file mode 100644
index be833e0a2..000000000
Binary files a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-3-3-traceexplorer.png and /dev/null differ
diff --git a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-3-4-traceexplorer.png b/oci-apm-weblogic/i-lab-eight-view-traces/images/6-3-4-traceexplorer.png
deleted file mode 100644
index 2cbf25954..000000000
Binary files a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-3-4-traceexplorer.png and /dev/null differ
diff --git a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-4-1-traceexplorer.png b/oci-apm-weblogic/i-lab-eight-view-traces/images/6-4-1-traceexplorer.png
deleted file mode 100644
index 6c5c95fb4..000000000
Binary files a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-4-1-traceexplorer.png and /dev/null differ
diff --git a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-4-2-traceexplorer.png b/oci-apm-weblogic/i-lab-eight-view-traces/images/6-4-2-traceexplorer.png
deleted file mode 100644
index ec72faa0c..000000000
Binary files a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-4-2-traceexplorer.png and /dev/null differ
diff --git a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-4-3-traceexplorer.png b/oci-apm-weblogic/i-lab-eight-view-traces/images/6-4-3-traceexplorer.png
deleted file mode 100644
index 8fcea77eb..000000000
Binary files a/oci-apm-weblogic/i-lab-eight-view-traces/images/6-4-3-traceexplorer.png and /dev/null differ
diff --git a/oci-apm-weblogic/i-lab-eight-view-traces/images/7-1-1-wstore.png b/oci-apm-weblogic/i-lab-eight-view-traces/images/7-1-1-wstore.png
deleted file mode 100644
index 31aa9fdf2..000000000
Binary files a/oci-apm-weblogic/i-lab-eight-view-traces/images/7-1-1-wstore.png and /dev/null differ
diff --git a/oci-apm-weblogic/i-lab-eight-view-traces/images/7-1-2-wstore.png b/oci-apm-weblogic/i-lab-eight-view-traces/images/7-1-2-wstore.png
deleted file mode 100644
index 6256f71d3..000000000
Binary files a/oci-apm-weblogic/i-lab-eight-view-traces/images/7-1-2-wstore.png and /dev/null differ
diff --git a/oci-apm-weblogic/i-lab-eight-view-traces/images/7-1-3-wstore.png b/oci-apm-weblogic/i-lab-eight-view-traces/images/7-1-3-wstore.png
deleted file mode 100644
index 621b49c24..000000000
Binary files a/oci-apm-weblogic/i-lab-eight-view-traces/images/7-1-3-wstore.png and /dev/null differ
diff --git a/oci-apm-weblogic/i-lab-eight-view-traces/images/7-1-4-wstore.png b/oci-apm-weblogic/i-lab-eight-view-traces/images/7-1-4-wstore.png
deleted file mode 100644
index 396f13a47..000000000
Binary files a/oci-apm-weblogic/i-lab-eight-view-traces/images/7-1-4-wstore.png and /dev/null differ
diff --git a/oci-apm-weblogic/i-lab-eight-view-traces/images/8-1-1-menu.png b/oci-apm-weblogic/i-lab-eight-view-traces/images/8-1-1-menu.png
deleted file mode 100644
index 149ac76e9..000000000
Binary files a/oci-apm-weblogic/i-lab-eight-view-traces/images/8-1-1-menu.png and /dev/null differ
diff --git a/oci-apm-weblogic/i-lab-eight-view-traces/images/8-1-2-1-menu.png b/oci-apm-weblogic/i-lab-eight-view-traces/images/8-1-2-1-menu.png
deleted file mode 100644
index 7f4ee871b..000000000
Binary files a/oci-apm-weblogic/i-lab-eight-view-traces/images/8-1-2-1-menu.png and /dev/null differ
diff --git a/oci-apm-weblogic/i-lab-eight-view-traces/images/8-1-2-menu.png b/oci-apm-weblogic/i-lab-eight-view-traces/images/8-1-2-menu.png
deleted file mode 100644
index c2fdca53c..000000000
Binary files a/oci-apm-weblogic/i-lab-eight-view-traces/images/8-1-2-menu.png and /dev/null differ
diff --git a/oci-apm-weblogic/i-lab-eight-view-traces/images/8-1-3-menu.png b/oci-apm-weblogic/i-lab-eight-view-traces/images/8-1-3-menu.png
deleted file mode 100644
index f2a1d5b1c..000000000
Binary files a/oci-apm-weblogic/i-lab-eight-view-traces/images/8-1-3-menu.png and /dev/null differ
diff --git a/oci-apm-weblogic/i-lab-eight-view-traces/images/8-1-4-menu.png b/oci-apm-weblogic/i-lab-eight-view-traces/images/8-1-4-menu.png
deleted file mode 100644
index a32ca5c2e..000000000
Binary files a/oci-apm-weblogic/i-lab-eight-view-traces/images/8-1-4-menu.png and /dev/null differ
diff --git a/oci-apm-weblogic/i-lab-eight-view-traces/images/8-2-1-menu.png b/oci-apm-weblogic/i-lab-eight-view-traces/images/8-2-1-menu.png
deleted file mode 100644
index ac26e4a4e..000000000
Binary files a/oci-apm-weblogic/i-lab-eight-view-traces/images/8-2-1-menu.png and /dev/null differ
diff --git a/oci-apm-weblogic/i-lab-eight-view-traces/images/8-2-2-menu.png b/oci-apm-weblogic/i-lab-eight-view-traces/images/8-2-2-menu.png
deleted file mode 100644
index 0830792f6..000000000
Binary files a/oci-apm-weblogic/i-lab-eight-view-traces/images/8-2-2-menu.png and /dev/null differ
diff --git a/oci-apm-weblogic/i-lab-eight-view-traces/images/8-2-3-menu.png b/oci-apm-weblogic/i-lab-eight-view-traces/images/8-2-3-menu.png
deleted file mode 100644
index 397503675..000000000
Binary files a/oci-apm-weblogic/i-lab-eight-view-traces/images/8-2-3-menu.png and /dev/null differ
diff --git a/oci-apm-weblogic/i-lab-eight-view-traces/images/8-2-4-menu.png b/oci-apm-weblogic/i-lab-eight-view-traces/images/8-2-4-menu.png
deleted file mode 100644
index 82b29d79f..000000000
Binary files a/oci-apm-weblogic/i-lab-eight-view-traces/images/8-2-4-menu.png and /dev/null differ
diff --git a/oci-apm-weblogic/i-lab-eight-view-traces/view-traces.md b/oci-apm-weblogic/i-lab-eight-view-traces/view-traces.md
deleted file mode 100644
index fda24dd87..000000000
--- a/oci-apm-weblogic/i-lab-eight-view-traces/view-traces.md
+++ /dev/null
@@ -1,90 +0,0 @@
-# View traces and spans in APM Trace Explorer
-
-## Introduction
-
-In this lab, you will learn how to use the APM Trace Explorer to trace the workload generated with the WebLogic Kubernetes Operator demo application.
-
-Estimated time: 10 minutes
-
-### Objectives
-
-* Open APM Trace Explorer from the Oracle Cloud console
-* Verify traces and spans generated by the APM Java agent and the APM Browser agent
-* Examine values in the span dimensions for the WebLogic Server and browser
-* Confirm the changes to the display names of the spans that are configured in Lab 6
-
-### Prerequisites
-
-* Completion of preceding labs in this workshop.
-
-
-## Task1: Open APM Trace Explorer in the Oracle Cloud console
-
-
-
-1. If the Oracle Cloud shell session is expired, run the oci ce (Container Engine) command that you saved in Lab 3, Task 2, step 5.
-
-
-2. From the navigation menu in the Oracle Cloud console, select **Observability & Management** > **Trace Explorer**.
-
- 
-
-
-3. On the Trace Explorer page, select the **Compartment** and the **APM Domain**. Review the traces captured. Operation
-
- 
-
-4. In the **Traces** view, review the **service: Operation: Operation** column of the traces. The traces with **WLS-Server** are the server-side traces. They are captured by the APM Java agent. The traces with **WLS-web** are the client-side traces, which are captured by the APM Browser agent.
-
- 
-
-5. In the query box, add **DisplayName,** (Including the comma) at the end of the first line, as in the screenshot example. Then click Run on the right side of the field.
-
- ``` bash
-
- DisplayName,
-
- ```
-
- 
-
-6. A new column, **DispalyName** is added to the table, and values are added to the server-side traces. The format is DomainName + Server as configured in Lab 6.
-
- 
-
- >**Note:** Browser traces do not have values as the configuration was applied to the server traces.
-
-## Task2: Verify spans and dimensions on the Trace Details page
-
-1. In the Traces pane, click the link to the trace with the Operation name **opdemo/index.jsp** from the table.
-
- 
-
-2. On the **Trace Details** page, click the triangle icon next to **Topology**.
-
- 
-
-3. Click the span in the **Spans** view.
-
- 
-
-4. Review the backend dimensions and values, including the WebLogic, Kubernetes, and Oracle Cloud information.
-
- 
-
-
-
-
-
-## Conclusions
-
-In this workshop, you’ve learned how to use a file system by adding the APM Java agent to the microservices web application. You have also learned how to configure the APM Browser agent, and how to use APM Trace Explorer to view traces and spans. For more information on APM, refer to the OCI documentation, **[Application Performance Monitoring](https://docs.oracle.com/en-us/iaas/application-performance-monitoring/index.html)**.
-
-
-## Acknowledgements
-
-* **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
-- **Contributors** - Steven Lemme, Senior Principal Product Manager,
-Anand Prabhu, Sr. Member of Technical Staff,
-Avi Huber, Vice President, Product Management
-* **Last Updated By/Date** - Yutaka Takatsu, August 2022
diff --git a/oci-apm-weblogic/j-lab-nine-cleanup/cleanup.md b/oci-apm-weblogic/j-lab-nine-cleanup/cleanup.md
deleted file mode 100644
index 39b52454a..000000000
--- a/oci-apm-weblogic/j-lab-nine-cleanup/cleanup.md
+++ /dev/null
@@ -1,157 +0,0 @@
-# Clean up the workshop environment
-
-## Introduction
-
-In this lab, you will clean up the workshop environment by running commands from the Cloud shell, also manually removing the Oracle cloud resources using the Oracle Cloud console.
-
-Estimated time: 10 minutes
-
-### Objectives
-
-* Remove the lab configurations and setups
-
-### Prerequisites
-
-* Completion of preceding labs in this workshop.
-
-## Task1: Clean Up the application setup
-
-To delete the workshop setup from your tenancy, follow the steps below.
-
-1. Run the oci ce (Container Engine) command that you saved in Lab 3, Task 2, step 5.
-
-
-2. Remove the application deployment.
-
- ``` bash
-
- kubectl delete -f ~/wls-hol/domain.yaml -n sample-domain1-ns
-
- ```
-
-3. Remove the storage configuration from the cluster.
-
- ``` bash
-
- kubectl delete -f ~/wls-hol/apmlab-fss.yaml -n sample-domain1-ns
-
- ```
- 
-
-
-4. Remove the WebLogic domain
-
- ``` bash
-
- cd ~/wls-hol; ./deleteWls.sh
-
- ```
-
-
-
-
-## Task2: Remove the Target Mount and the File System
-
-1. From the navigation menu in the Oracle Cloud console, select **Storage** > **Mount Target**.
- Then click the link to the MountTarget configured in the workshop.
-
- 
-
-2. In the **Mount Target Details** page, click **Delete**. In the confirmation window, click **Delete**.
-
- 
-
-3. Deletion of the Mount Target starts and completes.
-
- 
-
-4. From the navigation menu in the Oracle Cloud console, select **Storage** > **File Systems**. Then click the link to the File System configured in the workshop.
-
- 
-
-5. In the **File System Details** page, click **Delete**. In the confirmation window, click **Delete**.
-
- 
-
-6. Deletion of the File System starts and completes.
-
- 
-
-## Task3: Remove the container
-
-1. From the navigation menu in the Oracle Cloud console, select **Developer Services** > **Kubernetes Container(OKE)**. Then click the link to the Cluster configured in the workshop.
-
- 
-
-2. In the **Cluster Details** page, click **Delete**. In the confirmation window, enter the name of the cluster, then click **Delete**.
-
- 
-
-3. Deletion of the File System starts and completes.
-
- 
-
-## Task4: Remove the VCN
-
-1. From the navigation menu in the Oracle Cloud console, select **Networking** > **Virtual Cloud Networks**. Then click the link to the VCN configured in the workshop.
-
- 
-
-2. In the **Virtual Cloud Network Details** page, scroll down to locate the **Subnets** section. Select one of the subnets and click the three-dot icon on the right-hand side of the row.
-
- 
-
-3. From the pulldown menu, select **Terminate**. In the confirmation window, click **Terminate**.
-
- 
-
-4. Repeat to terminate other subnets. Once all the subnets are deleted, from the upper side of the VCN details page, click **Terminate** to remove the VCN.
-
- 
-
-
-5. **Delete Virtual Cloud Network** dialog opens. Click **Scan**.
-
- 
-
-6. Click the **Terminate All** button when activated. Termination of the resources begins. Once the message **Virtual Cloud Network termination complete** shows, click **Close**.
- 
-
-## Task5: Remove the workshop directory
-
-1. Open the Oracle Cloud shell, and run the following commands to remove the files and the workshop directory.
-
- ``` bash
-
- cd ~; rm apm-java-agent-installer-*.jar; rm ProbeConfig.acml; rm AgentConfig.properties; rm -r wls-hol;rm wls-hol.zip
-
- ```
- 
-
-## Task 6: Remove the APM domain and compartment
-
-1. From the navigation menu in the Oracle Cloud console, select **Observability & Management** > **Administration**. Then click the link to the APM domain which you created in the workshop.
- 
-
-2. In the **Domain details** page, click **Delete**. In the confirmation window, enter the name of the APM domain, then click **Delete**.
- 
-
-3. Deletion of the APM domain starts and completes. This may take a few minutes. Refresh the screen periodically and check the status.
- 
-
-4. From the navigation menu in the Oracle Cloud console, select **Identity & Security** > **Compartment**. Then click the link to the compartment which you created in the workshop.
- 
-
-5. In the **Compartment details** page, click **Delete**. In the confirmation window, click **Delete**.
- 
-
-6. Deletion of the compartment starts and completes. This may take a few minutes.
- 
-
-## Acknowledgements
-
-* **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
-- **Contributors** - Steven Lemme, Senior Principal Product Manager,
-Anand Prabhu, Sr. Member of Technical Staff,
-Avi Huber, Vice President, Product Management
-* **Last Updated By/Date** - Yutaka Takatsu, August 2022
diff --git a/oci-apm-weblogic/j-lab-nine-cleanup/images/4-10-cleanup.png b/oci-apm-weblogic/j-lab-nine-cleanup/images/4-10-cleanup.png
deleted file mode 100644
index 66134b4c2..000000000
Binary files a/oci-apm-weblogic/j-lab-nine-cleanup/images/4-10-cleanup.png and /dev/null differ
diff --git a/oci-apm-weblogic/j-lab-nine-cleanup/images/4-12-cleanup.png b/oci-apm-weblogic/j-lab-nine-cleanup/images/4-12-cleanup.png
deleted file mode 100644
index c12f189b2..000000000
Binary files a/oci-apm-weblogic/j-lab-nine-cleanup/images/4-12-cleanup.png and /dev/null differ
diff --git a/oci-apm-weblogic/j-lab-nine-cleanup/images/4-13-cleanup.png b/oci-apm-weblogic/j-lab-nine-cleanup/images/4-13-cleanup.png
deleted file mode 100644
index 107381448..000000000
Binary files a/oci-apm-weblogic/j-lab-nine-cleanup/images/4-13-cleanup.png and /dev/null differ
diff --git a/oci-apm-weblogic/j-lab-nine-cleanup/images/4-14-cleanup.png b/oci-apm-weblogic/j-lab-nine-cleanup/images/4-14-cleanup.png
deleted file mode 100644
index 88a8077f4..000000000
Binary files a/oci-apm-weblogic/j-lab-nine-cleanup/images/4-14-cleanup.png and /dev/null differ
diff --git a/oci-apm-weblogic/j-lab-nine-cleanup/images/4-2-cleanup.png b/oci-apm-weblogic/j-lab-nine-cleanup/images/4-2-cleanup.png
deleted file mode 100644
index 6334523cf..000000000
Binary files a/oci-apm-weblogic/j-lab-nine-cleanup/images/4-2-cleanup.png and /dev/null differ
diff --git a/oci-apm-weblogic/j-lab-nine-cleanup/images/4-3-cleanup.png b/oci-apm-weblogic/j-lab-nine-cleanup/images/4-3-cleanup.png
deleted file mode 100644
index 4e56135ee..000000000
Binary files a/oci-apm-weblogic/j-lab-nine-cleanup/images/4-3-cleanup.png and /dev/null differ
diff --git a/oci-apm-weblogic/j-lab-nine-cleanup/images/4-4-cleanup.png b/oci-apm-weblogic/j-lab-nine-cleanup/images/4-4-cleanup.png
deleted file mode 100644
index 3fe5dc048..000000000
Binary files a/oci-apm-weblogic/j-lab-nine-cleanup/images/4-4-cleanup.png and /dev/null differ
diff --git a/oci-apm-weblogic/j-lab-nine-cleanup/images/4-5-cleanup.png b/oci-apm-weblogic/j-lab-nine-cleanup/images/4-5-cleanup.png
deleted file mode 100644
index 43f3a594e..000000000
Binary files a/oci-apm-weblogic/j-lab-nine-cleanup/images/4-5-cleanup.png and /dev/null differ
diff --git a/oci-apm-weblogic/j-lab-nine-cleanup/images/4-7-cleanup.png b/oci-apm-weblogic/j-lab-nine-cleanup/images/4-7-cleanup.png
deleted file mode 100644
index f78e9d99a..000000000
Binary files a/oci-apm-weblogic/j-lab-nine-cleanup/images/4-7-cleanup.png and /dev/null differ
diff --git a/oci-apm-weblogic/j-lab-nine-cleanup/images/6-1-cleanup.png b/oci-apm-weblogic/j-lab-nine-cleanup/images/6-1-cleanup.png
deleted file mode 100644
index 0a7d17f4e..000000000
Binary files a/oci-apm-weblogic/j-lab-nine-cleanup/images/6-1-cleanup.png and /dev/null differ
diff --git a/oci-apm-weblogic/j-lab-nine-cleanup/images/6-5-cleanup.png b/oci-apm-weblogic/j-lab-nine-cleanup/images/6-5-cleanup.png
deleted file mode 100644
index b022f631c..000000000
Binary files a/oci-apm-weblogic/j-lab-nine-cleanup/images/6-5-cleanup.png and /dev/null differ
diff --git a/oci-apm-weblogic/j-lab-nine-cleanup/images/6-6-cleanup.png b/oci-apm-weblogic/j-lab-nine-cleanup/images/6-6-cleanup.png
deleted file mode 100644
index ee32d5a9b..000000000
Binary files a/oci-apm-weblogic/j-lab-nine-cleanup/images/6-6-cleanup.png and /dev/null differ
diff --git a/oci-apm-weblogic/k-learn-more/images/1-1-get-started.png b/oci-apm-weblogic/k-learn-more/images/1-1-get-started.png
deleted file mode 100644
index 766f193bc..000000000
Binary files a/oci-apm-weblogic/k-learn-more/images/1-1-get-started.png and /dev/null differ
diff --git a/oci-apm-weblogic/k-learn-more/images/1-2-get-started.png b/oci-apm-weblogic/k-learn-more/images/1-2-get-started.png
deleted file mode 100644
index e4b519223..000000000
Binary files a/oci-apm-weblogic/k-learn-more/images/1-2-get-started.png and /dev/null differ
diff --git a/oci-apm-weblogic/k-learn-more/images/1-3-get-started.png b/oci-apm-weblogic/k-learn-more/images/1-3-get-started.png
deleted file mode 100644
index 8cbb7ea83..000000000
Binary files a/oci-apm-weblogic/k-learn-more/images/1-3-get-started.png and /dev/null differ
diff --git a/oci-apm-weblogic/k-learn-more/images/1-4-get-started.png b/oci-apm-weblogic/k-learn-more/images/1-4-get-started.png
deleted file mode 100644
index a9bcc313b..000000000
Binary files a/oci-apm-weblogic/k-learn-more/images/1-4-get-started.png and /dev/null differ
diff --git a/oci-apm-weblogic/k-learn-more/images/1-5-get-started.png b/oci-apm-weblogic/k-learn-more/images/1-5-get-started.png
deleted file mode 100644
index 5e716924e..000000000
Binary files a/oci-apm-weblogic/k-learn-more/images/1-5-get-started.png and /dev/null differ
diff --git a/oci-apm-weblogic/k-learn-more/images/1-6-get-started.png b/oci-apm-weblogic/k-learn-more/images/1-6-get-started.png
deleted file mode 100644
index 52fd1ac4f..000000000
Binary files a/oci-apm-weblogic/k-learn-more/images/1-6-get-started.png and /dev/null differ
diff --git a/oci-apm-weblogic/k-learn-more/learn-more.md b/oci-apm-weblogic/k-learn-more/learn-more.md
deleted file mode 100644
index e1927b619..000000000
--- a/oci-apm-weblogic/k-learn-more/learn-more.md
+++ /dev/null
@@ -1,67 +0,0 @@
-# Learn more about APM
-
-## Introduction
-
-Congratulations! You have completed the workshop.
-
-To learn more about APM, please visit **Get started with Oracle Cloud Application Performance Monitoring** workshop.
-
- 
- 
-
-In this workshop, you will learn how to use Oracle Cloud APM to examine critical performance alarms, view synthetic monitors in a dashboard to analyze the trend and identify spikes, observe the monitor's client-side details in HTTP Archive (HAR) file, and explore the server-side details by tracing data in APM Trace Explorer.
-
-### Objectives
-
-* Review APM alarms
-* Examine APM synthetic monitors
-* Explore monitor details and their history
-* Perform exploration of application trace data
-
-### Prerequisites
-
-* Familiarity with distributed tracing is helpful, but not required
-* Familiarity with Oracle Cloud is helpful
-
-## Task 1: Access the workshop
-
-1. Click the link following URL to access the workshop: **[Get started with Oracle Cloud APM](https://livelabs.oracle.com/pls/apex/r/dbpm/livelabs/view-workshop?wec=2681-VVAB-USGL-IJWF)** Workshop.
-Alternatively, open a new browser tab, copy the following URL, paste it to the address bar, and hit enter.
-
- ``` bash
-
- https://livelabs.oracle.com/pls/apex/r/dbpm/livelabs/view-workshop?wec=2681-VVAB-USGL-IJWF
-
- ```
-
-2. Login with an Oracle account.
-
- 
-
- >**Note:** If you do not have an account or forgot your Oracle account credentials, please refer to the next lab, **Oracle CloudWorld 2022 - Get Help**, section **Your Oracle Account**.
-
-3. Enter the code you got for two-factor authentication.
-
- 
-
-4. Workshop home page opens. Click the **Start** button.
-
- 
-
- >**Note:** The event code for the workshop is **2681-VVAB-USGL-IJWF**, however, you do not need to re-enter it, because it is already included in the URL.
-
-5. Click **Run on LiveLabs SandBox**.
-
- 
-
-6. Check the checkbox, click **Submit Reservation**, and follow the instructions to reserve the workshop.
-
- 
-
-## Acknowledgements
-
-* **Author** - Yutaka Takatsu, Product Manager, Enterprise and Cloud Manageability
-- **Contributors** - Steven Lemme, Senior Principal Product Manager,
-Anand Prabhu, Sr. Member of Technical Staff,
-Avi Huber, Vice President, Product Management
-* **Last Updated By/Date** - Yutaka Takatsu, October 2022
diff --git a/oci-apm-weblogic/workshops/freetier/manifest.json b/oci-apm-weblogic/workshops/freetier/manifest.json
index 2563995e8..0a1a389a2 100644
--- a/oci-apm-weblogic/workshops/freetier/manifest.json
+++ b/oci-apm-weblogic/workshops/freetier/manifest.json
@@ -5,7 +5,7 @@
{
"title": "Introduction",
"description": "Introduction",
- "filename": "../../a-introduction/introduction.md"
+ "filename": "../../00-introduction/introduction.md"
},
{
"title": "Get Started",
@@ -15,49 +15,54 @@
{
"title": "Lab 1: Create a Kubernetes cluster",
"description": "Create a Kubernetes cluster",
- "filename": "../../b-lab-one-create-oke/create-oke.md"
+ "filename": "../../01-create-oke/create-oke.md"
},
{
"title": "Lab 2: Create an APM Domain and obtain Data Upload Endpoint and Private Data Key ",
"description": "Create an APM Domain and obtain Data Upload Endpoint and Private Data Key ",
- "filename": "../../c-lab-two-create-domain/create-domain.md"
+ "filename": "../../02-create-domain/create-domain.md"
},
{
"title": "Lab 3: Deploy a WebLogic application",
"description": "Deploy a WebLogic application",
- "filename": "../../d-lab-three-build-app/build-app.md"
+ "filename": "../../03-build-app/build-app.md"
},
{
"title": "Lab 4: Create and configure a file system",
"description": "Create and configure a file system",
- "filename": "../../e-lab-four-create-file-system/create-file-system.md"
+ "filename": "../../04-create-file-system/create-file-system.md"
},
{
"title": "Lab 5: Instrument server monitoring",
"description": "Instrumentation for server monitoring",
- "filename": "../../f-lab-five-configure-apm-agent/configure-apm-agent.md"
+ "filename": "../../05-configure-apm-agent/configure-apm-agent.md"
},
{
"title": "Lab 6: Change the display name format of spans",
"description": "Change the display name of spans",
- "filename": "../../g-lab-six-change-displayname/change-displayname.md"
+ "filename": "../../06-change-displayname/change-displayname.md"
},
{
"title": "Lab 7: Instrument browser monitoring",
"description": "Instrumentation for browser monitoring",
- "filename": "../../h-lab-seven-configure-browser-agent/configure-browser-agent.md"
+ "filename": "../../07-configure-browser-agent/configure-browser-agent.md"
},
{
"title": "Lab 8: View traces and spans in APM Trace Explorer",
"description": "View traces and spans in APM Trace Explorer",
- "filename": "../../i-lab-eight-view-traces/view-traces.md"
+ "filename": "../../08-view-traces/view-traces.md"
},
{
"title": "Lab 9: Clean up the workshop environment",
"description": "Clean up the workshop environment",
- "filename": "../../j-lab-nine-cleanup/cleanup.md"
+ "filename": "../../09-cleanup/cleanup.md"
+ },
+ {
+ "title": "Lab 10: Learn more about APM (optional)",
+ "description": "Learn more about APM",
+ "filename": "../../10-learn-more/learn-more.md"
},
{
"title": "Need Help?",
diff --git a/oci-apm-weblogic/workshops/livelabs/manifest.json b/oci-apm-weblogic/workshops/livelabs/manifest.json
index 4301ae98a..6b29369e2 100644
--- a/oci-apm-weblogic/workshops/livelabs/manifest.json
+++ b/oci-apm-weblogic/workshops/livelabs/manifest.json
@@ -5,59 +5,64 @@
{
"title": "Introduction",
"description": "Introduction",
- "filename": "../../a-introduction/introduction.md"
+ "filename": "../../00-introduction/introduction.md"
},
{
"title": "Get Started",
"description": "This is the prerequisites for customers using Free Trial and Paid tenancies, and Always Free accounts (if applicable). The title of the lab and the Contents Menu title (the title above) match for Prerequisite lab. This lab is always first.",
- "filename": "https://oracle-livelabs.github.io/common/labs/cloud-login/cloud-login-livelabs2.md"
+ "filename": "https://oracle-livelabs.github.io/common/labs/cloud-login/cloud-login-livelabs.md"
},
{
"title": "Lab 1: Create a Kubernetes cluster",
"description": "Create a Kubernetes cluster",
- "filename": "../../b-lab-one-create-oke/create-oke.md"
+ "filename": "../../01-create-oke/create-oke.md"
},
{
"title": "Lab 2: Create an APM Domain and obtain Data Upload Endpoint and Private Data Key ",
"description": "Create an APM Domain and obtain Data Upload Endpoint and Private Data Key ",
- "filename": "../../c-lab-two-create-domain/create-domain.md"
+ "filename": "../../02-create-domain/create-domain.md"
},
{
"title": "Lab 3: Deploy a WebLogic application",
"description": "Deploy a WebLogic application",
- "filename": "../../d-lab-three-build-app/build-app.md"
+ "filename": "../../03-build-app/build-app.md"
},
{
"title": "Lab 4: Create and configure a file system",
"description": "Create and configure a file system",
- "filename": "../../e-lab-four-create-file-system/create-file-system.md"
+ "filename": "../../04-create-file-system/create-file-system.md"
},
{
"title": "Lab 5: Instrument server monitoring",
"description": "Instrumentation for server monitoring",
- "filename": "../../f-lab-five-configure-apm-agent/configure-apm-agent.md"
+ "filename": "../../05-configure-apm-agent/configure-apm-agent.md"
},
{
"title": "Lab 6: Change the display name format of spans",
"description": "Change the display name of spans",
- "filename": "../../g-lab-six-change-displayname/change-displayname.md"
+ "filename": "../../06-change-displayname/change-displayname.md"
},
{
"title": "Lab 7: Instrument browser monitoring",
"description": "Instrumentation for browser monitoring",
- "filename": "../../h-lab-seven-configure-browser-agent/configure-browser-agent.md"
+ "filename": "../../07-configure-browser-agent/configure-browser-agent.md"
},
{
"title": "Lab 8: View traces and spans in APM Trace Explorer",
"description": "View traces and spans in APM Trace Explorer",
- "filename": "../../i-lab-eight-view-traces/view-traces.md"
+ "filename": "../../08-view-traces/view-traces.md"
},
{
"title": "Lab 9: Clean up the workshop environment",
"description": "Clean up the workshop environment",
- "filename": "../../j-lab-nine-cleanup/cleanup.md"
+ "filename": "../../09-cleanup/cleanup.md"
+ },
+ {
+ "title": "Lab 10: Learn more about APM (optional)",
+ "description": "Learn more about APM",
+ "filename": "../../10-learn-more/learn-more.md"
},
{
"title": "Need Help?",
diff --git a/oci-apm-weblogic/workshops/ocw-freetier/index.html b/oci-apm-weblogic/workshops/ocw-freetier/index.html
deleted file mode 100644
index 6acdb69d1..000000000
--- a/oci-apm-weblogic/workshops/ocw-freetier/index.html
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
-
-
-
-
- Oracle LiveLabs
-
-
-
-
-
-
-
-
-
-
-
-
-
Oracle LiveLabs
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/oci-apm-weblogic/workshops/ocw-freetier/manifest.json b/oci-apm-weblogic/workshops/ocw-freetier/manifest.json
deleted file mode 100644
index fa1d65b71..000000000
--- a/oci-apm-weblogic/workshops/ocw-freetier/manifest.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
- "workshoptitle": "Monitoring Traces for WebLogic Server Deployed on Kubernetes",
- "help": "livelabs-help-em_us@oracle.com",
- "tutorials": [
- {
- "title": "Introduction",
- "description": "Introduction",
- "filename": "../../a-introduction/introduction.md"
- },
- {
- "title": "Get Started",
- "description": "This is the prerequisites for customers using Free Trial and Paid tenancies, and Always Free accounts (if applicable). The title of the lab and the Contents Menu title (the title above) match for Prerequisite lab. This lab is always first.",
- "filename": "https://oracle-livelabs.github.io/common/labs/cloud-login/cloud-login.md"
- },
- {
- "title": "Lab 1: Create a Kubernetes cluster",
- "description": "Create a Kubernetes cluster",
- "filename": "../../b-lab-one-create-oke/create-oke.md"
- },
-
- {
- "title": "Lab 2: Create an APM Domain and obtain Data Upload Endpoint and Private Data Key ",
- "description": "Create an APM Domain and obtain Data Upload Endpoint and Private Data Key ",
- "filename": "../../c-lab-two-create-domain/create-domain.md"
- },
- {
- "title": "Lab 3: Deploy a WebLogic application",
- "description": "Deploy a WebLogic application",
- "filename": "../../d-lab-three-build-app/build-app.md"
- },
-
- {
- "title": "Lab 4: Create and configure a file system",
- "description": "Create and configure a file system",
- "filename": "../../e-lab-four-create-file-system/create-file-system.md"
- },
- {
- "title": "Lab 5: Instrument server monitoring",
- "description": "Instrumentation for server monitoring",
- "filename": "../../f-lab-five-configure-apm-agent/configure-apm-agent.md"
- },
- {
- "title": "Lab 6: Change the display name format of spans",
- "description": "Change the display name of spans",
- "filename": "../../g-lab-six-change-displayname/change-displayname.md"
- },
- {
- "title": "Lab 7: Instrument browser monitoring",
- "description": "Instrumentation for browser monitoring",
- "filename": "../../h-lab-seven-configure-browser-agent/configure-browser-agent.md"
- },
- {
- "title": "Lab 8: View traces and spans in APM Trace Explorer",
- "description": "View traces and spans in APM Trace Explorer",
- "filename": "../../i-lab-eight-view-traces/view-traces.md"
- },
- {
- "title": "Lab 9: Clean up the workshop environment",
- "description": "Clean up the workshop environment",
- "filename": "../../j-lab-nine-cleanup/cleanup.md"
- },
- {
- "title": "Lab 10: Learn more about APM (optional)",
- "description": "Learn more about APM",
- "filename": "../../k-learn-more/learn-more.md"
- },
- {
- "title": "Oracle CloudWorld 2022 - Get Help",
- "filename": "https://oracle-livelabs.github.io/common/support/ocwsupportlab/ocwsupportlab.md"
- }
- ]
-}
diff --git a/oci-apm-weblogic/workshops/ocw-livelabs/index.html b/oci-apm-weblogic/workshops/ocw-livelabs/index.html
deleted file mode 100644
index 6acdb69d1..000000000
--- a/oci-apm-weblogic/workshops/ocw-livelabs/index.html
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
-
-
-
-
- Oracle LiveLabs
-
-
-
-
-
-
-
-
-
-
-
-
-
Oracle LiveLabs
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/oci-apm-weblogic/workshops/ocw-livelabs/manifest.json b/oci-apm-weblogic/workshops/ocw-livelabs/manifest.json
deleted file mode 100644
index 2920e2bcf..000000000
--- a/oci-apm-weblogic/workshops/ocw-livelabs/manifest.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
- "workshoptitle": "Monitoring Traces for WebLogic Server Deployed on Kubernetes",
- "help": "livelabs-help-em_us@oracle.com",
- "tutorials": [
- {
- "title": "Introduction",
- "description": "Introduction",
- "filename": "../../a-introduction/introduction.md"
- },
- {
- "title": "Get Started",
- "description": "This is the prerequisites for customers using Free Trial and Paid tenancies, and Always Free accounts (if applicable). The title of the lab and the Contents Menu title (the title above) match for Prerequisite lab. This lab is always first.",
- "filename": "https://oracle-livelabs.github.io/common/labs/cloud-login/cloud-login-livelabs2.md"
- },
- {
- "title": "Lab 1: Create a Kubernetes cluster",
- "description": "Create a Kubernetes cluster",
- "filename": "../../b-lab-one-create-oke/create-oke.md"
- },
-
- {
- "title": "Lab 2: Create an APM Domain and obtain Data Upload Endpoint and Private Data Key ",
- "description": "Create an APM Domain and obtain Data Upload Endpoint and Private Data Key ",
- "filename": "../../c-lab-two-create-domain/create-domain.md"
- },
- {
- "title": "Lab 3: Deploy a WebLogic application",
- "description": "Deploy a WebLogic application",
- "filename": "../../d-lab-three-build-app/build-app.md"
- },
-
- {
- "title": "Lab 4: Create and configure a file system",
- "description": "Create and configure a file system",
- "filename": "../../e-lab-four-create-file-system/create-file-system.md"
- },
- {
- "title": "Lab 5: Instrument server monitoring",
- "description": "Instrumentation for server monitoring",
- "filename": "../../f-lab-five-configure-apm-agent/configure-apm-agent.md"
- },
- {
- "title": "Lab 6: Change the display name format of spans",
- "description": "Change the display name of spans",
- "filename": "../../g-lab-six-change-displayname/change-displayname.md"
- },
- {
- "title": "Lab 7: Instrument browser monitoring",
- "description": "Instrumentation for browser monitoring",
- "filename": "../../h-lab-seven-configure-browser-agent/configure-browser-agent.md"
- },
- {
- "title": "Lab 8: View traces and spans in APM Trace Explorer",
- "description": "View traces and spans in APM Trace Explorer",
- "filename": "../../i-lab-eight-view-traces/view-traces.md"
- },
- {
- "title": "Lab 9: Clean up the workshop environment",
- "description": "Clean up the workshop environment",
- "filename": "../../j-lab-nine-cleanup/cleanup.md"
- },
- {
- "title": "Lab 10: Learn more about APM (optional)",
- "description": "Learn more about APM",
- "filename": "../../k-learn-more/learn-more.md"
- },
- {
- "title": "Oracle CloudWorld 2022 - Get Help",
- "filename": "https://oracle-livelabs.github.io/common/support/ocwsupportlab/ocwsupportlab.md"
- }
- ]
-}
diff --git a/oke-opencost/get-started/get-started.md b/oke-opencost/get-started/get-started.md
new file mode 100644
index 000000000..fd50e382a
--- /dev/null
+++ b/oke-opencost/get-started/get-started.md
@@ -0,0 +1,60 @@
+# Get started
+
+## Introduction
+
+Oracle Cloud is a leading, integrated cloud provider offering services across SaaS, PaaS, and IaaS, with deployment options for public and private environments.
+
+**Estimated Time:** 5 minutes
+
+### Types of Cloud Accounts
+
+1. **Free Tier Accounts**: Details provided in a welcome email after signing up.
+2. **Paid Accounts**: Credentials sent to your company's default administrator, who assigns user access.
+
+### Objectives
+
+- Learn to log in to your Oracle Cloud account.
+
+### Prerequisites
+
+- **Cloud Account Name**: Provided by your administrator or welcome email.
+- **Username**: Your Oracle Cloud user ID.
+- **Password**: Set during account creation.
+
+## Task 1: Signing into Oracle Cloud
+
+Follow these steps to log in if you've signed out:
+
+1. Navigate to [cloud.oracle.com](https://cloud.oracle.com) and enter your **Cloud Account Name** and click **Next**.
+
+ 
+
+2. Select your **Identity Domain** and click **Next**.
+
+ 
+
+ 
+
+3. Enter your Cloud Account credentials:
+
+ - **Username:** Your email address.
+ - **Password:** The one chosen during signup.
+
+ 
+
+4. Complete Multi-factor Authentication (MFA) based on your setup (e.g., approve in the app or enter a code).
+
+ 
+
+ 
+
+ Once verified, you'll access the OCI Console Home Page and can continue your tasks!
+
+ 
+
+You may now proceed to the next lab.
+
+## Acknowledgements
+
+- **Author** - JP Santana, Master Cloud Architect, Oracle
+- **Last Updated By/Date** - JP Santana, November 2024
diff --git a/oke-opencost/get-started/images/sample1.png b/oke-opencost/get-started/images/sample1.png
new file mode 100644
index 000000000..ab4156701
Binary files /dev/null and b/oke-opencost/get-started/images/sample1.png differ
diff --git a/oke-opencost/get-started/images/sample2.png b/oke-opencost/get-started/images/sample2.png
new file mode 100644
index 000000000..4f8287668
Binary files /dev/null and b/oke-opencost/get-started/images/sample2.png differ
diff --git a/oke-opencost/get-started/images/sample3.png b/oke-opencost/get-started/images/sample3.png
new file mode 100644
index 000000000..b0eb7cdcb
Binary files /dev/null and b/oke-opencost/get-started/images/sample3.png differ
diff --git a/oke-opencost/get-started/images/sample4.png b/oke-opencost/get-started/images/sample4.png
new file mode 100644
index 000000000..8774428d9
Binary files /dev/null and b/oke-opencost/get-started/images/sample4.png differ
diff --git a/oke-opencost/get-started/images/sample5.png b/oke-opencost/get-started/images/sample5.png
new file mode 100644
index 000000000..226cde2ce
Binary files /dev/null and b/oke-opencost/get-started/images/sample5.png differ
diff --git a/oke-opencost/get-started/images/sample6.png b/oke-opencost/get-started/images/sample6.png
new file mode 100644
index 000000000..7f8b54b29
Binary files /dev/null and b/oke-opencost/get-started/images/sample6.png differ
diff --git a/oke-opencost/get-started/images/sample7.png b/oke-opencost/get-started/images/sample7.png
new file mode 100644
index 000000000..055871311
Binary files /dev/null and b/oke-opencost/get-started/images/sample7.png differ
diff --git a/oke-opencost/introduction/introduction.md b/oke-opencost/introduction/introduction.md
new file mode 100644
index 000000000..8af576f23
--- /dev/null
+++ b/oke-opencost/introduction/introduction.md
@@ -0,0 +1,44 @@
+# Introduction
+
+## About this Workshop
+
+This workshop will guide you through deploying and configuring **OpenCost** on **Oracle Kubernetes Engine (OKE)** to gain insights into Kubernetes cost management. By participating in this workshop, you'll acquire hands-on experience in setting up OpenCost, configuring it for multi-tenant SaaS environments, and understanding how to monitor and optimize Kubernetes costs effectively.
+
+You'll walk away with the skills to better manage costs for your Kubernetes workloads, making your solutions more efficient and transparent for your organization or customers.
+
+**Estimated Workshop Time:** 1 hour
+
+### Objectives
+
+In this workshop, you will learn how to:
+
+* Provision an Oracle Kubernetes Engine (OKE) cluster
+* Install and configure OpenCost in OKE
+* Visualize and analyze cost data to optimize resource utilization
+
+### Prerequisites
+
+This workshop assumes you have:
+
+* An Oracle Cloud Infrastructure (OCI) account with required permissions
+* Familiarity with basic Kubernetes concepts
+* Access to the OCI Console and CLI configured on your workstation
+
+Ensure the following are set up before beginning the lab:
+
+* An OKE cluster (if not, you will learn to provision one during the workshop)
+* A configured OCI CLI with appropriate authentication
+
+---
+
+## Learn More
+
+* [Oracle Kubernetes Engine Documentation](https://docs.oracle.com/en-us/iaas/Content/ContEng/Concepts/contengoverview.htm)
+* [OpenCost Documentation](https://opencost.io/docs)
+
+You may now proceed to the next lab.
+
+## Acknowledgements
+
+* **Author** - JP Santana, Master Cloud Architect, Oracle
+* **Last Updated By/Date** - JP Santana, November 2024
diff --git a/oke-opencost/provision/images/sample1.png b/oke-opencost/provision/images/sample1.png
new file mode 100644
index 000000000..2f0386678
Binary files /dev/null and b/oke-opencost/provision/images/sample1.png differ
diff --git a/oke-opencost/provision/images/sample10.png b/oke-opencost/provision/images/sample10.png
new file mode 100644
index 000000000..0e118724c
Binary files /dev/null and b/oke-opencost/provision/images/sample10.png differ
diff --git a/oke-opencost/provision/images/sample2.png b/oke-opencost/provision/images/sample2.png
new file mode 100644
index 000000000..e22ad1d56
Binary files /dev/null and b/oke-opencost/provision/images/sample2.png differ
diff --git a/oke-opencost/provision/images/sample3.png b/oke-opencost/provision/images/sample3.png
new file mode 100644
index 000000000..e23624d42
Binary files /dev/null and b/oke-opencost/provision/images/sample3.png differ
diff --git a/oke-opencost/provision/images/sample4.png b/oke-opencost/provision/images/sample4.png
new file mode 100644
index 000000000..705793571
Binary files /dev/null and b/oke-opencost/provision/images/sample4.png differ
diff --git a/oke-opencost/provision/images/sample5.png b/oke-opencost/provision/images/sample5.png
new file mode 100644
index 000000000..140fc0701
Binary files /dev/null and b/oke-opencost/provision/images/sample5.png differ
diff --git a/oke-opencost/provision/images/sample6.png b/oke-opencost/provision/images/sample6.png
new file mode 100644
index 000000000..8fff0868c
Binary files /dev/null and b/oke-opencost/provision/images/sample6.png differ
diff --git a/oke-opencost/provision/images/sample7.png b/oke-opencost/provision/images/sample7.png
new file mode 100644
index 000000000..3913c3c21
Binary files /dev/null and b/oke-opencost/provision/images/sample7.png differ
diff --git a/oke-opencost/provision/images/sample8.png b/oke-opencost/provision/images/sample8.png
new file mode 100644
index 000000000..31a44df58
Binary files /dev/null and b/oke-opencost/provision/images/sample8.png differ
diff --git a/oke-opencost/provision/images/sample9.png b/oke-opencost/provision/images/sample9.png
new file mode 100644
index 000000000..5c17fbaf8
Binary files /dev/null and b/oke-opencost/provision/images/sample9.png differ
diff --git a/oke-opencost/provision/provision.md b/oke-opencost/provision/provision.md
new file mode 100644
index 000000000..384960c2c
--- /dev/null
+++ b/oke-opencost/provision/provision.md
@@ -0,0 +1,87 @@
+# Provision Oracle Container Engine for Kubernetes (OKE) cluster
+
+## Introduction
+
+A Kubernetes cluster consists of master and worker nodes running applications. It can be divided into namespaces for resource management. This lab demonstrates how to create a Kubernetes cluster
+
+**Estimated Time**: 45 minutes
+
+### Objectives
+
+- Create a Kubernetes Cluster
+
+### Prerequisites
+
+- OCI CLI installed
+- Basic understanding of Kubernetes
+
+## Task 1: Create Kubernetes Cluster
+
+1. From the OCI Services menu, click **Developer Services > Kubernetes Clusters (OKE)**.
+
+ 
+
+2. Under **List Scope**, select the compartment in which you would like to create a cluster. Click **Create Cluster**.
+
+ 
+
+3. Choose **Quick Create** and click **Submit**.
+
+ 
+
+4. Fill out the dialog box:
+
+ **Name**: Provide a name (oke-cluster in this example)
+
+ **Compartment**: Choose your compartment
+
+ **Kubernetes Version**: Choose the most recent version
+
+ **Kubernetes API Endpoint**: Public Endpoint
+
+ **Kubernetes Worker Nodes**: Private Workers
+
+ **Shape**: VM.Standard.E5.Flex
+
+ **Number of Nodes**: 1
+
+5. Click **Next**.
+
+ 
+
+6. Click **Create Cluster**.
+
+ 
+
+ 
+
+## Task 2: Set Up Cloud Shell Access to Your Cluster
+
+This section explains how to set up Cloud Shell to access and interact with your Kubernetes cluster. The Oracle Cloud Shell includes pre-installed tools like `kubectl`, `helm` and the OCI CLI, streamlining the configuration process.
+
+1. Open Cloud Shell by clicking its icon in the top-right corner of the Oracle Cloud Console.
+
+ 
+
+2. In the OKE console, click your cluster name. Then, click **Access Clusters** and select **Cloud Shell Access**. Copy the displayed command and paste it into Cloud Shell to run.
+
+ 
+
+ 
+
+3. To test access to your cluster, list the worker nodes using the following command:
+
+ ```bash
+
+ kubectl get nodes
+
+ ```
+
+ 
+
+You may now proceed to the next lab.
+
+## Acknowledgements
+
+- **Author** - JP Santana, Master Cloud Architect, Oracle
+- **Last Updated By/Date** - JP Santana, November 2024
diff --git a/oke-opencost/setup/files/opencost-nsg-rule.json b/oke-opencost/setup/files/opencost-nsg-rule.json
new file mode 100644
index 000000000..70d61b316
--- /dev/null
+++ b/oke-opencost/setup/files/opencost-nsg-rule.json
@@ -0,0 +1,16 @@
+{
+ "securityRules": [
+ {
+ "direction": "INGRESS",
+ "protocol": "6",
+ "source": "0.0.0.0/0",
+ "destination": "0.0.0.0/0",
+ "tcpOptions": {
+ "destinationPortRange": {
+ "min": 9090,
+ "max": 9090
+ }
+ }
+ }
+ ]
+}
diff --git a/oke-opencost/setup/images/sample1.jpg b/oke-opencost/setup/images/sample1.jpg
new file mode 100644
index 000000000..8341aeb05
Binary files /dev/null and b/oke-opencost/setup/images/sample1.jpg differ
diff --git a/oke-opencost/setup/images/sample2.jpg b/oke-opencost/setup/images/sample2.jpg
new file mode 100644
index 000000000..874c6c8e7
Binary files /dev/null and b/oke-opencost/setup/images/sample2.jpg differ
diff --git a/oke-opencost/setup/images/sample3.jpg b/oke-opencost/setup/images/sample3.jpg
new file mode 100644
index 000000000..874c6c8e7
Binary files /dev/null and b/oke-opencost/setup/images/sample3.jpg differ
diff --git a/oke-opencost/setup/setup.md b/oke-opencost/setup/setup.md
new file mode 100644
index 000000000..a52df2e61
--- /dev/null
+++ b/oke-opencost/setup/setup.md
@@ -0,0 +1,109 @@
+# Setup OpenCost on your OKE cluster
+
+## Introduction
+
+In this lab, you will set up OpenCost on your Oracle Kubernetes Engine (OKE) cluster to track and manage costs for Kubernetes workloads. You'll install the necessary components, and deploy OpenCost to monitor cost allocation.
+
+Estimated Lab Time: 20 minutes
+
+### Objectives
+
+In this lab, you will:
+
+* Deploy OpenCost on your OKE cluster.
+* Configure external access to your OpenCost environment.
+
+### Prerequisites
+
+This lab assumes you have:
+* An Oracle Cloud account.
+* An OKE active cluster. All these steps are described in the previous labs.
+
+## Task 1: Install Prometheus
+
+1. Install Prometheus via Helm by running the following command:
+
+ ```bash
+
+ helm install prometheus --repo https://prometheus-community.github.io/helm-charts prometheus \
+ --namespace prometheus-system --create-namespace \
+ --set prometheus-pushgateway.enabled=false \
+ --set alertmanager.enabled=false \
+ -f https://raw.githubusercontent.com/opencost/opencost/develop/kubernetes/prometheus/extraScrapeConfigs.yaml
+
+ ```
+
+## Task 2: Install OpenCost on Your OKE Cluster
+
+1. Create the OpenCost namespace for your installation.
+
+ ```bash
+
+ kubectl create namespace opencost
+
+ ```
+
+2. Install OpenCost into the OpenCost namespace.
+
+ ```bash
+
+ helm install opencost --repo https://opencost.github.io/opencost-helm-chart opencost --namespace opencost
+
+ ```
+
+3. Update OpenCost.
+
+ ```bash
+
+ helm upgrade opencost --repo https://opencost.github.io/opencost-helm-chart opencost --namespace opencost
+
+ ```
+
+4. Update the service so that an external IP address is assigned to the OCI Load Balancer.
+
+ ```bash
+
+ kubectl patch svc opencost -n opencost -p '{"spec": {"type": "LoadBalancer"}}'
+
+ ```
+
+ To access OpenCost publicly, we need to create a Network Security Group (NSG), configure an ingress rule to open the required port, and associate it with the OCI Load Balancer.
+
+5. Create the Network Security Group (NSG). Be sure to replace `YOUR_COMPARTMENT_ID` with your actual compartment ID and `YOUR_VCN_ID` with your VCN ID. You can retrieve this information from the OCI Console.
+
+ ```bash
+
+ oci network nsg create --compartment-id [YOUR_COMPARTMENT_ID] --vcn-id [YOUR_VCN_ID] --display-name opencost_nsg
+
+ ```
+
+6. Create an ingress rule that allows TCP traffic on port `9090` from the internet. You can download the `opencost-nsg-rule.json` file from here: [opencost-nsg-rule.json](./files/opencost-nsg-rule.json).
+
+ ```bash
+
+ oci network nsg rules add --nsg-id [YOUR_NSG_ID] --from-json file://opencost-nsg-rule.json
+
+ ```
+
+7. Attach the newly created Network Security Group (NSG) to the OCI Load Balancer. Replace `YOUR_LB_ID` with your load balancer ID and `YOUR_NSG_ID` with your Network Security Group ID.
+
+ ```bash
+
+ oci lb nsg update --load-balancer-id [YOUR_LB_ID] --nsg-ids '[ "[YOUR_NSG_ID]" ]'
+
+ ```
+
+ 
+
+9. Retrieve the external IP address and use it to access OpenCost using your web browser. Run the `kubectl get svc -n opencost` command.
+
+ 
+
+## Learn More
+
+To get familiar with the OpenCost UI see [Video: See How OpenCost Tracks Your Kubernetes Costs and Cloud Billing](https://youtu.be/lCP4Ci9Kcdg).
+
+## Acknowledgements
+
+* **Author** - JP Santana, Master Cloud Architect, Oracle
+* **Last Updated By/Date** - JP Santana, November 2024
diff --git a/oke-opencost/use/images/sample1.png b/oke-opencost/use/images/sample1.png
new file mode 100644
index 000000000..9eb85d38b
Binary files /dev/null and b/oke-opencost/use/images/sample1.png differ
diff --git a/oke-opencost/use/images/sample10.png b/oke-opencost/use/images/sample10.png
new file mode 100644
index 000000000..caeca960f
Binary files /dev/null and b/oke-opencost/use/images/sample10.png differ
diff --git a/oke-opencost/use/images/sample11.png b/oke-opencost/use/images/sample11.png
new file mode 100644
index 000000000..bcb629c96
Binary files /dev/null and b/oke-opencost/use/images/sample11.png differ
diff --git a/oke-opencost/use/images/sample2.png b/oke-opencost/use/images/sample2.png
new file mode 100644
index 000000000..11a445f05
Binary files /dev/null and b/oke-opencost/use/images/sample2.png differ
diff --git a/oke-opencost/use/images/sample3.png b/oke-opencost/use/images/sample3.png
new file mode 100644
index 000000000..03f92f810
Binary files /dev/null and b/oke-opencost/use/images/sample3.png differ
diff --git a/oke-opencost/use/images/sample4.png b/oke-opencost/use/images/sample4.png
new file mode 100644
index 000000000..57917af15
Binary files /dev/null and b/oke-opencost/use/images/sample4.png differ
diff --git a/oke-opencost/use/images/sample5.png b/oke-opencost/use/images/sample5.png
new file mode 100644
index 000000000..7a14abfd2
Binary files /dev/null and b/oke-opencost/use/images/sample5.png differ
diff --git a/oke-opencost/use/images/sample6.png b/oke-opencost/use/images/sample6.png
new file mode 100644
index 000000000..6ed27deab
Binary files /dev/null and b/oke-opencost/use/images/sample6.png differ
diff --git a/oke-opencost/use/images/sample7.png b/oke-opencost/use/images/sample7.png
new file mode 100644
index 000000000..c49026b0b
Binary files /dev/null and b/oke-opencost/use/images/sample7.png differ
diff --git a/oke-opencost/use/images/sample8.png b/oke-opencost/use/images/sample8.png
new file mode 100644
index 000000000..27a9896bf
Binary files /dev/null and b/oke-opencost/use/images/sample8.png differ
diff --git a/oke-opencost/use/images/sample9.png b/oke-opencost/use/images/sample9.png
new file mode 100644
index 000000000..d2c747d7e
Binary files /dev/null and b/oke-opencost/use/images/sample9.png differ
diff --git a/oke-opencost/use/use.md b/oke-opencost/use/use.md
new file mode 100644
index 000000000..69577ef43
--- /dev/null
+++ b/oke-opencost/use/use.md
@@ -0,0 +1,85 @@
+# Use OpenCost to explore your Kubernetes costs
+
+## Introduction
+
+Discover how to use OpenCost for detailed insights into your Kubernetes cluster's cost structure. OpenCost offers visibility into resource usage and spending across Kubernetes resources such as namespaces, nodes, deployments, and others. This enables accurate analysis and optimized resource allocation. Dive in to better manage and control your Kubernetes costs!
+
+Estimated Lab Time: 20 minutes
+
+### Objectives
+
+In this lab, you will:
+
+* Utilize OpenCost to analyze Kubernetes costs across various resources.
+* Identify areas for cost optimization within your Kubernetes environment.
+* View costs broken down per customer to assess and enhance cost-efficiency for each.
+
+### Prerequisites
+
+Before starting this lab, ensure that you have completed all previous parts of the workshop.
+
+## Task 1: Access OpenCost
+
+1. From the OCI Console, navigate to **Networking > Load Balancers**.
+
+ 
+
+2. Find the Load Balancer created for OpenCost and click on it.
+
+3. Copy the **Public IP Address** of the Load Balancer.
+
+ 
+
+4. Open a new browser tab and enter the following URL: `http://:9090`.
+
+ 
+
+5. This will take you to the OpenCost dashboard, where you can explore your Kubernetes costs.
+
+## Task 2: Exploring Kubernetes Costs in OpenCost
+
+1. In the OpenCost UI, you will see an overview of your Kubernetes cluster's cost data.
+2. Use the various filters and options available to break down the costs by Kubernetes resources, such as namespaces, nodes, deployments, and more.
+
+ 
+
+3. Filter the costs by time ranges to analyze cost trends over specific periods.
+
+ 
+
+4. Identify idle resources that are driving up costs and optimize your workloads by adjusting pod resource requests and limits for greater cost-efficiency.
+
+ 
+
+5. Identify cost patterns and explore areas for potential cost optimization across your cluster. For example, focus on the "Efficiency" column to review the cost breakdown per customer and assess resource utilization efficiency.
+
+ 
+
+## Task 3: Delete the Resources
+
+1. To navigate back to your OCI Console window, click **Developer Services** > **Kubernetes Clusters (OKE)**.
+
+ 
+
+2. Navigate to your cluster. Click the action icon and **Delete** and click **Delete** in the confirmation window.
+
+ 
+
+3. From OCI services menu Click **Virtual Cloud Networks** under Networking, list of all VCNs will appear.
+
+ 
+
+4. Locate your VCN , click the action icon and then **Terminate**. Click **Terminate All** in the Confirmation window. Click **Close** once VCN is deleted.
+
+ 
+
+**Congratulations! You have successfully completed the lab.**
+
+## Learn More
+
+To get familiar with the OpenCost UI see [Video: See How OpenCost Tracks Your Kubernetes Costs and Cloud Billing](https://youtu.be/lCP4Ci9Kcdg).
+
+## Acknowledgements
+
+* **Author** - JP Santana, Master Cloud Architect, Oracle
+* **Last Updated By/Date** - JP Santana, November 2024
diff --git a/oci-apm-getstarted/workshops/ocw23-sandbox/index.html b/oke-opencost/workshops/tenancy/index.html
similarity index 100%
rename from oci-apm-getstarted/workshops/ocw23-sandbox/index.html
rename to oke-opencost/workshops/tenancy/index.html
diff --git a/oke-opencost/workshops/tenancy/manifest.json b/oke-opencost/workshops/tenancy/manifest.json
new file mode 100644
index 000000000..367523c42
--- /dev/null
+++ b/oke-opencost/workshops/tenancy/manifest.json
@@ -0,0 +1,30 @@
+{
+ "workshoptitle": "Optimize Oracle Kubernetes Engine (OKE) costs with OpenCost",
+ "help": "livelabs-help-**enterarea**_us@oracle.com",
+ "tutorials": [
+ {
+ "title": "Introduction",
+ "filename": "../../introduction/introduction.md"
+ },
+ {
+ "title": "Get started",
+ "filename": "../../get-started/get-started.md"
+ },
+ {
+ "title": "Lab 1: Provision Oracle Container Engine for Kubernetes (OKE) cluster",
+ "filename": "../../provision/provision.md"
+ },
+ {
+ "title": "Lab 2: Setup OpenCost on your OKE cluster",
+ "filename": "../../setup/setup.md"
+ },
+ {
+ "title": "Lab 3: Use OpenCost to explore your Kubernetes costs",
+ "filename": "../../use/use.md"
+ },
+ {
+ "title": "Need help?",
+ "filename":"https://oracle-livelabs.github.io/common/labs/need-help/need-help-freetier.md"
+ }
+ ]
+}