[incubator-inlong] branch master updated: [INLONG-3638][InLong] Change the default port for Prometheus (#3640)

[he...@apache.org]

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

healchow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git


The following commit(s) were added to refs/heads/master by this push:
     new 0058f1415 [INLONG-3638][InLong] Change the default port for Prometheus (#3640)
0058f1415 is described below

commit 0058f14154737d5a33f151f427ee032a0f7b2dc4
Author: dockerzhang <do...@apache.org>
AuthorDate: Tue Apr 12 16:15:49 2022 +0800

    [INLONG-3638][InLong] Change the default port for Prometheus (#3640)
---
 inlong-agent/conf/agent.properties                       | 2 +-
 inlong-dataproxy/conf/common.properties                  | 2 +-
 inlong-manager/manager-web/bin/startup.sh                | 4 ----
 inlong-manager/manager-web/src/main/resources/log4j2.xml | 2 +-
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/inlong-agent/conf/agent.properties b/inlong-agent/conf/agent.properties
index 1051e0e61..4c353f776 100755
--- a/inlong-agent/conf/agent.properties
+++ b/inlong-agent/conf/agent.properties
@@ -114,7 +114,7 @@ agent.manager.vip.http.port=8083
 # whether to enable prometheus
 agent.prometheus.enable=true
 # prometheus exporter server default port
-agent.prometheus.exporter.port=8080
+agent.prometheus.exporter.port=9080
 
 
 ############################
diff --git a/inlong-dataproxy/conf/common.properties b/inlong-dataproxy/conf/common.properties
index 555fdd404..a6f042ae2 100644
--- a/inlong-dataproxy/conf/common.properties
+++ b/inlong-dataproxy/conf/common.properties
@@ -28,7 +28,7 @@ configCheckInterval=10000
 metricDomains=DataProxy
 metricDomains.DataProxy.domainListeners=org.apache.inlong.dataproxy.metrics.prometheus.PrometheusMetricListener
 metricDomains.DataProxy.snapshotInterval=60000
-prometheusHttpPort=8080
+prometheusHttpPort=9081
 # whether to enable audit
 audit.enable=true
 # audit proxy address
diff --git a/inlong-manager/manager-web/bin/startup.sh b/inlong-manager/manager-web/bin/startup.sh
index 82962aabd..4cc7b4723 100755
--- a/inlong-manager/manager-web/bin/startup.sh
+++ b/inlong-manager/manager-web/bin/startup.sh
@@ -91,8 +91,4 @@ JAVA_OPT="${JAVA_OPT} -XX:+IgnoreUnrecognizedVMOptions -XX:+UseConcMarkSweepGC -
 #JAVA_OPT="${JAVA_OPT} -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8081"
 
 # Execute the startup command: start the project in the background, and output the log to the logs folder under the project root directory
-<<<<<<< HEAD
 nohup java ${JAVA_OPT} -Dlog4j2.formatMsgNoLookups=true -Dlog4j.formatMsgNoLookups=true -cp ${CLASSPATH} ${MAIN_CLASS} 1>startup.log 2>${LOG_DIR}/error.log &
-=======
-nohup java ${JAVA_OPT} -Dmanager.log.path=${CONFIG_DIR}/logs -Dlog4j2.formatMsgNoLookups=true -Dlog4j.formatMsgNoLookups=true -cp ${CLASSPATH} ${MAIN_CLASS} 1>/dev/null 2>${LOG_DIR}/error.log &
->>>>>>> [Featue]3622 Tidy up dependencies for all modules
diff --git a/inlong-manager/manager-web/src/main/resources/log4j2.xml b/inlong-manager/manager-web/src/main/resources/log4j2.xml
index 82ad678d3..ca0da4a9d 100644
--- a/inlong-manager/manager-web/src/main/resources/log4j2.xml
+++ b/inlong-manager/manager-web/src/main/resources/log4j2.xml
@@ -19,7 +19,7 @@
 -->
 <configuration status="WARN" monitorInterval="30">
     <Properties>
-        <property name="basePath">${sys:manager.log.path}</property>
+        <property name="basePath">logs</property>
         <property name="log_pattern">%d{yyyy-MM-dd HH:mm:ss.SSS} -%5p ${PID:-} [%15.15t] %-30.30C{1.} : %m%n</property>
         <property name="every_file_size">1G</property>
         <property name="output_log_level">DEBUG</property>