Skip to content

Commit cd6b75c

Browse files
aarshi0301aarshi0301
committed
fix filename
1 parent 3c1c672 commit cd6b75c

File tree

3 files changed

+203
-15
lines changed

3 files changed

+203
-15
lines changed

‎Dockerfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ COPY atlas-hub/repair_index.py /opt/apache-atlas/bin/
5656
RUN chmod +x /opt/apache-atlas/bin/repair_index.py
5757

5858
COPY atlas-hub/atlas_start.py.patch atlas-hub/atlas_config.py.patch /opt/apache-atlas/bin/
59-
COPY atlas-hub/pre-conf/atlas-log4j.xml /opt/apache-atlas/conf/
60-
COPY atlas-hub/pre-conf/atlas-log4j2.xml /opt/apache-atlas/conf/
59+
COPY atlas-hub/pre-conf/atlas-logback.xml /opt/apache-atlas/conf/
6160
COPY atlas-hub/pre-conf/atlas-auth/ /opt/apache-atlas/conf/
6261

6362
RUN curl https://repo1.maven.org/maven2/org/jolokia/jolokia-jvm/1.6.2/jolokia-jvm-1.6.2-agent.jar -o /opt/apache-atlas/libext/jolokia-jvm-agent.jar

‎atlas-hub/pre-conf/atlas-log4j222.xml

-13
This file was deleted.

‎atlas-hub/pre-conf/atlas-logback.xml

+202
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,202 @@
1+
<?xml version="1.0" encoding="UTF-8" ?>
2+
<!--
3+
~ Licensed to the Apache Software Foundation (ASF) under one
4+
~ or more contributor license agreements. See the NOTICE file
5+
~ distributed with this work for additional information
6+
~ regarding copyright ownership. The ASF licenses this file
7+
~ to you under the Apache License, Version 2.0 (the
8+
~ "License"); you may not use this file except in compliance
9+
~ with the License. You may obtain a copy of the License at
10+
~
11+
~ http://www.apache.org/licenses/LICENSE-2.0
12+
~
13+
~ Unless required by applicable law or agreed to in writing, software
14+
~ distributed under the License is distributed on an "AS IS" BASIS,
15+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
~ See the License for the specific language governing permissions and
17+
~ limitations under the License.
18+
-->
19+
20+
<configuration>
21+
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
22+
<param name="Target" value="System.out"/>
23+
<encoder>
24+
<pattern>
25+
logback: %d %-5p - [%t:%X{context-key}] - X-Atlan-Request-Id:[%X{X-Atlan-Request-Id}] - traceId:[%X{trace_id}] - span_id:[%X{span_id}] ~ %m (%C{1}:%L)%n
26+
</pattern>
27+
</encoder>
28+
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
29+
<level>INFO</level>
30+
</filter>
31+
</appender>
32+
33+
<appender name="OpenTelemetry"
34+
class="io.opentelemetry.instrumentation.logback.appender.v1_0.OpenTelemetryAppender">
35+
<!-- Additional capture options -->
36+
<captureExperimentalAttributes>true</captureExperimentalAttributes>
37+
<captureMdcAttributes>*</captureMdcAttributes>
38+
<captureLoggerContext>true</captureLoggerContext>
39+
<captureKeyValuePairAttributes>true</captureKeyValuePairAttributes>
40+
</appender>
41+
42+
43+
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
44+
<file>${atlas.log.dir}/${atlas.log.file}</file>
45+
<append>true</append>
46+
<encoder>
47+
<pattern>%date [%thread] %level{5} [%file:%line] %msg%n</pattern>
48+
</encoder>
49+
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
50+
<fileNamePattern>${atlas.log.dir}/${atlas.log.file}-%d</fileNamePattern>
51+
<maxHistory>20</maxHistory>
52+
<cleanHistoryOnStart>true</cleanHistoryOnStart>
53+
</rollingPolicy>
54+
</appender>
55+
56+
<appender name="LARGE_MESSAGES" class="ch.qos.logback.core.rolling.RollingFileAppender">
57+
<file>${atlas.log.dir}/large_messages.log</file>
58+
<append>true</append>
59+
<encoder>
60+
<pattern>%date [%thread] %level{5} [%file:%line] %msg%n</pattern>
61+
</encoder>
62+
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
63+
<fileNamePattern>${atlas.log.dir}/large_messages-%d.log</fileNamePattern>
64+
<maxHistory>20</maxHistory>
65+
<cleanHistoryOnStart>false</cleanHistoryOnStart>
66+
</rollingPolicy>
67+
</appender>
68+
69+
<appender name="AUDIT" class="ch.qos.logback.core.rolling.RollingFileAppender">
70+
<file>${atlas.log.dir}/audit.log</file>
71+
<append>true</append>
72+
<encoder>
73+
<pattern>%date [%thread] %level{5} [%file:%line] %msg%n</pattern>
74+
</encoder>
75+
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
76+
<fileNamePattern>${atlas.log.dir}/audit-%d.log</fileNamePattern>
77+
<maxHistory>20</maxHistory>
78+
<cleanHistoryOnStart>false</cleanHistoryOnStart>
79+
</rollingPolicy>
80+
</appender>
81+
82+
<appender name="TASKS" class="ch.qos.logback.core.rolling.RollingFileAppender">
83+
<file>${atlas.log.dir}/tasks.log</file>
84+
<append>true</append>
85+
<encoder>
86+
<pattern>%date [%thread] %level{5} [%file:%line] %msg%n</pattern>
87+
</encoder>
88+
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
89+
<fileNamePattern>${atlas.log.dir}/tasks-%d.log</fileNamePattern>
90+
<maxHistory>20</maxHistory>
91+
<cleanHistoryOnStart>false</cleanHistoryOnStart>
92+
</rollingPolicy>
93+
</appender>
94+
95+
<appender name="METRICS" class="ch.qos.logback.core.rolling.RollingFileAppender">
96+
<file>${atlas.log.dir}/metrics.log</file>
97+
<append>true</append>
98+
<encoder>
99+
<pattern>%date [%thread] %level{5} [%file:%line] %msg%n</pattern>
100+
</encoder>
101+
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
102+
<fileNamePattern>${atlas.log.dir}/metrics-%d.log</fileNamePattern>
103+
<maxHistory>20</maxHistory>
104+
<cleanHistoryOnStart>false</cleanHistoryOnStart>
105+
</rollingPolicy>
106+
</appender>
107+
108+
<appender name="FAILED" class="ch.qos.logback.core.rolling.RollingFileAppender">
109+
<file>${atlas.log.dir}/failed.log</file>
110+
<append>true</append>
111+
<encoder>
112+
<pattern>%date [%thread] %level{5} [%file:%line] %msg%n</pattern>
113+
</encoder>
114+
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
115+
<fileNamePattern>${atlas.log.dir}/failed-%d.log</fileNamePattern>
116+
<maxHistory>20</maxHistory>
117+
<cleanHistoryOnStart>false</cleanHistoryOnStart>
118+
</rollingPolicy>
119+
</appender>
120+
121+
<!-- Uncomment the following for perf logs -->
122+
<!--
123+
<appender name="perf_appender" class="ch.qos.logback.core.rolling.RollingFileAppender">
124+
<file>${atlas.log.dir}/atlas_perf.log</file>
125+
<append>true</append>
126+
<encoder>
127+
<pattern>%date [%thread] %msg%n</pattern>
128+
</encoder>
129+
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
130+
<fileNamePattern>${atlas.log.dir}/atlas_perf-%d.log</fileNamePattern>
131+
<maxHistory>20</maxHistory>
132+
<cleanHistoryOnStart>false</cleanHistoryOnStart>
133+
</rollingPolicy>
134+
</appender>
135+
-->
136+
<logger name="perf_appender" additivity="false" level="debug">
137+
<appender-ref ref="console"/>
138+
<appender-ref ref="OpenTelemetry"/>
139+
</logger>
140+
141+
142+
<logger name="org.apache.atlas" additivity="false" level="info">
143+
<appender-ref ref="console"/>
144+
<appender-ref ref="OpenTelemetry"/>
145+
</logger>
146+
147+
<logger name="org.janusgraph" additivity="false" level="warn">
148+
<appender-ref ref="console"/>
149+
<appender-ref ref="OpenTelemetry"/>
150+
</logger>
151+
152+
<logger name="org.springframework" additivity="false" level="warn">
153+
<appender-ref ref="console"/>
154+
<appender-ref ref="OpenTelemetry"/>
155+
</logger>
156+
157+
<logger name="org.eclipse" additivity="false" level="warn">
158+
<appender-ref ref="console"/>
159+
<appender-ref ref="OpenTelemetry"/>
160+
</logger>
161+
162+
<logger name="com.sun.jersey" additivity="false" level="warn">
163+
<appender-ref ref="console"/>
164+
<appender-ref ref="OpenTelemetry"/>
165+
</logger>
166+
167+
<!-- to avoid logs - The configuration log.flush.interval.messages = 1 was supplied but isn't a known config -->
168+
<logger name="org.apache.kafka.common.config.AbstractConfig" additivity="false" level="error">
169+
<appender-ref ref="console"/>
170+
<appender-ref ref="OpenTelemetry"/>
171+
</logger>
172+
173+
<logger name="AUDIT" additivity="false" level="info">
174+
<appender-ref ref="console"/>
175+
<appender-ref ref="OpenTelemetry"/>
176+
</logger>
177+
178+
<logger name="LARGE_MESSAGES" additivity="false" level="warn">
179+
<appender-ref ref="console"/>
180+
<appender-ref ref="OpenTelemetry"/>
181+
</logger>
182+
183+
<logger name="METRICS" additivity="false" level="debug">
184+
<appender-ref ref="console"/>
185+
<appender-ref ref="OpenTelemetry"/>
186+
</logger>
187+
188+
<logger name="FAILED" additivity="false" level="info">
189+
<appender-ref ref="console"/>
190+
<appender-ref ref="OpenTelemetry"/>
191+
</logger>
192+
193+
<logger name="TASKS" additivity="false" level="info">
194+
<appender-ref ref="console"/>
195+
<appender-ref ref="OpenTelemetry"/>
196+
</logger>
197+
198+
<root level="INFO">
199+
<appender-ref ref="OpenTelemetry"/>
200+
<appender-ref ref="console"/>
201+
</root>
202+
</configuration>

0 commit comments

Comments
 (0)