From d9825c58fc2d74d92daba725b6c55928504d135e Mon Sep 17 00:00:00 2001
From: qinchao <craig.qin@yoho01.local>
Date: Tue, 24 Apr 2018 13:18:18 +0800
Subject: [PATCH] 迁移docker
---
docker.sh | 2 +-
monitor-ui-web/pom.xml | 6 ++++++
monitor-ui-web/src/main/resources/product/config.properties | 2 +-
monitor-ui-web/src/main/resources/productdocker/config.properties | 5 +++++
monitor-ui-web/src/main/resources/productdocker/databases.yml | 9 +++++++++
monitor-ui-web/src/main/resources/productdocker/logback.xml | 163 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
6 files changed, 185 insertions(+), 2 deletions(-)
create mode 100644 monitor-ui-web/src/main/resources/productdocker/config.properties
create mode 100644 monitor-ui-web/src/main/resources/productdocker/databases.yml
create mode 100644 monitor-ui-web/src/main/resources/productdocker/logback.xml
diff --git a/docker.sh b/docker.sh
index e43f8cb..3c64e51 100644
--- a/docker.sh
+++ b/docker.sh
@@ -1,2 +1,2 @@
cd $1
-mvn clean package -Dmaven.test.skip=true -Pproduct
+mvn clean package -Dmaven.test.skip=true -Pproductdocker
diff --git a/monitor-ui-web/pom.xml b/monitor-ui-web/pom.xml
index f1934b8..41fce7c 100644
--- a/monitor-ui-web/pom.xml
+++ b/monitor-ui-web/pom.xml
@@ -140,6 +140,12 @@
</activation>
</profile>
<profile>
+ <id>productdocker</id>
+ <properties>
+ <package.environment>productdocker</package.environment>
+ </properties>
+ </profile>
+ <profile>
<id>local</id>
<properties>
<package.environment>test</package.environment>
diff --git a/monitor-ui-web/src/main/resources/product/config.properties b/monitor-ui-web/src/main/resources/product/config.properties
index 23b132b..8bc9627 100644
--- a/monitor-ui-web/src/main/resources/product/config.properties
+++ b/monitor-ui-web/src/main/resources/product/config.properties
@@ -1,4 +1,4 @@
-monitor.service.url=http://monitor-service-master:8080/monitor
+monitor.service.url=http://127.0.0.1:8880/monitor
qcloud_zkAddress=10.66.4.3:2181,10.66.4.4:2181,10.66.4.5:2181,10.66.4.8:2181,10.66.4.9:2181
aws_zkAddress=172.31.50.193:2181,172.31.50.191:2181,172.31.50.192:2181,172.31.50.190:2181,172.31.50.194:2181
job.run.log.limit=10
diff --git a/monitor-ui-web/src/main/resources/productdocker/config.properties b/monitor-ui-web/src/main/resources/productdocker/config.properties
new file mode 100644
index 0000000..23b132b
--- /dev/null
+++ b/monitor-ui-web/src/main/resources/productdocker/config.properties
@@ -0,0 +1,5 @@
+monitor.service.url=http://monitor-service-master:8080/monitor
+qcloud_zkAddress=10.66.4.3:2181,10.66.4.4:2181,10.66.4.5:2181,10.66.4.8:2181,10.66.4.9:2181
+aws_zkAddress=172.31.50.193:2181,172.31.50.191:2181,172.31.50.192:2181,172.31.50.190:2181,172.31.50.194:2181
+job.run.log.limit=10
+web.context=monitor-ui
\ No newline at end of file
diff --git a/monitor-ui-web/src/main/resources/productdocker/databases.yml b/monitor-ui-web/src/main/resources/productdocker/databases.yml
new file mode 100644
index 0000000..38013ec
--- /dev/null
+++ b/monitor-ui-web/src/main/resources/productdocker/databases.yml
@@ -0,0 +1,9 @@
+datasources:
+ yh_ops:
+ servers:
+ - 172.31.50.75:3306
+ - 172.31.50.75:3306
+ username: ops
+ password: t5/oMgwUCmO/GeMHBAQ2Cg==
+
+readOnlyInSlave: false
\ No newline at end of file
diff --git a/monitor-ui-web/src/main/resources/productdocker/logback.xml b/monitor-ui-web/src/main/resources/productdocker/logback.xml
new file mode 100644
index 0000000..f5aaa8e
--- /dev/null
+++ b/monitor-ui-web/src/main/resources/productdocker/logback.xml
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- 从高到地低 OFF 、 FATAL 、 ERROR 、 WARN 、 INFO 、 DEBUG 、 TRACE 、 ALL -->
+<!-- 日志输出规则 根据当前ROOT 级别，日志输出时，级别高于root默认的级别时 会输出 -->
+<!-- 以下 每个配置的 filter 是过滤掉输出文件里面，会出现高级别文件，依然出现低级别的日志信息，通过filter 过滤只记录本级别的日志-->
+
+
+<!-- 属性描述 scan：性设置为true时，配置文件如果发生改变，将会被重新加载，默认值为true scanPeriod:设置监测配置文件是否有修改的时间间隔，如果没有给出时间单位，默认单位是毫秒。当scan为true时，此属性生效。默认的时间间隔为1分钟。
+ debug:当此属性设置为true时，将打印出logback内部日志信息，实时查看logback运行状态。默认值为false。 -->
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+ <!-- 日志最大的历史 7天 -->
+ <property name="maxHistory" value="6"/>
+ <!-- 日志最大的文件大小 10MB-->
+ <property name="maxFileSize" value="30MB"/>
+
+ <!-- ConsoleAppender 控制台输出日志 -->
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <!-- 对日志进行格式化 -->
+ <encoder>
+ <pattern>%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger -%msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="WARN" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>/Data_new/monitor_logs/uilog/warn.log</file>
+ <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+ <level>WARN</level>
+ </filter>
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <!-- daily rollover -->
+ <fileNamePattern>
+ /Data_new/monitor_logs/uilog/warn.%d{yyyy-MM-dd}.%i.log.gz
+ </fileNamePattern>
+ <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+ <!-- or whenever the file size reaches 100MB -->
+ <maxFileSize>${maxFileSize}</maxFileSize>
+ </timeBasedFileNamingAndTriggeringPolicy>
+ <!-- keep 30 days' worth of history -->
+ <maxHistory>${maxHistory}</maxHistory>
+ </rollingPolicy>
+ <encoder>
+ <pattern>%-1relative - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{0}:%line -- %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <!-- DEBUG级别日志 appender -->
+ <appender name="DEBUG" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>/Data_new/monitor_logs/uilog/debug.log</file>
+ <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+ <level>INFO</level>
+ </filter>
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <!-- 按天回滚 daily -->
+ <fileNamePattern>
+ /Data_new/monitor_logs/uilog/debug.%d{yyyy-MM-dd}.%i.log.gz
+ </fileNamePattern>
+ <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+ <!-- or whenever the file size reaches 100MB -->
+ <maxFileSize>${maxFileSize}</maxFileSize>
+ </timeBasedFileNamingAndTriggeringPolicy>
+ <!-- 日志最大的历史 60天 -->
+ <maxHistory>${maxHistory}</maxHistory>
+ </rollingPolicy>
+ <encoder>
+ <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <!-- 按照每天生成日志文件 -->
+ <appender name="APP_LOG" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>/Data_new/monitor_logs/uilog/app.log</file>
+ <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+ <level>INFO</level>
+ </filter>
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <!-- 按天回滚 daily -->
+ <fileNamePattern>
+ /Data_new/monitor_logs/uilog/app.%d{yyyy-MM-dd}.%i.log.gz
+ </fileNamePattern>
+ <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+ <!-- or whenever the file size reaches 100MB -->
+ <maxFileSize>${maxFileSize}</maxFileSize>
+ </timeBasedFileNamingAndTriggeringPolicy>
+ <!-- 日志最大的历史 60天 -->
+ <maxHistory>${maxHistory}</maxHistory>
+ </rollingPolicy>
+ <encoder>
+ <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level - %msg%n</pattern>
+ </encoder>
+ </appender>
+
+
+ <!-- 按照每天生成日志文件 -->
+ <appender name="BAN_IP_LOG" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>/Data_new/monitor_logs/uilog/banIP.log</file>
+ <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+ <level>INFO</level>
+ </filter>
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <!-- 按天回滚 daily -->
+ <fileNamePattern>
+ /Data_new/monitor_logs/uilog/banIP.%d{yyyy-MM-dd}.%i.log.gz
+ </fileNamePattern>
+ <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+ <!-- or whenever the file size reaches 100MB -->
+ <maxFileSize>${maxFileSize}</maxFileSize>
+ </timeBasedFileNamingAndTriggeringPolicy>
+ <!-- 日志最大的历史 60天 -->
+ <maxHistory>${maxHistory}</maxHistory>
+ </rollingPolicy>
+ <encoder>
+ <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level - %msg%n</pattern>
+ </encoder>
+ </appender>
+
+
+ <!-- root级别 DEBUG -->
+ <root level="INFO">
+ <!-- 控制台输出 -->
+ <appender-ref ref="STDOUT"/>
+ <!-- 文件输出 -->
+ <appender-ref ref="DEBUG"/>
+ <appender-ref ref="WARN"/>
+ </root>
+
+ <logger name="appLogger" additivity="false">
+ <level value="INFO"/>
+ <appender-ref ref="APP_LOG"/>
+ </logger>
+
+ <logger name="banIPLogger" additivity="false">
+ <level value="INFO"/>
+ <appender-ref ref="BAN_IP_LOG"/>
+ </logger>
+
+ <!-- 按照每天生成日志文件 -->
+ <appender name="API_TEST_LOG" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>/Data_new/monitor_logs/uilog/apiTest.log</file>
+ <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+ <level>INFO</level>
+ </filter>
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <!-- 按天回滚 daily -->
+ <fileNamePattern>
+ /Data_new/monitor_logs/uilog/apiTest.%d{yyyy-MM-dd}.%i.log.gz
+ </fileNamePattern>
+ <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+ <!-- or whenever the file size reaches 100MB -->
+ <maxFileSize>${maxFileSize}</maxFileSize>
+ </timeBasedFileNamingAndTriggeringPolicy>
+ <!-- 日志最大的历史 60天 -->
+ <maxHistory>${maxHistory}</maxHistory>
+ </rollingPolicy>
+ <encoder>
+ <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level - %msg%n</pattern>
+ </encoder>
+ </appender>
+ <logger name="apiTestLogger" additivity="false">
+ <level value="INFO"/>
+ <appender-ref ref="API_TEST_LOG"/>
+ </logger>
+
+</configuration>
\ No newline at end of file
--
libgit2 0.24.0