summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorliamfallon <liam.fallon@est.tech>2022-11-09 18:06:09 +0000
committerliamfallon <liam.fallon@est.tech>2022-11-09 18:06:43 +0000
commit7a7c90404e9c0e3faaa3b3a111ed2263d2dad893 (patch)
treeae0ef2e6dd02fe38732486b94d537f12fe80686b
parent6e4582e760f0f63f8938a64b1317658dcde119cd (diff)
Enable health check and prometheus on gui-server
Issue-ID: POLICY-4138 Change-Id: Ibd815d54e7ee1df787412ed55d70d8a5dc95f1c0 Signed-off-by: liamfallon <liam.fallon@est.tech>
-rw-r--r--gui-server/pom.xml10
-rw-r--r--gui-server/src/main/resources/static/designtime-ui/index.html1
-rw-r--r--gui-server/src/main/resources/static/runtime-ui/index.html1
-rw-r--r--gui-server/src/test/resources/application_http.yaml5
-rw-r--r--gui-server/src/test/resources/application_https.yaml5
5 files changed, 20 insertions, 2 deletions
diff --git a/gui-server/pom.xml b/gui-server/pom.xml
index b774f0d..4082fd3 100644
--- a/gui-server/pom.xml
+++ b/gui-server/pom.xml
@@ -41,10 +41,20 @@
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-actuator</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>io.micrometer</groupId>
+ <artifactId>micrometer-registry-prometheus</artifactId>
+ <version>${version.io.micrometer}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
diff --git a/gui-server/src/main/resources/static/designtime-ui/index.html b/gui-server/src/main/resources/static/designtime-ui/index.html
index 8da1b06..4080991 100644
--- a/gui-server/src/main/resources/static/designtime-ui/index.html
+++ b/gui-server/src/main/resources/static/designtime-ui/index.html
@@ -7,6 +7,7 @@
<body>
<ul>
<li><a href="/designtime-ui/apex-editor/index.html">The Apex Policy Editor</a></li>
+ <li>Another Editor</li>
</ul>
</body>
</html>
diff --git a/gui-server/src/main/resources/static/runtime-ui/index.html b/gui-server/src/main/resources/static/runtime-ui/index.html
index 74fa41a..4d0f175 100644
--- a/gui-server/src/main/resources/static/runtime-ui/index.html
+++ b/gui-server/src/main/resources/static/runtime-ui/index.html
@@ -7,6 +7,7 @@
<body>
<ul>
<li><a href="/runtime-ui/clamp/index.html">The CLAMP GUI</a></li>
+ <li>Another Runtime GUI</li>
</ul>
</body>
</html>
diff --git a/gui-server/src/test/resources/application_http.yaml b/gui-server/src/test/resources/application_http.yaml
index 934e933..fbe2f36 100644
--- a/gui-server/src/test/resources/application_http.yaml
+++ b/gui-server/src/test/resources/application_http.yaml
@@ -30,5 +30,8 @@ designtime-ui:
management:
endpoints:
web:
+ base-path: /
exposure:
- include: health, metrics, prometheus
+ include: health,metrics,prometheus
+ path-mapping.metrics: plain-metrics
+ path-mapping.prometheus: metrics
diff --git a/gui-server/src/test/resources/application_https.yaml b/gui-server/src/test/resources/application_https.yaml
index e5a84c1..825d6b9 100644
--- a/gui-server/src/test/resources/application_https.yaml
+++ b/gui-server/src/test/resources/application_https.yaml
@@ -36,5 +36,8 @@ designtime-ui:
management:
endpoints:
web:
+ base-path: /
exposure:
- include: health, metrics, prometheus
+ include: health,metrics,prometheus
+ path-mapping.metrics: plain-metrics
+ path-mapping.prometheus: metrics