Merge remote-tracking branch 'upstream/main'

ahf/ahf-Insights/ahf-commands/common-ocw.md

@@ -206,11 +206,22 @@ The Insights report will bring all this information in to a dynamic html report
 6.  Run the Real time Database top consumer monitor 'oratop'  
     oratop gathers wait and usage metrics from the database and displays them by top session similar to the 'O/S' top command.
     > Note: hit the 'h' key to get help on the various options  
-    >       hit q to either exit the help or monitor itself when not in help.
+
+    >       hit 'q' to either exit the help or monitor itself when not in help.
+
 
     ```
     tfactl oratop -database <your database name>>
     ```
+    
+    You can use the **srvctl** command to get your database name if you do not have it handy as there is only one database configured.
+
+    ```
+    <copy>
+    tfactl oratop -database `srvctl config database`
+    </copy>
+    ```
+
     Example Command Output:
     ![Oratop Screenshot](./images/oratop-1.png =50%x*)
         

ahf/ahf-Insights/ahf-commands/diagcollect.md

@@ -121,7 +121,7 @@ All collections are copied back to the initiating node ready for analysis or upl
     > Note: You would be uploading the *.zip* files to Oracle Support when you have to raise a Support Request for the Incidents  
 
 
-## Task 4: Understand Manual Diagnostic Collections for a specific incident type
+## Task 3: Understand Manual Diagnostic Collections for a specific incident type
 ![Manual Diagnostic Collections](./images/manual_collect.png =40%x*)
 AHF has manual collections for :-
 - When customers do not want Automatic Collections enabled.
@@ -142,7 +142,7 @@ the incident type.
 In the slide above you can see the comparison of collecting performance diagnostics through a command list and running the `tfactl diagcollect -srdc dbperf` command.
 
 
-## Task 5: Understand Manual Diagnostic Collections with the problem chooser
+## Task 4: Understand Manual Diagnostic Collections with the problem chooser
 ![Problem Choose Diagnostic Collections](./images/problem_choose.png =40%x*)
 
 Before the problem chooser, running a default AHF diagnostic Collection would mean that default collection collection would be taken.  
@@ -161,7 +161,7 @@ You will be prompted to choose:-
 > If you choose the last option we have to collect everything in the hope we get what you want.
 
 
-## Task 6:  Generate a manual collection using problem chooser
+## Task 5:  Generate a manual collection using problem chooser
 1.  Simply run the `tfactl diagcollect` command and let the problem chhoser guide you.
 ```
 <copy>

ahf/ahf-Insights/ahf-commands/insights.md

@@ -21,7 +21,7 @@ Estimated Lab Time: 5 Minutes
 
 ### Prerequisites
 - You are connected to one of the DB System Nodes as described in Lab 1: Connect to your DB System
-- You have performed the tasks to generate some incidents as described in Lab 5: Generate Database and Clusterware Incidents for AHF to Detect and take Action on
+- You have performed the tasks to generate some incidents as described in Lab 2: Generate some Incidents in RAC Database
 
 
 ## Task 1:  Generate an AHF Insights report

ahf/ahf-Insights/ahf-reports/insightsreports.md

@@ -38,15 +38,20 @@ Diagnostic dimensions include :
 ## Task 1:  Download AHF Insights report to review System Topology
 1.  Download AHF Insights report zip file.
 
+    Paste the following URL in to your browser of choice to download to you local system
+
     ```
-    wget https://objectstorage.us-ashburn-1.oraclecloud.com/p/1fl26UQZiAjg7vCEP9K0kMJ3bhpdc-cQTWKYl9g08VJMCXZr0pi46xQgUxfe2VBx/n/idhbogog2wy7/b/ocw24-livelabs/o/node1_insights_2024_07_10_23_30_54_system_topology.zip
+    <copy>
+    https://objectstorage.us-ashburn-1.oraclecloud.com/p/1fl26UQZiAjg7vCEP9K0kMJ3bhpdc-cQTWKYl9g08VJMCXZr0pi46xQgUxfe2VBx/n/idhbogog2wy7/b/ocw24-livelabs/o/node1_insights_2024_07_10_23_30_54_system_topology.zip
+    </copy>
     ```
+2. Navigate to the Download location for you browser
 
-2.  Extract AHF Insights report zip file.
+3.  Extract AHF Insights report zip file.
 
 ![](./images/Task-1-point-2.png " ")
 
-3.  Open index.html file on a browser.
+4.  Open index.html file on a browser.
 
 ## Task 2:  Review parts of AHF Insights report
 
@@ -139,15 +144,20 @@ Diagnostic dimensions include :
 
 1.  Download AHF Insights report zip file.
 
+    Paste the following URL in to your browser of choice to download to you local system
+
     ```
-    wget https://objectstorage.us-ashburn-1.oraclecloud.com/p/JHSkKXru-WkrhAJj668oXGDLHGncTtuK1_EF40kilttwxMPHg6pDuGXe1CPujYDe/n/idhbogog2wy7/b/ocw24-livelabs/o/node1_insights_2024_05_02_20_44_11_insights.zip
+    <copy>
+    https://objectstorage.us-ashburn-1.oraclecloud.com/p/JHSkKXru-WkrhAJj668oXGDLHGncTtuK1_EF40kilttwxMPHg6pDuGXe1CPujYDe/n/idhbogog2wy7/b/ocw24-livelabs/o/node1_insights_2024_05_02_20_44_11_insights.zip
+    </copy>
     ```
+2.  Navigate to the Download location for you browser
 
-2.  Extract AHF Insights report zip file.
+3.  Extract AHF Insights report zip file.
 
 ![](./images/Task-8-point-2.png " ")
 
-3.  Open index.html file on a browser.
+4.  Open index.html file on a browser.
 
 ## Task 9:  Review *Timeline Section* in Insights
 

ahf/ahf-Insights/ahf-upgrade/check-ahf.md

@@ -11,7 +11,9 @@ Estimated Time: 5 minutes
 ### Objectives
 
 In this lab, you will:
-* Determine the location of the AHF install.proerties file
+
+* Connect to one RAC instance with IP address from 'Get Started with LiveLabs' Lab
+* Determine the location of the AHF install.properties file
 * Use this file to review the various code and data locations
 * Check that the AHF processes are running
 * Confirm the health of AHF on the System 
@@ -20,10 +22,34 @@ In this lab, you will:
 - You are connected to one of the DB System Nodes as described in **Get Started with LiveLabs**
 - You are logged in as the **root user**
 
-## Task 1: Determine the location of the AHF Installation
-AHF writes it's Software base location to */etc/oracle.ahf.loc* on Linux and Unix systems.
+## Task 1: Connect to a Database system node and determine the location of the AHF Installation
+
+1. 	If you are not already connected to one of you Database Sytem nodes. 
+	Using one of your Public IP addresses, enter the command below to login as the *opc* user and verify connection to your nodes.
+
+    ```
+    <copy>
+    ssh -i id_rsa_livelabs opc@<Your Node IP Address>
+    </copy>
+    ```
+
+   When prompted, answer **yes** to continue connecting.
+
+>Note: You only need to connect to one Node for Labs 1 to 5 in this workshop
 
-1.	Check the contents of the `/etc/oracle.ahf.loc` file 
+2.  If you are not the **root** user then change to the **root** user from the **opc** user
+
+     ```
+     <copy>
+      sudo su - 
+      </copy>
+     ```
+
+3.	Determine the location of AHF software.
+
+	AHF writes it's Software base location to */etc/oracle.ahf.loc* on Linux and Unix systems.
+
+	Check the contents of the `/etc/oracle.ahf.loc` file 
 	```
 	<copy>
 	cat /etc/oracle.ahf.loc
@@ -34,7 +60,8 @@ AHF writes it's Software base location to */etc/oracle.ahf.loc* on Linux and Uni
 	/u01/app/oracle.ahf
 	</pre> 
 
-2.	Use this location to check the contents of the AHF install.properties file
+4.	Use this location to check the contents of the AHF install.properties file
+
 	```
 	<copy>
 	cat /u01/app/oracle.ahf/install.properties

ahf/ahf-Insights/ahf-upgrade/upgrade-ahf.md

@@ -25,7 +25,9 @@ You will now learn how to upgrade AHF after downloading *ahf_setup*
 You must complete on both nodes of the RAC Database Cluster.
 >Note: To save time you can do all the steps in parallel on each node.
 
-1.	Download the new AHF installer from OCI Object Storage to each of the 2 nodes
+
+1.	Download the new AHF installer from OCI Object Storage on one node.
+
 	As the root user download the new AHF Installer using **wget**
 	```
 	<copy>
@@ -90,7 +92,7 @@ You must complete on both nodes of the RAC Database Cluster.
 	Moving /tmp/ahf_install_246100_53236_2024_07_11-03_45_55.log to /u01/app/oracle.ahf/data/lldbcs61/diag/ahf
 	</pre>
 
-
+Repeat Step 1 to 3 on the second node, if you were not doing these steps in parallel.
 
 4.	Confirm AHF 24.6.1 is now running on both nodes.
 

ahf/setup/setup-compute-livelabs-ocw.md

@@ -12,15 +12,14 @@ Estimated Time: 5 minutes
 
 -   View login information to LiveLabs Sandbox
 -   Identify DB Server Public IP Addresses
--   Connect to the each RAC instance:  Node 1 and Node 2
 
 ### Prerequisites
 
 * Requested a Green Button environment with:-
   - An assigned Oracle LiveLabs Cloud account
   - An assigned compartment
-  - An assigned Database Cluster Password
-  - Lab: Download SSH Keys
+  - An Assigned OCI username
+  - An assigned OCI Password
 
 ## Task 1: Log in to the Oracle Cloud Console
 
@@ -70,71 +69,10 @@ You should already be logged in to the OCI console from Task 1.
 
   ![Confirm node IP Addresses](./images/setup-compute-4.png " ")
 
-6. Now that you have your IP address select the method of connecting. Choose the environment where you created your ssh-key in the previous lab (Generate SSH Keys) and select one of the following steps. If you choose to use Oracle Cloud Shell, you will need to copy your SSH Private to the cloud shell and set the proper permissions, otherwise, choose the platform that matches your local environment.
+6. Now that you have the IP Addresses for your cluster nodes you will need to get the SSH keys to connect to those Nodes.
+
+   Follow the instructions in Task 1.  **'Oracle Cloud Shell'** in [Your LiveLabs SSH Key Lab](#next)
 
-## Task 3: Connect using Oracle Cloud Shell
-
-1.  To start the Oracle Cloud Shell, go to your Cloud console and click the Cloud Shell icon at the top right of the page.
-
-    ![CloudShell initialising](https://oracle-livelabs.github.io/common/images/console/cloud-shell.png " ")
-
-    ![CloudShell opened](https://oracle-livelabs.github.io/common/images/console/cloud-shell-open.png " ")
-
-2.  Click on the Cloud Shell hamburger icon and select **Upload** to upload your private key
-
-    ![Upload Private Key to CloudShell](https://oracle-livelabs.github.io/common//labs/generate-ssh-key-cloud-shell/images/upload-key.png " ")
-
-3.  To connect to the compute instance that was created for you, you will need to load your private key.  This is the key that does *not* have a .pub file at the end.  Locate that file on your machine and click **Upload** to process it.
-
-    ![Upload Private Key to CloudShell](https://oracle-livelabs.github.io/common//labs/generate-ssh-key-cloud-shell/images/upload-key-select.png " ")
-
-4. Be patient while the key file uploads to your Cloud Shell directory
-    ![Uploading Private Key to CloudShell](https://oracle-livelabs.github.io/common//labs/generate-ssh-key-cloud-shell/images/upload-key-select-2.png " ")
-
-    ![Uploaded Private Key to CloudShell](https://oracle-livelabs.github.io/common//labs/generate-ssh-key-cloud-shell/images/upload-key-select-3.png " ")
-
-5. Once finished run the command below to check to see if your ssh key was uploaded.  Move it into your .ssh directory, and change the permissions on the file.
-
-    ```nohighlight
-    <copy>
-    ls
-    </copy>
-    ```
-    ```nohighlight
-    <copy>
-    mkdir ~/.ssh
-    mv id_rsa ~/.ssh
-    chmod 600 ~/.ssh/id_rsa
-    ls ~/.ssh
-    cd ~
-    </copy>
-    ```
-
-    ![Set permissions on private key](https://oracle-livelabs.github.io/common//labs/generate-ssh-key-cloud-shell/images/upload-key-finished.png " ")
-
-6.  Using one of the Public IP addresses, enter the command below to login as the *opc* user and verify connection to your nodes.
-
-    ```nohighlight
-    <copy>
-    ssh -i ~/.ssh/id_rsa opc@<Your Node Public IP Address>
-    </copy>
-    ```
-    ![SSH to node-1](./images/em-mac-linux-ssh-login.png " ")
-
-   When prompted, answer **yes** to continue connecting.
-
->Note: You only need to connect to one Node for Labs 1 to 5 in this workshop
-
-8.  Change to the **root** user from the **opc** user
-     
-     ```
-     <copy>
-      sudo su - 
-      </copy>
-     ```
-
-
-You may now [proceed to the next lab](#next).
 
 
 ## Acknowledgements

ahf/workshops/ocw24/manifest.json

@@ -12,6 +12,11 @@
             "description": "Getting you connected with your LiveLabs Sandbox Environment",
             "filename": "../../setup/setup-compute-livelabs-ocw.md"
         },
+        {
+            "title": "Your LiveLabs SSH Key",
+            "description": "How to use LiveLabs' SSH Keys",
+            "filename": "https://oracle-livelabs.github.io/common/labs/livelabs-ssh/livelabs-ssh.md"
+        } ,
         {
             "title": "Lab 1: Check AHF Installation on your System",
             "description": "This lab walks you through checking that AHF is installed and healthy on your system.",