!53 合并 skywalking 分支 完成整合

* add 新增 所有服务 docker 部署对接 skywalking
* add 新增 三大 mq 整合 skywalking
* add 新增 seata 整合 skywalking 手动编译 seata 插件包
* add 新增 ruoyi-common-skylog 整合 skywalking 日志推送
* add 增加 skywalking docker编排

ruoyi-visual/pom.xml

@@ -28,6 +28,12 @@
 <!--        <dependency>-->
 <!--            <groupId>com.ruoyi</groupId>-->
 <!--            <artifactId>ruoyi-common-logstash</artifactId>-->
+<!--        </dependency>-->
+
+        <!-- skywalking 日志收集 -->
+<!--        <dependency>-->
+<!--            <groupId>com.ruoyi</groupId>-->
+<!--            <artifactId>ruoyi-common-skylog</artifactId>-->
 <!--        </dependency>-->
     </dependencies>
 

ruoyi-visual/ruoyi-monitor/Dockerfile

@@ -2,8 +2,7 @@ FROM anapsix/alpine-java:8_server-jre_unlimited
 
 MAINTAINER Lion Li
 
-RUN mkdir -p /ruoyi/monitor
-RUN mkdir -p /ruoyi/monitor/logs
+RUN mkdir -p /ruoyi/monitor /ruoyi/monitor/logs
 
 WORKDIR /ruoyi/monitor
 

ruoyi-visual/ruoyi-monitor/src/main/resources/logback.xml

@@ -101,6 +101,9 @@
 
     <include resource="logback-logstash.xml" />
 
+    <!-- 开启 skywalking 日志收集 -->
+    <include resource="logback-skylog.xml" />
+
 	<!--系统操作日志-->
     <root level="info">
         <appender-ref ref="console" />

ruoyi-visual/ruoyi-seata-server/Dockerfile

@@ -2,8 +2,9 @@ FROM anapsix/alpine-java:8_server-jre_unlimited
 
 MAINTAINER Lion Li
 
-RUN mkdir -p /ruoyi/seata-server
-RUN mkdir -p /ruoyi/seata-server/logs
+RUN mkdir -p /ruoyi/seata-server \
+    /ruoyi/seata-server/logs \
+    /ruoyi/skywalking/agent
 
 WORKDIR /ruoyi/seata-server
 
@@ -15,4 +16,9 @@ EXPOSE 8091
 
 ADD ./target/ruoyi-seata-server.jar ./app.jar
 
-ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
+ENTRYPOINT ["java", \
+            "-Djava.security.egd=file:/dev/./urandom", \
+#            "-Dskywalking.agent.service_name=ruoyi-seata-server", \
+#            "-Dskywalking.plugin.seata.server=true", \
+#            "-javaagent:/ruoyi/skywalking/agent/skywalking-agent.jar", \
+            "-jar", "app.jar"]

ruoyi-visual/ruoyi-seata-server/src/main/resources/logback-spring.xml

@@ -123,6 +123,9 @@
 
     <include resource="logback-logstash.xml" />
 
+    <!-- 开启 skywalking 日志收集 -->
+    <include resource="logback-skylog.xml" />
+
     <root level="INFO">
         <appender-ref ref="console"/>
         <appender-ref ref="async_info"/>

ruoyi-visual/ruoyi-sentinel-dashboard/Dockerfile

@@ -2,8 +2,9 @@ FROM anapsix/alpine-java:8_server-jre_unlimited
 
 MAINTAINER Lion Li
 
-RUN mkdir -p /ruoyi/sentinel-dashboard
-RUN mkdir -p /ruoyi/sentinel-dashboard/logs
+RUN mkdir -p /ruoyi/sentinel-dashboard \
+    /ruoyi/sentinel-dashboard/logs \
+    /ruoyi/skywalking/agent
 
 WORKDIR /ruoyi/sentinel-dashboard
 
@@ -11,4 +12,8 @@ EXPOSE 8718
 
 ADD ./target/ruoyi-sentinel-dashboard.jar ./app.jar
 
-ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
+ENTRYPOINT ["java", \
+            "-Djava.security.egd=file:/dev/./urandom", \
+#            "-Dskywalking.agent.service_name=ruoyi-sentinel-dashboard", \
+#            "-javaagent:/ruoyi/skywalking/agent/skywalking-agent.jar", \
+            "-jar", "app.jar"]

ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/logback.xml

@@ -101,6 +101,9 @@
 
     <include resource="logback-logstash.xml" />
 
+    <!-- 开启 skywalking 日志收集 -->
+    <include resource="logback-skylog.xml" />
+
     <!--系统操作日志-->
     <root level="info">
         <appender-ref ref="console"/>

ruoyi-visual/ruoyi-xxl-job-admin/Dockerfile

@@ -2,8 +2,9 @@ FROM anapsix/alpine-java:8_server-jre_unlimited
 
 MAINTAINER Lion Li
 
-RUN mkdir -p /ruoyi/xxl-job-admin
-RUN mkdir -p /ruoyi/xxl-job-admin/logs
+RUN mkdir -p /ruoyi/xxl-job-admin \
+    /ruoyi/xxl-job-admin/logs \
+    /ruoyi/skywalking/agent
 
 WORKDIR /ruoyi/xxl-job-admin
 
@@ -14,4 +15,8 @@ EXPOSE 9900
 
 ADD ./target/ruoyi-xxl-job-admin.jar ./app.jar
 
-ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
+ENTRYPOINT ["java",
+            "-Djava.security.egd=file:/dev/./urandom",
+#            "-Dskywalking.agent.service_name=ruoyi-xxl-job-admin", \
+#            "-javaagent:/ruoyi/skywalking/agent/skywalking-agent.jar", \
+            "-jar", "app.jar"]

ruoyi-visual/ruoyi-xxl-job-admin/src/main/resources/logback.xml

@@ -101,6 +101,9 @@
 
     <include resource="logback-logstash.xml" />
 
+    <!-- 开启 skywalking 日志收集 -->
+    <include resource="logback-skylog.xml" />
+
     <!--系统操作日志-->
     <root level="info">
         <appender-ref ref="console"/>