[Chore] Remove unused alert.rpc.port in common.properties

apache · Jan 13, 2025 · f43e814 · f43e814
1 parent b6b0461
commit f43e814
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 46 deletions.
diff --git a/deploy/kubernetes/dolphinscheduler/README.md b/deploy/kubernetes/dolphinscheduler/README.md
@@ -122,7 +122,6 @@ Please refer to the [Quick Start in Kubernetes](../../../docs/docs/en/guide/inst
 | common.sharedStoragePersistence.storage | string | `"20Gi"` | `PersistentVolumeClaim` size |
 | common.sharedStoragePersistence.storageClassName | string | `"-"` | Shared Storage persistent volume storage class, must support the access mode: ReadWriteMany |
 | conf.auto | bool | `false` | auto restart, if true, all components will be restarted automatically after the common configuration is updated. if false, you need to restart the components manually. default is false |
-| conf.common."alert.rpc.port" | int | `50052` | rpc port |
 | conf.common."appId.collect" | string | `"log"` | way to collect applicationId: log, aop |
 | conf.common."aws.credentials.provider.type" | string | `"AWSStaticCredentialsProvider"` |  |
 | conf.common."aws.s3.access.key.id" | string | `"minioadmin"` | The AWS access key. if resource.storage.type=S3, and credentials.provider.type is AWSStaticCredentialsProvider. This configuration is required |

diff --git a/deploy/kubernetes/dolphinscheduler/values.yaml b/deploy/kubernetes/dolphinscheduler/values.yaml
@@ -345,9 +345,6 @@ conf:
     # -- development state
     development.state: false
 
-    # -- rpc port
-    alert.rpc.port: 50052
-
     # -- set path of conda.sh
     conda.path: /opt/anaconda3/etc/profile.d/conda.sh
 

diff --git a/docs/docs/en/architecture/configuration.md b/docs/docs/en/architecture/configuration.md
@@ -226,7 +226,6 @@ The default configuration is as follows:
 | datasource.encryption.salt                    | !@#$%^&*                                         | the salt of the datasource encryption                                                                                                                                                                                                                                                                                                                                                                                                |
 | support.hive.oneSession                       | false                                            | specify whether hive SQL is executed in the same session                                                                                                                                                                                                                                                                                                                                                                             |
 | sudo.enable                                   | true                                             | whether to enable sudo                                                                                                                                                                                                                                                                                                                                                                                                               |
-| alert.rpc.port                                | 50052                                            | the RPC port of Alert Server                                                                                                                                                                                                                                                                                                                                                                                                         |
 | zeppelin.rest.url                             | http://localhost:8080                            | the RESTful API url of zeppelin                                                                                                                                                                                                                                                                                                                                                                                                      |
 | appId.collect                                 | log                                              | way to collect applicationId, if use aop, alter the configuration from log to aop, annotation of applicationId auto collection related configuration in `bin/env/dolphinscheduler_env.sh` should be removed. Note: Aop way doesn't support submitting yarn job on remote host by client mode like Beeline, and will failure if override applicationId collection-related environment configuration in dolphinscheduler_env.sh, and . |
 

diff --git a/docs/docs/zh/architecture/configuration.md b/docs/docs/zh/architecture/configuration.md
@@ -226,7 +226,6 @@ common.properties配置文件目前主要是配置hadoop/s3/yarn/applicationId
 | datasource.encryption.salt                    | !@#$%^&*                                         | datasource加密使用的salt                                                                                                                                                                                                  |
 | support.hive.oneSession                       | false                                            | 设置hive SQL是否在同一个session中执行                                                                                                                                                                                           |
 | sudo.enable                                   | true                                             | 是否开启sudo                                                                                                                                                                                                             |
-| alert.rpc.port                                | 50052                                            | Alert Server的RPC端口                                                                                                                                                                                                   |
 | zeppelin.rest.url                             | http://localhost:8080                            | zeppelin RESTful API 接口地址                                                                                                                                                                                            |
 | appId.collect                                 | log                                              | 收集applicationId方式， 如果用aop方法，将配置log替换为aop，并将`bin/env/dolphinscheduler_env.sh`自动收集applicationId相关环境变量配置的注释取消掉，注意：aop不支持远程主机提交yarn作业的方式比如Beeline客户端提交，且如果用户环境覆盖了dolphinscheduler_env.sh收集applicationId相关环境变量配置，aop方法会失效 |
 

diff --git a/...st/dolphinscheduler-api-test-case/src/test/resources/docker/file-manage/common.properties b/...st/dolphinscheduler-api-test-case/src/test/resources/docker/file-manage/common.properties
@@ -84,8 +84,6 @@ datasource.encryption.enable=false
 # datasource encryption salt
 datasource.encryption.salt=!@#$%^&*
 
-# Network IP gets priority, default inner outer
-
 # Whether hive SQL is executed in the same session
 support.hive.oneSession=false
 
@@ -98,15 +96,9 @@ sudo.enable=true
 # network IP gets priority, default: inner outer
 #dolphin.scheduler.network.priority.strategy=default
 
-# system env path
-#dolphinscheduler.env.path=dolphinscheduler_env.sh
-
 # development state
 development.state=false
 
-# rpc port
-alert.rpc.port=50052
-
 # set path of conda.sh
 conda.path=/opt/anaconda3/etc/profile.d/conda.sh
 

diff --git a/dolphinscheduler-common/src/main/resources/common.properties b/dolphinscheduler-common/src/main/resources/common.properties
@@ -66,8 +66,6 @@ datasource.encryption.enable=false
 # datasource encryption salt
 datasource.encryption.salt=!@#$%^&*
 
-# Network IP gets priority, default inner outer
-
 # Whether hive SQL is executed in the same session
 support.hive.oneSession=false
 
@@ -83,15 +81,9 @@ dolphin.scheduler.network.interface.restrict=docker0
 # network IP gets priority, default: inner outer
 #dolphin.scheduler.network.priority.strategy=default
 
-# system env path
-#dolphinscheduler.env.path=dolphinscheduler_env.sh
-
 # development state
 development.state=false
 
-# rpc port
-alert.rpc.port=50052
-
 # set path of conda.sh
 conda.path=/opt/anaconda3/etc/profile.d/conda.sh
 

diff --git a/dolphinscheduler-common/src/test/resources/common.properties b/dolphinscheduler-common/src/test/resources/common.properties
@@ -130,8 +130,6 @@ datasource.encryption.enable=false
 # datasource encryption salt
 datasource.encryption.salt=!@#$%^&*
 
-# Network IP gets priority, default inner outer
-
 # Whether hive SQL is executed in the same session
 support.hive.oneSession=false
 
@@ -147,15 +145,9 @@ dolphin.scheduler.network.interface.restrict=docker0
 # network IP gets priority, default: inner outer
 #dolphin.scheduler.network.priority.strategy=default
 
-# system env path
-#dolphinscheduler.env.path=dolphinscheduler_env.sh
-
 # development state
 development.state=false
 
-# rpc port
-alert.rpc.port=50052
-
 # set path of conda.sh
 conda.path=/opt/anaconda3/etc/profile.d/conda.sh
 

diff --git a/...ler-e2e/dolphinscheduler-e2e-case/src/test/resources/docker/file-manage/common.properties b/...ler-e2e/dolphinscheduler-e2e-case/src/test/resources/docker/file-manage/common.properties
@@ -84,8 +84,6 @@ datasource.encryption.enable=false
 # datasource encryption salt
 datasource.encryption.salt=!@#$%^&*
 
-# Network IP gets priority, default inner outer
-
 # Whether hive SQL is executed in the same session
 support.hive.oneSession=false
 
@@ -98,15 +96,9 @@ sudo.enable=true
 # network IP gets priority, default: inner outer
 #dolphin.scheduler.network.priority.strategy=default
 
-# system env path
-#dolphinscheduler.env.path=dolphinscheduler_env.sh
-
 # development state
 development.state=false
 
-# rpc port
-alert.rpc.port=50052
-
 # set path of conda.sh
 conda.path=/opt/anaconda3/etc/profile.d/conda.sh
 

diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/test/resources/common.properties b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/test/resources/common.properties
@@ -73,8 +73,6 @@ datasource.encryption.enable=false
 # datasource encryption salt
 datasource.encryption.salt=!@#$%^&*
 
-# Network IP gets priority, default inner outer
-
 # Whether hive SQL is executed in the same session
 support.hive.oneSession=false
 
@@ -87,15 +85,9 @@ sudo.enable=true
 # network IP gets priority, default: inner outer
 #dolphin.scheduler.network.priority.strategy=default
 
-# system env path
-#dolphinscheduler.env.path=dolphinscheduler_env.sh
-
 # development state
 development.state=false
 
-# rpc port
-alert.rpc.port=50052
-
 # set path of conda.sh
 conda.path=/opt/anaconda3/etc/profile.d/conda.sh