Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[hertzbeat] release hertzbeat version v1.5.0 #1538

Merged
merged 4 commits into from
Feb 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions manager/src/main/resources/sureness.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ excludedResource:
- /account/**===get
- /setting/**===get
- /passport/**===get
- /status/**===get
- /**/*.html===get
- /**/*.js===get
- /**/*.css===get
Expand Down
2 changes: 1 addition & 1 deletion script/assembly/collector/assembly-linux-amd64.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>linux_amd64_1.4.4</id>
<id>linux_amd64_1.5.0</id>
<!--打包类型,可以设置多种类型,打包的时候不同的类型都会打包打出来-->
<formats>
<format>tar.gz</format>
Expand Down
2 changes: 1 addition & 1 deletion script/assembly/collector/assembly-linux-arm64.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>linux_arm64_1.4.4</id>
<id>linux_arm64_1.5.0</id>
<!--打包类型,可以设置多种类型,打包的时候不同的类型都会打包打出来-->
<formats>
<format>tar.gz</format>
Expand Down
2 changes: 1 addition & 1 deletion script/assembly/collector/assembly-macos-amd64.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>macos_amd64_1.4.4</id>
<id>macos_amd64_1.5.0</id>
<!--打包类型,可以设置多种类型,打包的时候不同的类型都会打包打出来-->
<formats>
<format>tar.gz</format>
Expand Down
2 changes: 1 addition & 1 deletion script/assembly/collector/assembly-macos-arm64.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>macos_arm64_1.4.4</id>
<id>macos_arm64_1.5.0</id>
<!--打包类型,可以设置多种类型,打包的时候不同的类型都会打包打出来-->
<formats>
<format>tar.gz</format>
Expand Down
2 changes: 1 addition & 1 deletion script/assembly/collector/assembly-windows-64.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>windows64_1.4.4</id>
<id>windows64_1.5.0</id>
<!--打包类型,可以设置多种类型,打包的时候不同的类型都会打包打出来-->
<formats>
<format>zip</format>
Expand Down
2 changes: 1 addition & 1 deletion script/assembly/collector/assembly.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.4</id>
<id>1.5.0</id>
<!--打包类型,可以设置多种类型,打包的时候不同的类型都会打包打出来-->
<formats>
<format>tar</format>
Expand Down
2 changes: 1 addition & 1 deletion script/assembly/server/assembly-linux-amd64.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>linux_amd64_1.4.4</id>
<id>linux_amd64_1.5.0</id>
<!--打包类型,可以设置多种类型,打包的时候不同的类型都会打包打出来-->
<formats>
<format>tar.gz</format>
Expand Down
2 changes: 1 addition & 1 deletion script/assembly/server/assembly-linux-arm64.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>linux_arm64_1.4.4</id>
<id>linux_arm64_1.5.0</id>
<!--打包类型,可以设置多种类型,打包的时候不同的类型都会打包打出来-->
<formats>
<format>tar.gz</format>
Expand Down
2 changes: 1 addition & 1 deletion script/assembly/server/assembly-macos-amd64.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>macos_amd64_1.4.4</id>
<id>macos_amd64_1.5.0</id>
<!--打包类型,可以设置多种类型,打包的时候不同的类型都会打包打出来-->
<formats>
<format>tar.gz</format>
Expand Down
2 changes: 1 addition & 1 deletion script/assembly/server/assembly-macos-arm64.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>macos_arm64_1.4.4</id>
<id>macos_arm64_1.5.0</id>
<!--打包类型,可以设置多种类型,打包的时候不同的类型都会打包打出来-->
<formats>
<format>tar.gz</format>
Expand Down
2 changes: 1 addition & 1 deletion script/assembly/server/assembly-windows-64.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>windows64_1.4.4</id>
<id>windows64_1.5.0</id>
<!--打包类型,可以设置多种类型,打包的时候不同的类型都会打包打出来-->
<formats>
<format>zip</format>
Expand Down
2 changes: 1 addition & 1 deletion script/assembly/server/assembly.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.4</id>
<id>1.5.0</id>
<!--打包类型,可以设置多种类型,打包的时候不同的类型都会打包打出来-->
<formats>
<format>tar</format>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ excludedResource:
- /account/**===get
- /setting/**===get
- /passport/**===get
- /status/**===get
- /**/*.html===get
- /**/*.js===get
- /**/*.css===get
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ excludedResource:
- /account/**===get
- /setting/**===get
- /passport/**===get
- /status/**===get
- /**/*.html===get
- /**/*.js===get
- /**/*.css===get
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ excludedResource:
- /account/**===get
- /setting/**===get
- /passport/**===get
- /status/**===get
- /**/*.html===get
- /**/*.js===get
- /**/*.css===get
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ excludedResource:
- /account/**===get
- /setting/**===get
- /passport/**===get
- /status/**===get
- /**/*.html===get
- /**/*.js===get
- /**/*.css===get
Expand Down
4 changes: 2 additions & 2 deletions script/helm/hertzbeat/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.4
version: 1.5.0
# 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.4"
appVersion: "v1.5.0"
1 change: 1 addition & 0 deletions script/sureness.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ excludedResource:
- /account/**===get
- /setting/**===get
- /passport/**===get
- /status/**===get
- /**/*.html===get
- /**/*.js===get
- /**/*.css===get
Expand Down
2 changes: 2 additions & 0 deletions web-app/src/app/layout/basic/widgets/user.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ import { CONSTANTS } from '../../../shared/constants';
<br />
<nz-badge nzStatus="processing" [nzText]="'about.point.5' | i18n"></nz-badge>
<br />
<nz-badge nzStatus="processing" [nzText]="'about.point.6' | i18n"></nz-badge>
<br />
</div>
<div style="margin-top: 10px; font-weight: normal; font-size: small;">
{{ 'about.help' | i18n }}
Expand Down
3 changes: 3 additions & 0 deletions web-app/src/app/layout/passport/passport.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@
<nz-badge nzColor="white" nzStatus="processing"></nz-badge>
{{ 'about.point.5' | i18n }}
<br />
<nz-badge nzColor="white" nzStatus="processing"></nz-badge>
{{ 'about.point.6' | i18n }}
<br />
</div>
<nz-divider></nz-divider>
</div>
Expand Down
2 changes: 1 addition & 1 deletion web-app/src/app/shared/constants.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
export const CONSTANTS = {
VERSION: 'v1.4.4'
VERSION: 'v1.5.0'
};
4 changes: 3 additions & 1 deletion web-app/src/assets/app-data.json
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,9 @@
"text": "status",
"i18n": "menu.extras.status",
"icon": "anticon-mobile",
"link": "/setting/status"
"link": "/setting/status",
"badgeDot": true,
"badge": 1
},
{
"text": "collector",
Expand Down
3 changes: 2 additions & 1 deletion web-app/src/assets/i18n/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -583,12 +583,13 @@
"collector.confirm.offline-batch": "Please confirm whether to offline the collector in batches!",
"collector.help": "Collector Cluster is used to manage registered collector cluster nodes, display the current collector status and scheduling task distribution, and support operations such as deployment, deletion, offline of collectors.<br>In addition to using the built-in collector, you can register multiple collectors for use in <strong>High-Performance Cluster</strong> or <strong>Cloud-Edge Collaboration</strong> scenarios.",
"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.title": "An open source, real-time monitoring system with agentless, cluster, prometheus-compatible, custom and status page.",
"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 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 rules, timely notification via discord, slack, telegram etc.",
"about.point.6": "Easily build powerful status page to communicate the real-time status to users.",
"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",
Expand Down
3 changes: 2 additions & 1 deletion web-app/src/assets/i18n/zh-CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -582,12 +582,13 @@
"collector.confirm.offline-batch": "请确认是否批量下线采集器!",
"collector.help": "采集集群用于已注册的监控采集器集群节点管理,展示当前采集器集群状态和调度任务分布,支持对采集器的部署,删除,上线,下线等批量操作。<br>除了使用内置采集器外,您可以注册多个采集器应用于<strong>高性能集群</strong>或<strong>云边协同</strong>场景。",
"collector.help.link": "https://hertzbeat.com/docs/help/guide",
"about.title": "HertzBeat(赫兹跳动) 是一个拥有强大自定义监控能力,高性能集群,无需 Agent 的开源实时监控告警系统。",
"about.title": "HertzBeat(赫兹跳动) 是一个开源实时监控系统,无需Agent,性能集群,兼容Prometheus,自定义监控和状态页构建能力。",
"about.point.1": "一站式监控告警通知,支持应用服务,数据库,操作系统,中间件,云原生,网络等。",
"about.point.2": "易用友好,无需 Agent,全页面操作,鼠标点一点就能监控告警。",
"about.point.3": "强大监控模版能力,自定义监控任何您想要的指标。",
"about.point.4": "高性能,采集器集群横向扩展,支持多隔离网络监控,云边协同。",
"about.point.5": "自由的阈值规则,邮件钉钉微信飞书短信等消息及时送达。",
"about.point.6": "提供强大的状态页构建功能,轻松向用户传达您产品服务的实时状态。",
"about.help": "HertzBeat 的强大自定义,多类型支持,高性能,易扩展,希望能帮助用户快速构建自有监控系统。",
"about.github": "Github",
"about.gitee": "Gitee",
Expand Down
3 changes: 2 additions & 1 deletion web-app/src/assets/i18n/zh-TW.json
Original file line number Diff line number Diff line change
Expand Up @@ -581,12 +581,13 @@
"collector.confirm.offline-batch": "請確認是否批量下線採集器!",
"collector.help": "采集集群用于已注冊的監控采集器集群節點管理,展示當前采集器集群狀態和調度任務分布,支持對采集器的部署,刪除,上線,下線等批量操作。<br>除了使用內置采集器外,您可以注冊多個采集器應用于<strong>高性能集群</strong>或<strong>雲邊協同</strong>場景。",
"collector.help.link": "https://hertzbeat.com/docs/help/guide",
"about.title": "HertzBeat(赫茲跳動) 是一個擁有強大自定義監控能力,高性能集群,無需 Agent 的開源實時監控告警系統。",
"about.title": "HertzBeat(赫茲跳動) 是一個開源實時監控系統,無需Agent,性能集羣,兼容Prometheus,自定義監控和狀態頁構建能力。",
"about.point.1": "一站式監控告警通知,支持應用服務,數據庫,操作系統,中間件,雲原生,網絡等。",
"about.point.2": "易用友好,無需 Agent,全頁面操作,鼠標點一點就能監控告警。",
"about.point.3": "強大監控模版能力,自定義監控任何您想要的指標。",
"about.point.4": "高性能,採集器集群橫向擴展,支持多隔離網絡監控,雲邊協同。",
"about.point.5": "自由的閾值規則,郵件釘釘微信飛書短信等消息及時送達。",
"about.point.6": "提供強大的狀態頁構建功能,輕鬆向用戶傳達您產品服務的實時狀態。",
"about.help": "HertzBeat 的強大自定義,多類型支持,高性能,易擴展,希望能幫助用戶快速構建自有監控系統。",
"about.github": "Github",
"about.gitee": "Gitee",
Expand Down
Loading