From fd094a0265a072978796a1b817f936d1435313fe Mon Sep 17 00:00:00 2001 From: Yuting Nie Date: Mon, 7 Aug 2023 21:04:04 +0800 Subject: [PATCH 1/5] the components of the alert and setting module have been built Signed-off-by: Yuting Nie --- .../hertzbeat/common/entity/job/Job.java | 6 + .../hertzbeat/manager/service/AppService.java | 2 + .../manager/service/impl/AppServiceImpl.java | 50 +++--- .../main/resources/define/app-a_example.yml | 5 + .../alert-center/alert-center.component.html | 17 +- .../alert-converge.component.html | 23 +-- .../alert-notice/alert-notice.component.html | 24 +-- .../alert-setting.component.html | 23 +-- .../alert-silence.component.html | 23 +-- .../setting/define/define.component.html | 31 +--- .../routes/setting/tags/tags.component.html | 23 +-- .../help-massage-show.component.html | 76 +++++++++ .../help-massage-show.component.less | 153 ++++++++++++++++++ .../help-massage-show.component.spec.ts | 23 +++ .../help-massage-show.component.ts | 73 +++++++++ web-app/src/app/shared/shared.module.ts | 13 +- web-app/src/assets/i18n/en-US.json | 40 ++--- web-app/src/assets/i18n/zh-CN.json | 40 ++--- 18 files changed, 434 insertions(+), 211 deletions(-) create mode 100644 web-app/src/app/shared/components/help-massage-show/help-massage-show.component.html create mode 100644 web-app/src/app/shared/components/help-massage-show/help-massage-show.component.less create mode 100644 web-app/src/app/shared/components/help-massage-show/help-massage-show.component.spec.ts create mode 100644 web-app/src/app/shared/components/help-massage-show/help-massage-show.component.ts diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/Job.java b/common/src/main/java/org/dromara/hertzbeat/common/entity/job/Job.java index 5e3c0406b1b..4646bf34e39 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/Job.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/entity/job/Job.java @@ -78,6 +78,12 @@ public class Job { * en-US: PING CONNECT */ private Map name; + /** + * The description and help of the monitoring type + * zh-CN: PING连通性 - 支持您使用在线配置对端服务的IP或域名地址,监控本机网络与对端网络的PING可连通性。 + * en-US: PING CONNECT - You can use the IP address or domain address of the peer service to monitor the PING connectivity between the local network and the peer network. + */ + private Map help; /** * Task dispatch start timestamp * 任务派发开始时间戳 diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/service/AppService.java b/manager/src/main/java/org/dromara/hertzbeat/manager/service/AppService.java index 1042148669d..a155fe92a0d 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/service/AppService.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/service/AppService.java @@ -100,6 +100,8 @@ public interface AppService { */ void applyMonitorDefineYml(String ymlContent, boolean isModify); + void applyMonitorDefineYml(String ymlContent); + /** * delete monitor define yml * @param app app diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/AppServiceImpl.java b/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/AppServiceImpl.java index 06dec9af4ee..6d5a1c32e5a 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/AppServiceImpl.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/AppServiceImpl.java @@ -66,7 +66,7 @@ public class AppServiceImpl implements AppService, CommandLineRunner { @Autowired private MonitorDao monitorDao; - + private final Map appDefines = new ConcurrentHashMap<>(); @Override @@ -116,8 +116,8 @@ public List getAppDefineMetricNames(String app) { public Map getI18nResources(String lang) { Map i18nMap = new HashMap<>(128); for (Job job : appDefines.values()) { - // todo needs to support the indicator name - // 后面需要支持指标名称 + // TODO needs to support the metrics name i18n + // TODO 后面需要支持指标名称国际化 Map name = job.getName(); if (name != null && !name.isEmpty()) { String i18nName = Optional.ofNullable(name.get(lang)).orElse(name.values().stream().findFirst().orElse(null)); @@ -125,6 +125,13 @@ public Map getI18nResources(String lang) { i18nMap.put("monitor.app." + job.getApp(), i18nName); } } + Map help = job.getHelp(); + if (help != null && !help.isEmpty()) { + String i18nHelp = Optional.ofNullable(help.get(lang)).orElse(help.values().stream().findFirst().orElse(null)); + if (i18nHelp != null) { + i18nMap.put("monitor.app." + job.getApp() + ".help", i18nHelp); + } + } for (ParamDefine paramDefine : job.getParams()) { Map paramDefineName = paramDefine.getName(); if (paramDefineName != null && !paramDefineName.isEmpty()) { @@ -222,6 +229,11 @@ public String getMonitorDefineFileContent(String app) { @Override public void applyMonitorDefineYml(String ymlContent, boolean isModify) { + + } + + @Override + public void applyMonitorDefineYml(String ymlContent) { Yaml yaml = new Yaml(); Job app; try { @@ -231,7 +243,7 @@ public void applyMonitorDefineYml(String ymlContent, boolean isModify) { throw new IllegalArgumentException("parse yml define error: " + e.getMessage()); } // app params verify - verifyDefineAppContent(app, isModify); + verifyDefineAppContent(app); String classpath = Objects.requireNonNull(this.getClass().getClassLoader().getResource("")).getPath(); String defineAppPath = classpath + "define" + File.separator + "app-" + app.getApp() + ".yml"; File defineAppFile = new File(defineAppPath); @@ -247,21 +259,17 @@ public void applyMonitorDefineYml(String ymlContent, boolean isModify) { SpringContextHolder.getBean(MonitorService.class).updateAppCollectJob(app); } - private void verifyDefineAppContent(Job app, boolean isModify) { - Assert.notNull(app, "monitoring template can not null"); - Assert.notNull(app.getApp(), "monitoring template require attributes app"); - Assert.notNull(app.getCategory(), "monitoring template require attributes category"); - Assert.notEmpty(app.getName(), "monitoring template require attributes name"); - Assert.notEmpty(app.getParams(), "monitoring template require attributes params"); + private void verifyDefineAppContent(Job app) { + Assert.notNull(app, "define yml can not null"); + Assert.notNull(app.getApp(), "define yml require attributes app"); + Assert.notNull(app.getCategory(), "define yml require attributes category"); + Assert.notEmpty(app.getName(), "define yml require attributes name"); + Assert.notEmpty(app.getParams(), "define yml require attributes params"); boolean hasParamHost = app.getParams().stream().anyMatch(item -> "host".equals(item.getField())); - Assert.isTrue(hasParamHost, "monitoring template attributes params must have param host"); - Assert.notEmpty(app.getMetrics(), "monitoring template require attributes metrics"); + Assert.isTrue(hasParamHost, "define yml attributes params must have param host"); + Assert.notEmpty(app.getMetrics(), "define yml require attributes metrics"); boolean hasAvailableMetrics = app.getMetrics().stream().anyMatch(item -> item.getPriority() == 0); - Assert.isTrue(hasAvailableMetrics, "monitoring template metrics list must have one priority 0 metrics"); - if (!isModify) { - Assert.isNull(appDefines.get(app.getApp().toLowerCase()), - "monitoring template name " + app.getApp() + " already exists."); - } + Assert.isTrue(hasAvailableMetrics, "define yml metrics list must have one priority 0 metrics"); } @Override @@ -321,7 +329,6 @@ public void run(String... args) throws Exception { inputStream.close(); } catch (Exception e) { log.error(e.getMessage(), e); - log.error("Ignore this template file: {}.", resource.getFilename()); } } } catch (Exception e) { @@ -333,11 +340,6 @@ public void run(String... args) throws Exception { log.info("load define path {}", defineAppPath); for (File appFile : Objects.requireNonNull(directory.listFiles())) { if (appFile.exists() && appFile.isFile()) { - if (appFile.isHidden() - || (!appFile.getName().endsWith("yml") && !appFile.getName().endsWith("yaml"))) { - log.error("Ignore this template file: {}.", appFile.getName()); - continue; - } try (FileInputStream fileInputStream = new FileInputStream(appFile)) { Job app = yaml.loadAs(fileInputStream, Job.class); if (app != null) { @@ -345,7 +347,7 @@ public void run(String... args) throws Exception { } } catch (IOException e) { log.error(e.getMessage(), e); - log.error("Ignore this template file: {}.", appFile.getName()); + throw e; } } } diff --git a/manager/src/main/resources/define/app-a_example.yml b/manager/src/main/resources/define/app-a_example.yml index 2f685755319..61d293d3cd1 100644 --- a/manager/src/main/resources/define/app-a_example.yml +++ b/manager/src/main/resources/define/app-a_example.yml @@ -24,6 +24,11 @@ app: a_example name: zh-CN: 模拟应用 en-US: EXAMPLE APP +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: PING连通性 - Hertzbeat 支持您使用在线配置对端服务的IP或域名地址,监控本机网络与对端网络的PING可连通性。 + en-US: PING CONNECT - You can use the IP address or domain address of the peer service to monitor the PING connectivity between the local network and the peer network. # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/web-app/src/app/routes/alert/alert-center/alert-center.component.html b/web-app/src/app/routes/alert/alert-center/alert-center.component.html index 26a6edcc19b..c8e153034d2 100644 --- a/web-app/src/app/routes/alert/alert-center/alert-center.component.html +++ b/web-app/src/app/routes/alert/alert-center/alert-center.component.html @@ -1,16 +1,7 @@ - - - - - - {{ 'menu.dashboard' | i18n }} - - - - - {{ 'menu.alert.center' | i18n }} - - +
diff --git a/web-app/src/app/routes/alert/alert-converge/alert-converge.component.html b/web-app/src/app/routes/alert/alert-converge/alert-converge.component.html index f7f277b8903..8f46d26a457 100644 --- a/web-app/src/app/routes/alert/alert-converge/alert-converge.component.html +++ b/web-app/src/app/routes/alert/alert-converge/alert-converge.component.html @@ -1,22 +1,7 @@ - - - - - - {{ 'menu.dashboard' | i18n }} - - - - - {{ 'menu.alert.converge' | i18n }} - - - - - +
diff --git a/web-app/src/app/routes/alert/alert-notice/alert-notice.component.html b/web-app/src/app/routes/alert/alert-notice/alert-notice.component.html index 7c01224535a..41c8e18abf3 100644 --- a/web-app/src/app/routes/alert/alert-notice/alert-notice.component.html +++ b/web-app/src/app/routes/alert/alert-notice/alert-notice.component.html @@ -1,23 +1,7 @@ - - - - - - {{ 'menu.dashboard' | i18n }} - - - - - {{ 'menu.alert.dispatch' | i18n }} - - - - - - + diff --git a/web-app/src/app/routes/alert/alert-setting/alert-setting.component.html b/web-app/src/app/routes/alert/alert-setting/alert-setting.component.html index 43befa6563c..60c96b8ceb9 100644 --- a/web-app/src/app/routes/alert/alert-setting/alert-setting.component.html +++ b/web-app/src/app/routes/alert/alert-setting/alert-setting.component.html @@ -1,22 +1,7 @@ - - - - - - {{ 'menu.dashboard' | i18n }} - - - - - {{ 'menu.alert.setting' | i18n }} - - - - - +
diff --git a/web-app/src/app/routes/alert/alert-silence/alert-silence.component.html b/web-app/src/app/routes/alert/alert-silence/alert-silence.component.html index f92433e8753..66cb701a2de 100644 --- a/web-app/src/app/routes/alert/alert-silence/alert-silence.component.html +++ b/web-app/src/app/routes/alert/alert-silence/alert-silence.component.html @@ -1,22 +1,7 @@ - - - - - - {{ 'menu.dashboard' | i18n }} - - - - - {{ 'menu.alert.silence' | i18n }} - - - - - +
diff --git a/web-app/src/app/routes/setting/define/define.component.html b/web-app/src/app/routes/setting/define/define.component.html index f89471fa2c6..f3c33420faa 100644 --- a/web-app/src/app/routes/setting/define/define.component.html +++ b/web-app/src/app/routes/setting/define/define.component.html @@ -1,30 +1,7 @@ - - - - - - {{ 'menu.dashboard' | i18n }} - - - - - {{ 'menu.extras.define' | i18n }} - - {{ 'monitor.app.' + currentApp | i18n }} - - - - - - + diff --git a/web-app/src/app/routes/setting/tags/tags.component.html b/web-app/src/app/routes/setting/tags/tags.component.html index 1dc13644af7..98c141cdcb7 100644 --- a/web-app/src/app/routes/setting/tags/tags.component.html +++ b/web-app/src/app/routes/setting/tags/tags.component.html @@ -1,22 +1,7 @@ - - - - - - {{ 'menu.dashboard' | i18n }} - - - - - {{ 'menu.extras.tags' | 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 new file mode 100644 index 00000000000..502f5ec739d --- /dev/null +++ b/web-app/src/app/shared/components/help-massage-show/help-massage-show.component.html @@ -0,0 +1,76 @@ +
+
+ +
+ + + + +
+
+ + + 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 new file mode 100644 index 00000000000..d258b67d284 --- /dev/null +++ b/web-app/src/app/shared/components/help-massage-show/help-massage-show.component.less @@ -0,0 +1,153 @@ +.help_massage_div { + margin-top: 60px; + width: 100%; + height: 140px; + overflow-y: hidden; + box-shadow: inset 0 2px 4px 0 rgb(0 0 0 / 0.05); + border-radius: 5px; +} +.collapsed_content{ + overflow-y: hidden; + background-color: white; + height: 131.2px; +} +.help_massage_nav_item { + color: gray; +} + +.help_link_nav_item { + color: black; +} + +.flex { + display: flex; +} + +.level1_breabcrumb { + height: 28.8px; + background-color: rgba(0, 0, 0, 0.05); +} + +.menu_name { + line-height: 28.8px; +} + +.level2_massage_show { + padding-top: 0.8%; + height: 76px; + width: 99%; + margin: auto; + overflow-y: scroll; +} + +.level2_massage_show::-webkit-scrollbar-track { + background-color: rgba(63, 81, 181, 0.38); +} + +.help_link_content { + padding-left: 9px; + float: left; + +} + +.handover_button { + float: right; + margin-right: 0.8%; + line-height: 28.8px; + height: 28.8px; + +} + +.help_massage_nav { + float: left; + border-right: 1px solid white; + height: 28.8px; + padding-left: 23px; + padding-right: 23px; + color: white; + line-height: 28.8px; +} + +.help_massage_nav_item:hover { + color: #282828; +} + +.help_massage_nav:hover { + border-bottom: 2px solid rgba(116, 54, 157, 0.79); +} + +.help_link_nav { + float: left; + border-right: 1px solid rgba(255, 255, 255, 0.87); + height: 28.8px; + padding-right: 30px; + color: white; + line-height: 28.8px; +} + +.help_link_nav:nth-child(1):after { + content: ''; + float: left; + height: 13px; + width: 2px; + background-color: rgba(0, 0, 0, 0.44); + margin-top: 7px; + margin-left: 22px; +} + +.help_link_nav:nth-child(2) { + margin-left: -10px; +} + +.float-left { + float: left; +} + +.anticon { + margin-right: 6px; +} + +.help_com_icon { + width: 13px; + height: 13px; + margin-right: 6px; +} + +.hover_blue:hover { + color: #2b4acb; +} + +.help_link { + color: black; + padding-left: 10px; +} + +.help_link:hover { + color: #2aa2ee; +} + +.handover_button_content { + border: none; + background-color: transparent; + color: rgb(70, 70, 70); +} + +.handover_button_content:hover { + color: #282828; +} + +.help_link_span { + margin-left: 13px; + margin-right: 13px; +} + +.help_com_icon { + width: 22px; + height: 22px; + margin-right: 5px; +} + +.help_link_content-item { + float: left; +} + diff --git a/web-app/src/app/shared/components/help-massage-show/help-massage-show.component.spec.ts b/web-app/src/app/shared/components/help-massage-show/help-massage-show.component.spec.ts new file mode 100644 index 00000000000..a16405b6f09 --- /dev/null +++ b/web-app/src/app/shared/components/help-massage-show/help-massage-show.component.spec.ts @@ -0,0 +1,23 @@ +import {ComponentFixture, TestBed} from '@angular/core/testing'; + +import {HelpMassageShowComponent} from './help-massage-show.component'; + +describe('HelpMassageShowComponent', () => { + let component: HelpMassageShowComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [HelpMassageShowComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(HelpMassageShowComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); 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 new file mode 100644 index 00000000000..1728ab971cc --- /dev/null +++ b/web-app/src/app/shared/components/help-massage-show/help-massage-show.component.ts @@ -0,0 +1,73 @@ +import {Component, Inject,Input,OnInit} from '@angular/core'; +import {ActivatedRoute, Router} from '@angular/router'; +import {I18NService} from '@core'; +import {ALAIN_I18N_TOKEN} from '@delon/theme'; +import {NzMessageService} from 'ng-zorro-antd/message'; +import {NzModalService} from 'ng-zorro-antd/modal'; +import {NzNotificationService} from 'ng-zorro-antd/notification'; +import {Monitor} from '../../../pojo/Monitor'; +import {MonitorService} from '../../../service/monitor.service'; +import { ElementRef, Renderer2,ViewChild } from '@angular/core'; + + +@Component({ + selector: 'app-help-massage-show', + templateUrl: './help-massage-show.component.html', + styleUrls: ['./help-massage-show.component.less'] +}) +export class HelpMassageShowComponent implements OnInit { + @Input() + help_massage_content: string = "content"; + @Input() + guild_link: string = "content"; + constructor( + private route: ActivatedRoute, + private router: Router, + private modal: NzModalService, + private notifySvc: NzNotificationService, + private monitorSvc: MonitorService, + private messageSvc: NzMessageService, + private rd2: Renderer2, + @Inject(ALAIN_I18N_TOKEN) private i18nSvc: I18NService + ) { + } + isCollapsed: boolean = false; + isLevel2Collapsed: boolean = false; + @ViewChild('collapsed_content') collapsed_content: any; + initialHeight: number = 28.8; + handleButtonClick(): void { + this.isCollapsed = !this.isCollapsed; + this.isLevel2Collapsed = !this.isLevel2Collapsed; + const targetHeight = this.isLevel2Collapsed ? 28.8 : 140; + this.rd2.setStyle(this.collapsed_content.nativeElement, 'height', `${targetHeight}px`); + } + + app!: string | undefined; + tag!: string | undefined; + pageIndex: number = 1; + pageSize: number = 8; + total: number = 0; + monitors!: Monitor[]; + tableLoading: boolean = true; + checkedMonitorIds = new Set(); + + ngOnInit(): void { + this.route.queryParamMap.subscribe(paramMap => { + let appStr = paramMap.get('app'); + let tagStr = paramMap.get('tag'); + if (tagStr != null) { + this.tag = tagStr; + } else { + this.tag = undefined; + } + if (appStr != null) { + this.app = appStr; + } else { + this.app = undefined; + } + this.pageIndex = 1; + this.pageSize = 8; + this.checkedMonitorIds = new Set(); + }); + } +} diff --git a/web-app/src/app/shared/shared.module.ts b/web-app/src/app/shared/shared.module.ts index 40df0d7f350..19e1a9abfea 100644 --- a/web-app/src/app/shared/shared.module.ts +++ b/web-app/src/app/shared/shared.module.ts @@ -6,10 +6,14 @@ import { DelonACLModule } from '@delon/acl'; import { DelonFormModule } from '@delon/form'; import { AlainThemeModule } from '@delon/theme'; +import { HelpMassageShowComponent } from './components/help-massage-show/help-massage-show.component'; import { KeyValueInputComponent } from './components/key-value-input/key-value-input.component'; import { TimezonePipe } from './pipe/timezone.pipe'; import { SHARED_DELON_MODULES } from './shared-delon.module'; import { SHARED_ZORRO_MODULES } from './shared-zorro.module'; +import {NzBreadCrumbModule} from "ng-zorro-antd/breadcrumb"; +import {NzTagModule} from "ng-zorro-antd/tag"; + // #region third libs @@ -19,7 +23,7 @@ const THIRDMODULES: Array> = []; // #region your components & directives -const COMPONENTS: Array> = [KeyValueInputComponent]; +const COMPONENTS: Array> = [KeyValueInputComponent, HelpMassageShowComponent]; const DIRECTIVES: Array> = [TimezonePipe]; // #endregion @@ -36,12 +40,15 @@ const DIRECTIVES: Array> = [TimezonePipe]; ...SHARED_DELON_MODULES, ...SHARED_ZORRO_MODULES, // third libs - ...THIRDMODULES + ...THIRDMODULES, + NzBreadCrumbModule, + NzTagModule ], declarations: [ // your components ...COMPONENTS, - ...DIRECTIVES + ...DIRECTIVES, + HelpMassageShowComponent ], exports: [ CommonModule, diff --git a/web-app/src/assets/i18n/en-US.json b/web-app/src/assets/i18n/en-US.json index e23bca846f0..e1bcb7eae65 100644 --- a/web-app/src/assets/i18n/en-US.json +++ b/web-app/src/assets/i18n/en-US.json @@ -56,11 +56,6 @@ "description.tip": "Description and remarks", "intervals": "Intervals(s)", "intervals.tip": "Monitor the interval time of periodic collection of data, unit second", - "collector": "Collector", - "collector.tip": "Choose which collector to dispatch this monitoring", - "collector.system.default": "Default System Dispatch", - "collector.status.online": "Online", - "collector.status.offline": "Offline", "category": { "": "Category", "service": "Service", @@ -122,10 +117,6 @@ "alert.setting.rule.operator": "Operator", "alert.setting.rule.operator.str-equals": "equals", "alert.setting.rule.operator.str-no-equals": "not equals", - "alert.setting.rule.operator.str-contains": "contains", - "alert.setting.rule.operator.str-no-contains": "not contains", - "alert.setting.rule.operator.str-matches": "matches", - "alert.setting.rule.operator.str-no-matches": "not matches", "alert.setting.rule.string-value.place-holder": "Please input string", "alert.setting.rule.numeric-value.place-holder": "Please input numeric", "alert.setting.times": "Trigger Times", @@ -205,6 +196,16 @@ "alert.center.confirm.mark-done": "Please confirm whether to mark processed!", "alert.center.confirm.mark-no-batch": "Please confirm whether to mark Pending in batch!", "alert.center.confirm.mark-no": "Please confirm whether to mark Pending!", + "alert.help.notice": "This part specified the receiver of alarm information and receiving method. The alarm information will be sent to the receiver by specified way(currently support email, Webhook, etc.). Click here to look over configuration steps.
⚠\uFE0FNote:After configuring the “New Recivier”, you also need to congigure the“New Notice Policy”to specify which massages are sent to which receivers. Click here to look over potential issues you may encounter", + "alert.help.notice.link":"https://hertzbeat.com/docs/help/alert_threshold", + "alert.help.converge": "Hertzbeat will reduce the amount of the specified alarm information based on your silence strategy to solve the potential problem of duplicate alarms.", + "alert.help.converge.link":"https://hertzbeat.com/blog/#v132", + "alert.help.center": "In this part, you can check the alarm messages which triggered by the your alarm threshold。", + "alert.help.center.link":"https://hertzbeat.com/docs/help/guide", + "alert.help.setting": "Click the \"New Threshold\" to configure the alarm threshold for monitoring indicators. Hertzbeat will trigger alarms based on the configuration and collection of indicator data.
⚠\uFE0FNote: The alarm information that has been successfully triggered can be checked in [Alter Center], and you can also set the notification method and personnel in [Notification].", + "alert.help.setting.link":"https://hertzbeat.com/docs/help/alert_threshold", + "alert.help.silence": "Click \"New Silence Strategy\" and configure the time period when you don't want to be disturbed by alarm notifications. You can also turn off the specified alarm by choosing the tags.", + "alert.help.silence.link":"https://hertzbeat.com/docs/help/alert_threshold", "alert.notice.receiver": "Message Receiver", "alert.notice.receiver.new": "New Receiver", "alert.notice.receiver.edit": "Edit Receiver", @@ -285,6 +286,8 @@ "dashboard.monitors.sub-title": "The Distribution Of Monitors", "dashboard.monitors.formatter": " Monitors ", "dashboard.monitors.distribute": "Monitor Distribution", + "menu.link.question": "FAQ", + "menu.link.guild": "User Guide", "monitors.list": "Monitor List", "monitors.spinning-tip.detecting": "Available Detecting", "monitors.new": "New", @@ -434,6 +437,10 @@ "tag.display": "Display", "tag.bind": "Bind Tags", "tag.bind.tip": "You can use tags for classification management.eg: assign tags to resources in production environment and test environment.", + "tag.help": "The tags generated here can be bound during monitoring configure.
You can use tags to classify and manage monitoring resources, such as binding labels for production and testing environments separately.", + "tag.help.link": "https://hertzbeat.com/zh-cn/docs/", + "define.help": "HertzBeat supports custom modifications and you could select an existing monitoring template from the drop-down menu then make modifications according to your own needs.
The bottom-left area is the editing place.\nYou can also click \"New Monitor Type\" to define the new type. Currently supported protocols include HTTP, JDBC, SSH, JMX, SNMP. Click here to view the monitor templates.", + "define.help.link": "https://hertzbeat.com/zh-cn/docs/advanced/extend-point/", "define.save-apply": "Save And Apply", "define.delete": "Delete Monitor Type", "define.delete.confirm": "Please confirm whether to delete {{app}} monitoring type? This type of monitoring cannot be added after deletion.", @@ -446,21 +453,6 @@ "settings.server.email.setting": "Configure Email Server", "settings.server.sms": "SMS Server", "settings.server.sms.setting": "Configure SMS Server", - "settings.system-config": "System Configuration", - "settings.system-config.locale": "System Language", - "settings.system-config.locale.zh_CN": "Simplified Chinese(zh_CN)", - "settings.system-config.locale.zh_TW": "Traditional Chinese(zh_TW)", - "settings.system-config.locale.en_US": "English(en_US)", - "settings.system-config.timezone": "System Time Zone", - "settings.system-config.ok": "Confirm Update", - "collector": "Collector", - "collector.status": "Online Status", - "collector.task": "Number of Tasks", - "collector.start-time": "Start Time", - "collector.ip": "IP Address", - "collector.node": "Node Name", - "collector.pinned": "Pinned", - "collector.dispatched": "Dispatched", "validation.email.required": "Please enter your email!", "validation.email.wrong-format": "The email address is in the wrong format!", "validation.password.required": "Please enter your password!", diff --git a/web-app/src/assets/i18n/zh-CN.json b/web-app/src/assets/i18n/zh-CN.json index ed34dc9709d..0becf17f9bc 100644 --- a/web-app/src/assets/i18n/zh-CN.json +++ b/web-app/src/assets/i18n/zh-CN.json @@ -56,11 +56,6 @@ "description.tip": "更多标识和描述此监控的备注信息", "intervals": "采集间隔(秒)", "intervals.tip": "监控周期性采集数据间隔时间,单位秒", - "collector": "采集器", - "collector.tip": "配置此监控使用哪台采集器调度采集", - "collector.system.default": "默认系统调度", - "collector.status.online": "在线", - "collector.status.offline": "离线", "category": { "": "监控类别", "service": "应用服务", @@ -122,10 +117,6 @@ "alert.setting.rule.operator": "运算符", "alert.setting.rule.operator.str-equals": "等于", "alert.setting.rule.operator.str-no-equals": "不等于", - "alert.setting.rule.operator.str-contains": "包含", - "alert.setting.rule.operator.str-no-contains": "不包含", - "alert.setting.rule.operator.str-matches": "匹配", - "alert.setting.rule.operator.str-no-matches": "不匹配", "alert.setting.rule.string-value.place-holder": "请输入匹配字符串", "alert.setting.rule.numeric-value.place-holder": "请输入匹配数值", "alert.setting.times": "触发次数", @@ -205,6 +196,16 @@ "alert.center.confirm.mark-done": "请确认是否标记已处理!", "alert.center.confirm.mark-no-batch": "请确认是否批量标记未处理!", "alert.center.confirm.mark-no": "请确认是否标记未处理!", + "alert.help.notice": "此模块用于指定告警通知的接收人以及接收方式,使得阈值触发后发送告警信息,通过指定方式通知到接收人(目前支持邮箱、钉钉、微信,Webhook等),点击查看具体配置步骤
⚠\uFE0F注意:配置“新增接收人后”,您还需要配置“新增通知策略”来指定哪些消息发给哪些接收人,点击查看可能遇见的问题。", + "alert.help.notice.link":"https://hertzbeat.com/zh-cn/docs/help/alert_threshold", + "alert.help.converge": "设置告警收敛后,Hertzbeat 会根据您的收敛策略降低指定告警信息的规模来解决可能出现的重复告警问题。", + "alert.help.converge.link":"https://aiops.com/news/post/28195.html", + "alert.help.center": "在此处可查看由设定告警阈值触发的告警消息。", + "alert.help.center.link":"https://hertzbeat.com/zh-cn/docs/help/guide", + "alert.help.setting": "点击“新增阈值”对监控指标进行告警阈值配置,系统将根据配置和采集指标数据计算触发告警。您也可以根据需要修改已有配置,如需进行阈值关联监控,请先关闭全局默认。
注意⚠\uFE0F: 配置完毕后,已经被成功触发的告警信息可以在【告警中心】中查看,您也可以在【消息通知】中设置告警信息的通知方式以及通知人员。", + "alert.help.setting.link":"https://hertzbeat.com/zh-cn/docs/help/alert_threshold", + "alert.help.silence": "您可以点击”新增静默策略“,设置指定时间段内关闭所有的告警通知,或者选择已绑定的标签来关闭指定的监控告警。在设定的时间段内,您将不会收到相应的告警通知。", + "alert.help.silence.link":"https://hertzbeat.com/zh-cn/docs/help/alert_threshold", "alert.notice.receiver": "消息接收人", "alert.notice.receiver.new": "新增接收人", "alert.notice.receiver.edit": "编辑接收人", @@ -285,6 +286,8 @@ "dashboard.monitors.sub-title": "监控类型纳管数量分布", "dashboard.monitors.formatter": "个监控 占比", "dashboard.monitors.distribute": "纳管数量分布", + "menu.link.question": "常见问题", + "menu.link.guild": "使用指南", "monitors.list": "监控列表", "monitors.spinning-tip.detecting": "测试连接可用性", "monitors.new": "新增", @@ -432,6 +435,10 @@ "tag.display": "效果", "tag.bind": "绑定标签", "tag.bind.tip": "您可以使用标签(Tag)进行监控资源的分类管理, 例如给资源分别绑定生产环境、测试环境的标签。", + "tag.help": "在此处生成的标签可在生成监控时进行绑定(例如生成 JVM 虚拟机监控时绑定“功能:开发项目1”)。您可以使用生成的标签(Tag)对监控资源进行分类管理,例如给资源分别绑定生产环境、测试环境的标签。", + "tag.help.link": "https://hertzbeat.com/zh-cn/docs/", + "define.help": "HertzBeat 支持自定义监控,您可以根据自身需求在下拉菜单中选择已有监控模板进行修改。右下区域为编辑区,在这里输入您的 YML 数据,左下区域为对照区。
您也可以点击“新增监控类型”来定义新的的监控类型,目前支持 HTTP 协议JDBC协议SSH协议 JMX 协议 SNMP 协议点击查看监控模板。\n", + "define.help.link": "https://hertzbeat.com/zh-cn/docs/advanced/extend-point/", "define.save-apply": "保存并应用", "define.delete": "删除监控类型", "define.delete.confirm": "请确认是否删除 {{app}} 监控类型? 删除后无法添加此类监控。", @@ -444,21 +451,6 @@ "settings.server.email.setting": "配置邮件服务器", "settings.server.sms": "短信服务器", "settings.server.sms.setting": "配置短信服务器", - "settings.system-config": "系统配置", - "settings.system-config.locale": "系统语言", - "settings.system-config.locale.zh_CN": "简体中文(zh_CN)", - "settings.system-config.locale.zh_TW": "繁体中文(zh_TW)", - "settings.system-config.locale.en_US": "英语(en_US)", - "settings.system-config.timezone": "系统时区", - "settings.system-config.ok": "确认更新", - "collector": "采集器", - "collector.status": "运行状态", - "collector.task": "任务数量", - "collector.start-time": "启动时间", - "collector.ip": "IP地址", - "collector.node": "节点名称", - "collector.pinned": "固定任务", - "collector.dispatched": "调度任务", "validation.email.required": "请输入邮箱地址!", "validation.email.wrong-format": "邮箱地址格式错误!", "validation.email.invalid": "无效的邮箱地址!", From fd37d30f3f1641f50700cad3d7c602f0439efa74 Mon Sep 17 00:00:00 2001 From: Yuting Nie Date: Sun, 20 Aug 2023 12:02:51 +0800 Subject: [PATCH 2/5] Update help massage component functions Signed-off-by: Yuting Nie --- .../hertzbeat/common/entity/job/Job.java | 1 + .../hertzbeat/manager/service/AppService.java | 2 - .../manager/service/impl/AppServiceImpl.java | 46 ++++++++++------ .../main/resources/define/app-activemq.yml | 8 +++ .../src/main/resources/define/app-airflow.yml | 8 +++ .../main/resources/define/app-almalinux.yml | 8 +++ manager/src/main/resources/define/app-api.yml | 8 +++ .../main/resources/define/app-api_code.yml | 8 +++ .../src/main/resources/define/app-centos.yml | 8 +++ .../resources/define/app-cisco_switch.yml | 8 +++ .../main/resources/define/app-clickhouse.yml | 8 +++ .../src/main/resources/define/app-coreos.yml | 8 +++ .../src/main/resources/define/app-debian.yml | 8 +++ manager/src/main/resources/define/app-dm.yml | 8 +++ .../src/main/resources/define/app-docker.yml | 8 +++ .../main/resources/define/app-doris_be.yml | 8 +++ .../main/resources/define/app-doris_fe.yml | 8 +++ .../main/resources/define/app-dynamic_tp.yml | 8 +++ .../resources/define/app-elasticsearch.yml | 8 +++ .../src/main/resources/define/app-euleros.yml | 8 +++ .../src/main/resources/define/app-flink.yml | 8 +++ .../src/main/resources/define/app-freebsd.yml | 8 +++ manager/src/main/resources/define/app-ftp.yml | 8 +++ .../main/resources/define/app-fullsite.yml | 8 +++ .../main/resources/define/app-h3c_switch.yml | 8 +++ .../src/main/resources/define/app-hadoop.yml | 8 +++ .../main/resources/define/app-hertzbeat.yml | 8 +++ .../resources/define/app-hertzbeat_token.yml | 8 +++ .../main/resources/define/app-hpe_switch.yml | 8 +++ .../resources/define/app-huawei_switch.yml | 8 +++ .../resources/define/app-influxdb_promql.yml | 8 +++ .../src/main/resources/define/app-iotdb.yml | 8 +++ .../src/main/resources/define/app-jetty.yml | 8 +++ manager/src/main/resources/define/app-jvm.yml | 8 +++ .../src/main/resources/define/app-kafka.yml | 8 +++ .../resources/define/app-kafka_promql.yml | 8 +++ .../main/resources/define/app-kubernetes.yml | 8 +++ .../src/main/resources/define/app-linux.yml | 8 +++ .../src/main/resources/define/app-mariadb.yml | 8 +++ .../src/main/resources/define/app-mongodb.yml | 8 +++ .../src/main/resources/define/app-mysql.yml | 8 +++ .../src/main/resources/define/app-nacos.yml | 8 +++ .../main/resources/define/app-opengauss.yml | 8 +++ .../main/resources/define/app-opensuse.yml | 8 +++ .../src/main/resources/define/app-oracle.yml | 8 +++ .../src/main/resources/define/app-ping.yml | 8 +++ .../src/main/resources/define/app-port.yml | 8 +++ .../main/resources/define/app-postgresql.yml | 8 +++ .../main/resources/define/app-rabbitmq.yml | 8 +++ .../src/main/resources/define/app-redhat.yml | 8 +++ .../src/main/resources/define/app-redis.yml | 8 +++ .../resources/define/app-redis_cluster.yml | 8 +++ .../resources/define/app-redis_sentinel.yml | 8 +++ .../main/resources/define/app-rocketmq.yml | 8 +++ .../main/resources/define/app-rockylinux.yml | 8 +++ .../src/main/resources/define/app-shenyu.yml | 8 +++ .../src/main/resources/define/app-spark.yml | 8 +++ .../main/resources/define/app-springboot2.yml | 8 +++ .../main/resources/define/app-springboot3.yml | 8 +++ .../main/resources/define/app-sqlserver.yml | 8 +++ .../main/resources/define/app-ssl_cert.yml | 8 +++ .../src/main/resources/define/app-tomcat.yml | 8 +++ .../resources/define/app-tplink_switch.yml | 8 +++ .../src/main/resources/define/app-ubuntu.yml | 8 +++ .../src/main/resources/define/app-website.yml | 8 +++ .../src/main/resources/define/app-windows.yml | 8 +++ .../main/resources/define/app-zookeeper.yml | 8 +++ .../alert-center/alert-center.component.html | 1 + .../alert-converge.component.html | 1 + .../alert-notice/alert-notice.component.html | 1 + .../alert-setting.component.html | 1 + .../alert-silence.component.html | 1 + .../monitor-list/monitor-list.component.html | 53 ++++--------------- .../setting/define/define.component.html | 1 + .../routes/setting/tags/tags.component.html | 1 + .../help-massage-show.component.html | 12 +++-- .../help-massage-show.component.less | 2 +- .../help-massage-show.component.ts | 2 + web-app/src/assets/i18n/en-US.json | 11 ++-- web-app/src/assets/i18n/zh-CN.json | 13 +++-- 80 files changed, 586 insertions(+), 75 deletions(-) diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/Job.java b/common/src/main/java/org/dromara/hertzbeat/common/entity/job/Job.java index 4646bf34e39..fc89a070761 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/Job.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/entity/job/Job.java @@ -84,6 +84,7 @@ public class Job { * en-US: PING CONNECT - You can use the IP address or domain address of the peer service to monitor the PING connectivity between the local network and the peer network. */ private Map help; + private Map helpLink; /** * Task dispatch start timestamp * 任务派发开始时间戳 diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/service/AppService.java b/manager/src/main/java/org/dromara/hertzbeat/manager/service/AppService.java index a155fe92a0d..1042148669d 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/service/AppService.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/service/AppService.java @@ -100,8 +100,6 @@ public interface AppService { */ void applyMonitorDefineYml(String ymlContent, boolean isModify); - void applyMonitorDefineYml(String ymlContent); - /** * delete monitor define yml * @param app app diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/AppServiceImpl.java b/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/AppServiceImpl.java index 6d5a1c32e5a..6d58170066e 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/AppServiceImpl.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/AppServiceImpl.java @@ -132,6 +132,15 @@ public Map getI18nResources(String lang) { i18nMap.put("monitor.app." + job.getApp() + ".help", i18nHelp); } } + + Map helpLink = job.getHelpLink(); + if (helpLink != null && !helpLink.isEmpty()) { + String i18nHelp = Optional.ofNullable(helpLink.get(lang)).orElse(helpLink.values().stream().findFirst().orElse(null)); + if (i18nHelp != null) { + i18nMap.put("monitor.app." + job.getApp() + ".helpLink", i18nHelp); + } + } + for (ParamDefine paramDefine : job.getParams()) { Map paramDefineName = paramDefine.getName(); if (paramDefineName != null && !paramDefineName.isEmpty()) { @@ -229,11 +238,6 @@ public String getMonitorDefineFileContent(String app) { @Override public void applyMonitorDefineYml(String ymlContent, boolean isModify) { - - } - - @Override - public void applyMonitorDefineYml(String ymlContent) { Yaml yaml = new Yaml(); Job app; try { @@ -243,7 +247,7 @@ public void applyMonitorDefineYml(String ymlContent) { throw new IllegalArgumentException("parse yml define error: " + e.getMessage()); } // app params verify - verifyDefineAppContent(app); + verifyDefineAppContent(app, isModify); String classpath = Objects.requireNonNull(this.getClass().getClassLoader().getResource("")).getPath(); String defineAppPath = classpath + "define" + File.separator + "app-" + app.getApp() + ".yml"; File defineAppFile = new File(defineAppPath); @@ -259,17 +263,21 @@ public void applyMonitorDefineYml(String ymlContent) { SpringContextHolder.getBean(MonitorService.class).updateAppCollectJob(app); } - private void verifyDefineAppContent(Job app) { - Assert.notNull(app, "define yml can not null"); - Assert.notNull(app.getApp(), "define yml require attributes app"); - Assert.notNull(app.getCategory(), "define yml require attributes category"); - Assert.notEmpty(app.getName(), "define yml require attributes name"); - Assert.notEmpty(app.getParams(), "define yml require attributes params"); + private void verifyDefineAppContent(Job app, boolean isModify) { + Assert.notNull(app, "monitoring template can not null"); + Assert.notNull(app.getApp(), "monitoring template require attributes app"); + Assert.notNull(app.getCategory(), "monitoring template require attributes category"); + Assert.notEmpty(app.getName(), "monitoring template require attributes name"); + Assert.notEmpty(app.getParams(), "monitoring template require attributes params"); boolean hasParamHost = app.getParams().stream().anyMatch(item -> "host".equals(item.getField())); - Assert.isTrue(hasParamHost, "define yml attributes params must have param host"); - Assert.notEmpty(app.getMetrics(), "define yml require attributes metrics"); + Assert.isTrue(hasParamHost, "monitoring template attributes params must have param host"); + Assert.notEmpty(app.getMetrics(), "monitoring template require attributes metrics"); boolean hasAvailableMetrics = app.getMetrics().stream().anyMatch(item -> item.getPriority() == 0); - Assert.isTrue(hasAvailableMetrics, "define yml metrics list must have one priority 0 metrics"); + Assert.isTrue(hasAvailableMetrics, "monitoring template metrics list must have one priority 0 metrics"); + if (!isModify) { + Assert.isNull(appDefines.get(app.getApp().toLowerCase()), + "monitoring template name " + app.getApp() + " already exists."); + } } @Override @@ -329,6 +337,7 @@ public void run(String... args) throws Exception { inputStream.close(); } catch (Exception e) { log.error(e.getMessage(), e); + log.error("Ignore this template file: {}.", resource.getFilename()); } } } catch (Exception e) { @@ -340,6 +349,11 @@ public void run(String... args) throws Exception { log.info("load define path {}", defineAppPath); for (File appFile : Objects.requireNonNull(directory.listFiles())) { if (appFile.exists() && appFile.isFile()) { + if (appFile.isHidden() + || (!appFile.getName().endsWith("yml") && !appFile.getName().endsWith("yaml"))) { + log.error("Ignore this template file: {}.", appFile.getName()); + continue; + } try (FileInputStream fileInputStream = new FileInputStream(appFile)) { Job app = yaml.loadAs(fileInputStream, Job.class); if (app != null) { @@ -347,7 +361,7 @@ public void run(String... args) throws Exception { } } catch (IOException e) { log.error(e.getMessage(), e); - throw e; + log.error("Ignore this template file: {}.", appFile.getName()); } } } diff --git a/manager/src/main/resources/define/app-activemq.yml b/manager/src/main/resources/define/app-activemq.yml index f84d7d4aa73..f514e140a2b 100644 --- a/manager/src/main/resources/define/app-activemq.yml +++ b/manager/src/main/resources/define/app-activemq.yml @@ -24,6 +24,14 @@ app: activemq name: zh-CN: ActiveMQ消息系统 en-US: ActiveMQ Message +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: HertzBeat 使用 JMX 协议 对 Apache ActiveMQ 消息中间件的运行状态,节点,Topic等相关指标(broker、topic、memory pool、class loading、thread)进行监测。
⚠️注意:您需要在 ActiveMQ 开启 JMX 服务。点击查看开启步骤 + en-US: "HertzBeat uses JMX protocol to monitor the running status, nodes, topics, and other indicators of Apache ActiveMQ message-oriented middleware.
⚠️Note: You should enable the JMX service in ActiveMQ. Click here to view the specific steps." +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/activemq + en-US: https://hertzbeat.com/docs/help/activemq # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-airflow.yml b/manager/src/main/resources/define/app-airflow.yml index ec661bbd951..976ee91fe3f 100644 --- a/manager/src/main/resources/define/app-airflow.yml +++ b/manager/src/main/resources/define/app-airflow.yml @@ -24,6 +24,14 @@ app: airflow name: zh-CN: Apache Airflow en-US: Apache Airflow +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: Hertzbeat 对 Apache Airflow 通用性能指标(airflow health、airflow version)进行采集监控。
您可以点击“新建 Apache Airflow ”并进行配置,或者选择“更多操作”,导入已有配置。 + en-US: HertzBeat monitors Apache Airflow through general performance indicators such as airflow health and airflow version. You could click the "New Apache Airflow" button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/airflow/ + en-US: https://hertzbeat.com/docs/help/airflow/ # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-almalinux.yml b/manager/src/main/resources/define/app-almalinux.yml index cef4ff6bdfe..53ad36ffd8d 100644 --- a/manager/src/main/resources/define/app-almalinux.yml +++ b/manager/src/main/resources/define/app-almalinux.yml @@ -24,6 +24,14 @@ app: almalinux name: zh-CN: AlmaLinux en-US: AlmaLinux +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: Hertzbeat 对 AlmaLinux 通用性能指标进行采集监控。
您可以点击“新建 AlmaLinux ”并进行配置,或者选择“更多操作”,导入已有配置。 + en-US: HertzBeat monitors AlmaLinux through general performance indicators such as airflow health and airflow version. You could click the "New AlmaLinux" button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/almalinux + en-US: https://hertzbeat.com/docs/help/almalinux # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-api.yml b/manager/src/main/resources/define/app-api.yml index 896fcb48728..82aaa050505 100644 --- a/manager/src/main/resources/define/app-api.yml +++ b/manager/src/main/resources/define/app-api.yml @@ -22,6 +22,14 @@ app: api name: zh-CN: HTTP API en-US: HTTP API +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: Hertzbeat 将调用HTTP API接口,查看接口是否可用,并以ms为指标单位对其响应时间等指标进行监测。您可以先点击“新增 HTTP API”按钮并进行配置,或在“更多操作”中导入已有配置。 + en-US: The platform will invoke an HTTP API endpoint to verify its accessibility and monitor various metrics, including response time, measured in milliseconds (ms).
To set up this functionality, you could click the "Add HTTP API" button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/api + en-US: https://hertzbeat.com/docs/help/api # app api所需输入参数定义(根据定义渲染页面UI) # Input params define for app api(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-api_code.yml b/manager/src/main/resources/define/app-api_code.yml index e7ceceea011..26191f47923 100644 --- a/manager/src/main/resources/define/app-api_code.yml +++ b/manager/src/main/resources/define/app-api_code.yml @@ -23,6 +23,14 @@ app: api_code name: zh-CN: API Code en-US: API Code +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: Hertzbeat 对 api 返回的状态码进行监控。
您可以点击 “新建 API Code” 并进行配置,或者选择“更多操作”,导入已有配置。 + en-US: Hertzbeat monitors the status codes which returned by the API. You could click the "New API Codes" button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/api_code + en-US: https://hertzbeat.com/docs/help/api_code # app api所需输入参数定义(根据定义渲染页面UI) # Input params define for app api(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-centos.yml b/manager/src/main/resources/define/app-centos.yml index 73a614eab0b..6ad6986d018 100644 --- a/manager/src/main/resources/define/app-centos.yml +++ b/manager/src/main/resources/define/app-centos.yml @@ -24,6 +24,14 @@ app: centos name: zh-CN: Centos Linux en-US: Centos Linux +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: HertzBeat 对 CentOS 操作系统的通用性能指标(basic、cpu、memory、disk、interface、disk_free)进行采集监控。
您可以点击“新建 CentOS 操作系统”并进行配置,或者选择“更多操作”,导入已有配置。 + en-US: HertzBeat monitors CentOS operating system through general performance indicators such as cpu and memory. You could click the "New CentOS" button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/centos/ + en-US: https://hertzbeat.com/docs/help/centos/ # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-cisco_switch.yml b/manager/src/main/resources/define/app-cisco_switch.yml index a236643f78f..c9f7bb2c8b8 100644 --- a/manager/src/main/resources/define/app-cisco_switch.yml +++ b/manager/src/main/resources/define/app-cisco_switch.yml @@ -24,6 +24,14 @@ app: cisco_switch name: zh-CN: Cisco通用交换机 en-US: Cisco Switch +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: Hertzbeat 对 cisco switch 的通用指标进行测量监控。
您可以点击 “新建 Cisco Switch” 并进行配置,或者选择“更多操作”,导入已有配置。 + en-US: Hertzbeat monitors the status codes which returned by the API. You could click the "New Cisco Switch" button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/cisco_switch + en-US: https://hertzbeat.com/docs/help/cisco_switch # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-clickhouse.yml b/manager/src/main/resources/define/app-clickhouse.yml index cb6d6b25b2c..10dbbe517df 100644 --- a/manager/src/main/resources/define/app-clickhouse.yml +++ b/manager/src/main/resources/define/app-clickhouse.yml @@ -24,6 +24,14 @@ app: clickhouse name: zh-CN: ClickHouse数据库 en-US: ClickHouse DB +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: Hertzbeat 对 ClickHouse 数据库监控通用指标进行测量监控。
您可以点击 “新建 ClickHouse 数据库” 并进行配置,或者选择“更多操作”,导入已有配置。 + en-US: Hertzbeat monitors the status codes which returned by the API. You could click the "New ClickHouse Database" button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/clickhouse + en-US: https://hertzbeat.com/docs/help/clickhouse # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-coreos.yml b/manager/src/main/resources/define/app-coreos.yml index c1d45f7d8b9..be1b01d3038 100644 --- a/manager/src/main/resources/define/app-coreos.yml +++ b/manager/src/main/resources/define/app-coreos.yml @@ -24,6 +24,14 @@ app: coreos name: zh-CN: Fedora CoreOS en-US: Fedora CoreOS +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: Hertzbeat 对 Fedora CoreOS 数据库通用指标进行测量监控。
您可以点击 “新建 Fedora CoreOS” 并进行配置,或者选择“更多操作”,导入已有配置。 + en-US: Hertzbeat monitors Fedora CoreOS through general performance indicator. You could click the "New Fedora CoreOS" button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/coreos + en-US: https://hertzbeat.com/docs/help/coreos # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-debian.yml b/manager/src/main/resources/define/app-debian.yml index 11bc515da95..2463dadb6b7 100644 --- a/manager/src/main/resources/define/app-debian.yml +++ b/manager/src/main/resources/define/app-debian.yml @@ -24,6 +24,14 @@ app: debian name: zh-CN: Debian操作系统 en-US: Debian Linux +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: Hertzbeat 对 Debian 操作系统的通用指标进行测量监控。
您可以点击 “新建 Debian 操作系统监控” 并进行配置,或者选择“更多操作”,导入已有配置。 + en-US: Hertzbeat monitors Debian operating system through general performance indicator. You could click the "New Debian Linux Monitor" button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/debian + en-US: https://hertzbeat.com/docs/help/debian # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-dm.yml b/manager/src/main/resources/define/app-dm.yml index 57b62b84f3f..649b5b69d00 100644 --- a/manager/src/main/resources/define/app-dm.yml +++ b/manager/src/main/resources/define/app-dm.yml @@ -24,6 +24,14 @@ app: dm name: zh-CN: 达梦数据库 en-US: DM DB +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: HertzBeat 对 DM 达梦数据库的通用性能指标(basic、status、thread)进行采集监控,支持版本为 DM8+。
您可以点击“新建 达梦数据库”并进行配置,或者选择“更多操作”,导入已有配置。 + en-US: HertzBeat monitors DM database through basic performance indicators such as status and thread, the version we support is DM8+. You could click the "New DM" button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/dm + en-US: https://hertzbeat.com/docs/help/dm # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-docker.yml b/manager/src/main/resources/define/app-docker.yml index f82bbc20356..fb0fe0e6085 100644 --- a/manager/src/main/resources/define/app-docker.yml +++ b/manager/src/main/resources/define/app-docker.yml @@ -24,6 +24,14 @@ app: docker name: zh-CN: Docker en-US: Docker +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: HertzBeat 对 Docker 容器的通用性能指标(system、containers、stats)进行采集监控
⚠️注意:为了监控 Docker 中的容器信息,您需要打开端口,让采集请求获取到对应的信息, 点击查看开启步骤 + en-US: "HertzBeat monitors Docker through general performance indicators such as containers, status,
⚠️Note: In order to monitor container information of Docker, you need to enable the port so that the collection request can obtain the corresponding information.Click here to view the specific steps." +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/docker/ + en-US: https://hertzbeat.com/docs/help/docker/ # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-doris_be.yml b/manager/src/main/resources/define/app-doris_be.yml index 93b0e017507..19cc3e7d2e0 100644 --- a/manager/src/main/resources/define/app-doris_be.yml +++ b/manager/src/main/resources/define/app-doris_be.yml @@ -22,6 +22,14 @@ app: doris_be name: zh-CN: Doris 数据库BE en-US: Doris DatabaseBE +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: Hertzbeat 对 DORIS 数据库FE的通用性能指标(load channel count、memtable flush total、process thread num、light work max threads等)进行采集监控,支持版本为DORIS2.0.0。
您可以点击 “新建 Doris DatabaseBE” 并进行配置,或者选择“更多操作”,导入已有配置。 + en-US: Hertzbeat monitors Doris DatabaseBE through general performance indicator such as load channel count, memtable flush total, process thread num and light work max threads. The version we support is DORIS2.0.0. You could click the "New Doris DatabaseBE Monitor" button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/doris_be/ + en-US: https://hertzbeat.com/docs/help/doris_be/ # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-doris_fe.yml b/manager/src/main/resources/define/app-doris_fe.yml index 77e63af6f5c..1886b8e6a1c 100644 --- a/manager/src/main/resources/define/app-doris_fe.yml +++ b/manager/src/main/resources/define/app-doris_fe.yml @@ -22,6 +22,14 @@ app: doris_fe name: zh-CN: Doris 数据库FE en-US: Doris DatabaseFE +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: Hertzbeat 对 Doris 数据库FE的通用指标(doris_fe connection total、doris_fe edit log clean、doris_fe image、doris_fe rps等)进行测量监控,支持版本为DORIS2.0.0。
您可以点击 “新建 Doris DatabaseFE” 并进行配置,或者选择“更多操作”,导入已有配置。 + en-US: Hertzbeat monitors Doris DatabaseFE through general performance indicator such as doris_fe connection total, doris_fe edit log clean, doris_fe image and doris_fe rps. The version we support is DORIS2.0.0. You could click the "New Doris DatabaseFE Monitor" button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/doris_fe/ + en-US: https://hertzbeat.com/docs/help/doris_fe/ # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-dynamic_tp.yml b/manager/src/main/resources/define/app-dynamic_tp.yml index f8913007fe6..ff23a431900 100644 --- a/manager/src/main/resources/define/app-dynamic_tp.yml +++ b/manager/src/main/resources/define/app-dynamic_tp.yml @@ -24,6 +24,14 @@ app: dynamic_tp name: zh-CN: DynamicTp线程池 en-US: DynamicTp Pool +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: HertzBeat 对 DynamicTp actuator 暴露的线程池性能指标(thread pool)进行采集监控。
⚠️注意:您需要集成使用 DynamicTp,点击查看集成步骤。 + en-US: "HertzBeat monitors DynamicTp through the thread Pool Performance Metrics which exposed by DynamicTp actuator.
⚠️Note: You should integrate and use DynamicTp, Click here to view the specific steps." +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/dynamic_tp/ + en-US: https://hertzbeat.com/docs/help/dynamic_tp/ # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-elasticsearch.yml b/manager/src/main/resources/define/app-elasticsearch.yml index 075c3e78253..65a2813ff66 100644 --- a/manager/src/main/resources/define/app-elasticsearch.yml +++ b/manager/src/main/resources/define/app-elasticsearch.yml @@ -24,6 +24,14 @@ app: elasticsearch name: zh-CN: ElasticSearch en-US: ElasticSearch +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: Hertzbeat 对 ElasticSearch 数据库监控通用指标进行测量监控。
您可以点击 “新建 ElasticSearch” 并进行配置,或者选择“更多操作”,导入已有配置。 + en-US: Hertzbeat monitors ElasticSearch through general performance indicator. You could click the "New ElasticSearch" button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/elasticsearch + en-US: https://hertzbeat.com/docs/help/elasticsearch # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-euleros.yml b/manager/src/main/resources/define/app-euleros.yml index db5d4f92a01..96fb52bdee3 100644 --- a/manager/src/main/resources/define/app-euleros.yml +++ b/manager/src/main/resources/define/app-euleros.yml @@ -24,6 +24,14 @@ app: euleros name: zh-CN: EulerOS操作系统 en-US: EulerOS +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: Hertzbeat 对 EulerOS 操作系统通用指标进行测量监控。
您可以点击 “新建 EulerOS” 并进行配置,或者选择“更多操作”,导入已有配置。 + en-US: Hertzbeat monitors EulerOS operating system through general performance indicator. You could click the "New EulerOS" button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/euleros + en-US: https://hertzbeat.com/docs/help/euleros # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-flink.yml b/manager/src/main/resources/define/app-flink.yml index 36ee4b0a411..5a653ccc341 100644 --- a/manager/src/main/resources/define/app-flink.yml +++ b/manager/src/main/resources/define/app-flink.yml @@ -24,6 +24,14 @@ app: flink name: zh-CN: Flink流引擎 en-US: Flink Stream +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: Hertzbeat 对 Flink流引擎的通用指标进行测量监控。
您可以点击 “新建 Flink流引擎” 并进行配置,或者选择“更多操作”,导入已有配置。 + en-US: Hertzbeat monitors Flink Stream through general performance indicator. You could click the "New Flink Stream" button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/flink + en-US: https://hertzbeat.com/docs/help/flink # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-freebsd.yml b/manager/src/main/resources/define/app-freebsd.yml index fdc9cf53cf1..5a2556bcedf 100644 --- a/manager/src/main/resources/define/app-freebsd.yml +++ b/manager/src/main/resources/define/app-freebsd.yml @@ -24,6 +24,14 @@ app: freebsd name: zh-CN: FreeBSD操作系统 en-US: OS FreeBSD +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: Hertzbeat 对 FreeBSD 操作系统通用指标进行测量监控。
您可以点击 “新建 EulerOS” 并进行配置,或者选择“更多操作”,导入已有配置。 + en-US: Hertzbeat monitors FreeBSD operating system through general performance indicator. You could click the "New FreeBSD" button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn//docs/help/freebsd + en-US: https://hertzbeat.com/docs/help/freebsd # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-ftp.yml b/manager/src/main/resources/define/app-ftp.yml index ea570738908..348a4cd5665 100644 --- a/manager/src/main/resources/define/app-ftp.yml +++ b/manager/src/main/resources/define/app-ftp.yml @@ -24,6 +24,14 @@ app: ftp name: zh-CN: FTP服务器 en-US: FTP Server +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: Hertzbeat 对 FTP 服务器的通用指标进行测量监控。
您可以点击 “新建 FTP服务器” 并进行配置,或者选择“更多操作”,导入已有配置。 + en-US: Hertzbeat monitors FTP server through general performance indicator. You could click the "New FTP server" button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/ftp + en-US: https://hertzbeat.com/docs/help/ftp # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-fullsite.yml b/manager/src/main/resources/define/app-fullsite.yml index e18dd387e6d..d2394ed099f 100644 --- a/manager/src/main/resources/define/app-fullsite.yml +++ b/manager/src/main/resources/define/app-fullsite.yml @@ -24,6 +24,14 @@ app: fullsite name: zh-CN: SiteMap全站 en-US: SITE MAP +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: HertzBeat 对网站全部页面的 URL 路径、HTTP 状态码、响应时间及请求反馈进行监测。由于一个网站可能有多个不同服务提供的页面,系统将采集网站暴露的网站地图(SiteMap)来监控全站。⚠️注意:此功能需要您的网站支持 XML 和 TXT 格式的 SiteMap。 + en-US: "HertzBeat monitors all pages of website by URL path, HTTP status code, response times and request feedback. Due to the possibility that a website may have multiple pages provided by different services, Hertzbeat will collect SiteMap which exposed by the website to monitor the entire site. ⚠️Note: HertzBeat support SiteMap in XML or TXT format." +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/guide/ + en-US: https://hertzbeat.com/docs/help/guide/ # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-h3c_switch.yml b/manager/src/main/resources/define/app-h3c_switch.yml index f7d5c4d81ba..3b63c7fec3c 100644 --- a/manager/src/main/resources/define/app-h3c_switch.yml +++ b/manager/src/main/resources/define/app-h3c_switch.yml @@ -24,6 +24,14 @@ app: h3c_switch name: zh-CN: 华三通用交换机 en-US: H3C Switch +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: Hertzbeat 对 华三通用交换机的通用指标进行测量监控。
您可以点击 “新建 华三通用交换机” 并进行配置,或者选择“更多操作”,导入已有配置。 + en-US: Hertzbeat monitors H3C Switch through general performance indicator. You could click the "New H3C Switch" button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/h3c_switch + en-US: https://hertzbeat.com/docs/help/h3c_switch # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-hadoop.yml b/manager/src/main/resources/define/app-hadoop.yml index 8cc793e5539..8789a029598 100644 --- a/manager/src/main/resources/define/app-hadoop.yml +++ b/manager/src/main/resources/define/app-hadoop.yml @@ -24,6 +24,14 @@ app: hadoop name: zh-CN: Hadoop en-US: Hadoop +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: HertzBeat 使用 JMX 协议对 Hadoop 的 JVM 虚拟机的通用性能指标(memory pool,限JDK8及以下的code cache、class loading、thread)进行采集监控。
⚠️注意:您需要在 Hadoop 应用开启 JMX 服务, 点击查看开启步骤 + en-US: "HertzBeat monitors general performance indicators(memory pool, class loading, thread) of Hadoop VMware through JMX protocol.
⚠️Note: You should enable the JMX service in Hadoop application, and the indicator of code cache is only available to JDK8 and below.Click here to view the specific steps." +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/hadoop/ + en-US: https://hertzbeat.com/docs/help/hadoop/ # Input params define for monitoring(render web ui by the definition) # 监控所需输入参数定义(根据定义渲染页面UI) params: diff --git a/manager/src/main/resources/define/app-hertzbeat.yml b/manager/src/main/resources/define/app-hertzbeat.yml index d909fcd4c05..3c28109e547 100644 --- a/manager/src/main/resources/define/app-hertzbeat.yml +++ b/manager/src/main/resources/define/app-hertzbeat.yml @@ -22,6 +22,14 @@ app: hertzbeat name: zh-CN: HertzBeat监控系统 en-US: HertzBeat Monitor +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: Hertzbeat 对 Hertzbeat 监控系统的通用指标进行测量监控。
您可以点击 “新建 HertzBeat监控系统” 并进行配置,或者选择“更多操作”,导入已有配置。 + en-US: Hertzbeat monitors HertzBeat Monitor through general performance indicator. You could click the "New HertzBeat Monitor" button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/hertzbeat + en-US: https://hertzbeat.com/docs/help/hertzbeat params: - field: host name: diff --git a/manager/src/main/resources/define/app-hertzbeat_token.yml b/manager/src/main/resources/define/app-hertzbeat_token.yml index cea0cb365fd..809ae585f66 100644 --- a/manager/src/main/resources/define/app-hertzbeat_token.yml +++ b/manager/src/main/resources/define/app-hertzbeat_token.yml @@ -25,6 +25,14 @@ app: hertzbeat_token name: zh-CN: HertzBeat监控(Token) en-US: HertzBeat Monitor(Token) +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: Hertzbeat 对 HertzBeat监控(Token)进行测量监控。
您可以点击 “新建 HertzBeat监控(Token)” 并进行配置,或者选择“更多操作”,导入已有配置。 + en-US: Hertzbeat monitors HertzBeat Monitor(Token). You could click the "New HertzBeat Monitor(Token)" button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/hertzbeat_token + en-US: https://hertzbeat.com/docs/help/hertzbeat_token # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-hpe_switch.yml b/manager/src/main/resources/define/app-hpe_switch.yml index 330e2efb086..b5af195bb92 100644 --- a/manager/src/main/resources/define/app-hpe_switch.yml +++ b/manager/src/main/resources/define/app-hpe_switch.yml @@ -24,6 +24,14 @@ app: hpe_switch name: zh-CN: HPE通用交换机 en-US: HPE Switch +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: Hertzbeat 对 HPE 通用交换机的通用指标进行测量监控。
您可以点击 “新建 HPE通用交换机” 并进行配置,或者选择“更多操作”,导入已有配置。 + en-US: Hertzbeat monitors HPE Switch through general performance indicator. You could click the "New HPE Switch" button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/hpe_switch + en-US: https://hertzbeat.com/docs/help/hpe_switch # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-huawei_switch.yml b/manager/src/main/resources/define/app-huawei_switch.yml index 43be2ebe54e..5008ac78892 100644 --- a/manager/src/main/resources/define/app-huawei_switch.yml +++ b/manager/src/main/resources/define/app-huawei_switch.yml @@ -24,6 +24,14 @@ app: huawei_switch name: zh-CN: Huawei通用交换机 en-US: Huawei Switch +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: Hertzbeat 对 Huawei 通用交换机的通用指标进行测量监控。
您可以点击 “新建 Huawei通用交换机” 并进行配置,或者选择“更多操作”,导入已有配置。 + en-US: Hertzbeat monitors Huawei Switch through general performance indicator. You could click the "New Huawei Switch" button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/huawei_switch + en-US: https://hertzbeat.com/docs/help/huawei_switch # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-influxdb_promql.yml b/manager/src/main/resources/define/app-influxdb_promql.yml index 22dd95fb45e..77f6912c5b2 100644 --- a/manager/src/main/resources/define/app-influxdb_promql.yml +++ b/manager/src/main/resources/define/app-influxdb_promql.yml @@ -7,6 +7,14 @@ app: influxdb_promql name: zh-CN: InfluxDB-PromQL en-US: InfluxDB-PromQL +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: Hertzbeat 对 InfluxDB-PromQL 的通用指标进行测量监控。
您可以点击 “新建 InfluxDB-PromQL” 并进行配置,或者选择“更多操作”,导入已有配置。 + en-US: Hertzbeat monitors InfluxDB-PromQL through general performance indicator. You could click the "New InfluxDB-PromQL" button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/influxdb_promql + en-US: https://hertzbeat.com/docs/help/influxdb_promql params: - field: host name: diff --git a/manager/src/main/resources/define/app-iotdb.yml b/manager/src/main/resources/define/app-iotdb.yml index 8cb4fe78b89..851d433024c 100644 --- a/manager/src/main/resources/define/app-iotdb.yml +++ b/manager/src/main/resources/define/app-iotdb.yml @@ -24,6 +24,14 @@ app: iotdb name: zh-CN: IoTDB数据库 en-US: IoTDB +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: HertzBeat 对 Apache IoTDB JVM相关的物联网时序数据库的运行状态,内存任务集群等相关指标(cluster node status、jvm memory committed bytes、jvm memory used bytes、jvm threads states threads、quantity、cache hit、queue、hrift connections)进行监测。
⚠️注意:您需要在 IoTDB 开启 metrics 功能,其将提供 prometheus metrics 形式的接口数据,点击查看开启步骤 + en-US: "HertzBeat monitors the indicators such as operational status and memory task clusters of loT Series databases related to the Apache IoTDB JVM.
⚠️Note:You should enable the 'metrics' function in IoTDB, which will provide interface data in the form of prometheus metrics.Click here to view the specific steps." +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/iotdb/ + en-US: https://hertzbeat.com/docs/help/iotdb/ # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-jetty.yml b/manager/src/main/resources/define/app-jetty.yml index 7b4e1244c32..5bfc7b35c72 100644 --- a/manager/src/main/resources/define/app-jetty.yml +++ b/manager/src/main/resources/define/app-jetty.yml @@ -24,6 +24,14 @@ app: jetty name: zh-CN: Jetty应用服务器 en-US: Jetty AppServer +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: HertzBeat 使用 JMX 协议对 Jetty 应用服务器的通用性能指标(memory pool、class loading、thread)进行采集监控。
⚠️注意:您需要在 Jetty 应用开启 JMX 服务, 点击查看开启步骤 + en-US: "HertzBeat monitors general performance indicators(memory pool, class loading, thread) of Jetty application server through JMX protocol.
⚠️Note: You should enable the JMX service in Jetty application. Click here to view the specific steps." +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/jetty/ + en-US: https://hertzbeat.com/docs/help/jetty/ # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-jvm.yml b/manager/src/main/resources/define/app-jvm.yml index e5ab016c31c..f9a80a6c935 100644 --- a/manager/src/main/resources/define/app-jvm.yml +++ b/manager/src/main/resources/define/app-jvm.yml @@ -24,6 +24,14 @@ app: jvm name: zh-CN: JVM虚拟机 en-US: JVM +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: HertzBeat 使用 JMX 协议对 JVM 虚拟机的通用性能指标进行采集监控。⚠️注意:您需要在 JVM 应用中开启 JMX 服务,应用启动时添加 JVM 参数, 可自定义暴露端口,对外IP。点击查看开启步骤。 + en-US: "HertzBeat using JMX protocol to monitor and collect general performance indicator of virtual machine. ⚠️Note: You need to enable JVM services in JVM application, and add the JVM parameters when the application start. You can also customize external IP address and exposed port.Click here to view the activation steps." +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/jvm/ + en-US: https://hertzbeat.com/docs/help/jvm/ # Input params define for monitoring(render web ui by the definition) # 监控所需输入参数定义(根据定义渲染页面UI) params: diff --git a/manager/src/main/resources/define/app-kafka.yml b/manager/src/main/resources/define/app-kafka.yml index fdda24ae66c..fff6e6a18d2 100644 --- a/manager/src/main/resources/define/app-kafka.yml +++ b/manager/src/main/resources/define/app-kafka.yml @@ -24,6 +24,14 @@ app: kafka name: zh-CN: Kafka消息系统 en-US: Kafka Message +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: HertzBeat 对 Kafka 的通用性能指标(server info、code cache、active controller count、broker partition count、broker leader count、broker handler avg percent)进行采集监控。
⚠️注意:由于系统使用 JMX 协议对 Kafka 进行指标采集,您需要在 Kafka 开启 JMX 服务, 点击查看开启步骤 + en-US: "HertzBeat monitors kafka through general performance indicators such as code cache, active controller count, broker partition count.
⚠️Note:Due to the system using JMX protocol for collect indicator data in Kafka, you need to enable JMX service in Kafka. Click here to view the specific steps." +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/kafka + en-US: https://hertzbeat.com/docs/help/kafka # Input params define for monitoring(render web ui by the definition) # 监控所需输入参数定义(根据定义渲染页面UI) params: diff --git a/manager/src/main/resources/define/app-kafka_promql.yml b/manager/src/main/resources/define/app-kafka_promql.yml index f0ba0948867..7c312e454a8 100644 --- a/manager/src/main/resources/define/app-kafka_promql.yml +++ b/manager/src/main/resources/define/app-kafka_promql.yml @@ -5,6 +5,14 @@ app: kafka_promql name: zh-CN: Kafka-PromQL en-US: Kafka-PromQL +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: Hertzbeat 对 Kafka-PromQL的通用指标进行测量监控。
您可以点击 “新建 Kafka-PromQL” 并进行配置,或者选择“更多操作”,导入已有配置。 + en-US: Hertzbeat monitors Kafka-PromQL through general performance indicator. You could click the "New Kafka-PromQL" button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/kafka_promql + en-US: https://hertzbeat.com/docs/help/kafka_promql params: - field: host name: diff --git a/manager/src/main/resources/define/app-kubernetes.yml b/manager/src/main/resources/define/app-kubernetes.yml index e2747684d28..39df8debc1e 100644 --- a/manager/src/main/resources/define/app-kubernetes.yml +++ b/manager/src/main/resources/define/app-kubernetes.yml @@ -24,6 +24,14 @@ app: kubernetes name: zh-CN: Kubernetes en-US: Kubernetes +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: HertzBeat 对 kubernetes 的通用性能指标(nodes、namespaces、pods、services)进行采集监控。
⚠️注意:为了监控 Kubernetes 中的信息,则需要获取到可访问 Api Server 的授权 TOKEN,让采集请求获取到对应的信息,点击查看获取步骤 + en-US: "HertzBeat monitors kubernetes through general performance indicators such as nodes, namespaces and pods.
⚠️Note: In order to monitor the information of Kubernetes, Hertzbeat need to obtain the authorized TOKEN that can access Api Server. Click here to view the specific steps." +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/kubernetes + en-US: https://hertzbeat.com/docs/help/kubernetes # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-linux.yml b/manager/src/main/resources/define/app-linux.yml index cda1ebdc5ab..bf12c398adc 100644 --- a/manager/src/main/resources/define/app-linux.yml +++ b/manager/src/main/resources/define/app-linux.yml @@ -24,6 +24,14 @@ app: linux name: zh-CN: Linux操作系统 en-US: OS Linux +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: HertzBeat 对您的 Linux 操作系统通用性能指标(basic、cpu、memory、disk、interface、disk free)进行采集监控。
您可以点击“新建 Linux 操作系统”并进行配置,或者选择“更多操作”,导入已有配置。 + en-US: HertzBeat monitors your Linux operating system through general performance indicators such as cpu, disk, interface. You could click the "New Linux" button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/linux + en-US: https://hertzbeat.com/docs/help/linux # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-mariadb.yml b/manager/src/main/resources/define/app-mariadb.yml index 05e2467d69d..394f7cfc893 100644 --- a/manager/src/main/resources/define/app-mariadb.yml +++ b/manager/src/main/resources/define/app-mariadb.yml @@ -24,6 +24,14 @@ app: mariadb name: zh-CN: MariaDB数据库 en-US: MariaDB +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: HertzBeat 对 MariaDB 数据库的通用性能指标(basic、status、innodb)进行采集监控,支持版本为 MariaDB5+。
您可以点击“新建 MariaDB 数据库”并进行配置,或者选择“更多操作”,导入已有配置。 + en-US: HertzBeat monitors MariaDB database through general performance indicators such as status and innodb, the version we support is MariaDB5+. You could click the "New MariaDB" button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/mariadb + en-US: https://hertzbeat.com/docs/help/mariadb # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-mongodb.yml b/manager/src/main/resources/define/app-mongodb.yml index 0d66c28706b..a4d6adeb991 100644 --- a/manager/src/main/resources/define/app-mongodb.yml +++ b/manager/src/main/resources/define/app-mongodb.yml @@ -25,6 +25,14 @@ app: mongodb name: zh-CN: MongoDB数据库 en-US: MongoDB +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: Hertzbeat 对 MongoDB 数据库的通用指标进行测量监控。
您可以点击 “新建 MongoDB 数据库” 并进行配置,或者选择“更多操作”,导入已有配置。 + en-US: Hertzbeat monitors MongoDB through general performance indicator. You could click the "New MongoDB" button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/mongodb + en-US: https://hertzbeat.com/docs/help/mongodb # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-mysql.yml b/manager/src/main/resources/define/app-mysql.yml index 0d540b239d1..7aa259cfdb2 100644 --- a/manager/src/main/resources/define/app-mysql.yml +++ b/manager/src/main/resources/define/app-mysql.yml @@ -24,6 +24,14 @@ app: mysql name: zh-CN: Mysql数据库 en-US: Mysql DB +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: HertzBeat 对 MYSQL 数据库的通用性能指标(basic、status、innodb)进行采集监控,支持版本为 MYSQL5+。
您可以点击“新建 MYSQL 数据库”并进行配置,或者选择“更多操作”,导入已有配置。 + en-US: HertzBeat monitors MYSQL database through general performance indicators such as status and innodb, the version we support is MYSQL5+. You could click the "New SQL" button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/mysql + en-US: https://hertzbeat.com/docs/help/mysql # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-nacos.yml b/manager/src/main/resources/define/app-nacos.yml index 31509c80805..2d8e9587bbe 100644 --- a/manager/src/main/resources/define/app-nacos.yml +++ b/manager/src/main/resources/define/app-nacos.yml @@ -24,6 +24,14 @@ app: nacos name: zh-CN: Nacos注册配置中心 en-US: Nacos Server +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: Hertzbeat 对 Nacos 注册配置中心的通用指标进行测量监控。
您可以点击 “新建 Nacos注册配置中心” 并进行配置,或者选择“更多操作”,导入已有配置。 + en-US: Hertzbeat monitors Nacos Server through general performance indicator. You could click the "New Nacos Server" button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/nacos + en-US: https://hertzbeat.com/docs/help/nacos # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-opengauss.yml b/manager/src/main/resources/define/app-opengauss.yml index b0f77ca22a0..c7aefee21a6 100644 --- a/manager/src/main/resources/define/app-opengauss.yml +++ b/manager/src/main/resources/define/app-opengauss.yml @@ -18,6 +18,14 @@ app: opengauss name: zh-CN: OpenGauss数据库 en-US: OpenGauss DB +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: HertzBeat 对 OpenGauss 数据库的通用性能指标(basic、state、activity)进行采集监控,支持版本为 PostgreSQL10+。
您可以点击“新建 OpenGauss 数据库”并进行配置,或者选择“更多操作”,导入已有配置。 + en-US: HertzBeat monitors OpenGauss database through general performance indicators such as state and activity, the version we support is PostgreSQL10+. You could click the "New OpenGauss" button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/opengauss + en-US: https://hertzbeat.com/docs/help/opengauss params: - field: host name: diff --git a/manager/src/main/resources/define/app-opensuse.yml b/manager/src/main/resources/define/app-opensuse.yml index 55326942e6a..52ef20285b1 100644 --- a/manager/src/main/resources/define/app-opensuse.yml +++ b/manager/src/main/resources/define/app-opensuse.yml @@ -24,6 +24,14 @@ app: opensuse name: zh-CN: OpenSUSE en-US: OpenSUSE +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: Hertzbeat 对 OpenSUSE 的通用指标进行测量监控。
您可以点击 “新建 OpenSUSE” 并进行配置,或者选择“更多操作”,导入已有配置。 + en-US: Hertzbeat monitors OpenSUSE through general performance indicator. You could click the "New OpenSUSE" button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/opensuse + en-US: https://hertzbeat.com/docs/help/opensuse # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-oracle.yml b/manager/src/main/resources/define/app-oracle.yml index c39c9a9ff28..c81e338ff0f 100644 --- a/manager/src/main/resources/define/app-oracle.yml +++ b/manager/src/main/resources/define/app-oracle.yml @@ -24,6 +24,14 @@ app: oracle name: zh-CN: Oracle数据库 en-US: Oracle DB +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: Hertzbeat 对 Oracle 数据库的通用指标(tablespace、user connect、performance)进行测量监控。
您可以点击 “新建 Oracle数据库” 并进行配置,或者选择“更多操作”,导入已有配置。 + en-US: Hertzbeat monitors Oracle database through general performance indicator. You could click the "New Oracle DB" button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/oracle/ + en-US: https://hertzbeat.com/docs/help/oracle/ # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-ping.yml b/manager/src/main/resources/define/app-ping.yml index 7a221d52075..56dd943c1af 100644 --- a/manager/src/main/resources/define/app-ping.yml +++ b/manager/src/main/resources/define/app-ping.yml @@ -27,6 +27,14 @@ app: ping name: zh-CN: PING连通性 en-US: PING CONNECT +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: HertzBeat 以 ms 为指标单位,对端 HOST 地址进行 PING 操作,判断其连通性。您可以点击“新建 PING 连通性”并进行配置,或者选择“更多操作”,导入已有配置。 + en-US: HertzBeat uses 'ms' as the indicator unit to PING the end HOST address and determines the connectivity. You could click the "Add API " button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/ping + en-US: https://hertzbeat.com/docs/help/ping # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-port.yml b/manager/src/main/resources/define/app-port.yml index 7808d89d48d..f634e06c64d 100644 --- a/manager/src/main/resources/define/app-port.yml +++ b/manager/src/main/resources/define/app-port.yml @@ -23,6 +23,14 @@ app: port name: zh-CN: 端口可用性 en-US: PORT TELNET +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: HertzBeat 通过判断对端服务中暴露的端口是否可用,进而判断对端服务是否可用。同时以ms为指标,对响应时间等指标进行监测。您可以点击“新建 端口可用性”并进行配置,或者选择“更多操作”,导入已有配置。 + en-US: HertzBeat determines whether the exposed ports in the peer service are available, thereby determining whether the peer service is available. Simultaneously monitoring response time and other indicators using ms as indicator unit. You could click the "New port" button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/port + en-US: https://hertzbeat.com/docs/help/port # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-postgresql.yml b/manager/src/main/resources/define/app-postgresql.yml index 89bf6bda548..626a7470941 100644 --- a/manager/src/main/resources/define/app-postgresql.yml +++ b/manager/src/main/resources/define/app-postgresql.yml @@ -24,6 +24,14 @@ app: postgresql name: zh-CN: PostgreSQL数据库 en-US: PostgreSQL DB +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: HertzBeat 对 PostgreSQL 数据库的通用性能指标(basic、state、activity)进行采集监控,支持版本为 PostgreSQL 10+。
您可以点击“新建 PostgreSQL 数据库”并进行配置,或者选择“更多操作”,导入已有配置。 + en-US: HertzBeat monitors PostgreSQL database through basic performance indicators such as state and activity, the version we support is PostgreSQL 10+.
You could click the "New MariPostgreSQLaDB" button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/postgresql + en-US: https://hertzbeat.com/docs/help/postgresql # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-rabbitmq.yml b/manager/src/main/resources/define/app-rabbitmq.yml index c303e0881f5..0d6680c4bc8 100644 --- a/manager/src/main/resources/define/app-rabbitmq.yml +++ b/manager/src/main/resources/define/app-rabbitmq.yml @@ -24,6 +24,14 @@ app: rabbitmq name: zh-CN: RabbitMQ消息系统 en-US: RabbitMQ Message +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: HertzBeat 对 RabbitMQ 消息中间件的运行状态,节点,队列等相关指标(overview、object_totals、nodes、queues)进行监测。
⚠️注意:HertzBeat 使用 RabbitMQ Management 的 Rest Api 对 RabbitMQ 进行指标数据采集,因此您的 RabbitMQ 环境需要开启 Management 插件,点击查看开启步骤 + en-US: "HertzBeat monitors RabbitMQ through the runtime status, nodes, queues and other indicators of message-oriented middleware.
⚠️Note:HertzBeat uses the Rest Api of RabbitMQ Management to collect indicator data for RabbitMQ, so you need to enable Management plug-in component, Click here to view the specific steps." +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/rabbitmq + en-US: https://hertzbeat.com/docs/help/rabbitmq # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-redhat.yml b/manager/src/main/resources/define/app-redhat.yml index 5c68b92e753..88da8476d63 100644 --- a/manager/src/main/resources/define/app-redhat.yml +++ b/manager/src/main/resources/define/app-redhat.yml @@ -24,6 +24,14 @@ app: redhat name: zh-CN: Red Hat en-US: Red Hat +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: Hertzbeat 对 Red Hat 的通用指标进行测量监控。
您可以点击 “新建 Red Hat” 并进行配置,或者选择“更多操作”,导入已有配置。 + en-US: Hertzbeat monitors Red Hat through general performance indicator. You could click the "New Red Hat" button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/redhat + en-US: https://hertzbeat.com/docs/help/redhat # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-redis.yml b/manager/src/main/resources/define/app-redis.yml index 3a2348b4160..17e86913bbf 100644 --- a/manager/src/main/resources/define/app-redis.yml +++ b/manager/src/main/resources/define/app-redis.yml @@ -24,6 +24,14 @@ app: redis name: zh-CN: Redis数据库 en-US: Redis +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: HertzBeat 对 REDIS 数据库的通用性能指标进行采集监控(server、clients、memory、persistence、stats、replication、cpu、errorstats、cluster、commandstats),支持版本为 REDIS1.0+。
您可以点击“新建 REDIS 数据库”并进行配置,或者选择“更多操作”,导入已有配置。 + en-US: HertzBeat monitors REDIS database through general performance indicator such as memory, persistence, replication and so on. The versions we support is REDIS1.0+.
You could click the "New REDIS" button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/redis + en-US: https://hertzbeat.com/docs/help/redis # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by params: diff --git a/manager/src/main/resources/define/app-redis_cluster.yml b/manager/src/main/resources/define/app-redis_cluster.yml index 5e7eda5e875..f57ebcaa6e1 100644 --- a/manager/src/main/resources/define/app-redis_cluster.yml +++ b/manager/src/main/resources/define/app-redis_cluster.yml @@ -24,6 +24,14 @@ app: redis_cluster name: zh-CN: Redis Cluster数据库 en-US: Redis Cluster +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: Hertzbeat 对 Redis Cluster 的通用指标进行测量监控。
您可以点击 “新建 Redis Cluster” 并进行配置,或者选择“更多操作”,导入已有配置。 + en-US: Hertzbeat monitors Redis database Cluster through general performance indicator. You could click the "New Redis Cluster" button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/redis_cluster + en-US: https://hertzbeat.com/docs/help/redis_cluster # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-redis_sentinel.yml b/manager/src/main/resources/define/app-redis_sentinel.yml index a18f2445351..ecf549b79d0 100644 --- a/manager/src/main/resources/define/app-redis_sentinel.yml +++ b/manager/src/main/resources/define/app-redis_sentinel.yml @@ -24,6 +24,14 @@ app: redis_sentinel name: zh-CN: Redis Sentinel数据库 en-US: Redis Sentinel +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: Hertzbeat 对 Redis Sentinel 数据库的通用指标进行测量监控。
您可以点击 “新建 Redis Sentinel数据库” 并进行配置,或者选择“更多操作”,导入已有配置。 + en-US: Hertzbeat monitors Redis Sentinel database through general performance indicator. You could click the "New Redis Sentinel" button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/influxdb_promql + en-US: https://hertzbeat.com/docs/help/influxdb_promql # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-rocketmq.yml b/manager/src/main/resources/define/app-rocketmq.yml index 4b3101af94e..c64be66cb4c 100644 --- a/manager/src/main/resources/define/app-rocketmq.yml +++ b/manager/src/main/resources/define/app-rocketmq.yml @@ -18,6 +18,14 @@ app: rocketmq name: zh-CN: RocketMQ en-US: RocketMQ +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: Hertzbeat 对 RocketMQ 的通用指标进行测量监控。
您可以点击 “新建 RocketMQ” 并进行配置,或者选择“更多操作”,导入已有配置。 + en-US: Hertzbeat monitors RocketMQ through general performance indicator. You could click the "New RocketMQ" button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/rocketmq + en-US: https://hertzbeat.com/docs/help/rocketmq params: # field-param field key # field-字段名称标识符 diff --git a/manager/src/main/resources/define/app-rockylinux.yml b/manager/src/main/resources/define/app-rockylinux.yml index 47e5654df05..04a615ddc7d 100644 --- a/manager/src/main/resources/define/app-rockylinux.yml +++ b/manager/src/main/resources/define/app-rockylinux.yml @@ -24,6 +24,14 @@ app: rockylinux name: zh-CN: Rocky Linux en-US: Rocky Linux +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: Hertzbeat 对 Rocky Linux 操作系统的通用指标进行测量监控。
您可以点击 “新建 Rocky Linux” 并进行配置,或者选择“更多操作”,导入已有配置。 + en-US: Hertzbeat monitors Rocky Linux operating system through general performance indicator. You could click the "New Rocky Linux" button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/rockylinux + en-US: https://hertzbeat.com/docs/help/rockylinux # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-shenyu.yml b/manager/src/main/resources/define/app-shenyu.yml index 5830610d366..75df3dc45ce 100644 --- a/manager/src/main/resources/define/app-shenyu.yml +++ b/manager/src/main/resources/define/app-shenyu.yml @@ -18,6 +18,14 @@ app: shenyu name: zh-CN: ShenYu网关 en-US: ShenYu Gateway +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: HertzBeat 对 ShenYu 网关的运行状态(JVM相关),请求响应等相关指标(shenyu request total、process cpu seconds total、process open fds、process max fds、jvm memory pool bytes used、jvm memory pool bytes max、jvm threads state等)进行监测。
⚠️注意:您需要在 ShenYu 开启 metrics 插件 ,暴露对应的 prometheus metrics 接口, 点击查看开启步骤。 + en-US: "HertzBeat monitors ShenYu through runtime status(related to JVM) and request response and so on.
⚠️Note:You should enable the metrics plug-in component in ShenYu gateway for expose related prometheus metrics interface, Click here to view the specific steps." +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/shenyu + en-US: https://hertzbeat.com/docs/help/shenyu params: - field: host name: diff --git a/manager/src/main/resources/define/app-spark.yml b/manager/src/main/resources/define/app-spark.yml index 0e2515bdf4a..14f8aea2862 100644 --- a/manager/src/main/resources/define/app-spark.yml +++ b/manager/src/main/resources/define/app-spark.yml @@ -24,6 +24,14 @@ app: spark name: zh-CN: Apache Spark en-US: Apache Spark +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: HertzBeat 使用 JMX 协议对 Apache Spark 的通用性能指标进行采集监控。⚠️注意:为了开启 JVM 服务,您需要在系统IP启动 server 时添加 Spark 的 VM options 选项。Master和 Worker 的监控在 spark 集群运行时即可监控,Driver 和 Excutor 的监控需要针对某一个 app 来进行监控。 如果都要监控,请点击查看配置步骤。 + en-US: "HertzBeat using JMX protocol to monitor general performance indicator of Apache Spark. ⚠️Note: You should add Spark VM options When Start Server with customIP to enable the JVM services, You need to add Spark's VM options option when the system IP starts the server.
The monitoring of Master and Worker can be done then the Spark cluster is running, while the monitoring of Driver and Exciter needs to be targeted at a specific app. If you would like to monitor all of then, please click here to view the configuration steps" +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/spark + en-US: https://hertzbeat.com/docs/help/spark # Input params define for monitoring(render web ui by the definition) # 监控所需输入参数定义(根据定义渲染页面UI) params: diff --git a/manager/src/main/resources/define/app-springboot2.yml b/manager/src/main/resources/define/app-springboot2.yml index 2723c881b26..10b70af13b2 100644 --- a/manager/src/main/resources/define/app-springboot2.yml +++ b/manager/src/main/resources/define/app-springboot2.yml @@ -24,6 +24,14 @@ app: springboot2 name: zh-CN: SpringBoot2.0 en-US: SpringBoot2.0 +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: HertzBeat对 SpringBoot2.0 Actuator 暴露的通用性能指标(health、environment、threads、memory_used)进行采集监控。⚠️注意:如果要监控 SpringBoot 中的信息,需要您的 SpringBoot 应用集成并开启 SpringBoot Actuator, 点击查看具体步骤 + en-US: "HertzBeat collects and monitors SpringBoot through general performance indicator(health, environment, threads, memory_used) that exposed by the SpringBoot2.0 Actuator.
⚠️Note: You should make sure that your SpringBoot application have already integrated and enabled the SpringBoot Actuator, click here to see the specific steps." +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/springboot2 + en-US: https://hertzbeat.com/docs/help/springboot2 # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-springboot3.yml b/manager/src/main/resources/define/app-springboot3.yml index 3fe482e868a..a866a10bdf0 100644 --- a/manager/src/main/resources/define/app-springboot3.yml +++ b/manager/src/main/resources/define/app-springboot3.yml @@ -25,6 +25,14 @@ app: springboot3 name: zh-CN: SpringBoot3.0 en-US: SpringBoot3.0 +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: HertzBeat对 SpringBoot3.0 Actuator 暴露的通用性能指标(health、environment、threads、memory_used)进行采集监控。⚠️注意:如果要监控 SpringBoot 中的信息,需要您的 SpringBoot 应用集成并开启 SpringBoot Actuator, 点击查看具体步骤 + en-US: "HertzBeat collect and monitors SpringBoot through general performance indicator that exposed by the SpringBoot3.0 Actuator.

⚠️Note: You should make sure that your SpringBoot application have already integrated and enabled the SpringBoot Actuator, click here to see the specific steps.
" +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/springboot3 + en-US: https://hertzbeat.com/docs/help/springboot3 # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-sqlserver.yml b/manager/src/main/resources/define/app-sqlserver.yml index e1ead911b7d..4dfba180ece 100644 --- a/manager/src/main/resources/define/app-sqlserver.yml +++ b/manager/src/main/resources/define/app-sqlserver.yml @@ -24,6 +24,14 @@ app: sqlserver name: zh-CN: SqlServer数据库 en-US: SqlServer DB +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: HertzBeat 对 SqlServer 数据库的通用性能指标(basic、performance counters、connection)进行采集监控,支持版本为 SqlServer 2017+。
⚠️注意点击查看可能遇见的 ssh 问题 + en-US: "HertzBeat monitors SqlServer database through basic performance indicators such as performance counters and connection, the version we support is SqlServer 2017+.
⚠️Note: Click here to see the possible SSH problems." +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/sqlserver + en-US: https://hertzbeat.com/docs/help/sqlserver # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-ssl_cert.yml b/manager/src/main/resources/define/app-ssl_cert.yml index a942a72a2ed..5eb30d328c3 100644 --- a/manager/src/main/resources/define/app-ssl_cert.yml +++ b/manager/src/main/resources/define/app-ssl_cert.yml @@ -24,6 +24,14 @@ app: ssl_cert name: zh-CN: SSL证书 en-US: SSL Certificate +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: HertzBeat 通过证书名称、是否过期、有效期开始时间、有效期开始时间戳(ms)、过期时间、过期时间戳(ms)等指标对网站的 SSL 证书进行监测。您可以点击“新建 SSL 证书”并进行配置,或者选择“更多操作”,导入已有配置。 + en-US: HertzBeat monitors website's SSL certificates through indicators such as certificate name, expiration date, validity start time, validity start timestamp (ms), expiration time, and expiration timestamp (ms).
You could click the "New SSL" button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/ssl_cert + en-US: https://hertzbeat.com/docs/help/ssl_cert # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-tomcat.yml b/manager/src/main/resources/define/app-tomcat.yml index f1e4682587b..ffe83490bbe 100644 --- a/manager/src/main/resources/define/app-tomcat.yml +++ b/manager/src/main/resources/define/app-tomcat.yml @@ -24,6 +24,14 @@ app: tomcat name: zh-CN: Tomcat应用服务器 en-US: Tomcat WebServer +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: HertzBeat 使用 JMX 协议对 Tomcat 的通用性能指标(memory_pool、code_cache、class_loading、thread)进行采集监控,点击查看开启步骤
您可以点击“新建 Tomcat 应用服务器”并进行配置,或者选择“更多操作”,导入已有配置。 + en-US: HertzBeat monitors general performance indicators of Tomcat through JMX protocol. Click here to view the specific steps. You could click the "New Tomcat" button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/tomcat + en-US: https://hertzbeat.com/docs/help/tomcat # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-tplink_switch.yml b/manager/src/main/resources/define/app-tplink_switch.yml index cace9e02e99..95ddebf985c 100644 --- a/manager/src/main/resources/define/app-tplink_switch.yml +++ b/manager/src/main/resources/define/app-tplink_switch.yml @@ -24,6 +24,14 @@ app: tplink_switch name: zh-CN: TP-LINK通用交换机 en-US: TP-LINK Switch +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: Hertzbeat 对 TP-LINK 通用交换机的通用指标进行测量监控。
您可以点击 “新建 TP-LINK通用交换机” 并进行配置,或者选择“更多操作”,导入已有配置。 + en-US: Hertzbeat monitors TP-LINK Switch through general performance indicator. You could click the "New TP-LINK Switch" button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/tplink_switch + en-US: https://hertzbeat.com/docs/help/tplink_switch # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-ubuntu.yml b/manager/src/main/resources/define/app-ubuntu.yml index e6f48320ea7..e0669023e35 100644 --- a/manager/src/main/resources/define/app-ubuntu.yml +++ b/manager/src/main/resources/define/app-ubuntu.yml @@ -24,6 +24,14 @@ app: ubuntu name: zh-CN: Ubuntu Linux en-US: Ubuntu Linux +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: HertzBeat 对 Ubuntu 操作系统的通用性能指标(basic、cpu、memory、disk、interface、disk free)进行采集监控。
您可以点击“新建 Ubuntu 操作系统”并进行配置,或者选择“更多操作”,导入已有配置。 + en-US: HertzBeat monitors Ubuntu operating system through general performance indicators such as cpu and memory. You could click the "New Ubuntu" button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/ubuntu + en-US: https://hertzbeat.com/docs/help/ubuntu # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-website.yml b/manager/src/main/resources/define/app-website.yml index c25a63fcc92..88744403528 100644 --- a/manager/src/main/resources/define/app-website.yml +++ b/manager/src/main/resources/define/app-website.yml @@ -24,6 +24,14 @@ app: website name: zh-CN: 网站监测 en-US: WEBSITE +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: Hertzbeat 对网站是否可用,响应时间等指标进行监测。
您可以点击 “新建 网站监测” 并进行配置,或者选择“更多操作”,导入已有配置。 + en-US: Hertzbeat monitors whether the website is available, response time and other indicators. You could click the "New WEBSITE" button and proceed with the configuration or import an existing setup through the "More Actions" menu. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/website + en-US: https://hertzbeat.com/docs/help/websites # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-windows.yml b/manager/src/main/resources/define/app-windows.yml index e754211e6d9..9eeafcd748c 100644 --- a/manager/src/main/resources/define/app-windows.yml +++ b/manager/src/main/resources/define/app-windows.yml @@ -24,6 +24,14 @@ app: windows name: zh-CN: Windows操作系统 en-US: OS Windows +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: HertzBeat 通过 SNMP 协议对 Windows 操作系统的通用性能指标(用户数、进程数量、响应时间等)进行采集监控。
⚠️注意:Windows 服务器需要开启 SNMP 服务,点击查看开启步骤 + en-US: HertzBeat monitors general performance indicators such as number of users, number of processes, response time of Windows operating system through the SNMP protocol.
⚠️Note:Windows server need enable the SNMP services Click here to view the specific steps. +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/windows + en-US: https://hertzbeat.com/docs/help/windows # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/manager/src/main/resources/define/app-zookeeper.yml b/manager/src/main/resources/define/app-zookeeper.yml index b558cdb06b2..43b62193424 100644 --- a/manager/src/main/resources/define/app-zookeeper.yml +++ b/manager/src/main/resources/define/app-zookeeper.yml @@ -24,6 +24,14 @@ app: zookeeper name: zh-CN: Zookeeper注册配置中心 en-US: Zookeeper Server +# The description and help of this monitoring type +# 监控类型的帮助描述信息 +help: + zh-CN: HertzBeat 对 Zookeeper 的通用性能指标(conf、stats)进行采集监控。
⚠️注意:由于需要 zookeeper 提供的四字命令 + netcat 来收集指标数据,您需要将 zookeeper 的四字命令加入白名单,点击查看具体步骤。 + en-US: "HertzBeat monitors Zookeeper through general performance indicators such as status and configuration.
⚠️Note: Due to the need for four-letter-word provided by zookeeper to collect indicator data, you should add the four-letter-word to the whitelist.Click here to view the specific steps." +helpLink: + zh-CN: https://hertzbeat.com/zh-cn/docs/help/zookeeper + en-US: https://hertzbeat.com/docs/help/zookeeper # 监控所需输入参数定义(根据定义渲染页面UI) # Input params define for monitoring(render web ui by the definition) params: diff --git a/web-app/src/app/routes/alert/alert-center/alert-center.component.html b/web-app/src/app/routes/alert/alert-center/alert-center.component.html index c8e153034d2..1e57f11a4ea 100644 --- a/web-app/src/app/routes/alert/alert-center/alert-center.component.html +++ b/web-app/src/app/routes/alert/alert-center/alert-center.component.html @@ -1,6 +1,7 @@ diff --git a/web-app/src/app/routes/alert/alert-converge/alert-converge.component.html b/web-app/src/app/routes/alert/alert-converge/alert-converge.component.html index 8f46d26a457..6c7dbd32927 100644 --- a/web-app/src/app/routes/alert/alert-converge/alert-converge.component.html +++ b/web-app/src/app/routes/alert/alert-converge/alert-converge.component.html @@ -1,6 +1,7 @@ diff --git a/web-app/src/app/routes/alert/alert-notice/alert-notice.component.html b/web-app/src/app/routes/alert/alert-notice/alert-notice.component.html index 41c8e18abf3..ae764a4e170 100644 --- a/web-app/src/app/routes/alert/alert-notice/alert-notice.component.html +++ b/web-app/src/app/routes/alert/alert-notice/alert-notice.component.html @@ -1,6 +1,7 @@ diff --git a/web-app/src/app/routes/alert/alert-setting/alert-setting.component.html b/web-app/src/app/routes/alert/alert-setting/alert-setting.component.html index 60c96b8ceb9..d144f1d72f2 100644 --- a/web-app/src/app/routes/alert/alert-setting/alert-setting.component.html +++ b/web-app/src/app/routes/alert/alert-setting/alert-setting.component.html @@ -1,6 +1,7 @@ diff --git a/web-app/src/app/routes/alert/alert-silence/alert-silence.component.html b/web-app/src/app/routes/alert/alert-silence/alert-silence.component.html index 66cb701a2de..46858928727 100644 --- a/web-app/src/app/routes/alert/alert-silence/alert-silence.component.html +++ b/web-app/src/app/routes/alert/alert-silence/alert-silence.component.html @@ -1,6 +1,7 @@ diff --git a/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.html b/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.html index b5e061a52a2..eff24e6f81d 100644 --- a/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.html +++ b/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.html @@ -1,45 +1,14 @@ - - - - - - {{ 'menu.dashboard' | i18n }} - - - - - - {{ 'monitors.list' | i18n }} - {{ 'menu.monitor.center' | i18n }} - - - {{ 'monitor.app.' + app | i18n }} - - - - - {{ tag }} - - - - - - + +
diff --git a/web-app/src/app/routes/setting/define/define.component.html b/web-app/src/app/routes/setting/define/define.component.html index f3c33420faa..7b0f110712d 100644 --- a/web-app/src/app/routes/setting/define/define.component.html +++ b/web-app/src/app/routes/setting/define/define.component.html @@ -1,6 +1,7 @@ diff --git a/web-app/src/app/routes/setting/tags/tags.component.html b/web-app/src/app/routes/setting/tags/tags.component.html index 98c141cdcb7..c1b8045d680 100644 --- a/web-app/src/app/routes/setting/tags/tags.component.html +++ b/web-app/src/app/routes/setting/tags/tags.component.html @@ -1,6 +1,7 @@ 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 502f5ec739d..d85ca841387 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 @@ -2,7 +2,7 @@
- - +
diff --git a/web-app/src/app/shared/components/help-massage-show/help-massage-show.component.spec.ts b/web-app/src/app/shared/components/help-massage-show/help-massage-show.component.spec.ts index a16405b6f09..2c06621dafe 100644 --- a/web-app/src/app/shared/components/help-massage-show/help-massage-show.component.spec.ts +++ b/web-app/src/app/shared/components/help-massage-show/help-massage-show.component.spec.ts @@ -1,6 +1,6 @@ -import {ComponentFixture, TestBed} from '@angular/core/testing'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; -import {HelpMassageShowComponent} from './help-massage-show.component'; +import { HelpMassageShowComponent } from './help-massage-show.component'; describe('HelpMassageShowComponent', () => { let component: HelpMassageShowComponent; @@ -9,8 +9,7 @@ describe('HelpMassageShowComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ declarations: [HelpMassageShowComponent] - }) - .compileComponents(); + }).compileComponents(); fixture = TestBed.createComponent(HelpMassageShowComponent); component = fixture.componentInstance; 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 7ec85526e4a..9db526c8abb 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 @@ -1,29 +1,28 @@ -import {Component, Inject,Input,OnInit} from '@angular/core'; -import {ActivatedRoute, Router} from '@angular/router'; -import {I18NService} from '@core'; -import {ALAIN_I18N_TOKEN} from '@delon/theme'; -import {NzMessageService} from 'ng-zorro-antd/message'; -import {NzModalService} from 'ng-zorro-antd/modal'; -import {NzNotificationService} from 'ng-zorro-antd/notification'; -import {Monitor} from '../../../pojo/Monitor'; -import {MonitorService} from '../../../service/monitor.service'; -import { ElementRef, Renderer2,ViewChild } from '@angular/core'; +import { Component, Inject, Input, OnInit, ElementRef, Renderer2, ViewChild } from '@angular/core'; +import { ActivatedRoute, Router } from '@angular/router'; +import { I18NService } from '@core'; +import { ALAIN_I18N_TOKEN } from '@delon/theme'; +import { NzMessageService } from 'ng-zorro-antd/message'; +import { NzModalService } from 'ng-zorro-antd/modal'; +import { NzNotificationService } from 'ng-zorro-antd/notification'; + +import { Monitor } from '../../../pojo/Monitor'; +import { MonitorService } from '../../../service/monitor.service'; @Component({ selector: 'app-help-massage-show', templateUrl: './help-massage-show.component.html', styleUrls: ['./help-massage-show.component.less'] }) - export class HelpMassageShowComponent implements OnInit { @Input() - help_massage_content: string = "content"; + help_massage_content: string = 'content'; @Input() - guild_link: string = "content"; + guild_link: string = 'content'; @Input() - module_name: string = "content"; + module_name: string = 'content'; @Input() - icon_name: string = "home"; + icon_name: string = 'home'; constructor( private route: ActivatedRoute, private router: Router, @@ -34,16 +33,15 @@ export class HelpMassageShowComponent implements OnInit { private rd2: Renderer2, private el: ElementRef, @Inject(ALAIN_I18N_TOKEN) private i18nSvc: I18NService - ) { - } + ) {} isCollapsed: boolean = false; targetHeight: number = 140; @ViewChild('collapsed_content') collapsed_content: any; handleButtonClick(): void { this.isCollapsed = !this.isCollapsed; - localStorage.setItem("collapse_status", JSON.stringify(this.isCollapsed)); - this.targetHeight = localStorage.getItem("collapse_status") === "true" ? 28.8 : 140; - localStorage.setItem("collapse_height", JSON.stringify(this.targetHeight)); + localStorage.setItem('collapse_status', JSON.stringify(this.isCollapsed)); + this.targetHeight = localStorage.getItem('collapse_status') === 'true' ? 28.8 : 140; + localStorage.setItem('collapse_height', JSON.stringify(this.targetHeight)); this.rd2.setStyle(this.collapsed_content.nativeElement, 'height', `${this.targetHeight}px`); } @@ -57,8 +55,8 @@ export class HelpMassageShowComponent implements OnInit { checkedMonitorIds = new Set(); ngOnInit(): void { - this.isCollapsed = (localStorage.getItem("collapse_status") === "true" ? true : false); - this.el.nativeElement.querySelector('.help_massage_div').style.height = `${localStorage.getItem("collapse_height")}px`; + this.isCollapsed = localStorage.getItem('collapse_status') === 'true' ? true : false; + this.el.nativeElement.querySelector('.help_massage_div').style.height = `${localStorage.getItem('collapse_height')}px`; this.route.queryParamMap.subscribe(paramMap => { let appStr = paramMap.get('app'); let tagStr = paramMap.get('tag'); diff --git a/web-app/src/app/shared/shared.module.ts b/web-app/src/app/shared/shared.module.ts index 19e1a9abfea..20982f7ac57 100644 --- a/web-app/src/app/shared/shared.module.ts +++ b/web-app/src/app/shared/shared.module.ts @@ -5,15 +5,14 @@ import { RouterModule } from '@angular/router'; import { DelonACLModule } from '@delon/acl'; import { DelonFormModule } from '@delon/form'; import { AlainThemeModule } from '@delon/theme'; +import { NzBreadCrumbModule } from 'ng-zorro-antd/breadcrumb'; +import { NzTagModule } from 'ng-zorro-antd/tag'; import { HelpMassageShowComponent } from './components/help-massage-show/help-massage-show.component'; import { KeyValueInputComponent } from './components/key-value-input/key-value-input.component'; import { TimezonePipe } from './pipe/timezone.pipe'; import { SHARED_DELON_MODULES } from './shared-delon.module'; import { SHARED_ZORRO_MODULES } from './shared-zorro.module'; -import {NzBreadCrumbModule} from "ng-zorro-antd/breadcrumb"; -import {NzTagModule} from "ng-zorro-antd/tag"; - // #region third libs diff --git a/web-app/src/assets/i18n/en-US.json b/web-app/src/assets/i18n/en-US.json index 6d129b1c29a..3c8e95197a2 100644 --- a/web-app/src/assets/i18n/en-US.json +++ b/web-app/src/assets/i18n/en-US.json @@ -56,6 +56,11 @@ "description.tip": "Description and remarks", "intervals": "Intervals(s)", "intervals.tip": "Monitor the interval time of periodic collection of data, unit second", + "collector": "Collector", + "collector.tip": "Choose which collector to dispatch this monitoring", + "collector.system.default": "Default System Dispatch", + "collector.status.online": "Online", + "collector.status.offline": "Offline", "category": { "": "Category", "service": "Service", @@ -541,6 +546,21 @@ "settings.server.email.setting": "Configure Email Server", "settings.server.sms": "SMS Server", "settings.server.sms.setting": "Configure SMS Server", + "settings.system-config": "System Configuration", + "settings.system-config.locale": "System Language", + "settings.system-config.locale.zh_CN": "Simplified Chinese(zh_CN)", + "settings.system-config.locale.zh_TW": "Traditional Chinese(zh_TW)", + "settings.system-config.locale.en_US": "English(en_US)", + "settings.system-config.timezone": "System Time Zone", + "settings.system-config.ok": "Confirm Update", + "collector": "Collector", + "collector.status": "Online Status", + "collector.task": "Number of Tasks", + "collector.start-time": "Start Time", + "collector.ip": "IP Address", + "collector.node": "Node Name", + "collector.pinned": "Pinned", + "collector.dispatched": "Dispatched", "validation.email.required": "Please enter your email!", "validation.email.wrong-format": "The email address is in the wrong format!", "validation.password.required": "Please enter your password!", diff --git a/web-app/src/assets/i18n/zh-CN.json b/web-app/src/assets/i18n/zh-CN.json index afb7867e5fe..7549b1fabf5 100644 --- a/web-app/src/assets/i18n/zh-CN.json +++ b/web-app/src/assets/i18n/zh-CN.json @@ -7,16 +7,16 @@ "fullscreen": "全屏", "fullscreen.exit": "退出全屏", "clear.local.storage": "清理本地缓存", - "monitor": { - "": "监控", - "center": "监控中心", - "service": "应用服务监控", - "db": "数据库监控", - "os": "操作系统监控", - "mid": "中间件监控", - "cn": "云原生监控", - "network": "网络监控", - "custom": "自定义监控" + "monitor": { + "": "监控", + "center": "监控中心", + "service": "应用服务监控", + "db": "数据库监控", + "os": "操作系统监控", + "mid": "中间件监控", + "cn": "云原生监控", + "network": "网络监控", + "custom": "自定义监控" }, "account": { "": "个人页", @@ -56,6 +56,11 @@ "description.tip": "更多标识和描述此监控的备注信息", "intervals": "采集间隔(秒)", "intervals.tip": "监控周期性采集数据间隔时间,单位秒", + "collector": "采集器", + "collector.tip": "配置此监控使用哪台采集器调度采集", + "collector.system.default": "默认系统调度", + "collector.status.online": "在线", + "collector.status.offline": "离线", "category": { "": "监控类别", "service": "应用服务", @@ -537,6 +542,21 @@ "settings.server.email.setting": "配置邮件服务器", "settings.server.sms": "短信服务器", "settings.server.sms.setting": "配置短信服务器", + "settings.system-config": "系统配置", + "settings.system-config.locale": "系统语言", + "settings.system-config.locale.zh_CN": "简体中文(zh_CN)", + "settings.system-config.locale.zh_TW": "繁体中文(zh_TW)", + "settings.system-config.locale.en_US": "英语(en_US)", + "settings.system-config.timezone": "系统时区", + "settings.system-config.ok": "确认更新", + "collector": "采集器", + "collector.status": "运行状态", + "collector.task": "任务数量", + "collector.start-time": "启动时间", + "collector.ip": "IP地址", + "collector.node": "节点名称", + "collector.pinned": "固定任务", + "collector.dispatched": "调度任务", "validation.email.required": "请输入邮箱地址!", "validation.email.wrong-format": "邮箱地址格式错误!", "validation.email.invalid": "无效的邮箱地址!",