From 71b09db206a6dc8982bae1f5691d7e6517c6b412 Mon Sep 17 00:00:00 2001 From: Kevin Lazarz Date: Fri, 15 Mar 2024 04:18:08 +0100 Subject: [PATCH 1/2] Patch PAR URLs pts repository (#108) * WMS 5241: Fix OCW manifest WMS 5241: Fix OCW manifest * Patch PAR URLs pts repository Patch PAR URLs pts repository --- .../database-backup-services.md | 24 ++++++++--------- .../setup-environment/setup-environment.md | 2 +- hybrid-adg/test-with-adg/test-with-adg.md | 12 ++++----- .../install-application-migrate-database.md | 6 ++--- .../test-with-adg/test-with-adg.md | 12 ++++----- .../python/python.md | 2 +- sample-workshop/tables/tables.md | 26 +++++++++---------- .../deploy-demo-app/deploy-demo-app.md | 2 +- .../setup-environment/setup-environment.md | 2 +- sharding/migrate-to-sdb/migrate-to-sdb.md | 2 +- .../setup-environment/setup-environment.md | 2 +- .../setup-nonshard-app/setup-nonshard-app.md | 16 ++++++------ 12 files changed, 54 insertions(+), 54 deletions(-) diff --git a/backup-recovery/database-backup-services/database-backup-services.md b/backup-recovery/database-backup-services/database-backup-services.md index 52c13e25..ad12b0f9 100644 --- a/backup-recovery/database-backup-services/database-backup-services.md +++ b/backup-recovery/database-backup-services/database-backup-services.md @@ -47,7 +47,7 @@ Estimated Time: 2 hours 4. You can download the backup module from [Oracle Cloud Backup Downloads](https://www.oracle.com/database/technologies/oracle-cloud-backup-downloads.html), however, to load the zip through Cloud Shell, you will use this `wget` command: ``` - [oracle@workshop downloads]$ wget https://objectstorage.us-ashburn-1.oraclecloud.com/p/VEKec7t0mGwBkJX92Jn0nMptuXIlEpJ5XJA-A6C9PymRgY2LhKbjWqHeB5rVBbaV/n/c4u04/b/livelabsfiles/o/data-management-library-files/opc_installer.zip + [oracle@workshop downloads]$ wget https://c4u04.objectstorage.us-ashburn-1.oci.customer-oci.com/p/EcTjWk2IuZPZeNnD_fYMcgUhdNDIDA6rt9gaFj_WZMiL7VvxPBNMY60837hu5hga/n/c4u04/b/livelabsfiles/o/data-management-library-files/opc_installer.zip ``` 5. Extract the contents of the zip file. The file contains two directories: oci\_installer and opc\_installer, and a README file. @@ -167,17 +167,17 @@ Run the installer, **oci\_install.jar** to install the backup module. This examp The following table lists the required and some optional parameters. -| **Parameter** | **Description** | **Required or Optional**| -| ------------------------- | ------------------------------------------------------------ |-------------------------| -| -host | End point of the Oracle Cloud Infrastructure account. Constructed as https://objectstorage.``.oraclecloud.com. See [this reference](https://docs.cloud.oracle.com/en-us/iaas/Content/General/Concepts/regions.htm) for the region codes. |Required | -| -vtKeyFile | File that contains the private key used to authenticate Oracle Cloud Infrastructure API requests. The key file must be in PEM format. |Required| -| -pubFingerPrint | Finger print of the public key paired with the specified private key. |Required| -| -tOCID | Tenancy OCID for the Oracle Cloud Infrastructure account. |Required| -| -uOCID | User OCID for the Oracle Cloud Infrastructure account. |Required| -| -cOCID | Resource compartment ID for the Oracle Cloud Infrastructure account. |Required| -| -bucket | Name of the bucket in which backups are stored. If this bucket does not exist, then the installer creates it. When this parameter is omitted, a default bucket is automatically created to store backups |Optional| -| -walletDir | Directory in which Oracle Cloud Infrastructure Object Storage credentials are stored. |Required| -| -libDir | Directory in which the system backup to tape (SBT) library used for backups and restores with Oracle Cloud Infrastructure is stored. |Required| +| **Parameter** | **Description** | **Required or Optional** | +| --------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------ | +| -host | End point of the Oracle Cloud Infrastructure account. Constructed as https://objectstorage.``.oraclecloud.com. See [this reference](https://docs.cloud.oracle.com/en-us/iaas/Content/General/Concepts/regions.htm) for the region codes. | Required | +| -vtKeyFile | File that contains the private key used to authenticate Oracle Cloud Infrastructure API requests. The key file must be in PEM format. | Required | +| -pubFingerPrint | Finger print of the public key paired with the specified private key. | Required | +| -tOCID | Tenancy OCID for the Oracle Cloud Infrastructure account. | Required | +| -uOCID | User OCID for the Oracle Cloud Infrastructure account. | Required | +| -cOCID | Resource compartment ID for the Oracle Cloud Infrastructure account. | Required | +| -bucket | Name of the bucket in which backups are stored. If this bucket does not exist, then the installer creates it. When this parameter is omitted, a default bucket is automatically created to store backups | Optional | +| -walletDir | Directory in which Oracle Cloud Infrastructure Object Storage credentials are stored. | Required | +| -libDir | Directory in which the system backup to tape (SBT) library used for backups and restores with Oracle Cloud Infrastructure is stored. | Required | The installation creates a configuration file *opcORCL.ora* and wallet directory *oci\_wallet* and places these in $ORACLE_HOME/dbs. diff --git a/hybrid-adg/setup-environment/setup-environment.md b/hybrid-adg/setup-environment/setup-environment.md index 5f1ea7fc..4b3b08f4 100755 --- a/hybrid-adg/setup-environment/setup-environment.md +++ b/hybrid-adg/setup-environment/setup-environment.md @@ -18,7 +18,7 @@ This lab assumes you have already completed the following: Click on the link below to download the Resource Manager zip files you need to build your environment. -- [db19c-primary-19.20.zip](https://objectstorage.us-ashburn-1.oraclecloud.com/p/VEKec7t0mGwBkJX92Jn0nMptuXIlEpJ5XJA-A6C9PymRgY2LhKbjWqHeB5rVBbaV/n/c4u04/b/livelabsfiles/o/data-management-library-files/db19c-primary-19.20.zip) - Packaged terraform primary database instance creation script. +- [db19c-primary-19.20.zip](https://c4u04.objectstorage.us-ashburn-1.oci.customer-oci.com/p/EcTjWk2IuZPZeNnD_fYMcgUhdNDIDA6rt9gaFj_WZMiL7VvxPBNMY60837hu5hga/n/c4u04/b/livelabsfiles/o/data-management-library-files/db19c-primary-19.20.zip) - Packaged terraform primary database instance creation script. ## Task 1: Prepare the Primary Database diff --git a/hybrid-adg/test-with-adg/test-with-adg.md b/hybrid-adg/test-with-adg/test-with-adg.md index e06f7e38..8256c374 100644 --- a/hybrid-adg/test-with-adg/test-with-adg.md +++ b/hybrid-adg/test-with-adg/test-with-adg.md @@ -204,8 +204,8 @@ There are several ways to check the lag between the primary and standby. ``` - wget https://objectstorage.us-ashburn-1.oraclecloud.com/p/VEKec7t0mGwBkJX92Jn0nMptuXIlEpJ5XJA-A6C9PymRgY2LhKbjWqHeB5rVBbaV/n/c4u04/b/livelabsfiles/o/data-management-library-files/workload.sh - wget https://objectstorage.us-ashburn-1.oraclecloud.com/p/VEKec7t0mGwBkJX92Jn0nMptuXIlEpJ5XJA-A6C9PymRgY2LhKbjWqHeB5rVBbaV/n/c4u04/b/livelabsfiles/o/data-management-library-files/scn.sql + wget https://c4u04.objectstorage.us-ashburn-1.oci.customer-oci.com/p/EcTjWk2IuZPZeNnD_fYMcgUhdNDIDA6rt9gaFj_WZMiL7VvxPBNMY60837hu5hga/n/c4u04/b/livelabsfiles/o/data-management-library-files/workload.sh + wget https://c4u04.objectstorage.us-ashburn-1.oci.customer-oci.com/p/EcTjWk2IuZPZeNnD_fYMcgUhdNDIDA6rt9gaFj_WZMiL7VvxPBNMY60837hu5hga/n/c4u04/b/livelabsfiles/o/data-management-library-files/scn.sql ``` @@ -214,8 +214,8 @@ There are several ways to check the lag between the primary and standby. 2. From on-premise side, run as **oracle** user, download scripts using the command you copied. ``` - [oracle@primary ~]$ wget https://objectstorage.us-ashburn-1.oraclecloud.com/p/VEKec7t0mGwBkJX92Jn0nMptuXIlEpJ5XJA-A6C9PymRgY2LhKbjWqHeB5rVBbaV/n/c4u04/b/livelabsfiles/o/data-management-library-files/workload.sh - --2020-10-31 02:48:08-- https://objectstorage.us-ashburn-1.oraclecloud.com/p/VEKec7t0mGwBkJX92Jn0nMptuXIlEpJ5XJA-A6C9PymRgY2LhKbjWqHeB5rVBbaV/n/c4u04/b/livelabsfiles/o/data-management-library-files/workload.sh + [oracle@primary ~]$ wget https://c4u04.objectstorage.us-ashburn-1.oci.customer-oci.com/p/EcTjWk2IuZPZeNnD_fYMcgUhdNDIDA6rt9gaFj_WZMiL7VvxPBNMY60837hu5hga/n/c4u04/b/livelabsfiles/o/data-management-library-files/workload.sh + --2020-10-31 02:48:08-- https://c4u04.objectstorage.us-ashburn-1.oci.customer-oci.com/p/EcTjWk2IuZPZeNnD_fYMcgUhdNDIDA6rt9gaFj_WZMiL7VvxPBNMY60837hu5hga/n/c4u04/b/livelabsfiles/o/data-management-library-files/workload.sh Resolving objectstorage.us-ashburn-1.oraclecloud.com (objectstorage.us-ashburn-1.oraclecloud.com)... 134.70.31.247, 134.70.27.247, 134.70.35.189 Connecting to objectstorage.us-ashburn-1.oraclecloud.com (objectstorage.us-ashburn-1.oraclecloud.com)|134.70.31.247|:443... connected. HTTP request sent, awaiting response... 200 OK @@ -226,8 +226,8 @@ There are several ways to check the lag between the primary and standby. 2020-10-31 02:48:09 (10.5 MB/s) - ‘workload.sh’ saved [1442/1442] - [oracle@primary ~]$ wget https://objectstorage.us-ashburn-1.oraclecloud.com/p/VEKec7t0mGwBkJX92Jn0nMptuXIlEpJ5XJA-A6C9PymRgY2LhKbjWqHeB5rVBbaV/n/c4u04/b/livelabsfiles/o/data-management-library-files/scn.sql - --2020-10-31 02:48:29-- https://objectstorage.us-ashburn-1.oraclecloud.com/p/VEKec7t0mGwBkJX92Jn0nMptuXIlEpJ5XJA-A6C9PymRgY2LhKbjWqHeB5rVBbaV/n/c4u04/b/livelabsfiles/o/data-management-library-files/scn.sql + [oracle@primary ~]$ wget https://c4u04.objectstorage.us-ashburn-1.oci.customer-oci.com/p/EcTjWk2IuZPZeNnD_fYMcgUhdNDIDA6rt9gaFj_WZMiL7VvxPBNMY60837hu5hga/n/c4u04/b/livelabsfiles/o/data-management-library-files/scn.sql + --2020-10-31 02:48:29-- https://c4u04.objectstorage.us-ashburn-1.oci.customer-oci.com/p/EcTjWk2IuZPZeNnD_fYMcgUhdNDIDA6rt9gaFj_WZMiL7VvxPBNMY60837hu5hga/n/c4u04/b/livelabsfiles/o/data-management-library-files/scn.sql Resolving objectstorage.us-ashburn-1.oraclecloud.com (objectstorage.us-ashburn-1.oraclecloud.com)... 134.70.35.189, 134.70.31.247, 134.70.27.247 Connecting to objectstorage.us-ashburn-1.oraclecloud.com (objectstorage.us-ashburn-1.oraclecloud.com)|134.70.35.189|:443... connected. HTTP request sent, awaiting response... 200 OK diff --git a/move-improve-application-adb/install-application-migrate-database/install-application-migrate-database.md b/move-improve-application-adb/install-application-migrate-database/install-application-migrate-database.md index ace4ee65..95ff935b 100644 --- a/move-improve-application-adb/install-application-migrate-database/install-application-migrate-database.md +++ b/move-improve-application-adb/install-application-migrate-database/install-application-migrate-database.md @@ -186,7 +186,7 @@ The .dmp file has been copied to the Object Storage. You will use this in a lat AShburn, US East: ``` -https://objectstorage.us-ashburn-1.oraclecloud.com/p/LNAcA6wNFvhkvHGPcWIbKlyGkicSOVCIgWLIu6t7W2BQfwq2NSLCsXpTL9wVzjuP/n/c4u04/b/livelabsfiles/o/developer-library/soedump18C_1G.dmp +https://c4u04.objectstorage.us-ashburn-1.oci.customer-oci.com/p/EcTjWk2IuZPZeNnD_fYMcgUhdNDIDA6rt9gaFj_WZMiL7VvxPBNMY60837hu5hga/n/c4u04/b/livelabsfiles/o/developer-library/soedump18C_1G.dmp ``` @@ -242,7 +242,7 @@ Execute the impdb statement below from your compute with Instant Client software 4. Set parallel import to 2 since we can use 2 the OCPU cores in ATP. ``` - $ impdp admin/@ directory=data_pump_dir credential= schemas=soe dumpfile=https://objectstorage.us-ashburn-1.oraclecloud.com/p/LNAcA6wNFvhkvHGPcWIbKlyGkicSOVCIgWLIu6t7W2BQfwq2NSLCsXpTL9wVzjuP/n/c4u04/b/livelabsfiles/o/developer-library/soedump18C_1G.dmp logfile=import.log parallel=2 + $ impdp admin/@ directory=data_pump_dir credential= schemas=soe dumpfile=https://c4u04.objectstorage.us-ashburn-1.oci.customer-oci.com/p/EcTjWk2IuZPZeNnD_fYMcgUhdNDIDA6rt9gaFj_WZMiL7VvxPBNMY60837hu5hga/n/c4u04/b/livelabsfiles/o/developer-library/soedump18C_1G.dmp logfile=import.log parallel=2 ``` It should take about 15-25 minutes to import. If successful, you will see a similar output like the following: @@ -264,7 +264,7 @@ Execute the impdb statement below from your compute with Instant Client software Master table "ADMIN"."SYS_IMPORT_SCHEMA_01" successfully loaded/unloaded - Starting "ADMIN"."SYS_IMPORT_SCHEMA_01": admin/********@atp18c_high directory=data_pump_dir credential=STORAGE_CREDENTIAL schemas=soe dumpfile=https://objectstorage.us-ashburn-1.oraclecloud.com/p/jyHA4nclWcTaekNIdpKPq3u2gsLb00v_1mmRKDIuOEsp--D6GJWS_tMrqGmb85R2/n/c4u04/b/livelabsfiles/o/labfiles/soedump18C_1G.dmp logfile=import.log parallel=2 + Starting "ADMIN"."SYS_IMPORT_SCHEMA_01": admin/********@atp18c_high directory=data_pump_dir credential=STORAGE_CREDENTIAL schemas=soe dumpfile=https://c4u04.objectstorage.us-ashburn-1.oci.customer-oci.com/p/EcTjWk2IuZPZeNnD_fYMcgUhdNDIDA6rt9gaFj_WZMiL7VvxPBNMY60837hu5hga/n/c4u04/b/livelabsfiles/o/labfiles/soedump18C_1G.dmp logfile=import.log parallel=2 Processing object type SCHEMA_EXPORT/USER diff --git a/on-premise-19c-adg/test-with-adg/test-with-adg.md b/on-premise-19c-adg/test-with-adg/test-with-adg.md index 40fd63e6..efd73e50 100644 --- a/on-premise-19c-adg/test-with-adg/test-with-adg.md +++ b/on-premise-19c-adg/test-with-adg/test-with-adg.md @@ -222,8 +222,8 @@ There are several ways to check the lag between the primary and standby. ``` - wget https://objectstorage.us-ashburn-1.oraclecloud.com/p/VEKec7t0mGwBkJX92Jn0nMptuXIlEpJ5XJA-A6C9PymRgY2LhKbjWqHeB5rVBbaV/n/c4u04/b/livelabsfiles/o/data-management-library-files/workload.sh - wget https://objectstorage.us-ashburn-1.oraclecloud.com/p/VEKec7t0mGwBkJX92Jn0nMptuXIlEpJ5XJA-A6C9PymRgY2LhKbjWqHeB5rVBbaV/n/c4u04/b/livelabsfiles/o/data-management-library-files/scn.sql + wget https://c4u04.objectstorage.us-ashburn-1.oci.customer-oci.com/p/EcTjWk2IuZPZeNnD_fYMcgUhdNDIDA6rt9gaFj_WZMiL7VvxPBNMY60837hu5hga/n/c4u04/b/livelabsfiles/o/data-management-library-files/workload.sh + wget https://c4u04.objectstorage.us-ashburn-1.oci.customer-oci.com/p/EcTjWk2IuZPZeNnD_fYMcgUhdNDIDA6rt9gaFj_WZMiL7VvxPBNMY60837hu5hga/n/c4u04/b/livelabsfiles/o/data-management-library-files/scn.sql ``` @@ -232,8 +232,8 @@ There are several ways to check the lag between the primary and standby. 2. From primary side, run as **oracle** user, download scripts using the command you copied. ``` - [oracle@primary ~]$ wget https://objectstorage.us-ashburn-1.oraclecloud.com/p/VEKec7t0mGwBkJX92Jn0nMptuXIlEpJ5XJA-A6C9PymRgY2LhKbjWqHeB5rVBbaV/n/c4u04/b/livelabsfiles/o/data-management-library-files/workload.sh - --2020-10-31 02:48:08-- https://objectstorage.us-ashburn-1.oraclecloud.com/p/VEKec7t0mGwBkJX92Jn0nMptuXIlEpJ5XJA-A6C9PymRgY2LhKbjWqHeB5rVBbaV/n/c4u04/b/livelabsfiles/o/data-management-library-files/workload.sh + [oracle@primary ~]$ wget https://c4u04.objectstorage.us-ashburn-1.oci.customer-oci.com/p/EcTjWk2IuZPZeNnD_fYMcgUhdNDIDA6rt9gaFj_WZMiL7VvxPBNMY60837hu5hga/n/c4u04/b/livelabsfiles/o/data-management-library-files/workload.sh + --2020-10-31 02:48:08-- https://c4u04.objectstorage.us-ashburn-1.oci.customer-oci.com/p/EcTjWk2IuZPZeNnD_fYMcgUhdNDIDA6rt9gaFj_WZMiL7VvxPBNMY60837hu5hga/n/c4u04/b/livelabsfiles/o/data-management-library-files/workload.sh Resolving objectstorage.us-ashburn-1.oraclecloud.com (objectstorage.us-ashburn-1. oraclecloud.com)... 134.70.31.247, 134.70.27.247, 134.70.35.189 Connecting to objectstorage.us-ashburn-1.oraclecloud.com (objectstorage.us-ashburn-1. oraclecloud.com)|134.70.31.247|:443... connected. HTTP request sent, awaiting response... 200 OK @@ -244,8 +244,8 @@ There are several ways to check the lag between the primary and standby. 2020-10-31 02:48:09 (10.5 MB/s) - ‘workload.sh’ saved [1442/1442] - [oracle@primary ~]$ wget https://objectstorage.us-ashburn-1.oraclecloud.com/p/VEKec7t0mGwBkJX92Jn0nMptuXIlEpJ5XJA-A6C9PymRgY2LhKbjWqHeB5rVBbaV/n/c4u04/b/livelabsfiles/o/data-management-library-files/scn.sql - --2020-10-31 02:48:29-- https://objectstorage.us-ashburn-1.oraclecloud.com/p/VEKec7t0mGwBkJX92Jn0nMptuXIlEpJ5XJA-A6C9PymRgY2LhKbjWqHeB5rVBbaV/n/c4u04/b/livelabsfiles/o/data-management-library-files/scn.sql + [oracle@primary ~]$ wget https://c4u04.objectstorage.us-ashburn-1.oci.customer-oci.com/p/EcTjWk2IuZPZeNnD_fYMcgUhdNDIDA6rt9gaFj_WZMiL7VvxPBNMY60837hu5hga/n/c4u04/b/livelabsfiles/o/data-management-library-files/scn.sql + --2020-10-31 02:48:29-- https://c4u04.objectstorage.us-ashburn-1.oci.customer-oci.com/p/EcTjWk2IuZPZeNnD_fYMcgUhdNDIDA6rt9gaFj_WZMiL7VvxPBNMY60837hu5hga/n/c4u04/b/livelabsfiles/o/data-management-library-files/scn.sql Resolving objectstorage.us-ashburn-1.oraclecloud.com (objectstorage.us-ashburn-1. oraclecloud.com)... 134.70.35.189, 134.70.31.247, 134.70.27.247 Connecting to objectstorage.us-ashburn-1.oraclecloud.com (objectstorage.us-ashburn-1. oraclecloud.com)|134.70.35.189|:443... connected. HTTP request sent, awaiting response... 200 OK diff --git a/oracle-db-features-for-developers/python/python.md b/oracle-db-features-for-developers/python/python.md index fd38833d..e54870c9 100644 --- a/oracle-db-features-for-developers/python/python.md +++ b/oracle-db-features-for-developers/python/python.md @@ -433,7 +433,7 @@ You need to create a file-system directory and place a JSON document in this dir ```` cd /home/oracle/labs/python/External - wget https://objectstorage.us-ashburn-1.oraclecloud.com/p/jyHA4nclWcTaekNIdpKPq3u2gsLb00v_1mmRKDIuOEsp--D6GJWS_tMrqGmb85R2/n/c4u04/b/livelabsfiles/o/labfiles/deptJSON.zip + wget https://c4u04.objectstorage.us-ashburn-1.oci.customer-oci.com/p/EcTjWk2IuZPZeNnD_fYMcgUhdNDIDA6rt9gaFj_WZMiL7VvxPBNMY60837hu5hga/n/c4u04/b/livelabsfiles/o/labfiles/deptJSON.zip unzip deptJSON.zip ```` diff --git a/sample-workshop/tables/tables.md b/sample-workshop/tables/tables.md index 945bbd71..529dc6f7 100644 --- a/sample-workshop/tables/tables.md +++ b/sample-workshop/tables/tables.md @@ -5,18 +5,18 @@ You can define a table in Markdown just like so: ``` -| Tables | Are | Cool | -| ------------- |:-------------:| -----:| +| Tables | Are | Cool | +| ------------- | :-----------: | ----: | | **col 3 is** | right-aligned | $1600 | -| col 2 is | *centered* | $12 | +| col 2 is | *centered* | $12 | | zebra stripes | ~~are neat~~ | $1 | ``` The result looks like this: -| Tables | Are | Cool | -| ------------- |:-------------:| -----:| +| Tables | Are | Cool | +| ------------- | :-----------: | ----: | | **col 3 is** | right-aligned | $1600 | -| col 2 is | *centered* | $12 | +| col 2 is | *centered* | $12 | | zebra stripes | ~~are neat~~ | $1 | You can see that there is a default table caption provided which is by default a concatenation of the workshop title and the lab title. @@ -30,20 +30,20 @@ If you don't like the default, you can also provide your own table title by addi The complete markdown looks like this: ``` -| Tables | Are | Cool | -| ------------- |:-------------:| -----:| +| Tables | Are | Cool | +| ------------- | :-----------: | ----: | | **col 3 is** | right-aligned | $1600 | -| col 2 is | *centered* | $12 | +| col 2 is | *centered* | $12 | | zebra stripes | ~~are neat~~ | $1 | {: title="My table title"} ``` Now our table looks like this: -| Tables | Are | Cool | -| ------------- |:-------------:| -----:| +| Tables | Are | Cool | +| ------------- | :-----------: | ----: | | **col 3 is** | right-aligned | $1600 | -| col 2 is | *centered* | $12 | +| col 2 is | *centered* | $12 | | zebra stripes | ~~are neat~~ | $1 | {: title="My table title"} @@ -51,4 +51,4 @@ As you can see, the numbering is added automatically. Isn't that cool? -You can also refer to the [LiveLabs Markdown Cheatsheet](https://objectstorage.us-ashburn-1.oraclecloud.com/p/MKKRgodQ0WIIgL_R3QCgCRWCg30g22bXgxCdMk3YeKClB1238ZJXdau_Jsri0nzP/n/c4u04/b/qa-form/o/LiveLabs_MD_Cheat_Sheet.pdf) \ No newline at end of file +You can also refer to the [LiveLabs Markdown Cheatsheet](https://c4u04.objectstorage.us-ashburn-1.oci.customer-oci.com/p/EcTjWk2IuZPZeNnD_fYMcgUhdNDIDA6rt9gaFj_WZMiL7VvxPBNMY60837hu5hga/n/c4u04/b/livelabsfiles/o/labfiles/LiveLabs_MD_Cheat_Sheet.pdf) \ No newline at end of file diff --git a/sharding-quick-start/deploy-demo-app/deploy-demo-app.md b/sharding-quick-start/deploy-demo-app/deploy-demo-app.md index d2768ec5..1bde72a9 100644 --- a/sharding-quick-start/deploy-demo-app/deploy-demo-app.md +++ b/sharding-quick-start/deploy-demo-app/deploy-demo-app.md @@ -43,7 +43,7 @@ This lab assumes you have already completed the following: 2. Download the `sdb-demo-app-qs.zip` file. ``` - oracle@cata ~]$ wget https://objectstorage.us-ashburn-1.oraclecloud.com/p/VEKec7t0mGwBkJX92Jn0nMptuXIlEpJ5XJA-A6C9PymRgY2LhKbjWqHeB5rVBbaV/n/c4u04/b/livelabsfiles/o/data-management-library-files/sdb-demo-app-qs.zip + oracle@cata ~]$ wget https://c4u04.objectstorage.us-ashburn-1.oci.customer-oci.com/p/EcTjWk2IuZPZeNnD_fYMcgUhdNDIDA6rt9gaFj_WZMiL7VvxPBNMY60837hu5hga/n/c4u04/b/livelabsfiles/o/data-management-library-files/sdb-demo-app-qs.zip ``` diff --git a/sharding-quick-start/setup-environment/setup-environment.md b/sharding-quick-start/setup-environment/setup-environment.md index 7e673320..2e8fc7d7 100755 --- a/sharding-quick-start/setup-environment/setup-environment.md +++ b/sharding-quick-start/setup-environment/setup-environment.md @@ -22,7 +22,7 @@ This lab assumes you have already completed the following: Click on the link below to download the Resource Manager zip files you need to build your enviornment. -- [shardstack-marketplace-103-nodomain.zip](https://objectstorage.us-ashburn-1.oraclecloud.com/p/mAH8tEFXPeUT--YrjUthbjEyyHv-Q7Hm4eXA_LU32I6TLWuWneQJedYPjTAkm-YP/n/c4u04/b/livelabsfiles/o/shardstack-marketplace-103-nodomain.zip) - Packaged terraform primary database instances creation script. +- [shardstack-marketplace-103-nodomain.zip](https://c4u04.objectstorage.us-ashburn-1.oci.customer-oci.com/p/EcTjWk2IuZPZeNnD_fYMcgUhdNDIDA6rt9gaFj_WZMiL7VvxPBNMY60837hu5hga/n/c4u04/b/livelabsfiles/o/shardstack-marketplace-103-nodomain.zip) - Packaged terraform primary database instances creation script. diff --git a/sharding/migrate-to-sdb/migrate-to-sdb.md b/sharding/migrate-to-sdb/migrate-to-sdb.md index 37d2154c..09c76fc0 100644 --- a/sharding/migrate-to-sdb/migrate-to-sdb.md +++ b/sharding/migrate-to-sdb/migrate-to-sdb.md @@ -55,7 +55,7 @@ Before the existing database can be migrated to the sharded database, you must d 2. Download the sharded demo schema SQL scripts `sdb-app-schema.sql`. ``` - [oracle@cata ~]$ wget https://objectstorage.us-ashburn-1.oraclecloud.com/p/VEKec7t0mGwBkJX92Jn0nMptuXIlEpJ5XJA-A6C9PymRgY2LhKbjWqHeB5rVBbaV/n/c4u04/b/livelabsfiles/o/data-management-library-files/Oracle%20Sharding/sdb-app-schema.sql + [oracle@cata ~]$ wget https://c4u04.objectstorage.us-ashburn-1.oci.customer-oci.com/p/EcTjWk2IuZPZeNnD_fYMcgUhdNDIDA6rt9gaFj_WZMiL7VvxPBNMY60837hu5hga/n/c4u04/b/livelabsfiles/o/data-management-library-files/Oracle%20Sharding/sdb-app-schema.sql ``` diff --git a/sharding/setup-environment/setup-environment.md b/sharding/setup-environment/setup-environment.md index c8ddc193..ad2a5a82 100755 --- a/sharding/setup-environment/setup-environment.md +++ b/sharding/setup-environment/setup-environment.md @@ -24,7 +24,7 @@ This lab assumes you have already completed the following: Click on the link below to download the Resource Manager zip files you need to build your environment. -- [sdb19c-market-19.20.zip](https://objectstorage.us-ashburn-1.oraclecloud.com/p/VEKec7t0mGwBkJX92Jn0nMptuXIlEpJ5XJA-A6C9PymRgY2LhKbjWqHeB5rVBbaV/n/c4u04/b/livelabsfiles/o/data-management-library-files/sdb19c-market-19.20.zip) - Packaged terraform primary database instances creation script. +- [sdb19c-market-19.20.zip](https://c4u04.objectstorage.us-ashburn-1.oci.customer-oci.com/p/EcTjWk2IuZPZeNnD_fYMcgUhdNDIDA6rt9gaFj_WZMiL7VvxPBNMY60837hu5hga/n/c4u04/b/livelabsfiles/o/data-management-library-files/sdb19c-market-19.20.zip) - Packaged terraform primary database instances creation script. diff --git a/sharding/setup-nonshard-app/setup-nonshard-app.md b/sharding/setup-nonshard-app/setup-nonshard-app.md index e53ff322..df988c4a 100644 --- a/sharding/setup-nonshard-app/setup-nonshard-app.md +++ b/sharding/setup-nonshard-app/setup-nonshard-app.md @@ -150,13 +150,13 @@ This lab assumes you have already completed the following: 1. Still in the shard3 host with oracle user. Download the SQL script `nonshard-app-schema.sql`. ``` - [oracle@shd3 ~]$ wget https://objectstorage.us-ashburn-1.oraclecloud.com/p/VEKec7t0mGwBkJX92Jn0nMptuXIlEpJ5XJA-A6C9PymRgY2LhKbjWqHeB5rVBbaV/n/c4u04/b/livelabsfiles/o/data-management-library-files/Oracle%20Sharding/nonshard-app-schema.sql - --2020-12-06 10:45:06-- https://objectstorage.us-ashburn-1.oraclecloud.com/p/VEKec7t0mGwBkJX92Jn0nMptuXIlEpJ5XJA-A6C9PymRgY2LhKbjWqHeB5rVBbaV/n/c4u04/b/livelabsfiles/o/data-management-library-files/Oracle%20Sharding/nonshard-app-schema.sql + [oracle@shd3 ~]$ wget https://c4u04.objectstorage.us-ashburn-1.oci.customer-oci.com/p/EcTjWk2IuZPZeNnD_fYMcgUhdNDIDA6rt9gaFj_WZMiL7VvxPBNMY60837hu5hga/n/c4u04/b/livelabsfiles/o/data-management-library-files/Oracle%20Sharding/nonshard-app-schema.sql + --2020-12-06 10:45:06-- https://c4u04.objectstorage.us-ashburn-1.oci.customer-oci.com/p/EcTjWk2IuZPZeNnD_fYMcgUhdNDIDA6rt9gaFj_WZMiL7VvxPBNMY60837hu5hga/n/c4u04/b/livelabsfiles/o/data-management-library-files/Oracle%20Sharding/nonshard-app-schema.sql Resolving github.com (github.com)... 140.82.112.3 Connecting to github.com (github.com)|140.82.112.3|:443... connected. HTTP request sent, awaiting response... 302 Found - Location: https://objectstorage.us-ashburn-1.oraclecloud.com/p/VEKec7t0mGwBkJX92Jn0nMptuXIlEpJ5XJA-A6C9PymRgY2LhKbjWqHeB5rVBbaV/n/c4u04/b/livelabsfiles/o/data-management-library-files/Oracle%20Sharding/nonshard-app-schema.sql [following] - --2020-12-06 10:45:08-- https://objectstorage.us-ashburn-1.oraclecloud.com/p/VEKec7t0mGwBkJX92Jn0nMptuXIlEpJ5XJA-A6C9PymRgY2LhKbjWqHeB5rVBbaV/n/c4u04/b/livelabsfiles/o/data-management-library-files/Oracle%20Sharding/nonshard-app-schema.sql + Location: https://c4u04.objectstorage.us-ashburn-1.oci.customer-oci.com/p/EcTjWk2IuZPZeNnD_fYMcgUhdNDIDA6rt9gaFj_WZMiL7VvxPBNMY60837hu5hga/n/c4u04/b/livelabsfiles/o/data-management-library-files/Oracle%20Sharding/nonshard-app-schema.sql [following] + --2020-12-06 10:45:08-- https://c4u04.objectstorage.us-ashburn-1.oci.customer-oci.com/p/EcTjWk2IuZPZeNnD_fYMcgUhdNDIDA6rt9gaFj_WZMiL7VvxPBNMY60837hu5hga/n/c4u04/b/livelabsfiles/o/data-management-library-files/Oracle%20Sharding/nonshard-app-schema.sql Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 151.101.76.133 Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|151.101.76.133|:443... connected. HTTP request sent, awaiting response... 200 OK @@ -482,13 +482,13 @@ This lab assumes you have already completed the following: 2. Download the `sdb_demo_app.zip` file. ``` - [oracle@cata ~]$ wget https://objectstorage.us-ashburn-1.oraclecloud.com/p/VEKec7t0mGwBkJX92Jn0nMptuXIlEpJ5XJA-A6C9PymRgY2LhKbjWqHeB5rVBbaV/n/c4u04/b/livelabsfiles/o/data-management-library-files/Oracle%20Sharding/sdb_demo_app.zip - --2020-12-06 10:50:35-- https://objectstorage.us-ashburn-1.oraclecloud.com/p/VEKec7t0mGwBkJX92Jn0nMptuXIlEpJ5XJA-A6C9PymRgY2LhKbjWqHeB5rVBbaV/n/c4u04/b/livelabsfiles/o/data-management-library-files/Oracle%20Sharding/sdb_demo_app.zip + [oracle@cata ~]$ wget https://c4u04.objectstorage.us-ashburn-1.oci.customer-oci.com/p/EcTjWk2IuZPZeNnD_fYMcgUhdNDIDA6rt9gaFj_WZMiL7VvxPBNMY60837hu5hga/n/c4u04/b/livelabsfiles/o/data-management-library-files/Oracle%20Sharding/sdb_demo_app.zip + --2020-12-06 10:50:35-- https://c4u04.objectstorage.us-ashburn-1.oci.customer-oci.com/p/EcTjWk2IuZPZeNnD_fYMcgUhdNDIDA6rt9gaFj_WZMiL7VvxPBNMY60837hu5hga/n/c4u04/b/livelabsfiles/o/data-management-library-files/Oracle%20Sharding/sdb_demo_app.zip Resolving github.com (github.com)... 140.82.113.3 Connecting to github.com (github.com)|140.82.113.3|:443... connected. HTTP request sent, awaiting response... 302 Found - Location: https://objectstorage.us-ashburn-1.oraclecloud.com/p/VEKec7t0mGwBkJX92Jn0nMptuXIlEpJ5XJA-A6C9PymRgY2LhKbjWqHeB5rVBbaV/n/c4u04/b/livelabsfiles/o/data-management-library-files/Oracle%20Sharding/sdb_demo_app.zip [following] - --2020-12-06 10:50:37-- https://objectstorage.us-ashburn-1.oraclecloud.com/p/VEKec7t0mGwBkJX92Jn0nMptuXIlEpJ5XJA-A6C9PymRgY2LhKbjWqHeB5rVBbaV/n/c4u04/b/livelabsfiles/o/data-management-library-files/Oracle%20Sharding/sdb_demo_app.zip + Location: https://c4u04.objectstorage.us-ashburn-1.oci.customer-oci.com/p/EcTjWk2IuZPZeNnD_fYMcgUhdNDIDA6rt9gaFj_WZMiL7VvxPBNMY60837hu5hga/n/c4u04/b/livelabsfiles/o/data-management-library-files/Oracle%20Sharding/sdb_demo_app.zip [following] + --2020-12-06 10:50:37-- https://c4u04.objectstorage.us-ashburn-1.oci.customer-oci.com/p/EcTjWk2IuZPZeNnD_fYMcgUhdNDIDA6rt9gaFj_WZMiL7VvxPBNMY60837hu5hga/n/c4u04/b/livelabsfiles/o/data-management-library-files/Oracle%20Sharding/sdb_demo_app.zip Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 151.101.88.133 Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|151.101.88.133|:443... connected. HTTP request sent, awaiting response... 200 OK From 1b8df99f7a87083f64a660184358fff9725ff70d Mon Sep 17 00:00:00 2001 From: Francois Pons Date: Wed, 27 Mar 2024 19:19:29 +0100 Subject: [PATCH 2/2] WMS ID 11169 - March 2024 update to GB instructions (#109) * Added template files Copied from Valentin's Mongo API * Basic structure in place Basic structure in place * Fixed typos Fixed typos * Lab1 basic info Lab1 basic info * Changed img names Changed img names * Basic structure for all labs Basic structure for all labs * Update planned-maintenance.md * New structure from sample-workshop New structure from sample-workshop * Minor changes Minor changes * Fixed paths Fixed paths * Added tenancy folder Added tenancy folder * Added basic provisioning steps Added basic provisioning steps * Developing lab 3 Developing lab 3 * More on lab3 More on lab3 * Testing copy Testing copy * Update lab3-config.md * Lab 3 Tasks 1 to 3 Lab 3 Tasks 1 to 3 * small change * Simplified NSG rule Only one stateful ingress rule to open 6200 should be sufficient * Fixed typo in lab3 tacsrv * Lab 3 Task 4 * Lab 3 draft * Lab 4 tasks 1 to 2 * Finished lab 4 * Lab 5 Lab 5 * Fixing typos * Improved lab3 images * Fixing typos * Formatting code blocks * Trying better format * Adding steps to lab3 task 5 * Renamed first lab Replaced simple-ac with unplanned-outages * Removed unnecessary file * Improved instructions * Improved net config instructions * Better instructions * Restructuring labs * Starting lab1 * Stack apply instructions * Improved provisioning instructions * db unique name * Fixed lab 4 * Update lab4-planned-maintenance.md * Self QA modifs 1 Self QA modifs 1 * Self QA modifs 2 * Self QA modifs 3 * Self QA modifs 4 * Self QA modifs 5 * Self QA modifs 6 * Changing images names part 1 * Changing images names part 2 * Finished renaming images * Removed duplicate images Removed old images named with numbers and replaced with meaningful names * Added some COPY commands * Refreshed image edit-java-code * Updated the URL to download the stack * Improved common lab instructions For both BB & GB * Adding Green Button support Modified instructions for sandbox provisioning * Fixed shell prompts Fixed many shell prompts in command line examples * Fixing more typos * Clarifying sandbox instructions * Replacing DBCS with Oracle Base Database Replacing DBCS by Oracle Base Database and other clarifications * Fixed quarterly QA issues * GB no longer allows NSG Modified lab instructions for sandbox as it is now forbidden to create Network Security Groups * March 2024 Update Modified Green Button instructions to remove the need to create an NSG * Updated date of Last Update Updated date of Last Update --------- Co-authored-by: Andrei Manoliu Co-authored-by: Michelle Malcher <48925485+malcherm@users.noreply.github.com> --- ac-with-ucp/.vscode/settings.json | 3 ++ ac-with-ucp/introduction/introduction.md | 2 +- .../lab1-provision-env/lab1-provision-env.md | 2 +- .../lab2-configure-env/lab2-configure-env.md | 50 +++++++++++++++---- 4 files changed, 46 insertions(+), 11 deletions(-) create mode 100644 ac-with-ucp/.vscode/settings.json diff --git a/ac-with-ucp/.vscode/settings.json b/ac-with-ucp/.vscode/settings.json new file mode 100644 index 00000000..6f3a2913 --- /dev/null +++ b/ac-with-ucp/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "liveServer.settings.port": 5501 +} \ No newline at end of file diff --git a/ac-with-ucp/introduction/introduction.md b/ac-with-ucp/introduction/introduction.md index 6207c523..d2c7a607 100644 --- a/ac-with-ucp/introduction/introduction.md +++ b/ac-with-ucp/introduction/introduction.md @@ -57,4 +57,4 @@ Here is a video to help with the Oracle Trial Sign Up Process: ## Acknowledgements * **Author** - François Pons, Senior Principal Product Manager * **Contributors** - Andrei Manoliu, Principal Product Manager -* **Last Updated By/Date** - François Pons, September 2022 +* **Last Updated By/Date** - François Pons, March 2024 diff --git a/ac-with-ucp/lab1-provision-env/lab1-provision-env.md b/ac-with-ucp/lab1-provision-env/lab1-provision-env.md index f2c987a2..7b945681 100644 --- a/ac-with-ucp/lab1-provision-env/lab1-provision-env.md +++ b/ac-with-ucp/lab1-provision-env/lab1-provision-env.md @@ -111,4 +111,4 @@ Click on the link below to download the Resource Manager zip files you need to b ## Acknowledgements * **Author** - François Pons, Senior Principal Product Manager * **Contributors** - Andrei Manoliu, Principal Product Manager -* **Last Updated By/Date** - François Pons, September,15th 2022 +* **Last Updated By/Date** - François Pons, March 2024 diff --git a/ac-with-ucp/lab2-configure-env/lab2-configure-env.md b/ac-with-ucp/lab2-configure-env/lab2-configure-env.md index 713873c5..de303c49 100644 --- a/ac-with-ucp/lab2-configure-env/lab2-configure-env.md +++ b/ac-with-ucp/lab2-configure-env/lab2-configure-env.md @@ -8,7 +8,7 @@ In this lab, we will customize the environment that will be used to run the rest There are three main elements in our environment: -* **VCN-DEMORAC** : a **Virtual Cloud Network (VCN)** has been pre-created with the required network topology components inside the Oracle Cloud (Subnets, Route Tables, Security Lists, Gateways, etc.) +* **VCN-DEMORAC** (or another automatically generated name if you run in a sandbox environment): a **Virtual Cloud Network (VCN)** has been pre-created with the required network topology components inside the Oracle Cloud (Subnets, Route Tables, Security Lists, Gateways, etc.) * **dbrac** : a two-node Database Cloud Service (aka Oracle Base RAC Database) **RAC database** with **Grid Infrastructure** (which should have also been pre-created) * **demotac** : a **Compute instance** Virtual Machine hosting our demo application @@ -23,7 +23,7 @@ In this lab, you will: * Complete the network configuration -* Review the network configuration +* Understand important points in the network configuration * Configure RAC database services * Create a demo schema in the database @@ -45,14 +45,14 @@ This lab assumes you have: ## Task 1: Configure the Network for Oracle Net + +***As you are running in a sandbox environment, you should skip this task and go directly to Task 2. Security restrictions in sandbox environments do not allow the creation of Network Security Groups. However, all required ports are open for the workshop to work. You can read the instructions in this task to better understand which ports need to be open and for which purpose.*** + + 1. Create a **Network Security Group** rule allowing Oracle Net connectivity * It is necessary to **open TCP port 1521** in the VCN to allow the demo application to connect to the database. We can do this by configuring a **Network Security Group Rule** and adding the NSG to the database. - - * *As you are running this workshop in a sandbox environment, the configuration of the Virtual Cloud Network, Network Security Group, and the association between the NSG and the database have been completed automatically. For a better understanding of what was done, follow the instructions in this task without actually creating these components. Changing them will result in errors throughout the workshop.* - - * From the Oracle Cloud web console, go to **Networking** and select your VCN. It should be named **VCN-DEMORAC**. ![OCI console menu vcn](https://oracle-livelabs.github.io/common/images/console/networking-vcn.png " ") @@ -134,6 +134,14 @@ This lab assumes you have: 1. Connect to Cloud shell from the details page of database **dbrac** + * From the Oracle Cloud web console, go to **Oracle Database** + + ![OCI console menu database](https://oracle-livelabs.github.io/common/images/console/database-basedb.png " ") + + * Select database **dbrac** + + ![Select dbrac database](./images/task1/select-dbrac-database.png " ") + * Click on the Cloud Shell icon from the top right of the OCI console ![Cloud Shell icon](./images/task2/cloud-shell-icon.png " ") @@ -205,7 +213,7 @@ This lab assumes you have: * It is necessary to **open TCP port 6200** in the VCN to allow **Fast Application Notification Events** to flow from the cluster database to the client application. We can do this by adding a **Network Security Group Rule** to the database NSG. - * *As you are running this workshop in a sandbox, this network configuration has already been done automatically, but you should still follow the instructions in this step to review and understand what was done without actually creating the rule to open port 6200.* + * *As you are running this workshop in a sandbox, you should skip this step. The port is open by an automatically created Security List. You can read the instructions in this step to review and understand what normally needs to be done manually to open port 6200.* * From the OCI console under **Networking** > **Virtual Cloud Networks**, select the VCN (**VCN-DEMORAC**) @@ -423,6 +431,16 @@ This lab assumes you have: 1. Understand the demo application directory structure + + * ***As you are running this workshop in a sandbox environment, you will have to change the connect strings in SQL and Java files. + **.dnsdemorac.vcndemorac** will have to be replaced by **.pub.ll12345vcn** where **12345** is your LiveLab reservation ID. (Note the two lower case **L** followed by reservation number.) + The following command may help you to make this change in all the files of the current folder and its subfolders:*** + ```` + grep -lir dnsdemorac.vcndemorac | xargs -i@ sed -i 's/dnsdemorac.vcndemorac/pub.ll12345vcn/g' @ + ```` + + + * Using noVNC, connect to the remote desktop of the client machine **demotac** as user **oracle**. ![Remote Desktop](./images/task4/remote-desktop.png " ") @@ -441,7 +459,9 @@ This lab assumes you have: ac/sql : SQL scripts to be used in next labs ``` - + + * As you are running this workshop in a sandbox environment, you should change the connect strings in SQL and Java files before running them. Replace ***.dnsdemorac.vcndemorac*** by ***.pub.ll12345vcn*** where ***12345*** is your LiveLab reservation ID. + 2. Open a terminal window (as oracle) and change directory to $HOME/work/ac/ddl @@ -612,6 +632,18 @@ This lab assumes you have: * Verify the value of strScan and change it in MyCUPDemo.java if necessary. + + * ***As you are running this workshop in a sandbox environment, you should change the connect string in the application code. Replace **.dnsdemorac.vcndemorac** by **.pub.ll12345vcn** where **12345** is your LiveLab reservation ID. Note the two lower case L. + For instance:*** + + ``` + //String strScan = "ruby-scan.dnsdemorac.vcndemorac.oraclevcn.com"; + String strScan = "ruby-scan.pub.ll12345vcn.oraclevcn.com"; + //String strService = strAlias + ".dnsdemorac.vcndemorac.oraclevcn.com"; + String strService = strAlias + ".pub.ll12345vcn.oraclevcn.com"; + ``` + + 4. Compile the demo application @@ -635,4 +667,4 @@ This lab assumes you have: ## Acknowledgements * **Author** - François Pons, Senior Principal Product Manager * **Contributors** - Andrei Manoliu, Principal Product Manager -* **Last Updated By/Date** - François Pons, September, 15th 2022 +* **Last Updated By/Date** - François Pons, March 2024