This is an automated email from the ASF dual-hosted git repository.
dockerzhang 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 2c2e52b568 [INLONG-10150][Manager] Remove metrics. audit. proxy. hosts
from flink-sort-plugins. properties (#10153)
2c2e52b568 is described below
commit 2c2e52b5688b91a1ba48fccf03a51c927f82fb48
Author: fuweng11 <76141879+fuwen...@users.noreply.github.com>
AuthorDate: Wed May 8 18:32:44 2024 +0800
[INLONG-10150][Manager] Remove metrics. audit. proxy. hosts from
flink-sort-plugins. properties (#10153)
---
docker/docker-compose/docker-compose.yml | 1 -
inlong-manager/manager-docker/Dockerfile | 1 -
inlong-manager/manager-docker/manager-docker.sh | 1 -
.../main/java/org/apache/inlong/manager/plugin/flink/FlinkService.java | 2 --
.../java/org/apache/inlong/manager/plugin/flink/dto/FlinkConfig.java | 2 --
.../main/java/org/apache/inlong/manager/plugin/util/FlinkUtils.java | 2 --
.../base/src/main/resources/flink-sort-plugin.properties | 3 ---
7 files changed, 12 deletions(-)
diff --git a/docker/docker-compose/docker-compose.yml
b/docker/docker-compose/docker-compose.yml
index 6f7d7c4e7d..0bd5403854 100644
--- a/docker/docker-compose/docker-compose.yml
+++ b/docker/docker-compose/docker-compose.yml
@@ -59,7 +59,6 @@ services:
- ZK_URL=tubemq-server:2181
- FLINK_HOST=jobmanager
- FLINK_PORT=8081
- - AUDIT_PROXY_URL=audit:10081
dashboard:
image: inlong/dashboard:${VERSION_TAG}
diff --git a/inlong-manager/manager-docker/Dockerfile
b/inlong-manager/manager-docker/Dockerfile
index c3106dfb9a..cb48550a6d 100644
--- a/inlong-manager/manager-docker/Dockerfile
+++ b/inlong-manager/manager-docker/Dockerfile
@@ -35,7 +35,6 @@ ENV PLUGINS_URL=default
ENV FLINK_HOST=127.0.0.1
ENV FLINK_PORT=8081
ENV FLINK_PARALLELISM=1
-ENV AUDIT_PROXY_URL=127.0.0.1:10081
# JVM env
ENV MANAGER_JVM_HEAP_OPTS="-XX:+UseContainerSupport
-XX:InitialRAMPercentage=40.0 -XX:MaxRAMPercentage=80.0
-XX:-UseAdaptiveSizePolicy"
WORKDIR /opt/inlong-manager
diff --git a/inlong-manager/manager-docker/manager-docker.sh
b/inlong-manager/manager-docker/manager-docker.sh
index 478e5b2805..db647239a4 100644
--- a/inlong-manager/manager-docker/manager-docker.sh
+++ b/inlong-manager/manager-docker/manager-docker.sh
@@ -49,7 +49,6 @@ sed -i "s/apache_inlong_audit/${AUDIT_CK_DBNAME}/g"
"${conf_file}"
sed -i "s/flink.rest.address=.*$/flink.rest.address=${FLINK_HOST}/g"
"${flink_conf_file}"
sed -i "s/flink.rest.port=.*$/flink.rest.port=${FLINK_PORT}/g"
"${flink_conf_file}"
sed -i "s/flink.parallelism=.*$/flink.parallelism=${FLINK_PARALLELISM}/g"
"${flink_conf_file}"
-sed -i
"s/metrics.audit.proxy.hosts=.*$/metrics.audit.proxy.hosts=${AUDIT_PROXY_URL}/g"
"${flink_conf_file}"
# for db sql
sed -i "s/apache_inlong_manager/${MANAGER_DBNAME}/g" "${sql_file}"
diff --git
a/inlong-manager/manager-plugins/base/src/main/java/org/apache/inlong/manager/plugin/flink/FlinkService.java
b/inlong-manager/manager-plugins/base/src/main/java/org/apache/inlong/manager/plugin/flink/FlinkService.java
index 69a32b73fa..129b7aa444 100644
---
a/inlong-manager/manager-plugins/base/src/main/java/org/apache/inlong/manager/plugin/flink/FlinkService.java
+++
b/inlong-manager/manager-plugins/base/src/main/java/org/apache/inlong/manager/plugin/flink/FlinkService.java
@@ -258,8 +258,6 @@ public class FlinkService {
list.add(flinkInfo.getLocalConfPath());
list.add("-checkpoint.interval");
list.add("60000");
- list.add("-metrics.audit.proxy.hosts");
- list.add(flinkConfig.getAuditProxyHosts());
return list.toArray(new String[0]);
}
diff --git
a/inlong-manager/manager-plugins/base/src/main/java/org/apache/inlong/manager/plugin/flink/dto/FlinkConfig.java
b/inlong-manager/manager-plugins/base/src/main/java/org/apache/inlong/manager/plugin/flink/dto/FlinkConfig.java
index 54320a892c..7d2948510c 100644
---
a/inlong-manager/manager-plugins/base/src/main/java/org/apache/inlong/manager/plugin/flink/dto/FlinkConfig.java
+++
b/inlong-manager/manager-plugins/base/src/main/java/org/apache/inlong/manager/plugin/flink/dto/FlinkConfig.java
@@ -37,8 +37,6 @@ public class FlinkConfig {
private boolean drain;
- private String auditProxyHosts;
-
// flink version
private String version;
diff --git
a/inlong-manager/manager-plugins/base/src/main/java/org/apache/inlong/manager/plugin/util/FlinkUtils.java
b/inlong-manager/manager-plugins/base/src/main/java/org/apache/inlong/manager/plugin/util/FlinkUtils.java
index 61e7aac484..345c997a8e 100644
---
a/inlong-manager/manager-plugins/base/src/main/java/org/apache/inlong/manager/plugin/util/FlinkUtils.java
+++
b/inlong-manager/manager-plugins/base/src/main/java/org/apache/inlong/manager/plugin/util/FlinkUtils.java
@@ -42,7 +42,6 @@ import java.util.Properties;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import static
org.apache.inlong.common.constant.Constants.METRICS_AUDIT_PROXY_HOSTS_KEY;
import static org.apache.inlong.manager.plugin.flink.enums.Constants.ADDRESS;
import static org.apache.inlong.manager.plugin.flink.enums.Constants.DRAIN;
import static
org.apache.inlong.manager.plugin.flink.enums.Constants.FLINK_VERSION;
@@ -199,7 +198,6 @@ public class FlinkUtils {
flinkConfig.setSavepointDirectory(properties.getProperty(SAVEPOINT_DIRECTORY));
flinkConfig.setJobManagerPort(Integer.valueOf(properties.getProperty(JOB_MANAGER_PORT)));
flinkConfig.setDrain(Boolean.parseBoolean(properties.getProperty(DRAIN)));
-
flinkConfig.setAuditProxyHosts(properties.getProperty(METRICS_AUDIT_PROXY_HOSTS_KEY));
flinkConfig.setVersion(properties.getProperty(FLINK_VERSION));
return flinkConfig;
}
diff --git
a/inlong-manager/manager-plugins/base/src/main/resources/flink-sort-plugin.properties
b/inlong-manager/manager-plugins/base/src/main/resources/flink-sort-plugin.properties
index 347d5caa9a..4840f19ae1 100644
---
a/inlong-manager/manager-plugins/base/src/main/resources/flink-sort-plugin.properties
+++
b/inlong-manager/manager-plugins/base/src/main/resources/flink-sort-plugin.properties
@@ -35,6 +35,3 @@ flink.savepoint.directory=file:///data/inlong-sort/savepoints
flink.parallelism=1
# flink stop request drain
flink.drain=false
-
-# metrics.audit.proxy.hosts
-metrics.audit.proxy.hosts=127.0.0.1:10081
\ No newline at end of file
