From 806ca34fef54f94097dcea4fe7c51ccbb044786b Mon Sep 17 00:00:00 2001
From: Makhtar DIAGNE <makhtar.diagne@teamdlab.com>
Date: Sun, 3 May 2020 02:13:57 +0200
Subject: [PATCH] [TECH] Configure Prometheus for SpringBoot services

---
 api/api-iam/iam-external/pom.xml                              | 4 ++++
 .../src/main/resources/iam-external-application.yml           | 2 +-
 api/api-iam/iam-internal/pom.xml                              | 4 ++++
 .../src/main/resources/iam-internal-application.yml           | 2 +-
 api/api-security/security-internal/pom.xml                    | 4 ++++
 .../src/main/resources/security-internal-application.yml      | 2 +-
 pom.xml                                                       | 2 +-
 ui/ui-identity/pom.xml                                        | 4 ++++
 ui/ui-identity/src/main/resources/ui-identity-application.yml | 2 +-
 ui/ui-portal/pom.xml                                          | 4 ++++
 ui/ui-portal/src/main/resources/ui-portal-application.yml     | 4 +---
 11 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/api/api-iam/iam-external/pom.xml b/api/api-iam/iam-external/pom.xml
index 41c77e7b..add98ead 100644
--- a/api/api-iam/iam-external/pom.xml
+++ b/api/api-iam/iam-external/pom.xml
@@ -68,6 +68,10 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
 		</dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-registry-prometheus</artifactId>
+        </dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-configuration-processor</artifactId>
diff --git a/api/api-iam/iam-external/src/main/resources/iam-external-application.yml b/api/api-iam/iam-external/src/main/resources/iam-external-application.yml
index e66b176e..7f61cc82 100644
--- a/api/api-iam/iam-external/src/main/resources/iam-external-application.yml
+++ b/api/api-iam/iam-external/src/main/resources/iam-external-application.yml
@@ -20,7 +20,7 @@ management:
     jmx:
       domain: ${server-identity.identityRole}
       unique-names: true
-      web.exposure.include: info,health,prometheus
+    web.exposure.include: '*'
   endpoint:
     health:
       show-details: always
diff --git a/api/api-iam/iam-internal/pom.xml b/api/api-iam/iam-internal/pom.xml
index 505cc8e7..467063b6 100644
--- a/api/api-iam/iam-internal/pom.xml
+++ b/api/api-iam/iam-internal/pom.xml
@@ -80,6 +80,10 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
 		</dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-registry-prometheus</artifactId>
+        </dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-configuration-processor</artifactId>
diff --git a/api/api-iam/iam-internal/src/main/resources/iam-internal-application.yml b/api/api-iam/iam-internal/src/main/resources/iam-internal-application.yml
index f740946b..9e800d2b 100644
--- a/api/api-iam/iam-internal/src/main/resources/iam-internal-application.yml
+++ b/api/api-iam/iam-internal/src/main/resources/iam-internal-application.yml
@@ -20,7 +20,7 @@ management:
     jmx:
       domain: ${server-identity.identityRole}
       unique-names: true
-    web.exposure.include: info,health,prometheus
+    web.exposure.include: '*'
   endpoint:
     health:
       show-details: always
diff --git a/api/api-security/security-internal/pom.xml b/api/api-security/security-internal/pom.xml
index 7f68d7fa..c61200a9 100644
--- a/api/api-security/security-internal/pom.xml
+++ b/api/api-security/security-internal/pom.xml
@@ -59,6 +59,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-registry-prometheus</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-configuration-processor</artifactId>
diff --git a/api/api-security/security-internal/src/main/resources/security-internal-application.yml b/api/api-security/security-internal/src/main/resources/security-internal-application.yml
index 3bdc6541..a134968c 100644
--- a/api/api-security/security-internal/src/main/resources/security-internal-application.yml
+++ b/api/api-security/security-internal/src/main/resources/security-internal-application.yml
@@ -17,7 +17,7 @@ management:
     jmx:
       domain: ${server-identity.identityRole}
       unique-names: true
-      web.exposure.include: info,health,prometheus
+    web.exposure.include: '*'
   endpoint:
     health:
       show-details: always
diff --git a/pom.xml b/pom.xml
index 3b87a54c..5e0585d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,7 +107,7 @@
         <jsonassert.version>1.5.0</jsonassert.version>
         <logback.version>1.2.3</logback.version>
         <lombok.version>1.18.12</lombok.version>
-        <micrometer.version>1.4.1</micrometer.version>
+        <micrometer.version>1.3.6</micrometer.version>
         <mapstruct.version>1.3.0.Final</mapstruct.version>
         <nio.multipart.parser.version>1.1.0</nio.multipart.parser.version>
         <pac4j.version>4.0.0-RC2</pac4j.version>
diff --git a/ui/ui-identity/pom.xml b/ui/ui-identity/pom.xml
index cd405163..2a3d49ab 100644
--- a/ui/ui-identity/pom.xml
+++ b/ui/ui-identity/pom.xml
@@ -73,6 +73,10 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
 		</dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-registry-prometheus</artifactId>
+        </dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-configuration-processor</artifactId>
diff --git a/ui/ui-identity/src/main/resources/ui-identity-application.yml b/ui/ui-identity/src/main/resources/ui-identity-application.yml
index 252c1dee..2ce8a57a 100644
--- a/ui/ui-identity/src/main/resources/ui-identity-application.yml
+++ b/ui/ui-identity/src/main/resources/ui-identity-application.yml
@@ -17,7 +17,7 @@ management:
     jmx:
       domain: ${server-identity.identityRole}
       unique-names: true
-    web.exposure.include: info,health,prometheus
+    web.exposure.include: '*'
   endpoint:
     health:
       show-details: always
diff --git a/ui/ui-portal/pom.xml b/ui/ui-portal/pom.xml
index 5a0bcb2c..5d46439a 100644
--- a/ui/ui-portal/pom.xml
+++ b/ui/ui-portal/pom.xml
@@ -68,6 +68,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-registry-prometheus</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-configuration-processor</artifactId>
diff --git a/ui/ui-portal/src/main/resources/ui-portal-application.yml b/ui/ui-portal/src/main/resources/ui-portal-application.yml
index 102b44e2..310cf31f 100644
--- a/ui/ui-portal/src/main/resources/ui-portal-application.yml
+++ b/ui/ui-portal/src/main/resources/ui-portal-application.yml
@@ -17,9 +17,7 @@ management:
       jmx:
         domain: ${server-identity.identityRole}
         unique-names: true
-      web:
-        exposure:
-          include: info,health,prometheus
+      web.exposure.include: '*'
     endpoint:
       health:
         show-details: always
-- 
GitLab