You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@hertzbeat.apache.org by go...@apache.org on 2024/05/04 12:37:24 UTC
(hertzbeat) branch clean-home updated (7273d8cff -> aa7db95c9)
This is an automated email from the ASF dual-hosted git repository.
gongchao pushed a change to branch clean-home
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
from 7273d8cff clean up unused home code
new f50d3bf95 clean up unused home code
new aa7db95c9 update webapp remove unused
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
home/docusaurus.config.js | 8 +----
web-app/README.md | 14 +++-----
web-app/angular.json | 3 +-
web-app/proxy.conf.js | 17 ---------
web-app/src/app/core/startup/startup.service.ts | 3 --
web-app/src/assets/app-data.json | 46 ++++++++++++-------------
web-app/src/assets/img/icon-gitee.js | 1 -
7 files changed, 29 insertions(+), 63 deletions(-)
delete mode 100644 web-app/proxy.conf.js
delete mode 100644 web-app/src/assets/img/icon-gitee.js
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@hertzbeat.apache.org
For additional commands, e-mail: notifications-help@hertzbeat.apache.org
(hertzbeat) 01/02: clean up unused home code
Posted by go...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gongchao pushed a commit to branch clean-home
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
commit f50d3bf9506c80114c034bbefbcf5c2b478fa22c
Author: tomsun28 <to...@outlook.com>
AuthorDate: Sat May 4 20:11:37 2024 +0800
clean up unused home code
---
home/docusaurus.config.js | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/home/docusaurus.config.js b/home/docusaurus.config.js
index f5fef6859..921a33a07 100644
--- a/home/docusaurus.config.js
+++ b/home/docusaurus.config.js
@@ -403,11 +403,5 @@ module.exports = {
},
],
],
- themes: ['@docusaurus/theme-live-codeblock'],
- scripts: [
- {
- src: 'https://hm.baidu.com/hm.js?77fb03ed1c6c1267119fec6d84dd88f3',
- async: true,
- },
- ],
+ themes: ['@docusaurus/theme-live-codeblock']
}
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@hertzbeat.apache.org
For additional commands, e-mail: notifications-help@hertzbeat.apache.org
(hertzbeat) 02/02: update webapp remove unused
Posted by go...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gongchao pushed a commit to branch clean-home
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
commit aa7db95c91ba1bac574f785e509094f6dea6e436
Author: tomsun28 <to...@outlook.com>
AuthorDate: Sat May 4 20:36:17 2024 +0800
update webapp remove unused
Signed-off-by: tomsun28 <to...@outlook.com>
---
web-app/README.md | 14 +++-----
web-app/angular.json | 3 +-
web-app/proxy.conf.js | 17 ---------
web-app/src/app/core/startup/startup.service.ts | 3 --
web-app/src/assets/app-data.json | 46 ++++++++++++-------------
web-app/src/assets/img/icon-gitee.js | 1 -
6 files changed, 28 insertions(+), 56 deletions(-)
diff --git a/web-app/README.md b/web-app/README.md
index 5a2e1b566..12d87588e 100644
--- a/web-app/README.md
+++ b/web-app/README.md
@@ -3,17 +3,11 @@
### Quickly Start
1. Need `Node Yarn` Environment, Make sure `Node.js >= 18`
-2. Execute `yarn install` in `web-app`
-3. Install angular-cli : `yarn global add @angular/cli@15`
-4. Start After Backend Server Available : `ng serve --open`
+2. Install yarn if not existed `npm install -g yarn`
+3. Execute `yarn install` or `yarn install --registry=https://registry.npmmirror.com` in `web-app`
+4. Install angular-cli : `yarn global add @angular/cli@15` or `yarn global add @angular/cli@15 --registry=https://registry.npmmirror.com`
+5. Start After Backend Server Available : `ng serve --open`
----
-
-1. 需要nodejs npm环境，下载地址：https://nodejs.org/en/download 确保你的版本 `Node.js >= 18`
-2. 安装yarn `npm install -g yarn`
-3. 在前端工程目录web-app下执行 `yarn install --registry=https://registry.npmmirror.com`
-4. 全局安装angular-cli `yarn global add @angular/cli@15 --registry=https://registry.npmmirror.com`
-5. 待本地后端启动后，在web-app目录下启动本地前端 `ng serve --open`
### Build HertzBeat Install Package
diff --git a/web-app/angular.json b/web-app/angular.json
index 7c7174c6f..69b85946e 100644
--- a/web-app/angular.json
+++ b/web-app/angular.json
@@ -98,8 +98,7 @@
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
- "browserTarget": "hertzbeat-web-app:build",
- "proxyConfig": "proxy.conf.js"
+ "browserTarget": "hertzbeat-web-app:build"
},
"configurations": {
"production": {
diff --git a/web-app/proxy.conf.js b/web-app/proxy.conf.js
deleted file mode 100644
index ef28a111b..000000000
--- a/web-app/proxy.conf.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * For more configuration, please refer to https://angular.io/guide/build#proxying-to-a-backend-server
- *
- * 更多配置描述请参考 https://angular.cn/guide/build#proxying-to-a-backend-server
- *
- * Note: The proxy is only valid for real requests, Mock does not actually generate requests, so the priority of Mock will be higher than the proxy
- */
-module.exports = {
- /**
- * The following means that all requests are directed to the backend `https://localhost:9000/`
- */
- // '/apps/*': {
- // target: 'https://localhost:8080',
- // secure: false, // Ignore invalid SSL certificates
- // changeOrigin: true
- // }
-};
diff --git a/web-app/src/app/core/startup/startup.service.ts b/web-app/src/app/core/startup/startup.service.ts
index ccd0d1d16..ef5b03972 100644
--- a/web-app/src/app/core/startup/startup.service.ts
+++ b/web-app/src/app/core/startup/startup.service.ts
@@ -31,9 +31,6 @@ export class StartupService {
private storageService: MemoryStorageService
) {
iconSrv.addIcon(...ICONS_AUTO, ...ICONS);
- iconSrv.fetchFromIconfont({
- scriptUrl: './assets/img/icon-gitee.js'
- });
}
public loadConfigResourceViaHttp(): Observable<void> {
diff --git a/web-app/src/assets/app-data.json b/web-app/src/assets/app-data.json
index c7028e20d..552e76a90 100644
--- a/web-app/src/assets/app-data.json
+++ b/web-app/src/assets/app-data.json
@@ -1,7 +1,7 @@
{
"app": {
"name": "HertzBeat",
- "description": "易用友好的高性能监控云"
+ "description": " A real-time monitoring system with agentless, performance cluster, prometheus-compatible, custom monitoring and status page building capabilities."
},
"user": {
"name": "Admin",
@@ -10,13 +10,13 @@
},
"menu": [
{
- "text": "总览",
+ "text": "Guide",
"i18n": "menu.main",
"group": true,
"hideInBreadcrumb": true,
"children": [
{
- "text": "仪表盘",
+ "text": "Dashboard",
"i18n": "menu.dashboard",
"icon": "anticon-dashboard",
"link": "/dashboard"
@@ -25,19 +25,19 @@
},
{
"key": "monitoring",
- "text": "监控",
+ "text": "Monitoring",
"i18n": "menu.monitor",
"group": true,
"hideInBreadcrumb": true,
"children": [
{
- "text": "monitor-center",
+ "text": "Monitor-center",
"i18n": "menu.monitor.center",
"icon": "anticon-laptop",
"link": "/monitors"
},
{
- "text": "define",
+ "text": "Define",
"i18n": "menu.advanced.define",
"icon": "anticon-code",
"link": "/setting/define"
@@ -50,110 +50,110 @@
},
{
"key": "service",
- "text": "应用服务",
+ "text": "Service",
"i18n": "menu.monitor.service",
"icon": "anticon-appstore"
},
{
"key": "program",
- "text": "应用程序",
+ "text": "Program",
"i18n": "menu.monitor.program",
"icon": "anticon-code"
},
{
"key": "db",
- "text": "数据库",
+ "text": "Database",
"i18n": "menu.monitor.db",
"icon": "anticon-console-sql"
},
{
"key": "cache",
- "text": "缓存",
+ "text": "Cache",
"i18n": "menu.monitor.cache",
"icon": "anticon-group"
},
{
"key": "os",
- "text": "操作系统",
+ "text": "OS",
"hide": false,
"i18n": "menu.monitor.os",
"icon": "anticon-windows"
},
{
"key": "mid",
- "text": "中间件",
+ "text": "Middleware",
"hide": false,
"i18n": "menu.monitor.mid",
"icon": "anticon-cluster"
},
{
"key": "bigdata",
- "text": "大数据",
+ "text": "Bigdata",
"hide": false,
"i18n": "menu.monitor.bigdata",
"icon": "anticon-dot-chart"
},
{
"key": "webserver",
- "text": "Web服务器",
+ "text": "WebServer",
"hide": false,
"i18n": "menu.monitor.webserver",
"icon": "anticon-database"
},
{
"key": "cn",
- "text": "云原生",
+ "text": "CNCF",
"hide": false,
"i18n": "menu.monitor.cn",
"icon": "anticon-cloud-server"
},
{
"key": "network",
- "text": "网络",
+ "text": "Network",
"hide": false,
"i18n": "menu.monitor.network",
"icon": "anticon-global"
},
{
"key": "custom",
- "text": "自定义",
+ "text": "Custom",
"i18n": "menu.monitor.custom",
"icon": "anticon-project"
}
]
},
{
- "text": "告警",
+ "text": "Alarm",
"i18n": "menu.alert",
"group": true,
"hideInBreadcrumb": true,
"children": [
{
- "text": "告警配置",
+ "text": "Threshold",
"i18n": "menu.alert.setting",
"icon": "anticon-calculator",
"link": "/alert/setting"
},
{
- "text": "告警收敛",
+ "text": "Converge",
"i18n": "menu.alert.converge",
"icon": "anticon-filter",
"link": "/alert/converge"
},
{
- "text": "告警静默",
+ "text": "Silence",
"i18n": "menu.alert.silence",
"icon": "anticon-audio-muted",
"link": "/alert/silence"
},
{
- "text": "告警中心",
+ "text": "Center",
"i18n": "menu.alert.center",
"icon": "anticon-alert",
"link": "/alert/center"
},
{
- "text": "告警通知",
+ "text": "Notice",
"i18n": "menu.alert.dispatch",
"icon": "anticon-notification",
"link": "/alert/notice"
diff --git a/web-app/src/assets/img/icon-gitee.js b/web-app/src/assets/img/icon-gitee.js
deleted file mode 100644
index d3d6dfa97..000000000
--- a/web-app/src/assets/img/icon-gitee.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(e){var t,n,o,a,i,c='<svg><symbol id="icon-gitee" viewBox="0 0 1024 1024"><path d="M512 1024C229.222 1024 0 794.778 0 512S229.222 0 512 0s512 229.222 512 512-229.222 512-512 512z m259.149-568.883h-290.74a25.293 25.293 0 0 0-25.292 25.293l-0.026 63.206c0 13.952 11.315 25.293 25.267 25.293h177.024c13.978 0 25.293 11.315 25.293 25.267v12.646a75.853 75.853 0 0 1-75.853 75.853h-240.23a25.293 25.293 0 0 1-25.267-25.293V417.203a75.853 75.853 0 0 1 75.827-75.853h353.946a25.293 25.293 0 [...]
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@hertzbeat.apache.org
For additional commands, e-mail: notifications-help@hertzbeat.apache.org