From d269c9201f9244ee0776517410798d0c1a7519c8 Mon Sep 17 00:00:00 2001 From: Sukhminder Arora Date: Mon, 17 Feb 2025 14:46:00 +0530 Subject: [PATCH 1/6] Feature: Make header title configurable --- src/main/resources/application.properties | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/main/resources/application.properties diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 00000000000..761e3e429ff --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1 @@ +spring.boot.admin.ui.title=My Custom Admin Title From f031b92b03acc2f09a67d094a5c9c38a00fa278b Mon Sep 17 00:00:00 2001 From: Sukhminder Arora Date: Mon, 17 Feb 2025 14:48:58 +0530 Subject: [PATCH 2/6] Feature: Add server index file --- .../src/main/frontend/index.server.html | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 spring-boot-admin-server-ui/src/main/frontend/index.server.html diff --git a/spring-boot-admin-server-ui/src/main/frontend/index.server.html b/spring-boot-admin-server-ui/src/main/frontend/index.server.html new file mode 100644 index 00000000000..d0d1cdb14cc --- /dev/null +++ b/spring-boot-admin-server-ui/src/main/frontend/index.server.html @@ -0,0 +1,43 @@ + + + + + + Spring Boot Admin + + + + + + + + + + + + + + +
+ + + + From 649c0cf5dabf3993a8ab59207791068376268a61 Mon Sep 17 00:00:00 2001 From: Sukhminder Arora Date: Mon, 17 Feb 2025 14:52:10 +0530 Subject: [PATCH 3/6] Feature: Adding test cases --- .../admin/server/utils/jackson/BuildVersionMixinTest.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/spring-boot-admin-server/src/test/java/de/codecentric/boot/admin/server/utils/jackson/BuildVersionMixinTest.java b/spring-boot-admin-server/src/test/java/de/codecentric/boot/admin/server/utils/jackson/BuildVersionMixinTest.java index b2968c677bd..36c9a3c7c3d 100644 --- a/spring-boot-admin-server/src/test/java/de/codecentric/boot/admin/server/utils/jackson/BuildVersionMixinTest.java +++ b/spring-boot-admin-server/src/test/java/de/codecentric/boot/admin/server/utils/jackson/BuildVersionMixinTest.java @@ -68,4 +68,10 @@ public void verifySerializeWithNestedMapEntryVersion() throws JsonProcessingExce assertThat(result).isEqualTo("\"1.0.0\""); } + @Test + public void verifyDeserializer() throws JSONException, JsonProcessingException { + BuildVersion buildVersion = objectMapper.readValue("\"1.0.0\"", BuildVersion.class); + assertThat(buildVersion).isEqualTo(BuildVersion.valueOf("1.0.0")); + } + } From 1385cab6341e9d42821e8af5865526da003f0d73 Mon Sep 17 00:00:00 2001 From: Sukhminder Arora Date: Tue, 18 Feb 2025 13:19:28 +0530 Subject: [PATCH 4/6] Feature: Add methods --- .../ui/config/AdminServerUiProperties.java | 27 +++++++++++++++++++ .../admin/server/services/IntervalCheck.java | 14 ++++++++++ 2 files changed, 41 insertions(+) diff --git a/spring-boot-admin-server-ui/src/main/java/de/codecentric/boot/admin/server/ui/config/AdminServerUiProperties.java b/spring-boot-admin-server-ui/src/main/java/de/codecentric/boot/admin/server/ui/config/AdminServerUiProperties.java index 05e4c941d71..8eaa6d2f8eb 100644 --- a/spring-boot-admin-server-ui/src/main/java/de/codecentric/boot/admin/server/ui/config/AdminServerUiProperties.java +++ b/spring-boot-admin-server-ui/src/main/java/de/codecentric/boot/admin/server/ui/config/AdminServerUiProperties.java @@ -19,6 +19,7 @@ import java.time.Duration; import java.time.temporal.ChronoUnit; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.concurrent.TimeUnit; @@ -297,4 +298,30 @@ public void set900(String shade900) { } + + @Override + public String toString() { + return "AdminServerUiProperties{" + + "resourceLocations=" + Arrays.toString(resourceLocations) + + ", extensionResourceLocations=" + Arrays.toString(extensionResourceLocations) + + ", templateLocation='" + templateLocation + '\'' + + ", loginIcon='" + loginIcon + '\'' + + ", favicon='" + favicon + '\'' + + ", faviconDanger='" + faviconDanger + '\'' + + ", title='" + title + '\'' + + ", brand='" + brand + '\'' + + ", publicUrl='" + publicUrl + '\'' + + ", cacheTemplates=" + cacheTemplates + + ", cache=" + cache + + ", externalViews=" + externalViews + + ", viewSettings=" + viewSettings + + ", rememberMeEnabled=" + rememberMeEnabled + + ", availableLanguages=" + availableLanguages + + ", pollTimer=" + pollTimer + + ", additionalRouteExcludes=" + additionalRouteExcludes + + ", enableToasts=" + enableToasts + + ", hideInstanceUrl=" + hideInstanceUrl + + ", theme=" + theme + + '}'; + } } diff --git a/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/services/IntervalCheck.java b/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/services/IntervalCheck.java index 9f982e13fcf..37c42683213 100644 --- a/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/services/IntervalCheck.java +++ b/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/services/IntervalCheck.java @@ -115,4 +115,18 @@ public void stop() { } } + @Override + public String toString() { + return "IntervalCheck{" + + "name='" + name + '\'' + + ", lastChecked=" + lastChecked + + ", checkFn=" + checkFn + + ", maxBackoff=" + maxBackoff + + ", interval=" + interval + + ", minRetention=" + minRetention + + ", subscription=" + subscription + + ", scheduler=" + scheduler + + '}'; + } + } From 86f79e6ba2916ce7f1551cd84ac0f0093b11c90c Mon Sep 17 00:00:00 2001 From: Sukhminder Arora Date: Tue, 18 Feb 2025 13:31:36 +0530 Subject: [PATCH 5/6] Feature: Add lombok slf4j --- .../client/registration/DefaultApplicationRegistrator.java | 2 ++ .../client/registration/RegistrationApplicationListener.java | 2 ++ .../boot/admin/server/notify/MicrosoftTeamsNotifier.java | 2 ++ 3 files changed, 6 insertions(+) diff --git a/spring-boot-admin-client/src/main/java/de/codecentric/boot/admin/client/registration/DefaultApplicationRegistrator.java b/spring-boot-admin-client/src/main/java/de/codecentric/boot/admin/client/registration/DefaultApplicationRegistrator.java index 5724ad6b9e2..933cf0f2329 100644 --- a/spring-boot-admin-client/src/main/java/de/codecentric/boot/admin/client/registration/DefaultApplicationRegistrator.java +++ b/spring-boot-admin-client/src/main/java/de/codecentric/boot/admin/client/registration/DefaultApplicationRegistrator.java @@ -20,9 +20,11 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.LongAdder; +import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +@Slf4j public class DefaultApplicationRegistrator implements ApplicationRegistrator { private static final Logger LOGGER = LoggerFactory.getLogger(ApplicationRegistrator.class); diff --git a/spring-boot-admin-client/src/main/java/de/codecentric/boot/admin/client/registration/RegistrationApplicationListener.java b/spring-boot-admin-client/src/main/java/de/codecentric/boot/admin/client/registration/RegistrationApplicationListener.java index c226f10027b..16d63968e7d 100644 --- a/spring-boot-admin-client/src/main/java/de/codecentric/boot/admin/client/registration/RegistrationApplicationListener.java +++ b/spring-boot-admin-client/src/main/java/de/codecentric/boot/admin/client/registration/RegistrationApplicationListener.java @@ -19,6 +19,7 @@ import java.time.Duration; import java.util.concurrent.ScheduledFuture; +import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.DisposableBean; @@ -37,6 +38,7 @@ * * @author Johannes Edmeier */ +@Slf4j public class RegistrationApplicationListener implements InitializingBean, DisposableBean { private static final Logger LOGGER = LoggerFactory.getLogger(RegistrationApplicationListener.class); diff --git a/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/notify/MicrosoftTeamsNotifier.java b/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/notify/MicrosoftTeamsNotifier.java index 6272e215a8e..61707f98a99 100644 --- a/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/notify/MicrosoftTeamsNotifier.java +++ b/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/notify/MicrosoftTeamsNotifier.java @@ -25,6 +25,7 @@ import lombok.Builder; import lombok.Data; +import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.expression.MapAccessor; @@ -50,6 +51,7 @@ import static java.util.Collections.singletonList; +@Slf4j public class MicrosoftTeamsNotifier extends AbstractStatusChangeNotifier { private static final Logger LOGGER = LoggerFactory.getLogger(MicrosoftTeamsNotifier.class); From 439fee972738609afd03b0547e4c4fc2c0280f21 Mon Sep 17 00:00:00 2001 From: Sukhminder Arora Date: Wed, 26 Feb 2025 10:34:27 +0530 Subject: [PATCH 6/6] fix: Modify the classes to have features --- .../registration/ReactiveRegistrationClient.java | 7 +++++++ .../RegistrationApplicationListener.java | 12 ++++++++++++ 2 files changed, 19 insertions(+) diff --git a/spring-boot-admin-client/src/main/java/de/codecentric/boot/admin/client/registration/ReactiveRegistrationClient.java b/spring-boot-admin-client/src/main/java/de/codecentric/boot/admin/client/registration/ReactiveRegistrationClient.java index 139dd66aaac..200d9ed3c0e 100644 --- a/spring-boot-admin-client/src/main/java/de/codecentric/boot/admin/client/registration/ReactiveRegistrationClient.java +++ b/spring-boot-admin-client/src/main/java/de/codecentric/boot/admin/client/registration/ReactiveRegistrationClient.java @@ -62,4 +62,11 @@ protected void setRequestHeaders(HttpHeaders headers) { headers.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON)); } + @Override + public String toString() { + return "ReactiveRegistrationClient{" + + "webclient=" + webclient + + ", timeout=" + timeout + + '}'; + } } diff --git a/spring-boot-admin-client/src/main/java/de/codecentric/boot/admin/client/registration/RegistrationApplicationListener.java b/spring-boot-admin-client/src/main/java/de/codecentric/boot/admin/client/registration/RegistrationApplicationListener.java index 16d63968e7d..ebb30b25f46 100644 --- a/spring-boot-admin-client/src/main/java/de/codecentric/boot/admin/client/registration/RegistrationApplicationListener.java +++ b/spring-boot-admin-client/src/main/java/de/codecentric/boot/admin/client/registration/RegistrationApplicationListener.java @@ -81,6 +81,18 @@ public void onApplicationReady(ApplicationReadyEvent event) { } } + @Override + public String toString() { + return "RegistrationApplicationListener{" + + "registrator=" + registrator + + ", taskScheduler=" + taskScheduler + + ", autoDeregister=" + autoDeregister + + ", autoRegister=" + autoRegister + + ", registerPeriod=" + registerPeriod + + ", scheduledTask=" + scheduledTask + + '}'; + } + @EventListener @Order(Ordered.LOWEST_PRECEDENCE) public void onClosedContext(ContextClosedEvent event) {