add back privs for observability

README.md

@@ -33,6 +33,5 @@ Licensed under the Universal Permissive License v 1.0 as shown at <https://oss.o
 [LiveLabs]: https://apexapps.oracle.com/pls/apex/f?p=133:1
 [Workshops]: https://apexapps.oracle.com/pls/apex/dbpm/r/livelabs/livelabs-workshop-cards?p100_role=12&p100_focus_area=35&me=126
 [DRC]: https://developer.oracle.com
-[Helidon]: https://helidon.io
 [Workshop]: https://bit.ly/simplifymicroservices
-[Blogs]: https://blogs.oracle.com/developers/category/dev-app-dev
+[Blogs]: https://blogs.oracle.com/developers/authors/Blog-Author/CORE18EB69239F2845558809929771DB8EFA/paulparkinson

grabdish/config/db/common/apply/admin-inventory-create-schema.sql

@@ -9,4 +9,8 @@ GRANT aq_user_role TO $INVENTORY_USER;
 GRANT EXECUTE ON sys.dbms_aq TO $INVENTORY_USER;
 -- For inventory-plsql deployment
 GRANT CREATE JOB to $INVENTORY_USER; 
-GRANT EXECUTE ON sys.DBMS_SCHEDULER TO $INVENTORY_USER; 
+GRANT EXECUTE ON sys.DBMS_SCHEDULER TO $INVENTORY_USER;
+--GRANT select on GV$SESSION to inventoryuser;
+GRANT select on DBA_QUEUE_SCHEDULES to inventoryuser;
+--GRANT select on V$diag_alert_ext to inventoryuser
+--GRANT select on v$active_session_history to inventoryuser;

grabdish/config/db/common/apply/admin-order-create-schema.sql

@@ -7,4 +7,8 @@ GRANT unlimited tablespace to $ORDER_USER;
 GRANT connect, resource TO $ORDER_USER;
 GRANT aq_user_role TO $ORDER_USER;
 GRANT EXECUTE ON sys.dbms_aq TO $ORDER_USER;
-GRANT SODA_APP to $ORDER_USER;
+GRANT SODA_APP to $ORDER_USER;
+--GRANT select on GV$SESSION to orderuser;
+GRANT select on DBA_QUEUE_SCHEDULES to orderuser;
+--GRANT select on V$diag_alert_ext to orderuser;
+--GRANT select on v$active_session_history to orderuser;

grabdish/inventory-helidon/inventory-helidon-deployment.yaml

@@ -0,0 +1,54 @@
+## Copyright (c) 2021 Oracle and/or its affiliates.
+## Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: inventory-helidon
+spec:
+ replicas: 1
+ selector:
+ matchLabels:
+ app: inventory
+ template:
+ metadata:
+ labels:
+ app: inventory
+ version: helidon
+ spec:
+ containers:
+ - name: inventory
+ image: ${DOCKER_REGISTRY}/inventory-helidon:0.1
+ imagePullPolicy: Always
+ env:
+ - name: oracle.ucp.jdbc.PoolDataSource.inventorypdb.user
+ value: "inventoryuser"
+ - name: oracle.ucp.jdbc.PoolDataSource.inventorypdb.URL
+ value: "jdbc:oracle:thin:@${INVENTORY_DB_ALIAS}?TNS_ADMIN=/msdataworkshop/creds"
+ - name: queueowner
+ value: "AQ"
+ - name: orderqueuename
+ value: "ORDERQUEUE"
+ - name: inventoryqueuename
+ value: "inventoryqueue"
+ - name: OCI_REGION
+ value: "${OCI_REGION-}"
+ - name: VAULT_SECRET_OCID
+ value: "${VAULT_SECRET_OCID-}"
+ - name: isSuggestiveSaleAIEnabled
+ value: "${IS_SUGGESTIVE_SALE_ENABLED}"
+ - name: dbpassword
+ valueFrom:
+ secretKeyRef:
+ name: dbuser
+ key: dbpassword
+ optional: true #not needed/used if using VAULT_SECRET_OCID exists
+ volumeMounts:
+ - name: creds
+ mountPath: /msdataworkshop/creds
+ ports:
+ - containerPort: 8080
+ restartPolicy: Always
+ volumes:
+ - name: creds
+ secret:
+ secretName: inventory-db-tns-admin-secret

grabdish/observability/createMonitorsAndExporters.sh

@@ -18,6 +18,6 @@ cd db-metrics-exporter
 cd ../
 #echo
 #echo create deployments and services for db log exporters...
-#cd db-log-exporter
-#./deploy.sh
-#cd ../
+cd db-log-exporter
+./deploy.sh
+cd ../

grabdish/observability/db-log-exporter/src/main/java/dblogexporter/DBLogExporterResource.java

@@ -30,7 +30,7 @@ public class DBLogExporterResource {
  PoolDataSource alertlogpdbPdb;
 
  static boolean isFirstCall = true;
- static String querySQL = System.getenv("QUERY_SQL");
+ static String querySQL = "select ORIGINATING_TIMESTAMP, MODULE_ID, EXECUTION_CONTEXT_ID, MESSAGE_TEXT from V$diag_alert_ext"; // System.getenv("QUERY_SQL");
  static String queryRetryIntervalString = System.getenv("QUERY_INTERVAL");
  static int DEFAULT_RETRY_INTERVAL = 30; // in seconds
  private boolean enabled = true;
@@ -41,7 +41,7 @@ public class DBLogExporterResource {
  private int vashQueryLastSampleId = -1;
  private String alertLogDefaultQuery = "select ORIGINATING_TIMESTAMP, MODULE_ID, EXECUTION_CONTEXT_ID, MESSAGE_TEXT from TABLE(GV$(CURSOR(select * from v$diag_alert_ext)))";
  private String vashDefaultQuery = "select SAMPLE_ID, SAMPLE_TIME, SQL_ID, SQL_OPNAME, PROGRAM, MODULE, ACTION, CLIENT_ID, MACHINE, ECID " +
- "from TABLE(GV$(CURSOR(select * from v$active_session_history))) where ECID is not null and SAMPLE_ID > ";
+  "from TABLE(GV$(CURSOR(select * from v$active_session_history))) where ECID is not null and SAMPLE_ID > ";
 
  public void init(@Observes @Initialized(ApplicationScoped.class) Object init) throws Exception {
  // todo for each config entry write to different logger, eg...
@@ -57,7 +57,7 @@ public void init(@Observes @Initialized(ApplicationScoped.class) Object init) th
  try (Connection conn = alertlogpdbPdb.getConnection()) {
  while (enabled) {
  executeAlertLogQuery(conn);
- executeVASHQuery(conn);
+ // executeVASHQuery(conn);
  int queryRetryInterval = queryRetryIntervalString == null ||
  queryRetryIntervalString.trim().equals("") ?
  DEFAULT_RETRY_INTERVAL : Integer.parseInt(queryRetryIntervalString.trim());

grabdish/observability/db-metrics-exporter/db-metrics-inventorypdb-exporter-metrics.toml

@@ -8,7 +8,7 @@ request = "select inst_id, status, type, count(*) as value from gv$session group
 context = "inventoryqueue_messages_by_state"
 labels = ["state"]
 metricsdesc = { value = "Total number of messages in inventory queue by state"}
-request = "select state, count(*) as value from inventoryqueuetable group by state"
+request = "select state, count(*) as value from AQ.inventoryqueuetable group by state"
 ignorezeroresult = true
 
 [[metric]]

grabdish/observability/db-metrics-exporter/db-metrics-orderpdb-exporter-metrics.toml

@@ -8,7 +8,7 @@ request = "select inst_id, status, type, count(*) as value from gv$session group
 context = "orderqueue_messages_by_state"
 labels = ["state"]
 metricsdesc = { value = "Total number of messages in order queue by state"}
-request = "select state, count(*) as value from orderqueuetable group by state"
+request = "select state, count(*) as value from AQ.orderqueuetable group by state"
 ignorezeroresult = true
 
 [[metric]]

workshops/dcms-oci/source.env

@@ -95,6 +95,7 @@ export LAB2_JAVA_BUILDS="frontend-helidon order-helidon supplier-helidon-se inve
 export LAB2_NON_JAVA_BUILDS="foodwinepairing-python"
 export LAB3_JAVA_BUILDS="inventory-helidon-se inventory-micronaut inventory-quarkus"
 export LAB3_NON_JAVA_BUILDS="inventory-python inventory-nodejs inventory-dotnet inventory-go inventory-plsql"
+#export LAB5_JAVA_BUILDS="db-log-exporter trace-log-exporter"
 export LAB7_JAVA_BUILDS="order-mongodb-kafka inventory-postgres-kafka"
 export LAB7_NON_JAVA_BUILDS=""