Skip to content

Commit b12d055

Browse files
paulparkinsonpaulparkinson
authored
various observability work as well as some cloudbank and repos cleanup re md file locations, etc. (#404)
* enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * observability * enable teq * enable teq * enable teq * enable teq * enable teq * observability work * observability work * enable teq * enable teq * enable teq * observ * enable teq * observability dash * observability * osbservability * enable teq * enable teq * enable teq * obs * obs * enable teq * obs * enable teq * observ * obs * converged wording change * fix k6 command * correct workshop link * update workshop link * modifiy python impl to conn.autocommit = False * enable teq * various including security fix in inventory-nodejs * various including security fix in inventory-nodejs * various including security fix in inventory-nodejs * enable teq * inventory-micronaut * inventory-micronaut * inventory-quarkus * inventory-micronaut-native-image * upgrade helidon and db versions * mn and quarkus build wrappers * mn native-image build and deploy fixes * mn native-image build and deploy fixes * mn native-image use JsonObject instead of Jackson * dotnet vault work, etc. * vault work, various languages * Go OCI Vault/Secrets client * displaysetuplogs util script * displaysetuplogs util script * displaysetuplogs util script * displaysetuplogs util script * createsecretfromwallet * createsecretfromwallet * createsecretfromwallet * set order and inventory helidon versions back to 2.4.0 * travelagency readme * createsecretfromwallet * temp eventmesh and osaga java api * travelagencysaga * observability workshop and various fixes * travelagency saga ws work * saga ws work * saga ws * saga ws * saga ws * saga ws * saga ws * osaga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * obs ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * saga ws * obs ws * saga ws * obs ws * foodwinepairing scripts were not chmoded properly * fix inventory-helidon/deploy.sh to renable IS_SUGGESTIVE_SALE_ENABLED functionality * ws fixes * revert unrelated changes * revert unwanted changes * saga ws * ws fixes * fix typo * remove extraneous deploy-order-metrics-exporter.sh * fix typo * jackson databind version change to address https://github.com/oracle/microservices-datadriven/security/dependabot/5 * remove verrazzano yaml etc * add back privs for observability * add back db-log-exporter deploy * add back privs for observability * add back privs for observability * add back privs for observability * add back privs for observability * add back privs for observability * add back privs for observability * add back privs for observability * cloudbank and observability dirs and readmes, inventory-helidon fix, fanEnabled flag in travel app * tx tests * tests * tests * tests * obs mods * obs mods * obs mods * rename obs dir * add exporter build * obs mods * obs mods * obs mods * obs mods * temp removal of foodwinepairing * directions for running aq/teq deq/enq grafana dashboard and alerts
1 parent af0f510 commit b12d055

File tree

81 files changed

+10163
-400
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+10163
-400
lines changed

‎grabdish/CONTRIBUTING.md renamed to ‎CONTRIBUTING.md

File renamed without changes.

‎grabdish/SECURITY.md renamed to ‎SECURITY.md

File renamed without changes.

‎SummaryOfWorkshops.md

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# Summary of workshops included in this repos
2+
3+
Includes title, ID, link to doc, short description, resources required, and any other relevant info
4+
5+
##Existing workshops...
6+
OSaga workshop 8781:
7+
Cloud Shell
8+
2 ADB-S 21c databases with public IP addresses
9+
10+
WMS#8021: Requirements for oracle AQ/TEQ workshop:
11+
Cloud shell
12+
Cx_oracle 8.3
13+
Two ADB-s 21c
14+
15+
TEQ/Okafka workshop #8022 :
16+
1- Cloud shell (with Docker engine — to install Kafka and microservices)
17+
2- ADB-S 19c database (one only) * the public IP address helps with DB interaction but it is not a strong requirement if DB with internal IP is accessible by Cloud Shell (TBH I don’t remember)
18+
19+
##Workshops currently being developed...
20+
21+
Requirements for the Grabdish Two-Tier Workshop with MLE JavaScript Implementation #11025:
22+
VCN + the usual sub components
23+
Load Balancer with public IP
24+
Compute instance with at least 4GB memory with public IP address
25+
ADB-S 21c database (one only) with public IP address
26+
27+
WMS ID#8481: Modern CI/CD Pipelines for App Dev with converged Oracle Database
28+
1. Compute instance with public IP address
29+
2. Bastion Service
30+
3. Load Balancer with public IP
31+
4. VCN + the usual sub components
32+
5. OCIR & OKE & Cloud Shell
33+
6. 2 ADB-S 19c
34+
35+
Data Refactoring workshop: (11016)
36+
ADB-S 21c database with public address, access to database actions, graph studio
37+
Cloud shell (we could potentially eliminate this one if needed)

‎cloudbank/README.md

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,38 @@
11
# Application: Cloudbank
22

3-
Application source code for upcoming workshops
4-
[Simplify Microservices with converged Oracle Database Workshop][1]
5-
available on [Oracle LiveLabs][2].
3+
4+
This is a work in progress.
5+
6+
### Steps for setting up AQ/TEQ prometheus metrics, Grafana dashboard, and deq/enq alert(s)
7+
8+
1. create DB with kubernetes secrets as done in normal setup for simplify microservices workshop (ie run lab 1)
9+
2. `cd microservices-datadriven/oracle-db-appdev-monitoring/`
10+
3. run `./install_observability_stack.sh`
11+
4. run `microservices-datadriven/cloudbank/sql/AdminCreateUsers.sql` as admin
12+
5. run `microservices-datadriven/cloudbank/sql/AQUserCreateQueues.sql` as aquser
13+
6. `cd microservices-datadriven/cloudbank/observability`
14+
7. run `./createMonitorsAndExporters.sh`
15+
8. open Grafana as usual (ie find Grafana service created by install_observability_stack.sh and login as admin/prom-operator)
16+
9. import the microservices-datadriven/cloudbank/observability/dashboard/cloudbankdashboard.json dashboard and notice metrics
17+
10. create an alert panel and/or alert channel in Grafana as shown in the observability workshop/lab
18+
11. create an alert for deq/enq rate falling as in the image alertrule_deqenqrate.png (todo add src here)
19+
12. `cd microservices-datadriven/cloudbank/cloudbank-backend`
20+
13. export `bankauser, bankapw, and bankaurl`
21+
1. eg `export bankauser=bankauser ; export bankapw=myPW ; export bankaurl="jdbc:oracle:thin:@gd49301311_tp?TNS_ADMIN=/Users/pparkins/Downloads/Wallet_gd49301311"
22+
14. run `mvn package`
23+
15. run `java -jar target/springboot-0.0.1-SNAPSHOT.jar`
24+
16. run `./loadTest.sh dequeue 1000`
25+
17. run `./loadTest.sh enqueue 1000`
26+
18. notice Grafana console and enq/rate above .5
27+
19. kill enqueue load test
28+
20. notice Grafana console and enq/rate drop below .5 and alert notification in console and/or channel as configured in step 10
29+
30+
<p><img src="alertrule_deqenqrate.png" ></p>
631

732
## License
833

34+
35+
936
Copyright (c) 2022 Oracle and/or its affiliates.
1037

1138
Licensed under the Universal Permissive License v 1.0 as shown at <https://oss.oracle.com/licenses/upl>.

‎cloudbank/alertrule_deqenqrate.png

1.38 MB
Loading

‎cloudbank/cloudbank-backend/loadTest.sh

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
#!/bin/bash
2+
## Copyright (c) 2021 Oracle and/or its affiliates.
3+
## Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
4+
5+
6+
export ENQUEUE_OR_DEQUEUE=$1
7+
export NUMBER_TO_ENQUEUE_OR_DEQUEUE=$2
8+
if [[ $ENQUEUE_OR_DEQUEUE == "enqueue" ]]
9+
then
10+
echo "enqueueing" $NUMBER_TO_ENQUEUE_OR_DEQUEUE
11+
a=0
12+
while [ $a -lt $NUMBER_TO_ENQUEUE_OR_DEQUEUE ]
13+
do
14+
echo $a
15+
a=`expr $a + 1`
16+
sleep 1
17+
curl http://localhost:8080/enqueue
18+
done
19+
else
20+
echo "dequeueing" $NUMBER_TO_ENQUEUE_OR_DEQUEUE
21+
a=0
22+
while [ $a -lt $NUMBER_TO_ENQUEUE_OR_DEQUEUE ]
23+
do
24+
echo $a
25+
a=`expr $a + 1`
26+
sleep 1
27+
curl http://localhost:8080/dequeue
28+
done
29+
fi

‎cloudbank/cloudbank-backend/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,6 @@
2121
<groupId>org.springframework.boot</groupId>
2222
<artifactId>spring-boot-starter-web</artifactId>
2323
</dependency>
24-
<!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-data-jpa -->
25-
<dependency>
26-
<groupId>org.springframework.boot</groupId>
27-
<artifactId>spring-boot-starter-data-jpa</artifactId>
28-
<version>2.6.6</version>
29-
</dependency>
3024

3125

3226
<dependency>

‎cloudbank/cloudbank-backend/src/main/java/com/cloudbank/springboot/accounts/AccountController.java

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎cloudbank/cloudbank-backend/src/main/java/com/cloudbank/springboot/accounts/AccountService.java

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎cloudbank/cloudbank-backend/src/main/java/com/cloudbank/springboot/accounts/AccountServiceImpl.java

Lines changed: 0 additions & 72 deletions
This file was deleted.

0 commit comments

Comments
 (0)