MID-4849

Evolveum · Sep 11, 2018 · ebe7d47 · ebe7d47
1 parent 5803ae9
commit ebe7d47
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 13 deletions.
diff --git a/gui/admin-gui/pom.xml b/gui/admin-gui/pom.xml
@@ -150,6 +150,10 @@
     		<groupId>org.springframework.boot</groupId>
    	 		<artifactId>spring-boot-starter-actuator</artifactId>
 		</dependency>
+		<dependency>
+    		<groupId>org.springframework.boot</groupId>
+   	 		<artifactId>spring-boot-actuator-autoconfigure</artifactId>
+		</dependency>
 
         <dependency>
             <groupId>org.webjars</groupId>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/MidPointSpringApplication.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/MidPointSpringApplication.java
@@ -19,6 +19,7 @@
 import java.io.File;
 import java.lang.management.ManagementFactory;
 import java.time.Duration;
+import java.util.Arrays;
 
 import javax.servlet.DispatcherType;
 
@@ -30,11 +31,15 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.Banner;
+import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.ExitCodeGenerator;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.SpringBootConfiguration;
+import org.springframework.boot.actuate.autoconfigure.endpoint.EndpointAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointAutoConfiguration;
+import org.springframework.boot.actuate.autoconfigure.endpoint.web.servlet.WebMvcEndpointManagementContextConfiguration;
 import org.springframework.boot.actuate.autoconfigure.health.HealthEndpointAutoConfiguration;
+import org.springframework.boot.actuate.autoconfigure.health.HealthIndicatorAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.web.servlet.ServletManagementContextAutoConfiguration;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
@@ -57,6 +62,7 @@
 import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerFactory;
 import org.springframework.boot.web.servlet.server.Session;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+import org.springframework.context.ApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ImportResource;
@@ -112,9 +118,12 @@
 		SecurityFilterAutoConfiguration.class,
 		MultipartAutoConfiguration.class,
         HttpEncodingAutoConfiguration.class,
+        EndpointAutoConfiguration.class,
         WebEndpointAutoConfiguration.class,
+        WebMvcEndpointManagementContextConfiguration.class,
         ServletManagementContextAutoConfiguration.class,
-        HealthEndpointAutoConfiguration.class
+        HealthEndpointAutoConfiguration.class,
+        HealthIndicatorAutoConfiguration.class
 })
 @SpringBootConfiguration
 public class MidPointSpringApplication extends SpringBootServletInitializer {
@@ -227,14 +236,6 @@ public FilterRegistrationBean<WroFilter> webResourceOptimizer(WroFilter wroFilte
         return registration;
     }
 
-//    @Bean
-//    public ServletRegistrationBean actuatorServlet(Servlet endpointServlet ) {
-//    	ServletRegistrationBean registration = new ServletRegistrationBean();
-//        registration.setServlet(endpointServlet);
-//        registration.addUrlMappings("/actuator/*");
-//        return registration;
-//    }
-
     @Bean
     public ServletRegistrationBean<CXFServlet> cxfServlet() {
         ServletRegistrationBean<CXFServlet> registration = new ServletRegistrationBean<>();

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/WebSecurityConfig.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/WebSecurityConfig.java
@@ -109,7 +109,6 @@ public void configure(WebSecurity web) throws Exception {
 
         web.ignoring().antMatchers("/wicket/resource/**");
 
-        web.ignoring().antMatchers("/health");
         web.ignoring().antMatchers("/actuator/**");
     }
 

diff --git a/gui/admin-gui/src/main/resources/application.yml b/gui/admin-gui/src/main/resources/application.yml
@@ -54,6 +54,6 @@ management:
       enabled: true
 
 
-logging:
-  level:
-    org.springframework: TRACE
+#logging:
+#  level:
+#    org.springframework: TRACE