[hertzbeat] release hertzbeat version v1.4.3 (#1400)

Signed-off-by: tomsun28 <[email protected]>
apache · Dec 7, 2023 · da9f95a · da9f95a
1 parent 31d6db2
commit da9f95a
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 18 deletions.
diff --git a/.github/workflows/maven-build.yml → .github/workflows/backend-build-test.yml b/.github/workflows/maven-build.yml → .github/workflows/backend-build-test.yml
@@ -1,7 +1,7 @@
 # This workflow will build a Java project with Maven
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
 
-name: Java CI with Maven
+name: Backend CI
 
 on:
   push:
@@ -11,9 +11,7 @@ on:
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
-
     steps:
     - uses: actions/checkout@v2
     - name: Set up JDK 11

diff --git a/.github/workflows/doc-pdf-builder.yml b/.github/workflows/doc-pdf-builder.yml
@@ -1,4 +1,4 @@
-name: 'hertzbeat-doc-pdf-builder'
+name: 'HertzBeat Doc Pdf Builder'
 on:
   page_build
 

diff --git a/.github/workflows/yarn-build.yml → .github/workflows/frontend-build-test.yml b/.github/workflows/yarn-build.yml → .github/workflows/frontend-build-test.yml
@@ -1,7 +1,7 @@
 # This workflow will build a Java project with Maven
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
 
-name: Node CI with Yarn
+name: Frontend CI 
 
 on:
   push:

diff --git a/.github/workflows/issues-translator.yml b/.github/workflows/issues-translator.yml
@@ -1,12 +1,12 @@
-name: 'issues-translator'
+name: 'Issues Translator'
 on:
   issue_comment:
     types: [created]
   issues:
     types: [opened]
 
 jobs:
-  build:
+  translate:
     runs-on: ubuntu-latest
     steps:
       - uses: usthe/[email protected]

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.4.2</id>
+    <id>1.4.3</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.4.2</id>
+    <id>1.4.3</id>
     <!--打包类型,可以设置多种类型,打包的时候不同的类型都会打包打出来-->
     <formats>
         <format>tar</format>

diff --git a/script/docker/collector/build.sh b/script/docker/collector/build.sh
@@ -31,11 +31,11 @@ fi
 # 编译上下文目录
 CONTEXT_DIR=`pwd`
 
-#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"
+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"
 
 #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"
 
-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"
+#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"
 
 #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"
 

diff --git a/script/docker/server/Dockerfile b/script/docker/server/Dockerfile
@@ -5,9 +5,12 @@ ARG VERSION
 
 MAINTAINER tancloud "[email protected]"
 
-# Install SSH
-RUN apt-get update && apt-get install -y openssh-server 
+# Install SSH And Locales
+RUN apt-get update && apt-get install -y openssh-server && apt-get install -y locales
 RUN mkdir /var/run/sshd
+# Build zh_CN en_US locale resource package
+RUN localedef -c -f UTF-8 -i zh_CN zh_CN.UTF-8
+RUN localedef -c -f UTF-8 -i en_US en_US.UTF-8
 
 ADD hertzbeat-${VERSION}.tar /opt/
 

diff --git a/script/helm/hertzbeat/Chart.yaml b/script/helm/hertzbeat/Chart.yaml
@@ -13,9 +13,9 @@ icon: https://raw.githubusercontent.com/dromara/hertzbeat/master/home/static/img
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.4.2
+version: 1.4.3
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v1.4.2"
+appVersion: "v1.4.3"
diff --git a/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.html b/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.html
@@ -320,7 +320,7 @@
           >
             <nz-option
               nzCustomContent
-              [nzValue]="0"
+              [nzValue]="''"
               [nzLabel]="('monitor.collector.system.default' | i18n) + '-' + ('collector.mode.public' | i18n)"
             >
               <nz-tag nzColor="processing">{{ 'monitor.collector.system.default' | i18n }}</nz-tag>

diff --git a/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.html b/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.html
@@ -329,7 +329,7 @@
           >
             <nz-option
               nzCustomContent
-              [nzValue]="0"
+              [nzValue]="''"
               [nzLabel]="('monitor.collector.system.default' | i18n) + '-' + ('collector.mode.public' | i18n)"
             >
               <nz-tag nzColor="processing">{{ 'monitor.collector.system.default' | i18n }}</nz-tag>

diff --git a/web-app/src/app/shared/constants.ts b/web-app/src/app/shared/constants.ts
@@ -1,3 +1,3 @@
 export const CONSTANTS = {
-  VERSION: 'v1.4.2'
+  VERSION: 'v1.4.3'
 };