From 08fe971ba3012e913b9c9f28aee688a5c581756a Mon Sep 17 00:00:00 2001
From: "puthuparambil.aditya" <aditya.puthuparambil@bell.ca>
Date: Tue, 13 Jul 2021 11:52:13 +0100
Subject: Expose Prometheus metrics for monitoring ncmp-dmi-plugin

Issue-ID: CPS-492
Signed-off-by: puthuparambil.aditya <aditya.puthuparambil@bell.ca>
Change-Id: Id8e91883973aec2654ae0e6cc0a859bc1121018a
---
 docker-compose/docker-compose.yml  |  4 +++-
 pom.xml                            |  9 +++++++--
 src/main/resources/application.yml | 11 ++++++-----
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 78207f94..81ac5235 100755
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -1,5 +1,6 @@
 # ============LICENSE_START=======================================================
 # Copyright (C) 2021 Nordix Foundation
+# Modifications Copyright (C) 2021 Bell Canada.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,7 +24,8 @@ services:
     container_name: ncmp-dmi-plugin
     image: ${DOCKER_REPO:-nexus3.onap.org:10003}/onap/ncmp-dmi-plugin:${VERSION:-latest}
     ports:
-      - "8883:8080"
+      - "8783:8080"
+      - "8787:8081"
     environment:
       CPS_USERNAME: ${CPS_USERNAME:-cpsuser}
       CPS_PASSWORD: ${CPS_PASSWORD:-cpsr0cks!}
diff --git a/pom.xml b/pom.xml
index 1f3c2049..699f79d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,7 @@
 <!--
   ============LICENSE_START=======================================================
   Copyright (c) 2021 Nordix Foundation.
+  Modifications Copyright (C) 2021 Bell Canada.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -18,8 +19,8 @@
   ============LICENSE_END=========================================================
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onap.oparent</groupId>
@@ -115,6 +116,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-registry-prometheus</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <resources>
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a8e765e2..ad1c8a3c 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,6 @@
 #  ============LICENSE_START=======================================================
-#  Modification (C) 2021 Nordix Foundation
+#  Copyright (C) 2021 Nordix Foundation
+#  Modifications Copyright (C) 2021 Bell Canada.
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -24,23 +25,23 @@ rest:
     dmi-base-path: /dmi/api
 
 security:
-  permit-uri: /manage/health/**,/manage/info,/swagger-ui/**,/swagger-resources/**,/v3/api-docs
+  permit-uri: /manage/**,/swagger-ui/**,/swagger-resources/**,/v3/api-docs
   auth:
     username: ${CPS_USERNAME}
     password: ${CPS_PASSWORD}
 
 # Actuator
 management:
+  server:
+    port: 8081
   endpoints:
     web:
       base-path: /manage
       exposure:
-        include: info,health,loggers
+        include: info,health,loggers,prometheus
   endpoint:
     health:
       show-details: always
       # kubernetes probes: liveness and readiness
       probes:
         enabled: true
-    loggers:
-      enabled: true
-- 
cgit 1.2.3-korg