Merge branch 'dev' of https://git.mesalab.cn/nezha/nz-talon.git into dev
This commit is contained in:
@@ -1,10 +1,10 @@
|
||||
confagent:
|
||||
promtail:
|
||||
cmdLine: /home/fang/loki/config.conf
|
||||
config: /home/fang/loki/promtail.yml
|
||||
cmdLine: /opt/nezha/promtail/config.conf
|
||||
config: /opt/nezha/protail/promtail.yaml
|
||||
defaultIP: 127.0.0.1
|
||||
startCmd: systemctl start promtail
|
||||
stopCmd: systemctl stop promtail
|
||||
startCmd: systemctl start nz-promtail
|
||||
stopCmd: systemctl stop nz-promtail
|
||||
|
||||
logging:
|
||||
config: config/logback-spring.xml
|
||||
|
||||
@@ -2,18 +2,18 @@ server:
|
||||
tomcat:
|
||||
uri-encoding: UTF-8
|
||||
basedir: /opt/nezha/nz-talon/tmp
|
||||
port: 10090
|
||||
port: 10092
|
||||
servlet:
|
||||
context-path: /nz-talon
|
||||
|
||||
spring:
|
||||
profiles:
|
||||
active: dev
|
||||
active: prod
|
||||
|
||||
confagent:
|
||||
tokenFile: src/main/resources/config/token.auth
|
||||
authFile: src/main/resources/config/auth.yml
|
||||
versionFile: src/main/resources/config/promtail.version
|
||||
tokenFile: ./config/token.auth
|
||||
authFile: ./config/auth.yml
|
||||
versionFile: ./config/promtail.version
|
||||
promtail:
|
||||
query:
|
||||
auth: false
|
||||
Reference in New Issue
Block a user