wyl/hertzbeat
1
0
Fork 0
mirror of https://github.com/dromara/hertzbeat.git synced 2026-09-17 09:40:58 +00:00
Code Issues Projects Releases Wiki Activity

[hertzbeat] release hertzbeat version v1.4.1 (#1261)

Browse Source
This commit is contained in:
tomsun28
2023-09-25 16:48:12 +08:00
committed by GitHub
parent 04c7a76724
commit d560930400
21 changed files with 63 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CONTRIBUTING.md
+1 -1
View File
@@ -229,7 +229,7 @@ git push origin a-feature-branch
另外，我们的项目有比较规范和严格的 CI 检查流程，在提交 PR 之后会触发 CI，请注意是否通过 CI 检查。
最后，Committer 可以将 PR 合并入DEV主分支。
最后，Committer 可以将 PR 合并入 master 主分支。
### 代码被合并后
README.md
+1 -1
View File
@@ -28,7 +28,7 @@
**Home: [hertzbeat.dromara.org](https://hertzbeat.dromara.org) | [hertzbeat.com](https://hertzbeat.com)**
**Cloud: [tancloud.cn](https://tancloud.cn)**
**Cloud: [console.tancloud.cn](https://console.tancloud.cn)**
## 🎡 <font color="green">Introduction</font>
README_CN.md
+1 -1
View File
@@ -28,7 +28,7 @@
**官网: [hertzbeat.dromara.org](https://hertzbeat.dromara.org) | [hertzbeat.com](https://hertzbeat.com)**
**云服务: [tancloud.cn](https://tancloud.cn)**
**云服务: [console.tancloud.cn](https://console.tancloud.cn)**
## 🎡 <font color="green">介绍</font>
collector/src/main/resources/application.yml
+2
View File
@@ -39,7 +39,9 @@ collector:
entrance:
netty:
enabled: true
# Config the collector unique identity name.
identity: ${IDENTITY:}
# Config the running mode(public or private), public cluster or private cloud-edge.
mode: ${MODE:public}
manager-host: ${MANAGER_HOST:}${MANAGER_IP:}
manager-port: ${MANAGER_PORT:1158}
home/i18n/zh-cn/docusaurus-plugin-content-docs/current/others/contributing.md
+1 -1
View File
@@ -88,7 +88,7 @@ git push origin a-feature-branch
另外，我们的项目有比较规范和严格的 CI 检查流程，在提交 PR 之后会触发 CI，请注意是否通过 CI 检查。
最后，Committer 可以将 PR 合并入DEV主分支。
最后，Committer 可以将 PR 合并入 master 主分支。
### 代码被合并后
script/assembly/collector/assembly.xml
+1 -1
View File
@@ -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.0</id>
<id>1.4.1</id>
<!--打包类型,可以设置多种类型,打包的时候不同的类型都会打包打出来-->
<formats>
<format>tar</format>
script/assembly/server/assembly.xml
+1 -1
View File
@@ -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.0</id>
<id>1.4.1</id>
<!--打包类型,可以设置多种类型,打包的时候不同的类型都会打包打出来-->
<formats>
<format>tar</format>
script/docker/collector/Dockerfile
+4
View File
@@ -4,6 +4,10 @@ ARG VERSION
MAINTAINER tancloud "tomsun28@outlook.com"
# Install SSH
RUN apt-get update && apt-get install -y openssh-server
RUN mkdir /var/run/sshd
ADD hertzbeat-collector-${VERSION}.tar /opt/
ENV TZ=Asia/Shanghai
script/helm/hertzbeat/Chart.yaml
+2 -2
View File
@@ -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.0
version: 1.4.1
# 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.0"
appVersion: "v1.4.1"
script/helm/hertzbeat/templates/collector/configmap.yaml
+1
View File
@@ -34,6 +34,7 @@ data:
netty:
enabled: true
identity: ${IDENTITY:}
mode: ${MODE:public}
manager-host: ${MANAGER_HOST:127.0.0.1}
manager-port: ${MANAGER_PORT:1158}
web-app/src/app/layout/basic/basic.component.ts
+3 -2
View File
@@ -3,7 +3,8 @@ import { I18NService } from '@core';
import { ALAIN_I18N_TOKEN, SettingsService, User } from '@delon/theme';
import { LayoutDefaultOptions } from '@delon/theme/layout-default';
import { environment } from '@env/environment';
import { CONSTS } from 'src/app/shared/consts';
import { CONSTANTS } from '../../shared/constants';
@Component({
selector: 'layout-basic',
@@ -104,7 +105,7 @@ export class LayoutBasicComponent {
avatar: string = `./assets/img/avatar.svg`;
searchToggleStatus = false;
showSettingDrawer = !environment.production;
version = CONSTS.VERSION;
version = CONSTANTS.VERSION;
currentYear = new Date().getFullYear();
get user(): User {
return this.settings.user;
web-app/src/app/layout/basic/widgets/i18n.component.ts
+9 -1
View File
@@ -12,7 +12,15 @@ import { BooleanInput, InputBoolean } from '@delon/util/decorator';
{{ 'menu.lang' | i18n }}
<i nz-icon nzType="down"></i>
</div>
<i *ngIf="!showLangText" nz-dropdown [nzDropdownMenu]="langMenu" nzPlacement="bottomRight" nz-icon nzType="global"></i>
<i
style="font-size: 25px; color: #b421cc"
*ngIf="!showLangText"
nz-dropdown
[nzDropdownMenu]="langMenu"
nzPlacement="bottomRight"
nz-icon
nzType="global"
></i>
<nz-dropdown-menu #langMenu="nzDropdownMenu">
<ul nz-menu>
<li nz-menu-item class="mr-sm" *ngFor="let item of langs" [nzSelected]="item.code === curLangCode" (click)="change(item.code)">
web-app/src/app/layout/basic/widgets/user.component.ts
+3 -3
View File
@@ -3,7 +3,7 @@ import { Router } from '@angular/router';
import { SettingsService, User } from '@delon/theme';
import { LocalStorageService } from '../../../service/local-storage.service';
import { CONSTS } from '../../../shared/consts';
import { CONSTANTS } from '../../../shared/constants';
@Component({
selector: 'header-user',
@@ -98,7 +98,7 @@ import { CONSTS } from '../../../shared/consts';
})
export class HeaderUserComponent {
isAboutModalVisible = false;
version = CONSTS.VERSION;
version = CONSTANTS.VERSION;
currentYear = new Date().getFullYear();
get user(): User {
return this.settings.user;
@@ -126,6 +126,6 @@ export class HeaderUserComponent {
showAndCloseAboutModal() {
this.isAboutModalVisible = true;
setTimeout(() => (this.isAboutModalVisible = false), 12000);
setTimeout(() => (this.isAboutModalVisible = false), 20000);
}
}
web-app/src/app/layout/passport/passport.component.html
+2 -2
View File
@@ -1,6 +1,6 @@
<div class="container">
<header-i18n showLangText="false" class="langs"></header-i18n>
<div class="wrap">
<div class="wrap" style="display: flex; flex-direction: column">
<div class="top">
<div class="head">
<img class="logo" src="./assets/brand.svg" alt="" />
@@ -38,7 +38,7 @@
<router-outlet></router-outlet>
</div>
</div>
<global-footer style="border-top: 1px solid #d692e3; min-height: 120px; margin-top: 10%">
<global-footer style="border-top: 1px solid #d692e3; margin-top: auto">
<div style="margin-top: 30px">
HertzBeat {{ version }}<br />
Copyright &copy; 2021-{{ currentYear }}
web-app/src/app/layout/passport/passport.component.ts
+4 -3
View File
@@ -2,7 +2,8 @@ import { Component, Inject, OnInit } from '@angular/core';
import { I18NService } from '@core';
import { DA_SERVICE_TOKEN, ITokenService } from '@delon/auth';
import { ALAIN_I18N_TOKEN } from '@delon/theme';
import { CONSTS } from 'src/app/shared/consts';
import { CONSTANTS } from '../../shared/constants';
@Component({
selector: 'layout-passport',
@@ -10,11 +11,11 @@ import { CONSTS } from 'src/app/shared/consts';
styleUrls: ['./passport.component.less']
})
export class LayoutPassportComponent implements OnInit {
version = CONSTS.VERSION;
version = CONSTANTS.VERSION;
links = [
{
title: this.i18nSvc.fanyi('app.passport.welcome'),
href: 'https://tancloud.cn'
href: 'https://console.tancloud.cn'
}
];
web-app/src/app/routes/setting/collector/collector.component.ts
+7 -5
View File
@@ -280,21 +280,23 @@ export class CollectorComponent implements OnInit {
this.identity = message.data.identity;
this.managerHost = message.data.host;
this.dockerShell =
`${this.i18nSvc.fanyi('collector.deploy.docker.help')}\n \n` +
`${this.i18nSvc.fanyi('collector.deploy.docker.help')}\n` +
`$ docker run -d \\\n` +
` -e IDENTITY=${this.identity} \\\n` +
` -e MANAGER_HOST=${this.managerHost} \\\n` +
` -e MODE=public \\\n` +
` --name hertzbeat-collector tancloud/hertzbeat-collector` +
`\n \n` +
`\n` +
`${this.i18nSvc.fanyi('collector.deploy.docker.help.1')}\n` +
`${this.i18nSvc.fanyi('collector.deploy.docker.help.2')}\n` +
`${this.i18nSvc.fanyi('collector.deploy.docker.help.3')}\n` +
`${this.i18nSvc.fanyi('collector.deploy.docker.help.4')}\n` +
`${this.i18nSvc.fanyi('collector.deploy.docker.help.5')}\n`;
`${this.i18nSvc.fanyi('collector.deploy.docker.help.5')}\n` +
`${this.i18nSvc.fanyi('collector.deploy.docker.help.6')}\n`;
this.packageShell =
`${this.i18nSvc.fanyi('collector.deploy.package.help')}\n` +
`${this.i18nSvc.fanyi('collector.deploy.package.help.1')}\n` +
`${this.i18nSvc.fanyi('collector.deploy.package.help.2')}\n \n` +
`${this.i18nSvc.fanyi('collector.deploy.package.help.2')}\n` +
`collector:\n` +
` dispatch:\n` +
` entrance:\n` +
@@ -303,7 +305,7 @@ export class CollectorComponent implements OnInit {
` mode: public\n` +
` identity: ${this.identity}\n` +
` manager-host: ${this.managerHost}\n` +
` manager-port: 1158\n\n` +
` manager-port: 1158\n` +
`${this.i18nSvc.fanyi('collector.deploy.package.help.3')}\n`;
} else {
this.notifySvc.error(this.i18nSvc.fanyi('common.notify.apply-fail'), message.msg);
web-app/src/app/shared/constants.ts
+3
View File
@@ -0,0 +1,3 @@
export const CONSTANTS = {
VERSION: 'v1.4.1'
};
web-app/src/app/shared/consts.ts
-3
View File
@@ -1,3 +0,0 @@
export const CONSTS = {
VERSION: 'v1.4.0'
};
web-app/src/assets/i18n/en-US.json
+7 -7
View File
@@ -453,10 +453,9 @@
"app.role.admin": "administrator",
"app.lock": "Unlock",
"app.lock.placeholder": "Enter Any To Unlock",
"app.passport.desc": "An Open Source Real-Time Monitoring Tool",
"app.passport.desc": "An Open Source Real-Time Monitoring System",
"app.passport.intro-1": "Open Source、Distributed",
"app.passport.intro-2": "Real-Time Monitoring",
"app.login.message-need-identifier": "Please enter your username",
"app.passport.intro-2": "Real-Time Monitoring", "app.login.message-need-identifier": "Please enter your username",
"app.login.message-need-credential": "Please enter password",
"app.login.message-invalid-credentials": "Invalid username or password",
"app.login.tab-login-credentials": "Sign In HertzBeat",
@@ -526,8 +525,9 @@
"collector.deploy.docker.help.1": "# docker run -d : Start a container running in the background through Docker",
"collector.deploy.docker.help.2": "# -e IDENTITY=xxx : Set the collector's identity token",
"collector.deploy.docker.help.3": "# -e MANAGER_HOST=127.0.0.1 : Set the main HertzBeat service address for connection",
"collector.deploy.docker.help.4": "# --name hertzbeat-collector: Name the container name hertzbeat-collector",
"collector.deploy.docker.help.5": "# tancloud/hertzbeat-collector: Use the HertzBeat official application image source, or use quay.io/tancloud/hertzbeat-collector to replace it",
"collector.deploy.docker.help.4": "# -e MODE=public : Set the running mode(public or private), public cluster or private cloud-edge.",
"collector.deploy.docker.help.5": "# --name hertzbeat-collector: Name the container name hertzbeat-collector",
"collector.deploy.docker.help.6": "# tancloud/hertzbeat-collector: Use the HertzBeat official application image source, or use quay.io/tancloud/hertzbeat-collector to replace it",
"collector.deploy.package": "Deploy via Package",
"collector.deploy.package.github": "Download From Github",
"collector.deploy.package.gitee": "Download From Gitee",
@@ -545,10 +545,10 @@
"collector.help.link": "https://hertzbeat.com/docs/help/guide",
"about.title": "HertzBeat is an open source, real-time monitoring system with custom, performance and agentless.",
"about.point.1": "Monitor-alarm-notify all in one, supports web, database, os, middleware, network etc.",
"about.point.2": "Easy to use, full web-based operations with just a few clicks.",
"about.point.2": "Easy to use, full web-based operations with just a click of a mouse.",
"about.point.3": "Powerful monitoring template capabilities, custom monitoring any metrics you want.",
"about.point.4": "High performance, supports collector cluster, multi-isolated network and cloud-edge.",
"about.point.5": "Flexible alarm threshold, timely notification via discord, slack, telegram, webhook etc.",
"about.point.5": "Flexible alarm threshold rules, timely notification via discord, slack, telegram, webhook etc.",
"about.help": "HertzBeat's powerful customization, multi-type support, high performance and easy expansion, aims to help users quickly build their own monitoring system.",
"about.github": "Github",
"about.gitee": "Gitee",
web-app/src/assets/i18n/zh-CN.json
+5 -3
View File
@@ -450,6 +450,7 @@
"app.lock": "解除锁定",
"app.lock.placeholder": "输入任意解锁",
"app.passport.desc": "易用友好的开源实时监控系统",
"app.passport.welcome": "点击探索 TanCloud 监控云服务",
"app.passport.intro-1": "开源、高性能、分布式的",
"app.passport.intro-2": "实时监控",
"app.login.message-need-identifier": "请输入用户名",
@@ -522,8 +523,9 @@
"collector.deploy.docker.help.1": "# docker run -d : 通过Docker启动一个在后台运行的容器",
"collector.deploy.docker.help.2": "# -e IDENTITY=xxx : 设置采集器的标识令牌",
"collector.deploy.docker.help.3": "# -e MANAGER_HOST=127.0.0.1 : 设置连接的主HertzBeat服务地址",
"collector.deploy.docker.help.4": "# --name hertzbeat-collector : 命名容器名称 hertzbeat-collector",
"collector.deploy.docker.help.5": "# tancloud/hertzbeat-collector : 使用HertzBeat官方应用镜像源,也可若使用quay.io/tancloud/hertzbeat-collector替换",
"collector.deploy.docker.help.4": "# -e MODE=public : 配置运行模式(public or private), 公共集群模式或私有云边模式",
"collector.deploy.docker.help.5": "# --name hertzbeat-collector : 命名容器名称 hertzbeat-collector",
"collector.deploy.docker.help.6": "# tancloud/hertzbeat-collector : 使用HertzBeat官方应用镜像源,也可若使用quay.io/tancloud/hertzbeat-collector替换",
"collector.deploy.package": "通过 安装包 方式部署",
"collector.deploy.package.github": "下载安装包-Github",
"collector.deploy.package.gitee": "下载安装包-Gitee",
@@ -540,7 +542,7 @@
"collector.help": "除了使用内置采集器外，您可以注册多个采集器应用于<strong>高性能集群</strong>或<strong>云边协同</strong>场景。<br>采集集群用于已注册的采集器集群节点管理，展示当前采集器集群状态和调度任务分布，支持对采集器的部署删除，上线下线等批量操作。",
"collector.help.link": "https://hertzbeat.com/docs/help/guide",
"about.title": "HertzBeat(赫兹跳动) 是一个拥有强大自定义监控能力，高性能集群，无需 Agent 的开源实时监控告警系统。",
"about.point.1": "一站式监控告警通知，支持应用服务、数据库、操作系统、中间件、云原生、网络等。",
"about.point.1": "一站式监控告警通知，支持应用服务，数据库，操作系统，中间件，云原生，网络等。",
"about.point.2": "易用友好，无需 Agent，全页面操作，鼠标点一点就能监控告警。",
"about.point.3": "强大监控模版能力，自定义监控任何您想要的指标。",
"about.point.4": "高性能，采集器集群横向扩展，支持多隔离网络监控，云边协同。",
web-app/src/assets/i18n/zh-TW.json
+5 -3
View File
@@ -449,6 +449,7 @@
"app.lock": "解除鎖定",
"app.lock.placeholder": "輸入任意解鎖",
"app.passport.desc": "易用友好的開源實時監控系統",
"app.passport.welcome": "點選探索 TanCloud 監控雲端服務",
"app.passport.intro-1": "開源、高效能、分散式的",
"app.passport.intro-2": "即時監控",
"app.login.message-need-identifier": "請輸入用戶名",
@@ -521,8 +522,9 @@
"collector.deploy.docker.help.1": "# docker run -d : 通過Docker啟動一個在後台運行的容器",
"collector.deploy.docker.help.2": "# -e IDENTITY=xxx : 設置採集器的標識令牌",
"collector.deploy.docker.help.3": "# -e MANAGER_HOST=127.0.0.1 : 設置連接的主HertzBeat服務地址",
"collector.deploy.docker.help.4": "# --name hertzbeat-collector : 命名容器名稱 hertzbeat-collector",
"collector.deploy.docker.help.5": "# tancloud/hertzbeat-collector : 使用HertzBeat官方應用鏡像源,也可若使用quay.io/tancloud/hertzbeat-collector替換",
"collector.deploy.docker.help.4": "# -e MODE=public : 設定運作模式(public or private), 公有叢集模式或私有雲邊模式",
"collector.deploy.docker.help.5": "# --name hertzbeat-collector : 命名容器名稱 hertzbeat-collector",
"collector.deploy.docker.help.6": "# tancloud/hertzbeat-collector : 使用HertzBeat官方應用鏡像源,也可若使用quay.io/tancloud/hertzbeat-collector替換",
"collector.deploy.package": "通過 安裝包 方式部署",
"collector.deploy.package.github": "下載安裝包-Github",
"collector.deploy.package.gitee": "下載安裝包-Gitee",
@@ -539,7 +541,7 @@
"collector.help": "除了使用內置採集器外，您可以註冊多個採集器應用於<strong>高性能集群</strong>或<strong>雲邊協同</strong>場景。<br>採集集群用於已註冊的採集器集群節點管理，展示當前採集器集群狀態和調度任務分佈，支持對採集器的部署刪除，上線下線等批量操作。",
"collector.help.link": "https://hertzbeat.com/docs/help/guide",
"about.title": "HertzBeat(赫茲跳動) 是一個擁有強大自定義監控能力，高性能集群，無需 Agent 的開源實時監控告警系統。",
"about.point.1": "一站式監控告警通知，支持應用服務、數據庫、操作系統、中間件、雲原生、網絡等。",
"about.point.1": "一站式監控告警通知，支持應用服務，數據庫，操作系統，中間件，雲原生，網絡等。",
"about.point.2": "易用友好，無需 Agent，全頁面操作，鼠標點一點就能監控告警。",
"about.point.3": "強大監控模版能力，自定義監控任何您想要的指標。",
"about.point.4": "高性能，採集器集群橫向擴展，支持多隔離網絡監控，雲邊協同。",