diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e54e032b5d0685951138071d007c02f384d597dc..780b1c359b548910b56d4f8abe3cb17af48e0e5a 100644
--- 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)
@@ -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
index 8d826d83a0d1c305d10744ee6ee0f46193d8c86d..3f3717925443ff7ff2facbd28cd48b9654d7a21f 100644
--- 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
index 41cdf8654cfb29c75474bf5fdb435a6790c7503c..4c08bd623aaa46f24b62c3aec46017a55791c633 100644
--- 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
index 3d73b1c0c01332b30daacc9139921de03d38e0fc..71524ae4111237351fc3c86a3866117344dda855 100644
--- 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
index f86b16d51f5667c890d0444d76b1fe2a424f494d..9e56ad9362e1af6aef2875739621aa3e9afe35fb 100644
--- 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
index 2f28446ed5cfebc229bc6bd28734d4b582c8d1ab..5ac7a2b334fe3ecd181baab10509987bd56fc460 100644
--- 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
index 4c4a793dad538c30c7c82ae6b823ae8799b8aaad..5a1b2334ba870d02c0c1dbf1a1f5305701697796 100644
--- 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
index 3806af047417bfd7d3339540cc9b7880b375c4a0..03339eeb4b59a2f5173e0bc1bf0adffeb017bb16 100644
--- 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
index aa67e6c549604ff739506ac5a6b6a46433a4b360..d35d37f214719c19ea185c00f727f35872774d09 100644
--- 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
index 0a14fb1ac94b7928a8a893f139800951a5c7c3ad..7951689f892feb80981e8a249290ffbc27c32562 100644
--- 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
index f86b16d51f5667c890d0444d76b1fe2a424f494d..54462534eb574ae76d66e6306a8d5ba4c21d565e 100644
--- 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
index 5817382a1c9b18e82565fc9b1dbe97aefc8b28a6..70f2b6f0cc6efb43f522c0e10cb51eef170a3446 100644
--- 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 ">
- 1.3.2
+ 1.4.0
tar
diff --git a/script/assembly/server/assembly.xml b/script/assembly/server/assembly.xml
index dcc2967c42da8c79a8c35d21e0b46e5d750e41c5..d16a7a07250999ffe9d0b70b86e55b9d0116cc85 100644
--- 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 ">
- 1.3.2
+ 1.4.0
tar
diff --git a/script/docker/collector/build.sh b/script/docker/collector/build.sh
index eb09aae7d434b1a5254ebf6d935eaf4f8d169ac9..0b7da2df314f9c462d0de5db28632ff2e69cbc33 100755
--- 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
index ac0f2b0214bb99303a3b634c50f1acf17c60015e..32487549903261450dfb95ae1b1fb4498915ec79 100755
--- 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
index b158c8c6ac6cf9c9b93e075112807a673b4b4079..54b159286e11d8006a3d4408cd5c07e1b343a00c 100644
--- 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'
};