diff --git a/build.sh b/build.sh index f99e7aaa..da5d20ef 100644 --- a/build.sh +++ b/build.sh @@ -3,72 +3,52 @@ workspace=$(cd $(dirname $0) && pwd -P) cd $workspace ## constant -app_name=kafka-manager -output_dir=output +OUTPUT_DIR=./output +KM_VERSION=2.1.0 +APP_NAME=kafka-manager-$KM_VERSION -gitversion=.gitversion -control=./control.sh -create_mysql_table=./docs/install_guide/create_mysql_table.sql -app_config_file=./kafka-manager-web/src/main/resources/application.yml +MYSQL_TABLE_SQL_FILE=./docs/install_guide/create_mysql_table.sql +CONFIG_FILE=./kafka-manager-web/src/main/resources/application.yml ## function function build() { - # 进行编译 -# # cmd 设置使用的JDK, 按需选择, 默认已安装了JDK 8 -# JVERSION=`java -version 2>&1 | awk 'NR==1{gsub(/"/,"");print $3}'` -# major=`echo $JVERSION | awk -F. '{print $1}'` -# mijor=`echo $JVERSION | awk -F. '{print $2}'` -# if [ $major -le 1 ] && [ $mijor -lt 8 ]; then -# export JAVA_HOME=/usr/local/jdk1.8.0_65 #(使用jdk8请设置) -# export PATH=$JAVA_HOME/bin:$PATH -# fi - # 编译命令 - mvn -U clean package -Dmaven.test.skip=true + mvn -U clean package -Dmaven.test.skip=true local sc=$? if [ $sc -ne 0 ];then ## 编译失败, 退出码为 非0 - echo "$app_name build error" + echo "$APP_NAME build error" exit $sc else - echo -n "$app_name build ok, vsn="`gitversion` + echo "$APP_NAME build ok" fi } function make_output() { - # 新建output目录 - rm -rf $output_dir &>/dev/null - mkdir -p $output_dir &>/dev/null + # 新建output目录 + rm -rf ${OUTPUT_DIR} &>/dev/null + mkdir -p ${OUTPUT_DIR}/${APP_NAME} &>/dev/null - # 填充output目录, output内的内容 即为 线上部署内容 - ( -# cp -rf $control $output_dir && # 拷贝 control.sh 脚本 至output目录 - cp -rf $create_mysql_table $output_dir && # 拷贝 sql 初始化脚本 至output目录 - cp -rf $app_config_file $output_dir && # 拷贝 application.yml 至output目录 + # 填充output目录, output内的内容 + ( + cp -rf ${MYSQL_TABLE_SQL_FILE} ${OUTPUT_DIR}/${APP_NAME} && # 拷贝 sql 初始化脚本 至output目录 + cp -rf ${CONFIG_FILE} ${OUTPUT_DIR}/${APP_NAME} && # 拷贝 application.yml 至output目录 - # 拷贝程序包到output路径 - cp kafka-manager-web/target/${app_name}-*-SNAPSHOT.jar ${output_dir}/${app_name}.jar - echo -e "make output ok." - ) || { echo -e "make output error"; exit 2; } # 填充output目录失败后, 退出码为 非0 + # 拷贝程序包到output路径 + cp kafka-manager-web/target/kafka-manager-web-${KM_VERSION}-SNAPSHOT.jar ${OUTPUT_DIR}/${APP_NAME}/${APP_NAME}-SNAPSHOT.jar + echo -e "make output ok." + ) || { echo -e "make output error"; exit 2; } # 填充output目录失败后, 退出码为 非0 } function make_package() { # 压缩output目录 ( - tar cvzf ${app_name}.tar.gz ${output_dir} - echo -e "make package ok." + cd ${OUTPUT_DIR} && tar cvzf ${APP_NAME}.tar.gz ${APP_NAME} + echo -e "make package ok." ) || { echo -e "make package error"; exit 2; } # 压缩output目录失败后, 退出码为 非0 } -## internals -function gitversion() { - git log -1 --pretty=%h > $gitversion - local gv=`cat $gitversion` - echo "$gv" -} - - ########################################## ## main ## 其中, @@ -88,4 +68,4 @@ make_package # 编译成功 echo -e "build done" -exit 0 +exit 0 \ No newline at end of file diff --git a/docs/install_guide/config_description.md b/docs/install_guide/config_description.md new file mode 100644 index 00000000..54ec4d85 --- /dev/null +++ b/docs/install_guide/config_description.md @@ -0,0 +1,99 @@ + +--- + +![kafka-manager-logo](../assets/images/common/logo_name.png) + +**一站式`Apache Kafka`集群指标监控与运维管控平台** + +--- + +# 配置说明 + +```yaml +server: + port: 8080 # 服务端口 + tomcat: + accept-count: 1000 + max-connections: 10000 + max-threads: 800 + min-spare-threads: 100 + +spring: + application: + name: kafkamanager + datasource: + kafka-manager: # 数据库连接配置 + jdbc-url: jdbc:mysql://127.0.0.1:3306/kafka_manager?characterEncoding=UTF-8&serverTimezone=GMT%2B8 #数据库的地址 + username: admin # 用户名 + password: admin # 密码 + driver-class-name: com.mysql.jdbc.Driver + main: + allow-bean-definition-overriding: true + + profiles: + active: dev # 启用的配置 + servlet: + multipart: + max-file-size: 100MB + max-request-size: 100MB + +logging: + config: classpath:logback-spring.xml + +custom: + idc: cn # 部署的数据中心, 忽略该配置, 后续会进行删除 + jmx: + max-conn: 10 # 和单台 broker 的最大JMX连接数 + store-metrics-task: + community: + broker-metrics-enabled: true # 社区部分broker metrics信息收集开关, 关闭之后metrics信息将不会进行收集及写DB + topic-metrics-enabled: true # 社区部分topic的metrics信息收集开关, 关闭之后metrics信息将不会进行收集及写DB + didi: + app-topic-metrics-enabled: false # 滴滴埋入的指标, 社区AK不存在该指标，因此默认关闭 + topic-request-time-metrics-enabled: false # 滴滴埋入的指标, 社区AK不存在该指标，因此默认关闭 + topic-throttled-metrics: false # 滴滴埋入的指标, 社区AK不存在该指标，因此默认关闭 + save-days: 7 #指标在DB中保持的天数，-1表示永久保存，7表示保存近7天的数据 + +account: # ldap相关的配置, 社区版本暂时支持不够完善，可以先忽略，欢迎贡献代码对这块做优化 + ldap: + +kcm: # 集群升级部署相关的功能，需要配合夜莺及S3进行使用，这块我们后续专门补充一个文档细化一下，牵扯到kcm_script.sh脚本的修改 + enabled: false # 默认关闭 + storage: + base-url: http://127.0.0.1 # 存储地址 + n9e: + base-url: http://127.0.0.1:8004 # 夜莺任务中心的地址 + user-token: 12345678 # 夜莺用户的token + timeout: 300 # 集群任务的超时时间，单位秒 + account: root # 集群任务使用的账号 + script-file: kcm_script.sh # 集群任务的脚本 + +monitor: # 监控告警相关的功能，需要配合夜莺进行使用 + enabled: false # 默认关闭，true就是开启 + n9e: + nid: 2 + user-token: 1234567890 + mon: + # 夜莺 mon监控服务 地址 + base-url: http://127.0.0.1:8032 + sink: + # 夜莺 transfer上传服务 地址 + base-url: http://127.0.0.1:8006 + rdb: + # 夜莺 rdb资源服务 地址 + base-url: http://127.0.0.1:80 + +# enabled: 表示是否开启监控告警的功能, true: 开启, false: 不开启 +# n9e.nid: 夜莺的节点ID +# n9e.user-token: 用户的密钥，在夜莺的个人设置中 +# n9e.mon.base-url: 监控地址 +# n9e.sink.base-url: 数据上报地址 +# n9e.rdb.base-url: 用户资源中心地址 + +notify: # 通知的功能 + kafka: # 默认通知发送到kafka的指定Topic中 + cluster-id: 95 # Topic的集群ID + topic-name: didi-kafka-notify # Topic名称 + order: # 部署的KM的地址 + detail-url: http://127.0.0.1 +``` diff --git a/docs/install_guide/install_guide_cn.md b/docs/install_guide/install_guide_cn.md index dbfa5e2c..9c700587 100644 --- a/docs/install_guide/install_guide_cn.md +++ b/docs/install_guide/install_guide_cn.md @@ -49,7 +49,7 @@ mvn install cp kafka-manager-web/src/main/resources/application.yml kafka-manager-web/target/ cd kafka-manager-web/target/ -nohup java -jar kafka-manager-web-2.0.0-SNAPSHOT.jar --spring.config.location=./application.yml > /dev/null 2>&1 & +nohup java -jar kafka-manager-web-2.1.0-SNAPSHOT.jar --spring.config.location=./application.yml > /dev/null 2>&1 & ``` ## 使用 diff --git a/kafka-manager-common/pom.xml b/kafka-manager-common/pom.xml index daf647a7..f310a81a 100644 --- a/kafka-manager-common/pom.xml +++ b/kafka-manager-common/pom.xml @@ -5,13 +5,13 @@ 4.0.0 com.xiaojukeji.kafka kafka-manager-common - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT jar kafka-manager com.xiaojukeji.kafka - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT diff --git a/kafka-manager-console/pom.xml b/kafka-manager-console/pom.xml index e8f6295b..2339dabd 100644 --- a/kafka-manager-console/pom.xml +++ b/kafka-manager-console/pom.xml @@ -8,7 +8,7 @@ kafka-manager com.xiaojukeji.kafka - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT diff --git a/kafka-manager-core/pom.xml b/kafka-manager-core/pom.xml index 966f7c93..2360dffd 100644 --- a/kafka-manager-core/pom.xml +++ b/kafka-manager-core/pom.xml @@ -5,13 +5,13 @@ 4.0.0 com.xiaojukeji.kafka kafka-manager-core - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT jar kafka-manager com.xiaojukeji.kafka - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT diff --git a/kafka-manager-dao/pom.xml b/kafka-manager-dao/pom.xml index 9db31a3e..41122856 100644 --- a/kafka-manager-dao/pom.xml +++ b/kafka-manager-dao/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-dao - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT jar kafka-manager com.xiaojukeji.kafka - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT diff --git a/kafka-manager-extends/kafka-manager-account/pom.xml b/kafka-manager-extends/kafka-manager-account/pom.xml index e112b5bf..3d129969 100644 --- a/kafka-manager-extends/kafka-manager-account/pom.xml +++ b/kafka-manager-extends/kafka-manager-account/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-account - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT jar kafka-manager com.xiaojukeji.kafka - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT ../../pom.xml diff --git a/kafka-manager-extends/kafka-manager-bpm/pom.xml b/kafka-manager-extends/kafka-manager-bpm/pom.xml index 3cf1c501..6a670849 100644 --- a/kafka-manager-extends/kafka-manager-bpm/pom.xml +++ b/kafka-manager-extends/kafka-manager-bpm/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-bpm - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT jar kafka-manager com.xiaojukeji.kafka - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT ../../pom.xml diff --git a/kafka-manager-extends/kafka-manager-kcm/pom.xml b/kafka-manager-extends/kafka-manager-kcm/pom.xml index ea581c86..4e087dd1 100644 --- a/kafka-manager-extends/kafka-manager-kcm/pom.xml +++ b/kafka-manager-extends/kafka-manager-kcm/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-kcm - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT jar kafka-manager com.xiaojukeji.kafka - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT ../../pom.xml diff --git a/kafka-manager-extends/kafka-manager-monitor/pom.xml b/kafka-manager-extends/kafka-manager-monitor/pom.xml index cba5366a..9d198a49 100644 --- a/kafka-manager-extends/kafka-manager-monitor/pom.xml +++ b/kafka-manager-extends/kafka-manager-monitor/pom.xml @@ -5,13 +5,13 @@ 4.0.0 com.xiaojukeji.kafka kafka-manager-monitor - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT jar kafka-manager com.xiaojukeji.kafka - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT ../../pom.xml diff --git a/kafka-manager-extends/kafka-manager-notify/pom.xml b/kafka-manager-extends/kafka-manager-notify/pom.xml index f0a80446..c15dba32 100644 --- a/kafka-manager-extends/kafka-manager-notify/pom.xml +++ b/kafka-manager-extends/kafka-manager-notify/pom.xml @@ -5,13 +5,13 @@ 4.0.0 com.xiaojukeji.kafka kafka-manager-notify - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT jar kafka-manager com.xiaojukeji.kafka - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT ../../pom.xml diff --git a/kafka-manager-extends/kafka-manager-openapi/pom.xml b/kafka-manager-extends/kafka-manager-openapi/pom.xml index ca37d012..a0c4c277 100644 --- a/kafka-manager-extends/kafka-manager-openapi/pom.xml +++ b/kafka-manager-extends/kafka-manager-openapi/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-openapi - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT jar kafka-manager com.xiaojukeji.kafka - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT ../../pom.xml diff --git a/kafka-manager-task/pom.xml b/kafka-manager-task/pom.xml index 4741a948..86c06a99 100644 --- a/kafka-manager-task/pom.xml +++ b/kafka-manager-task/pom.xml @@ -5,13 +5,13 @@ 4.0.0 com.xiaojukeji.kafka kafka-manager-task - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT jar kafka-manager com.xiaojukeji.kafka - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT diff --git a/kafka-manager-web/pom.xml b/kafka-manager-web/pom.xml index 9970a0bf..e894af5d 100644 --- a/kafka-manager-web/pom.xml +++ b/kafka-manager-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 - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT jar kafka-manager com.xiaojukeji.kafka - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT diff --git a/kafka-manager-web/src/main/resources/application.yml b/kafka-manager-web/src/main/resources/application.yml index 2e7b5159..b1ed6cd5 100644 --- a/kafka-manager-web/src/main/resources/application.yml +++ b/kafka-manager-web/src/main/resources/application.yml @@ -37,9 +37,9 @@ custom: broker-metrics-enabled: true topic-metrics-enabled: true didi: - app-topic-metrics-enabled: true - topic-request-time-metrics-enabled: true - topic-throttled-metrics: true + app-topic-metrics-enabled: false + topic-request-time-metrics-enabled: false + topic-throttled-metrics: false save-days: 7 account: diff --git a/pom.xml b/pom.xml index e7d9bed0..d5e74d61 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.xiaojukeji.kafka kafka-manager pom - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT org.springframework.boot