RANGER-178 - Incorporated feedback from Madhan Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/d27cacd7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/d27cacd7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/d27cacd7
Branch: refs/heads/master Commit: d27cacd7dbe966c13fc8dd962e66eb306f3b36a1 Parents: 1295055 Author: Don Bosco Durai <[email protected]> Authored: Mon Mar 30 20:57:12 2015 -0700 Committer: Don Bosco Durai <[email protected]> Committed: Mon Mar 30 20:57:12 2015 -0700 ---------------------------------------------------------------------- .../service-defs/ranger-servicedef-solr.json | 12 ++--- plugin-solr/conf/ranger-solr-audit.xml | 48 ++++++++++++++++++++ 2 files changed, 54 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/d27cacd7/agents-common/src/main/resources/service-defs/ranger-servicedef-solr.json ---------------------------------------------------------------------- diff --git a/agents-common/src/main/resources/service-defs/ranger-servicedef-solr.json b/agents-common/src/main/resources/service-defs/ranger-servicedef-solr.json index e66f2b3..6ae7a87 100644 --- a/agents-common/src/main/resources/service-defs/ranger-servicedef-solr.json +++ b/agents-common/src/main/resources/service-defs/ranger-servicedef-solr.json @@ -7,14 +7,14 @@ { "name":"collection", "type":"string", - "level":1, + "level":10, "parent":"", "mandatory":true, "lookupSupported":true, "recursiveSupported":false, "excludesSupported":true, "matcher":"org.apache.ranger.plugin.resourcematcher.RangerDefaultResourceMatcher", - "matcherOptions":"wildCard=true;ignoreCase=true", + "matcherOptions":{ "wildCard":true, "ignoreCase":true, "pathSeparatorChar":"." }, "validationRegEx":"", "validationMessage":"", "uiHint":"", @@ -24,14 +24,14 @@ { "name":"field", "type":"string", - "level":2, + "level":20, "parent":"collection", "mandatory":true, "lookupSupported":true, "recursiveSupported":false, "excludesSupported":true, "matcher":"org.apache.ranger.plugin.resourcematcher.RangerDefaultResourceMatcher", - "matcherOptions":"wildCard=true;ignoreCase=true", + "matcherOptions":{ "wildCard":true, "ignoreCase":true, "pathSeparatorChar":"." }, "validationRegEx":"", "validationMessage":"", "uiHint":"", @@ -54,8 +54,8 @@ "label":"Query" }, { - "name":"admin", - "label":"Admin" + "name":"solr_admin", + "label":"Solr Admin" } ], http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/d27cacd7/plugin-solr/conf/ranger-solr-audit.xml ---------------------------------------------------------------------- diff --git a/plugin-solr/conf/ranger-solr-audit.xml b/plugin-solr/conf/ranger-solr-audit.xml index d27f062..a42716f 100644 --- a/plugin-solr/conf/ranger-solr-audit.xml +++ b/plugin-solr/conf/ranger-solr-audit.xml @@ -184,4 +184,52 @@ <name>xasecure.audit.log4j.async.max.flush.interval.ms</name> <value>30000</value> </property> + + + <!-- Kafka audit provider configuration --> + <property> + <name>xasecure.audit.kafka.is.enabled</name> + <value>false</value> + </property> + + <property> + <name>xasecure.audit.kafka.async.max.queue.size</name> + <value>1</value> + </property> + + <property> + <name>xasecure.audit.kafka.async.max.flush.interval.ms</name> + <value>1000</value> + </property> + + <property> + <name>xasecure.audit.kafka.broker_list</name> + <value>localhost:9092</value> + </property> + + <property> + <name>xasecure.audit.kafka.topic_name</name> + <value>ranger_audits</value> + </property> + + <!-- Ranger audit provider configuration --> + <property> + <name>xasecure.audit.solr.is.enabled</name> + <value>false</value> + </property> + + <property> + <name>xasecure.audit.solr.async.max.queue.size</name> + <value>1</value> + </property> + + <property> + <name>xasecure.audit.solr.async.max.flush.interval.ms</name> + <value>1000</value> + </property> + + <property> + <name>xasecure.audit.solr.solr_url</name> + <value>http://localhost:6083/solr/ranger_audits</value> + </property> </configuration>
