This is an automated email from the ASF dual-hosted git repository. gaoxihui pushed a commit to branch release-2.2.5-incubating-rc2 in repository https://gitbox.apache.org/repos/asf/ozhera.git
commit bd75682e084bb50f58068b9cf3d93a5cf5ea669d Merge: c8c54b09 812cd2d1 Author: gaoxihui <[email protected]> AuthorDate: Sun Feb 23 17:13:00 2025 +0800 Merge branch 'release-2.2.5-incubating-rc2-dev' into release-2.2.5-incubating-rc2 dist/LICENSE | 644 +++++++ dist/NOTICE | 1863 ++++++++++++++++++++ .../dockerfiles/ozhera-app}/Dockerfile | 6 +- .../ozhera-demo-client-server/Dockerfile | 4 +- .../ozhera-demo-server-server/Dockerfile | 4 +- .../ozhera-log-agent-server}/Dockerfile | 4 +- .../dockerfiles/ozhera-log-agent}/Dockerfile | 4 +- .../dockerfiles/ozhera-log-manager}/Dockerfile | 4 +- .../dockerfiles/ozhera-log-stream}/Dockerfile | 6 +- .../dockerfiles/ozhera-monitor}/Dockerfile | 3 +- .../dockerfiles/ozhera-operator}/Dockerfile | 3 +- .../ozhera-prometheus-agent-server/Dockerfile | 4 +- .../dockerfiles/ozhera-trace-etl-es}/Dockerfile | 4 +- .../ozhera-trace-etl-manager}/Dockerfile | 4 +- .../ozhera-trace-etl-server}/Dockerfile | 4 +- .../dockerfiles/ozhera-webhook}/Dockerfile | 5 +- dist/sql/mysql/ozhera.sql | 978 ++++++++++ dist/sql/postgre/ozhera.sql | 1483 ++++++++++++++++ ...nsource-outer.properties => merge-dependency.sh | 31 +- ozhera-app/app-server/Dockerfile | 8 +- ozhera-app/app-server/pom.xml | 37 +- .../apache/ozhera/app/config/DataSourceConfig.java | 8 +- .../src/main/resources/application.properties | 5 - ozhera-app/app-service/pom.xml | 15 +- .../ozhera-demo-client-server/Dockerfile | 6 +- .../ozhera-demo-client-server/pom.xml | 4 +- .../ozhera-demo-client-service/pom.xml | 6 + .../ozhera-demo-server-server/Dockerfile | 6 +- .../ozhera-demo-server-server/pom.xml | 4 +- .../main/resources/config/open-source.properties | 1 - ozhera-log/log-agent-server/Dockerfile | 8 +- ozhera-log/log-agent-server/pom.xml | 29 - ozhera-log/log-agent/Dockerfile | 9 +- ozhera-log/log-agent/pom.xml | 29 - ozhera-log/log-common/pom.xml | 4 +- ozhera-log/log-manager/Dockerfile | 10 +- ozhera-log/log-manager/pom.xml | 40 +- ozhera-log/log-stream/Dockerfile | 10 +- ozhera-log/log-stream/pom.xml | 35 - ozhera-log/pom.xml | 7 - ozhera-monitor/ozhera-monitor-common/pom.xml | 3 +- ozhera-monitor/ozhera-monitor-server/Dockerfile | 5 +- ozhera-monitor/ozhera-monitor-server/pom.xml | 4 +- ozhera-monitor/ozhera-monitor-service/pom.xml | 43 +- ozhera-operator/ozhera-operator-server/Dockerfile | 4 +- ozhera-operator/ozhera-operator-server/pom.xml | 14 +- .../hera_app_config_#_DEFAULT_GROUP.properties | 5 + ...era_log_manager_open_#_DEFAULT_GROUP.properties | 1 + .../hera_trace_config_#_DEFAULT_GROUP.properties | 1 + ...us_agent_open_config_#_DEFAULT_GROUP.properties | 2 +- ozhera-operator/ozhera-operator-service/pom.xml | 12 +- .../operator/handler/HeraResourceEventHandler.java | 5 +- .../operator/service/HeraBootstrapInitService.java | 30 +- .../ozhera-prometheus-agent-common/pom.xml | 2 +- .../ozhera-prometheus-agent-dao/pom.xml | 16 +- .../ozhera-prometheus-agent-server/Dockerfile | 6 +- .../ozhera-prometheus-agent-server/pom.xml | 37 + ozhera-prometheus-agent/pom.xml | 6 - ozhera-webhook/ozhera-webhook-server/Dockerfile | 5 +- ozhera-webhook/ozhera-webhook-server/pom.xml | 4 +- ozhera-webhook/pom.xml | 4 +- pom.xml | 43 +- trace-etl/trace-etl-dao/pom.xml | 10 +- trace-etl/trace-etl-es/Dockerfile | 6 +- trace-etl/trace-etl-es/pom.xml | 4 +- .../trace/etl/es/config/DataSourceConfig.java | 2 +- .../src/main/resources/application.properties | 3 - .../resources/config/opensource-outer.properties | 2 - .../etl/extension/doris/config/DorisConfig.java | 2 +- trace-etl/trace-etl-manager/Dockerfile | 6 +- trace-etl/trace-etl-manager/pom.xml | 4 +- .../trace/etl/manager/config/DataSourceConfig.java | 2 +- .../src/main/resources/application.properties | 3 - .../resources/config/opensource-outer.properties | 2 - trace-etl/trace-etl-server/Dockerfile | 6 +- trace-etl/trace-etl-server/pom.xml | 10 +- .../ozhera/trace/etl/config/DataSourceConfig.java | 2 +- .../src/main/resources/application.properties | 4 - .../resources/config/opensource-outer.properties | 2 - trace-etl/trace-etl-service/pom.xml | 12 + 80 files changed, 5331 insertions(+), 342 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
