diff --git a/home/static/img/hertzbeat-brand-white-y.png b/home/static/img/hertzbeat-brand-white-y.png
new file mode 100644
index 00000000000..198cd887ac6
Binary files /dev/null and b/home/static/img/hertzbeat-brand-white-y.png differ
diff --git a/home/static/img/hertzbeat-brand-white-y.svg b/home/static/img/hertzbeat-brand-white-y.svg
new file mode 100644
index 00000000000..c63f407c112
--- /dev/null
+++ b/home/static/img/hertzbeat-brand-white-y.svg
@@ -0,0 +1,4 @@
+
diff --git a/home/static/img/hertzbeat-brand-y.png b/home/static/img/hertzbeat-brand-y.png
new file mode 100644
index 00000000000..9ca32993970
Binary files /dev/null and b/home/static/img/hertzbeat-brand-y.png differ
diff --git a/home/static/img/hertzbeat-brand-y.svg b/home/static/img/hertzbeat-brand-y.svg
new file mode 100644
index 00000000000..11580d67239
--- /dev/null
+++ b/home/static/img/hertzbeat-brand-y.svg
@@ -0,0 +1,4 @@
+
diff --git a/home/static/img/tancloud-brand-white-y.png b/home/static/img/tancloud-brand-white-y.png
new file mode 100644
index 00000000000..d75533cddfc
Binary files /dev/null and b/home/static/img/tancloud-brand-white-y.png differ
diff --git a/home/static/img/tancloud-brand-white-y.svg b/home/static/img/tancloud-brand-white-y.svg
new file mode 100644
index 00000000000..d7c233e28f2
--- /dev/null
+++ b/home/static/img/tancloud-brand-white-y.svg
@@ -0,0 +1,4 @@
+
diff --git a/home/static/img/tancloud-brand-white.png b/home/static/img/tancloud-brand-white.png
new file mode 100644
index 00000000000..2939fe93b71
Binary files /dev/null and b/home/static/img/tancloud-brand-white.png differ
diff --git a/home/static/img/tancloud-brand-y.png b/home/static/img/tancloud-brand-y.png
new file mode 100644
index 00000000000..256ff19c480
Binary files /dev/null and b/home/static/img/tancloud-brand-y.png differ
diff --git a/home/static/img/tancloud-brand-y.svg b/home/static/img/tancloud-brand-y.svg
new file mode 100644
index 00000000000..65450a7cc02
--- /dev/null
+++ b/home/static/img/tancloud-brand-y.svg
@@ -0,0 +1,4 @@
+
diff --git a/manager/src/main/resources/define/app-ftp.yml b/manager/src/main/resources/define/app-ftp.yml
index b7860a7d365..a650f4e3250 100644
--- a/manager/src/main/resources/define/app-ftp.yml
+++ b/manager/src/main/resources/define/app-ftp.yml
@@ -110,6 +110,9 @@ metrics:
# metrics - basic
# 监控指标 - basic
- name: basic
+ i18n:
+ zh-CN: 概要
+ en-US: Basic
# metrics scheduling priority(0->127)->(high->low), metrics with the same priority will be scheduled in parallel
# priority 0's metrics is availability metrics, it will be scheduled first, only availability metrics collect success will the scheduling continue
# 指标采集调度优先级(0->127)->(优先级高->低) 优先级低的指标会等优先级高的指标采集完成后才会被调度, 相同优先级的指标会并行调度采集
@@ -122,9 +125,15 @@ metrics:
# field-指标名称, type-指标类型(0-number数字,1-string字符串), unit-指标单位('%','ms','MB'), label-是否是指标标签字段
- field: isActive
type: 1
+ i18n:
+ zh-CN: 活动状态
+ en-US: Is Active
- field: responseTime
type: 0
unit: ms
+ i18n:
+ zh-CN: 响应时间
+ en-US: ResponseTime
# the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk
protocol: ftp
# the config content when protocol is ftp
diff --git a/manager/src/main/resources/define/app-port.yml b/manager/src/main/resources/define/app-port.yml
index bbb10d4aca3..089e60a5248 100644
--- a/manager/src/main/resources/define/app-port.yml
+++ b/manager/src/main/resources/define/app-port.yml
@@ -95,6 +95,9 @@ metrics:
# metrics - summary
# 监控指标 - summary
- name: summary
+ i18n:
+ zh-CN: 概要
+ en-US: Summary
# metrics scheduling priority(0->127)->(high->low), metrics with the same priority will be scheduled in parallel
# priority 0's metrics is availability metrics, it will be scheduled first, only availability metrics collect success will the scheduling continue
# 指标采集调度优先级(0->127)->(优先级高->低) 优先级低的指标会等优先级高的指标采集完成后才会被调度, 相同优先级的指标会并行调度采集
@@ -107,6 +110,9 @@ metrics:
- field: responseTime
type: 0
unit: ms
+ i18n:
+ zh-CN: 响应时间
+ en-US: ResponseTime
# the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk
# 采集协议, 目前支持sql, ssh, http, telnet, wmi, snmp, sdk
protocol: telnet
diff --git a/manager/src/main/resources/define/app-ssl_cert.yml b/manager/src/main/resources/define/app-ssl_cert.yml
index fa3ea22656d..9ceb4f5ff18 100644
--- a/manager/src/main/resources/define/app-ssl_cert.yml
+++ b/manager/src/main/resources/define/app-ssl_cert.yml
@@ -99,6 +99,9 @@ metrics:
# metrics - certificate
# 监控指标 - certificate
- name: certificate
+ i18n:
+ zh-CN: 证书
+ en-US: Certificate
# metrics scheduling priority(0->127)->(high->low), metrics with the same priority will be scheduled in parallel
# priority 0's metrics is availability metrics, it will be scheduled first, only availability metrics collect success will the scheduling continue
# 指标采集调度优先级(0->127)->(优先级高->低) 优先级低的指标会等优先级高的指标采集完成后才会被调度, 相同优先级的指标会并行调度采集
@@ -112,21 +115,42 @@ metrics:
- field: subject
type: 1
label: true
+ i18n:
+ zh-CN: 颁发对象
+ en-US: Subject
- field: expired
type: 1
+ i18n:
+ zh-CN: 是否过期
+ en-US: Expired
- field: start_time
type: 1
+ i18n:
+ zh-CN: 颁发日期
+ en-US: Start Time
- field: start_timestamp
type: 0
unit: ms
+ i18n:
+ zh-CN: 颁发时间戳
+ en-US: Start Timestamp
- field: end_time
type: 1
+ i18n:
+ zh-CN: 截止日期
+ en-US: End Time
- field: end_timestamp
type: 0
unit: ms
+ i18n:
+ zh-CN: 截止时间戳
+ en-US: End Timestamp
- field: days_remaining
type: 0
unit: d
+ i18n:
+ zh-CN: 剩余天数
+ en-US: Remaining Days
aliasFields:
- subject
- expired
diff --git a/manager/src/main/resources/define/app-udp_port.yml b/manager/src/main/resources/define/app-udp_port.yml
index f5118c55552..12d6807ea38 100644
--- a/manager/src/main/resources/define/app-udp_port.yml
+++ b/manager/src/main/resources/define/app-udp_port.yml
@@ -104,6 +104,9 @@ metrics:
# metrics - summary
# 监控指标 - summary
- name: summary
+ i18n:
+ zh-CN: 概要
+ en-US: Summary
# metrics scheduling priority(0->127)->(high->low), metrics with the same priority will be scheduled in parallel
# priority 0's metrics is availability metrics, it will be scheduled first, only availability metrics collect success will the scheduling continue
# 指标采集调度优先级(0->127)->(优先级高->低) 优先级低的指标会等优先级高的指标采集完成后才会被调度, 相同优先级的指标会并行调度采集
@@ -116,6 +119,9 @@ metrics:
- field: responseTime
type: 0
unit: ms
+ i18n:
+ zh-CN: 响应时间
+ en-US: ResponseTime
# the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk
# 采集协议, 目前支持sql, ssh, http, telnet, wmi, snmp, sdk
protocol: udp
diff --git a/manager/src/main/resources/define/app-website.yml b/manager/src/main/resources/define/app-website.yml
index ba899f60429..6b0ae0181d4 100644
--- a/manager/src/main/resources/define/app-website.yml
+++ b/manager/src/main/resources/define/app-website.yml
@@ -206,6 +206,9 @@ metrics:
# metrics - summary, inner monitoring metrics (responseTime - response time, keyword - number of keywords)
# 监控指标 - summary, 内置监控指标有 (responseTime - 响应时间, keyword - 关键字数量)
- name: summary
+ i18n:
+ zh-CN: 概要
+ en-US: Summary
# 指标调度优先级(0-127)越小优先级越高,优先级低的指标会等优先级高的指标采集完成后才会被调度,相同优先级的指标会并行调度采集
# metrics scheduling priority(0->127)->(high->low), metrics with the same priority will be scheduled in parallel
# priority 0's metrics is availability metrics, it will be scheduled first, only availability metrics collect success will the scheduling continue
@@ -220,8 +223,14 @@ metrics:
- field: responseTime
type: 0
unit: ms
+ i18n:
+ zh-CN: 响应时间
+ en-US: ResponseTime
- field: keyword
type: 0
+ i18n:
+ zh-CN: 关键词数量
+ en-US: Keyword
# the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk
protocol: http
# the config content when protocol is http
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
index a626cf3e67c..b856d0b9767 100644
--- 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
@@ -1,34 +1,9 @@
-
-
-
-
-
- {{ 'menu.dashboard' | i18n }}
-
-
-
-
-
- {{ 'monitors.list' | i18n }}
-
-
-
-
- {{ 'monitors.edit' | i18n }}
-
-
- {{ 'monitor.app.' + monitor.app | i18n }}
-
-
- {{ 'monitor' | i18n }}
-
-
-
-
-
+
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
index 6eee6261782..153b8ba6b21 100644
--- 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
@@ -1,34 +1,9 @@
-
-
-
-
-
- {{ 'menu.dashboard' | i18n }}
-
-
-
-
-
- {{ 'monitors.list' | i18n }}
-
-
-
-
- {{ 'monitors.new' | i18n }}
-
-
- {{ 'monitor.app.' + monitor.app | i18n }}
-
-
- {{ 'monitor' | i18n }}
-
-
-
-
-
+
diff --git a/web-app/src/app/shared/components/help-massage-show/help-massage-show.component.html b/web-app/src/app/shared/components/help-massage-show/help-massage-show.component.html
index 59d2d8bfc37..d97acba3305 100644
--- a/web-app/src/app/shared/components/help-massage-show/help-massage-show.component.html
+++ b/web-app/src/app/shared/components/help-massage-show/help-massage-show.component.html
@@ -11,8 +11,8 @@
diff --git a/web-app/src/app/shared/components/help-massage-show/help-massage-show.component.less b/web-app/src/app/shared/components/help-massage-show/help-massage-show.component.less
index 4408c5303bc..060231c2ca9 100644
--- a/web-app/src/app/shared/components/help-massage-show/help-massage-show.component.less
+++ b/web-app/src/app/shared/components/help-massage-show/help-massage-show.component.less
@@ -58,6 +58,7 @@
.help_massage_nav {
float: left;
+ border-right: 1px solid white;
height: 28.8px;
padding-left: 23px;
padding-right: 23px;
@@ -75,7 +76,6 @@
.help_link_nav {
float: left;
- border-right: 1px solid rgba(255, 255, 255, 0.87);
height: 28.8px;
padding-right: 30px;
color: white;
diff --git a/web-app/src/app/shared/components/help-massage-show/help-massage-show.component.ts b/web-app/src/app/shared/components/help-massage-show/help-massage-show.component.ts
index 0cd7fea5c5b..782716bdb66 100644
--- a/web-app/src/app/shared/components/help-massage-show/help-massage-show.component.ts
+++ b/web-app/src/app/shared/components/help-massage-show/help-massage-show.component.ts
@@ -20,7 +20,7 @@ export class HelpMassageShowComponent implements OnInit {
@Input()
guild_link: string = 'content';
@Input()
- module_name: string = 'content';
+ module_name!: string;
@Input()
icon_name: string = 'home';
constructor(