This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev-2.1.4
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev-2.1.4 by this push:
new 4672d4d3b [Improve] docker-compose.yaml config improvement
4672d4d3b is described below
commit 4672d4d3b1882870a82fd428c76a08bfd9619036
Author: benjobs <[email protected]>
AuthorDate: Sat Apr 6 22:28:18 2024 +0800
[Improve] docker-compose.yaml config improvement
---
.../ValidationMessages.properties | 23 ----
.../streampark-console-config/application-h2.yml | 30 -----
.../application-mysql.yml | 23 ----
.../application-pgsql.yml | 23 ----
.../conf/streampark-console-config/application.yml | 149 ---------------------
.../conf/streampark-console-config}/config.yaml | 4 +-
.../conf/streampark-console-config/kerberos.yml | 26 ----
.../{logback-spring.xml => logback.xml} | 76 +++++++----
.../conf/streampark-console-config/spy.properties | 30 -----
helm/streampark/templates/configmap.yaml | 58 ++------
helm/streampark/templates/streampark.yml | 23 +---
.../main/resources/ValidationMessages.properties | 23 ----
.../src/main/resources/config.yaml | 4 +-
.../src/main/resources/spy.properties | 30 -----
14 files changed, 68 insertions(+), 454 deletions(-)
diff --git
a/helm/streampark/conf/streampark-console-config/ValidationMessages.properties
b/helm/streampark/conf/streampark-console-config/ValidationMessages.properties
deleted file mode 100755
index 93295997d..000000000
---
a/helm/streampark/conf/streampark-console-config/ValidationMessages.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-required=\u4E0D\u80FD\u4E3A\u7A7A
-range=\u6709\u6548\u957F\u5EA6{min}\u5230{max}\u4E2A\u5B57\u7B26
-email=\u90AE\u7BB1\u683C\u5F0F\u4E0D\u5408\u6CD5
-mobile=\u624B\u673A\u53F7\u4E0D\u5408\u6CD5
-noMoreThan=\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC7{max}\u4E2A\u5B57\u7B26
-invalid=\u503C\u4E0D\u5408\u6CD5
diff --git a/helm/streampark/conf/streampark-console-config/application-h2.yml
b/helm/streampark/conf/streampark-console-config/application-h2.yml
deleted file mode 100644
index 1a469c8ab..000000000
--- a/helm/streampark/conf/streampark-console-config/application-h2.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-spring:
- datasource:
- driver-class-name: org.h2.Driver
- url:
jdbc:h2:mem:streampark;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=true;INIT=runscript
from 'classpath:db/schema-h2.sql'
- username: sa
- password: sa
- sql:
- init:
- data-locations: classpath:db/data-h2.sql
- continue-on-error: true
- username: sa
- password: sa
- mode: always
diff --git
a/helm/streampark/conf/streampark-console-config/application-mysql.yml
b/helm/streampark/conf/streampark-console-config/application-mysql.yml
deleted file mode 100644
index 986ed37cf..000000000
--- a/helm/streampark/conf/streampark-console-config/application-mysql.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-spring:
- datasource:
- username: root
- password: streampark
- driver-class-name: com.mysql.cj.jdbc.Driver
- url:
jdbc:mysql://localhost:3306/streampark?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
diff --git
a/helm/streampark/conf/streampark-console-config/application-pgsql.yml
b/helm/streampark/conf/streampark-console-config/application-pgsql.yml
deleted file mode 100644
index 9c71b81c5..000000000
--- a/helm/streampark/conf/streampark-console-config/application-pgsql.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-spring:
- datasource:
- username: postgres
- password: streampark
- driver-class-name: org.postgresql.Driver
- url: jdbc:postgresql://localhost:5432/streampark?stringtype=unspecified
diff --git a/helm/streampark/conf/streampark-console-config/application.yml
b/helm/streampark/conf/streampark-console-config/application.yml
deleted file mode 100644
index 223fa0ff3..000000000
--- a/helm/streampark/conf/streampark-console-config/application.yml
+++ /dev/null
@@ -1,149 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-server:
- port: 10000
- undertow:
- buffer-size: 1024
- direct-buffers: true
- threads:
- io: 4
- worker: 20
-
-logging:
- level:
- root: info
-
-knife4j:
- enable: true
- basic:
- # basic authentication, used to access swagger-ui and doc
- enable: false
- username: admin
- password: streampark
-
-springdoc:
- api-docs:
- enabled: true
- swagger-ui:
- path: /swagger-ui.html
- packages-to-scan: org.apache.streampark.console
-
-spring:
- profiles.active: h2 #[h2,pgsql,mysql]
- application.name: StreamPark
- devtools.restart.enabled: false
- mvc.pathmatch.matching-strategy: ant_path_matcher
- servlet:
- multipart:
- enabled: true
- max-file-size: 500MB
- max-request-size: 500MB
- aop.proxy-target-class: true
- messages.encoding: utf-8
- jackson:
- date-format: yyyy-MM-dd HH:mm:ss
- time-zone: GMT+8
- deserialization:
- fail-on-unknown-properties: false
- main:
- allow-circular-references: true
- banner-mode: off
- mvc:
- converters:
- preferred-json-mapper: jackson
-
-management:
- endpoints:
- web:
- exposure:
- include: [ 'health', 'httptrace', 'metrics' ]
- endpoint:
- health:
- enabled: true
- show-details: always
- probes:
- enabled: true
- health:
- ldap:
- enabled: false
-
-streampark:
- proxy:
- # knox process address
https://cdpsit02.example.cn:8443/gateway/cdp-proxy/yarn
- yarn-url:
- # lark alert proxy,default https://open.feishu.cn
- lark-url:
- yarn:
- # default simple, or kerberos
- http-auth: simple
-
- # HADOOP_USER_NAME
- hadoop-user-name: hdfs
- # local workspace, used to store source code and build dir etc.
- workspace:
- local: /opt/streampark_workspace
- remote: hdfs:///streampark # support hdfs:///streampark/ 、 /streampark
、hdfs://host:ip/streampark/
-
- # remote docker register namespace for streampark
- docker:
- # instantiating DockerHttpClient
- http-client:
- max-connections: 10000
- connection-timeout-sec: 10000
- response-timeout-sec: 12000
- docker-host: ""
-
- # flink-k8s tracking configuration
- flink-k8s:
- tracking:
- silent-state-keep-sec: 10
- polling-task-timeout-sec:
- job-status: 120
- cluster-metric: 120
- polling-interval-sec:
- job-status: 2
- cluster-metric: 3
- # If you need to specify an ingress controller, you can use this.
- ingress:
- class: nginx
-
- # packer garbage resources collection configuration
- packer-gc:
- # maximum retention time for temporary build resources
- max-resource-expired-hours: 120
- # gc task running interval hours
- exec-cron: 0 0 0/6 * * ?
-
- shiro:
- # token timeout, unit second
- jwtTimeOut: 86400
- # backend authentication-free resources url
- anonUrl: >
-
-ldap:
- # Is ldap enabled? If so, please modify the urls
- enable: false
- ## AD server IP, default port 389
- urls: ldap://99.99.99.99:389
- ## Login Account
- base-dn: dc=streampark,dc=com
- username: cn=Manager,dc=streampark,dc=com
- password: streampark
- user:
- identity-attribute: uid
- email-attribute: mail
diff --git
a/streampark-console/streampark-console-service/src/main/resources/config.yaml
b/helm/streampark/conf/streampark-console-config/config.yaml
similarity index 95%
copy from
streampark-console/streampark-console-service/src/main/resources/config.yaml
copy to helm/streampark/conf/streampark-console-config/config.yaml
index 5be2ac8ff..7e929ad49 100644
---
a/streampark-console/streampark-console-service/src/main/resources/config.yaml
+++ b/helm/streampark/conf/streampark-console-config/config.yaml
@@ -35,7 +35,7 @@ server:
# system database, default h2, mysql|pgsql|h2
datasource:
dialect: h2 #h2, pgsql
- #if datasource.dialect is mysql or pgsql, you need to configure the
following connection information
+ # if datasource.dialect is mysql or pgsql, you need to configure the
following connection information
# mysql/postgresql connect access user
username:
# mysql/postgresql connect access password
@@ -60,7 +60,7 @@ streampark:
yarn:
# flink on yarn or spark on yarn, monitoring job status from yarn, it is
necessary to set hadoop.http.authentication.type
http-auth: 'simple' # default simple, or kerberos
- #flink on yarn or spark on yarn, HADOOP_USER_NAME
+ # flink on yarn or spark on yarn, HADOOP_USER_NAME
hadoop-user-name: hdfs
# flink on k8s ingress setting, If an ingress controller is specified in the
configuration, the ingress class
# kubernetes.io/ingress.class must be specified when creating the ingress,
since there are often
diff --git a/helm/streampark/conf/streampark-console-config/kerberos.yml
b/helm/streampark/conf/streampark-console-config/kerberos.yml
deleted file mode 100644
index b8199054b..000000000
--- a/helm/streampark/conf/streampark-console-config/kerberos.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-security:
- kerberos:
- ttl: 2h # unit [s|m|h|d]
- login:
- enable: false
- debug: false
- principal:
- krb5:
- keytab:
diff --git a/helm/streampark/conf/streampark-console-config/logback-spring.xml
b/helm/streampark/conf/streampark-console-config/logback.xml
old mode 100755
new mode 100644
similarity index 55%
rename from helm/streampark/conf/streampark-console-config/logback-spring.xml
rename to helm/streampark/conf/streampark-console-config/logback.xml
index 27334797a..c7daf7a0e
--- a/helm/streampark/conf/streampark-console-config/logback-spring.xml
+++ b/helm/streampark/conf/streampark-console-config/logback.xml
@@ -17,33 +17,38 @@
-->
<configuration scan="true" scanPeriod="60 seconds" debug="false">
<contextName>StreamPark</contextName>
- <property name="log.path" value="${app.home}/logs"/>
- <property name="log.maxHistory" value="15"/>
- <property name="log.colorPattern"
+ <property name="LOG_HOME" value="${app.home}/logs"/>
+ <property name="LOG_MAX_HISTORY" value="15"/>
value="%d{yyyy-MM-dd HH:mm:ss} | %highlight(%-5level) |
%boldYellow(%thread) | %boldGreen(%logger):%L] %msg%n"/>
- <property name="log.pattern"
+ <property name="LOG_PATTERN"
value="%d{yyyy-MM-dd HH:mm:ss.SSS} %contextName [%thread]
%-5level %logger{36}:%L - %msg%n"/>
+ <property name="COLOR_PATTERN"
+ value="%d{yyyy-MM-dd HH:mm:ss} | %highlight(%-5level) |
%boldYellow(%thread) | %boldGreen(%logger):%L] %msg%n"/>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
- <pattern>${log.colorPattern}</pattern>
+ <pattern>${COLOR_PATTERN}</pattern>
+ <charset>UTF-8</charset>
</encoder>
</appender>
<appender name="INFO"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>INFO</level>
- <onMatch>ACCEPT</onMatch>
- <onMismatch>DENY</onMismatch>
+ <onMatch>DENY</onMatch>
+ <onMismatch>ACCEPT</onMismatch>
</filter>
+ <file>${LOG_HOME}/info.log</file>
+ <rollingPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+
<fileNamePattern>${LOG_HOME}/info.%d{yyyy-MM-dd}_%i.log</fileNamePattern>
+ <maxHistory>${LOG_MAX_HISTORY}</maxHistory>
+ <maxFileSize>50MB</maxFileSize>
+ <totalSizeCap>1GB</totalSizeCap>
+ </rollingPolicy>
<encoder>
+ <pattern>${LOG_PATTERN}</pattern>
<charset>UTF-8</charset>
- <pattern>${log.pattern}</pattern>
</encoder>
- <rollingPolicy
class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-
<fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
- <MaxHistory>${log.maxHistory}</MaxHistory>
- </rollingPolicy>
</appender>
<appender name="ERROR"
class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -52,12 +57,16 @@
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
- <rollingPolicy
class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-
<fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
+ <file>${LOG_HOME}/error.log</file>
+ <rollingPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+
<fileNamePattern>${LOG_HOME}/error.%d{yyyy-MM-dd}_%i.log</fileNamePattern>
+ <maxHistory>${LOG_MAX_HISTORY}</maxHistory>
+ <maxFileSize>50MB</maxFileSize>
+ <totalSizeCap>1GB</totalSizeCap>
</rollingPolicy>
<encoder>
+ <pattern>${LOG_PATTERN}</pattern>
<charset>UTF-8</charset>
- <pattern>${log.pattern}</pattern>
</encoder>
</appender>
@@ -67,12 +76,16 @@
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
- <rollingPolicy
class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-
<fileNamePattern>${log.path}/warn.%d{yyyy-MM-dd}.log</fileNamePattern>
+ <file>${LOG_HOME}/warn.log</file>
+ <rollingPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+
<fileNamePattern>${LOG_HOME}/warn.%d{yyyy-MM-dd}_%i.log</fileNamePattern>
+ <maxHistory>${LOG_MAX_HISTORY}</maxHistory>
+ <maxFileSize>50MB</maxFileSize>
+ <totalSizeCap>1GB</totalSizeCap>
</rollingPolicy>
<encoder>
+ <pattern>${LOG_PATTERN}</pattern>
<charset>UTF-8</charset>
- <pattern>${log.pattern}</pattern>
</encoder>
</appender>
@@ -82,12 +95,16 @@
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
- <rollingPolicy
class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-
<fileNamePattern>${log.path}/debug.%d{yyyy-MM-dd}.log</fileNamePattern>
+ <file>${LOG_HOME}/debug.log</file>
+ <rollingPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+
<fileNamePattern>${LOG_HOME}/debug.%d{yyyy-MM-dd}_%i.log</fileNamePattern>
+ <maxHistory>${LOG_MAX_HISTORY}</maxHistory>
+ <maxFileSize>50MB</maxFileSize>
+ <totalSizeCap>1GB</totalSizeCap>
</rollingPolicy>
<encoder>
+ <pattern>${LOG_PATTERN}</pattern>
<charset>UTF-8</charset>
- <pattern>${log.pattern}</pattern>
</encoder>
</appender>
@@ -97,15 +114,26 @@
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
- <rollingPolicy
class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-
<fileNamePattern>${log.path}/trace.%d{yyyy-MM-dd}.log</fileNamePattern>
+ <file>${LOG_HOME}/trace.log</file>
+ <rollingPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+
<fileNamePattern>${LOG_HOME}/trace.%d{yyyy-MM-dd}_%i.log</fileNamePattern>
+ <maxHistory>${LOG_MAX_HISTORY}</maxHistory>
+ <maxFileSize>50MB</maxFileSize>
+ <totalSizeCap>1GB</totalSizeCap>
</rollingPolicy>
<encoder>
+ <pattern>${LOG_PATTERN}</pattern>
<charset>UTF-8</charset>
- <pattern>${log.pattern}</pattern>
</encoder>
</appender>
+ <!-- log level -->
+ <logger name="org.springframework.web" level="INFO"/>
+ <logger name="com.apache.ibatis" level="TRACE"/>
+ <logger name="java.sql.Connection" level="DEBUG"/>
+ <logger name="java.sql.Statement" level="DEBUG"/>
+ <logger name="java.sql.PreparedStatement" level="DEBUG"/>
+
<root level="INFO">
<appender-ref ref="STDOUT"/>
<appender-ref ref="INFO"/>
diff --git a/helm/streampark/conf/streampark-console-config/spy.properties
b/helm/streampark/conf/streampark-console-config/spy.properties
deleted file mode 100755
index 4ff9b4f6c..000000000
--- a/helm/streampark/conf/streampark-console-config/spy.properties
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# p6spy configuration and use
https://p6spy.readthedocs.io/en/latest/configandusage.html
-# Use logging system to record sql
-appender=com.p6spy.engine.spy.appender.Slf4JLogger
-# Customized log printing
-logMessageFormat=org.apache.streampark.console.base.config.P6spySqlFormatConfig
-# Whether to enable slow sql logging
-outagedetection=true
-# Slow SQL logging standards:second
-outagedetectioninterval=2
-# Whether to enable log filtering default false, this configuration takes
effect if include/exclude/sqlexpression is configured
-filter=true
-# Comma-separated list of table names excluded when filtering Logs Default is
empty
-exclude=QRTZ
diff --git a/helm/streampark/templates/configmap.yaml
b/helm/streampark/templates/configmap.yaml
index d2d7fcce8..60de7d406 100644
--- a/helm/streampark/templates/configmap.yaml
+++ b/helm/streampark/templates/configmap.yaml
@@ -23,60 +23,18 @@ metadata:
labels:
{{- include "streampark.labels" . | nindent 4 }}
data:
- application.yml: |+
+ config.yaml: |+
{{- if .Values.streamParkDefaultConfiguration.append }}
- {{- $.Files.Get "conf/streampark-console-config/application.yml" |
nindent 4 -}}
+ {{- $.Files.Get "conf/streampark-console-config/config.yaml" | nindent 4
-}}
{{- end }}
-{{- if index (.Values.streamParkDefaultConfiguration) "application.yml" }}
- {{- index (.Values.streamParkDefaultConfiguration) "application.yml" |
nindent 4 -}}
+{{- if index (.Values.streamParkDefaultConfiguration) "config.yaml" }}
+ {{- index (.Values.streamParkDefaultConfiguration) "config.yaml" | nindent
4 -}}
{{- end }}
- application-h2.yml: |+
+ logback.xml: |+
{{- if .Values.streamParkDefaultConfiguration.append }}
- {{- $.Files.Get "conf/streampark-console-config/application-h2.yml" |
nindent 4 -}}
+ {{- $.Files.Get "conf/streampark-console-config/logback.xml" | nindent 4
-}}
{{- end }}
-{{- if index (.Values.streamParkDefaultConfiguration) "application-h2.yml" }}
- {{- index (.Values.streamParkDefaultConfiguration) "application-h2.yml" |
nindent 4 -}}
-{{- end }}
- application-mysql.yml: |+
-{{- if .Values.streamParkDefaultConfiguration.append }}
- {{- $.Files.Get "conf/streampark-console-config/application-mysql.yml" |
nindent 4 -}}
-{{- end }}
-{{- if index (.Values.streamParkDefaultConfiguration) "application-mysql.yml"
}}
- {{- index (.Values.streamParkDefaultConfiguration) "application-mysql.yml"
| nindent 4 -}}
-{{- end }}
- application-pgsql.yml: |+
-{{- if .Values.streamParkDefaultConfiguration.append }}
- {{- $.Files.Get "conf/streampark-console-config/application-pgsql.yml" |
nindent 4 -}}
-{{- end }}
-{{- if index (.Values.streamParkDefaultConfiguration) "application-pgsql.yml"
}}
- {{- index (.Values.streamParkDefaultConfiguration) "application-pgsql.yml"
| nindent 4 -}}
-{{- end }}
- logback-spring.xml: |+
-{{- if .Values.streamParkDefaultConfiguration.append }}
- {{- $.Files.Get "conf/streampark-console-config/logback-spring.xml" |
nindent 4 -}}
-{{- end }}
-{{- if index (.Values.streamParkDefaultConfiguration) "logback-spring.xml" }}
- {{- index (.Values.streamParkDefaultConfiguration) "logback-spring.xml" |
nindent 4 -}}
-{{- end }}
- kerberos.yml: |+
-{{- if .Values.streamParkDefaultConfiguration.append }}
- {{- $.Files.Get "conf/streampark-console-config/kerberos.yml" | nindent 4
-}}
-{{- end }}
-{{- if index (.Values.streamParkDefaultConfiguration) "kerberos.yml" }}
- {{- index (.Values.streamParkDefaultConfiguration) "kerberos.yml" |
nindent 4 -}}
-{{- end }}
- spy.properties: |+
-{{- if .Values.streamParkDefaultConfiguration.append }}
- {{- $.Files.Get "conf/streampark-console-config/spy.properties" | nindent
4 -}}
-{{- end }}
-{{- if index (.Values.streamParkDefaultConfiguration) "spy.properties" }}
- {{- index (.Values.streamParkDefaultConfiguration) "spy.properties" |
nindent 4 -}}
-{{- end }}
- ValidationMessages.properties: |+
-{{- if .Values.streamParkDefaultConfiguration.append }}
- {{- $.Files.Get
"conf/streampark-console-config/ValidationMessages.properties" | nindent 4 -}}
-{{- end }}
-{{- if index (.Values.streamParkDefaultConfiguration)
"ValidationMessages.properties" }}
- {{- index (.Values.streamParkDefaultConfiguration)
"ValidationMessages.properties" | nindent 4 -}}
+{{- if index (.Values.streamParkDefaultConfiguration) "logback.xml" }}
+ {{- index (.Values.streamParkDefaultConfiguration) "logback.xml" | nindent
4 -}}
{{- end }}
{{- end }}
diff --git a/helm/streampark/templates/streampark.yml
b/helm/streampark/templates/streampark.yml
index fa8a5d4df..0ee92a889 100755
--- a/helm/streampark/templates/streampark.yml
+++ b/helm/streampark/templates/streampark.yml
@@ -91,22 +91,7 @@ spec:
configMap:
name: streampark-console-config
items:
- - key: application.yml
- path: application.yml
- - key: application-h2.yml
- path: application-h2.yml
- - key: application-mysql.yml
- path: application-mysql.yml
- - key: application-pgsql.yml
- path: application-pgsql.yml
- - key: logback-spring.xml
- path: logback-spring.xml
- - key: kerberos.yml
- path: kerberos.yml
- - key: spy.properties
- path: spy.properties
- - key: ValidationMessages.properties
- path: ValidationMessages.properties
-
-
-
+ - key: config.yaml
+ path: config.yaml
+ - key: logback.xml
+ path: logback.xml
diff --git
a/streampark-console/streampark-console-service/src/main/resources/ValidationMessages.properties
b/streampark-console/streampark-console-service/src/main/resources/ValidationMessages.properties
deleted file mode 100644
index 93295997d..000000000
---
a/streampark-console/streampark-console-service/src/main/resources/ValidationMessages.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-required=\u4E0D\u80FD\u4E3A\u7A7A
-range=\u6709\u6548\u957F\u5EA6{min}\u5230{max}\u4E2A\u5B57\u7B26
-email=\u90AE\u7BB1\u683C\u5F0F\u4E0D\u5408\u6CD5
-mobile=\u624B\u673A\u53F7\u4E0D\u5408\u6CD5
-noMoreThan=\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC7{max}\u4E2A\u5B57\u7B26
-invalid=\u503C\u4E0D\u5408\u6CD5
diff --git
a/streampark-console/streampark-console-service/src/main/resources/config.yaml
b/streampark-console/streampark-console-service/src/main/resources/config.yaml
index 5be2ac8ff..7e929ad49 100644
---
a/streampark-console/streampark-console-service/src/main/resources/config.yaml
+++
b/streampark-console/streampark-console-service/src/main/resources/config.yaml
@@ -35,7 +35,7 @@ server:
# system database, default h2, mysql|pgsql|h2
datasource:
dialect: h2 #h2, pgsql
- #if datasource.dialect is mysql or pgsql, you need to configure the
following connection information
+ # if datasource.dialect is mysql or pgsql, you need to configure the
following connection information
# mysql/postgresql connect access user
username:
# mysql/postgresql connect access password
@@ -60,7 +60,7 @@ streampark:
yarn:
# flink on yarn or spark on yarn, monitoring job status from yarn, it is
necessary to set hadoop.http.authentication.type
http-auth: 'simple' # default simple, or kerberos
- #flink on yarn or spark on yarn, HADOOP_USER_NAME
+ # flink on yarn or spark on yarn, HADOOP_USER_NAME
hadoop-user-name: hdfs
# flink on k8s ingress setting, If an ingress controller is specified in the
configuration, the ingress class
# kubernetes.io/ingress.class must be specified when creating the ingress,
since there are often
diff --git
a/streampark-console/streampark-console-service/src/main/resources/spy.properties
b/streampark-console/streampark-console-service/src/main/resources/spy.properties
deleted file mode 100644
index 4ff9b4f6c..000000000
---
a/streampark-console/streampark-console-service/src/main/resources/spy.properties
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# p6spy configuration and use
https://p6spy.readthedocs.io/en/latest/configandusage.html
-# Use logging system to record sql
-appender=com.p6spy.engine.spy.appender.Slf4JLogger
-# Customized log printing
-logMessageFormat=org.apache.streampark.console.base.config.P6spySqlFormatConfig
-# Whether to enable slow sql logging
-outagedetection=true
-# Slow SQL logging standards:second
-outagedetectioninterval=2
-# Whether to enable log filtering default false, this configuration takes
effect if include/exclude/sqlexpression is configured
-filter=true
-# Comma-separated list of table names excluded when filtering Logs Default is
empty
-exclude=QRTZ
