You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2015/12/10 21:24:27 UTC
ambari git commit: AMBARI-13763. ranger.audit.solr.zookeepers value
should be suffixed with /ranger_audits. (Gautam via Jaimin)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 1f631152d -> 98ce26c59
AMBARI-13763. ranger.audit.solr.zookeepers value should be suffixed with /ranger_audits. (Gautam via Jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/98ce26c5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/98ce26c5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/98ce26c5
Branch: refs/heads/branch-2.2
Commit: 98ce26c594e1062cc1949c2170e87d84c8c8bc42
Parents: 1f63115
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Thu Dec 10 12:23:11 2015 -0800
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Thu Dec 10 12:23:11 2015 -0800
----------------------------------------------------------------------
.../main/resources/common-services/RANGER/0.4.0/alerts.json | 2 +-
.../main/resources/stacks/HDP/2.3/services/RANGER/alerts.json | 2 +-
.../main/resources/stacks/HDP/2.3/services/stack_advisor.py | 7 ++-----
3 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/98ce26c5/ambari-server/src/main/resources/common-services/RANGER/0.4.0/alerts.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/alerts.json b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/alerts.json
index a8b576c..c64ebfe 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/alerts.json
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/alerts.json
@@ -34,7 +34,7 @@
"name": "ranger_admin_password_check",
"label": "Ranger Admin password check",
"description": "This alert is used to ensure that the Ranger Admin password in Ambari is correct.",
- "interval": 1,
+ "interval": 30,
"scope": "ANY",
"source": {
"type": "SCRIPT",
http://git-wip-us.apache.org/repos/asf/ambari/blob/98ce26c5/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/alerts.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/alerts.json b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/alerts.json
index 480b7c9..182a06c 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/alerts.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/alerts.json
@@ -34,7 +34,7 @@
"name": "ranger_admin_password_check",
"label": "Ranger Admin password check",
"description": "This alert is used to ensure that the Ranger Admin password in Ambari is correct.",
- "interval": 1,
+ "interval": 30,
"scope": "ANY",
"source": {
"type": "SCRIPT",
http://git-wip-us.apache.org/repos/asf/ambari/blob/98ce26c5/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 aacc7e4..3264678 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
@@ -497,12 +497,9 @@ class HDP23StackAdvisor(HDP22StackAdvisor):
if isSolrCloudEnabled:
zookeeper_host_port = self.getZKHostPortString(services)
+ ranger_audit_zk_port = ''
if zookeeper_host_port:
- ranger_audit_zk_port = []
- zk_hosts = zookeeper_host_port.split(',')
- for zk_host in zk_hosts:
- ranger_audit_zk_port.append('{0}/{1}'.format(zk_host,'ranger_audits'))
- ranger_audit_zk_port = ','.join(ranger_audit_zk_port)
+ ranger_audit_zk_port = '{0}/{1}'.format(zookeeper_host_port, 'ranger_audits')
putRangerAdminProperty('ranger.audit.solr.zookeepers', ranger_audit_zk_port)
else:
putRangerAdminProperty('ranger.audit.solr.zookeepers', 'NONE')