Consider servlet-path for guessing management-url

spring-boot-admin-docs/src/main/asciidoc/index.adoc

@@ -209,7 +209,7 @@ spring.boot.admin.password
 
 | spring.boot.admin.client.management-url
 | Client-management-url to register with. Can be overriden in case the reachable url is different (e.g. Docker).
-| Guessed based on service-url, `management.port` and `management.context-path`.
+| Guessed based on service-url, `server.servlet-path`, `management.port` and `management.context-path`.
 
 | spring.boot.admin.client.service-url
 | Client-service-url to register with. Can be overriden in case the reachable url is different (e.g. Docker).

spring-boot-admin-starter-client/src/main/java/de/codecentric/boot/admin/config/AdminClientProperties.java

@@ -94,7 +94,8 @@ public class AdminClientProperties {
 
 		if ((managementPort == null || managementPort.equals(serverPort))
 				&& getServiceUrl() != null) {
-			return append(getServiceUrl(), management.getContextPath());
+			return append(append(getServiceUrl(), server.getServletPrefix()),
+					management.getContextPath());
 		}
 
 		if (ready && managementPort == null) {

spring-boot-admin-starter-client/src/test/java/de/codecentric/boot/admin/config/AdminClientPropertiesTest.java

@@ -91,6 +91,21 @@ public class AdminClientPropertiesTest {
 	}
 
 	@Test
+	public void test_servletPath() {
+		load("server.servlet-path=app", "server.context-path=srv", "local.server.port=80");
+		AdminClientProperties clientProperties = new AdminClientProperties();
+		context.getAutowireCapableBeanFactory().autowireBean(clientProperties);
+
+		publishApplicationReadyEvent(clientProperties);
+
+		assertThat(clientProperties.getManagementUrl(),
+				is("http://" + getHostname() + ":80/srv/app"));
+		assertThat(clientProperties.getHealthUrl(),
+				is("http://" + getHostname() + ":80/srv/app/health"));
+		assertThat(clientProperties.getServiceUrl(), is("http://" + getHostname() + ":80/srv"));
+	}
+
+	@Test
 	public void test_default() {
 		load("local.server.port=8080");
 		AdminClientProperties clientProperties = new AdminClientProperties();