This is an automated email from the ASF dual-hosted git repository.

peacewong pushed a commit to branch dev-1.1.3
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git

commit 6df54952bc9a41a7f236c1548c0433c4679c4b47
Author: casionone <[email protected]>
AuthorDate: Tue Jul 12 10:37:00 2022 +0800

    optimize prometheus configuration
---
 assembly-combined-package/assembly-combined/conf/linkis.properties | 4 ++++
 assembly-combined-package/bin/install.sh                           | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/assembly-combined-package/assembly-combined/conf/linkis.properties 
b/assembly-combined-package/assembly-combined/conf/linkis.properties
index 7d78cb651..2714f0661 100644
--- a/assembly-combined-package/assembly-combined/conf/linkis.properties
+++ b/assembly-combined-package/assembly-combined/conf/linkis.properties
@@ -57,6 +57,10 @@ wds.linkis.home=/appcom/Install/LinkisInstall
 wds.linkis.governance.station.admin=hadoop
 
wds.linkis.gateway.conf.publicservice.list=query,jobhistory,application,configuration,filesystem,udf,variable,microservice,errorcode,bml,datasource
 
+#wds.linkis.prometheus.enable=true
+wds.linkis.server.user.restful.uri.pass.auth=/api/rest_j/v1/actuator/prometheus
+
+
 spring.spring.servlet.multipart.max-file-size=500MB
 spring.spring.servlet.multipart.max-request-size=500MB
 
diff --git a/assembly-combined-package/bin/install.sh 
b/assembly-combined-package/bin/install.sh
index 9392ec1df..9d31c627a 100644
--- a/assembly-combined-package/bin/install.sh
+++ b/assembly-combined-package/bin/install.sh
@@ -427,8 +427,7 @@ fi
 if [ "true" == "$PROMETHEUS_ENABLE" ]
 then
   echo "prometheus is enabled"
-  sed -i ${txt} '$a \wds.linkis.prometheus.enable={{ PROMETHEUS_ENABLE }}' 
$LINKIS_HOME/conf/linkis.properties
-  sed -i ${txt} '$a 
\wds.linkis.server.user.restful.uri.pass.auth=/api/rest_j/v1/actuator/prometheus,'
 $LINKIS_HOME/conf/linkis.properties
+  sed -i ${txt}  
"s#\#wds.linkis.prometheus.enable.*#wds.linkis.prometheus.enable=true#g" 
$common_conf
   sed -i ${txt}  '/eureka:/a \\  instance:\n    metadata-map:\n      
prometheus.path: ${prometheus.path:${prometheus.endpoint}}' 
$LINKIS_HOME/conf/application-linkis.yml
   sed -i ${txt}  's#include: refresh,info#include: 
refresh,info,health,metrics,prometheus#g' 
$LINKIS_HOME/conf/application-linkis.yml
   sed -i ${txt} '/instance:/a \    metadata-map:\n      prometheus.path: 
${prometheus.path:/actuator/prometheus}' 
$LINKIS_HOME/conf/application-eureka.yml


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to