+
+
\ No newline at end of file
diff --git a/example-apps/sre-demo-frontend-app/src/assets/base.css b/example-apps/sre-demo-frontend-app/src/assets/base.css
new file mode 100644
index 00000000..e69de29b
diff --git a/example-apps/sre-demo-frontend-app/src/assets/logo.svg b/example-apps/sre-demo-frontend-app/src/assets/logo.svg
new file mode 100644
index 00000000..bc826fed
--- /dev/null
+++ b/example-apps/sre-demo-frontend-app/src/assets/logo.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/example-apps/sre-demo-frontend-app/src/assets/main.css b/example-apps/sre-demo-frontend-app/src/assets/main.css
new file mode 100644
index 00000000..e69de29b
diff --git a/example-apps/sre-demo-frontend-app/src/components/CounterForm.vue b/example-apps/sre-demo-frontend-app/src/components/CounterForm.vue
new file mode 100644
index 00000000..4fb6bcbf
--- /dev/null
+++ b/example-apps/sre-demo-frontend-app/src/components/CounterForm.vue
@@ -0,0 +1,104 @@
+
+
Counter metric
+
+
+
+
+
+
Successful
+
Exceptions
+
Total
+
+
+
+
+
{{ successCounter }}
+
{{ exceptionCounter }}
+
{{ totalCounter }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/example-apps/sre-demo-frontend-app/src/components/Version.vue b/example-apps/sre-demo-frontend-app/src/components/Version.vue
new file mode 100644
index 00000000..f423b28d
--- /dev/null
+++ b/example-apps/sre-demo-frontend-app/src/components/Version.vue
@@ -0,0 +1,35 @@
+
+ {{`API Version: ${version.runtime} ${version.version}`}}
+
+
+
\ No newline at end of file
diff --git a/example-apps/sre-demo-frontend-app/src/main.js b/example-apps/sre-demo-frontend-app/src/main.js
new file mode 100644
index 00000000..53919d04
--- /dev/null
+++ b/example-apps/sre-demo-frontend-app/src/main.js
@@ -0,0 +1,6 @@
+import { createApp } from "vue";
+import App from "./App.vue";
+
+import "./assets/main.css";
+
+createApp(App).mount("#app");
diff --git a/example-apps/sre-demo-frontend-app/vite.config.js b/example-apps/sre-demo-frontend-app/vite.config.js
new file mode 100644
index 00000000..20a19c3e
--- /dev/null
+++ b/example-apps/sre-demo-frontend-app/vite.config.js
@@ -0,0 +1,18 @@
+import { fileURLToPath, URL } from "node:url";
+
+import { defineConfig } from "vite";
+import vue from "@vitejs/plugin-vue";
+
+// https://vitejs.dev/config/
+export default defineConfig({
+ plugins: [vue()],
+ resolve: {
+ alias: {
+ "@": fileURLToPath(new URL("./src", import.meta.url)),
+ },
+ },
+ server: {
+ host: true,
+ port: 4000,
+ },
+});
diff --git a/example-apps/sre-demo-java-app/README.md b/example-apps/sre-demo-java-app/README.md
index c3279254..de623a6b 100644
--- a/example-apps/sre-demo-java-app/README.md
+++ b/example-apps/sre-demo-java-app/README.md
@@ -17,10 +17,10 @@ docker build -t sre-demo-java-app .
Once built, the application can be run using the following command:
```
-docker run -ti -p 8081:8080 sre-demo-java-app
+docker run -ti -p 4001:4001 sre-demo-java-app
```
-Navigate to http://localhost:8081 and the application should serve a simple HTML page for testing purposes.
+Navigate to http://localhost:4001/actutor/prometheus and you should be able to see your metrics in a prometheus format.
## How to integrate with MaC
@@ -37,7 +37,7 @@ Navigate to http://localhost:8081 and the application should serve a simple HTML
"namespace": "localhost"
},
"targets": [
- "host.docker.internal:8081"
+ "host.docker.internal:4001"
]
}
]
diff --git a/example-apps/sre-demo-java-app/pom.xml b/example-apps/sre-demo-java-app/pom.xml
index a492f7cd..24d3c175 100644
--- a/example-apps/sre-demo-java-app/pom.xml
+++ b/example-apps/sre-demo-java-app/pom.xml
@@ -30,11 +30,6 @@
org.springframework.bootspring-boot-starter-web
-
- org.springframework.boot
- spring-boot-starter-thymeleaf
-
-
org.springframework.bootspring-boot-starter-test
diff --git a/example-apps/sre-demo-java-app/src/main/java/hocto/sredemojavaapp/MetricRestController.java b/example-apps/sre-demo-java-app/src/main/java/hocto/sredemojavaapp/MetricRestController.java
index 189fbc31..e86e6835 100644
--- a/example-apps/sre-demo-java-app/src/main/java/hocto/sredemojavaapp/MetricRestController.java
+++ b/example-apps/sre-demo-java-app/src/main/java/hocto/sredemojavaapp/MetricRestController.java
@@ -1,13 +1,13 @@
package hocto.sredemojavaapp;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
-@Controller
+@RestController
public class MetricRestController {
private MetricService metricService;
@@ -16,25 +16,29 @@ public MetricRestController(MetricService metricService) {
this.metricService = metricService;
}
- @GetMapping("/")
- public String index(Model model) {
- model.addAttribute("successful", metricService.getSuccessValue());
- model.addAttribute("exceptions", metricService.getExceptionsValue());
- model.addAttribute("total", metricService.getTotalValue());
-
- return "index";
+ @CrossOrigin(origins = "*")
+ @GetMapping("/values")
+ public SimpleCounterMetricResponse index() {
+ return new SimpleCounterMetricResponse(metricService.getSuccessValue(), metricService.getExceptionsValue(), metricService.getTotalValue());
}
- @RequestMapping(value = "/success", method = RequestMethod.POST)
- public String handleSuccess(@RequestParam(defaultValue = "1", name = "amount") String amount) {
- this.metricService.incrementSuccessCounter(Double.parseDouble(amount));
- return "redirect:/";
+ @CrossOrigin(origins = "*")
+ @RequestMapping(value = "/success", method = RequestMethod.POST, produces = "application/json")
+ public SimpleCounterMetricResponse handleSuccess(@RequestBody SimpleCounterMetricRequest request) {
+ this.metricService.incrementSuccessCounter(request.getAmount());
+ return new SimpleCounterMetricResponse(metricService.getSuccessValue(), metricService.getExceptionsValue(), metricService.getTotalValue());
}
- @RequestMapping(value = "/exception", method = RequestMethod.POST)
- public String handleException(@RequestParam(defaultValue = "1", name = "amount") String amount) {
- this.metricService.incrementExceptionCounter(Double.parseDouble(amount));
- return "redirect:/";
+ @CrossOrigin(origins = "*")
+ @RequestMapping(value = "/exception", method = RequestMethod.POST, produces = "application/json")
+ public SimpleCounterMetricResponse handleException(@RequestBody SimpleCounterMetricRequest request) {
+ this.metricService.incrementExceptionCounter(request.getAmount());
+ return new SimpleCounterMetricResponse(metricService.getSuccessValue(), metricService.getExceptionsValue(), metricService.getTotalValue());
}
+ @CrossOrigin(origins = "*")
+ @GetMapping(value = "/version")
+ public VersionResponse handleVersion() {
+ return new VersionResponse();
+ }
}
\ No newline at end of file
diff --git a/example-apps/sre-demo-java-app/src/main/java/hocto/sredemojavaapp/SimpleCounterMetricRequest.java b/example-apps/sre-demo-java-app/src/main/java/hocto/sredemojavaapp/SimpleCounterMetricRequest.java
new file mode 100644
index 00000000..8238cb5c
--- /dev/null
+++ b/example-apps/sre-demo-java-app/src/main/java/hocto/sredemojavaapp/SimpleCounterMetricRequest.java
@@ -0,0 +1,16 @@
+package hocto.sredemojavaapp;
+
+public class SimpleCounterMetricRequest {
+ public double amount;
+
+ public double getAmount() {
+ return amount;
+ }
+
+ public void setAmount(double amount) {
+ this.amount = amount;
+ }
+
+ public SimpleCounterMetricRequest() {
+ }
+}
\ No newline at end of file
diff --git a/example-apps/sre-demo-java-app/src/main/java/hocto/sredemojavaapp/SimpleCounterMetricResponse.java b/example-apps/sre-demo-java-app/src/main/java/hocto/sredemojavaapp/SimpleCounterMetricResponse.java
new file mode 100644
index 00000000..d433e028
--- /dev/null
+++ b/example-apps/sre-demo-java-app/src/main/java/hocto/sredemojavaapp/SimpleCounterMetricResponse.java
@@ -0,0 +1,45 @@
+package hocto.sredemojavaapp;
+
+import java.io.Serializable;
+
+public class SimpleCounterMetricResponse implements Serializable {
+
+ private double good;
+ private double bad;
+ private double total;
+
+ public SimpleCounterMetricResponse(double good, double bad, double total) {
+ this.good = good;
+ this.bad = bad;
+ this.total = total;
+ }
+
+ public double getGood() {
+ return good;
+ }
+
+
+ public void setGood(double good) {
+ this.good = good;
+ }
+
+
+ public double getBad() {
+ return bad;
+ }
+
+
+ public void setBad(double bad) {
+ this.bad = bad;
+ }
+
+
+ public double getTotal() {
+ return total;
+ }
+
+
+ public void setTotal(double total) {
+ this.total = total;
+ }
+}
diff --git a/example-apps/sre-demo-java-app/src/main/java/hocto/sredemojavaapp/VersionResponse.java b/example-apps/sre-demo-java-app/src/main/java/hocto/sredemojavaapp/VersionResponse.java
new file mode 100644
index 00000000..7ad2fc76
--- /dev/null
+++ b/example-apps/sre-demo-java-app/src/main/java/hocto/sredemojavaapp/VersionResponse.java
@@ -0,0 +1,16 @@
+package hocto.sredemojavaapp;
+
+public class VersionResponse {
+
+ private static String runtime = System.getProperty("java.runtime.name");
+ private static String version = System.getProperty("java.version");
+
+ public String getRuntime() {
+ return runtime;
+ }
+
+ public String getVersion() {
+ return version;
+ }
+
+}
diff --git a/example-apps/sre-demo-java-app/src/main/resources/application.properties b/example-apps/sre-demo-java-app/src/main/resources/application.properties
index 9359fada..3f146900 100644
--- a/example-apps/sre-demo-java-app/src/main/resources/application.properties
+++ b/example-apps/sre-demo-java-app/src/main/resources/application.properties
@@ -1 +1,2 @@
-management.endpoints.web.exposure.include=health,info,metrics,prometheus
\ No newline at end of file
+management.endpoints.web.exposure.include=health,info,metrics,prometheus
+server.port=4001
\ No newline at end of file
diff --git a/example-apps/sre-demo-java-app/src/main/resources/templates/index.html b/example-apps/sre-demo-java-app/src/main/resources/templates/index.html
deleted file mode 100644
index 132ddd13..00000000
--- a/example-apps/sre-demo-java-app/src/main/resources/templates/index.html
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
- Document
-
-
-