Add actuator and enable metrics, add Grafana configs#6840
Merged
CalvinKirs merged 1 commit intoapache:devfrom Nov 14, 2021
kezhenxu94:metrics
Merged
Add actuator and enable metrics, add Grafana configs#6840CalvinKirs merged 1 commit intoapache:devfrom kezhenxu94:metrics
CalvinKirs merged 1 commit intoapache:devfrom
kezhenxu94:metrics
Conversation
Codecov Report
@@ Coverage Diff @@
## dev #6840 +/- ##
============================================
- Coverage 41.80% 33.15% -8.66%
+ Complexity 3614 1620 -1994
============================================
Files 641 433 -208
Lines 25891 14300 -11591
Branches 2796 1428 -1368
============================================
- Hits 10825 4741 -6084
+ Misses 14087 9107 -4980
+ Partials 979 452 -527
Continue to review full report at Codecov.
|
|
SonarCloud Quality Gate failed. |
zhongjiajie
reviewed
Nov 17, 2021
Comment on lines
-24
to
-78
| # 1.replace file | ||
| echo "1.replace file" | ||
|
|
||
| txt="" | ||
| if [[ "$OSTYPE" == "darwin"* ]]; then | ||
| # Mac OSX | ||
| txt="''" | ||
| fi | ||
|
|
||
| datasourceDriverClassname="com.mysql.jdbc.Driver" | ||
| if [ $dbtype == "postgresql" ];then | ||
| datasourceDriverClassname="org.postgresql.Driver" | ||
| fi | ||
|
|
||
| # Change configuration in conf/config/dolphinscheduler_env.sh | ||
| sed -i ${txt} "s@^export JAVA_HOME=.*@export JAVA_HOME=${javaHome}@g" conf/env/dolphinscheduler_env.sh | ||
|
|
||
| # Change configuration in conf/datasource.properties | ||
| sed -i ${txt} "s@^spring.datasource.driver-class-name=.*@spring.datasource.driver-class-name=${datasourceDriverClassname}@g" conf/datasource.properties | ||
| sed -i ${txt} "s@^spring.datasource.url=.*@spring.datasource.url=jdbc:${dbtype}://${dbhost}/${dbname}?characterEncoding=UTF-8\&allowMultiQueries=true@g" conf/datasource.properties | ||
| sed -i ${txt} "s@^spring.datasource.username=.*@spring.datasource.username=${username}@g" conf/datasource.properties | ||
| sed -i ${txt} "s@^spring.datasource.password=.*@spring.datasource.password=${password}@g" conf/datasource.properties | ||
|
|
||
| # Change configuration in conf/common.properties | ||
| sed -i ${txt} "s@^data.basedir.path=.*@data.basedir.path=${dataBasedirPath}@g" conf/common.properties | ||
| sed -i ${txt} "s@^resource.storage.type=.*@resource.storage.type=${resourceStorageType}@g" conf/common.properties | ||
| sed -i ${txt} "s@^resource.upload.path=.*@resource.upload.path=${resourceUploadPath}@g" conf/common.properties | ||
| sed -i ${txt} "s@^hadoop.security.authentication.startup.state=.*@hadoop.security.authentication.startup.state=${kerberosStartUp}@g" conf/common.properties | ||
| sed -i ${txt} "s@^java.security.krb5.conf.path=.*@java.security.krb5.conf.path=${krb5ConfPath}@g" conf/common.properties | ||
| sed -i ${txt} "s@^login.user.keytab.username=.*@login.user.keytab.username=${keytabUserName}@g" conf/common.properties | ||
| sed -i ${txt} "s@^login.user.keytab.path=.*@login.user.keytab.path=${keytabPath}@g" conf/common.properties | ||
| sed -i ${txt} "s@^kerberos.expire.time=.*@kerberos.expire.time=${kerberosExpireTime}@g" conf/common.properties | ||
| sed -i ${txt} "s@^hdfs.root.user=.*@hdfs.root.user=${hdfsRootUser}@g" conf/common.properties | ||
| sed -i ${txt} "s@^fs.defaultFS=.*@fs.defaultFS=${defaultFS}@g" conf/common.properties | ||
| sed -i ${txt} "s@^fs.s3a.endpoint=.*@fs.s3a.endpoint=${s3Endpoint}@g" conf/common.properties | ||
| sed -i ${txt} "s@^fs.s3a.access.key=.*@fs.s3a.access.key=${s3AccessKey}@g" conf/common.properties | ||
| sed -i ${txt} "s@^fs.s3a.secret.key=.*@fs.s3a.secret.key=${s3SecretKey}@g" conf/common.properties | ||
| sed -i ${txt} "s@^resource.manager.httpaddress.port=.*@resource.manager.httpaddress.port=${resourceManagerHttpAddressPort}@g" conf/common.properties | ||
| sed -i ${txt} "s@^yarn.resourcemanager.ha.rm.ids=.*@yarn.resourcemanager.ha.rm.ids=${yarnHaIps}@g" conf/common.properties | ||
| sed -i ${txt} "s@^yarn.application.status.address=.*@yarn.application.status.address=http://${singleYarnIp}:%s/ws/v1/cluster/apps/%s@g" conf/common.properties | ||
| sed -i ${txt} "s@^yarn.job.history.status.address=.*@yarn.job.history.status.address=http://${singleYarnIp}:19888/ws/v1/history/mapreduce/jobs/%s@g" conf/common.properties | ||
| sed -i ${txt} "s@^sudo.enable=.*@sudo.enable=${sudoEnable}@g" conf/common.properties | ||
|
|
||
| # The following configurations may be commented, so ddd #* to ensure sed work correct | ||
| # Change configuration in conf/worker.properties | ||
| sed -i ${txt} "s@^#*worker.tenant.auto.create=.*@worker.tenant.auto.create=${workerTenantAutoCreate}@g" conf/worker.properties | ||
| sed -i ${txt} "s@^#*alert.listen.host=.*@alert.listen.host=${alertServer}@g" conf/worker.properties | ||
|
|
||
| # Change configuration in conf/application-api.properties | ||
| sed -i ${txt} "s@^#*server.port=.*@server.port=${apiServerPort}@g" conf/application-api.properties | ||
|
|
||
| # Change configuration in conf/registry.properties | ||
| sed -i ${txt} "s@^#*registry.plugin.dir=.*@registry.plugin.dir=${installPath}/${registryPluginDir}@g" conf/registry.properties | ||
| sed -i ${txt} "s@^#*registry.plugin.name=.*@registry.plugin.name=${registryPluginName}@g" conf/registry.properties | ||
| sed -i ${txt} "s@^#*registry.servers=.*@registry.servers=${registryServers}@g" conf/registry.properties |
Member
|
This pr violates the principle of minimum code submission, introduces irrelevant modifications and deletes template files related to docker, resulting in docker and k8s not working properly. |
Member
|
Maybe related issue: #6998, #6994, #6885 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Also closes #6520
PTAL @CalvinKirs @dailidong @lenboo @caishunfeng