diff --git a/kontor-spring/build.gradle b/kontor-spring/build.gradle index 585e603..5308d79 100644 --- a/kontor-spring/build.gradle +++ b/kontor-spring/build.gradle @@ -59,6 +59,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-validation' implementation 'org.springframework.boot:spring-boot-starter-actuator' developmentOnly 'org.springframework.boot:spring-boot-devtools' + implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'org.springframework.security:spring-security-oauth2-jose' implementation 'org.springframework.security:spring-security-oauth2-resource-server' implementation 'com.h2database:h2' diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/common/views/SearchFilter.java b/kontor-spring/src/main/java/de/thpeetz/kontor/common/views/SearchFilter.java index 570564d..7eb97e5 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/common/views/SearchFilter.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/common/views/SearchFilter.java @@ -5,7 +5,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import com.vaadin.flow.component.HasValue; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/common/views/SearchFilterField.java b/kontor-spring/src/main/java/de/thpeetz/kontor/common/views/SearchFilterField.java index 6d627b2..2d37df0 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/common/views/SearchFilterField.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/common/views/SearchFilterField.java @@ -1,9 +1,7 @@ package de.thpeetz.kontor.common.views; -import java.util.HashMap; import java.util.LinkedList; import java.util.List; -import java.util.Map; import java.util.Set; import com.vaadin.flow.component.combobox.MultiSelectComboBox; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/security/SecurityConfig.java b/kontor-spring/src/main/java/de/thpeetz/kontor/security/SecurityConfig.java index ae77838..08b029f 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/security/SecurityConfig.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/security/SecurityConfig.java @@ -20,7 +20,6 @@ import org.springframework.security.config.annotation.web.configuration.EnableWe import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.oauth2.jose.jws.JwsAlgorithms; -import org.springframework.security.web.util.matcher.AntPathRequestMatcher; @EnableWebSecurity @Configuration @@ -36,8 +35,9 @@ public class SecurityConfig extends VaadinWebSecurity { @Override protected void configure(HttpSecurity http) throws Exception { - http.authorizeHttpRequests(auth -> auth.requestMatchers( - AntPathRequestMatcher.antMatcher(HttpMethod.GET, "/images/*.png")).permitAll()); + http.authorizeHttpRequests(auth -> auth + .requestMatchers("/images/*.png").permitAll() + .requestMatchers("/actuator/**").permitAll()); super.configure(http); setLoginView(http, LoginView.class); setStatelessAuthentication(http, new SecretKeySpec(Base64.getDecoder().decode(authSecret), JwsAlgorithms.HS256), diff --git a/kontor-spring/src/main/resources/application.yml b/kontor-spring/src/main/resources/application.yml index c4abf9b..63a3f43 100644 --- a/kontor-spring/src/main/resources/application.yml +++ b/kontor-spring/src/main/resources/application.yml @@ -28,10 +28,12 @@ management: endpoints: web: exposure: - include: "*" + include: health,info,metrics,prometheus endpoint: health: show-details: always + prometheus: + enabled: true logging: level: org: