This is an automated email from the ASF dual-hosted git repository. zhaoqingran pushed a commit to branch bugfix-oom in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
commit d2f9a56fe7f2b550d4421e71e615a072bbe42173 Merge: a0b41dc7bb f7676ac8ca Author: Logic <[email protected]> AuthorDate: Wed Jan 8 10:33:11 2025 +0800 Merge branch 'master' of github.com:apache/hertzbeat .all-contributorsrc | 45 + README.md | 7 + README_CN.md | 7 + e2e/testsuite.yaml | 10 +- hertzbeat-alerter/pom.xml | 52 +- .../apache/hertzbeat/alert/AlerterProperties.java | 18 + .../apache/hertzbeat/alert/AlerterWorkerPool.java | 4 +- .../hertzbeat/alert/calculate/CalculateAlarm.java | 492 ----------- .../alert/calculate/PeriodicAlertCalculator.java | 106 +++ .../calculate/PeriodicAlertRuleScheduler.java | 11 +- .../alert/calculate/RealTimeAlertCalculator.java | 395 +++++++++ .../alert/controller/AlertDefineController.java | 23 - .../alert/controller/AlertDefinesController.java | 3 +- ...ller.java => AlertGroupConvergeController.java} | 40 +- ...ler.java => AlertGroupConvergesController.java} | 26 +- ...Controller.java => AlertInhibitController.java} | 46 +- ...ontroller.java => AlertInhibitsController.java} | 37 +- .../alert/controller/AlertReportController.java | 5 +- .../alert/controller/AlertsController.java | 53 +- .../alert}/controller/NoticeConfigController.java | 47 +- .../apache/hertzbeat/alert/dao/AlertDefineDao.java | 32 +- .../hertzbeat/alert/dao/AlertGroupConvergeDao.java | 33 +- ...{AlertConvergeDao.java => AlertInhibitDao.java} | 20 +- .../hertzbeat/alert/dao/AlertMonitorDao.java | 15 +- .../hertzbeat/alert/dao/AlertSilenceDao.java | 7 + .../dao/{AlertDao.java => GroupAlertDao.java} | 35 +- .../hertzbeat/alert}/dao/NoticeReceiverDao.java | 4 +- .../apache/hertzbeat/alert}/dao/NoticeRuleDao.java | 4 +- .../hertzbeat/alert}/dao/NoticeTemplateDao.java | 4 +- .../dao/{AlertDao.java => SingleAlertDao.java} | 49 +- .../apache/hertzbeat/alert/dto/AlertDefineDTO.java | 31 +- .../alert/dto/GeneralCloudAlertReport.java | 79 -- .../hertzbeat/alert/dto/MailServerConfig.java | 4 +- .../alert/notice/AlertNoticeDispatch.java | 109 +-- .../alert/notice}/AlertNoticeException.java | 2 +- .../alert/notice}/AlertNotifyHandler.java | 11 +- .../hertzbeat/alert/notice}/AlertStoreHandler.java | 6 +- .../impl/AbstractAlertNotifyHandlerImpl.java | 66 +- .../notice}/impl/AliYunAlertNotifyHandlerImpl.java | 21 +- .../alert/notice}/impl/CommonRobotNotifyResp.java | 2 +- .../alert/notice/impl/DbAlertStoreHandlerImpl.java | 123 +++ .../impl/DingTalkRobotAlertNotifyHandlerImpl.java | 12 +- .../impl/DiscordBotAlertNotifyHandlerImpl.java | 14 +- .../notice}/impl/EmailAlertNotifyHandlerImpl.java | 18 +- .../impl/FlyBookAlertNotifyHandlerImpl.java | 15 +- .../notice}/impl/GotifyAlertNotifyHandlerImpl.java | 12 +- .../impl/HuaweiCloudSmnAlertNotifyHandlerImpl.java | 14 +- .../impl/ServerChanAlertNotifyHandlerImpl.java | 12 +- .../notice}/impl/SlackAlertNotifyHandlerImpl.java | 12 +- .../notice}/impl/SmsAlertNotifyHandlerImpl.java | 38 +- .../impl/TelegramBotAlertNotifyHandlerImpl.java | 14 +- .../notice}/impl/WeChatAlertNotifyHandlerImpl.java | 15 +- .../impl/WeComAppAlertNotifyHandlerImpl.java | 24 +- .../impl/WeComRobotAlertNotifyHandlerImpl.java | 14 +- .../impl/WebHookAlertNotifyHandlerImpl.java | 41 +- .../hertzbeat/alert/reduce/AlarmCommonReduce.java | 102 ++- .../alert/reduce/AlarmConvergeReduce.java | 168 ---- .../hertzbeat/alert/reduce/AlarmGroupReduce.java | 329 +++++++ .../hertzbeat/alert/reduce/AlarmInhibitReduce.java | 318 +++++++ .../hertzbeat/alert/reduce/AlarmSilenceReduce.java | 110 +-- .../alert/service/AlertDefineService.java | 56 +- ...Service.java => AlertGroupConvergeService.java} | 36 +- ...nvergeService.java => AlertInhibitService.java} | 42 +- .../hertzbeat/alert/service/AlertService.java | 59 +- .../hertzbeat/alert/service/DataSourceService.java | 20 +- .../alert}/service/NoticeConfigService.java | 12 +- .../hertzbeat/alert}/service/TencentSmsClient.java | 2 +- .../impl/AlertDefineExcelImExportServiceImpl.java | 115 ++- .../alert/service/impl/AlertDefineServiceImpl.java | 118 +-- ...mpl.java => AlertGroupConvergeServiceImpl.java} | 53 +- ...rviceImpl.java => AlertInhibitServiceImpl.java} | 74 +- .../alert/service/impl/AlertServiceImpl.java | 230 ++--- .../service/impl/AlertSilenceServiceImpl.java | 5 +- .../alert/service/impl/DataSourceServiceImpl.java | 53 ++ .../service/impl/NoticeConfigServiceImpl.java | 115 +-- .../controller/AlertDefineControllerTest.java | 24 +- .../controller/AlertDefinesControllerTest.java | 7 +- ....java => AlertGroupConvergeControllerTest.java} | 57 +- ...java => AlertGroupConvergesControllerTest.java} | 40 +- .../controller/AlertReportControllerTest.java | 18 +- .../alert/controller/AlertsControllerTest.java | 41 +- .../controller/NoticeConfigControllerTest.java | 77 +- .../alert/notice/AlertNoticeDispatchTest.java | 147 ++++ .../notice/impl/DbAlertStoreHandlerImplTest.java | 113 +++ .../DingTalkRobotAlertNotifyHandlerImplTest.java | 135 +++ .../impl/DiscordBotAlertNotifyHandlerImplTest.java | 131 +++ .../impl/EmailAlertNotifyHandlerImplTest.java | 137 +++ .../impl/FlyBookAlertNotifyHandlerImplTest.java | 131 +++ .../impl/GotifyAlertNotifyHandlerImplTest.java | 127 +++ .../impl/ServerChanAlertNotifyHandlerImplTest.java | 129 +++ .../impl/SlackAlertNotifyHandlerImplTest.java | 111 +++ .../TelegramBotAlertNotifyHandlerImplTest.java | 127 +++ .../impl/WeComAppAlertNotifyHandlerImplTest.java | 134 +++ .../impl/WeComRobotAlertNotifyHandlerImplTest.java | 127 +++ .../impl/WebHookAlertNotifyHandlerImplTest.java | 111 +++ .../alert/reduce/AlarmCommonReduceTest.java | 93 +- .../alert/reduce/AlarmConvergeReduceTest.java | 112 --- .../alert/reduce/AlarmGroupReduceTest.java | 122 +++ .../alert/reduce/AlarmInhibitReduceTest.java | 350 ++++++++ .../alert/reduce/AlarmSilenceReduceTest.java | 208 +++-- .../AlertDefineExcelImExportServiceTest.java | 28 +- .../AlertDefineJsonImExportServiceTest.java | 18 +- .../alert/service/AlertDefineServiceTest.java | 66 +- .../AlertDefineYamlImExportServiceTest.java | 32 +- ...est.java => AlertGroupConvergeServiceTest.java} | 60 +- .../hertzbeat/alert/service/AlertServiceTest.java | 77 +- .../alert}/service/NoticeConfigServiceTest.java | 83 +- .../pom.xml | 29 +- .../hertzbeat/base}/dao/GeneralConfigDao.java | 2 +- .../base}/service/GeneralConfigService.java | 2 +- .../collect/database/JdbcCommonCollect.java | 12 +- .../collector/collect/ipmi2/IpmiCollectImpl.java | 10 +- .../collect/jmx/CustomizedJmxFactory.java | 88 ++ .../collector/collect/jmx/JmxCollectImpl.java | 35 +- .../collector/collect/jmx/JmxValidator.java | 41 +- .../collector/collect/jmx/MbeanProcessor.java | 52 ++ .../collect/jmx/kafkajmx/KafkaJmxValidator.java | 80 ++ .../KafkaBytesInAndOutPerSecProcessor.java | 58 ++ .../kafkaprocessor/KafkaCommonProcessor.java | 82 ++ .../KafkaReplicaManageProcessor.java | 88 ++ .../collect/prometheus/parser/OnlineParser.java | 329 +++++++ .../collect/redfish/RedfishCollectImpl.java | 13 +- .../collect/redis/RedisCommonCollectImpl.java | 16 +- .../collector/collect/ssh/SshCollectImpl.java | 14 +- .../collect/common/cache/CommonCacheTest.java | 113 --- .../prometheus/parser/OnlineParserTest.java | 84 ++ .../hertzbeat/collector/util/CollectUtilTest.java | 65 ++ .../collector/dispatch/CommonDispatcher.java | 41 +- .../collector/dispatch/MetricsCollect.java | 40 +- ...CommonCache.java => GlobalConnectionCache.java} | 134 +-- .../collector/dispatch/export/NettyDataQueue.java | 15 +- .../hertzbeat/collector/util/CollectUtil.java | 249 +++--- .../collector/collect/kafka/KafkaCollectImpl.java | 61 +- .../collector/collect/kafka/KafkaConnect.java | 28 +- .../collect/mongodb/MongodbSingleCollectImpl.java | 13 +- .../hertzbeat/common/cache/CacheFactory.java | 79 +- .../common/cache/CaffeineCacheServiceImpl.java | 7 +- .../hertzbeat/common/cache/CommonCacheService.java | 9 +- .../common/constants/CommonConstants.java | 80 +- .../common/constants/GeneralConfigTypeEnum.java | 7 +- .../hertzbeat/common/entity/alerter/Alert.java | 158 ---- .../common/entity/alerter/AlertDefine.java | 80 +- ...{AlertConverge.java => AlertGroupConverge.java} | 72 +- .../common/entity/alerter/AlertInhibit.java | 134 +++ .../common/entity/alerter/AlertSilence.java | 55 +- .../{AlertConverge.java => GroupAlert.java} | 82 +- .../entity/alerter/JsonMapAttributeConverter.java | 5 +- .../{manager => alerter}/NoticeReceiver.java | 2 +- .../entity/{manager => alerter}/NoticeRule.java | 20 +- .../{manager => alerter}/NoticeTemplate.java | 2 +- .../Bulletin.java => alerter/SingleAlert.java} | 74 +- .../common/entity/job/protocol/DnsProtocol.java | 2 +- .../common/entity/job/protocol/FtpProtocol.java | 2 +- .../common/entity/job/protocol/HttpProtocol.java | 2 +- .../common/entity/job/protocol/IcmpProtocol.java | 2 +- .../common/entity/job/protocol/ImapProtocol.java | 2 +- .../common/entity/job/protocol/IpmiProtocol.java | 2 +- .../common/entity/job/protocol/JdbcProtocol.java | 2 +- .../common/entity/job/protocol/JmxProtocol.java | 2 +- .../common/entity/job/protocol/KafkaProtocol.java | 2 +- .../entity/job/protocol/MemcachedProtocol.java | 2 +- .../common/entity/job/protocol/ModbusProtocol.java | 2 +- .../entity/job/protocol/MongodbProtocol.java | 2 +- .../common/entity/job/protocol/MqttProtocol.java | 2 +- .../entity/job/protocol/NebulaGraphProtocol.java | 2 +- .../common/entity/job/protocol/NginxProtocol.java | 2 +- .../common/entity/job/protocol/NgqlProtocol.java | 2 +- .../common/entity/job/protocol/NtpProtocol.java | 2 +- .../common/entity/job/protocol/PlcProtocol.java | 2 +- .../common/entity/job/protocol/Pop3Protocol.java | 2 +- .../entity/job/protocol/PrometheusProtocol.java | 2 +- .../common/entity/job/protocol/Protocol.java | 7 +- .../common/entity/job/protocol/PushProtocol.java | 2 +- .../entity/job/protocol/RedfishProtocol.java | 2 +- .../common/entity/job/protocol/RedisProtocol.java | 2 +- .../entity/job/protocol/RegistryProtocol.java | 2 +- .../entity/job/protocol/RocketmqProtocol.java | 2 +- .../common/entity/job/protocol/ScriptProtocol.java | 2 +- .../common/entity/job/protocol/SmtpProtocol.java | 2 +- .../common/entity/job/protocol/SnmpProtocol.java | 2 +- .../common/entity/job/protocol/SshProtocol.java | 2 +- .../common/entity/job/protocol/TelnetProtocol.java | 2 +- .../common/entity/job/protocol/UdpProtocol.java | 2 +- .../entity/job/protocol/WebsocketProtocol.java | 2 +- .../hertzbeat/common/entity/manager/Bulletin.java | 6 - .../entity/manager/JsonTagAttributeConverter.java | 43 - .../manager/JsonTagListAttributeConverter.java | 58 -- .../hertzbeat/common/entity/manager/Monitor.java | 101 +-- .../common/entity/manager/StatusPageComponent.java | 13 +- .../hertzbeat/common/entity/manager/TagItem.java | 41 - .../common/entity/manager/TagMonitorBind.java | 77 -- .../common/entity/message/CollectRep.java | 46 +- .../hertzbeat/common/queue/CommonDataQueue.java | 14 - .../common/queue/impl/InMemoryCommonDataQueue.java | 17 +- .../common/queue/impl/KafkaCommonDataQueue.java | 37 +- .../common/queue/impl/RedisCommonDataQueue.java | 12 - .../common/serialize/AlertDeserializer.java | 49 -- .../common/serialize/AlertSerializer.java | 53 -- .../common/serialize/RedisMetricsDataCodec.java | 55 +- .../common}/support/exception/IgnoreException.java | 2 +- .../hertzbeat/common/util/SdMonitorOperator.java | 18 +- .../common/util/prometheus/PrometheusUtil.java | 255 ------ .../hertzbeat/common/cache/CacheFactoryTest.java | 9 +- .../hertzbeat/common/cache/CaffeineCacheTest.java | 6 + .../queue/impl/InMemoryCommonDataQueueTest.java | 31 +- .../common/serialize/AlertDeserializerTest.java | 96 -- .../common/serialize/AlertSerializerTest.java | 106 --- .../common/util/JexlExpressionRunnerTest.java | 3 + .../apache/hertzbeat/common/util/JsonUtilTest.java | 21 +- .../common/util/prometheus/PrometheusUtilTest.java | 225 ----- .../hertzbeat-collector-basic-e2e/pom.xml | 7 + .../collect/basic/http/DockerMonitorE2eTest.java | 142 +++ .../collect/basic/ssh/SshCollectE2eTest.java | 68 +- .../resources/http/docker/containers_result.txt | 1 + .../resources/http/docker/containers_stats.txt | 1 + .../test/resources/http/docker/system_result.txt | 1 + .../pom.xml | 22 +- .../collector/collect/AbstractCollectE2eTest.java | 121 +++ hertzbeat-e2e/pom.xml | 1 + hertzbeat-manager/pom.xml | 35 +- .../alerter/impl/DbAlertStoreHandlerImpl.java | 83 -- .../component/sd/ServiceDiscoveryWorker.java | 2 +- .../manager/component/status/CalculateStatus.java | 58 +- .../manager/config/ConfigInitializer.java | 14 +- .../manager/controller/MonitorController.java | 18 - .../manager/controller/MonitorsController.java | 11 +- .../manager/controller/StatusPageController.java | 2 +- .../apache/hertzbeat/manager/dao/MonitorDao.java | 2 +- .../hertzbeat/manager/pojo/dto/MuteConfig.java | 39 + .../hertzbeat/manager/scheduler/SchedulerInit.java | 2 +- .../manager/service/AvailableAlertDefineInit.java | 70 -- .../hertzbeat/manager/service/MonitorService.java | 22 +- .../hertzbeat/manager/service/TagService.java | 15 - .../impl/AbstractGeneralConfigServiceImpl.java | 4 +- .../service/impl/AbstractImExportServiceImpl.java | 37 +- .../manager/service/impl/ConfigServiceImpl.java | 2 +- .../service/impl/ExcelImExportServiceImpl.java | 66 +- .../service/impl/MailGeneralConfigServiceImpl.java | 10 +- .../manager/service/impl/MonitorServiceImpl.java | 182 +--- .../service/impl/MuteGeneralConfigServiceImpl.java | 84 ++ .../service/impl/ObjectStoreConfigServiceImpl.java | 36 +- .../service/impl/SmsGeneralConfigServiceImpl.java | 2 +- .../impl/SystemGeneralConfigServiceImpl.java | 2 +- .../service/impl/SystemSecretServiceImpl.java | 2 +- .../manager/service/impl/TagServiceImpl.java | 25 - .../service/impl/TemplateConfigServiceImpl.java | 2 +- .../manager/support/GlobalExceptionHandler.java | 2 +- .../src/main/resources/application.yml | 3 + .../db/migration/h2/V170__update_column.sql | 36 + .../db/migration/mysql/V170__update_column.sql | 96 ++ .../migration/postgresql/V170__update_column.sql | 38 + .../src/main/resources/define/app-kafka.yml | 408 ++++++++- .../src/main/resources/define/app-ubuntu.yml | 25 + .../main/resources/define/app-windows_script.yml | 6 +- .../main/resources/templates/1-EmailTemplate.html | 969 ++------------------- .../resources/templates/10-WeWorkAppTemplate.txt | 54 +- .../templates/11-HuaweiCloudSmnTemplate.txt | 54 +- .../resources/templates/12-ServerChanTemplate.txt | 54 +- .../main/resources/templates/13-GotifyTemplate.txt | 54 +- .../main/resources/templates/2-WebhookTemplate.txt | 62 +- .../resources/templates/4-WeWorkRobotTemplate.txt | 54 +- .../templates/5-DingTalkRobotTemplate.txt | 54 +- .../resources/templates/6-FlyBookRobotTemplate.txt | 53 +- .../resources/templates/7-TelegramBotTemplate.txt | 54 +- .../main/resources/templates/8-SlackTemplate.txt | 54 +- .../resources/templates/9-DiscordBotTemplate.txt | 53 +- .../org/apache/hertzbeat/manager/ManagerTest.java | 6 +- .../component/alerter/DispatcherAlarmTest.java | 131 --- .../alerter/impl/DbAlertStoreHandlerImplTest.java | 164 ---- .../DingTalkRobotAlertNotifyHandlerImplTest.java | 79 -- .../impl/DiscordBotAlertNotifyHandlerImplTest.java | 79 -- .../impl/EmailAlertNotifyHandlerImplTest.java | 108 --- .../impl/FlyBookAlertNotifyHandlerImplTest.java | 78 -- .../impl/GotifyAlertNotifyHandlerImplTest.java | 141 --- .../HuaweiCloudSmnAlertNotifyHandlerImplTest.java | 100 --- .../impl/ServerChanAlertNotifyHandlerImplTest.java | 143 --- .../impl/SlackAlertNotifyHandlerImplTest.java | 80 -- .../impl/SmsAlertNotifyHandlerImplTest.java | 121 --- .../TelegramBotAlertNotifyHandlerImplTest.java | 82 -- .../impl/WeChatAppAlertNotifyHandlerImplTest.java | 75 -- .../impl/WeComAppAlertNotifyHandlerImplTest.java | 133 --- .../impl/WeComRobotAlertNotifyHandlerImplTest.java | 79 -- .../impl/WebHookAlertNotifyHandlerImplTest.java | 136 --- .../manager/controller/MonitorControllerTest.java | 32 - .../hertzbeat/manager/dao/MonitorDaoTest.java | 4 +- .../hertzbeat/manager/dao/NoticeRuleDaoTest.java | 8 +- .../service/AvailableAlertDefineInitTest.java | 102 --- .../manager/service/ConfigServiceTest.java | 9 +- .../manager/service/ExcelImExportServiceTest.java | 3 +- .../service/MailGeneralConfigServiceTest.java | 8 +- .../manager/service/MonitorServiceTest.java | 47 +- .../service/ObjectStoreConfigServiceTest.java | 51 +- .../service/SmsGeneralConfigServiceTest.java | 2 +- .../service/SystemGeneralConfigServiceTest.java | 2 +- .../manager/service/SystemSecretServiceTest.java | 2 +- .../hertzbeat/manager/service/TagServiceTest.java | 14 - .../manager/service/TemplateConfigServiceTest.java | 2 +- .../manager/service/YamlImExportServiceTest.java | 8 +- .../java/org/apache/hertzbeat/plugin/Plugin.java | 4 +- .../apache/hertzbeat/plugin/PostAlertPlugin.java | 4 +- .../push/service/impl/PushGatewayServiceImpl.java | 6 +- .../push/service/PushGatewayServiceTest.java | 104 --- .../service/impl/MetricsDataServiceImpl.java | 4 + .../warehouse/store/DataStorageDispatch.java | 32 +- home/docs/help/doris_be.md | 182 ++-- home/docs/help/kafka_client.md | 10 + home/docs/start/mysql-change.md | 11 +- .../current}/help/doris_be.md | 0 .../current/start/mysql-change.md | 15 +- home/src/css/navbar.css | 13 - home/src/pages/team/index.jsx | 24 + pom.xml | 7 + script/application.yml | 5 +- .../hertzbeat-mysql-iotdb/conf/application.yml | 5 +- .../hertzbeat-mysql-tdengine/conf/application.yml | 5 +- .../conf/application.yml | 5 +- .../conf/application.yml | 5 +- web-app/angular.json | 7 +- web-app/package.json | 1 + .../app/layout/basic/widgets/notify.component.ts | 202 +++-- web-app/src/app/pojo/Alert.ts | 38 - web-app/src/app/pojo/AlertDefine.ts | 22 +- .../{AlertConverge.ts => AlertGroupConverge.ts} | 15 +- .../app/pojo/{AlertConverge.ts => AlertInhibit.ts} | 11 +- web-app/src/app/pojo/AlertSilence.ts | 5 +- web-app/src/app/pojo/{Monitor.ts => GroupAlert.ts} | 19 +- web-app/src/app/pojo/Monitor.ts | 5 +- .../Label.java => web-app/src/app/pojo/Mute.ts | 19 +- web-app/src/app/pojo/NoticeRule.ts | 9 +- .../src/app/pojo/{Monitor.ts => SingleAlert.ts} | 21 +- web-app/src/app/pojo/StatusPageComponent.ts | 4 +- .../alert/alert-center/alert-center.component.html | 344 ++++---- .../alert/alert-center/alert-center.component.less | 284 ++++++ .../alert/alert-center/alert-center.component.ts | 166 +--- .../alert-converge/alert-converge.component.html | 231 ----- .../alert-group-converge.component.html | 257 ++++++ .../alert-group-converge.component.less | 62 ++ .../alert-group-converge.component.spec.ts} | 10 +- .../alert-group-converge.component.ts} | 178 +--- .../alert-inhibit/alert-inhibit.component.html | 198 +++++ .../alert-inhibit/alert-inhibit.component.less | 19 + .../alert-inhibit/alert-inhibit.component.spec.ts} | 14 +- .../alert-inhibit.component.ts} | 183 +--- .../alert-notice-receiver.component.html | 450 ++++++++++ .../alert-notice-receiver.component.less} | 0 .../alert-notice-receiver.component.spec.ts} | 12 +- .../alert-notice-receiver.component.ts | 268 ++++++ .../alert-notice-rule.component.html | 195 +++++ .../alert-notice-rule.component.less} | 0 .../alert-notice-rule.component.spec.ts} | 12 +- .../alert-notice-rule.component.ts | 429 +++++++++ .../alert-notice-template.component.html | 228 +++++ .../alert-notice-template.component.less} | 0 .../alert-notice-template.component.spec.ts} | 12 +- .../alert-notice-template.component.ts | 212 +++++ .../alert/alert-notice/alert-notice.component.html | 863 +----------------- .../alert/alert-notice/alert-notice.component.ts | 843 +----------------- .../src/app/routes/alert/alert-routing.module.ts | 7 +- .../alert-setting/alert-setting.component.html | 506 ++++++----- .../alert-setting/alert-setting.component.less | 183 ++++ .../alert/alert-setting/alert-setting.component.ts | 856 ++++++++++++------ .../alert-silence/alert-silence.component.html | 97 +-- .../alert/alert-silence/alert-silence.component.ts | 86 -- web-app/src/app/routes/alert/alert.module.ts | 16 +- .../app/routes/bulletin/bulletin.component.html | 32 +- .../app/routes/dashboard/dashboard.component.html | 23 +- .../app/routes/dashboard/dashboard.component.ts | 12 +- .../monitor/monitor-edit/monitor-edit.component.ts | 7 +- .../monitor-form/monitor-form.component.html | 20 +- .../monitor/monitor-form/monitor-form.component.ts | 3 +- .../monitor-list/monitor-list.component.html | 69 +- .../monitor-list/monitor-list.component.less | 58 ++ .../monitor/monitor-list/monitor-list.component.ts | 45 +- .../monitor/monitor-new/monitor-new.component.ts | 5 +- .../setting/collector/collector.component.html | 41 +- .../routes/setting/define/define.component.html | 2 +- .../routes/setting/plugins/plugin.component.html | 25 +- .../app/routes/setting/setting-routing.module.ts | 2 +- web-app/src/app/routes/setting/setting.module.ts | 6 +- .../routes/setting/status/status.component.html | 24 +- .../app/routes/setting/status/status.component.ts | 75 +- .../app/routes/setting/tags/tags.component.html | 110 +-- .../app/routes/setting/tags/tags.component.less | 107 +++ .../src/app/routes/setting/tags/tags.component.ts | 74 +- ...service.spec.ts => alert-group.service.spec.ts} | 6 +- ...-converge.service.ts => alert-group.service.ts} | 28 +- ...rvice.spec.ts => alert-inhibit.service.spec.ts} | 8 +- ...onverge.service.ts => alert-inhibit.service.ts} | 32 +- .../src/app/service/alert-sound.service.ts | 42 +- web-app/src/app/service/alert.service.ts | 65 +- web-app/src/app/service/monitor.service.ts | 21 +- web-app/src/app/service/notice-receiver.service.ts | 4 + web-app/src/app/service/notice-rule.service.ts | 4 + web-app/src/app/service/notice-template.service.ts | 5 + .../form-field/form-field.component.html | 2 - .../key-value-input/key-value-input.component.html | 6 +- .../key-value-input/key-value-input.component.less | 2 +- .../labels-input.component.html} | 11 +- .../labels-input.component.less} | 2 +- .../labels-input/labels-input.component.spec.ts} | 12 +- .../labels-input/labels-input.component.ts | 115 +++ .../tags-select/tags-select.component.html | 78 -- .../tags-select/tags-select.component.less | 4 - .../tags-select/tags-select.component.ts | 149 ---- web-app/src/app/shared/shared.module.ts | 6 +- web-app/src/assets/app-data.json | 18 +- web-app/src/assets/audio/default-alert-CN.mp3 | Bin 0 -> 12096 bytes web-app/src/assets/audio/default-alert-EN.mp3 | Bin 0 -> 11664 bytes web-app/src/assets/i18n/en-US.json | 161 +++- web-app/src/assets/i18n/zh-CN.json | 174 +++- web-app/src/assets/i18n/zh-TW.json | 151 +++- web-app/src/styles/theme.less | 10 - web-app/yarn.lock | 10 +- 413 files changed, 14178 insertions(+), 12785 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
