[hertzbeat] release hertzbeat version v1.4.0 (#1168)

apache · Aug 10, 2023 · d14fe28 · d14fe28
1 parent 61ed414
commit d14fe28
Show file tree

Hide file tree

Showing 16 changed files with 35 additions and 26 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -135,7 +135,7 @@ Public WeChat: `tancloudtech`
 - **[web-app](https://github.com/dromara/hertzbeat/tree/master/web-app)** Provide web ui.
 > Angular Web UI.
 
-![hertzBeat](home/static/img/docs/hertzbeat-stru-en.svg)   
+![hertzBeat](home/static/img/docs/hertzbeat-arch.png)
 
 <br>  
 
@@ -279,4 +279,4 @@ git pull upstream master
 - **[web-app](https://github.com/dromara/hertzbeat/tree/master/web-app)** 提供可视化控制台页面
 > 监控告警系统可视化控制台前端
 
-![hertzBeat](https://cdn.jsdelivr.net/gh/dromara/hertzbeat@gh-pages/img/docs/hertzbeat-stru.svg)   
+![hertzBeat](home/static/img/docs/hertzbeat-arch.png)     
diff --git a/README.md b/README.md
@@ -142,7 +142,7 @@ Detailed config refer to [Install HertzBeat via Docker](https://hertzbeat.com/do
           entrance:
             netty:
               enabled: true
-              identity: ${IDENTITY}
+              identity: ${IDENTITY:}
               manager-ip: ${MANAGER_IP:127.0.0.1}
               manager-port: ${MANAGER_PORT:1158}
       ```

diff --git a/README_CN.md b/README_CN.md
@@ -139,7 +139,7 @@ docker run -d -e IDENTITY=custom-collector-name -e MANAGER_IP=127.0.0.1 -e MANAG
          entrance:
            netty:
              enabled: true
-             identity: ${IDENTITY}
+             identity: ${IDENTITY:}
              manager-ip: ${MANAGER_IP:127.0.0.1}
              manager-port: ${MANAGER_PORT:1158}
      ```

diff --git a/collector/src/main/resources/application.yml b/collector/src/main/resources/application.yml
@@ -36,7 +36,7 @@ collector:
     entrance:
       netty:
         enabled: true
-        identity: ${IDENTITY}
+        identity: ${IDENTITY:}
         manager-ip: ${MANAGER_IP:127.0.0.1}
         manager-port: ${MANAGER_PORT:1158}
 

diff --git a/collector/src/main/resources/banner.txt b/collector/src/main/resources/banner.txt
@@ -2,4 +2,4 @@
  | | | | ___ _ __| |_ ___| __ )  ___  __ _| |_
  | |_| |/ _ \ '__| __|_  /  _ \ / _ \/ _` | __|        Profile: ${spring.profiles.active}
  |  _  |  __/ |  | |_ / /| |_) |  __/ (_| | |_         Name: ${spring.application.name} Port: ${server.port} Pid: ${pid}
- |_| |_|\___|_|   \__/___|____/ \___|\__,_|\__|
+ |_| |_|\___|_|   \__/___|____/ \___|\__,_|\__|        https://hertzbeat.com/
diff --git a/home/docs/start/docker-deploy.md b/home/docs/start/docker-deploy.md
@@ -41,7 +41,7 @@ sidebar_label: Install via Docker
    HertzBeat default built-in three user accounts, respectively `admin/hertzbeat tom/hertzbeat guest/hertzbeat`       
    If you need update account or password, configure `sureness.yml`. Ignore this step without this demand.    
    Download and config `sureness.yml` in the host directory，eg:`$(pwd)/sureness.yml`    
-   Download from [github/script/sureness.yml](https://github.com/dromara/hertzbeat/blob/master/script/sureness.yml) or [gitee/script/sureness.yml](https://gitee.com/dromara/hertzbeat/blob/master/script/sureness.yml)    
+   Download from [github/script/sureness.yml](https://github.com/dromara/hertzbeat/raw/master/script/sureness.yml) or [gitee/script/sureness.yml](https://gitee.com/dromara/hertzbeat/raw/master/script/sureness.yml)    
    For detail steps, please refer to [Configure Account Password](account-modify)    
 
 5. Start the HertzBeat Docker container    
@@ -55,7 +55,7 @@ $ docker run -d -p 1157:1157 -p 1158:1158 \
     --name hertzbeat tancloud/hertzbeat
 ```
 
-   This command starts a running HertzBeat Docker container with mapping port 1157. If existing processes on the host use the port, please modify host mapped port.  
+   This command starts a running HertzBeat Docker container with mapping port 1157-1158. If existing processes on the host use the port, please modify host mapped port.  
    - `docker run -d` : Run a container in the background via Docker
    - `-p 1157:1157 -p 1158:1158`  : Mapping container ports to the host, 1157 is web-ui port, 1158 is cluster port.
    - `-v $(pwd)/data:/opt/hertzbeat/data` : (optional, data persistence) Important⚠️ Mount the H2 database file to the local host, to ensure that the data is not lost due creating or deleting container.  

diff --git a/home/docs/start/package-deploy.md b/home/docs/start/package-deploy.md
@@ -65,7 +65,7 @@ In `startup.bat`, modify `javaw` to the path of `java11`, such as `C:\Users\user
          entrance:
            netty:
              enabled: true
-             identity: ${IDENTITY}
+             identity: ${IDENTITY:}
              manager-ip: ${MANAGER_IP:127.0.0.1}
              manager-port: ${MANAGER_PORT:1158}
      ```

diff --git a/home/docs/start/quickstart.md b/home/docs/start/quickstart.md
@@ -53,7 +53,7 @@ Detailed config refer to [Install HertzBeat via Docker](https://hertzbeat.com/do
           entrance:
             netty:
               enabled: true
-              identity: ${IDENTITY}
+              identity: ${IDENTITY:}
               manager-ip: ${MANAGER_IP:127.0.0.1}
               manager-port: ${MANAGER_PORT:1158}
       ```

diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/package-deploy.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/package-deploy.md
@@ -63,7 +63,7 @@ sidebar_label: 安装包方式部署
          entrance:
            netty:
              enabled: true
-             identity: ${IDENTITY}
+             identity: ${IDENTITY:}
              manager-ip: ${MANAGER_IP:127.0.0.1}
              manager-port: ${MANAGER_PORT:1158}
      ```

diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/quickstart.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/quickstart.md
@@ -91,7 +91,7 @@ docker run -d -e IDENTITY=custom-collector-name -e MANAGER_IP=127.0.0.1 -e MANAG
          entrance:
            netty:
              enabled: true
-             identity: ${IDENTITY}
+             identity: ${IDENTITY:}
              manager-ip: ${MANAGER_IP:127.0.0.1}
              manager-port: ${MANAGER_PORT:1158}
      ```

diff --git a/manager/src/main/resources/banner.txt b/manager/src/main/resources/banner.txt
@@ -2,4 +2,4 @@
  | | | | ___ _ __| |_ ___| __ )  ___  __ _| |_
  | |_| |/ _ \ '__| __|_  /  _ \ / _ \/ _` | __|        Profile: ${spring.profiles.active}
  |  _  |  __/ |  | |_ / /| |_) |  __/ (_| | |_         Name: ${spring.application.name} Port: ${server.port} Pid: ${pid}
- |_| |_|\___|_|   \__/___|____/ \___|\__,_|\__|
+ |_| |_|\___|_|   \__/___|____/ \___|\__,_|\__|        https://hertzbeat.com/ 
diff --git a/script/assembly/collector/assembly.xml b/script/assembly/collector/assembly.xml
@@ -3,7 +3,7 @@
           xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd
 http://maven.apache.org/ASSEMBLY/2.0.0 ">
     <!--必填,会追加到打包文件名称的末尾-->
-    <id>1.3.2</id>
+    <id>1.4.0</id>
     <!--打包类型,可以设置多种类型,打包的时候不同的类型都会打包打出来-->
     <formats>
         <format>tar</format>

diff --git a/script/assembly/server/assembly.xml b/script/assembly/server/assembly.xml
@@ -19,7 +19,7 @@
           xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd
 http://maven.apache.org/ASSEMBLY/2.0.0 ">
     <!--必填,会追加到打包文件名称的末尾-->
-    <id>1.3.2</id>
+    <id>1.4.0</id>
     <!--打包类型,可以设置多种类型,打包的时候不同的类型都会打包打出来-->
     <formats>
         <format>tar</format>

diff --git a/script/docker/collector/build.sh b/script/docker/collector/build.sh
@@ -31,11 +31,16 @@ fi
 # 编译上下文目录
 CONTEXT_DIR=`pwd`
 
-echo "docker buildx build --platform linux/arm64,linux/amd64 -t tancloud/hertzbeat-collector:v$VERSION -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg VERSION="$VERSION" --push"
+COMMAND="docker buildx build --platform linux/arm64,linux/amd64 -t tancloud/hertzbeat-collector:v$VERSION -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg VERSION="$VERSION" --push"
 
-#docker buildx build --platform linux/arm64,linux/amd64 -t tancloud/hertzbeat:v"$VERSION" -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg VERSION="$VERSION" --push
-#docker build -t tancloud/hertzbeat:latest -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg VERSION="$VERSION"
+#COMMAND="docker buildx build --platform linux/arm64,linux/amd64 -t tancloud/hertzbeat-collector:latest -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg VERSION="$VERSION" --push"
 
-echo "docker buildx build --platform linux/arm64,linux/amd64 -t quay.io/tancloud/hertzbeat-collector:v$VERSION -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg VERSION="$VERSION" --push"
+#COMMAND="docker buildx build --platform linux/arm64,linux/amd64 -t quay.io/tancloud/hertzbeat-collector:v$VERSION -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg VERSION="$VERSION" --push"
 
-#docker buildx build --platform linux/arm64,linux/amd64 -t quay.io/tancloud/hertzbeat-collector:v$VERSION -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg VERSION="$VERSION" --push
+#COMMAND="docker buildx build --platform linux/arm64,linux/amd64 -t quay.io/tancloud/hertzbeat-collector:latest -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg VERSION="$VERSION" --push"
+
+echo "$COMMAND"
+
+$COMMAND
+
+#docker build -t tancloud/hertzbeat-collector:latest -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg VERSION="$VERSION"
diff --git a/script/docker/server/build.sh b/script/docker/server/build.sh
@@ -31,12 +31,16 @@ fi
 # 编译上下文目录
 CONTEXT_DIR=`pwd`
 
-echo "docker buildx build --platform linux/arm64,linux/amd64 -t tancloud/hertzbeat:v$VERSION -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg VERSION="$VERSION" --push"
+COMMAND="docker buildx build --platform linux/arm64,linux/amd64 -t tancloud/hertzbeat:v$VERSION -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg VERSION="$VERSION" --push"
 
-#docker buildx build --platform linux/arm64,linux/amd64 -t tancloud/hertzbeat:v"$VERSION" -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg VERSION="$VERSION" --push
-#docker build -t tancloud/hertzbeat:latest -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg VERSION="$VERSION"
+#COMMAND="docker buildx build --platform linux/arm64,linux/amd64 -t tancloud/hertzbeat:latest -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg VERSION="$VERSION" --push"
+
+#COMMAND="docker buildx build --platform linux/arm64,linux/amd64 -t quay.io/tancloud/hertzbeat:v$VERSION -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg VERSION="$VERSION" --push"
 
+#COMMAND="docker buildx build --platform linux/arm64,linux/amd64 -t quay.io/tancloud/hertzbeat:latest -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg VERSION="$VERSION" --push"
 
-echo "docker buildx build --platform linux/arm64,linux/amd64 -t quay.io/tancloud/hertzbeat:v$VERSION -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg VERSION="$VERSION" --push"
+echo "$COMMAND"
 
-#docker buildx build --platform linux/arm64,linux/amd64 -t quay.io/tancloud/hertzbeat:v$VERSION -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg VERSION="$VERSION" --push
+$COMMAND
+
+#docker build -t tancloud/hertzbeat:latest -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg VERSION="$VERSION"
diff --git a/web-app/src/app/shared/consts.ts b/web-app/src/app/shared/consts.ts
@@ -1,3 +1,3 @@
 export const CONSTS = {
-  VERSION: 'v1.3.2'
+  VERSION: 'v1.4.0'
 };