From 839c00e6f38436efb0fea1e6cc4fb3ba10a95596 Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sangshuduo@gmail.com>
Date: Thu, 4 Nov 2021 23:59:18 +0800
Subject: [PATCH] Feature/sangshuduo/td 10469 blm3 (#8551)

* [TD-10469]<feature>: 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

* <test>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

* update blm3

* add upx to compress blm3

* update blm3 for systemd service

* update blm3 to fix lower version go incompatible issue

Co-authored-by: liuyq-617 <yqliu@taosdata.com>
---
 src/plugins/CMakeLists.txt | 6 +++++-
 src/plugins/blm3           | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index 0d085fc6f0..ec3863b815 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -40,7 +40,11 @@ ELSE ()
     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/
+    INSTALL_COMMAND
+        COMMAND curl -sL https://github.com/upx/upx/releases/download/v3.96/upx-3.96-amd64_linux.tar.xz -o upx.tar.xz && tar xvJf upx.tar.xz --strip-components 1 && ./upx blm3
+        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/
   )
 ENDIF ()
 
diff --git a/src/plugins/blm3 b/src/plugins/blm3
index ba539ce69d..598cb96ee6 160000
--- a/src/plugins/blm3
+++ b/src/plugins/blm3
@@ -1 +1 @@
-Subproject commit ba539ce69dc4fe53536e9b0517fe75917dce5c46
+Subproject commit 598cb96ee60ec6a16c5b8b07ea8ca9748799e7e1
-- 
GitLab