diff --git a/ms/monitor-center/README.md b/ms/monitor-turbine/README.md similarity index 100% rename from ms/monitor-center/README.md rename to ms/monitor-turbine/README.md diff --git a/ms/monitor-center/pom.xml b/ms/monitor-turbine/pom.xml similarity index 100% rename from ms/monitor-center/pom.xml rename to ms/monitor-turbine/pom.xml diff --git a/ms/monitor-center/src/main/java/com/micro/fast/monitor/center/MsMonitorCenterApplication.java b/ms/monitor-turbine/src/main/java/com/micro/fast/monitor/center/MsMonitorCenterApplication.java similarity index 100% rename from ms/monitor-center/src/main/java/com/micro/fast/monitor/center/MsMonitorCenterApplication.java rename to ms/monitor-turbine/src/main/java/com/micro/fast/monitor/center/MsMonitorCenterApplication.java diff --git a/ms/monitor-center/src/main/resources/bootstrap.yml b/ms/monitor-turbine/src/main/resources/bootstrap.yml similarity index 100% rename from ms/monitor-center/src/main/resources/bootstrap.yml rename to ms/monitor-turbine/src/main/resources/bootstrap.yml diff --git a/ms/monitor-center/src/main/resources/log4j2-dev.xml b/ms/monitor-turbine/src/main/resources/log4j2-dev.xml similarity index 100% rename from ms/monitor-center/src/main/resources/log4j2-dev.xml rename to ms/monitor-turbine/src/main/resources/log4j2-dev.xml diff --git a/ms/monitor-center/src/test/java/com/micro/fast/monitor/center/MsMonitorCenterApplicationTests.java b/ms/monitor-turbine/src/test/java/com/micro/fast/monitor/center/MsMonitorCenterApplicationTests.java similarity index 100% rename from ms/monitor-center/src/test/java/com/micro/fast/monitor/center/MsMonitorCenterApplicationTests.java rename to ms/monitor-turbine/src/test/java/com/micro/fast/monitor/center/MsMonitorCenterApplicationTests.java diff --git a/ms/monitor-zipkin/README.md b/ms/monitor-zipkin/README.md new file mode 100644 index 0000000..6c4e363 --- /dev/null +++ b/ms/monitor-zipkin/README.md @@ -0,0 +1,5 @@ +# 微服务系统监控中心 +#### 集群服务熔断情况的监控 +界面访问地址`/hystrix`。可使用`http://.../turbine.stream?cluster={集群名称之一}`访问 +#### 集群服务调用情况的监控 +界面访问地址`/` \ No newline at end of file diff --git a/ms/monitor-zipkin/pom.xml b/ms/monitor-zipkin/pom.xml new file mode 100644 index 0000000..ccd66d9 --- /dev/null +++ b/ms/monitor-zipkin/pom.xml @@ -0,0 +1,97 @@ + + + 4.0.0 + + monitor-center + jar + + ms-monitor-center + ms-monitor-center + + + com.micro.fast + ms + 0.0.1-SNAPSHOT + + + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.cloud + spring-cloud-starter-config + + + + org.springframework.cloud + spring-cloud-starter-eureka + + + org.springframework.boot + spring-boot-starter-actuator + + + + org.springframework.cloud + spring-cloud-starter-hystrix + + + + org.springframework.cloud + spring-cloud-starter-hystrix-dashboard + + + + org.springframework.cloud + spring-cloud-starter-turbine + + + org.springframework.cloud + spring-cloud-netflix-turbine + + + + io.zipkin.java + zipkin-server + + + io.zipkin.java + zipkin-autoconfigure-ui + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-compiler-plugin + + + + + + + com.spotify + docker-maven-plugin + + + ms-monitor-center + + + + diff --git a/ms/monitor-zipkin/src/main/java/com/micro/fast/monitor/zipkin/MsMonitorZipkinApplication.java b/ms/monitor-zipkin/src/main/java/com/micro/fast/monitor/zipkin/MsMonitorZipkinApplication.java new file mode 100644 index 0000000..36747ee --- /dev/null +++ b/ms/monitor-zipkin/src/main/java/com/micro/fast/monitor/zipkin/MsMonitorZipkinApplication.java @@ -0,0 +1,25 @@ +package com.micro.fast.monitor.center; + +import org.springframework.boot.SpringApplication; +import org.springframework.cloud.client.SpringCloudApplication; +import org.springframework.cloud.netflix.hystrix.EnableHystrix; +import org.springframework.cloud.netflix.hystrix.dashboard.EnableHystrixDashboard; +import org.springframework.cloud.netflix.turbine.EnableTurbine; +import zipkin.server.EnableZipkinServer; + +/** + * @author lsy + */ +@SpringCloudApplication +//集群熔断降级情况的聚合展示 +@EnableTurbine +//集群间服务调用情况的聚合展示 +@EnableZipkinServer +@EnableHystrixDashboard +@EnableHystrix +public class MsMonitorCenterApplication { + + public static void main(String[] args) { + SpringApplication.run(MsMonitorCenterApplication.class, args); + } +} diff --git a/ms/monitor-zipkin/src/main/resources/bootstrap.yml b/ms/monitor-zipkin/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..6edd051 --- /dev/null +++ b/ms/monitor-zipkin/src/main/resources/bootstrap.yml @@ -0,0 +1,17 @@ +spring: + cloud: + config: + profile: dev + label: master + name: monitorcenter + discovery: + service-id: config-server + enabled: true + username: config + password: server +eureka: + client: + serviceUrl: + defaultZone: http://micro:fast@www.register1.com:10002/eureka/,http://micro:fast@www.register2.com:10004/eureka/ #配置所有的注册中心 + instance: + hostname: www.monitorcenter.com diff --git a/ms/monitor-zipkin/src/main/resources/log4j2-dev.xml b/ms/monitor-zipkin/src/main/resources/log4j2-dev.xml new file mode 100644 index 0000000..e355a3f --- /dev/null +++ b/ms/monitor-zipkin/src/main/resources/log4j2-dev.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file