[INLONG-11400][Manager] Change Configuration

Zkplo · Nov 18, 2024 · b55b8d8 · b55b8d8
1 parent 5def0ae
commit b55b8d8
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 46 deletions.
diff --git a/...hedule/src/main/java/org/apache/inlong/manager/schedule/airflow/config/AirflowConfig.java b/...hedule/src/main/java/org/apache/inlong/manager/schedule/airflow/config/AirflowConfig.java
@@ -38,7 +38,7 @@
 @EqualsAndHashCode(callSuper = true)
 public class AirflowConfig extends ClientConfiguration {
 
-    @Value("${inlong.manager.host:127.0.0.1}")
+    @Value("${schedule.engine.airflow.inlong.manager.host:127.0.0.1}")
     private String host;
 
     @Value("${server.port:8083}")
@@ -50,22 +50,22 @@ public class AirflowConfig extends ClientConfiguration {
     @Value("${default.admin.password:inlong}")
     private String inlongPassword;
 
-    @Value("${airflow.connection.id:inlong_connection}")
+    @Value("${schedule.engine.airflow.connection.id:inlong_connection}")
     private String connectionId;
 
-    @Value("${airflow.cleaner.id:dag_cleaner}")
+    @Value("${schedule.engine.airflow.cleaner.id:dag_cleaner}")
     private String dagCleanerId;
 
-    @Value("${airflow.creator.id:dag_creator}")
+    @Value("${schedule.engine.airflow.creator.id:dag_creator}")
     private String dagCreatorId;
 
-    @Value("${airflow.username:airflow}")
+    @Value("${schedule.engine.airflow.username:airflow}")
     private String airflowUsername;
 
-    @Value("${airflow.password:airflow}")
+    @Value("${schedule.engine.airflow.password:airflow}")
     private String airflowPassword;
 
-    @Value("${airflow.baseUrl:http://localhost:8080/}")
+    @Value("${schedule.engine.airflow.baseUrl:http://localhost:8080/}")
     private String baseUrl;
 
     @Bean

diff --git a/inlong-manager/manager-web/src/main/resources/application-dev.properties b/inlong-manager/manager-web/src/main/resources/application-dev.properties
@@ -103,17 +103,13 @@ agent.install.temp.path=inlong/agent-installer-temp/
 
 # The primary key id of the default agent module used
 default.module.id=1
-# schedule engine type
-# support none(no scheduler) and quartz(quartz scheduler), default is none
-inlong.schedule.engine=none
-
-# Airflow API URL
-airflow.baseUrl=
-airflow.connection.id=
-airflow.username=
-airflow.password=
+
+# Airflow configuration
+schedule.engine.airflow.baseUrl=
+schedule.engine.airflow.connection.id=
+schedule.engine.airflow.username=
+schedule.engine.airflow.password=
 # Please confirm if it is a loopback address
-inlong.manager.host=
-# DAG Deleter and Creator ID
-airflow.cleaner.id=
-airflow.creator.id=
+schedule.engine.airflow.inlong.manager.host=
+schedule.engine.airflow.cleaner.id=
+schedule.engine.airflow.creator.id=
diff --git a/inlong-manager/manager-web/src/main/resources/application-prod.properties b/inlong-manager/manager-web/src/main/resources/application-prod.properties
@@ -95,17 +95,12 @@ group.deleted.enabled=false
 # Tencent cloud log service endpoint, The Operator cls resource by it
 cls.manager.endpoint=127.0.0.1
 
-# schedule engine type
-# support none(no scheduler) and quartz(quartz scheduler), default is none
-inlong.schedule.engine=none
-
-# Airflow API URL
-airflow.baseUrl=
-airflow.connection.id=
-airflow.username=
-airflow.password=
+# Airflow configuration
+schedule.engine.airflow.baseUrl=
+schedule.engine.airflow.connection.id=
+schedule.engine.airflow.username=
+schedule.engine.airflow.password=
 # Please confirm if it is a loopback address
-inlong.manager.host=
-# DAG Deleter and Creator ID
-airflow.cleaner.id=
-airflow.creator.id=
+schedule.engine.airflow.inlong.manager.host=
+schedule.engine.airflow.cleaner.id=
+schedule.engine.airflow.creator.id=
diff --git a/inlong-manager/manager-web/src/main/resources/application-test.properties b/inlong-manager/manager-web/src/main/resources/application-test.properties
@@ -96,17 +96,12 @@ group.deleted.enabled=false
 # Tencent cloud log service endpoint, The Operator cls resource by it
 cls.manager.endpoint=127.0.0.1
 
-# schedule engine type
-# support none(no scheduler) and quartz(quartz scheduler), default is none
-inlong.schedule.engine=none
-
-# Airflow API URL
-airflow.baseUrl=
-airflow.connection.id=
-airflow.username=
-airflow.password=
+# Airflow configuration
+schedule.engine.airflow.baseUrl=
+schedule.engine.airflow.connection.id=
+schedule.engine.airflow.username=
+schedule.engine.airflow.password=
 # Please confirm if it is a loopback address
-inlong.manager.host=
-# DAG Deleter and Creator ID
-airflow.cleaner.id=
-airflow.creator.id=
+schedule.engine.airflow.inlong.manager.host=
+schedule.engine.airflow.cleaner.id=
+schedule.engine.airflow.creator.id=