This is an automated email from the ASF dual-hosted git repository.
aloyszhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 82128a3666 [INLONG-11535][Manager] Enhance schedule engine config
(#11536)
82128a3666 is described below
commit 82128a36669053dab0abd96a571dce17b046362e
Author: emptyOVO <[email protected]>
AuthorDate: Mon Nov 25 09:56:33 2024 +0800
[INLONG-11535][Manager] Enhance schedule engine config (#11536)
---
.../inlong/manager/schedule/airflow/config/AirflowConfig.java | 2 +-
.../schedule/dolphinscheduler/DolphinScheduleEngine.java | 2 +-
.../manager-web/src/main/resources/application-dev.properties | 11 ++++++-----
.../src/main/resources/application-prod.properties | 11 ++++++-----
.../src/main/resources/application-test.properties | 11 ++++++-----
5 files changed, 20 insertions(+), 17 deletions(-)
diff --git
a/inlong-manager/manager-schedule/src/main/java/org/apache/inlong/manager/schedule/airflow/config/AirflowConfig.java
b/inlong-manager/manager-schedule/src/main/java/org/apache/inlong/manager/schedule/airflow/config/AirflowConfig.java
index 60bb6673ce..489712abe9 100644
---
a/inlong-manager/manager-schedule/src/main/java/org/apache/inlong/manager/schedule/airflow/config/AirflowConfig.java
+++
b/inlong-manager/manager-schedule/src/main/java/org/apache/inlong/manager/schedule/airflow/config/AirflowConfig.java
@@ -38,7 +38,7 @@ import org.springframework.context.annotation.Configuration;
@EqualsAndHashCode(callSuper = true)
public class AirflowConfig extends ClientConfiguration {
- @Value("${schedule.engine.airflow.inlong.manager.host:127.0.0.1}")
+ @Value("${schedule.engine.inlong.manager.host:127.0.0.1}")
private String host;
@Value("${server.port:8083}")
diff --git
a/inlong-manager/manager-schedule/src/main/java/org/apache/inlong/manager/schedule/dolphinscheduler/DolphinScheduleEngine.java
b/inlong-manager/manager-schedule/src/main/java/org/apache/inlong/manager/schedule/dolphinscheduler/DolphinScheduleEngine.java
index 7b09481cea..dd0c6d0c81 100644
---
a/inlong-manager/manager-schedule/src/main/java/org/apache/inlong/manager/schedule/dolphinscheduler/DolphinScheduleEngine.java
+++
b/inlong-manager/manager-schedule/src/main/java/org/apache/inlong/manager/schedule/dolphinscheduler/DolphinScheduleEngine.java
@@ -56,7 +56,7 @@ public class DolphinScheduleEngine implements ScheduleEngine {
private static final Logger LOGGER =
LoggerFactory.getLogger(DolphinScheduleEngine.class);
- @Value("${server.host:127.0.0.1}")
+ @Value("${schedule.engine.inlong.manager.host:127.0.0.1}")
private String host;
@Value("${server.port:8083}")
diff --git
a/inlong-manager/manager-web/src/main/resources/application-dev.properties
b/inlong-manager/manager-web/src/main/resources/application-dev.properties
index f17c451aee..39900e1fdb 100644
--- a/inlong-manager/manager-web/src/main/resources/application-dev.properties
+++ b/inlong-manager/manager-web/src/main/resources/application-dev.properties
@@ -110,16 +110,17 @@ dirty.log.clean.interval.minutes=5
dirty.log.retention.minutes=10
dirty.log.db.table=inlong_iceberg::dirty_data_achive_iceberg
+# Please confirm it is the actual address of manager
+schedule.engine.inlong.manager.host=
+
# DolphinScheduler related config
-schedule.engine.dolphinscheduler.url=http://127.0.0.1:12345/dolphinscheduler
-schedule.engine.dolphinscheduler.token=default_token_value
+schedule.engine.dolphinscheduler.url=
+schedule.engine.dolphinscheduler.token=
-# Airflow configuration
+# Airflow related config
schedule.engine.airflow.baseUrl=
schedule.engine.airflow.username=
schedule.engine.airflow.password=
schedule.engine.airflow.connection.id=
-# Please confirm if it is a loopback address
-schedule.engine.airflow.inlong.manager.host=
schedule.engine.airflow.cleaner.id=
schedule.engine.airflow.creator.id=
\ No newline at end of file
diff --git
a/inlong-manager/manager-web/src/main/resources/application-prod.properties
b/inlong-manager/manager-web/src/main/resources/application-prod.properties
index 129bce9ac6..4de0f65d20 100644
--- a/inlong-manager/manager-web/src/main/resources/application-prod.properties
+++ b/inlong-manager/manager-web/src/main/resources/application-prod.properties
@@ -101,16 +101,17 @@ dirty.log.clean.interval.minutes=5
dirty.log.retention.minutes=10
dirty.log.db.table=inlong_iceberg::dirty_data_achive_iceberg
+# Please confirm it is the actual address of manager
+schedule.engine.inlong.manager.host=
+
# DolphinScheduler related config
-schedule.engine.dolphinscheduler.url=http://127.0.0.1:12345/dolphinscheduler
-schedule.engine.dolphinscheduler.token=default_token_value
+schedule.engine.dolphinscheduler.url=
+schedule.engine.dolphinscheduler.token=
-# Airflow configuration
+# Airflow related config
schedule.engine.airflow.baseUrl=
schedule.engine.airflow.username=
schedule.engine.airflow.password=
schedule.engine.airflow.connection.id=
-# Please confirm if it is a loopback address
-schedule.engine.airflow.inlong.manager.host=
schedule.engine.airflow.cleaner.id=
schedule.engine.airflow.creator.id=
\ No newline at end of file
diff --git
a/inlong-manager/manager-web/src/main/resources/application-test.properties
b/inlong-manager/manager-web/src/main/resources/application-test.properties
index a062bc2c63..96e33e5fd4 100644
--- a/inlong-manager/manager-web/src/main/resources/application-test.properties
+++ b/inlong-manager/manager-web/src/main/resources/application-test.properties
@@ -102,16 +102,17 @@ dirty.log.clean.interval.minutes=5
dirty.log.retention.minutes=10
dirty.log.db.table=inlong_iceberg::dirty_data_achive_iceberg
+# Please confirm it is the actual address of manager
+schedule.engine.inlong.manager.host=
+
# DolphinScheduler related config
-schedule.engine.dolphinscheduler.url=http://127.0.0.1:12345/dolphinscheduler
-schedule.engine.dolphinscheduler.token=default_token_value
+schedule.engine.dolphinscheduler.url=
+schedule.engine.dolphinscheduler.token=
-# Airflow configuration
+# Airflow related config
schedule.engine.airflow.baseUrl=
schedule.engine.airflow.username=
schedule.engine.airflow.password=
schedule.engine.airflow.connection.id=
-# Please confirm if it is a loopback address
-schedule.engine.airflow.inlong.manager.host=
schedule.engine.airflow.cleaner.id=
schedule.engine.airflow.creator.id=
\ No newline at end of file
