You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metron.apache.org by ni...@apache.org on 2017/10/21 12:16:24 UTC

metron git commit: METRON-1266 Profiler - SASL Authentication Failed (nickwallen) closes apache/metron#809

Repository: metron
Updated Branches:
  refs/heads/master b4aa0859a -> 892aec357


METRON-1266 Profiler - SASL Authentication Failed (nickwallen) closes apache/metron#809


Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/892aec35
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/892aec35
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/892aec35

Branch: refs/heads/master
Commit: 892aec3573d300b3531be6b5d05ef50b7d4ed710
Parents: b4aa085
Author: nickwallen <ni...@nickallen.org>
Authored: Sat Oct 21 08:15:56 2017 -0400
Committer: nickallen <ni...@apache.org>
Committed: Sat Oct 21 08:15:56 2017 -0400

----------------------------------------------------------------------
 .../metron-profiler/src/main/config/profiler.properties          | 1 +
 .../metron-profiler/src/main/flux/profiler/remote.yaml           | 4 +++-
 .../metron/profiler/integration/ProfilerIntegrationTest.java     | 1 +
 .../METRON/CURRENT/package/templates/profiler.properties.j2      | 1 +
 4 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/metron/blob/892aec35/metron-analytics/metron-profiler/src/main/config/profiler.properties
----------------------------------------------------------------------
diff --git a/metron-analytics/metron-profiler/src/main/config/profiler.properties b/metron-analytics/metron-profiler/src/main/config/profiler.properties
index 873c837..896f8d5 100644
--- a/metron-analytics/metron-profiler/src/main/config/profiler.properties
+++ b/metron-analytics/metron-profiler/src/main/config/profiler.properties
@@ -21,6 +21,7 @@
 ##### Storm #####
 
 topology.worker.childopts=
+topology.auto-credentials=
 
 ##### Profiler #####
 

http://git-wip-us.apache.org/repos/asf/metron/blob/892aec35/metron-analytics/metron-profiler/src/main/flux/profiler/remote.yaml
----------------------------------------------------------------------
diff --git a/metron-analytics/metron-profiler/src/main/flux/profiler/remote.yaml b/metron-analytics/metron-profiler/src/main/flux/profiler/remote.yaml
index 4c96b08..752640a 100644
--- a/metron-analytics/metron-profiler/src/main/flux/profiler/remote.yaml
+++ b/metron-analytics/metron-profiler/src/main/flux/profiler/remote.yaml
@@ -20,6 +20,7 @@ config:
     topology.worker.childopts: ${topology.worker.childopts}
     topology.workers: ${profiler.workers}
     topology.acker.executors: ${profiler.executors}
+    topology.auto-credentials: ${topology.auto-credentials}
 
 components:
 
@@ -44,6 +45,7 @@ components:
               ref: "rowKeyBuilder"
             - name: "columnBuilder"
               ref: "columnBuilder"
+
     # Any kafka props for the producer go here.
     -   id: "kafkaProps"
         className: "java.util.HashMap"
@@ -65,7 +67,7 @@ components:
                     - "security.protocol"
                     - "${kafka.security.protocol}"
 
-  # The fields to pull out of the kafka messages
+    # The fields to pull out of the kafka messages
     -   id: "fields"
         className: "java.util.ArrayList"
         configMethods:

http://git-wip-us.apache.org/repos/asf/metron/blob/892aec35/metron-analytics/metron-profiler/src/test/java/org/apache/metron/profiler/integration/ProfilerIntegrationTest.java
----------------------------------------------------------------------
diff --git a/metron-analytics/metron-profiler/src/test/java/org/apache/metron/profiler/integration/ProfilerIntegrationTest.java b/metron-analytics/metron-profiler/src/test/java/org/apache/metron/profiler/integration/ProfilerIntegrationTest.java
index ad96857..0d1b465 100644
--- a/metron-analytics/metron-profiler/src/test/java/org/apache/metron/profiler/integration/ProfilerIntegrationTest.java
+++ b/metron-analytics/metron-profiler/src/test/java/org/apache/metron/profiler/integration/ProfilerIntegrationTest.java
@@ -303,6 +303,7 @@ public class ProfilerIntegrationTest extends BaseIntegrationTest {
       setProperty("hbase.provider.impl", "" + MockHBaseTableProvider.class.getName());
       setProperty("storm.auto.credentials", "[]");
       setProperty("kafka.security.protocol", "PLAINTEXT");
+      setProperty("topology.auto-credentials", "[]");
     }};
 
     // create the mock table

http://git-wip-us.apache.org/repos/asf/metron/blob/892aec35/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/templates/profiler.properties.j2
----------------------------------------------------------------------
diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/templates/profiler.properties.j2 b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/templates/profiler.properties.j2
index cf2ad58..06fd209 100644
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/templates/profiler.properties.j2
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/templates/profiler.properties.j2
@@ -21,6 +21,7 @@
 ##### Storm #####
 
 topology.worker.childopts={{profiler_topology_worker_childopts}}
+topology.auto-credentials={{topology_auto_credentials}}
 
 ##### Profiler #####