Merge branch 'master' into bael-16656

spring-boot-admin/spring-boot-admin-client/src/main/resources/application.properties

@@ -0,0 +1,20 @@
+#basic auth creddentials
+spring.security.user.name=client
+spring.security.user.password=client
+
+#configs to connect to a secured server
+spring.boot.admin.client.url=http://localhost:8080
+#spring.boot.admin.client.instance.service-base-url=http://localhost:8081
+spring.boot.admin.client.username=admin
+spring.boot.admin.client.password=admin
+
+#configs to give secured server info
+spring.boot.admin.client.instance.metadata.user.name=${spring.security.user.name}
+spring.boot.admin.client.instance.metadata.user.password=${spring.security.user.password}
+
+#app config
+spring.application.name=spring-boot-admin-client
+server.port=8081
+
+management.endpoints.web.exposure.include=*
+management.endpoint.health.show-details=always

spring-boot-admin/spring-boot-admin-client/src/main/resources/logback.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <jmxConfigurator />
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%date [%thread] %-5level %logger{25} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="CONSOLE"/>
+    </root>
+</configuration>