WMS ID 11191 - Quarterly Review completed

oci-apm-springboot/a-introduction/introduction.md → oci-apm-springboot/00-introduction/introduction.md

@@ -1,52 +1,46 @@
 # Introduction
 
-## About this Workshop
-
+## 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.
+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.
 
-![Workshop app architecture](images/apm_microservices_setup.png " ")
+Estimated Time: 45 minutes
 
-Estimated Time: 75 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.
 
   ![APM architecture](images/apm_diagram.png " ")
 
-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.
+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 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.
+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.
 
->**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
+*	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.

+* 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.
 
+*	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
 
@@ -59,4 +53,4 @@ If you are running the workshop in a Paid Cloud Account, ensure you have the per
 - **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
+- **Last Updated By/Date** - Yutaka Takatsu, November, 2024

oci-apm-springboot/b-lab-one-create-oke/create-oke.md → oci-apm-springboot/01-create-oke/create-oke.md

@@ -41,28 +41,28 @@ Watch the video below for a quick walk-through of the lab.
 
 2. Make sure the **apmworkshop** is selected in the Compartment field, then click **Create cluster**
 
-   ![Oracle Cloud console, Clusters in Compartment](images/1-2-OKE.png " ")
+   ![Oracle Cloud console, Clusters in Compartment](images/1-2-oke.png " ")
 
 3. Quick Create pane is pre-selected. Keep the default selection and click **Submit**.
 
-   ![Oracle Cloud console, Create cluster](images/1-3-OKE.png " ")
+   ![Oracle Cloud console, Create cluster](images/1-3-oke.png " ")
 
 4. Name the cluster as **apmlab-cluser1**. Accept the default setting for other fields and click **Next**.
 
-   ![Oracle Cloud console, Create cluster](images/1-4-OKE.png " ")
-   ![Oracle Cloud console, Create cluster](images/1-5-OKE.png " ")
+   ![Oracle Cloud console, Create cluster](images/1-4-oke.png " ")
+   ![Oracle Cloud console, Create cluster](images/1-5-oke.png " ")
 
 5. Review the configuration, and click **Create cluster**.
 
-   ![Oracle Cloud console, Create cluster](images/1-6-OKE.png " ")
+   ![Oracle Cloud console, Create cluster](images/1-6-oke.png " ")
 
 6. Make sure all verification steps are cleared. Click **Close**.
 
-   ![Oracle Cloud console, Create cluster](images/1-7-OKE.png " ")
+   ![Oracle Cloud console, Create cluster](images/1-7-oke.png " ")
 
 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.
 
-   ![Oracle Cloud console, Create cluster](images/1-8-OKE.png " ")
+   ![Oracle Cloud console, Create cluster](images/1-8-oke.png " ")
 
 
 
@@ -75,4 +75,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, November, 2024

oci-apm-springboot/c-lab-two-create-domain/create-domain.md → oci-apm-springboot/02-create-domain/create-domain.md

@@ -25,10 +25,10 @@ Watch the video below for a quick walk-through of the lab.
 1.	From the OCI menu, select **Observability & Management**, then **Administration**.
 	![Oracle Cloud console Menu](images/2-1-domain.png " ")
 
-2. Select the **apmworkshop** compartment from the pulldown menu.
+2. Select the **apmworkshop** compartment from the pulldown menu. Then click **Create APM Domain**.
 	![Oracle Cloud console Menu](images/2-1-2-domain.png " ")
-3.	Click **Create APM Domain**.
-  ![Oracle Cloud console, Create APM Domain](images/2-2-domain.png " ")
+
+
 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**.
   ![Oracle Cloud console, Create APM Domain](images/2-3-domain.png " ")
 
@@ -71,4 +71,4 @@ You may now **proceed to the next lab**.
 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, November, 2024

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)**.
+
+   ![Oracle Cloud console, Cluster details](images/1-1-menu.png " ")
+
+2. Click the **apmlab-cluser1** link from the table.
+
+   ![Oracle Cloud console, Navigation Menu](images/1-2-menu.png " ")
+
+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).
+
+   ![Oracle Cloud console, Cluster details](images/1-9-oke.png " ")
+
+## Task 2: Access the OKE in the Oracle Cloud shell
+
+
+1. Click **Access Cluster** on the cluster details page.
+
+  ![Oracle Cloud console, Cluster details](images/2-1-oke.png " ")
+
+2. Make sure the **Cloud Shell Access** is selected. Click the **Copy** link from the command to access kubeconfig for the cluster.
+
+  ![Oracle Cloud console, Cluster details](images/2-2-oke.png " ")
+
+3. Then click **Launch Cloud Shell**.
+
+  ![Oracle Cloud console, Cluster details](images/2-2-2-oke.png " ")
+
+4. Oracle Cloud Shell window opens at the lower side of the browser screen.
+
+  ![Oracle Cloud console, Cluster details](images/2-3-oke.png " ")
+
+5. Paste the copied command to the command shell prompt. Then hit enter.   
+
+  ![Oracle Cloud console, Cluster details](images/2-4-oke.png " ")
+
+  >**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
+    <copy>
+    mkdir ~/sb-hol;cd ~/sb-hol
+    </copy>
+    ```
+
+      ![Oracle Cloud console, Cloud Shell](images/3-1-mkdir.png " ")
+
+2. Use text editor (such as the vi editor tool) to create a configuration file within the directory.
+
+    ``` bash
+    <copy>
+    vi wstore.yaml
+    </copy>
+    ```
+      ![Oracle Cloud console, Cloud Shell](images/3-2-wstore.png " ")
+
+      >**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
+    <copy>
+    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
+
+    </copy>
+    ```
+      ![Oracle Cloud console, Cloud Shell](images/3-3-wstore-content.png " ")
+
+      >**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
+    <copy>
+    kubectl apply -f ~/sb-hol/wstore.yaml
+    </copy>
+    ```
+
+  Verify the 2 services and 2 stateful sets are created.
+
+    ![Oracle Cloud console, Cloud Shell](images/4-1-apply.png " ")
+
+
+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
+    <copy>
+    kubectl get pods
+    </copy>
+    ```
+
+   ![Oracle Cloud console, Cloud Shell](images/4-2-pods.png " ")
+
+3. Run the kubectl command below to display the deployed services.
+
+    ``` bash
+    <copy>
+    kubectl get svc
+    </copy>
+    ```
+
+4. Copy the External IP of the wstore-frontend service
+
+    ![Oracle Cloud console, Cloud Shell](images/4-3-svc.png " ")
+
+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
+    <copy>
+    http://<IP of the wstore-frontend service>/winestore/
+    </copy>
+    ```
+   ![Oracle Cloud console, Cloud Shell](images/4-4-app.png " ")
+
+    >**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