Commit 0b2e4e83 authored by PECQUOT's avatar PECQUOT
Browse files

Merge branch 'develop' into feature/obsdeb

parents b8057e83 847d73af
......@@ -222,7 +222,7 @@
<!-- I18n configuration -->
<i18n.bundles>fr_FR,en_GB</i18n.bundles>
<i18n.silent>true</i18n.silent>
<!-- by default, use maven 2 source base dir -->
<maven.src.dir>${basedir}/src</maven.src.dir>
<java.main.dir>${maven.src.dir}/main/java</java.main.dir>
......@@ -476,6 +476,16 @@
<artifactId>spring-boot-test</artifactId>
<version>${spring-boot.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
<version>${spring-boot.version}</version>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
<version>1.6.6</version>
</dependency>
<!-- Cryptography -->
<dependency>
......@@ -898,6 +908,10 @@
<groupId>org.apache.jena</groupId>
<artifactId>jena-cmds</artifactId>
</exclusion>
<exclusion>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
......
......@@ -102,6 +102,14 @@
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
</dependency>
<!-- Security -->
<dependency>
......
......@@ -95,3 +95,13 @@ spring.mvc.converters.preferred-json-mapper=jackson
#spring.jackson.serialization.*= # Jackson on/off features for serialization.
#spring.jackson.time-zone= # Time zone
#spring.jackson.visibility.*= # To limit which methods (and fields) are auto-detected.
#Actuator (monitoring)
management.endpoints.web.base-path=/api/node
management.endpoints.enabled-by-default=false
management.endpoint.health.enabled=true
management.endpoint.health.show-details=always
management.health.mail.enabled=${spring.mail.enabled:false}
management.health.ldap.enabled=${spring.security.ldap.enabled:false}
management.health.jms.enabled=${spring.activemq.pool.enabled:false}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment