From 9eb376bf3f2cc4875d891770bc31d687a0cbfd24 Mon Sep 17 00:00:00 2001 From: mbittmann Date: Fri, 31 Jul 2015 17:02:20 -0400 Subject: [PATCH 1/2] markdown formatting nit --- OpenSOC-Topologies/readme.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenSOC-Topologies/readme.md b/OpenSOC-Topologies/readme.md index feac62d..0674d70 100644 --- a/OpenSOC-Topologies/readme.md +++ b/OpenSOC-Topologies/readme.md @@ -41,7 +41,7 @@ The sample topologies provided use a specific directory structure. The example https://github.com/OpenSOC/opensoc-streaming/tree/master/OpenSOC-Topologies/src/main/resources/OpenSOC_Configs ``` -topology.conf - settings specific to each topology -features_enabled.conf - turn on and off features for each topology and control parallelism -metrics.conf - export definitions for metrics to Graphite -topology_dentifier.conf - customer-specific tag (since we deploy to multiple data centers we need to identify where the alerts are coming from and what topologies we are looking at when we need to debug) +topology.conf - settings specific to each topology +features_enabled.conf - turn on and off features for each topology and control parallelism +metrics.conf - export definitions for metrics to Graphite +topology_dentifier.conf - customer-specific tag (since we deploy to multiple data centers we need to identify where the alerts are coming from and what topologies we are looking at when we need to debug) From ebb75e9264afcb778d40ef847274af0f2db681fe Mon Sep 17 00:00:00 2001 From: Mark Bittmann Date: Wed, 5 Aug 2015 10:46:17 -0400 Subject: [PATCH 2/2] use config values where appropriate, fall back on hardcoded defaults if not present. Currently, the pcap/topology.conf exposes these config parameters, so we should us them. --- .../main/java/com/opensoc/topology/runner/TopologyRunner.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenSOC-Topologies/src/main/java/com/opensoc/topology/runner/TopologyRunner.java b/OpenSOC-Topologies/src/main/java/com/opensoc/topology/runner/TopologyRunner.java index 72c2240..06d4c8f 100644 --- a/OpenSOC-Topologies/src/main/java/com/opensoc/topology/runner/TopologyRunner.java +++ b/OpenSOC-Topologies/src/main/java/com/opensoc/topology/runner/TopologyRunner.java @@ -555,8 +555,8 @@ private boolean initializeKafkaSpout(String name) { SpoutConfig kafkaConfig = new SpoutConfig(zk, input_topic, "", input_topic); kafkaConfig.scheme = new SchemeAsMultiScheme(new RawScheme()); - kafkaConfig.forceFromStart = Boolean.valueOf("True"); - kafkaConfig.startOffsetTime = -1; + kafkaConfig.forceFromStart = config.getBoolean("spout.kafka.forcefromstart", Boolean.valueOf("True")); + kafkaConfig.startOffsetTime = config.getInt("spout.kafka.start.offset.time", -1); builder.setSpout(name, new KafkaSpout(kafkaConfig), config.getInt("spout.kafka.parallelism.hint")).setNumTasks(