Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5BB2718552 for ; Tue, 2 Feb 2016 09:49:03 +0000 (UTC) Received: (qmail 47318 invoked by uid 500); 2 Feb 2016 09:49:03 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 47291 invoked by uid 500); 2 Feb 2016 09:49:03 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 47282 invoked by uid 99); 2 Feb 2016 09:49:03 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Feb 2016 09:49:03 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CD27FDFDC7; Tue, 2 Feb 2016 09:49:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: gautam@apache.org To: commits@ambari.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-14562. Ranger - If configured audit store is 'solr', then audit_store value should be 'solr'(gautam) Date: Tue, 2 Feb 2016 09:49:02 +0000 (UTC) Repository: ambari Updated Branches: refs/heads/trunk 774d689ee -> 6e098207d AMBARI-14562. Ranger - If configured audit store is 'solr', then audit_store value should be 'solr'(gautam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6e098207 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6e098207 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6e098207 Branch: refs/heads/trunk Commit: 6e098207dd0d8c015df7dd5f7ddede87ee269216 Parents: 774d689 Author: Gautam Borad Authored: Fri Jan 22 09:25:37 2016 +0530 Committer: Gautam Borad Committed: Tue Feb 2 15:18:48 2016 +0530 ---------------------------------------------------------------------- .../RANGER/0.4.0/package/scripts/setup_ranger_xml.py | 5 +++++ .../services/RANGER/configuration/ranger-admin-site.xml | 10 ++++++++++ .../resources/stacks/HDP/2.3/services/stack_advisor.py | 11 +++++++++++ .../test/python/stacks/2.3/common/test_stack_advisor.py | 3 ++- 4 files changed, 28 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/6e098207/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 119da1a..4660cf8 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 @@ -196,6 +196,11 @@ def setup_ranger_db(upgrade_type=None): owner = params.unix_user, ) + ModifyPropertiesFile(format("{ranger_home}/install.properties"), + properties = {'audit_store': params.ranger_audit_source_type}, + owner = params.unix_user, + ) + if params.db_flavor.lower() == 'sqla': ModifyPropertiesFile(format("{ranger_home}/install.properties"), properties = {'SQL_CONNECTOR_JAR': format('{ranger_home}/ews/lib/{jdbc_jar_name}')}, http://git-wip-us.apache.org/repos/asf/ambari/blob/6e098207/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml index e9eecde..07eb7c4 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml @@ -164,6 +164,16 @@ ranger.audit.source.type solr db or solr, based on the audit destination used + + + ranger-env + xasecure.audit.destination.solr + + + ranger-env + xasecure.audit.destination.db + + http://git-wip-us.apache.org/repos/asf/ambari/blob/6e098207/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py index 3e60f05..dae3e8a 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py @@ -624,6 +624,17 @@ class HDP23StackAdvisor(HDP22StackAdvisor): rangerAuditProperty = services["configurations"][item['filename']]["properties"][item['configname']] putRangerAuditProperty(item['target_configname'], rangerAuditProperty) + audit_solr_flag = 'false' + audit_db_flag = 'false' + ranger_audit_source_type = 'solr' + if 'ranger-env' in services['configurations'] and 'xasecure.audit.destination.solr' in services['configurations']["ranger-env"]["properties"]: + audit_solr_flag = services['configurations']["ranger-env"]["properties"]['xasecure.audit.destination.solr'] + if 'ranger-env' in services['configurations'] and 'xasecure.audit.destination.db' in services['configurations']["ranger-env"]["properties"]: + audit_db_flag = services['configurations']["ranger-env"]["properties"]['xasecure.audit.destination.db'] + + if audit_db_flag == 'true' and audit_solr_flag == 'false': + ranger_audit_source_type = 'db' + putRangerAdminProperty('ranger.audit.source.type',ranger_audit_source_type) def recommendYARNConfigurations(self, configurations, clusterData, services, hosts): http://git-wip-us.apache.org/repos/asf/ambari/blob/6e098207/ambari-server/src/test/python/stacks/2.3/common/test_stack_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/common/test_stack_advisor.py b/ambari-server/src/test/python/stacks/2.3/common/test_stack_advisor.py index e345e2a..965ce98 100644 --- a/ambari-server/src/test/python/stacks/2.3/common/test_stack_advisor.py +++ b/ambari-server/src/test/python/stacks/2.3/common/test_stack_advisor.py @@ -1531,7 +1531,8 @@ class TestHDP23StackAdvisor(TestCase): }, 'ranger-admin-site': { 'properties': { - "ranger.audit.solr.zookeepers": "NONE" + "ranger.audit.solr.zookeepers": "NONE", + "ranger.audit.source.type": "solr" } }, 'ranger-env': {