This is an automated email from the ASF dual-hosted git repository.

shown pushed a change to branch yuluo-yx-patch-1
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git


    from 7bd7b33af6 Merge branch 'master' into yuluo-yx-patch-1
     add 360abcc61d [feature] Using duckdb instead of jpa to store history data 
(#3883)
     add 4ae6ba9a3c feat: update add monitors pop selected menus modal (#3878)
     add 3e567e5be6 [improve]Improve issues related to tag conflicts (#3889)
     add 7727d63451 [add] Add parameter validators and their corresponding 
tests (#3888)
     add 964566020f Merge branch 'master' into yuluo-yx-patch-1

No new revisions were added by this update.

Summary of changes:
 .../realtime/MetricsRealTimeAlertCalculator.java   |   1 -
 ...gnConstants.java => HertzBeatKeywordsEnum.java} |  31 +-
 .../common/util/HertzBeatKeywordsUtil.java         |  34 +-
 .../common/util/HertzBeatKeywordsUtilTest.java     |  54 +++
 .../log/alert/LogPeriodicAlertE2eTest.java         |   2 +-
 .../log/storage/GreptimeLogStorageE2eTest.java     |   2 +-
 .../validator/ParamValidator.java}                 |  29 +-
 .../component/validator/ParamValidatorManager.java |  36 +-
 .../validator/impl/ArrayParamValidator.java        |  46 +++
 .../validator/impl/BooleanParamValidator.java      |  31 +-
 .../validator/impl/HostParamValidatorAdapter.java  |  49 +++
 .../validator/impl/JsonParamValidator.java         |  30 +-
 .../validator/impl/NumberParamValidator.java       |  53 +++
 .../validator/impl/OptionParamValidator.java       |  54 +++
 .../validator/impl/PasswordParamValidator.java     |  34 +-
 .../validator/impl/TextParamValidator.java         |  31 +-
 .../service/helper/MonitorImExportHelper.java      |  85 +++++
 .../manager/service/impl/AppServiceImpl.java       |  13 +-
 .../manager/service/impl/MonitorServiceImpl.java   | 309 +++++-----------
 .../main/resources/define/app-influxdb_promql.yml  |  36 +-
 .../src/main/resources/define/app-kafka_promql.yml |  19 +-
 .../validator/ParamValidatorManagerTest.java       |  72 ++++
 .../validator/impl/ArrayParamValidatorTest.java    |  74 ++++
 .../validator/impl/BooleanParamValidatorTest.java  |  85 +++++
 .../impl/HostParamValidatorAdapterTest.java        |  95 +++++
 .../validator/impl/JsonParamValidatorTest.java     |  66 ++++
 .../validator/impl/NumberParamValidatorTest.java   |  90 +++++
 .../validator/impl/OptionParamValidatorTest.java   |  81 +++++
 .../validator/impl/PasswordParamValidatorTest.java |  75 ++++
 .../validator/impl/TextParamValidatorTest.java     |  68 ++++
 .../manager/service/MonitorServiceTest.java        | 114 ++++--
 .../service/helper/MonitorImExportHelperTest.java  | 100 +++++
 .../src/main/resources/application-test.yml        |   5 +-
 .../src/main/resources/application.yml             |   7 +-
 hertzbeat-warehouse/pom.xml                        |   8 +-
 .../warehouse/constants/WarehouseConstants.java    |   2 +
 .../tsdb/duckdb/DuckdbDatabaseDataStorage.java     | 402 +++++++++++++++++++++
 .../DuckdbProperties.java}                         |  16 +-
 .../history/tsdb/jpa/JpaDatabaseDataStorage.java   | 273 --------------
 .../store/history/tsdb/jpa/JpaProperties.java      |  41 ---
 .../docs/help/{mcp_sse_server.md => mcp_server.md} |   2 +-
 .../help/{mcp_sse_server.md => mcp_server.md}      |   2 +-
 home/sidebars.json                                 |   2 +-
 material/licenses/LICENSE                          |   1 +
 pom.xml                                            |   1 +
 script/application.yml                             |   7 +-
 .../monitor-list/monitor-list.component.html       |  10 +-
 .../monitor-list/monitor-list.component.less       |  17 +-
 .../routes/setting/define/define.component.html    |   4 +-
 .../monitor-select-list.component.html}            |   0
 .../monitor-select-list.component.less}            |   0
 .../monitor-select-list.component.spec.ts}         |  12 +-
 .../monitor-select-list.component.ts}              |   8 +-
 .../monitor-select-menu.component.html             |  45 ++-
 .../monitor-select-menu.component.less             | 157 +++++++-
 .../monitor-select-menu.component.ts               |  21 ++
 web-app/src/app/shared/shared.module.ts            |   2 +
 web-app/src/assets/app-data.json                   |   2 +-
 58 files changed, 2153 insertions(+), 793 deletions(-)
 copy 
hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/{SignConstants.java
 => HertzBeatKeywordsEnum.java} (66%)
 copy 
hertzbeat-collector/hertzbeat-collector-common/src/main/java/org/apache/hertzbeat/collector/dispatch/unit/impl/TimeLengthConvert.java
 => 
hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/HertzBeatKeywordsUtil.java
 (51%)
 create mode 100644 
hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/HertzBeatKeywordsUtilTest.java
 copy 
hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/{pojo/dto/PluginParametersVO.java
 => component/validator/ParamValidator.java} (58%)
 copy 
hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonByteListAttributeConverter.java
 => 
hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/component/validator/ParamValidatorManager.java
 (51%)
 create mode 100644 
hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/component/validator/impl/ArrayParamValidator.java
 copy 
hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/ZonedDateTimeAttributeConverter.java
 => 
hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/component/validator/impl/BooleanParamValidator.java
 (53%)
 create mode 100644 
hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/component/validator/impl/HostParamValidatorAdapter.java
 copy 
hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/JsonMapAttributeConverter.java
 => 
hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/component/validator/impl/JsonParamValidator.java
 (55%)
 create mode 100644 
hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/component/validator/impl/NumberParamValidator.java
 create mode 100644 
hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/component/validator/impl/OptionParamValidator.java
 copy 
hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/ZonedDateTimeAttributeConverter.java
 => 
hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/component/validator/impl/PasswordParamValidator.java
 (51%)
 copy 
hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/ZonedDateTimeAttributeConverter.java
 => 
hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/component/validator/impl/TextParamValidator.java
 (53%)
 create mode 100644 
hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/helper/MonitorImExportHelper.java
 create mode 100644 
hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/component/validator/ParamValidatorManagerTest.java
 create mode 100644 
hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/component/validator/impl/ArrayParamValidatorTest.java
 create mode 100644 
hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/component/validator/impl/BooleanParamValidatorTest.java
 create mode 100644 
hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/component/validator/impl/HostParamValidatorAdapterTest.java
 create mode 100644 
hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/component/validator/impl/JsonParamValidatorTest.java
 create mode 100644 
hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/component/validator/impl/NumberParamValidatorTest.java
 create mode 100644 
hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/component/validator/impl/OptionParamValidatorTest.java
 create mode 100644 
hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/component/validator/impl/PasswordParamValidatorTest.java
 create mode 100644 
hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/component/validator/impl/TextParamValidatorTest.java
 create mode 100644 
hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/helper/MonitorImExportHelperTest.java
 create mode 100644 
hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/tsdb/duckdb/DuckdbDatabaseDataStorage.java
 copy 
hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/tsdb/{vm/VictoriaMetricsClusterProperties.java
 => duckdb/DuckdbProperties.java} (76%)
 delete mode 100644 
hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/tsdb/jpa/JpaDatabaseDataStorage.java
 delete mode 100644 
hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/tsdb/jpa/JpaProperties.java
 rename home/docs/help/{mcp_sse_server.md => mcp_server.md} (99%)
 rename 
home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/{mcp_sse_server.md 
=> mcp_server.md} (99%)
 copy 
web-app/src/app/shared/components/{monitor-select-menu/monitor-select-menu.component.html
 => monitor-select-list/monitor-select-list.component.html} (100%)
 copy 
web-app/src/app/shared/components/{monitor-select-menu/monitor-select-menu.component.less
 => monitor-select-list/monitor-select-list.component.less} (100%)
 copy 
web-app/src/app/shared/components/{configurable-field/configurable-field.component.spec.ts
 => monitor-select-list/monitor-select-list.component.spec.ts} (77%)
 mode change 100644 => 100755
 copy 
web-app/src/app/shared/components/{monitor-select-menu/monitor-select-menu.component.ts
 => monitor-select-list/monitor-select-list.component.ts} (90%)


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to