Repository: ambari Updated Branches: refs/heads/branch-2.2 64705350a -> cb67ce6ed
AMBARI-15676. Log streaming disabled in Oozie.(vbrodetskyi) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cb67ce6e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cb67ce6e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cb67ce6e Branch: refs/heads/branch-2.2 Commit: cb67ce6eda720d1e69bb98ff7cd832e2244a7851 Parents: 6470535 Author: Vitaly Brodetskyi <vbrodets...@hortonworks.com> Authored: Mon Apr 4 16:14:47 2016 +0300 Committer: Vitaly Brodetskyi <vbrodets...@hortonworks.com> Committed: Mon Apr 4 16:14:47 2016 +0300 ---------------------------------------------------------------------- .../4.0.0.2.0/configuration/oozie-log4j.xml | 21 ++- .../4.2.0.2.3/configuration/oozie-log4j.xml | 137 +++++++++++++++++++ 2 files changed, 154 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/cb67ce6e/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-log4j.xml b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-log4j.xml index b4518ce..ef1c5e0 100644 --- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-log4j.xml +++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-log4j.xml @@ -47,13 +47,26 @@ # If the Java System property 'oozie.log.dir' is not defined at Oozie start up time # XLogService sets its value to '${oozie.home}/logs' -log4j.appender.oozie=org.apache.log4j.RollingFileAppender +# The appender that Oozie uses must be named 'oozie' (i.e. log4j.appender.oozie) + +# Using the RollingFileAppender with the OozieRollingPolicy will roll the log file every hour and retain up to MaxHistory number of +# log files. If FileNamePattern ends with ".gz" it will create gzip files. +log4j.appender.oozie=org.apache.log4j.rolling.RollingFileAppender +log4j.appender.oozie.RollingPolicy=org.apache.oozie.util.OozieRollingPolicy log4j.appender.oozie.File=${oozie.log.dir}/oozie.log -log4j.appender.oozie.MaxFileSize=200MB -log4j.appender.oozie.MaxBackupIndex=10 log4j.appender.oozie.Append=true log4j.appender.oozie.layout=org.apache.log4j.PatternLayout log4j.appender.oozie.layout.ConversionPattern=%d{ISO8601} %5p %c{1}:%L - SERVER[${oozie.instance.id}] %m%n +# The FileNamePattern must end with "-%d{yyyy-MM-dd-HH}.gz" or "-%d{yyyy-MM-dd-HH}" and also start with the +# value of log4j.appender.oozie.File +log4j.appender.oozie.RollingPolicy.FileNamePattern=${log4j.appender.oozie.File}-%d{yyyy-MM-dd-HH} +# The MaxHistory controls how many log files will be retained (720 hours / 24 hours per day = 30 days); -1 to disable +log4j.appender.oozie.RollingPolicy.MaxHistory=720 + +# Uncomment the below two lines to use the DailyRollingFileAppender instead +# The DatePattern must end with either "dd" or "HH" +#log4j.appender.oozie=org.apache.log4j.DailyRollingFileAppender +#log4j.appender.oozie.DatePattern='.'yyyy-MM-dd-HH log4j.appender.oozieops=org.apache.log4j.DailyRollingFileAppender log4j.appender.oozieops.DatePattern='.'yyyy-MM-dd @@ -91,7 +104,7 @@ log4j.logger.org.apache.oozie=INFO, oozie log4j.logger.org.apache.hadoop=WARN, oozie log4j.logger.org.mortbay=WARN, oozie log4j.logger.org.hsqldb=WARN, oozie -log4j.logger.org.apache.hadoop.security.authentication.server=INFO, oozie +log4j.logger.org.apache.hadoop.security.authentication.server=WARN, oozie </value> <value-attributes> <show-property-name>false</show-property-name> http://git-wip-us.apache.org/repos/asf/ambari/blob/cb67ce6e/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-log4j.xml b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-log4j.xml new file mode 100644 index 0000000..a164f52 --- /dev/null +++ b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-log4j.xml @@ -0,0 +1,137 @@ +<?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_final="false"> + + <property> + <name>content</name> + <description>Custom log4j.properties</description> + <value> +# +# 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. See accompanying LICENSE file. +# + +# If the Java System property 'oozie.log.dir' is not defined at Oozie start up time +# XLogService sets its value to '${oozie.home}/logs' + +# The appender that Oozie uses must be named 'oozie' (i.e. log4j.appender.oozie) + +# Using the RollingFileAppender with the OozieRollingPolicy will roll the log file every hour and retain up to MaxHistory number of +# log files. If FileNamePattern ends with ".gz" it will create gzip files. +log4j.appender.oozie=org.apache.log4j.rolling.RollingFileAppender +log4j.appender.oozie.RollingPolicy=org.apache.oozie.util.OozieRollingPolicy +log4j.appender.oozie.File=${oozie.log.dir}/oozie.log +log4j.appender.oozie.Append=true +log4j.appender.oozie.layout=org.apache.log4j.PatternLayout +log4j.appender.oozie.layout.ConversionPattern=%d{ISO8601} %5p %c{1}:%L - SERVER[${oozie.instance.id}] %m%n +# The FileNamePattern must end with "-%d{yyyy-MM-dd-HH}.gz" or "-%d{yyyy-MM-dd-HH}" and also start with the +# value of log4j.appender.oozie.File +log4j.appender.oozie.RollingPolicy.FileNamePattern=${log4j.appender.oozie.File}-%d{yyyy-MM-dd-HH} +# The MaxHistory controls how many log files will be retained (720 hours / 24 hours per day = 30 days); -1 to disable +log4j.appender.oozie.RollingPolicy.MaxHistory=720 + + + +log4j.appender.oozieError=org.apache.log4j.rolling.RollingFileAppender +log4j.appender.oozieError.RollingPolicy=org.apache.oozie.util.OozieRollingPolicy +log4j.appender.oozieError.File=${oozie.log.dir}/oozie-error.log +log4j.appender.oozieError.Append=true +log4j.appender.oozieError.layout=org.apache.log4j.PatternLayout +log4j.appender.oozieError.layout.ConversionPattern=%d{ISO8601} %5p %c{1}:%L - SERVER[${oozie.instance.id}] %m%n +# The FileNamePattern must end with "-%d{yyyy-MM-dd-HH}.gz" or "-%d{yyyy-MM-dd-HH}" and also start with the +# value of log4j.appender.oozieError.File +log4j.appender.oozieError.RollingPolicy.FileNamePattern=${log4j.appender.oozieError.File}-%d{yyyy-MM-dd-HH} +# The MaxHistory controls how many log files will be retained (720 hours / 24 hours per day = 30 days); -1 to disable +log4j.appender.oozieError.RollingPolicy.MaxHistory=720 +log4j.appender.oozieError.filter.1 = org.apache.log4j.varia.LevelMatchFilter +log4j.appender.oozieError.filter.1.levelToMatch = WARN +log4j.appender.oozieError.filter.2 = org.apache.log4j.varia.LevelMatchFilter +log4j.appender.oozieError.filter.2.levelToMatch = ERROR +log4j.appender.oozieError.filter.3 = org.apache.log4j.varia.LevelMatchFilter +log4j.appender.oozieError.filter.3.levelToMatch = FATAL +log4j.appender.oozieError.filter.4 = org.apache.log4j.varia.DenyAllFilter + + + +# Uncomment the below two lines to use the DailyRollingFileAppender instead +# The DatePattern must end with either "dd" or "HH" +#log4j.appender.oozie=org.apache.log4j.DailyRollingFileAppender +#log4j.appender.oozie.DatePattern='.'yyyy-MM-dd-HH + +log4j.appender.oozieops=org.apache.log4j.DailyRollingFileAppender +log4j.appender.oozieops.DatePattern='.'yyyy-MM-dd +log4j.appender.oozieops.File=${oozie.log.dir}/oozie-ops.log +log4j.appender.oozieops.Append=true +log4j.appender.oozieops.layout=org.apache.log4j.PatternLayout +log4j.appender.oozieops.layout.ConversionPattern=%d{ISO8601} %5p %c{1}:%L - %m%n + +log4j.appender.oozieinstrumentation=org.apache.log4j.DailyRollingFileAppender +log4j.appender.oozieinstrumentation.DatePattern='.'yyyy-MM-dd +log4j.appender.oozieinstrumentation.File=${oozie.log.dir}/oozie-instrumentation.log +log4j.appender.oozieinstrumentation.Append=true +log4j.appender.oozieinstrumentation.layout=org.apache.log4j.PatternLayout +log4j.appender.oozieinstrumentation.layout.ConversionPattern=%d{ISO8601} %5p %c{1}:%L - %m%n + +log4j.appender.oozieaudit=org.apache.log4j.DailyRollingFileAppender +log4j.appender.oozieaudit.DatePattern='.'yyyy-MM-dd +log4j.appender.oozieaudit.File=${oozie.log.dir}/oozie-audit.log +log4j.appender.oozieaudit.Append=true +log4j.appender.oozieaudit.layout=org.apache.log4j.PatternLayout +log4j.appender.oozieaudit.layout.ConversionPattern=%d{ISO8601} %5p %c{1}:%L - %m%n + +log4j.appender.openjpa=org.apache.log4j.DailyRollingFileAppender +log4j.appender.openjpa.DatePattern='.'yyyy-MM-dd +log4j.appender.openjpa.File=${oozie.log.dir}/oozie-jpa.log +log4j.appender.openjpa.Append=true +log4j.appender.openjpa.layout=org.apache.log4j.PatternLayout +log4j.appender.openjpa.layout.ConversionPattern=%d{ISO8601} %5p %c{1}:%L - %m%n + +log4j.logger.openjpa=INFO, openjpa +log4j.logger.oozieops=INFO, oozieops +log4j.logger.oozieinstrumentation=ALL, oozieinstrumentation +log4j.logger.oozieaudit=ALL, oozieaudit +log4j.logger.org.apache.oozie=INFO, oozie, oozieError +log4j.logger.org.apache.hadoop=WARN, oozie +log4j.logger.org.mortbay=WARN, oozie +log4j.logger.org.hsqldb=WARN, oozie +log4j.logger.org.apache.hadoop.security.authentication.server=WARN, oozie + </value> + <value-attributes> + <show-property-name>false</show-property-name> + </value-attributes> + </property> + +</configuration>
