Merge pull request #1217 from WeBankPartners/add_tz_to_plugin

#tz add tomcat exporter config

cmdb-plugin/Dockerfile

@@ -1,7 +1,9 @@
 from platten/alpine-oracle-jre8-docker
 LABEL maintainer = "Webank CTB Team"
 ADD target/wecube-plugins-wecmdb-1.5.0.jar /application/wecube-plugins-wecmdb.jar
+ADD scripts/start-tomcat-exporter.sh /scripts/start-tomcat-exporter.sh
 ADD scripts/start.sh /scripts/start.sh
+RUN chmod +x /scripts/start-tomcat-exporter.sh
 RUN chmod +x /scripts/start.sh
 ADD scripts/tomcat_exporter.tar /scripts/
 CMD ["/bin/sh","-c","/scripts/start.sh $DB_HOST $DB_PORT $DB_SCHEMA $DB_USER $DB_PWD"]

cmdb-plugin/scripts/start-tomcat-exporter.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+sleep 3m
+echo "About to start tomcat exporter..."
+/bin/sh /scripts/tomcat_exporter/start.sh
+

cmdb-plugin/scripts/start.sh

@@ -8,8 +8,12 @@ JAVA_OPT="-Xmx3G -Xms512m -XX:+UseG1GC -XX:MaxGCPauseMillis=200  -XX:MaxTenuring
 JAVA_OPT="${JAVA_OPT} -verbose:gc -Xloggc:/data/wecmdb/log/wecmdb_gc_%p.log -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCApplicationStoppedTime -XX:+PrintAdaptiveSizePolicy"
 JAVA_OPT="${JAVA_OPT} -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=30m"
 
-/bin/sh /scripts/tomcat_exporter/start.sh
+nohup /scripts/start-tomcat-exporter.sh > /tmp/jmx.log 2>&1 &
+
+echo "About to start wecmdb..."
+
 mkdir -p /data/wecmdb/log
+
 java ${JAVA_OPT} -Duser.timezone=Asia/Shanghai \
 -Dcom.sun.management.jmxremote \
 -Dcom.sun.management.jmxremote.port=18082 \