diff --git a/pom.xml b/pom.xml
index a641cfacca0276e572538143f013731acb883312..fbbbd4b7320238866cab87a2c2414316de12dafc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.ozgcloud.user</groupId>
<artifactId>user-manager</artifactId>
- <version>2.7.0</version>
+ <version>2.7.1</version>
<name>OZG-Cloud User Manager</name>
<packaging>pom</packaging>
diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index 2bebcaeb28b0b22578d5b4b70bb9f74fc27e8e2b..c27b5d9f1144032ffe2ff94847fe171947140d83 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -137,11 +137,14 @@ spec:
- containerPort: 8080
name: http
protocol: TCP
+ - containerPort: 9002
+ name: metrics
+ protocol: TCP
readinessProbe:
failureThreshold: 3
httpGet:
path: /q/health/ready
- port: 8080
+ port: metrics
scheme: HTTP
periodSeconds: 10
successThreshold: 1
@@ -150,7 +153,7 @@ spec:
failureThreshold: 10
httpGet:
path: /q/health/started
- port: 8080
+ port: metrics
scheme: HTTP
initialDelaySeconds: 30
periodSeconds: 10
@@ -161,7 +164,7 @@ spec:
failureThreshold: 10
httpGet:
path: /q/health/started
- port: 8080
+ port: metrics
scheme: HTTP
initialDelaySeconds: 15
periodSeconds: 5
diff --git a/src/main/helm/templates/service.yaml b/src/main/helm/templates/service.yaml
index dd175e4b848bd56b7cb19f226b3b45e65582f8b3..cd4042a86e44606c06e820383273b05b7e3202f5 100644
--- a/src/main/helm/templates/service.yaml
+++ b/src/main/helm/templates/service.yaml
@@ -39,6 +39,9 @@ spec:
- name: http
port: 8080
protocol: TCP
+ - name: metrics
+ port: 9002
+ protocol: TCP
selector:
{{- include "app.matchLabels" . | indent 4 }}
component: user-manager
diff --git a/src/main/helm/templates/service_monitor.yaml b/src/main/helm/templates/service_monitor.yaml
index 29e7125bbb9d391b3cf0081ab78ed17e643a1d79..66ec606c670a1b4b3537f63486fe49ed90652205 100644
--- a/src/main/helm/templates/service_monitor.yaml
+++ b/src/main/helm/templates/service_monitor.yaml
@@ -36,7 +36,7 @@ metadata:
spec:
endpoints:
- interval: 30s
- targetPort: 8080
+ targetPort: metrics
path: /q/metrics
scheme: http
namespaceSelector:
diff --git a/src/test/helm/deployment_probes_test.yaml b/src/test/helm/deployment_probes_test.yaml
index b0b21391ef3675e497828239825c412782eeaa6b..519e64d054a3a57b1f1927b910a9b0b81899e4b8 100644
--- a/src/test/helm/deployment_probes_test.yaml
+++ b/src/test/helm/deployment_probes_test.yaml
@@ -53,7 +53,7 @@ tests:
failureThreshold: 10
httpGet:
path: /q/health/started
- port: 8080
+ port: metrics
scheme: HTTP
initialDelaySeconds: 15
periodSeconds: 5
@@ -72,7 +72,7 @@ tests:
failureThreshold: 3
httpGet:
path: /q/health/ready
- port: 8080
+ port: metrics
scheme: HTTP
periodSeconds: 10
successThreshold: 1
@@ -86,7 +86,7 @@ tests:
failureThreshold: 10
httpGet:
path: /q/health/started
- port: 8080
+ port: metrics
scheme: HTTP
initialDelaySeconds: 30
periodSeconds: 10
diff --git a/src/test/helm/service_monitor_test.yaml b/src/test/helm/service_monitor_test.yaml
index 32b0cf3ec13546a57baf0a3f0e4cae341cf4f298..38f07ce0319aba447fcde7c1ee8069a9b4525157 100644
--- a/src/test/helm/service_monitor_test.yaml
+++ b/src/test/helm/service_monitor_test.yaml
@@ -71,7 +71,7 @@ tests:
interval: 30s
path: /q/metrics
scheme: http
- targetPort: 8080
+ targetPort: metrics
- it: namespace selector should contain the namespace
asserts:
- contains:
diff --git a/src/test/helm/service_test.yaml b/src/test/helm/service_test.yaml
index 00d7b3d378f53e4e8e1bebfdc2dd0498b84b2a90..b5141ecde11382cbefc5ed6c12582e1c88870858 100644
--- a/src/test/helm/service_test.yaml
+++ b/src/test/helm/service_test.yaml
@@ -85,6 +85,16 @@ tests:
protocol: TCP
count: 1
any: true
+ - it: ports should contain the metrics port
+ asserts:
+ - contains:
+ path: spec.ports
+ content:
+ name: metrics
+ port: 9002
+ protocol: TCP
+ count: 1
+ any: true
- it: selector should contain the component label with the value user-manager
asserts:
- equal:
diff --git a/user-manager-interface/pom.xml b/user-manager-interface/pom.xml
index 2c1c03c17653ba46da8000c3bd66e6a484f1fdb0..667b2c96402324705eb24c0bee847d48a8bf7ede 100644
--- a/user-manager-interface/pom.xml
+++ b/user-manager-interface/pom.xml
@@ -30,7 +30,7 @@
<parent>
<groupId>de.ozgcloud.user</groupId>
<artifactId>user-manager</artifactId>
- <version>2.7.0</version>
+ <version>2.7.1</version>
</parent>
<artifactId>user-manager-interface</artifactId>
diff --git a/user-manager-server/pom.xml b/user-manager-server/pom.xml
index 12cc072cac19c1a042012b249873e7d1c12d1283..8684713d4cd9e5c29de91739da675f0f5be9c196 100644
--- a/user-manager-server/pom.xml
+++ b/user-manager-server/pom.xml
@@ -30,7 +30,7 @@
<parent>
<groupId>de.ozgcloud.user</groupId>
<artifactId>user-manager</artifactId>
- <version>2.7.0</version>
+ <version>2.7.1</version>
</parent>
<artifactId>user-manager-server</artifactId>
diff --git a/user-manager-server/src/main/resources/application.yaml b/user-manager-server/src/main/resources/application.yaml
index 2b4d4d46bbb8454c3a07367095923d2b59921254..c5f0bca40745037a671471028db8c950b57c93fd 100644
--- a/user-manager-server/src/main/resources/application.yaml
+++ b/user-manager-server/src/main/resources/application.yaml
@@ -31,6 +31,9 @@ quarkus:
level: INFO
mongodb:
database: usermanager
+ management:
+ enabled: true
+ port: 9002
grpc:
server:
diff --git a/user-manager-server/src/test/resources/application.yml b/user-manager-server/src/test/resources/application.yml
index 46b99472074ade5ea9df92f4b9a8baf2525e6598..bb3a56bcf9202539a99a364b521f5411408c71f0 100644
--- a/user-manager-server/src/test/resources/application.yml
+++ b/user-manager-server/src/test/resources/application.yml
@@ -15,6 +15,8 @@ quarkus:
level: INFO
oidc:
auth-server-url: https://sso.dev.by.ozg-cloud.de/realms/by-kiel-dev
+ management:
+ test-port: 9003
keycloak:
url: http://localhost:8088