From 07c35514c8f1dec9fcd68dbe26f7b026c367e0d5 Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Wed, 3 Nov 2021 09:54:55 +0800 Subject: [PATCH] Feature/sangshuduo/td 10469 blm3 (#8544) * [TD-10469]: use blm to replace httpd * add blm3 as submodule and modify the install script. * make http disabled by default. * use external project for go build. * make install and systemctl works. * change blm3 to official repo. * fix alert build missing sqlx package. * update README regarding golang env setup. * remove blm3. * modify script to support blm3 * udpate submodule in CI * update jenkinsfile * update blm3 with statsd port changed and config file name changed. * still use tdengine's httpd for lite version. * include blm.toml in released packages. * merge with develop branch. * update grafana plugin to support telegraf. * fix python test framework * fix blm3.toml name * comment off restful test for blm3 CI. * fix blm.toml name * comment off http related case for blm3. * fix cmake define.inc for windows build * update grafanaplugin * update blm3 * update grafana. * update grafana plugin to support statsd. * update blm3 to support lower version go. * update grafanaplugin and blm3 bugfix. * update grafana plugin, dashboard name changed. update blm3 for cinterface error code. * disable blm3 in arm32 * support blm3 --version * change cmake minimum version requirement from 2.8 to 3.0 * pull latest blm3 c67fcc11bc5e82e3d7aea8db855a8cbf8b109239 * update blm3 to 2021/10/22. * support BUILD_HTTP false. * fix one line in post.sh * blm3 support opentsdb telenet protocol. * update grafana plugin to 3.1.1 * revert grafanaplugin * fix grafanaplugin submodule url issue. * cleanup blm3 directory before build Co-authored-by: liuyq-617 --- src/plugins/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt index 4cf444bab2..dee9806000 100644 --- a/src/plugins/CMakeLists.txt +++ b/src/plugins/CMakeLists.txt @@ -57,6 +57,8 @@ ELSE () DEPENDS taos BUILD_IN_SOURCE 1 CONFIGURE_COMMAND cmake -E echo "blm3 no need cmake to config" + PATCH_COMMAND + COMMAND git clean -f -d BUILD_COMMAND CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../inc CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib go build -ldflags "-s -w -X github.com/taosdata/blm3/version.CommitID=${blm3_commit_sha1}" INSTALL_COMMAND cmake -E copy blm3 ${CMAKE_BINARY_DIR}/build/bin COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/test/cfg/ COMMAND cmake -E copy ./example/config/blm.toml ${CMAKE_BINARY_DIR}/test/cfg/ ) -- GitLab