oleewere closed pull request #23: AMBARI-24987 - Infra Manager: parse logs by
Logsearch
URL: https://github.com/apache/ambari-infra/pull/23
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/ambari-infra-manager/pom.xml b/ambari-infra-manager/pom.xml
index 419ccd57..80dddb1f 100644
--- a/ambari-infra-manager/pom.xml
+++ b/ambari-infra-manager/pom.xml
@@ -363,6 +363,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
@@ -571,6 +575,17 @@
<version>2.3.1</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-web</artifactId>
+ <version>${log4j2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-1.2-api</artifactId>
+ <version>${log4j2.version}</version>
+ </dependency>
+
</dependencies>
</project>
diff --git a/ambari-infra-manager/src/main/resources/log4j2.xml
b/ambari-infra-manager/src/main/resources/log4j2.xml
index d3db3d7e..80819c89 100644
--- a/ambari-infra-manager/src/main/resources/log4j2.xml
+++ b/ambari-infra-manager/src/main/resources/log4j2.xml
@@ -24,7 +24,7 @@
<Layout type="PatternLayout" pattern="%d{HH:mm:ss.SSS} [%t] %-5level
%logger{36}:%L - %msg%n" />
</Appender>
<RollingFile name="File" fileName="${logging.file}"
filePattern="${logging.file}-%i-%d{yyyy-MM-dd}">
- <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36}:%L -
%msg%n" />
+ <PatternLayout pattern="%d{ISO8601} [%t] %-5p %C{6} (%F:%L) - %m%n" />
<Policies>
<TimeBasedTriggeringPolicy />
<SizeBasedTriggeringPolicy size="10 MB"/>
diff --git a/pom.xml b/pom.xml
index af47dc8f..80c4877b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,6 +36,7 @@
<zookeeper.version>3.4.6.2.3.0.0-2557</zookeeper.version>
<ambari-metrics.version>2.7.0.0.0</ambari-metrics.version>
<skipSurefireTests>false</skipSurefireTests>
+ <log4j2.version>2.10.0</log4j2.version>
</properties>
<licenses>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
