This is an automated email from the ASF dual-hosted git repository.
Aias00 pushed a change to branch fix/008-questdb-sql-injection
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
from 3a73a34daf Merge branch 'master' into fix/008-questdb-sql-injection
add 42307a9928 [feat] Support etcd monitoring (#4306)
add 3e7c2bc67f feat(alerter): support Alibaba Cloud Monitor webhook (#4296)
add 4feff12e32 fix(alert): keep datasource in alert rule export/import
(#4264)
add cfb3dee490 [fix] fix align cors configuration with header based
authentication (#4267)
add 41c4fb7ff5 [fix] add missing rbac rules for the remaining unruled
routes (#4271)
add f07215639d [feat] paginate the monitoring metrics data table (#4309)
add 8a62215e8b test(web): make web-app unit tests runnable (#4314)
add 2cea398910 fix(ai): create conversation when conversation ID is
missing (#4315)
add 001e229236 fix(ai): persist parameters for scheduled skills (#4317)
add cbb62a3358 [fix] bound what one anonymous push request can consume
(#4273)
add cf737db2ee [fix] stop serving the openapi document to anonymous
callers (#4276)
add f952d47eb4 [security] Restrict plugin upload endpoint to admin role
(#4149) (#4257)
add b61dbfcacf fix(collector): correct jsonpath alias parsing for rows
missing path (#4265)
add e12a1ddead [fix] keep one-row metric data when command output is short
(#4308)
add 1ebfe76c37 [fix] evaluate threshold rules with empty field values
(#4307)
add a08a365952 fix(collector): keep partial telnet metrics, surface raw
reply (#4311)
add 1573236b15 fix(deps): replace bouncycastle jdk15on with jdk18on 1.85
(#4312)
add 33284bb955 [fix] strip NUL bytes before tdengine history insert (#4310)
add c2755a37b1 Merge branch 'master' into fix/008-questdb-sql-injection
No new revisions were added by this update.
Summary of changes:
.github/workflows/frontend-build-test.yml | 4 +
.../ai/service/impl/ConversationServiceImpl.java | 40 ++-
.../hertzbeat/ai/tools/impl/ScheduleToolsImpl.java | 75 ++++-
.../service/impl/ConversationServiceImplTest.java | 42 +++
.../ai/tools/impl/ScheduleToolsImplTest.java | 129 ++++++++
.../realtime/MetricsRealTimeAlertCalculator.java | 16 +-
.../apache/hertzbeat/alert/dto/AlertDefineDTO.java | 2 +
.../alert/dto/AlibabaCloudCmsExternAlert.java | 142 ++++++++
.../impl/AlertDefineExcelImExportServiceImpl.java | 6 +-
.../impl/AlibabaCloudCmsExternAlertService.java | 195 +++++++++++
.../MetricsRealTimeAlertCalculatorMatchTest.java | 88 +++++
.../AlertDefineExcelImExportServiceTest.java | 5 +
.../AlertDefineJsonImExportServiceTest.java | 30 +-
.../AlertDefineYamlImExportServiceTest.java | 3 +
.../AlibabaCloudCmsExternAlertServiceTest.java | 180 ++++++++++
.../hertzbeat-collector-basic/pom.xml | 4 +-
.../collect/common/OneRowResponseSupport.java | 113 +++++++
.../collector/collect/http/HttpCollectImpl.java | 12 +-
.../collect/prometheus/parser/OnlineParser.java | 35 +-
.../collect/script/ScriptCollectImpl.java | 79 +++--
.../collector/collect/ssh/SshCollectImpl.java | 49 ++-
.../collect/telnet/TelnetCollectImpl.java | 48 ++-
.../collect/common/OneRowResponseSupportTest.java | 123 +++++++
.../collect/http/HttpCollectImplTest.java | 43 +++
.../collector/collect/mqtt/MqttSslFactoryTest.java | 88 +++++
.../prometheus/parser/OnlineParserTest.java | 25 ++
.../collect/script/ScriptCollectImplTest.java | 82 +++++
.../collector/collect/ssh/SshCollectImplTest.java | 136 ++++++++
.../collect/telnet/TelnetCollectImplTest.java | 110 ++++++
.../collector/dispatch/MetricsCollect.java | 12 +-
.../collector/dispatch/MetricsCollectTest.java | 73 ++++
.../hertzbeat/collector/util/JsonPathParser.java | 18 +
.../collector/util/JsonPathParserTest.java | 81 +++++
.../hertzbeat-collector-nebulagraph/pom.xml | 13 +
.../VesoftSslBouncyCastleSmokeTest.java | 67 ++++
.../common/entity/job/protocol/SshProtocol.java | 5 +
...MonitorE2eTest.java => EtcdMonitorE2eTest.java} | 82 +++--
.../src/test/resources/http/etcd/metrics.txt | 17 +
.../src/test/resources/sureness.yml | 15 +-
.../config/AuthorizedSwaggerIndexTransformer.java | 126 +++++++
.../manager/config/SecurityCorsConfiguration.java | 4 +-
.../hertzbeat/manager/config/SwaggerConfig.java | 28 ++
.../src/main/resources/define/app-etcd.yml | 328 ++++++++++++++++++
.../AuthorizedSwaggerIndexTransformerTest.java | 105 ++++++
.../config/SecurityCorsConfigurationTest.java | 70 ++++
hertzbeat-manager/src/test/resources/sureness.yml | 15 +-
.../push/service/impl/PushGatewayServiceImpl.java | 315 ++++++++++++++++--
.../service/impl/PushGatewayServiceImplTest.java | 367 +++++++++++++++++++++
.../src/main/resources/application.yml | 15 +
hertzbeat-startup/src/main/resources/sureness.yml | 36 +-
.../OpenApiDocumentDisabledByDefaultTest.java | 142 ++++++++
.../security/SurenessOpenApiDocRuleTest.java | 207 ++++++++++++
.../security/SurenessUnruledEndpointTest.java | 130 ++++++++
.../history/tsdb/tdengine/TdEngineDataStorage.java | 10 +-
.../warehouse/store/TdEngineDataStorageTest.java | 29 +-
home/docs/help/etcd.md | 65 ++++
home/docs/start/account-modify.md | 37 ++-
.../current/help/etcd.md | 65 ++++
.../current/start/account-modify.md | 37 ++-
home/sidebars.json | 1 +
material/licenses/LICENSE | 6 +-
material/licenses/backend/LICENSE | 6 +-
...pkix-jdk15on.txt => LICENSE-bcpkix-jdk18on.txt} | 0
...prov-jdk15on.txt => LICENSE-bcprov-jdk18on.txt} | 0
...util-jdk15on.txt => LICENSE-bcutil-jdk18on.txt} | 0
material/licenses/collector/LICENSE | 6 +-
...pkix-jdk15on.txt => LICENSE-bcpkix-jdk18on.txt} | 0
...prov-jdk15on.txt => LICENSE-bcprov-jdk18on.txt} | 0
...util-jdk15on.txt => LICENSE-bcutil-jdk18on.txt} | 0
pom.xml | 1 +
script/application.yml | 15 +
.../hertzbeat-mysql-iotdb/conf/application.yml | 23 +-
.../hertzbeat-mysql-iotdb/conf/sureness.yml | 32 +-
.../hertzbeat-mysql-tdengine/conf/application.yml | 23 +-
.../hertzbeat-mysql-tdengine/conf/sureness.yml | 32 +-
.../conf/application.yml | 23 +-
.../conf/sureness.yml | 32 +-
.../conf/application.yml | 21 +-
.../conf/sureness.yml | 32 +-
.../.env.example | 5 +-
.../.gitignore | 4 +-
.../conf/application.yml | 21 +-
.../conf/sureness.yml | 32 +-
.../docker-compose.yaml | 6 +-
script/sureness.yml | 32 +-
web-app/karma.conf.js | 3 +-
web-app/package.json | 4 +-
web-app/src/app/core/i18n/i18n.service.spec.ts | 2 +-
.../setting-drawer-i18n.directive.spec.ts | 41 ++-
.../alert-center/alert-center.component.spec.ts | 5 +-
.../alert-group-converge.component.spec.ts | 5 +-
.../alert-inhibit/alert-inhibit.component.spec.ts | 5 +-
.../alert-integration.component.spec.ts | 6 +-
.../alert-integration.component.ts | 5 +
.../alert-notice-receiver.component.spec.ts | 5 +-
.../alert-notice-rule.component.spec.ts | 5 +-
.../alert-notice-template.component.spec.ts | 5 +-
.../alert-notice/alert-notice.component.spec.ts | 5 +-
.../alert-setting/alert-setting.component.spec.ts | 5 +-
.../alert-silence/alert-silence.component.spec.ts | 5 +-
.../app/routes/bulletin/bulletin.component.spec.ts | 5 +-
.../monitor-data-chart.component.spec.ts | 5 +-
.../monitor-data-table.component.html | 12 +-
.../monitor-data-table.component.spec.ts | 5 +-
.../monitor-data-table.component.ts | 7 +-
.../monitor-detail.component.spec.ts | 5 +-
.../monitor-edit/monitor-edit.component.spec.ts | 5 +-
.../monitor-form/monitor-form.component.spec.ts | 8 +-
.../monitor-list/monitor-list.component.spec.ts | 5 +-
.../monitor-new/monitor-new.component.spec.ts | 5 +-
.../setting/collector/collector.component.spec.ts | 5 +-
.../routes/setting/define/define.component.spec.ts | 5 +-
.../routes/setting/label/label.component.spec.ts | 5 +-
.../setting/plugins/plugin.component.spec.ts | 5 +-
.../message-server.component.spec.ts | 5 +-
.../object-store/object-store.component.spec.ts | 5 +-
.../setting/settings/settings.component.spec.ts | 7 +-
.../system-config/system-config.component.spec.ts | 5 +-
.../routes/setting/status/status.component.spec.ts | 5 +-
.../status-public/status-public.component.spec.ts | 5 +-
.../src/app/service/alert-define.service.spec.ts | 3 +-
.../src/app/service/alert-group.service.spec.ts | 3 +-
.../src/app/service/alert-inhibit.service.spec.ts | 3 +-
.../src/app/service/alert-silence.service.spec.ts | 3 +-
web-app/src/app/service/alert.service.spec.ts | 3 +-
web-app/src/app/service/app-define.service.spec.ts | 3 +-
web-app/src/app/service/auth.service.spec.ts | 3 +-
web-app/src/app/service/collector.service.spec.ts | 3 +-
web-app/src/app/service/label.service.spec.ts | 3 +-
web-app/src/app/service/monitor.service.spec.ts | 3 +-
.../app/service/notice-receiver.service.spec.ts | 3 +-
.../src/app/service/notice-rule.service.spec.ts | 3 +-
.../app/service/notice-template.service.spec.ts | 3 +-
web-app/src/app/service/plugin.service.spec.ts | 3 +-
.../app/service/status-page-public.service.spec.ts | 3 +-
.../src/app/service/status-page.service.spec.ts | 3 +-
.../configurable-field.component.spec.ts | 5 +-
.../form-field/form-field.component.spec.ts | 6 +-
.../help-message-show.component.spec.ts | 5 +-
.../label-selector.component.spec.ts | 5 +-
.../monitor-select-list.component.spec.ts | 5 +-
.../monitor-select-menu.component.spec.ts | 5 +-
.../multi-func-input.component.spec.ts | 6 +-
.../components/toolbar/toolbar.component.spec.ts | 5 +-
.../alert-integration/alibabacloud-cms.en-US.md | 75 +++++
.../alert-integration/alibabacloud-cms.zh-CN.md | 75 +++++
web-app/src/assets/i18n/en-US.json | 1 +
web-app/src/assets/i18n/ja-JP.json | 1 +
web-app/src/assets/i18n/ko-KR.json | 1 +
web-app/src/assets/i18n/pt-BR.json | 1 +
web-app/src/assets/i18n/zh-CN.json | 1 +
web-app/src/assets/i18n/zh-TW.json | 1 +
web-app/src/testing.ts | 76 +++++
web-app/tsconfig.json | 3 +
154 files changed, 4874 insertions(+), 442 deletions(-)
create mode 100644
hertzbeat-ai/src/test/java/org/apache/hertzbeat/ai/tools/impl/ScheduleToolsImplTest.java
create mode 100644
hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/dto/AlibabaCloudCmsExternAlert.java
create mode 100644
hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlibabaCloudCmsExternAlertService.java
create mode 100644
hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/service/AlibabaCloudCmsExternAlertServiceTest.java
create mode 100644
hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/common/OneRowResponseSupport.java
create mode 100644
hertzbeat-collector/hertzbeat-collector-basic/src/test/java/org/apache/hertzbeat/collector/collect/common/OneRowResponseSupportTest.java
create mode 100644
hertzbeat-collector/hertzbeat-collector-basic/src/test/java/org/apache/hertzbeat/collector/collect/mqtt/MqttSslFactoryTest.java
create mode 100644
hertzbeat-collector/hertzbeat-collector-collector/src/test/java/org/apache/hertzbeat/collector/dispatch/MetricsCollectTest.java
create mode 100644
hertzbeat-collector/hertzbeat-collector-common/src/test/java/org/apache/hertzbeat/collector/util/JsonPathParserTest.java
create mode 100644
hertzbeat-collector/hertzbeat-collector-nebulagraph/src/test/java/org/apache/hertzbeat/collector/collect/nebulagraph/VesoftSslBouncyCastleSmokeTest.java
copy
hertzbeat-e2e/hertzbeat-collector-basic-e2e/src/test/java/org/apache/hertzbeat/collector/collect/basic/http/{DockerMonitorE2eTest.java
=> EtcdMonitorE2eTest.java} (59%)
create mode 100644
hertzbeat-e2e/hertzbeat-collector-basic-e2e/src/test/resources/http/etcd/metrics.txt
create mode 100644
hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/config/AuthorizedSwaggerIndexTransformer.java
create mode 100644 hertzbeat-manager/src/main/resources/define/app-etcd.yml
create mode 100644
hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/config/AuthorizedSwaggerIndexTransformerTest.java
create mode 100644
hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/config/SecurityCorsConfigurationTest.java
create mode 100644
hertzbeat-push/src/test/java/org/apache/hertzbeat/push/service/impl/PushGatewayServiceImplTest.java
create mode 100644
hertzbeat-startup/src/test/java/org/apache/hertzbeat/startup/security/OpenApiDocumentDisabledByDefaultTest.java
create mode 100644
hertzbeat-startup/src/test/java/org/apache/hertzbeat/startup/security/SurenessOpenApiDocRuleTest.java
create mode 100644
hertzbeat-startup/src/test/java/org/apache/hertzbeat/startup/security/SurenessUnruledEndpointTest.java
create mode 100644 home/docs/help/etcd.md
create mode 100644
home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/etcd.md
rename material/licenses/backend/{LICENSE-bcpkix-jdk15on.txt =>
LICENSE-bcpkix-jdk18on.txt} (100%)
rename material/licenses/backend/{LICENSE-bcprov-jdk15on.txt =>
LICENSE-bcprov-jdk18on.txt} (100%)
rename material/licenses/backend/{LICENSE-bcutil-jdk15on.txt =>
LICENSE-bcutil-jdk18on.txt} (100%)
rename material/licenses/collector/{LICENSE-bcpkix-jdk15on.txt =>
LICENSE-bcpkix-jdk18on.txt} (100%)
rename material/licenses/collector/{LICENSE-bcprov-jdk15on.txt =>
LICENSE-bcprov-jdk18on.txt} (100%)
rename material/licenses/collector/{LICENSE-bcutil-jdk15on.txt =>
LICENSE-bcutil-jdk18on.txt} (100%)
copy
hertzbeat-collector/hertzbeat-collector-collector/src/main/resources/META-INF/spring.factories
=> script/docker-compose/hertzbeat-postgresql-victoria-metrics/.env.example
(85%)
copy
hertzbeat-plugin/src/main/resources/META-INF/services/org.apache.hertzbeat.plugin.PostCollectPlugin
=> script/docker-compose/hertzbeat-postgresql-victoria-metrics/.gitignore (99%)
create mode 100644
web-app/src/assets/doc/alert-integration/alibabacloud-cms.en-US.md
create mode 100644
web-app/src/assets/doc/alert-integration/alibabacloud-cms.zh-CN.md
create mode 100644 web-app/src/testing.ts
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
