Add sample for discovery using Consul

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

@@ -95,8 +95,11 @@ spring.boot.admin.url=http://localhost:8080
 [[discover-clients-via-spring-cloud-discovery]]
 ==== Discover clients via Spring Cloud Discovery ====
 
-If you already using Spring Cloud Discovery for your applications you don't have to add the Spring Boot Admin Client to your applications. Just make the Spring Boot Admin Server a DiscoveryClient, the rest is done by our AutoConfiguration. The following steps are for using Eureka.
-Also have a look at the http://projects.spring.io/spring-cloud/spring-cloud.html#_spring_cloud_netflix[Spring Cloud Netflix documentation].
+If you already using Spring Cloud Discovery for your applications you don't have to add the Spring Boot Admin Client to your applications. Just make the Spring Boot Admin Server a DiscoveryClient, the rest is done by our AutoConfiguration.
+
+The following steps are for using Eureka, but other Spring Cloud Discovery implementations are supported as well. There is an example using Consul (see https://github.com/codecentric/spring-boot-admin/tree/master/spring-boot-admin-samples/spring-boot-admin-sample-consul/[spring-boot-admin-sample-consul]).
+
+Also have a look at the http://projects.spring.io/spring-cloud/spring-cloud.html[Spring Cloud documentation].
 
 . Add spring-cloud-starter-eureka to you dependencies:
 +
@@ -106,7 +109,6 @@ Also have a look at the http://projects.spring.io/spring-cloud/spring-cloud.html
 <dependency>
     <groupId>org.springframework.cloud</groupId>
     <artifactId>spring-cloud-starter-eureka</artifactId>
-    <version>1.0.6.RELEASE</version>
 </dependency>
 ----
 
@@ -133,7 +135,7 @@ public class SpringBootAdminApplication {
 eureka.instance.client.serviceUrl.defaultZone: http://localhost:8761/eureka/
 ----
 
-See also https://github.com/codecentric/spring-boot-admin/tree/master/spring-boot-admin-samples/spring-boot-admin-sample-discovery/[spring-boot-admin-sample-discovery].
+See also https://github.com/codecentric/spring-boot-admin/tree/master/spring-boot-admin-samples/spring-boot-admin-sample-eureka/[spring-boot-admin-sample-eureka].
 
 NOTE: You can include the Spring Boot Admin to your Eureka server. Add the dependencies, add `@EnableAdminServer` to your configuration and set `spring.boot.admin.context-path` to something different than `"/"` so that the Spring Boot Admin Server UI won't clash with Eureka's one.
 

spring-boot-admin-samples/pom.xml

@@ -16,7 +16,8 @@
     <modules>
         <module>spring-boot-admin-sample</module>
         <module>spring-boot-admin-sample-war</module>
-        <module>spring-boot-admin-sample-discovery</module>
+        <module>spring-boot-admin-sample-eureka</module>
+        <module>spring-boot-admin-sample-consul</module>
         <module>spring-boot-admin-sample-hazelcast</module>
     </modules>
 </project>

spring-boot-admin-samples/spring-boot-admin-sample-consul/pom.xml

+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>de.codecentric</groupId>
+        <artifactId>spring-boot-admin-samples</artifactId>
+        <version>1.3.4-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+    <artifactId>spring-boot-admin-sample-consul</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>de.codecentric</groupId>
+            <artifactId>spring-boot-admin-server</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>de.codecentric</groupId>
+            <artifactId>spring-boot-admin-server-ui</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-consul-discovery</artifactId>
+        </dependency>
+    </dependencies>
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <mainClass>de.codecentric.boot.admin.SpringBootAdminApplication</mainClass>
+                    <addResources>false</addResources>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

spring-boot-admin-samples/spring-boot-admin-sample-consul/src/main/resources/application.yml

+info:
+  version: 1.0.0
+
+spring:
+  application:
+    name: consul-example
+  cloud:
+    config:
+      enabled: false
+    consul:
+      host: localhost
+      port: 8500
+      discovery:
+        tags: management.context-path=/foo, health.path=/ping
+
+management.context-path: /foo
+endpoints.health.path: /ping
+
+spring.boot.admin.discovery:
+  ignored-services: consul

spring-boot-admin-samples/spring-boot-admin-sample-discovery/pom.xml → spring-boot-admin-samples/spring-boot-admin-sample-eureka/pom.xml

@@ -7,7 +7,7 @@
         <version>1.3.4-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
-    <artifactId>spring-boot-admin-sample-discovery</artifactId>
+    <artifactId>spring-boot-admin-sample-eureka</artifactId>
     <dependencies>
         <dependency>
             <groupId>de.codecentric</groupId>

spring-boot-admin-samples/spring-boot-admin-sample-eureka/src/main/java/de/codecentric/boot/admin/SpringBootAdminApplication.java

+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package de.codecentric.boot.admin;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.context.annotation.Configuration;
+
+import de.codecentric.boot.admin.config.EnableAdminServer;
+
+@Configuration
+@EnableAutoConfiguration
+@EnableDiscoveryClient
+@EnableAdminServer
+public class SpringBootAdminApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(SpringBootAdminApplication.class, args);
+	}
+
+}

spring-boot-admin-samples/spring-boot-admin-sample-discovery/src/main/resources/application.yml → spring-boot-admin-samples/spring-boot-admin-sample-eureka/src/main/resources/application.yml

@@ -3,7 +3,7 @@ info:
 
 spring:
   application:
-    name: discovery-example
+    name: eureka-example
   cloud:
     config:
       enabled: false
@@ -13,4 +13,4 @@ eureka:
     leaseRenewalIntervalInSeconds: 5
     client:
       serviceUrl:
-        defaultZone: http://localhost:8761/eureka/
\ No newline at end of file
+        defaultZone: http://localhost:8761/eureka/

spring-boot-admin-samples/spring-boot-admin-sample-eureka/src/main/resources/logback-spring.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+	<include resource="org/springframework/boot/logging/logback/base.xml"/>
+	<jmxConfigurator/>
+</configuration>
\ No newline at end of file