Merge remote-tracking branch 'origin/dev-3.7' into dev-3.8

src/main/resources/logback-spring.xml

@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-	<include resource="org/springframework/boot/logging/logback/base.xml" />
+<configuration scan="true" scanPeriod="60 seconds">
+	<include resource="org/springframework/boot/logging/logback/defaults.xml" />
 	<logger name="org.springframework.web" level="info" />
-	<logger name="org.springboot.sample" level="info" />
-	<logger name="org.apache" level="info" />
+	<logger name="org.apache" level="warn" />
 	<logger name="org.springframework" level="info" />
 	<logger name="druid.sql" level="info" />
-	<logger name="com.springboot" level="debug" />
 
 	<property name="log.path" value="./logs/" />
     <!-- 输出格式 -->
@@ -65,4 +63,4 @@
 		<appender-ref ref="ERROR_FILE" />
 	</root>
 
-</configuration>
+</configuration>

tools/afterinstall.sh

@@ -12,6 +12,45 @@ service_exists(){
     fi
 }
 
+# 初始化 rsyslog & logrotate 配置
+fn_init_syslog_logrotate_config(){
+# promtail
+  cat > /etc/rsyslog.d/promtail.conf << "EOF"
+if $programname == 'promtail' then {
+    /var/log/nezha/promtail/promtail.log
+    stop
+}
+EOF
+  cat > /etc/logrotate.d/promtail << "EOF"
+/var/log/nezha/promtail/*.log {
+    daily
+    missingok
+    maxsize 100M
+    rotate 7
+    copytruncate
+    compress
+}
+EOF
+
+# telegraf
+  cat > /etc/rsyslog.d/telegraf.conf << "EOF"
+if $programname == 'telegraf' then {
+    /var/log/nezha/telegraf/telegraf.log
+    stop
+}
+EOF
+  cat > /etc/logrotate.d/telegraf << "EOF"
+/var/log/nezha/telegraf/*.log {
+    daily
+    missingok
+    maxsize 100M
+    rotate 7
+    copytruncate
+    compress
+}
+EOF
+}
+
 compareMD5(){
   if [ ! -f $1 ] || [ ! -f $2 ];then
     echo 1
@@ -116,10 +155,14 @@ LimitMEMLOCK=8M:8M
 WantedBy=multi-user.target
 EOF
 
+    fn_init_syslog_logrotate_config
+
 	systemctl daemon-reload
 	systemctl enable nz-talon && systemctl restart nz-talon
 	systemctl enable nz-promtail && systemctl restart nz-promtail
 	systemctl enable nz-telegraf && systemctl restart nz-telegraf
+	systemctl enable crond && systemctl restart crond
+	systemctl enable rsyslog && systemctl restart rsyslog
 	echo 'install nz-talon success !'
 fi
 
@@ -148,7 +191,13 @@ if [ 2 -eq $1 ];then
 		    restoreComponentConfig $TELEGRAF_PATH/telegraf.d $TMP_PATH/telegraf/telegraf.d
         fi
 	fi
+
+	fn_init_syslog_logrotate_config
+
+	systemctl daemon-reload
 	systemctl restart nz-talon
+	systemctl enable crond && systemctl restart crond
+	systemctl enable rsyslog && systemctl restart rsyslog
 
 	# nz-promtail.service
     if service_exists nz-promtail; then

tools/afterremove.sh

@@ -37,8 +37,11 @@ if [ 0 -eq $1 ];then
     fi
 
 	rm -rf /usr/lib/systemd/system/{nz-talon.service,promtail.service,nz-promtail.service,nz-telegraf.service}
+	rm -rf /etc/rsyslog.d/{promtail.conf,telegraf.conf}
+	rm -rf /etc/logrotate.d/{promtail,telegraf}
 
 	systemctl daemon-reload
+	systemctl restart rsyslog
 
 	echo 'uninstall success!'
 fi

tools/package.sh

@@ -51,8 +51,8 @@ mc cp nz/depends/jdk/$JDK_FILENAME ./
 tar -xzf ./$JDK_FILENAME --strip-components 1 -C $RPM_JDK_PATH
 
 # 下载 promtail
-mc cp nz/depends/loki/promtail-linux-amd64.zip ./
-unzip  -o promtail-linux-amd64.zip -d $RPM_PROMTAIL_PATH
+mc cp nz/depends/loki/promtail-2.9.0.linux-amd64.zip ./
+unzip  -o promtail-2.9.0.linux-amd64.zip -d $RPM_PROMTAIL_PATH
 mv $RPM_PROMTAIL_PATH/promtail-linux-amd64 $RPM_PROMTAIL_PATH/promtail
 cp -f ./tools/config.conf $RPM_PROMTAIL_PATH
 cp -f ./tools/promtail.yaml $RPM_PROMTAIL_PATH