Merge "Add health check, metrics and prometheus endpoints for CL participants"

7 files changed, 39 insertions, 5 deletions

diff --git a/packages/policy-clamp-docker/src/main/docker/ClRuntimeDockerfile b/packages/policy-clamp-docker/src/main/docker/ClRuntimeDockerfile
index 9167b226a..01b150bd2 100644
--- a/packages/policy-clamp-docker/src/main/docker/ClRuntimeDockerfile
+++ b/packages/policy-clamp-docker/src/main/docker/ClRuntimeDockerfile
@@ -46,6 +46,8 @@ RUN chown -R policy:policy * && \
     chmod 755 bin/*.sh && \
     chown -R policy:policy /app
 
+EXPOSE 6969
+
 USER policy
 WORKDIR $POLICY_HOME/bin
 ENTRYPOINT [ "./controlloop-runtime.sh" ]
diff --git a/packages/policy-clamp-docker/src/main/docker/HttpParticipantDockerfile b/packages/policy-clamp-docker/src/main/docker/HttpParticipantDockerfile
index 88bf34579..294a59754 100644
--- a/packages/policy-clamp-docker/src/main/docker/HttpParticipantDockerfile
+++ b/packages/policy-clamp-docker/src/main/docker/HttpParticipantDockerfile
@@ -47,6 +47,8 @@ RUN chown -R policy:policy * && \
     chmod 755 bin/*.sh && \
     chown -R policy:policy /app
 
+EXPOSE 8084
+
 USER policy
 WORKDIR $POLICY_HOME/bin
 ENTRYPOINT [ "./http-participant.sh" ]
diff --git a/packages/policy-clamp-docker/src/main/docker/PolicyParticipantDockerfile b/packages/policy-clamp-docker/src/main/docker/PolicyParticipantDockerfile
index 08a731c0c..14f10dd6f 100644
--- a/packages/policy-clamp-docker/src/main/docker/PolicyParticipantDockerfile
+++ b/packages/policy-clamp-docker/src/main/docker/PolicyParticipantDockerfile
@@ -46,6 +46,8 @@ RUN chown -R policy:policy * && \
     chmod 755 bin/*.sh && \
     chown -R policy:policy /app
 
+EXPOSE 8085
+
 USER policy
 WORKDIR $POLICY_HOME/bin
 ENTRYPOINT [ "./policy-participant.sh" ]
diff --git a/packages/policy-clamp-tarball/src/main/resources/etc/ClRuntimeParameters.yaml b/packages/policy-clamp-tarball/src/main/resources/etc/ClRuntimeParameters.yaml
index a01c49881..1a57f2347 100644
--- a/packages/policy-clamp-tarball/src/main/resources/etc/ClRuntimeParameters.yaml
+++ b/packages/policy-clamp-tarball/src/main/resources/etc/ClRuntimeParameters.yaml
@@ -1,7 +1,7 @@
 spring:
   security:
     user:
-      name: healthcheck
+      name: runtimeUser
       password: zb!XztG34
   http:
     converters:
diff --git a/packages/policy-clamp-tarball/src/main/resources/etc/HttpParticipantParameters.yaml b/packages/policy-clamp-tarball/src/main/resources/etc/HttpParticipantParameters.yaml
index be421fcae..b13059a69 100644
--- a/packages/policy-clamp-tarball/src/main/resources/etc/HttpParticipantParameters.yaml
+++ b/packages/policy-clamp-tarball/src/main/resources/etc/HttpParticipantParameters.yaml
@@ -1,3 +1,10 @@
+spring:
+  security:
+    user:
+      name: participantUser
+      password: zb!XztG34
+security:
+  enable-csrf: false
 participant:
   intermediaryParameters:
     reportingTimeIntervalMs: 120000
@@ -22,3 +29,12 @@ participant:
             - ${topicServer:message-router}
           topicCommInfrastructure: dmaap
           useHttps: true
+management:
+  endpoints:
+    web:
+      exposure:
+        include: health, metrics, prometheus
+server:
+  port: 8084
+  servlet:
+    context-path: /onap/httpparticipant
diff --git a/packages/policy-clamp-tarball/src/main/resources/etc/KubernetesParticipantParameters.yaml b/packages/policy-clamp-tarball/src/main/resources/etc/KubernetesParticipantParameters.yaml
index d605cfa1d..3b0a97113 100644
--- a/packages/policy-clamp-tarball/src/main/resources/etc/KubernetesParticipantParameters.yaml
+++ b/packages/policy-clamp-tarball/src/main/resources/etc/KubernetesParticipantParameters.yaml
@@ -1,7 +1,7 @@
 spring:
   security:
     user:
-      name: healthcheck
+      name: participantUser
       password: zb!XztG34
 security:
   enable-csrf: false
@@ -39,10 +39,8 @@ management:
   endpoints:
     web:
       exposure:
-        include: "loggers,logfile,health,info,metrics,threaddump,heapdump"
+        include: health, metrics, prometheus
 server:
-  # Configuration of the HTTP/REST server. The parameters are defined and handled by the springboot framework.
-  # See springboot documentation.
   port: 8083
   servlet:
     context-path: /onap/k8sparticipant
diff --git a/packages/policy-clamp-tarball/src/main/resources/etc/PolicyParticipantParameters.yaml b/packages/policy-clamp-tarball/src/main/resources/etc/PolicyParticipantParameters.yaml
index 625b15b89..b357ae424 100644
--- a/packages/policy-clamp-tarball/src/main/resources/etc/PolicyParticipantParameters.yaml
+++ b/packages/policy-clamp-tarball/src/main/resources/etc/PolicyParticipantParameters.yaml
@@ -1,3 +1,8 @@
+spring:
+  security:
+    user:
+      name: participantUser
+      password: zb!XztG34
 
 participant:
   pdpGroup: defaultGroup
@@ -43,3 +48,12 @@ participant:
             - ${topicServer:message-router}
           topicCommInfrastructure: dmaap
           useHttps: true
+management:
+  endpoints:
+    web:
+      exposure:
+        include: health, metrics, prometheus
+server:
+  port: 8085
+  servlet:
+    context-path: /onap/policyparticipant