diff --git a/Dockerfile b/Dockerfile index 71f0412f..6bfaadea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM fabric8/java-alpine-openjdk8-jdk MAINTAINER xuzhengxi ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 -ADD ./web/target/kafka-manager-web-1.0.0-SNAPSHOT.jar kafka-manager-web.jar +ADD ./web/target/kafka-manager-web-1.1.0-SNAPSHOT.jar kafka-manager-web.jar ADD ./docker/kafka-manager/application-standalone.yml application.yml ENTRYPOINT ["java","-jar","/kafka-manager-web.jar","--spring.config.location=./application.yml"] EXPOSE 8080 \ No newline at end of file diff --git a/README.md b/README.md index 02177bdc..e65dc2c0 100644 --- a/README.md +++ b/README.md @@ -95,7 +95,7 @@ create database kafka_manager owner=admin template=template0 encoding='UTF-8' lc ############# application.yml 是配置文件 cp web/src/main/resources/application.yml web/target/ cd web/target/ -nohup java -jar kafka-manager-web-1.0.0-SNAPSHOT.jar --spring.config.location=./application.yml > /dev/null 2>&1 & +nohup java -jar kafka-manager-web-1.1.0-SNAPSHOT.jar --spring.config.location=./application.yml > /dev/null 2>&1 & ``` ### 使用 diff --git a/common/pom.xml b/common/pom.xml index 9284d4ff..a39bcd31 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,13 +5,13 @@ 4.0.0 com.xiaojukeji.kafka kafka-manager-common - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT jar kafka-manager com.xiaojukeji.kafka - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT diff --git a/console/pom.xml b/console/pom.xml index cbb41991..40a10973 100644 --- a/console/pom.xml +++ b/console/pom.xml @@ -5,7 +5,7 @@ kafka-manager com.xiaojukeji.kafka - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT 4.0.0 kafka-manager-console diff --git a/dao/pom.xml b/dao/pom.xml index 0e0cf71f..a50eaa58 100644 --- a/dao/pom.xml +++ b/dao/pom.xml @@ -5,13 +5,13 @@ 4.0.0 com.xiaojukeji.kafka kafka-manager-dao - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT jar kafka-manager com.xiaojukeji.kafka - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT diff --git a/docker/kafka-manager/Dockerfile b/docker/kafka-manager/Dockerfile index 87647313..de8d2f25 100644 --- a/docker/kafka-manager/Dockerfile +++ b/docker/kafka-manager/Dockerfile @@ -1,7 +1,7 @@ FROM java:8 MAINTAINER xuzhengxi ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 -ADD ../../web/target/kafka-manager-web-1.0.0-SNAPSHOT.jar kafka-manager-web.jar +ADD ../../web/target/kafka-manager-web-1.1.0-SNAPSHOT.jar kafka-manager-web.jar ADD ./application.yml application.yml ENTRYPOINT ["java","-jar","/kafka-manager-web.jar","--spring.config.location=./application.yml"] EXPOSE 8080 \ No newline at end of file diff --git a/pom.xml b/pom.xml index f56b02cc..c9a2e9e4 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.xiaojukeji.kafka kafka-manager pom - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT org.springframework.boot @@ -15,7 +15,7 @@ - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT 2.9.0 @@ -77,7 +77,7 @@ com.alibaba fastjson - 1.2.58 + 1.2.68 org.apache.zookeeper diff --git a/service/pom.xml b/service/pom.xml index 568ace60..73c1ab93 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -5,13 +5,13 @@ 4.0.0 com.xiaojukeji.kafka kafka-manager-service - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT jar kafka-manager com.xiaojukeji.kafka - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT @@ -31,7 +31,7 @@ com.xiaojukeji.kafka kafka-manager-dao - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT diff --git a/web/bin/shutdown.sh b/web/bin/shutdown.sh new file mode 100644 index 00000000..4fb29c78 --- /dev/null +++ b/web/bin/shutdown.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash + +cd `dirname $0`/../lib +lib_dir=`pwd` + +pid=`ps ax | grep -i 'kafka-manager-web' | grep ${lib_dir} | grep java | grep -v grep | awk '{print $1}'` +if [ -z "$pid" ] ; then + echo "No kafka-manager-web running." + exit -1; +fi + +echo "The kafka-manager-web(${pid}) is running..." + +kill ${pid} + +echo "Send shutdown request to kafka-manager-web(${pid}) OK" \ No newline at end of file diff --git a/web/bin/startup.sh b/web/bin/startup.sh new file mode 100644 index 00000000..0ccde105 --- /dev/null +++ b/web/bin/startup.sh @@ -0,0 +1,46 @@ +#!/usr/bin/env bash + +error_exit () +{ + echo "ERROR: $1 !!" + exit 1 +} + +if [ -z "$JAVA_HOME" ]; then + error_exit "Please set the JAVA_HOME variable in your environment, We need java(x64)! jdk8 or later is better!" + +fi + +export WEB_SERVER="kafka-manager-web-*" +export JAVA_HOME +export JAVA="$JAVA_HOME/bin/java" +export BASE_DIR=`cd $(dirname $0)/..; pwd` +export DEFAULT_SEARCH_LOCATIONS="classpath:/,classpath:/config/,file:./,file:./config/" +export CUSTOM_SEARCH_LOCATIONS=${DEFAULT_SEARCH_LOCATIONS},file:${BASE_DIR}/conf/ + +#=========================================================================================== +# JVM Configuration +#=========================================================================================== + +JAVA_OPT="${JAVA_OPT} -server -Xms2g -Xmx2g -Xmn1g -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=320m" +JAVA_OPT="${JAVA_OPT} -XX:-OmitStackTraceInFastThrow -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${BASE_DIR}/logs/java_heapdump.hprof" +JAVA_OPT="${JAVA_OPT} -Xloggc:${BASE_DIR}/logs/gc.log -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCTimeStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=100M" +JAVA_OPT="${JAVA_OPT} -jar ${BASE_DIR}/lib/${WEB_SERVER}.jar" +JAVA_OPT="${JAVA_OPT} --spring.config.location=${CUSTOM_SEARCH_LOCATIONS}" +JAVA_OPT="${JAVA_OPT} --logging.config=${BASE_DIR}/conf/logback-spring.xml" +JAVA_OPT="${JAVA_OPT} --server.max-http-header-size=524288" + +if [ ! -d "${BASE_DIR}/logs" ]; then + mkdir ${BASE_DIR}/logs +fi + +echo "$JAVA ${JAVA_OPT}" + +# check the start.out log output file +if [ ! -f "${BASE_DIR}/logs/start.out" ]; then + touch "${BASE_DIR}/logs/start.out" +fi +# start +echo "$JAVA ${JAVA_OPT}" > ${BASE_DIR}/logs/start.out 2>&1 & +nohup $JAVA ${JAVA_OPT} >> ${BASE_DIR}/logs/start.out 2>&1 & +echo "kafka-manager is starting,you can check the ${BASE_DIR}/logs/start.out" \ No newline at end of file diff --git a/web/conf/application.yml b/web/conf/application.yml new file mode 100644 index 00000000..b0363881 --- /dev/null +++ b/web/conf/application.yml @@ -0,0 +1,32 @@ +server: + port: 8080 + tomcat: + accept-count: 100 + max-connections: 1000 + max-threads: 20 + min-spare-threads: 20 + +spring: + application: + name: kafkamanager + datasource: + kafka-manager: + jdbc-url: jdbc:mysql://localhost:3306/kafka_manager?characterEncoding=UTF-8&serverTimezone=GMT%2B8 + username: admin + password: admin + driver-class-name: org.mariadb.jdbc.Driver + main: + allow-bean-definition-overriding: true + + profiles: + active: dev + +logging: + config: classpath:logback-spring.xml + +# kafka监控 +kafka-monitor: + enabled: true + notify-kafka: + cluster-id: 95 + topic-name: kmo_monitor diff --git a/web/pom.xml b/web/pom.xml index 8865e641..9ef75708 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -4,13 +4,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 kafka-manager-web - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT jar kafka-manager com.xiaojukeji.kafka - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT @@ -110,6 +110,26 @@ + + org.apache.maven.plugins + maven-assembly-plugin + + + make-assembly + package + + single + + + kafka-manager-${project.version} + + ./src/main/resources/assembly.xml + + posix + + + + diff --git a/web/src/main/resources/assembly.xml b/web/src/main/resources/assembly.xml new file mode 100644 index 00000000..a71ba211 --- /dev/null +++ b/web/src/main/resources/assembly.xml @@ -0,0 +1,34 @@ + + bin + + dir + tar.gz + + + + + ./bin/* + + 0755 + + + ./src/main/resources/ + conf + + application.yml + logback-spring.xml + + + + ${project.build.directory} + lib + + *.jar + + + + + \ No newline at end of file