various observability work (oracle#441)

* 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 * cloudbank k8s service and funds transfer * various changes and observability exporter work * various changes and observability exporter work * various changes and observability exporter work * various changes and observability exporter work * various changes and observability exporter work * various changes and observability exporter work * various changes and observability exporter work * various changes and observability exporter work * various changes and observability exporter work * various changes and observability exporter work * various changes and observability exporter work * various changes and observability exporter work * various changes and observability exporter work * various changes and observability exporter work * various changes and observability exporter work * various changes and observability exporter work * various changes and observability exporter work * various changes and observability exporter work * various changes and observability exporter work * various changes and observability exporter work * various changes and observability exporter work * various changes and observability exporter work * move tests dir under grabdish * privs for springboot-inventory service * add back grabdish-dashboard.json * add back grabdish-dashboard.json * add back grabdish-dashboard.json * reconcile test changes * observability work * observability work * observability work * observability work * observability work * observability work * observability work * observability work * observability work * observability work * observability work * observability work * observability work * observability work * observability work * observability work * observability work * observability work * observability work * observability work * observability work * observability work * observability work
egorcl · Jun 16, 2022 · 4f0a430 · 4f0a430
1 parent c599ebf
commit 4f0a430
Show file tree

Hide file tree

Showing 19 changed files with 2,125 additions and 38 deletions.
diff --git a/grabdish/deploy-noLB.sh b/grabdish/deploy-noLB.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+# 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.
+
+MS="order-helidon supplier-helidon-se inventory-helidon"
+for s in $MS; do
+    echo ________________________________________
+    echo "Deploying $s..."
+    echo ________________________________________
+    cd $GRABDISH_HOME/$s
+    ./deploy.sh
+    cd $GRABDISH_HOME
+done
+
+echo ________________________________________
+echo "Deploying frontend-helidon with NodePort instead of Ingress..."
+echo ________________________________________
+cd $GRABDISH_HOME/frontend-helidon
+./deploy-noLB.sh
+cd $GRABDISH_HOME
+
+echo ________________________________________
+echo ...finished
+echo ________________________________________
diff --git a/grabdish/frontend-helidon/deploy-noLB.sh b/grabdish/frontend-helidon/deploy-noLB.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+## Copyright (c) 2022 Oracle and/or its affiliates.
+## Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
+
+kubectl delete service ingress-nginx-controller -n msdataworkshop
+k8s-deploy 'frontend-helidon-deployment.yaml frontend-service-nodeport.yaml'
diff --git a/grabdish/frontend-helidon/frontend-service-nodeport.yaml b/grabdish/frontend-helidon/frontend-service-nodeport.yaml
@@ -0,0 +1,21 @@
+
+##
+## 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: v1
+kind: Service
+metadata:
+  name: frontend
+  labels:
+    app: frontend
+  #annotations:
+  #  service.beta.kubernetes.io/oci-load-balancer-ssl-ports: "443"
+  #  service.beta.kubernetes.io/oci-load-balancer-tls-secret: ssl-certificate-secret
+spec:
+  type: NodePort
+  ports:
+    - port: 8080
+      name: metrics
+      targetPort: 8080
+  selector:
+    app: frontend
diff --git a/grabdish/frontend-helidon/src/main/java/io/helidon/data/examples/FrontEndResource.java b/grabdish/frontend-helidon/src/main/java/io/helidon/data/examples/FrontEndResource.java
@@ -217,6 +217,19 @@ public String placeorder(Command command) {
 
     }
 
+    int autoincrementorderid = 1;
+    @POST
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    @Path("/placeorderautoincrement")
+    @Traced(operationName = "Frontend.placeOrder")
+    @Timed(name = "frontend_placeOrder_timed") //length of time of an object
+    @Counted(name = "frontend_placeOrder_counted") //amount of invocations
+    public String placeorderautoincrement(Command command) {
+        command.orderId = autoincrementorderid++;
+        return placeorder(command);
+    }
+
     @POST
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.APPLICATION_JSON)

diff --git a/grabdish/observability/createMonitorsAndExporters.sh b/grabdish/observability/createMonitorsAndExporters.sh
@@ -12,15 +12,7 @@ kubectl apply -f db-metrics-exporter/db-metrics-orderpdb-service-monitor.yaml -n
 kubectl apply -f db-metrics-exporter/db-metrics-inventorypdb-service-monitor.yaml -n msdataworkshop
 kubectl get ServiceMonitor --all-namespaces
 echo
-echo create deployments and services for db metrics exporters...
+echo create deployments and services for db observability exporters...
 cd db-metrics-exporter
 ./deploy.sh
 cd ../
-cd db-log-exporter
-./deploy.sh
-cd ../
-#echo
-#echo create deployments and services for db log exporters...
-#cd db-log-exporter
-#./deploy.sh
-#cd ../