Repository: ambari Updated Branches: refs/heads/trunk 50d8928c7 -> bc2d2d378
AMBARI-18169. Falcon log4j configuration should be configurable via Ambari (Venkat Ranganathan via alejandro) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bc2d2d37 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bc2d2d37 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bc2d2d37 Branch: refs/heads/trunk Commit: bc2d2d3784809b9167cdf8ddf1f2badebc7e2409 Parents: 50d8928 Author: Alejandro Fernandez <[email protected]> Authored: Wed Aug 17 15:44:09 2016 -0700 Committer: Alejandro Fernandez <[email protected]> Committed: Wed Aug 17 15:44:09 2016 -0700 ---------------------------------------------------------------------- .../0.5.0.2.1/configuration/falcon-log4j.xml | 162 +++++++++++++++++++ .../FALCON/0.5.0.2.1/metainfo.xml | 1 + 2 files changed, 163 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/bc2d2d37/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-log4j.xml b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-log4j.xml new file mode 100644 index 0000000..ecf68a9 --- /dev/null +++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-log4j.xml @@ -0,0 +1,162 @@ +<?xml version="1.0"?> +<?xml-stylesheet type="text/xsl" href="configuration.xsl"?> +<!-- +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * 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 KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +--> +<configuration supports_adding_forbidden="true"> + <!-- log4j.xml --> + <property> + <name>content</name> + <display-name>falcon-log4j template</display-name> + <description>Falcon server.xml</description> + <value><![CDATA[ +<?xml version="1.0" encoding="UTF-8" ?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + 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 KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<!-- + This is used for falcon packaging only. + --> + +<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> + +<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";> + <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender"> + <param name="File" value="${falcon.log.dir}/${falcon.app.type}.application.log"/> + <param name="Append" value="true"/> + <param name="Threshold" value="debug"/> + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%d %-5p - [%t:%x] ~ %m (%c{1}:%L)%n"/> + </layout> + </appender> + + <appender name="AUDIT" class="org.apache.log4j.DailyRollingFileAppender"> + <param name="File" value="${falcon.log.dir}/${falcon.app.type}.audit.log"/> + <param name="Append" value="true"/> + <param name="Threshold" value="debug"/> + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%d %x %m%n"/> + </layout> + </appender> + + <appender name="METRIC" class="org.apache.log4j.DailyRollingFileAppender"> + <param name="File" value="${falcon.log.dir}/${falcon.app.type}.metric.log"/> + <param name="Append" value="true"/> + <param name="Threshold" value="debug"/> + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%d %m%n"/> + </layout> + </appender> + + <appender name="FeedSLA" class="org.apache.log4j.DailyRollingFileAppender"> + <param name="File" value="${falcon.log.dir}/${falcon.app.type}.feed.sla.log"/> + <param name="Append" value="true"/> + <param name="Threshold" value="debug"/> + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%d %m%n"/> + </layout> + </appender> + + <appender name="ALERT" class="org.apache.log4j.DailyRollingFileAppender"> + <param name="File" value="${falcon.log.dir}/${falcon.app.type}.alerts.log"/> + <param name="Append" value="true"/> + <param name="Threshold" value="debug"/> + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%d %m%n"/> + </layout> + </appender> + + <appender name="SECURITY" class="org.apache.log4j.DailyRollingFileAppender"> + <param name="File" value="${falcon.log.dir}/${falcon.app.type}.security.audit.log"/> + <param name="Append" value="true"/> + <param name="Threshold" value="debug"/> + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%d %x %m%n"/> + </layout> + </appender> + + <logger name="org.apache.falcon" additivity="false"> + <level value="debug"/> + <appender-ref ref="FILE"/> + </logger> + + <logger name="AUDIT"> + <level value="info"/> + <appender-ref ref="AUDIT"/> + </logger> + + <logger name="METRIC"> + <level value="info"/> + <appender-ref ref="METRIC"/> + </logger> + + <logger name="FeedSLA"> + <level value="debug"/> + <appender-ref ref="FeedSLA"/> + </logger> + + <logger name="org.apache.hadoop.security" additivity="false"> + <level value="info"/> + <appender-ref ref="SECURITY"/> + </logger> + + <logger name="org.apache.hadoop" additivity="false"> + <level value="info"/> + <appender-ref ref="FILE"/> + </logger> + + <logger name="org.apache.oozie" additivity="false"> + <level value="info"/> + <appender-ref ref="FILE"/> + </logger> + + <logger name="org.apache.hadoop.hive" additivity="false"> + <level value="info"/> + <appender-ref ref="FILE"/> + </logger> + + <root> + <priority value="info"/> + <appender-ref ref="FILE"/> + </root> + +</log4j:configuration> + ]]></value> + <value-attributes> + <type>content</type> + <show-property-name>false</show-property-name> + </value-attributes> + <on-ambari-upgrade add="true"/> + </property> +</configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/bc2d2d37/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/metainfo.xml b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/metainfo.xml index 0c49209..2cda70a 100644 --- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/metainfo.xml @@ -122,6 +122,7 @@ <config-type>falcon-startup.properties</config-type> <config-type>falcon-runtime.properties</config-type> <config-type>falcon-client.properties</config-type> + <config-type>falcon-log4j.xml</config-type> <config-type>falcon-atlas-application.properties</config-type> <config-type>application.properties</config-type> </configuration-dependencies>
