Skip to content

Commit 4f0a430

Browse files
paulparkinsonpaulparkinson
authored
various observability work (#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
1 parent c599ebf commit 4f0a430

19 files changed

+2125
-38
lines changed

‎grabdish/deploy-noLB.sh

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
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+
MS="order-helidon supplier-helidon-se inventory-helidon"
6+
for s in $MS; do
7+
echo ________________________________________
8+
echo "Deploying $s..."
9+
echo ________________________________________
10+
cd $GRABDISH_HOME/$s
11+
./deploy.sh
12+
cd $GRABDISH_HOME
13+
done
14+
15+
echo ________________________________________
16+
echo "Deploying frontend-helidon with NodePort instead of Ingress..."
17+
echo ________________________________________
18+
cd $GRABDISH_HOME/frontend-helidon
19+
./deploy-noLB.sh
20+
cd $GRABDISH_HOME
21+
22+
echo ________________________________________
23+
echo ...finished
24+
echo ________________________________________

‎grabdish/frontend-helidon/deploy-noLB.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/bash
2+
## Copyright (c) 2022 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+
kubectl delete service ingress-nginx-controller -n msdataworkshop
6+
k8s-deploy 'frontend-helidon-deployment.yaml frontend-service-nodeport.yaml'

‎grabdish/frontend-helidon/frontend-service-nodeport.yaml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
2+
##
3+
## Copyright (c) 2021 Oracle and/or its affiliates.
4+
## Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
5+
apiVersion: v1
6+
kind: Service
7+
metadata:
8+
name: frontend
9+
labels:
10+
app: frontend
11+
#annotations:
12+
# service.beta.kubernetes.io/oci-load-balancer-ssl-ports: "443"
13+
# service.beta.kubernetes.io/oci-load-balancer-tls-secret: ssl-certificate-secret
14+
spec:
15+
type: NodePort
16+
ports:
17+
- port: 8080
18+
name: metrics
19+
targetPort: 8080
20+
selector:
21+
app: frontend

‎grabdish/frontend-helidon/src/main/java/io/helidon/data/examples/FrontEndResource.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,19 @@ public String placeorder(Command command) {
217217

218218
}
219219

220+
int autoincrementorderid = 1;
221+
@POST
222+
@Consumes(MediaType.APPLICATION_JSON)
223+
@Produces(MediaType.APPLICATION_JSON)
224+
@Path("/placeorderautoincrement")
225+
@Traced(operationName = "Frontend.placeOrder")
226+
@Timed(name = "frontend_placeOrder_timed") //length of time of an object
227+
@Counted(name = "frontend_placeOrder_counted") //amount of invocations
228+
public String placeorderautoincrement(Command command) {
229+
command.orderId = autoincrementorderid++;
230+
return placeorder(command);
231+
}
232+
220233
@POST
221234
@Consumes(MediaType.APPLICATION_JSON)
222235
@Produces(MediaType.APPLICATION_JSON)

‎grabdish/observability/createMonitorsAndExporters.sh

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,7 @@ kubectl apply -f db-metrics-exporter/db-metrics-orderpdb-service-monitor.yaml -n
1212
kubectl apply -f db-metrics-exporter/db-metrics-inventorypdb-service-monitor.yaml -n msdataworkshop
1313
kubectl get ServiceMonitor --all-namespaces
1414
echo
15-
echo create deployments and services for db metrics exporters...
15+
echo create deployments and services for db observability exporters...
1616
cd db-metrics-exporter
1717
./deploy.sh
1818
cd ../
19-
cd db-log-exporter
20-
./deploy.sh
21-
cd ../
22-
#echo
23-
#echo create deployments and services for db log exporters...
24-
#cd db-log-exporter
25-
#./deploy.sh
26-
#cd ../

0 commit comments

Comments
 (0)