diff --git a/README.md b/README.md index ced0058f60a..6b4ef012ed5 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ ### Features * Combines **monitoring, alarm, and notification** features into one platform, and supports monitoring for web service, database, os, middleware, cloud-native, network and more. -* Easy to use and agentless, offering full web-based operations for monitoring and alerting with just a click of a mouse, all at zero learning cost. +* Easy to use and agentless, offering full web-based operations for monitoring and alerting with just a few clicks, all at zero learning cost. * Makes protocols such as `Http, Jmx, Ssh, Snmp, Jdbc` configurable, allowing you to collect any metrics by simply configuring the template `YML` file online. Imagine being able to quickly adapt to a new monitoring type like K8s or Docker simply by configuring online with HertzBeat. * High performance, supports horizontal expansion of multi-collector clusters, multi-isolated network monitoring and cloud-edge collaboration. * Provides flexible alarm threshold rules and timely notifications delivered via `Discord` `Slack` `Telegram` `Email` `Dingtalk` `WeChat` `FeiShu` `Webhook` `SMS` `ServerChan`. diff --git a/home/blog/2023-08-14-hertzbeat-v1.4.0.md b/home/blog/2023-08-14-hertzbeat-v1.4.0.md index 04b18cd9b53..84f6c05166e 100644 --- a/home/blog/2023-08-14-hertzbeat-v1.4.0.md +++ b/home/blog/2023-08-14-hertzbeat-v1.4.0.md @@ -18,7 +18,7 @@ keywords: [open source monitoring system, alerting system, Linux monitoring] ### Features * Combines **monitoring, alarm, and notification** features into one platform, and supports monitoring for web service, database, os, middleware, cloud-native, network and more. -* Easy to use and agentless, offering full web-based operations for monitoring and alerting with just a click of a mouse, all at zero learning cost. +* Easy to use and agentless, offering full web-based operations for monitoring and alerting with just a few clicks, all at zero learning cost. * Makes protocols such as `Http, Jmx, Ssh, Snmp, Jdbc` configurable, allowing you to collect any metrics by simply configuring the template `YML` file online. Imagine being able to quickly adapt to a new monitoring type like K8s or Docker simply by configuring online with HertzBeat. * High performance, supports horizontal expansion of multi-collector clusters, multi-isolated network monitoring and cloud-edge collaboration. * Provides flexible alarm threshold rules and timely notifications delivered via `Discord` `Slack` `Telegram` `Email` `DingDing` `WeChat` `FeiShu` `Webhook` `SMS`. diff --git a/home/docs/introduce.md b/home/docs/introduce.md index cf280c266d0..3bf351afd4b 100644 --- a/home/docs/introduce.md +++ b/home/docs/introduce.md @@ -30,7 +30,7 @@ slug: / ### Features * Combines **monitoring, alarm, and notification** features into one platform, and supports monitoring for web service, database, os, middleware, cloud-native, network and more. -* Easy to use and agentless, offering full web-based operations for monitoring and alerting with just a click of a mouse, all at zero learning cost. +* Easy to use and agentless, offering full web-based operations for monitoring and alerting with just a few clicks, all at zero learning cost. * Makes protocols such as `Http, Jmx, Ssh, Snmp, Jdbc` configurable, allowing you to collect any metrics by simply configuring the template `YML` file online. Imagine being able to quickly adapt to a new monitoring type like K8s or Docker simply by configuring online with HertzBeat. * High performance, supports horizontal expansion of multi-collector clusters, multi-isolated network monitoring and cloud-edge collaboration. * Provides flexible alarm threshold rules and timely notifications delivered via `Discord` `Slack` `Telegram` `Email` `DingDing` `WeChat` `FeiShu` `Webhook` `SMS`. diff --git a/home/i18n/en/code.json b/home/i18n/en/code.json index dc6e6e5e3e3..2ea20c19078 100644 --- a/home/i18n/en/code.json +++ b/home/i18n/en/code.json @@ -257,7 +257,7 @@ "description": "The label used by the button on the collapsible TOC component" }, "convenient-content": { - "message": "{docker} {br} [Monitoring+Alarm+Notification] all in one. Support monitoring web service, database, os, middleware, cloud-native, network and more. {br} Easy to use and agentless, offering full web-based operations for monitoring and alerting with just a click of a mouse. {br} We also provider sass cloud - tancloud, {console}. Security is the most important, we encrypt the whole data of account and monitoring." + "message": "{docker} {br} [Monitoring+Alarm+Notification] all in one. Support monitoring web service, database, os, middleware, cloud-native, network and more. {br} Easy to use and agentless, offering full web-based operations for monitoring and alerting with just a few clicks. {br} We also provider sass cloud - tancloud, {console}. Security is the most important, we encrypt the whole data of account and monitoring." }, "custom-multi-support-content": { "message": "Makes protocols such as Http, Jmx, Ssh, Snmp, Jdbc configurable, allowing you to collect any metrics by simply configuring the template online. {br} High performance, supports horizontal expansion of multi-collector clusters, multi-isolated network monitoring and cloud-edge collaboration. {br} Provides flexible alarm threshold rules and timely notifications delivered via Discord Slack Telegram Email DingDing WeChat FeiShu Webhook SMS." diff --git a/script/helm/hertzbeat/README.md b/script/helm/hertzbeat/README.md index 2b871eea1cf..6afcb140236 100644 --- a/script/helm/hertzbeat/README.md +++ b/script/helm/hertzbeat/README.md @@ -12,7 +12,7 @@ ### Features * Combines **monitoring, alarm, and notification** features into one platform, and supports monitoring for web service, database, os, middleware, cloud-native, network and more. -* Easy to use and agentless, offering full web-based operations for monitoring and alerting with just a click of a mouse, all at zero learning cost. +* Easy to use and agentless, offering full web-based operations for monitoring and alerting with just a few clicks, all at zero learning cost. * Makes protocols such as `Http, Jmx, Ssh, Snmp, Jdbc` configurable, allowing you to collect any metrics by simply configuring the template `YML` file online. Imagine being able to quickly adapt to a new monitoring type like K8s or Docker simply by configuring online with HertzBeat. * High performance, supports horizontal expansion of multi-collector clusters, multi-isolated network monitoring and cloud-edge collaboration. * Provides flexible alarm threshold rules and timely notifications delivered via `Discord` `Slack` `Telegram` `Email` `Dingtalk` `WeChat` `FeiShu` `Webhook` `SMS` `ServerChan`. diff --git a/web-app/src/app/layout/passport/passport.component.html b/web-app/src/app/layout/passport/passport.component.html index d2eedb04f0a..574955a724c 100644 --- a/web-app/src/app/layout/passport/passport.component.html +++ b/web-app/src/app/layout/passport/passport.component.html @@ -7,9 +7,39 @@
{{ 'app.passport.desc' | i18n }}
- - -
+
+
+
+
+ {{ 'app.passport.intro-1' | i18n }}
{{ 'app.passport.intro-2' | i18n }} +
+ +
+ + {{ 'about.point.1' | i18n }} +
+ + {{ 'about.point.2' | i18n }} +
+ + {{ 'about.point.3' | i18n }} +
+ + {{ 'about.point.4' | i18n }} +
+ + {{ 'about.point.5' | i18n }} +
+
+ +
+
+
+ +
+
+ +
HertzBeat {{ version }}
Copyright © 2021-{{ currentYear }} hertzbeat.com diff --git a/web-app/src/app/routes/passport/lock/lock.component.html b/web-app/src/app/routes/passport/lock/lock.component.html index c43e21fda8d..0dd25e5805d 100644 --- a/web-app/src/app/routes/passport/lock/lock.component.html +++ b/web-app/src/app/routes/passport/lock/lock.component.html @@ -1,4 +1,4 @@ -
+
diff --git a/web-app/src/app/routes/passport/login/login.component.html b/web-app/src/app/routes/passport/login/login.component.html index 6b43d44ed1b..18345903692 100644 --- a/web-app/src/app/routes/passport/login/login.component.html +++ b/web-app/src/app/routes/passport/login/login.component.html @@ -1,31 +1,43 @@ -
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
diff --git a/web-app/src/app/routes/passport/login/login.component.ts b/web-app/src/app/routes/passport/login/login.component.ts index bc2c112698b..0f199603281 100644 --- a/web-app/src/app/routes/passport/login/login.component.ts +++ b/web-app/src/app/routes/passport/login/login.component.ts @@ -146,4 +146,6 @@ export class UserLoginComponent implements OnDestroy { clearInterval(this.interval$); } } + + protected readonly window = window; } diff --git a/web-app/src/assets/i18n/en-US.json b/web-app/src/assets/i18n/en-US.json index 26d4ffe4df1..1fae217495b 100644 --- a/web-app/src/assets/i18n/en-US.json +++ b/web-app/src/assets/i18n/en-US.json @@ -454,14 +454,17 @@ "app.lock": "Unlock", "app.lock.placeholder": "Enter Any To Unlock", "app.passport.desc": "An Open Source Real-Time Monitoring Tool", - "app.passport.welcome": "Welcome To Use TanCloud - Monitoring Cloud Service", + "app.passport.intro-1": "Open Source、Distributed", + "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": "Credentials", + "app.login.tab-login-credentials": "Sign In HertzBeat", "app.login.remember-me": "Remember me", "app.login.login": "Login", "app.login.notify": "Please Login!", + "app.login.explore.cloud": "Explore Cloud", + "app.login.explore.cloud.detail": "Click to Explore HertzBeat Cloud", "tag.new": "New Tag", "tag.edit": "Edit Tag", "tag.search": "Search Tag", @@ -541,11 +544,11 @@ "collector.help": "In addition to using the built-in collector, you can register multiple collectors for use in High-Performance Cluster or Cloud-Edge Collaboration scenarios.
The collector cluster is used to manage registered collector cluster nodes, display the current collector cluster status and scheduling task distribution, and support batch operations such as deployment and deletion of collectors, online and offline operations.", "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, cloud-native, network etc.", - "about.point.2": "Easy to use, full web-based operations with just a click of a mouse.", + "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.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 collaboration.", - "about.point.5": "Flexible alarm threshold rules, timely notification via discord, slack, telegram, webhook etc.", + "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.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", diff --git a/web-app/src/assets/i18n/zh-CN.json b/web-app/src/assets/i18n/zh-CN.json index 12757685506..29c9785688f 100644 --- a/web-app/src/assets/i18n/zh-CN.json +++ b/web-app/src/assets/i18n/zh-CN.json @@ -450,14 +450,17 @@ "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": "请输入用户名", "app.login.message-need-credential": "请输入密码", "app.login.message-invalid-credentials": "账户或密码错误", - "app.login.tab-login-credentials": "账户密码登录", + "app.login.tab-login-credentials": "登入 HertzBeat", "app.login.remember-me": "自动登录", "app.login.login": "登录", "app.login.notify": "请先登录!", + "app.login.explore.cloud": "探索云服务", + "app.login.explore.cloud.detail": "点击探索 HertzBeat 监控云服务", "tag.new": "新增标签", "tag.edit": "编辑标签", "tag.search": "搜索标签", @@ -537,7 +540,7 @@ "collector.help": "除了使用内置采集器外，您可以注册多个采集器应用于高性能集群或云边协同场景。
采集集群用于已注册的采集器集群节点管理，展示当前采集器集群状态和调度任务分布，支持对采集器的部署删除，上线下线等批量操作。", "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": "高性能，采集器集群横向扩展，支持多隔离网络监控，云边协同。", diff --git a/web-app/src/assets/i18n/zh-TW.json b/web-app/src/assets/i18n/zh-TW.json index c38aa792f32..e5e4d1898a9 100644 --- a/web-app/src/assets/i18n/zh-TW.json +++ b/web-app/src/assets/i18n/zh-TW.json @@ -449,14 +449,17 @@ "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": "請輸入用戶名", "app.login.message-need-credential": "請輸入密碼", "app.login.message-invalid-credentials": "賬戶或密碼錯誤", - "app.login.tab-login-credentials": "賬戶密碼登錄", + "app.login.tab-login-credentials": "登錄 HertzBeat", "app.login.remember-me": "自動登錄", "app.login.login": "登錄", "app.login.notify": "请先登錄!", + "app.login.explore.cloud": "探索雲端服務", + "app.login.explore.cloud.detail": "點擊探索 HertzBeat 監控雲端服務", "tag.new": "新增標簽", "tag.edit": "編輯標簽", "tag.search": "搜索標簽", @@ -536,7 +539,7 @@ "collector.help": "除了使用內置採集器外，您可以註冊多個採集器應用於高性能集群或雲邊協同場景。
採集集群用於已註冊的採集器集群節點管理，展示當前採集器集群狀態和調度任務分佈，支持對採集器的部署刪除，上線下線等批量操作。", "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": "高性能，採集器集群橫向擴展，支持多隔離網絡監控，雲邊協同。",