You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2017/01/05 17:14:10 UTC
ambari git commit: AMBARI-19368. Add common log rotation settings to
ranger, ranger-kms and falcon (Madhuvanthi Radhakrishnan via smohanty)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 4ea61b72a -> 1482ffdbf
AMBARI-19368. Add common log rotation settings to ranger, ranger-kms and falcon (Madhuvanthi Radhakrishnan via smohanty)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1482ffdb
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1482ffdb
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1482ffdb
Branch: refs/heads/branch-2.5
Commit: 1482ffdbf59d597bf731e48b93c063fdf4377168
Parents: 4ea61b7
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Thu Jan 5 09:11:12 2017 -0800
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Thu Jan 5 09:11:12 2017 -0800
----------------------------------------------------------------------
.../0.5.0.2.1/configuration/falcon-log4j.xml | 46 ++++++++++++++++++++
.../FALCON/0.5.0.2.1/package/scripts/falcon.py | 13 +++++-
.../0.5.0.2.1/package/scripts/params_linux.py | 8 ++++
.../RANGER/0.4.0/package/scripts/params.py | 9 +++-
.../0.4.0/package/scripts/setup_ranger_xml.py | 6 +--
.../RANGER/0.6.0/configuration/admin-log4j.xml | 24 ++++++++++
.../0.6.0/configuration/tagsync-log4j.xml | 23 ++++++++++
.../0.6.0/configuration/usersync-log4j.xml | 23 ++++++++++
.../0.5.0.2.3/configuration/kms-log4j.xml | 46 ++++++++++++++++++++
.../RANGER_KMS/0.5.0.2.3/package/scripts/kms.py | 2 +-
.../0.5.0.2.3/package/scripts/params.py | 7 ++-
.../stacks/2.1/FALCON/test_falcon_client.py | 6 +++
.../stacks/2.1/FALCON/test_falcon_server.py | 18 ++++++++
.../test/python/stacks/2.1/configs/default.json | 6 +++
.../stacks/2.2/configs/falcon-upgrade.json | 7 ++-
.../stacks/2.5/RANGER/test_ranger_admin.py | 6 +--
.../stacks/2.5/RANGER/test_ranger_tagsync.py | 2 +-
.../stacks/2.5/RANGER/test_ranger_usersync.py | 2 +-
.../stacks/2.5/RANGER_KMS/test_kms_server.py | 4 +-
.../stacks/2.6/RANGER/test_ranger_admin.py | 6 +--
.../stacks/2.6/RANGER/test_ranger_tagsync.py | 2 +-
21 files changed, 246 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/1482ffdb/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
index ecf68a9..2662b51 100644
--- 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
@@ -22,6 +22,48 @@
<configuration supports_adding_forbidden="true">
<!-- log4j.xml -->
<property>
+ <name>falcon_log_maxfilesize</name>
+ <value>256</value>
+ <description>The maximum size of backup file before the log is rotated</description>
+ <display-name>Falcon Log: backup file size</display-name>
+ <value-attributes>
+ <unit>MB</unit>
+ </value-attributes>
+ <on-ambari-upgrade add="false"/>
+ </property>
+ <property>
+ <name>falcon_log_maxbackupindex</name>
+ <value>20</value>
+ <description>The number of backup files</description>
+ <display-name>Falcon Log: # of backup files</display-name>
+ <value-attributes>
+ <type>int</type>
+ <minimum>0</minimum>
+ </value-attributes>
+ <on-ambari-upgrade add="false"/>
+ </property>
+ <property>
+ <name>falcon_security_log_maxfilesize</name>
+ <value>256</value>
+ <description>The maximum size of backup file before the log is rotated</description>
+ <display-name>Falcon Security Log: backup file size</display-name>
+ <value-attributes>
+ <unit>MB</unit>
+ </value-attributes>
+ <on-ambari-upgrade add="false"/>
+ </property>
+ <property>
+ <name>falcon_security_log_maxbackupindex</name>
+ <value>20</value>
+ <description>The number of backup files</description>
+ <display-name>Falcon Security Log: # of backup files</display-name>
+ <value-attributes>
+ <type>int</type>
+ <minimum>0</minimum>
+ </value-attributes>
+ <on-ambari-upgrade add="false"/>
+ </property>
+ <property>
<name>content</name>
<display-name>falcon-log4j template</display-name>
<description>Falcon server.xml</description>
@@ -56,6 +98,8 @@
<param name="File" value="${falcon.log.dir}/${falcon.app.type}.application.log"/>
<param name="Append" value="true"/>
<param name="Threshold" value="debug"/>
+ <param name="MaxFileSize" value="{{falcon_log_maxfilesize}}MB" />
+ <param name="MaxBackupIndex" value="{{falcon_log_maxbackupindex}}" />
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d %-5p - [%t:%x] ~ %m (%c{1}:%L)%n"/>
</layout>
@@ -101,6 +145,8 @@
<param name="File" value="${falcon.log.dir}/${falcon.app.type}.security.audit.log"/>
<param name="Append" value="true"/>
<param name="Threshold" value="debug"/>
+ <param name="MaxFileSize" value="{{falcon_security_log_maxfilesize}}MB"/>
+ <param name="MaxBackupIndex" value="{{falcon_security_log_maxbackupindex}}"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d %x %m%n"/>
</layout>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1482ffdb/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon.py b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon.py
index 4a12b9f..d7981e1 100644
--- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon.py
+++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon.py
@@ -35,16 +35,19 @@ from resource_management.libraries.script import Script
from resource_management.libraries.resources import PropertiesFile
from resource_management.libraries.functions import format
from resource_management.libraries.functions.show_logs import show_logs
+from resource_management.libraries.functions import get_user_call_output
from resource_management.libraries.functions.setup_atlas_hook import has_atlas_in_cluster, setup_atlas_hook, install_atlas_hook_packages, setup_atlas_jar_symlinks
from resource_management.libraries.functions.stack_features import check_stack_feature
from resource_management.libraries.functions.version import format_stack_version
from resource_management.libraries.functions import StackFeature
+from resource_management.libraries.functions.setup_atlas_hook import has_atlas_in_cluster, setup_atlas_hook, install_atlas_hook_packages, setup_atlas_jar_symlinks
+from resource_management.libraries.functions.stack_features import check_stack_feature
from ambari_commons.constants import SERVICE
from resource_management.core.logger import Logger
-
from ambari_commons import OSConst
from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl
+
@OsFamilyFuncImpl(os_family = OsFamilyImpl.DEFAULT)
def falcon(type, action = None, upgrade_type=None):
import params
@@ -85,7 +88,7 @@ def falcon(type, action = None, upgrade_type=None):
owner = params.falcon_user,
group=params.user_group,
)
-
+
PropertiesFile(params.falcon_conf_dir + '/client.properties',
properties = params.falcon_client_properties,
mode = 0644,
@@ -101,6 +104,12 @@ def falcon(type, action = None, upgrade_type=None):
mode = 0644,
owner = params.falcon_user)
+ File(params.falcon_conf_dir + '/log4j.properties',
+ content = InlineTemplate(params.falcon_log4j),
+ group = params.user_group,
+ mode = 0644,
+ owner = params.falcon_user)
+
if params.falcon_graph_storage_directory:
Directory(params.falcon_graph_storage_directory,
owner = params.falcon_user,
http://git-wip-us.apache.org/repos/asf/ambari/blob/1482ffdb/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_linux.py
index 6d1ae03..d667d9f 100644
--- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_linux.py
@@ -114,6 +114,14 @@ falcon_client_properties = config['configurations']['falcon-client.properties']
smokeuser_keytab = config['configurations']['cluster-env']['smokeuser_keytab']
falcon_env_sh_template = config['configurations']['falcon-env']['content']
+#Log4j properties
+falcon_log_maxfilesize = default('/configurations/falcon-log4j/falcon_log_maxfilesize',256)
+falcon_log_maxbackupindex = default('/configurations/falcon-log4j/falcon_log_maxbackupindex',20)
+falcon_security_log_maxfilesize = default('/configurations/falcon-log4j/falcon_security_log_maxfilesize',256)
+falcon_security_log_maxbackupindex = default('/configurations/falcon-log4j/falcon_security_log_maxbackupindex',20)
+
+falcon_log4j=config['configurations']['falcon-log4j']['content']
+
falcon_apps_dir = config['configurations']['falcon-env']['falcon_apps_hdfs_dir']
#for create_hdfs_directory
security_enabled = config['configurations']['cluster-env']['security_enabled']
http://git-wip-us.apache.org/repos/asf/ambari/blob/1482ffdb/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py
index ddbd9d7..0b4532b 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py
@@ -265,6 +265,13 @@ tagsync_application_properties = dict(config["configurations"]["tagsync-applicat
tagsync_pid_file = format('{ranger_pid_dir}/tagsync.pid')
tagsync_cred_lib = os.path.join(ranger_tagsync_home, "lib", "*")
+ranger_usersync_log_maxfilesize = default('/configurations/usersync-log4j/ranger_usersync_log_maxfilesize',256)
+ranger_usersync_log_maxbackupindex = default('/configurations/usersync-log4j/ranger_usersync_log_maxbackupindex',20)
+ranger_tagsync_log_maxfilesize = default('/configurations/tagsync-log4j/ranger_tagsync_log_maxfilesize',256)
+ranger_tagsync_log_number_of_backup_files = default('/configurations/tagsync-log4j/ranger_tagsync_log_number_of_backup_files',20)
+ranger_xa_log_maxfilesize = default('/configurations/admin-log4j/ranger_xa_log_maxfilesize',256)
+ranger_xa_log_maxbackupindex = default('/configurations/admin-log4j/ranger_xa_log_maxbackupindex',20)
+
# ranger log4j.properties
admin_log4j = config['configurations']['admin-log4j']['content']
usersync_log4j = config['configurations']['usersync-log4j']['content']
@@ -414,4 +421,4 @@ if is_hbase_ha_enabled:
ranger_hbase_plugin_enabled = config['configurations']['ranger-hbase-plugin-properties']['ranger-hbase-plugin-enabled'].lower() == 'yes'
if is_namenode_ha_enabled:
if not is_empty(config['configurations']['ranger-hdfs-plugin-properties']['ranger-hdfs-plugin-enabled']):
- ranger_hdfs_plugin_enabled = config['configurations']['ranger-hdfs-plugin-properties']['ranger-hdfs-plugin-enabled'].lower() == 'yes'
\ No newline at end of file
+ ranger_hdfs_plugin_enabled = config['configurations']['ranger-hdfs-plugin-properties']['ranger-hdfs-plugin-enabled'].lower() == 'yes'
http://git-wip-us.apache.org/repos/asf/ambari/blob/1482ffdb/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
index ac4e54e..3cb225f 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
@@ -190,7 +190,7 @@ def setup_ranger_admin(upgrade_type=None):
File(format('{ranger_home}/ews/webapp/WEB-INF/log4j.properties'),
owner=params.unix_user,
group=params.unix_group,
- content=params.admin_log4j,
+ content=InlineTemplate(params.admin_log4j),
mode=0644
)
@@ -426,7 +426,7 @@ def setup_usersync(upgrade_type=None):
File(format('{usersync_home}/conf/log4j.properties'),
owner=params.unix_user,
group=params.unix_group,
- content=params.usersync_log4j,
+ content=InlineTemplate(params.usersync_log4j),
mode=0644
)
elif upgrade_type is not None and not params.stack_supports_ranger_log4j:
@@ -558,7 +558,7 @@ def setup_tagsync(upgrade_type=None):
File(format('{ranger_tagsync_conf}/log4j.properties'),
owner=params.unix_user,
group=params.unix_group,
- content=params.tagsync_log4j,
+ content=InlineTemplate(params.tagsync_log4j),
mode=0644
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/1482ffdb/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/admin-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/admin-log4j.xml b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/admin-log4j.xml
index 9f0cdbf..fdffcdf 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/admin-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/admin-log4j.xml
@@ -20,6 +20,27 @@
-->
<configuration supports_adding_forbidden="true">
<property>
+ <name>ranger_xa_log_maxfilesize</name>
+ <value>256</value>
+ <description>The maximum size of backup file before the log is rotated</description>
+ <display-name>Ranger Log: backup file size</display-name>
+ <value-attributes>
+ <unit>MB</unit>
+ </value-attributes>
+ <on-ambari-upgrade add="false"/>
+ </property>
+ <property>
+ <name>ranger_xa_log_maxbackupindex</name>
+ <value>20</value>
+ <description>The number of backup files</description>
+ <display-name>Ranger Log: # of backup files</display-name>
+ <value-attributes>
+ <type>int</type>
+ <minimum>0</minimum>
+ </value-attributes>
+ <on-ambari-upgrade add="false"/>
+ </property>
+ <property>
<name>content</name>
<display-name>admin-log4j template</display-name>
<description>admin-log4j.properties</description>
@@ -53,6 +74,9 @@ log4j.appender.xa_log_appender.datePattern='.'yyyy-MM-dd
log4j.appender.xa_log_appender.append=true
log4j.appender.xa_log_appender.layout=org.apache.log4j.PatternLayout
log4j.appender.xa_log_appender.layout.ConversionPattern=%d [%t] %-5p %C{6} (%F:%L) - %m%n
+log4j.appender.xa_log_appender.MaxFileSize={{ranger_xa_log_maxfilesize}}MB
+log4j.appender.xa_log_appender.MaxBackupIndex={{ranger_xa_log_maxbackupindex}}
+
# xa_log_appender : category and additivity
log4j.category.org.springframework=warn,xa_log_appender
log4j.additivity.org.springframework=false
http://git-wip-us.apache.org/repos/asf/ambari/blob/1482ffdb/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/tagsync-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/tagsync-log4j.xml b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/tagsync-log4j.xml
index afeb422..141c8c9 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/tagsync-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/tagsync-log4j.xml
@@ -20,6 +20,27 @@
-->
<configuration supports_adding_forbidden="true">
<property>
+ <name>ranger_tagsync_log_maxfilesize</name>
+ <value>256</value>
+ <description>The maximum size of backup file before the log is rotated</description>
+ <display-name>Ranger tagsync Log: backup file size</display-name>
+ <value-attributes>
+ <unit>MB</unit>
+ </value-attributes>
+ <on-ambari-upgrade add="false"/>
+ </property>
+ <property>
+ <name>ranger_tagsync_log_number_of_backup_files</name>
+ <value>20</value>
+ <description>The number of backup files</description>
+ <display-name>Ranger tagsync Log: # of backup files</display-name>
+ <value-attributes>
+ <type>int</type>
+ <minimum>0</minimum>
+ </value-attributes>
+ <on-ambari-upgrade add="false"/>
+ </property>
+ <property>
<name>content</name>
<display-name>tagsync-log4j template</display-name>
<description>tagsync-log4j.properties</description>
@@ -50,6 +71,8 @@ log4j.appender.logFile=org.apache.log4j.DailyRollingFileAppender
log4j.appender.logFile.file=${logdir}/tagsync.log
log4j.appender.logFile.datePattern='.'yyyy-MM-dd
log4j.appender.logFile.layout=org.apache.log4j.PatternLayout
+log4j.appender.logFile.MaxFileSize = {{ranger_tagsync_log_maxfilesize}}MB
+log4j.appender.logFile.MaxBackupIndex = {{ranger_tagsync_log_number_of_backup_files}}
log4j.appender.logFile.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss} %5p %c{1} [%t] - %L %m%n
# console
http://git-wip-us.apache.org/repos/asf/ambari/blob/1482ffdb/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/usersync-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/usersync-log4j.xml b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/usersync-log4j.xml
index 768c153..4cbc34e 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/usersync-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/usersync-log4j.xml
@@ -20,6 +20,27 @@
-->
<configuration supports_adding_forbidden="true">
<property>
+ <name>ranger_usersync_log_maxfilesize</name>
+ <value>256</value>
+ <description>The maximum size of backup file before the log is rotated</description>
+ <display-name>Ranger usersync Log: backup file size</display-name>
+ <value-attributes>
+ <unit>MB</unit>
+ </value-attributes>
+ <on-ambari-upgrade add="false"/>
+ </property>
+ <property>
+ <name>ranger_usersync_log_maxbackupindex</name>
+ <value>20</value>
+ <description>The number of backup files</description>
+ <display-name>Ranger usersync Log: # of backup files</display-name>
+ <value-attributes>
+ <type>int</type>
+ <minimum>0</minimum>
+ </value-attributes>
+ <on-ambari-upgrade add="false"/>
+ </property>
+ <property>
<name>content</name>
<display-name>usersync-log4j template</display-name>
<description>usersync-log4j.properties</description>
@@ -50,6 +71,8 @@ log4j.appender.logFile.file=${logdir}/usersync.log
log4j.appender.logFile.datePattern='.'yyyy-MM-dd
log4j.appender.logFile.layout=org.apache.log4j.PatternLayout
log4j.appender.logFile.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss} %5p %c{1} [%t] - %m%n
+log4j.appender.logFile.MaxFileSize = {{ranger_usersync_log_maxfilesize}}MB
+log4j.appender.logFile.MaxBackupIndex = {{ranger_usersync_log_maxbackupindex}}
# console
log4j.appender.console=org.apache.log4j.ConsoleAppender
http://git-wip-us.apache.org/repos/asf/ambari/blob/1482ffdb/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-log4j.xml b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-log4j.xml
index 20b2dc1..3a63f38 100644
--- a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-log4j.xml
@@ -19,6 +19,48 @@
*/
-->
<configuration supports_adding_forbidden="true">
+ <property>
+ <name>ranger_kms_log_maxfilesize</name>
+ <value>256</value>
+ <description>The maximum size of backup file before the log is rotated</description>
+ <display-name>Ranger-kms Log: backup file size</display-name>
+ <value-attributes>
+ <unit>MB</unit>
+ </value-attributes>
+ <on-ambari-upgrade add="false"/>
+ </property>
+ <property>
+ <name>ranger_kms_log_maxbackupindex</name>
+ <value>20</value>
+ <description>The number of backup files</description>
+ <display-name>Ranger-kms Log: # of backup files</display-name>
+ <value-attributes>
+ <type>int</type>
+ <minimum>0</minimum>
+ </value-attributes>
+ <on-ambari-upgrade add="false"/>
+ </property>
+ <property>
+ <name>ranger_kms_audit_log_maxfilesize</name>
+ <value>256</value>
+ <description>The maximum size of backup file before the log is rotated</description>
+ <display-name>Ranger-kms Audit Log: backup file size</display-name>
+ <value-attributes>
+ <unit>MB</unit>
+ </value-attributes>
+ <on-ambari-upgrade add="false"/>
+ </property>
+ <property>
+ <name>ranger_kms_audit_log_maxbackupindex</name>
+ <value>20</value>
+ <description>The number of backup files</description>
+ <display-name>Ranger-kms Audit Log: # of backup files</display-name>
+ <value-attributes>
+ <type>int</type>
+ <minimum>0</minimum>
+ </value-attributes>
+ <on-ambari-upgrade add="false"/>
+ </property>
<property>
<name>content</name>
<display-name>kms-log4j template</display-name>
@@ -47,6 +89,8 @@ log4j.appender.kms.File=${kms.log.dir}/kms.log
log4j.appender.kms.Append=true
log4j.appender.kms.layout=org.apache.log4j.PatternLayout
log4j.appender.kms.layout.ConversionPattern=%d{ISO8601} %-5p %c{1} - %m%n
+log4j.appender.kms.MaxFileSize = {{ranger_kms_log_maxfilesize}}MB
+log4j.appender.kms.MaxBackupIndex = {{ranger_kms_log_maxbackupindex}}
log4j.appender.kms-audit=org.apache.log4j.DailyRollingFileAppender
log4j.appender.kms-audit.DatePattern='.'yyyy-MM-dd
@@ -54,6 +98,8 @@ log4j.appender.kms-audit.File=${kms.log.dir}/kms-audit.log
log4j.appender.kms-audit.Append=true
log4j.appender.kms-audit.layout=org.apache.log4j.PatternLayout
log4j.appender.kms-audit.layout.ConversionPattern=%d{ISO8601} %m%n
+log4j.appender.kms-audit.MaxFileSize = {{ranger_kms_audit_log_maxfilesize}}MB
+log4j.appender.kms-audit.MaxBackupIndex = {{ranger_kms_audit_log_maxbackupindex}}
log4j.logger.kms-audit=INFO, kms-audit
log4j.additivity.kms-audit=false
http://git-wip-us.apache.org/repos/asf/ambari/blob/1482ffdb/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py
index 7fb8ba6..742cb93 100755
--- a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py
+++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py
@@ -301,7 +301,7 @@ def kms(upgrade_type=None):
File(os.path.join(params.kms_conf_dir, "kms-log4j.properties"),
owner=params.kms_user,
group=params.kms_group,
- content=params.kms_log4j,
+ content=InlineTemplate(params.kms_log4j),
mode=0644
)
if params.security_enabled:
http://git-wip-us.apache.org/repos/asf/ambari/blob/1482ffdb/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/params.py b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/params.py
index 82dcb6b..05e8881 100755
--- a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/params.py
@@ -61,6 +61,11 @@ java_home = config['hostLevelParams']['java_home']
kms_user = default("/configurations/kms-env/kms_user", "kms")
kms_group = default("/configurations/kms-env/kms_group", "kms")
+ranger_kms_audit_log_maxfilesize = default('/configurations/kms-log4j/ranger_kms_audit_log_maxfilesize',256)
+ranger_kms_audit_log_maxbackupindex = default('/configurations/kms-log4j/ranger_kms_audit_log_maxbackupindex',20)
+ranger_kms_log_maxfilesize = default('/configurations/kms-log4j/ranger_kms_log_maxfilesize',256)
+ranger_kms_log_maxbackupindex = default('/configurations/kms-log4j/ranger_kms_log_maxbackupindex',20)
+
jdk_location = config['hostLevelParams']['jdk_location']
kms_log4j = config['configurations']['kms-log4j']['content']
@@ -270,4 +275,4 @@ ranger_kms_pid_file = format('{ranger_kms_pid_dir}/rangerkms.pid')
if security_enabled:
spengo_keytab = config['configurations']['kms-site']['hadoop.kms.authentication.signer.secret.provider.zookeeper.kerberos.keytab']
spnego_principal = config['configurations']['kms-site']['hadoop.kms.authentication.signer.secret.provider.zookeeper.kerberos.principal']
- spnego_principal = spnego_principal.replace('_HOST', current_host.lower())
\ No newline at end of file
+ spnego_principal = spnego_principal.replace('_HOST', current_host.lower())
http://git-wip-us.apache.org/repos/asf/ambari/blob/1482ffdb/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py
index 8079147..5f88b6b 100644
--- a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py
+++ b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py
@@ -83,6 +83,12 @@ class TestFalconClient(RMFTestCase):
properties = self.getConfig()['configurations']['falcon-startup.properties'],
owner = 'falcon'
)
+ self.assertResourceCalled('File', '/etc/falcon/conf/log4j.properties',
+ content=InlineTemplate(self.getConfig()['configurations']['falcon-log4j']['content']),
+ owner='falcon',
+ group='hadoop',
+ mode= 0644
+ )
self.assertNoMoreResources()
@patch("resource_management.libraries.script.Script.put_structured_out")
http://git-wip-us.apache.org/repos/asf/ambari/blob/1482ffdb/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py
index 4ad5c0f..feba0c4 100644
--- a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py
+++ b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py
@@ -118,6 +118,7 @@ class TestFalconServer(RMFTestCase):
mode = 0755,
create_parents = True
)
+
self.assertResourceCalled('Directory', '/etc/falcon/conf',
owner = 'falcon',
create_parents = True
@@ -127,6 +128,7 @@ class TestFalconServer(RMFTestCase):
owner = 'falcon',
group = 'hadoop'
)
+
self.assertResourceCalled('PropertiesFile', '/etc/falcon/conf/client.properties',
mode = 0644,
owner = 'falcon',
@@ -142,6 +144,14 @@ class TestFalconServer(RMFTestCase):
properties = self.getConfig()['configurations']['falcon-startup.properties'],
owner = 'falcon'
)
+
+ self.assertResourceCalled('File', '/etc/falcon/conf/log4j.properties',
+ content=InlineTemplate(self.getConfig()['configurations']['falcon-log4j']['content']),
+ owner='falcon',
+ group='hadoop',
+ mode= 0644
+ )
+
self.assertResourceCalled('Directory', '/hadoop/falcon/store',
owner = 'falcon',
create_parents = True
@@ -297,6 +307,14 @@ class TestFalconServer(RMFTestCase):
mode = 0644,
properties = self.getConfig()['configurations']['falcon-startup.properties'],
)
+
+ self.assertResourceCalled('File', '/usr/hdp/current/falcon-server/conf/log4j.properties',
+ content=InlineTemplate(self.getConfig()['configurations']['falcon-log4j']['content']),
+ owner='falcon',
+ group='hadoop',
+ mode= 0644
+ )
+
self.assertResourceCalled('Directory', '/hadoop/falcon/data/lineage/graphdb',
owner = 'falcon',
create_parents = True,
http://git-wip-us.apache.org/repos/asf/ambari/blob/1482ffdb/ambari-server/src/test/python/stacks/2.1/configs/default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/configs/default.json b/ambari-server/src/test/python/stacks/2.1/configs/default.json
index 49c8a7b..6ee7612 100644
--- a/ambari-server/src/test/python/stacks/2.1/configs/default.json
+++ b/ambari-server/src/test/python/stacks/2.1/configs/default.json
@@ -762,6 +762,9 @@
"zookeeper-log4j": {
"property1": "value1"
},
+ "falcon-log4j": {
+ "content": "<?xml version=1.0 encoding=UTF-8 ?>\u2028<!--\u2028 Licensed to the Apache Software Foundation (ASF) under one\u2028 or more contributor license agreements. See the NOTICE file\u2028 distributed with this work for additional information\u2028 regarding copyright ownership. The ASF licenses this file\u2028 to you under the Apache License, Version 2.0 (the\u2028 License); you may not use this file except in compliance\u2028 with the License. You may obtain a copy of the License at\u2028\u2028 http://www.apache.org/licenses/LICENSE-2.0\u2028\u2028 Unless required by applicable law or agreed to in writing, software\u2028 distributed under the License is distributed on an AS IS BASIS,\u2028 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\u2028 See the License for the specific language governing permissions and\u2028 limitations under the License.\u2028 -->\u2028\u2028<!--\u2028 This is used for falcon packaging only.\u2028 -->\u2028\u2028<!DOCTYPE log4j:configuration SYSTEM log4j.dt
d>\u2028\u2028<log4j:configuration xmlns:log4j=http://jakarta.apache.org/log4j/>\u2028 <appender name=FILE class=org.apache.log4j.DailyRollingFileAppender>\u2028 <param name=File value=${falcon.log.dir}/${falcon.app.type}.application.log/>\u2028 <param name=Append value=true/>\u2028 <param name=Threshold value=debug/>\u2028 <param name=MaxFileSize value={{falcon_log_maxfilesize}}MB />\u2028 <param name=MaxBackupIndex value={{falcon_log_maxbackupindex}} />\u2028 <layout class=org.apache.log4j.PatternLayout>\u2028 <param name=ConversionPattern value=%d %-5p - [%t:%x] ~ %m (%c{1}:%L)%n/>\u2028 </layout>\u2028 </appender>\u2028\u2028 <appender name=AUDIT class=org.apache.log4j.DailyRollingFileAppender>\u2028 <param name=File value=${falcon.log.dir}/${falcon.app.type}.audit.log/>\u2028 <param name=Append value=true/>\u2028 <param name=Threshold value=debug/>\u2028 <layout class=org.apache.log4j.PatternLayout>\u2028 <param name=Conversion
Pattern value=%d %x %m%n/>\u2028 </layout>\u2028 </appender>\u2028\u2028 <appender name=METRIC class=org.apache.log4j.DailyRollingFileAppender>\u2028 <param name=File value=${falcon.log.dir}/${falcon.app.type}.metric.log/>\u2028 <param name=Append value=true/>\u2028 <param name=Threshold value=debug/>\u2028 <layout class=org.apache.log4j.PatternLayout>\u2028 <param name=ConversionPattern value=%d %m%n/>\u2028 </layout>\u2028 </appender>\u2028\u2028 <appender name=FeedSLA class=org.apache.log4j.DailyRollingFileAppender>\u2028 <param name=File value=${falcon.log.dir}/${falcon.app.type}.feed.sla.log/>\u2028 <param name=Append value=true/>\u2028 <param name=Threshold value=debug/>\u2028 <layout class=org.apache.log4j.PatternLayout>\u2028 <param name=ConversionPattern value=%d %m%n/>\u2028 </layout>\u2028 </appender>\u2028\u2028 <appender name=ALERT class=org.apache.log4j.DailyRollingFileAppender>\u2028 <param name=File value=${falco
n.log.dir}/${falcon.app.type}.alerts.log/>\u2028 <param name=Append value=true/>\u2028 <param name=Threshold value=debug/>\u2028 <layout class=org.apache.log4j.PatternLayout>\u2028 <param name=ConversionPattern value=%d %m%n/>\u2028 </layout>\u2028 </appender>\u2028\u2028 <appender name=SECURITY class=org.apache.log4j.DailyRollingFileAppender>\u2028 <param name=File value=${falcon.log.dir}/${falcon.app.type}.security.audit.log/>\u2028 <param name=Append value=true/>\u2028 <param name=Threshold value=debug/>\u2028 <param name=MaxFileSize value={{falcon_security_log_maxfilesize}}MB/>\u2028 <param name=MaxBackupIndex value={{falcon_security_log_maxbackupindex}}/>\u2028 <layout class=org.apache.log4j.PatternLayout>\u2028 <param name=ConversionPattern value=%d %x %m%n/>\u2028 </layout>\u2028 </appender>\u2028\u2028 <logger name=org.apache.falcon additivity=false>\u2028 <level value=debug/>\u2028 <appender-ref ref=FILE/>\u2028
</logger>\u2028\u2028 <logger name=AUDIT>\u2028 <level value=info/>\u2028 <appender-ref ref=AUDIT/>\u2028 </logger>\u2028\u2028 <logger name=METRIC>\u2028 <level value=info/>\u2028 <appender-ref ref=METRIC/>\u2028 </logger>\u2028\u2028 <logger name=FeedSLA>\u2028 <level value=debug/>\u2028 <appender-ref ref=FeedSLA/>\u2028 </logger>\u2028\u2028 <logger name=org.apache.hadoop.security additivity=false>\u2028 <level value=info/>\u2028 <appender-ref ref=SECURITY/>\u2028 </logger>\u2028\u2028 <logger name=org.apache.hadoop additivity=false>\u2028 <level value=info/>\u2028 <appender-ref ref=FILE/>\u2028 </logger>\u2028\u2028 <logger name=org.apache.oozie additivity=false>\u2028 <level value=info/>\u2028 <appender-ref ref=FILE/>\u2028 </logger>\u2028\u2028 <logger name=org.apache.hadoop.hive additivity=false>\u2028 <level value=info/>\u2028 <appender-ref ref=FILE/>\u2028 </logger>\u2028\u2028 <root>\u2028 <priority value=info/>\u2028 <appender-ref r
ef=FILE/>\u2028 </root>\u2028\u2028</log4j:configuration>\u2028 ]]></value>\u2028 <value-attributes>\u2028 <type>content</type>\u2028 <show-property-name>false</show-property-name>\u2028 </value-attributes>\u2028 <on-ambari-upgrade add=true/>\u2028 </property>\u2028</configuration>\u2028"
+ },
"ranger-hive-plugin-properties": {
"XAAUDIT.HDFS.DESTINTATION_FLUSH_INTERVAL_SECONDS": "900",
"XAAUDIT.HDFS.DESTINATION_DIRECTORY": "hdfs://__REPLACE__NAME_NODE_HOST:8020/ranger/audit/%app-type%/%time:yyyyMMdd%",
@@ -920,6 +923,9 @@
},
"zookeeper-log4j": {
"tag": "version1"
+ },
+ "falcon-log4j":{
+ "tag": "version1"
}
},
"commandId": "7-1",
http://git-wip-us.apache.org/repos/asf/ambari/blob/1482ffdb/ambari-server/src/test/python/stacks/2.2/configs/falcon-upgrade.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.2/configs/falcon-upgrade.json b/ambari-server/src/test/python/stacks/2.2/configs/falcon-upgrade.json
index f2a0405..7ded3a0 100644
--- a/ambari-server/src/test/python/stacks/2.2/configs/falcon-upgrade.json
+++ b/ambari-server/src/test/python/stacks/2.2/configs/falcon-upgrade.json
@@ -110,7 +110,7 @@
"*.internal.queue.size": "1000",
"*.falcon.authentication.type": "simple",
"*.falcon.service.authentication.kerberos.keytab": "/etc/security/keytabs/falcon.service.keytab"
- },
+ },
"falcon-runtime.properties": {
"*.log.cleanup.frequency.hours.retention": "minutes(1)",
"*.log.cleanup.frequency.days.retention": "days(7)",
@@ -121,6 +121,10 @@
"falcon-client.properties": {
"falcon.url": "http://{{falcon_host}}:{{falcon_port}}"
},
+ "falcon-log4j": {
+ "content": "<?xml version=1.0 encoding=UTF-8 ?>\u2028<!--\u2028 Licensed to the Apache Software Foundation (ASF) under one\u2028 or more contributor license agreements. See the NOTICE file\u2028 distributed with this work for additional information\u2028 regarding copyright ownership. The ASF licenses this file\u2028 to you under the Apache License, Version 2.0 (the\u2028 License); you may not use this file except in compliance\u2028 with the License. You may obtain a copy of the License at\u2028\u2028 http://www.apache.org/licenses/LICENSE-2.0\u2028\u2028 Unless required by applicable law or agreed to in writing, software\u2028 distributed under the License is distributed on an AS IS BASIS,\u2028 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\u2028 See the License for the specific language governing permissions and\u2028 limitations under the License.\u2028 -->\u2028\u2028<!--\u2028 This is used for falcon packaging only.\u2028 -->\u2028\u2028<!DOCTYPE log4j:configuration SYSTEM log4j.dt
d>\u2028\u2028<log4j:configuration xmlns:log4j=http://jakarta.apache.org/log4j/>\u2028 <appender name=FILE class=org.apache.log4j.DailyRollingFileAppender>\u2028 <param name=File value=${falcon.log.dir}/${falcon.app.type}.application.log/>\u2028 <param name=Append value=true/>\u2028 <param name=Threshold value=debug/>\u2028 <param name=MaxFileSize value={{falcon_log_maxfilesize}}MB />\u2028 <param name=MaxBackupIndex value={{falcon_log_maxbackupindex}} />\u2028 <layout class=org.apache.log4j.PatternLayout>\u2028 <param name=ConversionPattern value=%d %-5p - [%t:%x] ~ %m (%c{1}:%L)%n/>\u2028 </layout>\u2028 </appender>\u2028\u2028 <appender name=AUDIT class=org.apache.log4j.DailyRollingFileAppender>\u2028 <param name=File value=${falcon.log.dir}/${falcon.app.type}.audit.log/>\u2028 <param name=Append value=true/>\u2028 <param name=Threshold value=debug/>\u2028 <layout class=org.apache.log4j.PatternLayout>\u2028 <param name=Conversion
Pattern value=%d %x %m%n/>\u2028 </layout>\u2028 </appender>\u2028\u2028 <appender name=METRIC class=org.apache.log4j.DailyRollingFileAppender>\u2028 <param name=File value=${falcon.log.dir}/${falcon.app.type}.metric.log/>\u2028 <param name=Append value=true/>\u2028 <param name=Threshold value=debug/>\u2028 <layout class=org.apache.log4j.PatternLayout>\u2028 <param name=ConversionPattern value=%d %m%n/>\u2028 </layout>\u2028 </appender>\u2028\u2028 <appender name=FeedSLA class=org.apache.log4j.DailyRollingFileAppender>\u2028 <param name=File value=${falcon.log.dir}/${falcon.app.type}.feed.sla.log/>\u2028 <param name=Append value=true/>\u2028 <param name=Threshold value=debug/>\u2028 <layout class=org.apache.log4j.PatternLayout>\u2028 <param name=ConversionPattern value=%d %m%n/>\u2028 </layout>\u2028 </appender>\u2028\u2028 <appender name=ALERT class=org.apache.log4j.DailyRollingFileAppender>\u2028 <param name=File value=${falco
n.log.dir}/${falcon.app.type}.alerts.log/>\u2028 <param name=Append value=true/>\u2028 <param name=Threshold value=debug/>\u2028 <layout class=org.apache.log4j.PatternLayout>\u2028 <param name=ConversionPattern value=%d %m%n/>\u2028 </layout>\u2028 </appender>\u2028\u2028 <appender name=SECURITY class=org.apache.log4j.DailyRollingFileAppender>\u2028 <param name=File value=${falcon.log.dir}/${falcon.app.type}.security.audit.log/>\u2028 <param name=Append value=true/>\u2028 <param name=Threshold value=debug/>\u2028 <param name=MaxFileSize value={{falcon_security_log_maxfilesize}}MB/>\u2028 <param name=MaxBackupIndex value={{falcon_security_log_maxbackupindex}}/>\u2028 <layout class=org.apache.log4j.PatternLayout>\u2028 <param name=ConversionPattern value=%d %x %m%n/>\u2028 </layout>\u2028 </appender>\u2028\u2028 <logger name=org.apache.falcon additivity=false>\u2028 <level value=debug/>\u2028 <appender-ref ref=FILE/>\u2028
</logger>\u2028\u2028 <logger name=AUDIT>\u2028 <level value=info/>\u2028 <appender-ref ref=AUDIT/>\u2028 </logger>\u2028\u2028 <logger name=METRIC>\u2028 <level value=info/>\u2028 <appender-ref ref=METRIC/>\u2028 </logger>\u2028\u2028 <logger name=FeedSLA>\u2028 <level value=debug/>\u2028 <appender-ref ref=FeedSLA/>\u2028 </logger>\u2028\u2028 <logger name=org.apache.hadoop.security additivity=false>\u2028 <level value=info/>\u2028 <appender-ref ref=SECURITY/>\u2028 </logger>\u2028\u2028 <logger name=org.apache.hadoop additivity=false>\u2028 <level value=info/>\u2028 <appender-ref ref=FILE/>\u2028 </logger>\u2028\u2028 <logger name=org.apache.oozie additivity=false>\u2028 <level value=info/>\u2028 <appender-ref ref=FILE/>\u2028 </logger>\u2028\u2028 <logger name=org.apache.hadoop.hive additivity=false>\u2028 <level value=info/>\u2028 <appender-ref ref=FILE/>\u2028 </logger>\u2028\u2028 <root>\u2028 <priority value=info/>\u2028 <appender-ref r
ef=FILE/>\u2028 </root>\u2028\u2028</log4j:configuration>\u2028 ]]></value>\u2028 <value-attributes>\u2028 <type>content</type>\u2028 <show-property-name>false</show-property-name>\u2028 </value-attributes>\u2028 <on-ambari-upgrade add=true/>\u2028 </property>\u2028</configuration>\u2028"
+ },
+
"hdfs-site": {
"dfs.namenode.checkpoint.period": "21600",
"dfs.namenode.avoid.write.stale.datanode": "true",
@@ -232,6 +236,7 @@
"user_group": "hadoop",
"smokeuser": "ambari-qa"
}
+
},
"configurationTags": {
"falcon-startup.properties": {
http://git-wip-us.apache.org/repos/asf/ambari/blob/1482ffdb/ambari-server/src/test/python/stacks/2.5/RANGER/test_ranger_admin.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.5/RANGER/test_ranger_admin.py b/ambari-server/src/test/python/stacks/2.5/RANGER/test_ranger_admin.py
index 8e8e68b..8e959ad 100644
--- a/ambari-server/src/test/python/stacks/2.5/RANGER/test_ranger_admin.py
+++ b/ambari-server/src/test/python/stacks/2.5/RANGER/test_ranger_admin.py
@@ -300,7 +300,7 @@ class TestRangerAdmin(RMFTestCase):
self.assertResourceCalled('File', '/usr/hdp/current/ranger-admin/ews/webapp/WEB-INF/log4j.properties',
owner = 'ranger',
group = 'ranger',
- content = self.getConfig()['configurations']['admin-log4j']['content'],
+ content = InlineTemplate(self.getConfig()['configurations']['admin-log4j']['content']),
mode = 0644
)
@@ -450,7 +450,7 @@ class TestRangerAdmin(RMFTestCase):
self.assertResourceCalled('File', '/usr/hdp/current/ranger-admin/ews/webapp/WEB-INF/log4j.properties',
owner = 'ranger',
group = 'ranger',
- content = self.getConfig()['configurations']['admin-log4j']['content'],
+ content = InlineTemplate(self.getConfig()['configurations']['admin-log4j']['content']),
mode = 0644
)
@@ -473,4 +473,4 @@ class TestRangerAdmin(RMFTestCase):
configurations = self.getConfig()['configurations']['core-site'],
configuration_attributes = self.getConfig()['configuration_attributes']['core-site'],
mode = 0644
- )
\ No newline at end of file
+ )
http://git-wip-us.apache.org/repos/asf/ambari/blob/1482ffdb/ambari-server/src/test/python/stacks/2.5/RANGER/test_ranger_tagsync.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.5/RANGER/test_ranger_tagsync.py b/ambari-server/src/test/python/stacks/2.5/RANGER/test_ranger_tagsync.py
index f5e55b3..dba3a6a 100644
--- a/ambari-server/src/test/python/stacks/2.5/RANGER/test_ranger_tagsync.py
+++ b/ambari-server/src/test/python/stacks/2.5/RANGER/test_ranger_tagsync.py
@@ -140,7 +140,7 @@ class TestRangerTagsync(RMFTestCase):
self.assertResourceCalled('File', '/usr/hdp/current/ranger-tagsync/conf/log4j.properties',
owner = 'ranger',
group = 'ranger',
- content = self.getConfig()['configurations']['tagsync-log4j']['content'],
+ content = InlineTemplate(self.getConfig()['configurations']['tagsync-log4j']['content']),
mode = 0644
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/1482ffdb/ambari-server/src/test/python/stacks/2.5/RANGER/test_ranger_usersync.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.5/RANGER/test_ranger_usersync.py b/ambari-server/src/test/python/stacks/2.5/RANGER/test_ranger_usersync.py
index 36fa15b..22e84fc 100644
--- a/ambari-server/src/test/python/stacks/2.5/RANGER/test_ranger_usersync.py
+++ b/ambari-server/src/test/python/stacks/2.5/RANGER/test_ranger_usersync.py
@@ -128,7 +128,7 @@ class TestRangerUsersync(RMFTestCase):
self.assertResourceCalled('File', '/usr/hdp/current/ranger-usersync/conf/log4j.properties',
owner = 'ranger',
group = 'ranger',
- content = self.getConfig()['configurations']['usersync-log4j']['content'],
+ content = InlineTemplate(self.getConfig()['configurations']['usersync-log4j']['content']),
mode = 0644
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/1482ffdb/ambari-server/src/test/python/stacks/2.5/RANGER_KMS/test_kms_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.5/RANGER_KMS/test_kms_server.py b/ambari-server/src/test/python/stacks/2.5/RANGER_KMS/test_kms_server.py
index 3d79e0a..57f9f34 100644
--- a/ambari-server/src/test/python/stacks/2.5/RANGER_KMS/test_kms_server.py
+++ b/ambari-server/src/test/python/stacks/2.5/RANGER_KMS/test_kms_server.py
@@ -380,7 +380,7 @@ class TestRangerKMS(RMFTestCase):
mode = 0644,
owner = 'kms',
group = 'kms',
- content = self.getConfig()['configurations']['kms-log4j']['content']
+ content = InlineTemplate(self.getConfig()['configurations']['kms-log4j']['content'])
)
@patch("os.path.isfile")
@@ -712,7 +712,7 @@ class TestRangerKMS(RMFTestCase):
mode = 0644,
owner = 'kms',
group = 'kms',
- content = self.getConfig()['configurations']['kms-log4j']['content']
+ content = InlineTemplate(self.getConfig()['configurations']['kms-log4j']['content'])
)
self.assertResourceCalled('XmlConfig', 'core-site.xml',
http://git-wip-us.apache.org/repos/asf/ambari/blob/1482ffdb/ambari-server/src/test/python/stacks/2.6/RANGER/test_ranger_admin.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.6/RANGER/test_ranger_admin.py b/ambari-server/src/test/python/stacks/2.6/RANGER/test_ranger_admin.py
index 32219b3..927ee0c 100644
--- a/ambari-server/src/test/python/stacks/2.6/RANGER/test_ranger_admin.py
+++ b/ambari-server/src/test/python/stacks/2.6/RANGER/test_ranger_admin.py
@@ -345,7 +345,7 @@ class TestRangerAdmin(RMFTestCase):
self.assertResourceCalled('File', '/usr/hdp/current/ranger-admin/ews/webapp/WEB-INF/log4j.properties',
owner = 'ranger',
group = 'ranger',
- content = self.getConfig()['configurations']['admin-log4j']['content'],
+ content = InlineTemplate(self.getConfig()['configurations']['admin-log4j']['content']),
mode = 0644
)
@@ -505,7 +505,7 @@ class TestRangerAdmin(RMFTestCase):
self.assertResourceCalled('File', '/usr/hdp/current/ranger-admin/ews/webapp/WEB-INF/log4j.properties',
owner = 'ranger',
group = 'ranger',
- content = self.getConfig()['configurations']['admin-log4j']['content'],
+ content = InlineTemplate(self.getConfig()['configurations']['admin-log4j']['content']),
mode = 0644
)
@@ -535,4 +535,4 @@ class TestRangerAdmin(RMFTestCase):
environment = {'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_45',
'RANGER_ADMIN_HOME': u'/usr/hdp/current/ranger-admin'},
logoutput = True
- )
\ No newline at end of file
+ )
http://git-wip-us.apache.org/repos/asf/ambari/blob/1482ffdb/ambari-server/src/test/python/stacks/2.6/RANGER/test_ranger_tagsync.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.6/RANGER/test_ranger_tagsync.py b/ambari-server/src/test/python/stacks/2.6/RANGER/test_ranger_tagsync.py
index 42f75e2..bf5128e 100644
--- a/ambari-server/src/test/python/stacks/2.6/RANGER/test_ranger_tagsync.py
+++ b/ambari-server/src/test/python/stacks/2.6/RANGER/test_ranger_tagsync.py
@@ -246,7 +246,7 @@ class TestRangerTagsync(RMFTestCase):
self.assertResourceCalled('File', '/usr/hdp/current/ranger-tagsync/conf/log4j.properties',
owner = 'ranger',
group = 'ranger',
- content = self.getConfig()['configurations']['tagsync-log4j']['content'],
+ content = InlineTemplate(self.getConfig()['configurations']['tagsync-log4j']['content']),
mode = 0644
)