diff --git a/docker/docker-compose/docker-compose.yml b/docker/docker-compose/docker-compose.yml index 6c40e36b3ac..6124afcbb4b 100644 --- a/docker/docker-compose/docker-compose.yml +++ b/docker/docker-compose/docker-compose.yml @@ -57,6 +57,7 @@ services: - ZK_URL=tubemq-server:2181 - FLINK_HOST=localhost - FLINK_PORT=8081 + - AUDIT_PROXY_URL=audit:10081 webisite: image: inlong/dashboard diff --git a/docker/kubernetes/templates/manager-statefulset.yaml b/docker/kubernetes/templates/manager-statefulset.yaml index 0369297a616..7d674de269d 100644 --- a/docker/kubernetes/templates/manager-statefulset.yaml +++ b/docker/kubernetes/templates/manager-statefulset.yaml @@ -99,6 +99,8 @@ spec: value: {{ .Values.external.flink.hostname | quote }} - name: FLINK_PORT value: {{ .Values.external.flink.port | quote }} + - name: AUDIT_PROXY_URL + value: "{{ template "inlong.audit.hostname" . }}:{{ .Values.audit.port }}" {{- range $key, $value := .Values.manager.env }} - name: {{ $key }} value: {{ $value | quote }} diff --git a/docker/kubernetes/values.yaml b/docker/kubernetes/values.yaml index 1f77eab2ace..610ed446ba9 100644 --- a/docker/kubernetes/values.yaml +++ b/docker/kubernetes/values.yaml @@ -324,6 +324,7 @@ manager: -XX:-UseAdaptiveSizePolicy ACTIVE_PROFILE: "prod" PLUGINS_URL: "default" + FLINK_PARALLELISM: 1 audit: component: "audit" diff --git a/inlong-manager/manager-docker/Dockerfile b/inlong-manager/manager-docker/Dockerfile index 99403b6940b..9ce14af576b 100644 --- a/inlong-manager/manager-docker/Dockerfile +++ b/inlong-manager/manager-docker/Dockerfile @@ -29,6 +29,12 @@ ENV PASSWORD=inlong ENV ZK_URL=127.0.0.1:2181 # support download plugins from remote address. ENV PLUGINS_URL=default +# for flink-sort-plugin.properties +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 a61a61405f4..91289b79d8c 100644 --- a/inlong-manager/manager-docker/manager-docker.sh +++ b/inlong-manager/manager-docker/manager-docker.sh @@ -28,14 +28,16 @@ fi conf_file="${file_path}"/conf/application-"${ACTIVE_PROFILE}".properties flink_conf_file="${file_path}"/plugins/flink-sort-plugin.properties -# replace the configuration +# application-prod/dev.properties sed -i "s/spring.profiles.active=.*$/spring.profiles.active=${ACTIVE_PROFILE}/g" "${file_path}"/conf/application.properties sed -i "s/127.0.0.1:3306/${JDBC_URL}/g" "${conf_file}" sed -i "s/datasource.druid.username=.*$/datasource.druid.username=${USERNAME}/g" "${conf_file}" sed -i "s/datasource.druid.password=.*$/datasource.druid.password=${PASSWORD}/g" "${conf_file}" - +# flink-sort-plugin.properties 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}" # startup the application JAVA_OPTS="-Dspring.profiles.active=${ACTIVE_PROFILE}"