oracle
diff --git a/‎.vscode/settings.json
Lines changed: 0 additions & 4 deletions b/‎.vscode/settings.json
Lines changed: 0 additions & 4 deletions
diff --git a/‎grabdish/docs/AutoTest.md
Lines changed: 1 addition & 1 deletion b/‎grabdish/docs/AutoTest.md
Lines changed: 1 addition & 1 deletion
diff --git a/‎grabdish/env.sh
Lines changed: 2 additions & 0 deletions b/‎grabdish/env.sh
Lines changed: 2 additions & 0 deletions
diff --git a/‎grabdish/frontend-helidon/build.sh
Lines changed: 5 additions & 4 deletions b/‎grabdish/frontend-helidon/build.sh
Lines changed: 5 additions & 4 deletions
diff --git a/‎grabdish/frontend-helidon/frontend-service-monitor.yaml
Lines changed: 37 additions & 0 deletions b/‎grabdish/frontend-helidon/frontend-service-monitor.yaml
Lines changed: 37 additions & 0 deletions
diff --git a/‎grabdish/frontend-helidon/frontend-service.yaml
Lines changed: 2 additions & 2 deletions b/‎grabdish/frontend-helidon/frontend-service.yaml
Lines changed: 2 additions & 2 deletions
diff --git a/‎grabdish/frontend-helidon/pom.xml
Lines changed: 13 additions & 1 deletion b/‎grabdish/frontend-helidon/pom.xml
Lines changed: 13 additions & 1 deletion
diff --git a/‎grabdish/frontend-helidon/src/main/java/io/helidon/data/examples/FrontEndResource.java
Lines changed: 8 additions & 2 deletions b/‎grabdish/frontend-helidon/src/main/java/io/helidon/data/examples/FrontEndResource.java
Lines changed: 8 additions & 2 deletions
diff --git a/‎grabdish/frontend-helidon/src/main/resources/web/index.html
Lines changed: 27 additions & 2 deletions b/‎grabdish/frontend-helidon/src/main/resources/web/index.html
Lines changed: 27 additions & 2 deletions
diff --git a/‎grabdish/inventory-dotnet/build.sh
Lines changed: 7 additions & 2 deletions b/‎grabdish/inventory-dotnet/build.sh
Lines changed: 7 additions & 2 deletions
@@ -30,7 +30,7 @@ export TEST_USER_OCID='ocid1.user.oc1..xxxxx'
 export GITHUB_BRANCH='main'
 export GITHUB_USER='myghuser'
 export TEST_DB_PASSWORD='Welcome12345;#!:'
-export TEST_UI_PASSWORD='Welcome1;#!"'
+export TEST_UI_PASSWORD='Welcome1;#!:"'
 ```
 
 6. Clone the code
 
@@ -57,6 +57,8 @@ alias secrets='kubectl get secrets --all-namespaces'
 alias ingresssecret='kubectl get secrets --all-namespaces | grep istio-ingressgateway-certs'
 alias virtualservices='kubectl get virtualservices --all-namespaces'
 alias deployments='kubectl get deployments --all-namespaces'
+alias servicemonitors='kubectl get servicemonitors --all-namespaces'
+alias configmaps='kubectl get configmaps --all-namespaces'
 alias msdataworkshop='echo deployments... ; deployments|grep msdataworkshop ; echo pods... ; pods|grep msdataworkshop ; echo services... ; services | grep msdataworkshop ; echo secrets... ; secrets|grep msdataworkshop ; echo "other shortcut commands... most can take partial podname as argument, such as [logpod front] or [deletepod order]...  pods  services secrets deployments "'
 
 export PATH=$PATH:$GRABDISH_HOME/utils/
@@ -10,17 +10,18 @@ SCRIPT_DIR=$(dirname $0)
 IMAGE_NAME=frontend-helidon
 IMAGE_VERSION=0.1
 
-export DOCKER_REGISTRY=$(state_get DOCKER_REGISTRY)
+if [ -z "$DOCKER_REGISTRY" ]; then
+    echo "DOCKER_REGISTRY not set. Will get it with state_get"
+  export DOCKER_REGISTRY=$(state_get DOCKER_REGISTRY)
+fi
 
-if [ -z "DOCKER_REGISTRY" ]; then
+if [ -z "$DOCKER_REGISTRY" ]; then
     echo "Error: DOCKER_REGISTRY env variable needs to be set!"
     exit 1
 fi
 
 export IMAGE=${DOCKER_REGISTRY}/${IMAGE_NAME}:${IMAGE_VERSION}
 
-# mvn install
-# mvn package docker:build
 mvn package
 
 docker push $IMAGE
 
@@ -0,0 +1,37 @@
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: prometheus-frontend
+  labels:
+    release: stable
+spec:
+  endpoints:
+    - interval: 5s
+      port: metrics
+  selector:
+    matchLabels:
+      app: frontend
+
+#apiVersion: monitoring.coreos.com/v1
+#kind: ServiceMonitor
+#metadata:
+#  name: prometheus-frontend
+#  labels:
+#    release: stable
+#spec:
+#  endpoints:
+#    - interval: 5s
+#      port: https
+#      scheme: https
+#      tlsConfig:
+#        insecureSkipVerify: true
+#      basicAuth:
+#        password:
+#          name: frontendadmin
+#          key: password
+#        username:
+#          name: frontendadmin
+#          key: user
+#  selector:
+#    matchLabels:
+#      app: frontend
@@ -12,11 +12,11 @@ metadata:
   #  service.beta.kubernetes.io/oci-load-balancer-ssl-ports: "443"
   #  service.beta.kubernetes.io/oci-load-balancer-tls-secret: ssl-certificate-secret
 spec:
-  #type: LoadBalancer
+#  type: LoadBalancer
   type: ClusterIP
   ports:
   - port: 80
-    name: http
+    name: metrics
     targetPort: 8080
   selector:
     app: frontend
@@ -129,11 +129,23 @@
                 <groupId>io.helidon.microprofile.bundles</groupId>
                 <artifactId>helidon-microprofile</artifactId>
             </dependency>
-            <!--tracing-->
             <dependency>
                 <groupId>io.helidon.tracing</groupId>
                 <artifactId>helidon-tracing-jaeger</artifactId>
             </dependency>
+            <dependency>
+                <groupId>io.helidon.metrics</groupId>
+                <artifactId>helidon-metrics</artifactId>
+            </dependency>
+            <dependency>
+                <groupId>io.helidon.tracing</groupId>
+                <artifactId>helidon-tracing-jaeger</artifactId>
+            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>io.helidon.metrics</groupId>-->
+<!--                <artifactId>helidon-metrics-trace-exemplar</artifactId>-->
+<!--                <scope>runtime</scope>-->
+<!--            </dependency>-->
             <dependency>
                 <groupId>org.jboss</groupId>
                 <artifactId>jandex</artifactId>
 
@@ -15,6 +15,8 @@
 import io.opentracing.Tracer;
 import org.eclipse.microprofile.auth.LoginConfig;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
+import org.eclipse.microprofile.metrics.annotation.Counted;
+import org.eclipse.microprofile.metrics.annotation.Timed;
 import org.eclipse.microprofile.opentracing.Traced;
 
 import javax.annotation.security.DeclareRoles;
@@ -188,8 +190,10 @@ public Response jsResources(@PathParam("path") final String path) {
     @POST
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.APPLICATION_JSON)
-    @Traced(operationName = "Frontend.placeOrder")
     @Path("/placeorder")
+    @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 placeorder(Command command) {
         try {
             System.out.println("FrontEndResource.serviceName " + command.serviceName);
@@ -247,7 +251,9 @@ public String command(Command command) {
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.TEXT_PLAIN)
     @Traced(operationName = "FrontEnd.getmetrics")
-    @Path("/metrics")
+    @Path("/getmetrics")
+    //not to be confused with the /metrics of this frontend service,
+    // this is a call through to a service (can be any service but the frontend only calls order service) to get and display it's metrics
     public String getMetrics(Command command) {
         String urlString = "http://" + command.serviceName + ".msdataworkshop:8080/" + command.commandName;
         System.out.println("FrontEndResource.getMetrics url:" + urlString);
 
@@ -147,9 +147,10 @@ <h1 class="oj-sm-only-hide oj-web-applayout-header-title" title="Application Nam
                   <br><br>
                   <br>Transactional Exactly-Once Message Delivery Tests...
                   <br>
-                  <oj-button disabled="[[inProgress]]" on-oj-action="[[lab11CrashAfterInsertAction]]">Crash order service after Order is inserted (before Order message is sent to Inventory service)</oj-button>
+                  <oj-button disabled="[[inProgress]]" on-oj-action="[[lab11CrashAfterInsertAction]]">Crash Order service after Order is inserted (before Order message is sent to Inventory service)</oj-button>
                   <br><oj-button disabled="[[inProgress]]" on-oj-action="[[lab11CrashAfterOrderMessageReceivedAction]]">Crash Inventory service after Order message is received (before inventory for order is checked)</oj-button>
                   <br><oj-button disabled="[[inProgress]]" on-oj-action="[[lab11CrashAfterOrderMessageProcessedAction]]">Crash Inventory service after inventory for order is checked (before Inventory status message is sent)</oj-button>
+                  <br><oj-button disabled="[[inProgress]]" on-oj-action="[[lab11CrashAfterInventoryMessageReceivedAction]]">Crash Order service after Inventory message is received (before Order status is updated)</oj-button>
                 </div>
                 <!-- lab10 -->
                 <div slot="lab10">
@@ -674,7 +675,7 @@ <h1 class="oj-sm-only-hide oj-web-applayout-header-title" title="Application Nam
               body: JSON.stringify(order)
             };
 
-            fetch('/metrics', fetchOptions).then(fetchResult => {
+            fetch('/getmetrics', fetchOptions).then(fetchResult => {
               vm.httpCode(fetchResult.status);
               fetchResult.text().then(payload => {
                 vm.labResult(payload);
@@ -880,6 +881,30 @@ <h1 class="oj-sm-only-hide oj-web-applayout-header-title" title="Application Nam
             });
           };
 
+          this.lab11CrashAfterInventoryMessageReceivedAction = function (event, vm) {
+            vm.inProgress(true);
+            var order = {
+              serviceName: 'order',
+              commandName: 'crashAfterInventoryMessageReceived',
+              orderId: -1,
+              orderItem: '',
+              deliverTo: ''
+            };
+            var fetchOptions = {
+              method: 'POST',
+              headers: { 'Content-Type': 'application/json' },
+              body: JSON.stringify(order)
+            };
+
+            fetch('/command', fetchOptions).then(fetchResult => {
+              vm.httpCode(fetchResult.status);
+              fetchResult.text().then(payload => {
+                vm.labResult(payload);
+                vm.inProgress(false);
+              });
+            });
+          };
+
 
           // Footer
           this.footerLinks = [
 
@@ -5,8 +5,13 @@
 
 IMAGE_NAME=inventory-dotnet
 IMAGE_VERSION=0.1
-export DOCKER_REGISTRY=$(state_get DOCKER_REGISTRY)
-if [ -z "DOCKER_REGISTRY" ]; then
+
+if [ -z "$DOCKER_REGISTRY" ]; then
+    echo "DOCKER_REGISTRY not set. Will get it with state_get"
+  export DOCKER_REGISTRY=$(state_get DOCKER_REGISTRY)
+fi
+
+if [ -z "$DOCKER_REGISTRY" ]; then
     echo "Error: DOCKER_REGISTRY env variable needs to be set!"
     exit 1
 fi