metron-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ceste...@apache.org
Subject [3/3] incubator-metron git commit: METRON-797: Pass security.protocol and enable auto-renew for the storm topologies closes apache/incubator-metron#495
Date Thu, 30 Mar 2017 22:17:27 GMT
METRON-797: Pass security.protocol and enable auto-renew for the storm topologies closes apache/incubator-metron#495


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

Branch: refs/heads/master
Commit: aef84636a3427da20b1d54acfe1b8de23e2aaf97
Parents: e03636d
Author: mmiklavc <michael.miklavcic@gmail.com>
Authored: Wed Mar 29 09:23:09 2017 -0400
Committer: cstella <cestella@gmail.com>
Committed: Thu Mar 30 18:16:06 2017 -0400

----------------------------------------------------------------------
 .../metron-profiler/src/main/config/profiler.properties            | 2 +-
 .../metron-profiler/src/main/flux/profiler/remote.yaml             | 2 +-
 .../METRON/CURRENT/package/templates/enrichment.properties.j2      | 2 +-
 .../metron-elasticsearch/src/main/config/elasticsearch.properties  | 2 +-
 .../metron-enrichment/src/main/config/enrichment.properties        | 2 +-
 .../metron-enrichment/src/main/flux/enrichment/remote.yaml         | 2 +-
 metron-platform/metron-indexing/src/main/flux/indexing/remote.yaml | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/aef84636/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 b79ac73..f020b30 100644
--- a/metron-analytics/metron-profiler/src/main/config/profiler.properties
+++ b/metron-analytics/metron-profiler/src/main/config/profiler.properties
@@ -20,7 +20,7 @@
 
 ##### Storm #####
 
-storm.auto.credentials=[]
+topology.worker.childopts=
 
 ##### Profiler #####
 

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/aef84636/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 0b14bce..4c96b08 100644
--- a/metron-analytics/metron-profiler/src/main/flux/profiler/remote.yaml
+++ b/metron-analytics/metron-profiler/src/main/flux/profiler/remote.yaml
@@ -17,7 +17,7 @@
 name: "profiler"
 
 config:
-    topology.auto-credentials: ${storm.auto.credentials}
+    topology.worker.childopts: ${topology.worker.childopts}
     topology.workers: ${profiler.workers}
     topology.acker.executors: ${profiler.executors}
 

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/aef84636/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/templates/enrichment.properties.j2
----------------------------------------------------------------------
diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/templates/enrichment.properties.j2
b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/templates/enrichment.properties.j2
index 8fc2335..508bce9 100755
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/templates/enrichment.properties.j2
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/templates/enrichment.properties.j2
@@ -20,7 +20,7 @@
 kafka.zk={{zookeeper_quorum}}
 kafka.broker={{kafka_brokers}}
 kafka.security.protocol=PLAINTEXT
-storm.auto.credentials=[]
+topology.worker.childopts=
 enrichment.output.topic=indexing
 enrichment.error.topic=enrichments_error
 threat.intel.error.topic=threatintel_error

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/aef84636/metron-platform/metron-elasticsearch/src/main/config/elasticsearch.properties
----------------------------------------------------------------------
diff --git a/metron-platform/metron-elasticsearch/src/main/config/elasticsearch.properties
b/metron-platform/metron-elasticsearch/src/main/config/elasticsearch.properties
index d45d3d4..47a5092 100644
--- a/metron-platform/metron-elasticsearch/src/main/config/elasticsearch.properties
+++ b/metron-platform/metron-elasticsearch/src/main/config/elasticsearch.properties
@@ -17,7 +17,7 @@
 ##### Storm #####
 indexing.workers=1
 indexing.executors=0
-storm.auto.credentials=[]
+topology.worker.childopts=
 
 ##### Kafka #####
 

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/aef84636/metron-platform/metron-enrichment/src/main/config/enrichment.properties
----------------------------------------------------------------------
diff --git a/metron-platform/metron-enrichment/src/main/config/enrichment.properties b/metron-platform/metron-enrichment/src/main/config/enrichment.properties
index af5b27b..e293201 100644
--- a/metron-platform/metron-enrichment/src/main/config/enrichment.properties
+++ b/metron-platform/metron-enrichment/src/main/config/enrichment.properties
@@ -20,7 +20,7 @@
 kafka.zk=node1:2181
 kafka.broker=node1:6667
 kafka.security.protocol=PLAINTEXT
-storm.auto.credentials=[]
+topology.worker.childopts=
 
 enrichment.output.topic=indexing
 enrichment.error.topic=indexing

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/aef84636/metron-platform/metron-enrichment/src/main/flux/enrichment/remote.yaml
----------------------------------------------------------------------
diff --git a/metron-platform/metron-enrichment/src/main/flux/enrichment/remote.yaml b/metron-platform/metron-enrichment/src/main/flux/enrichment/remote.yaml
index 51fc7ce..82863ed 100644
--- a/metron-platform/metron-enrichment/src/main/flux/enrichment/remote.yaml
+++ b/metron-platform/metron-enrichment/src/main/flux/enrichment/remote.yaml
@@ -18,7 +18,7 @@ name: "enrichment"
 config:
     topology.workers: 1
     topology.acker.executors: 0
-    topology.auto-credentials: ${storm.auto.credentials}
+    topology.worker.childopts: ${topology.worker.childopts}
 
 components:
 

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/aef84636/metron-platform/metron-indexing/src/main/flux/indexing/remote.yaml
----------------------------------------------------------------------
diff --git a/metron-platform/metron-indexing/src/main/flux/indexing/remote.yaml b/metron-platform/metron-indexing/src/main/flux/indexing/remote.yaml
index ec423c5..25ecdab 100644
--- a/metron-platform/metron-indexing/src/main/flux/indexing/remote.yaml
+++ b/metron-platform/metron-indexing/src/main/flux/indexing/remote.yaml
@@ -19,7 +19,7 @@ name: "indexing"
 config:
     topology.workers: ${indexing.workers}
     topology.acker.executors: ${indexing.executors}
-    topology.auto-credentials: ${storm.auto.credentials}
+    topology.worker.childopts: ${topology.worker.childopts}
 
 components:
 


Mime
View raw message