From 1ba7c64aa5b15e1779c27838db6bba16c7aa457e Mon Sep 17 00:00:00 2001 From: Antoine Rey Date: Wed, 20 Nov 2019 08:35:40 +0100 Subject: [PATCH] Remove Hystrix Dashboard #117 --- README.md | 4 -- docker-compose.yml | 11 ---- pom.xml | 1 - spring-petclinic-hystrix-dashboard/pom.xml | 62 ------------------- .../HystrixDashboardApplication.java | 25 -------- .../src/main/resources/bootstrap.yml | 12 ---- .../src/main/resources/logback-spring.xml | 6 -- .../HystrixDashboardApplicationTests.java | 13 ---- 8 files changed, 134 deletions(-) delete mode 100644 spring-petclinic-hystrix-dashboard/pom.xml delete mode 100644 spring-petclinic-hystrix-dashboard/src/main/java/org/springframework/samples/petclinic/dashboard/HystrixDashboardApplication.java delete mode 100644 spring-petclinic-hystrix-dashboard/src/main/resources/bootstrap.yml delete mode 100644 spring-petclinic-hystrix-dashboard/src/main/resources/logback-spring.xml delete mode 100644 spring-petclinic-hystrix-dashboard/src/test/java/org/springframework/samples/petclinic/dashboard/HystrixDashboardApplicationTests.java diff --git a/README.md b/README.md index 8596ba9c7..7ae6f7c03 100644 --- a/README.md +++ b/README.md @@ -19,10 +19,6 @@ If everything goes well, you can access the following services at given location * Admin Server (Spring Boot Admin) - http://localhost:9090 * Grafana Dashboards - http://localhost:3000 * Prometheus - http://localhost:9091 -* Hystrix Dashboard for Circuit Breaker pattern - http://localhost:7979 - On the home page is a form where you can enter -the URL for an event stream to monitor, for example the `api-gateway` service running locally: `http://localhost:8080/actuator/hystrix.stream` -or running into docker: `http://api-gateway:8080/actuator/hystrix.stream` - You can tell Config Server to use your local Git repository by using `native` Spring profile and setting `GIT_REPO` environment variable, for example: diff --git a/docker-compose.yml b/docker-compose.yml index da6b7b337..93c0a42d3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -82,17 +82,6 @@ services: ports: - 9090:9090 - hystrix-dashboard: - image: springcommunity/spring-petclinic-hystrix-dashboard - container_name: hystrix-dashboard - mem_limit: 512M - depends_on: - - config-server - - discovery-server - entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "-XX:+UnlockExperimentalVMOptions", "-XX:+UseCGroupMemoryLimitForHeap", "-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"] - ports: - - 7979:7979 - ## Grafana / Prometheus grafana-server: diff --git a/pom.xml b/pom.xml index cd85814de..33d6a39e3 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,6 @@ spring-petclinic-config-server spring-petclinic-discovery-server spring-petclinic-api-gateway - spring-petclinic-hystrix-dashboard diff --git a/spring-petclinic-hystrix-dashboard/pom.xml b/spring-petclinic-hystrix-dashboard/pom.xml deleted file mode 100644 index c6a4eb486..000000000 --- a/spring-petclinic-hystrix-dashboard/pom.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - spring-petclinic-microservices - org.springframework.samples - 2.2.1 - - 4.0.0 - - spring-petclinic-hystrix-dashboard - Circuit breaker dashboard with with Spring Cloud Netflix Hystrix - - - 7979 - ${basedir}/../docker - - - - - - - org.springframework.boot - spring-boot-starter-test - test - - - - - org.springframework.cloud - spring-cloud-starter-config - - - org.springframework.cloud - spring-cloud-starter-netflix-hystrix-dashboard - - - - - org.junit.jupiter - junit-jupiter-engine - test - - - - - - buildDocker - - - - com.spotify - docker-maven-plugin - ${docker.plugin.version} - - - - - - - diff --git a/spring-petclinic-hystrix-dashboard/src/main/java/org/springframework/samples/petclinic/dashboard/HystrixDashboardApplication.java b/spring-petclinic-hystrix-dashboard/src/main/java/org/springframework/samples/petclinic/dashboard/HystrixDashboardApplication.java deleted file mode 100644 index 0ecd670fa..000000000 --- a/spring-petclinic-hystrix-dashboard/src/main/java/org/springframework/samples/petclinic/dashboard/HystrixDashboardApplication.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.springframework.samples.petclinic.dashboard; - - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.cloud.netflix.hystrix.dashboard.EnableHystrixDashboard; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; - -@SpringBootApplication -@EnableDiscoveryClient -@EnableHystrixDashboard -@Controller -public class HystrixDashboardApplication { - - public static void main(String[] args) { - SpringApplication.run(HystrixDashboardApplication.class, args); - } - - @RequestMapping("/") - public String home() { - return "forward:/hystrix"; - } -} diff --git a/spring-petclinic-hystrix-dashboard/src/main/resources/bootstrap.yml b/spring-petclinic-hystrix-dashboard/src/main/resources/bootstrap.yml deleted file mode 100644 index 5e52f8d46..000000000 --- a/spring-petclinic-hystrix-dashboard/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,12 +0,0 @@ -spring: - cloud: - config: - uri: http://localhost:8888 - application: - name: hystrix-dashboard ---- -spring: - profiles: docker - cloud: - config: - uri: http://config-server:8888 diff --git a/spring-petclinic-hystrix-dashboard/src/main/resources/logback-spring.xml b/spring-petclinic-hystrix-dashboard/src/main/resources/logback-spring.xml deleted file mode 100644 index 5d03f7941..000000000 --- a/spring-petclinic-hystrix-dashboard/src/main/resources/logback-spring.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/spring-petclinic-hystrix-dashboard/src/test/java/org/springframework/samples/petclinic/dashboard/HystrixDashboardApplicationTests.java b/spring-petclinic-hystrix-dashboard/src/test/java/org/springframework/samples/petclinic/dashboard/HystrixDashboardApplicationTests.java deleted file mode 100644 index 2049712ef..000000000 --- a/spring-petclinic-hystrix-dashboard/src/test/java/org/springframework/samples/petclinic/dashboard/HystrixDashboardApplicationTests.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.springframework.samples.petclinic.dashboard; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class HystrixDashboardApplicationTests { - - @Test - void contextLoads() { - } - -}