From 87c649d9fb3f5dfe4c661eb784e67856358a6dd7 Mon Sep 17 00:00:00 2001
From: jdcs <jonathan.duchesne@hcuge.ch>
Date: Tue, 24 May 2022 14:48:46 +0200
Subject: [PATCH 1/2] feat: set config eureka for memory monitoring graphana

---
 pom.xml                                       | 18 +++++++++++++++
 .../org/karnak/backend/config/AppConfig.java  |  4 ++++
 src/main/resources/application-eureka.yml     | 20 +++++++++++++++++
 src/main/resources/application.yml            | 22 ++++++++++++++++++-
 src/test/resources/application.yml            |  5 +++++
 5 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 src/main/resources/application-eureka.yml

diff --git a/pom.xml b/pom.xml
index 559af5b2..a5edb8ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -395,6 +395,16 @@
       <version>1.1.1</version>
     </dependency>
 
+    <dependency>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-starter</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+    </dependency>
+
     <!--   Monitoring-->
     <dependency>
       <groupId>io.micrometer</groupId>
@@ -689,6 +699,14 @@
         <type>pom</type>
         <version>${vaadin.version}</version>
       </dependency>
+
+          <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-dependencies</artifactId>
+            <version>2021.0.2</version>
+            <type>pom</type>
+            <scope>import</scope>
+          </dependency>
     </dependencies>
   </dependencyManagement>
 
diff --git a/src/main/java/org/karnak/backend/config/AppConfig.java b/src/main/java/org/karnak/backend/config/AppConfig.java
index 5bbee7e7..5798b1c2 100644
--- a/src/main/java/org/karnak/backend/config/AppConfig.java
+++ b/src/main/java/org/karnak/backend/config/AppConfig.java
@@ -29,6 +29,8 @@
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.event.EventListener;
@@ -39,6 +41,8 @@
 @EnableConfigurationProperties
 @ConfigurationProperties
 @EnableCaching
+@EnableDiscoveryClient
+@EnableEurekaClient
 public class AppConfig {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(AppConfig.class);
diff --git a/src/main/resources/application-eureka.yml b/src/main/resources/application-eureka.yml
new file mode 100644
index 00000000..4de2cc5b
--- /dev/null
+++ b/src/main/resources/application-eureka.yml
@@ -0,0 +1,20 @@
+eureka:
+  datacenter: ${DATACENTER:local}
+  instance:
+    instanceId: ${spring.application.name}:${server.port}:${spring.application.instance_id:${random.value}}
+    health-check-url-path: /actuator/health
+    lease-expiration-duration-in-seconds: 2
+    lease-renewal-interval-in-seconds: 1
+    prefer-ip-address: false   # forcer l'enregistrement par hostname
+    metadata-map:
+      startup: ${random.int}    #needed to trigger info and endpoint update after restart
+  client:
+    enabled: true
+    healthcheck:
+      enabled: true
+    fetch-registry: true
+    register-with-eureka: true
+    service-url:
+      defaultZone: ${EUREKA_CLIENT_SERVICE_URL_DEFAULT_ZONE:http://localhost:8761/eureka}
+    registry-fetch-interval-seconds: 3
+    region: ${REGION:local}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a0a56fea..9b26c259 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -34,7 +34,7 @@ spring:
     enabled: true
     change-log: classpath:db/changelog/db.changelog-master.yaml
   profiles:
-    active: '@activatedProperties@,docker,redis'
+    active: '@activatedProperties@,docker,redis, eureka'
   datasource:
     password: ${DB_PASSWORD:5!KAnN@%98%d}
     url: 'jdbc:postgresql://${DB_HOST:localhost}:${DB_PORT:5433}/${DB_NAME:karnak}'
@@ -63,6 +63,12 @@ spring:
       jdbc:
         lob:
           non_contextual_creation: true
+info:
+#  environment: ${ENVIRONMENT}
+  tags:
+    eureka.datacenter: ${eureka.datacenter}
+    eureka.instance-id: ${eureka.instance.instance-id}
+
 management:
   endpoints:
     web:
@@ -74,5 +80,19 @@ management:
   endpoint:
     health:
       show-details: always
+  metrics:
+    export:
+      prometheus:
+        enabled: true
+    distribution:
+      percentiles-histogram:
+        '[http.server.requests]': true
+      percentiles:
+        '[http.server.requests]': 0.5, 0.9, 0.95, 0.99, 0.999
+      slo:
+        '[http.server.requests]': 50ms, 150ms, 250ms, 400ms
+    tags:
+      application: ${spring.application.name}
+
 monitoring:
   max-history: 150000
diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml
index defe8362..a500d709 100644
--- a/src/test/resources/application.yml
+++ b/src/test/resources/application.yml
@@ -32,6 +32,11 @@ logging:
 server:
   port: 8081
 spring:
+  application:
+    name: karnak
+  cloud:
+    config:
+      enabled: false
   profiles:
     active: '@activatedProperties@'
   liquibase:

From 0917d7f257fb81bcc4851f911ed3cd15cc3c3d59 Mon Sep 17 00:00:00 2001
From: jdcs <jonathan.duchesne@hcuge.ch>
Date: Tue, 24 May 2022 15:23:12 +0200
Subject: [PATCH 2/2] feat: change pom version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a5edb8ac..2e02e649 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
   </licenses>
 
   <!-- Version -->
-  <version>1.0.32</version>
+  <version>1.0.33</version>
 
   <!-- Packaging -->
   <packaging>jar</packaging>