Code Review / policy / gui.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 6e4582e)
Enable health check and prometheus on gui-server 06/132106/1
authorliamfallon <liam.fallon@est.tech>
Wed, 9 Nov 2022 18:06:09 +0000 (18:06 +0000)
committerliamfallon <liam.fallon@est.tech>
Wed, 9 Nov 2022 18:06:43 +0000 (18:06 +0000)
Issue-ID: POLICY-4138
Change-Id: Ibd815d54e7ee1df787412ed55d70d8a5dc95f1c0
Signed-off-by: liamfallon <liam.fallon@est.tech>
gui-server/pom.xml patch | blob | history
gui-server/src/main/resources/static/designtime-ui/index.html patch | blob | history
gui-server/src/main/resources/static/runtime-ui/index.html patch | blob | history
gui-server/src/test/resources/application_http.yaml patch | blob | history
gui-server/src/test/resources/application_https.yaml patch | blob | history

diff --git a/gui-server/pom.xml b/gui-server/pom.xml
index b774f0d..4082fd3 100644 (file)
--- a/gui-server/pom.xml
+++ b/gui-server/pom.xml
@@ -39,11 +39,21 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </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>
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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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
ARCHIVED- 2024-07-26 at the request of the project