-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Add timestamps to management, server and agent .err logs #12967
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,8 +8,10 @@ to you under the Apache License, Version 2.0 (the | |
| "License"); you may not use this file except in compliance | ||
| with the License. You may obtain a copy of the License at | ||
|
|
||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
|
|
||
| Unless required by applicable law or agreed to in writing, | ||
| software distributed under the License is distributed on an | ||
| "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
|
|
@@ -20,14 +22,17 @@ under the License. | |
| <Configuration monitorInterval="60" packages="org.apache.cloudstack.alert.snmp,org.apache.cloudstack.syslog"> | ||
| <Appenders> | ||
|
|
||
|
|
||
| <properties> | ||
| <property name="filters">net.sf.cglib.proxy</property> | ||
| </properties> | ||
|
|
||
|
|
||
| <!-- ================================= --> | ||
| <!-- Preserve messages in a local file --> | ||
| <!-- ================================= --> | ||
|
|
||
|
|
||
| <!-- A regular appender --> | ||
| <RollingFile name="FILE" append="true" fileName="@MSLOG@" filePattern="@MSLOG@.%d{yyyy-MM-dd}.gz"> | ||
| <ThresholdFilter level="TRACE" onMatch="ACCEPT" onMismatch="DENY"/> | ||
|
|
@@ -46,89 +51,122 @@ under the License. | |
| <PatternLayout pattern="%d{DEFAULT} %-5p [%c{1.}] (%t:%x) (logid:%X{logcontextid}) %m%ex{filters(${filters})}%n"/> | ||
| </RollingFile> | ||
|
|
||
|
|
||
| <!-- ============================== --> | ||
| <!-- Append warnings+ to the syslog if it is listening on UDP port --> | ||
| <!-- ============================== --> | ||
|
|
||
|
|
||
| <Syslog name="SYSLOG" host="localhost" facility="LOCAL6"> | ||
| <ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="DENY"/> | ||
| <PatternLayout pattern="%d{DEFAULT} %-5p [%c{1.}] (%t:%x) (logid:%X{logcontextid}) %m%ex{filters(${filters})}%n"/> | ||
| </Syslog> | ||
|
|
||
|
|
||
| <!-- ============================== --> | ||
| <!-- Append alerts to the syslog if it is configured --> | ||
| <!-- ============================== --> | ||
|
|
||
|
|
||
| <AlertSyslogAppender name="ALERTSYSLOG" syslogHosts="" facility="LOCAL6"> | ||
| <ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="DENY"/> | ||
| <PatternLayout pattern="%d{DEFAULT} %-5p [%c{1.}] (%t:%x) (logid:%X{logcontextid}) %m%ex{filters(${filters})}%n"/> | ||
| </AlertSyslogAppender> | ||
|
|
||
|
|
||
| <!-- ============================== --> | ||
| <!-- Append messages to the console --> | ||
| <!-- ============================== --> | ||
|
|
||
|
|
||
| <Console name="CONSOLE" target="SYSTEM_OUT"> | ||
| <ThresholdFilter level="OFF" onMatch="ACCEPT" onMismatch="DENY"/> | ||
| <PatternLayout pattern="%-5p [%c{1.}] (%t:%x) (logid:%X{logcontextid}) %m%ex{filters(${filters})}%n"/> | ||
| <ThresholdFilter level="ERROR" onMatch="DENY" onMismatch="ACCEPT"/> | ||
| <PatternLayout pattern="%d{DEFAULT} %-5p [%c{1.}] (%t:%x) (logid:%X{logcontextid}) %m%ex{filters(${filters})}%n"/> | ||
| </Console> | ||
|
Comment on lines
82
to
85
|
||
|
|
||
| <Console name="CONSOLE_ERR" target="SYSTEM_ERR"> | ||
| <ThresholdFilter level="ERROR" onMatch="ACCEPT" onMismatch="DENY"/> | ||
| <PatternLayout pattern="%d{DEFAULT} %-5p [%c{1.}] (%t:%x) (logid:%X{logcontextid}) %m%ex{filters(${filters})}%n"/> | ||
| </Console> | ||
|
|
||
|
|
||
| <!-- ============================== --> | ||
| <!-- send alert warnings+ as the SNMP trap if it is configured! --> | ||
| <!-- ============================== --> | ||
|
|
||
|
|
||
| <SnmpTrapAppender name="SNMP" SnmpManagerIpAddresses="" SnmpManagerPorts="" SnmpManagerCommunities=""> | ||
| <ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="DENY"/> | ||
| </SnmpTrapAppender> | ||
| </Appenders> | ||
|
|
||
|
|
||
| <Loggers> | ||
|
|
||
|
|
||
| <Logger name="com.cloud" level="DEBUG"/> | ||
|
|
||
|
|
||
| <Logger name="org.apache.cloudstack" level="DEBUG"/> | ||
|
|
||
|
|
||
| <Logger name="com.cloud.utils.nio" level="INFO"/> | ||
|
|
||
|
|
||
| <Logger name="org.apache" level="INFO"/> | ||
|
|
||
|
|
||
| <Logger name="org.apache.cloudstack.api.command" level="DEBUG"/> | ||
|
|
||
|
|
||
| <Logger name="org" level="INFO"/> | ||
|
|
||
|
|
||
| <Logger name="org.springframework" level="WARN"/> | ||
|
|
||
|
|
||
| <Logger name="org.apache.cloudstack.spring.module.context.ResourceApplicationContext" level="WARN"/> | ||
|
|
||
|
|
||
| <Logger name="net" level="INFO"/> | ||
|
|
||
|
|
||
| <Logger name="apiserver.com.cloud" level="DEBUG"/> | ||
|
|
||
|
|
||
| <Logger name="apiserver.com.cloud" level="DEBUG" additivity="false"> | ||
| <AppenderRef ref="APISERVER"/> | ||
| </Logger> | ||
|
|
||
|
|
||
| <Logger name="com.amazonaws" level="INFO"/> | ||
|
|
||
|
|
||
| <Logger name="httpclient.wire" level="INFO"/> | ||
|
|
||
|
|
||
| <Logger name="org.apache.cloudstack.alert" additivity="false" level="WARN"> | ||
| <AppenderRef ref="SYSLOG"/> | ||
| <AppenderRef ref="CONSOLE"/> | ||
| <AppenderRef ref="CONSOLE_ERR"/> | ||
| <AppenderRef ref="FILE"/> | ||
| <AppenderRef ref="SNMP"/> | ||
| <AppenderRef ref="ALERTSYSLOG"/> | ||
| </Logger> | ||
|
|
||
|
|
||
| <!-- ======================= --> | ||
| <!-- Setup the Root category --> | ||
| <!-- ======================= --> | ||
|
|
||
|
|
||
| <Root level="INFO"> | ||
| <AppenderRef ref="SYSLOG"/> | ||
| <AppenderRef ref="CONSOLE"/> | ||
| <AppenderRef ref="CONSOLE_ERR"/> | ||
| <AppenderRef ref="FILE"/> | ||
| </Root> | ||
|
|
||
|
|
||
| </Loggers> | ||
| </Configuration> | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,8 +8,10 @@ to you under the Apache License, Version 2.0 (the | |
| "License"); you may not use this file except in compliance | ||
| with the License. You may obtain a copy of the License at | ||
|
|
||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
|
|
||
| Unless required by applicable law or agreed to in writing, | ||
| software distributed under the License is distributed on an | ||
| "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
|
|
@@ -20,6 +22,7 @@ under the License. | |
| <Configuration monitorInterval="60"> | ||
| <Appenders> | ||
|
|
||
|
|
||
| <!-- ================================= --> | ||
| <!-- Preserve messages in a local file --> | ||
| <!-- ================================= --> | ||
|
|
@@ -52,6 +55,7 @@ under the License. | |
| <PatternLayout pattern="%d{DEFAULT} %-5p [%c{1.}] (%t:%x) %m%ex%n"/> | ||
| </RollingFile> | ||
|
|
||
|
|
||
| <!-- ============================== --> | ||
| <!-- Append warnings+ to the syslog if it is listening on UDP port --> | ||
| <!-- ============================== --> | ||
|
|
@@ -62,60 +66,84 @@ under the License. | |
| <PatternLayout pattern="%-5p [%c{1.}] (%t:%x) %m%ex%n"/> | ||
| </Syslog> | ||
|
|
||
|
|
||
| <!-- ============================== --> | ||
| <!-- Append messages to the console --> | ||
| <!-- ============================== --> | ||
|
|
||
|
|
||
| <Console name="CONSOLE" target="SYSTEM_OUT"> | ||
| <ThresholdFilter level="OFF" onMatch="ACCEPT" onMismatch="DENY"/> | ||
| <PatternLayout pattern="%-5p [%c{1.}] (%t:%x) %m%ex%n"/> | ||
| <ThresholdFilter level="ERROR" onMatch="DENY" onMismatch="ACCEPT"/> | ||
| <PatternLayout pattern="%d{DEFAULT} %-5p [%c{1.}] (%t:%x) %m%ex%n"/> | ||
| </Console> | ||
|
|
||
| <Console name="CONSOLE_ERR" target="SYSTEM_ERR"> | ||
| <ThresholdFilter level="ERROR" onMatch="ACCEPT" onMismatch="DENY"/> | ||
| <PatternLayout pattern="%d{DEFAULT} %-5p [%c{1.}] (%t:%x) %m%ex%n"/> | ||
|
Comment on lines
75
to
+82
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think we need to double check this, @dheeraj12347 . I looked in an env and the .out file already contains the date stamps for each line. The .err file doesn’t .
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
You’re right, Daan – .out already had timestamps while .err didn’t. I’ve now added a CONSOLE_ERR appender using SYSTEM_ERR with the same timestamped pattern, so stderr (and thus the .err files) will get timestamps as well. |
||
| </Console> | ||
|
Comment on lines
75
to
83
|
||
| </Appenders> | ||
|
|
||
|
|
||
| <Loggers> | ||
|
|
||
|
|
||
| <Logger name="com.cloud" level="DEBUG"/> | ||
|
|
||
|
|
||
| <Logger name="org.apache.cloudstack" level="DEBUG"/> | ||
|
|
||
|
|
||
| <Logger name="org.apache" level="INFO"/> | ||
|
|
||
|
|
||
| <Logger name="org" level="INFO"/> | ||
|
|
||
|
|
||
| <Logger name="net" level="INFO"/> | ||
|
|
||
|
|
||
| <Logger name="apiserver.com.cloud" level="DEBUG"/> | ||
|
|
||
|
|
||
| <Logger name="apiserver.com.cloud" level="DEBUG" additivity="false"> | ||
| <AppenderRef ref="APISERVER"/> | ||
| </Logger> | ||
|
|
||
|
|
||
| <Logger name="com.amazonaws" level="INFO"/> | ||
|
|
||
|
|
||
| <Logger name="httpclient.wire" level="INFO"/> | ||
|
|
||
|
|
||
| <!-- ============================== --> | ||
| <!-- Add or remove these logger for SNMP, this logger is for SNMP alerts plugin --> | ||
| <!-- ============================== --> | ||
|
|
||
|
|
||
| <Logger name="org.apache.cloudstack.alerts" additivity="false" level="WARN"> | ||
| <AppenderRef ref="SYSLOG"/> | ||
| <AppenderRef ref="CONSOLE"/> | ||
| <AppenderRef ref="CONSOLE_ERR"/> | ||
| <AppenderRef ref="FILE"/> | ||
| <AppenderRef ref="SNMP"/> | ||
| <AppenderRef ref="ALERTSYSLOG"/> | ||
| </Logger> | ||
|
|
||
|
|
||
| <!-- ======================= --> | ||
| <!-- Setup the Root category --> | ||
| <!-- ======================= --> | ||
|
|
||
|
|
||
| <Root level="INFO"> | ||
| <AppenderRef ref="SYSLOG"/> | ||
| <AppenderRef ref="CONSOLE"/> | ||
| <AppenderRef ref="CONSOLE_ERR"/> | ||
| <AppenderRef ref="FILE"/> | ||
| <AppenderRef ref="INFO-FILE"/> | ||
| </Root> | ||
|
|
||
|
|
||
| </Loggers> | ||
| </Configuration> | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same concern here: if
.erris sourced from stderr as stated in the PR description, this console appender targetingSYSTEM_OUTwon’t influence.errformatting. Consider usingtarget=\"SYSTEM_ERR\"(or aligning systemd routing) to ensure.errlines include the new timestamp.