You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metron.apache.org by le...@apache.org on 2018/09/13 19:20:59 UTC

[1/5] metron git commit: METRON-1776 Update public web site to point at 0.6.0 new release (justinleet) closes apache/metron#1195

Repository: metron
Updated Branches:
  refs/heads/master 2720e537e -> a97e575f3


http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/use-cases/parser_chaining/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/use-cases/parser_chaining/index.html b/site/current-book/use-cases/parser_chaining/index.html
new file mode 100644
index 0000000..5ddcde2
--- /dev/null
+++ b/site/current-book/use-cases/parser_chaining/index.html
@@ -0,0 +1,412 @@
+<!DOCTYPE html>
+<!--
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/use-cases/parser_chaining/index.md at 2018-09-12
+ | Rendered using Apache Maven Fluido Skin 1.7
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
+    <meta http-equiv="Content-Language" content="en" />
+    <title>Metron &#x2013; Problem Statement</title>
+    <link rel="stylesheet" href="../../css/apache-maven-fluido-1.7.min.css" />
+    <link rel="stylesheet" href="../../css/site.css" />
+    <link rel="stylesheet" href="../../css/print.css" media="print" />
+    <script type="text/javascript" src="../../js/apache-maven-fluido-1.7.min.js"></script>
+<script type="text/javascript">
+              $( document ).ready( function() { $( '.carousel' ).carousel( { interval: 3500 } ) } );
+            </script>
+  </head>
+  <body class="topBarDisabled">
+    <div class="container-fluid">
+      <div id="banner">
+        <div class="pull-left"><a href="http://metron.apache.org/" id="bannerLeft"><img src="../../images/metron-logo.png"  alt="Apache Metron" width="148px" height="48px"/></a></div>
+        <div class="pull-right"></div>
+        <div class="clear"><hr/></div>
+      </div>
+
+      <div id="breadcrumbs">
+        <ul class="breadcrumb">
+      <li class=""><a href="http://www.apache.org" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>
+      <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
+      <li class=""><a href="../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
+    <li class="active ">Problem Statement</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
+        </ul>
+      </div>
+      <div class="row-fluid">
+        <div id="leftColumn" class="span2">
+          <div class="well sidebar-nav">
+    <ul class="nav nav-list">
+      <li class="nav-header">User Documentation</li>
+    <li><a href="../../index.html" title="Metron"><span class="icon-chevron-down"></span>Metron</a>
+    <ul class="nav nav-list">
+    <li><a href="../../CONTRIBUTING.html" title="CONTRIBUTING"><span class="none"></span>CONTRIBUTING</a></li>
+    <li><a href="../../Upgrading.html" title="Upgrading"><span class="none"></span>Upgrading</a></li>
+    <li><a href="../../metron-analytics/index.html" title="Analytics"><span class="icon-chevron-right"></span>Analytics</a></li>
+    <li><a href="../../metron-contrib/metron-docker/index.html" title="Docker"><span class="none"></span>Docker</a></li>
+    <li><a href="../../metron-contrib/metron-performance/index.html" title="Performance"><span class="none"></span>Performance</a></li>
+    <li><a href="../../metron-deployment/index.html" title="Deployment"><span class="icon-chevron-right"></span>Deployment</a></li>
+    <li><a href="../../metron-interface/metron-alerts/index.html" title="Alerts"><span class="none"></span>Alerts</a></li>
+    <li><a href="../../metron-interface/metron-config/index.html" title="Config"><span class="none"></span>Config</a></li>
+    <li><a href="../../metron-interface/metron-rest/index.html" title="Rest"><span class="none"></span>Rest</a></li>
+    <li><a href="../../metron-platform/index.html" title="Platform"><span class="icon-chevron-right"></span>Platform</a></li>
+    <li><a href="../../metron-sensors/index.html" title="Sensors"><span class="icon-chevron-right"></span>Sensors</a></li>
+    <li><a href="../../metron-stellar/stellar-3rd-party-example/index.html" title="Stellar-3rd-party-example"><span class="none"></span>Stellar-3rd-party-example</a></li>
+    <li><a href="../../metron-stellar/stellar-common/index.html" title="Stellar-common"><span class="icon-chevron-right"></span>Stellar-common</a></li>
+    <li><a href="../../metron-stellar/stellar-zeppelin/index.html" title="Stellar-zeppelin"><span class="none"></span>Stellar-zeppelin</a></li>
+    <li><a href="../../use-cases/index.html" title="Use-cases"><span class="icon-chevron-down"></span>Use-cases</a>
+    <ul class="nav nav-list">
+    <li><a href="../../use-cases/forensic_clustering/index.html" title="Forensic_clustering"><span class="none"></span>Forensic_clustering</a></li>
+    <li><a href="../../use-cases/geographic_login_outliers/index.html" title="Geographic_login_outliers"><span class="none"></span>Geographic_login_outliers</a></li>
+    <li class="active"><a href="#"><span class="none"></span>Parser_chaining</a></li>
+    <li><a href="../../use-cases/typosquat_detection/index.html" title="Typosquat_detection"><span class="none"></span>Typosquat_detection</a></li>
+    </ul>
+</li>
+    </ul>
+</li>
+</ul>
+          <hr />
+          <div id="poweredBy">
+            <div class="clear"></div>
+            <div class="clear"></div>
+            <div class="clear"></div>
+            <div class="clear"></div>
+<a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="../../images/logos/maven-feather.png" /></a>
+            </div>
+          </div>
+        </div>
+        <div id="bodyColumn"  class="span10" >
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<h1>Problem Statement</h1>
+<p><a name="Problem_Statement"></a></p>
+<p>Aggregating many different types sensors into a single data source (e.g. syslog) and ingesting that aggregate sensor into Metron is a common pattern.  It is not obvious precisely how to manage these types of aggregate sensors as they require two-pass parsing.  This document will walk through an example of supporting this kind of multi-pass ingest.</p>
+<p>Multi-pass parser involves the following requirements:</p>
+<ul>
+
+<li>The enveloping parser (e.g. the aggregation format such as syslog or plain CSV) may contain metadata which should be ingested along with the data.</li>
+<li>The enveloping sensor contains many different sensor types</li>
+</ul>
+<p><a name="High_Level_Solution"></a></p>
+<h1>High Level Solution</h1>
+<p><img src="message_routing_high_level.svg" alt="High Level Approach" /></p>
+<p>At a high level, we continue to maintain the architectural invariant of a 1-1 relationship between logical sensors and storm topologies. Eventually this relationship may become more complex, but at the moment the approach is to construct a routing parser which will have two responsibilities:</p>
+<ul>
+
+<li>Parse the envelope (e.g. syslog data) and extract any metadata fields from the envelope to pass along</li>
+<li>Route the unfolded data to the appropriate kafka topic associated with the enveloped sensor data</li>
+</ul>
+<p>Because the data emitted from the routing parser is just like any data emitted from any other parser, in that it is a JSON blob like any data emitted from any parser, we will need to adjust the downstream parsers to extract the enveloped data from the JSON blob and treat it as the data to parse.</p>
+<p><a name="Example"></a></p>
+<h1>Example</h1>
+<div class="section">
+<h2><a name="Preliminaries"></a>Preliminaries</h2>
+<p>We assume that the following environment variables are set:</p>
+<ul>
+
+<li><tt>METRON_HOME</tt> - the home directory for metron</li>
+<li><tt>ZOOKEEPER</tt> - The zookeeper quorum (comma separated with port specified: e.g. <tt>node1:2181</tt> for full-dev)</li>
+<li><tt>BROKERLIST</tt> - The Kafka broker list (comma separated with port specified: e.g. <tt>node1:6667</tt> for full-dev)</li>
+<li><tt>ES_HOST</tt> - The elasticsearch master (and port) e.g. <tt>node1:9200</tt> for full-dev.</li>
+</ul>
+<p>Before editing configurations, be sure to pull the configs from zookeeper locally via</p>
+
+<div>
+<div>
+<pre class="source">$METRON_HOME/bin/zk_load_configs.sh --mode PULL -z $ZOOKEEPER -o $METRON_HOME/config/zookeeper/ -f
+</pre></div></div>
+</div>
+<div class="section">
+<h2><a name="The_Scenario"></a>The Scenario</h2>
+<p>Consider the following situation, we have some logs from a Cisco PIX device that we would like to ingest.  The format is syslog, but multiple scenarios exist in the same log file.  Specificaly, let&#x2019;s consider the sample logs <a class="externalLink" href="http://www.monitorware.com/en/logsamples/cisco-pix-61(2).php">here</a>.</p>
+<p>The log lines in general have the following components:</p>
+<ul>
+
+<li>A timestamp</li>
+<li>A message type tag</li>
+<li>The message payload that is dependent upon the tag</li>
+</ul>
+<p>Let&#x2019;s consider two types of messages that we&#x2019;d like to parse:</p>
+<ul>
+
+<li>Tag <tt>6-302*</tt> which are connection creation and teardown messages e.g. <tt>Built UDP connection for faddr 198.207.223.240/53337 gaddr 10.0.0.187/53 laddr 192.168.0.2/53</tt></li>
+<li>Tag <tt>5-304*</tt> which are URL access events e.g. <tt>192.168.0.2 Accessed URL 66.102.9.99:/</tt></li>
+</ul>
+<p>A couple things are apparent from this:</p>
+<ul>
+
+<li>The formats we care about are easy to represent in grok, but are very different and logically represent very different sensors.</li>
+<li>The syslog loglines output by this device has many types of events that I do not care about (yet).</li>
+</ul>
+<p>We will proceed to create 3 separate parsers:</p>
+<ul>
+
+<li>A <tt>pix_syslog_router</tt> parser which will:
+<ul>
+
+<li>Parse the timestamp field</li>
+<li>Parse the payload into a field called <tt>data</tt></li>
+<li>Parse the tag into a field called <tt>pix_type</tt></li>
+<li>Route the enveloped messages to the appropriate kafka topic based on the tag</li>
+</ul>
+</li>
+<li>A <tt>cisco-6-302</tt> and <tt>cisco-5-304</tt> parser which will append to the existing fields from the <tt>pix_syslog_router</tt> the sensor specific fields based on the tag type.</li>
+</ul></div>
+<div class="section">
+<h2><a name="Cisco_PIX_Grok_Patterns"></a>Cisco PIX Grok Patterns</h2>
+<p>In order to assist in these parsers, we&#x2019;re going to accumulate some grok expressions which will help us deal with these various parsers.</p>
+<ul>
+
+<li>Open a file <tt>~/cisco_patterns</tt> and place the following in there</li>
+</ul>
+
+<div>
+<div>
+<pre class="source">CISCO_ACTION Built|Teardown|Deny|Denied|denied|requested|permitted|denied by ACL|discarded|est-allowed|Dropping|created|deleted
+CISCO_REASON Duplicate TCP SYN|Failed to locate egress interface|Invalid transport field|No matching connection|DNS Response|DNS Query|(?:%{WORD}\s*)*
+CISCO_DIRECTION Inbound|inbound|Outbound|outbound
+CISCOFW302020_302021 %{CISCO_ACTION:action}(?:%{CISCO_DIRECTION:direction})? %{WORD:protocol} connection %{GREEDYDATA:ignore} faddr %{IP:ip_dst_addr}/%{INT:icmp_seq_num}(?:\(%{DATA:fwuser}\))? gaddr %{IP:ip_src_xlated}/%{INT:icmp_code_xlated} laddr %{IP:ip_src_addr}/%{INT:icmp_code}( \(%{DATA:user}\))?
+ACCESSED %{URIHOST:ip_src_addr} Accessed URL %{IP:ip_dst_addr}:%{URIPATHPARAM:uri_path}
+CISCO_PIX %{GREEDYDATA:timestamp}: %PIX-%{NOTSPACE:pix_type}: %{GREEDYDATA:data}
+</pre></div></div>
+
+<ul>
+
+<li>Place this pattern in HDFS at <tt>/tmp/cisco_patterns</tt> via <tt>hadoop fs -put ~/cisco_patterns /tmp</tt>
+<ul>
+
+<li>NOTE: In production, we&#x2019;d have more battle hardened patterns as well as place them in a more sensible location.</li>
+</ul>
+</li>
+</ul></div>
+<div class="section">
+<h2><a name="The_pix_syslog_router_Parser"></a>The <tt>pix_syslog_router</tt> Parser</h2>
+<ul>
+
+<li>Create the <tt>pix_syslog_router</tt> kafka topic via:</li>
+</ul>
+
+<div>
+<div>
+<pre class="source">/usr/hdp/current/kafka-broker/bin/kafka-topics.sh --zookeeper $ZOOKEEPER --create --topic pix_syslog_router --partitions 1 --replication-factor 1
+</pre></div></div>
+
+<ul>
+
+<li>Create the <tt>pix_syslog_router</tt> parser by opening <tt>$METRON_HOME/config/zookeeper/parsers/pix_syslog_router.json</tt> and placing the following:</li>
+</ul>
+
+<div>
+<div>
+<pre class="source">{
+   &quot;parserClassName&quot; : &quot;org.apache.metron.parsers.GrokParser&quot;
+  ,&quot;sensorTopic&quot; : &quot;pix_syslog_router&quot;
+  , &quot;parserConfig&quot;: {
+     &quot;grokPath&quot;: &quot;/tmp/cisco_patterns&quot;,
+     &quot;batchSize&quot; : 1,
+     &quot;patternLabel&quot;: &quot;CISCO_PIX&quot;,
+     &quot;timestampField&quot;: &quot;timestamp&quot;,
+     &quot;timeFields&quot; : [ &quot;timestamp&quot; ],
+     &quot;dateFormat&quot; : &quot;MMM dd yyyy HH:mm:ss&quot;,
+     &quot;kafka.topicField&quot; : &quot;logical_source_type&quot;
+   }
+  ,&quot;fieldTransformations&quot; : [
+    {
+     &quot;transformation&quot; : &quot;REGEX_SELECT&quot;
+    ,&quot;input&quot; :  &quot;pix_type&quot;
+    ,&quot;output&quot; :  &quot;logical_source_type&quot;
+    ,&quot;config&quot; : {
+      &quot;cisco-6-302&quot; : &quot;^6-302.*&quot;,
+      &quot;cisco-5-304&quot; : &quot;^5-304.*&quot;
+                }
+    }
+                           ]
+}
+</pre></div></div>
+
+<p>A couple of things to note about this config:</p>
+<ul>
+
+<li>In the <tt>parserConfig</tt> section, note that we are specifying <tt>kafka.topicField</tt> is <tt>logical_source_field</tt>.  This specifies that the parser will send messages to the topic specified in the <tt>logical_source_type</tt> field.  If the field does not exist, then the message is not sent.</li>
+<li>The <tt>REGEX_SELECT</tt> field transformation sets the <tt>logical_source_type</tt> field based on the value in the <tt>pix_type</tt> field, which recall is our tag.  This will enable us to route the broad category of cisco firewall messages along to the specific parser.</li>
+</ul></div>
+<div class="section">
+<h2><a name="The_cisco-6-302_Parser"></a>The <tt>cisco-6-302</tt> Parser</h2>
+<ul>
+
+<li>Create the <tt>cisco-6-302</tt> kafka topic via:</li>
+</ul>
+
+<div>
+<div>
+<pre class="source">/usr/hdp/current/kafka-broker/bin/kafka-topics.sh --zookeeper $ZOOKEEPER --create --topic cisco-6-302 --partitions 1 --replication-factor 1
+</pre></div></div>
+
+<ul>
+
+<li>Create the <tt>cisco-6-302</tt> parser by opening <tt>$METRON_HOME/config/zookeeper/parsers/cisco-6-302.json</tt> and placing the following:</li>
+</ul>
+
+<div>
+<div>
+<pre class="source">{
+   &quot;parserClassName&quot; : &quot;org.apache.metron.parsers.GrokParser&quot;
+  ,&quot;sensorTopic&quot; : &quot;cisco-6-302&quot;
+  ,&quot;rawMessageStrategy&quot; : &quot;ENVELOPE&quot;
+  ,&quot;rawMessageStrategyConfig&quot; : {
+      &quot;messageField&quot; : &quot;data&quot;,
+      &quot;metadataPrefix&quot; : &quot;&quot;
+  }
+  , &quot;parserConfig&quot;: {
+     &quot;grokPath&quot;: &quot;/tmp/cisco_patterns&quot;,
+     &quot;batchSize&quot; : 1,
+     &quot;patternLabel&quot;: &quot;CISCOFW302020_302021&quot;
+   }
+}
+</pre></div></div>
+
+<p>Note a couple of things:</p>
+<ul>
+
+<li>We are specifying the <tt>rawMessageStrategy</tt> to be <tt>ENVELOPE</tt> to indicate that it is not a straight data feed, but rather it&#x2019;s enveloped in a JSON map (i.e. the output of the `pix_syslog_router)</li>
+<li>Because this is enveloped, we must specify the field which contains the actual raw data by setting <tt>messageField</tt> in <tt>rawMessageStrategyConfig</tt></li>
+<li>You may be wondering why we specify <tt>metadataPrefix</tt> to be empty string.  We want some of the fields in the enveloped message to be merged in without prefix.  Most specifically, we want the <tt>timestamp</tt> field.  By default, the prefix is <tt>metron.metadata</tt>.</li>
+</ul></div>
+<div class="section">
+<h2><a name="The_cisco-5-304_Parser"></a>The <tt>cisco-5-304</tt> Parser</h2>
+<ul>
+
+<li>Create the <tt>cisco-5-304</tt> kafka topic via:</li>
+</ul>
+
+<div>
+<div>
+<pre class="source">/usr/hdp/current/kafka-broker/bin/kafka-topics.sh --zookeeper $ZOOKEEPER --create --topic cisco-5-304 --partitions 1 --replication-factor 1
+</pre></div></div>
+
+<ul>
+
+<li>Create the <tt>cisco-5-304</tt> parser by opening <tt>$METRON_HOME/config/zookeeper/parsers/cisco-5-304.json</tt> and placing the following:</li>
+</ul>
+
+<div>
+<div>
+<pre class="source">{
+   &quot;parserClassName&quot; : &quot;org.apache.metron.parsers.GrokParser&quot;
+  ,&quot;sensorTopic&quot; : &quot;cisco-5-304&quot;
+  ,&quot;rawMessageStrategy&quot; : &quot;ENVELOPE&quot;
+  ,&quot;rawMessageStrategyConfig&quot; : {
+      &quot;messageField&quot; : &quot;data&quot;,
+      &quot;metadataPrefix&quot; : &quot;&quot;
+  }
+  , &quot;parserConfig&quot;: {
+     &quot;grokPath&quot;: &quot;/tmp/cisco_patterns&quot;,
+     &quot;batchSize&quot; : 1,
+     &quot;patternLabel&quot;: &quot;ACCESSED&quot;
+   }
+}
+</pre></div></div>
+
+<p>Mostly the same comments from the previous parser apply here; we are just using a different pattern label.</p>
+<p><a name="Start_the_Parsers"></a></p>
+<h1>Start the Parsers</h1>
+<p>Now we should start the parsers</p>
+<ul>
+
+<li>Push the configs that we&#x2019;ve created for the 3 parsers:</li>
+</ul>
+
+<div>
+<div>
+<pre class="source">$METRON_HOME/bin/zk_load_configs.sh --mode PUSH -z $ZOOKEEPER -i $METRON_HOME/config/zookeeper/
+</pre></div></div>
+
+<ul>
+
+<li>Start the <tt>cisco-6-302</tt> parser via</li>
+</ul>
+
+<div>
+<div>
+<pre class="source">$METRON_HOME/bin/start_parser_topology.sh -k $BROKERLIST -z $ZOOKEEPER -s cisco-6-302 
+</pre></div></div>
+
+<ul>
+
+<li>Start the <tt>cisco-5-304</tt> parser via</li>
+</ul>
+
+<div>
+<div>
+<pre class="source">$METRON_HOME/bin/start_parser_topology.sh -k $BROKERLIST -z $ZOOKEEPER -s cisco-5-304 
+</pre></div></div>
+
+<ul>
+
+<li>Start the <tt>pix_syslog_router</tt> parser via</li>
+</ul>
+
+<div>
+<div>
+<pre class="source">$METRON_HOME/bin/start_parser_topology.sh -k $BROKERLIST -z $ZOOKEEPER -s pix_syslog_router
+</pre></div></div>
+
+<p><a name="Send_Data"></a></p>
+<h1>Send Data</h1>
+<ul>
+
+<li>Create a file called <tt>~/data.log</tt> with the sample syslog loglines <a class="externalLink" href="http://www.monitorware.com/en/logsamples/cisco-pix-61(2).php">here</a>.</li>
+<li>Send the data in via kafka console producer</li>
+</ul>
+
+<div>
+<div>
+<pre class="source">cat ~/data.log | /usr/hdp/current/kafka-broker/bin/kafka-console-producer.sh --broker-list $BROKERLIST --topic pix_syslog_router
+</pre></div></div>
+
+<p>You should see indices created for the <tt>cisco-5-304</tt> and <tt>cisco-6-302</tt> data with appropriate fields created for each type.</p>
+<p><a name="Aggregated_Parsers_with_Parser_Chaining"></a></p>
+<h1>Aggregated Parsers with Parser Chaining</h1>
+<p>Chained parsers can be run as aggregated parsers. These parsers continue to use the sensor specific Kafka topics, and do not do internal routing to the appropriate sensor.</p>
+<p>Instead of creating a topology per sensor, all 3 (<tt>pix-syslog-parser</tt>, <tt>cisco-5-304</tt>, and <tt>cisco-6-302</tt>) can be run in a single aggregated parser. It&#x2019;s also possible to aggregate a subset of these parsers (e.g. run <tt>cisco-6-302</tt> as it&#x2019;s own topology, and aggregate the other 2).</p>
+<p>The step to start parsers then becomes</p>
+
+<div>
+<div>
+<pre class="source">$METRON_HOME/bin/start_parser_topology.sh -k $BROKERLIST -z $ZOOKEEPER -s cisco-6-302,cisco-5-304,pix_syslog_router
+</pre></div></div>
+
+<p>The flow through the Storm topology and Kafka topics:</p>
+<p><img src="aggregated_parser_chaining_flow.svg" alt="Aggregated Flow" /></p></div>
+        </div>
+      </div>
+    </div>
+    <hr/>
+    <footer>
+      <div class="container-fluid">
+        <div class="row-fluid">
+© 2015-2016 The Apache Software Foundation. Apache Metron, Metron, Apache, the Apache feather logo,
+            and the Apache Metron project logo are trademarks of The Apache Software Foundation.
+        </div>
+      </div>
+    </footer>
+  </body>
+</html>

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/use-cases/typosquat_detection/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/use-cases/typosquat_detection/index.html b/site/current-book/use-cases/typosquat_detection/index.html
index 03c3581..acb2763 100644
--- a/site/current-book/use-cases/typosquat_detection/index.html
+++ b/site/current-book/use-cases/typosquat_detection/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/use-cases/typosquat_detection/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/use-cases/typosquat_detection/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Problem Statement</title>
     <link rel="stylesheet" href="../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Problem Statement</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -61,6 +61,7 @@
     <ul class="nav nav-list">
     <li><a href="../../use-cases/forensic_clustering/index.html" title="Forensic_clustering"><span class="none"></span>Forensic_clustering</a></li>
     <li><a href="../../use-cases/geographic_login_outliers/index.html" title="Geographic_login_outliers"><span class="none"></span>Geographic_login_outliers</a></li>
+    <li><a href="../../use-cases/parser_chaining/index.html" title="Parser_chaining"><span class="none"></span>Parser_chaining</a></li>
     <li class="active"><a href="#"><span class="none"></span>Typosquat_detection</a></li>
     </ul>
 </li>
@@ -379,7 +380,7 @@ true
     &quot;fieldMap&quot;: {
       &quot;stellar&quot; : {
         &quot;config&quot; : [
-          &quot;is_alert := (exists(is_alert) &amp;&amp; is_alert) || is_potential_typosquat&quot;
+          &quot;is_alert := is_alert || is_potential_typosquat&quot;
         ]
       }
 
@@ -501,7 +502,7 @@ true
                  &quot;url&quot; : {
                    &quot;type&quot; : &quot;text&quot;,&quot;fielddata&quot; : true
                  },
-                 &quot;alert&quot; : {
+                 &quot;metron_alert&quot; : {
                    &quot;type&quot; : &quot;nested&quot;
                  }
               }
@@ -528,7 +529,15 @@ We can visit the Alerts UI (find the link from Ambari if not on full-dev.  If on
 <p>From there you should see the following data from squid with one as an alert and the other not</p>
 <p><img src="squid_search.png" alt="Alerts" /></p>
 <p>Now, if you drill down into the alert, you can see our fields and the reasons specified</p>
-<p><img src="drill_down.png" alt="Drill Down" /></p></div>
+<p><img src="drill_down.png" alt="Drill Down" /></p>
+<div class="section">
+<h3><a name="Version_Info"></a>Version Info</h3>
+<p>Verified against:</p>
+<ul>
+
+<li>METRON_VERSION=0.5.0</li>
+<li>ELASTIC_VERSION=5.6.2</li>
+</ul></div></div>
         </div>
       </div>
     </div>

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/documentation/index.md
----------------------------------------------------------------------
diff --git a/site/documentation/index.md b/site/documentation/index.md
index f842a67..e528fae 100644
--- a/site/documentation/index.md
+++ b/site/documentation/index.md
@@ -74,24 +74,21 @@ title: Apache Metron Documentation
 <section class="events-section info-block darken" id="releases">
     <div class="wrapper downloads">
         <div class="text-center">
-            <h4>Current Release: 0.5.0</h4>
+            <h4>Current Release: 0.6.0</h4>
         </div>
         <div class="content-960 hover-btn text-center">
             <ul>
                 <li>
-                <a href="http://www.apache.org/dyn/closer.cgi/metron/0.5.0/apache-metron-0.5.0.tar.gz" target="new">
-                    apache-metron-0.5.0.tar.gz
+                <a href="http://www.apache.org/dyn/closer.cgi/metron/0.6.0/apache-metron-0.6.0.tar.gz" target="new">
+                    apache-metron-0.6.0.tar.gz
                 </a>
-                 [ <a href="https://www.apache.org/dist/metron/0.5.0/apache-metron-0.5.0.tar.gz.asc" target="new">
+                 [ <a href="https://www.apache.org/dist/metron/0.6.0/apache-metron-0.6.0.tar.gz.asc" target="new">
                     PGP
                  </a>]
-                 [ <a href="https://www.apache.org/dist/metron/0.5.0/apache-metron-0.5.0.tar.gz.sha1" target="new">
-                    SHA1
-                 </a>]
-                 [ <a href="https://www.apache.org/dist/metron/0.5.0/apache-metron-0.5.0.tar.gz.sha256" target="new">
+                 [ <a href="https://www.apache.org/dist/metron/0.6.0/apache-metron-0.6.0.tar.gz.sha256" target="new">
                     SHA256
                  </a>]
-                 [ <a href="https://www.apache.org/dist/metron/0.5.0/apache-metron-0.5.0.tar.gz.sha512" target="new">
+                 [ <a href="https://www.apache.org/dist/metron/0.6.0/apache-metron-0.6.0.tar.gz.sha512" target="new">
                     SHA512
                  </a>]
                  [ <a href="/current-book/index.html" target="new"> Book </a>]


[4/5] metron git commit: METRON-1776 Update public web site to point at 0.6.0 new release (justinleet) closes apache/metron#1195

Posted by le...@apache.org.
http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-deployment/development/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-deployment/development/index.html b/site/current-book/metron-deployment/development/index.html
index ea99fdf..9c6f49e 100644
--- a/site/current-book/metron-deployment/development/index.html
+++ b/site/current-book/metron-deployment/development/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/development/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/development/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Metron Development Environments</title>
     <link rel="stylesheet" href="../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Metron Development Environments</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-deployment/development/ubuntu14/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-deployment/development/ubuntu14/index.html b/site/current-book/metron-deployment/development/ubuntu14/index.html
index 16b2d81..fb15a5e 100644
--- a/site/current-book/metron-deployment/development/ubuntu14/index.html
+++ b/site/current-book/metron-deployment/development/ubuntu14/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/development/ubuntu14/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/development/ubuntu14/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Metron on Ubuntu 14</title>
     <link rel="stylesheet" href="../../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Metron on Ubuntu 14</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -190,8 +190,8 @@ vagrant up
 <p>Navigate to the following resources to explore your newly minted Apache Metron environment.</p>
 <ul>
 
-<li><a class="externalLink" href="http://node1:4201">Metron Alerts</a></li>
-<li><a class="externalLink" href="http://node1:8080">Ambari</a></li>
+<li><a class="externalLink" href="http://node1:4201">Metron Alerts</a> credentials: user/password</li>
+<li><a class="externalLink" href="http://node1:8080">Ambari</a> credentials: admin/admin</li>
 </ul>
 <p>Connecting to the host through SSH is as simple as running the following command.</p>
 

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-deployment/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-deployment/index.html b/site/current-book/metron-deployment/index.html
index a3ffcbd..ef7ddb1 100644
--- a/site/current-book/metron-deployment/index.html
+++ b/site/current-book/metron-deployment/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; </title>
     <link rel="stylesheet" href="../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active "></li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -171,7 +171,10 @@ limitations under the License.
 <p>Running Metron within the resource constraints of a single VM is incredibly challenging. Failing to respect this warning, will cause various services to fail mysteriously as the system runs into memory and processing limits.</p></div>
 <div class="section">
 <h4><a name="How.3F"></a>How?</h4>
-<p>To deploy Metron in a VM running on your computer, follow the instructions at <a href="development/centos6/index.html">development/centos6</a>.</p></div></div></div>
+<p>To deploy Metron in a VM running on your computer, follow the instructions at <a href="development/centos6/index.html">development/centos6</a>.</p></div>
+<div class="section">
+<h4><a name="How_do_I_address_services_crashing_when_running_Metron_on_a_single_VM.3F"></a>How do I address services crashing when running Metron on a single VM?</h4>
+<p>We recommend looking at Ambari and shutting down any services you may not be using. For example, we recommend turning off Metron Profiler, as this commonly causes REST services to crash when running on a single VM.</p></div></div></div>
 <div class="section">
 <h2><a name="How_do_I_build_RPM_packages.3F"></a>How do I build RPM packages?</h2>
 <p>This provides RPM packages that allow you to install Metron on an RPM-based operating system like CentOS.</p>

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-deployment/other-examples/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-deployment/other-examples/index.html b/site/current-book/metron-deployment/other-examples/index.html
index 3a89cb0..41ee390 100644
--- a/site/current-book/metron-deployment/other-examples/index.html
+++ b/site/current-book/metron-deployment/other-examples/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/other-examples/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/other-examples/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Other Example Deployments</title>
     <link rel="stylesheet" href="../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Other Example Deployments</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-deployment/other-examples/manual-install/Manual_Install_CentOS6.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-deployment/other-examples/manual-install/Manual_Install_CentOS6.html b/site/current-book/metron-deployment/other-examples/manual-install/Manual_Install_CentOS6.html
index 5cf9775..f3d8dff 100644
--- a/site/current-book/metron-deployment/other-examples/manual-install/Manual_Install_CentOS6.html
+++ b/site/current-book/metron-deployment/other-examples/manual-install/Manual_Install_CentOS6.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/other-examples/manual-install/Manual_Install_CentOS6.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/other-examples/manual-install/Manual_Install_CentOS6.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; </title>
     <link rel="stylesheet" href="../../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active "></li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-deployment/packaging/ambari/elasticsearch-mpack/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-deployment/packaging/ambari/elasticsearch-mpack/index.html b/site/current-book/metron-deployment/packaging/ambari/elasticsearch-mpack/index.html
index 499e89b..8a59770 100644
--- a/site/current-book/metron-deployment/packaging/ambari/elasticsearch-mpack/index.html
+++ b/site/current-book/metron-deployment/packaging/ambari/elasticsearch-mpack/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/packaging/ambari/elasticsearch-mpack/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/packaging/ambari/elasticsearch-mpack/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; </title>
     <link rel="stylesheet" href="../../../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active "></li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-deployment/packaging/ambari/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-deployment/packaging/ambari/index.html b/site/current-book/metron-deployment/packaging/ambari/index.html
index bac5758..7acd537 100644
--- a/site/current-book/metron-deployment/packaging/ambari/index.html
+++ b/site/current-book/metron-deployment/packaging/ambari/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/packaging/ambari/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/packaging/ambari/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Ambari Management Pack Development</title>
     <link rel="stylesheet" href="../../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Ambari Management Pack Development</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-deployment/packaging/ambari/metron-mpack/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-deployment/packaging/ambari/metron-mpack/index.html b/site/current-book/metron-deployment/packaging/ambari/metron-mpack/index.html
index dd97717..ddf0663 100644
--- a/site/current-book/metron-deployment/packaging/ambari/metron-mpack/index.html
+++ b/site/current-book/metron-deployment/packaging/ambari/metron-mpack/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/packaging/ambari/metron-mpack/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/packaging/ambari/metron-mpack/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; </title>
     <link rel="stylesheet" href="../../../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active "></li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-deployment/packaging/docker/ansible-docker/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-deployment/packaging/docker/ansible-docker/index.html b/site/current-book/metron-deployment/packaging/docker/ansible-docker/index.html
index 8145c8f..4c85d3f 100644
--- a/site/current-book/metron-deployment/packaging/docker/ansible-docker/index.html
+++ b/site/current-book/metron-deployment/packaging/docker/ansible-docker/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/packaging/docker/ansible-docker/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/packaging/docker/ansible-docker/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; </title>
     <link rel="stylesheet" href="../../../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active "></li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-deployment/packaging/docker/deb-docker/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-deployment/packaging/docker/deb-docker/index.html b/site/current-book/metron-deployment/packaging/docker/deb-docker/index.html
index a83a363..8dd1e3f 100644
--- a/site/current-book/metron-deployment/packaging/docker/deb-docker/index.html
+++ b/site/current-book/metron-deployment/packaging/docker/deb-docker/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/packaging/docker/deb-docker/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/packaging/docker/deb-docker/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; </title>
     <link rel="stylesheet" href="../../../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active "></li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-deployment/packaging/docker/rpm-docker/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-deployment/packaging/docker/rpm-docker/index.html b/site/current-book/metron-deployment/packaging/docker/rpm-docker/index.html
index d684c0d..4d0cee3 100644
--- a/site/current-book/metron-deployment/packaging/docker/rpm-docker/index.html
+++ b/site/current-book/metron-deployment/packaging/docker/rpm-docker/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/packaging/docker/rpm-docker/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/packaging/docker/rpm-docker/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; </title>
     <link rel="stylesheet" href="../../../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active "></li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-deployment/packaging/packer-build/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-deployment/packaging/packer-build/index.html b/site/current-book/metron-deployment/packaging/packer-build/index.html
index fb4b71b..63a85b0 100644
--- a/site/current-book/metron-deployment/packaging/packer-build/index.html
+++ b/site/current-book/metron-deployment/packaging/packer-build/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/packaging/packer-build/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/packaging/packer-build/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Build Metron Images</title>
     <link rel="stylesheet" href="../../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Build Metron Images</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-interface/metron-alerts/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-interface/metron-alerts/index.html b/site/current-book/metron-interface/metron-alerts/index.html
index 9459bd1..f4c3d04 100644
--- a/site/current-book/metron-interface/metron-alerts/index.html
+++ b/site/current-book/metron-interface/metron-alerts/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-interface/metron-alerts/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-interface/metron-alerts/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; </title>
     <link rel="stylesheet" href="../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active "></li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -118,7 +118,8 @@ limitations under the License.
 <h2><a name="Prerequisites"></a>Prerequisites</h2>
 <ul>
 
-<li>The Metron REST application should be up and running and Elasticsearch should have some alerts populated by Metron topologies</li>
+<li>The Metron REST application should be up and running</li>
+<li>Elasticsearch or Solr should have some alerts populated by Metron topologies, depending on which real-time store is enabled</li>
 <li>The Management UI should be installed (which includes <a class="externalLink" href="https://expressjs.com/">Express</a>)</li>
 <li>The alerts can be populated using Full Dev or any other setup</li>
 <li>UI is developed using angular4 and uses angular-cli</li>
@@ -202,7 +203,10 @@ rest:
 <h2><a name="Global_Configuration_Properties"></a>Global Configuration Properties</h2>
 <div class="section">
 <h3><a name="source.type.field"></a><tt>source.type.field</tt></h3>
-<p>The source type format used. Defaults to <tt>source:type</tt>.</p></div></div>
+<p>The source type field name used in the real-time store. Defaults to <tt>source:type</tt>.</p></div>
+<div class="section">
+<h3><a name="threat.triage.score.field"></a><tt>threat.triage.score.field</tt></h3>
+<p>The threat triage score field name used in the real-time store. Defaults to <tt>threat:triage:score</tt>.</p></div></div>
 <div class="section">
 <h2><a name="Usage"></a>Usage</h2>
 <p>After configuration is complete, the Management UI can be managed as a service:</p>
@@ -237,12 +241,34 @@ npm install
 <p><b>NOTE</b>: <i>In the development mode ui by default connects to REST at <a class="externalLink" href="http://node1:8082">http://node1:8082</a> for fetching data. If you wish to change it you can change the REST url at metron/metron-interface/metron-alerts/proxy.conf.json</i></p></div>
 <div class="section">
 <h2><a name="E2E_Tests"></a>E2E Tests</h2>
-<p>An expressjs server is available for mocking the elastic search api.</p>
+<div class="section">
+<h3><a name="Caveats"></a>Caveats</h3>
 <ol style="list-style-type: decimal">
 
 <li>
 
-<p>Run e2e webserver :</p>
+<p>E2E tests uses data from full-dev wherever applicable. The tests assume rest-api&#x2019;s are available @<a class="externalLink" href="http://node1:8082">http://node1:8082</a>. It is recommended to shutdown all other Metron services while running the E2E tests including Parsers, Enrichment, Indexing and the Profiler.</p>
+</li>
+<li>
+
+<p>E2E tests are run on headless chrome. To see the chrome browser in action, remove the &#x2018;&#x2013;headless&#x2019; parameter of chromeOptions in metron/metron-interface/metron-alerts/protractor.conf.js file</p>
+</li>
+<li>
+
+<p>E2E tests delete all the data in HBase table &#x2018;metron_update&#x2019; and Elastic search index &#x2018;meta_alerts_index&#x2019; for testing against its test data</p>
+</li>
+<li>
+
+<p>E2E tests use <a class="externalLink" href="https://github.com/NickTomlin/protractor-flake">protractor-flake</a> to re-run flaky tests.</p>
+</li>
+</ol></div>
+<div class="section">
+<h3><a name="Steps_to_run"></a>Steps to run</h3>
+<ol style="list-style-type: decimal">
+
+<li>
+
+<p>An Express.js server is available for accessing the rest api. Run the e2e webserver:</p>
 
 <div>
 <div>
@@ -252,7 +278,7 @@ sh ./scripts/start-server-for-e2e.sh
 </li>
 <li>
 
-<p>run e2e test using the following command</p>
+<p>Run e2e tests using the following command:</p>
 
 <div>
 <div>
@@ -260,12 +286,8 @@ sh ./scripts/start-server-for-e2e.sh
 npm run e2e
 </pre></div></div>
 </li>
-<li>
-
-<p>E2E tests uses data from full-dev wherever applicable. The tests assume rest-api&#x2019;s are available @<a class="externalLink" href="http://node1:8082">http://node1:8082</a></p>
-</li>
 </ol>
-<p><b>NOTE</b>: <i>e2e tests covers all the general workflows and we will extend them as we need</i></p></div>
+<p><b>NOTE</b>: <i>e2e tests cover all the general workflows and we will extend them as we need</i></p></div></div>
         </div>
       </div>
     </div>

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-interface/metron-config/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-interface/metron-config/index.html b/site/current-book/metron-interface/metron-config/index.html
index 0c4c073..c46f751 100644
--- a/site/current-book/metron-interface/metron-config/index.html
+++ b/site/current-book/metron-interface/metron-config/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-interface/metron-config/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-interface/metron-config/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Metron Management UI</title>
     <link rel="stylesheet" href="../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Metron Management UI</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-interface/metron-rest/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-interface/metron-rest/index.html b/site/current-book/metron-interface/metron-rest/index.html
index eb378b3..b0f91d7 100644
--- a/site/current-book/metron-interface/metron-rest/index.html
+++ b/site/current-book/metron-interface/metron-rest/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-interface/metron-rest/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-interface/metron-rest/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Metron REST</title>
     <link rel="stylesheet" href="../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Metron REST</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -97,6 +97,7 @@ limitations under the License.
 <ul>
 
 <li>A running Metron cluster</li>
+<li>A running real-time store, either Elasticsearch or Solr depending on which one is enabled</li>
 <li>Java 8 installed</li>
 <li>Storm CLI and Metron topology scripts (start_parser_topology.sh, start_enrichment_topology.sh, start_elasticsearch_topology.sh) installed</li>
 <li>A relational database</li>
@@ -429,6 +430,23 @@ METRON_SERVICE_KEYTAB=&quot;/etc/security/keytabs/metron.keytab&quot;
 </pre></div></div>
 </div>
 <div class="section">
+<h2><a name="Pcap_Query"></a>Pcap Query</h2>
+<p>The REST application exposes endpoints for querying Pcap data.  For more information about filtering options see <a href="../../metron-platform/metron-pcap-backend/index.html#Query_Filter_Utility">Query Filter Utility</a>.</p>
+<p>There is an endpoint available that will return Pcap data in <a class="externalLink" href="https://wiki.wireshark.org/PDML">PDML</a> format.  <a class="externalLink" href="https://www.wireshark.org/">Wireshark</a> must be installed for this feature to work. Installing wireshark in CentOS can be done with <tt>yum -y install wireshark</tt>.</p>
+<p>The REST application uses a Java Process object to call out to the <tt>pcap_to_pdml.sh</tt> script.  This script is installed at <tt>$METRON_HOME/bin/pcap_to_pdml.sh</tt> by default. Out of the box it is a simple wrapper around the tshark command to transform raw pcap data to PDML.  However it can be extended to do additional processing as long as the expected input/output is maintained. REST will supply the script with raw pcap data through standard in and expects PDML data serialized as XML.</p>
+<p>Pcap query jobs can be configured for submission to a YARN queue.  This setting is exposed as the Spring property <tt>pcap.yarn.queue</tt>.  If configured, the REST application will set the <tt>mapreduce.job.queuename</tt> Hadoop property to that value. It is highly recommended that a dedicated YARN queue be created and configured for Pcap queries to prevent a job from consuming too many cluster resources.  More information about setting up YARN queues can be found <a class="externalLink" href="https://hadoop.apache.org/docs/current/hadoop-yarn/hadoop-yarn-site/CapacityScheduler.html#Setting_up_queues">here</a>.</p>
+<p>Pcap query results are stored in HDFS.  The location of query results when run through the REST app is determined by a couple factors.  The root of Pcap query results defaults to <tt>/apps/metron/pcap/output</tt> but can be changed with the Spring property <tt>pcap.final.output.path</tt>.  Assuming the default Pcap query output directory, the path to a result page will follow this pattern:</p>
+
+<div>
+<div>
+<pre class="source">/apps/metron/pcap/output/{username}/MAP_REDUCE/{job id}/page-{page number}.pcap
+</pre></div></div>
+
+<p>Over time Pcap query results will accumulate in HDFS.  Currently these results are not cleaned up automatically so cluster administrators should be aware of this and monitor them.  It is highly recommended that a process be put in place to periodically delete files and directories under the Pcap query results root.</p>
+<p>Users should also be mindful of date ranges used in queries so they don&#x2019;t produce result sets that are too large.  Currently there are no limits enforced on date ranges.</p>
+<p>Queries can also be configured on a global level for setting the number of results per page via a Spring property <tt>pcap.page.size</tt>. By default, this value is set to 10 pcaps per page, but you may choose to set this value higher based on observing frequenetly-run query result sizes. This setting works in conjunction with the property for setting finalizer threadpool size when optimizing query performance.</p>
+<p>Pcap query jobs have a finalization routine that writes their results out to HDFS in pages. Depending on the size of your pcaps, the number or results typically returned, page sizing (described above), and available CPU cores for running your REST application, your performance can be improved by adjusting the number of files that can be written to HDFS in parallel. To this end, there is a threadpool used for this finalization step that can be configured to use a specified number of threads. This setting is exposed as the Spring property <tt>pcap.finalizer.threadpool.size</tt>. A default value of &#x201c;1&#x201d; is used if not specified by the user. Generally speaking, you should see a performance gain when this value is set to anything higher than 1. A sizeable increase in performance can be achieved, especially for larger numbers of files of smaller size, by increasing the number of threads. It should be noted that this property is parsed as a String to allow for more complex 
 parallelism values. In addition to normal integer values, you can specify a multiple of the number of cores. If it&#x2019;s a string and ends with &#x201c;C&#x201d;, then strip the C and treat it as an integral multiple of the number of cores. If it&#x2019;s a string and does not end with a C, then treat it as a number in string form.</p></div>
+<div class="section">
 <h2><a name="API"></a>API</h2>
 <p>Request and Response objects are JSON formatted.  The JSON schemas are available in the Swagger UI.</p>
 <table border="0" class="table table-striped">
@@ -439,7 +457,7 @@ METRON_SERVICE_KEYTAB=&quot;/etc/security/keytabs/metron.keytab&quot;
 </thead><tbody>
 
 <tr class="b">
-<td> <a href="#get-apiv1alertsuiescalate"> <tt>POST /api/v1/alerts/ui/escalate</tt></a></td></tr>
+<td> <a href="#POST_apiv1alertsuiescalate"> <tt>POST /api/v1/alerts/ui/escalate</tt></a></td></tr>
 <tr class="a">
 <td> <a href="#GET_apiv1alertsuisettings"> <tt>GET /api/v1/alerts/ui/settings</tt></a></td></tr>
 <tr class="b">
@@ -491,11 +509,27 @@ METRON_SERVICE_KEYTAB=&quot;/etc/security/keytabs/metron.keytab&quot;
 <tr class="a">
 <td> <a href="#GET_apiv1metaalertupdatestatusguidstatus"> <tt>GET /api/v1/metaalert/update/status/{guid}/{status}</tt></a></td></tr>
 <tr class="b">
+<td> <a href="#POST_apiv1pcapfixed"> <tt>POST /api/v1/pcap/fixed</tt></a></td></tr>
+<tr class="a">
+<td> <a href="#POST_apiv1pcapquery"> <tt>POST /api/v1/pcap/query</tt></a></td></tr>
+<tr class="b">
+<td> <a href="#GET_apiv1pcap"> <tt>GET /api/v1/pcap</tt></a></td></tr>
+<tr class="a">
+<td> <a href="#GET_apiv1pcapjobId"> <tt>GET /api/v1/pcap/{jobId}</tt></a></td></tr>
+<tr class="b">
+<td> <a href="#GET_apiv1pcapjobIdpdml"> <tt>GET /api/v1/pcap/{jobId}/pdml</tt></a></td></tr>
+<tr class="a">
+<td> <a href="#GET_apiv1pcapjobIdraw"> <tt>GET /api/v1/pcap/{jobId}/raw</tt></a></td></tr>
+<tr class="b">
+<td> <a href="#DELETE_apiv1pcapkilljobId"> <tt>DELETE /api/v1/pcap/kill/{jobId}</tt></a></td></tr>
+<tr class="a">
+<td> <a href="#GET_apiv1pcapjobIdconfig"> <tt>GET /api/v1/pcap/{jobId}/config</tt></a></td></tr>
+<tr class="b">
 <td> <a href="#GET_apiv1searchsearch"> <tt>GET /api/v1/search/search</tt></a></td></tr>
 <tr class="a">
-<td> <a href="#get-apiv1searchsearch"> <tt>POST /api/v1/search/search</tt></a></td></tr>
+<td> <a href="#POST_apiv1searchsearch"> <tt>POST /api/v1/search/search</tt></a></td></tr>
 <tr class="b">
-<td> <a href="#get-apiv1searchgroup"> <tt>POST /api/v1/search/group</tt></a></td></tr>
+<td> <a href="#POST_apiv1searchgroup"> <tt>POST /api/v1/search/group</tt></a></td></tr>
 <tr class="a">
 <td> <a href="#GET_apiv1searchfindOne"> <tt>GET /api/v1/search/findOne</tt></a></td></tr>
 <tr class="b">
@@ -593,7 +627,7 @@ METRON_SERVICE_KEYTAB=&quot;/etc/security/keytabs/metron.keytab&quot;
 <tr class="b">
 <td> <a href="#PATCH_apiv1updatepatch"> <tt>PATCH /api/v1/update/patch</tt></a></td></tr>
 <tr class="a">
-<td> <a href="#patch-apiv1updatereplace"> <tt>PUT /api/v1/update/replace</tt></a></td></tr>
+<td> <a href="#PUT_apiv1updatereplace"> <tt>PUT /api/v1/update/replace</tt></a></td></tr>
 <tr class="b">
 <td> <a href="#GET_apiv1user"> <tt>GET /api/v1/user</tt></a></td></tr>
 </tbody>
@@ -1051,6 +1085,156 @@ METRON_SERVICE_KEYTAB=&quot;/etc/security/keytabs/metron.keytab&quot;
 </li>
 </ul></div>
 <div class="section">
+<h3><a name="POST_.2Fapi.2Fv1.2Fpcap.2Ffixed"></a><tt>POST /api/v1/pcap/fixed</tt></h3>
+<ul>
+
+<li>Description: Executes a Fixed Filter Pcap Query.</li>
+<li>Input:
+<ul>
+
+<li>fixedPcapRequest - A Fixed Pcap Request which includes fixed filter fields like ip source address and protocol</li>
+</ul>
+</li>
+<li>Returns:
+<ul>
+
+<li>200 - Returns a job status with job ID.</li>
+</ul>
+</li>
+</ul></div>
+<div class="section">
+<h3><a name="POST_.2Fapi.2Fv1.2Fpcap.2Fquery"></a><tt>POST /api/v1/pcap/query</tt></h3>
+<ul>
+
+<li>Description: Executes a Query Filter Pcap Query.</li>
+<li>Input:
+<ul>
+
+<li>queryPcapRequest - A Query Pcap Request which includes Stellar query field</li>
+</ul>
+</li>
+<li>Returns:
+<ul>
+
+<li>200 - Returns a job status with job ID.</li>
+</ul>
+</li>
+</ul></div>
+<div class="section">
+<h3><a name="GET_.2Fapi.2Fv1.2Fpcap"></a><tt>GET /api/v1/pcap</tt></h3>
+<ul>
+
+<li>Description: Gets a list of job statuses for Pcap query jobs that match the requested state.</li>
+<li>Input:
+<ul>
+
+<li>state - Job state</li>
+</ul>
+</li>
+<li>Returns:
+<ul>
+
+<li>200 - Returns a list of job statuses for jobs that match the requested state.</li>
+</ul>
+</li>
+</ul></div>
+<div class="section">
+<h3><a name="GET_.2Fapi.2Fv1.2Fpcap.2F.7BjobId.7D"></a><tt>GET /api/v1/pcap/{jobId}</tt></h3>
+<ul>
+
+<li>Description: Gets job status for Pcap query job.</li>
+<li>Input:
+<ul>
+
+<li>jobId - Job ID of submitted job</li>
+</ul>
+</li>
+<li>Returns:
+<ul>
+
+<li>200 - Returns a job status for the Job ID.</li>
+<li>404 - Job is missing.</li>
+</ul>
+</li>
+</ul></div>
+<div class="section">
+<h3><a name="GET_.2Fapi.2Fv1.2Fpcap.2F.7BjobId.7D.2Fpdml"></a><tt>GET /api/v1/pcap/{jobId}/pdml</tt></h3>
+<ul>
+
+<li>Description: Gets Pcap Results for a page in PDML format.</li>
+<li>Input:
+<ul>
+
+<li>jobId - Job ID of submitted job</li>
+<li>page - Page number</li>
+</ul>
+</li>
+<li>Returns:
+<ul>
+
+<li>200 - Returns PDML in json format.</li>
+<li>404 - Job or page is missing.</li>
+</ul>
+</li>
+</ul></div>
+<div class="section">
+<h3><a name="GET_.2Fapi.2Fv1.2Fpcap.2F.7BjobId.7D.2Fraw"></a><tt>GET /api/v1/pcap/{jobId}/raw</tt></h3>
+<ul>
+
+<li>Description: Download Pcap Results for a page.</li>
+<li>Input:
+<ul>
+
+<li>jobId - Job ID of submitted job</li>
+<li>page - Page number</li>
+</ul>
+</li>
+<li>Returns:
+<ul>
+
+<li>200 - Returns Pcap as a file download.</li>
+<li>404 - Job or page is missing.</li>
+</ul>
+</li>
+</ul></div>
+<div class="section">
+<h3><a name="DELETE_.2Fapi.2Fv1.2Fpcap.2Fkill.2F.7BjobId.7D"></a><tt>DELETE /api/v1/pcap/kill/{jobId}</tt></h3>
+<ul>
+
+<li>Description: Kills running job.</li>
+<li>Input:
+<ul>
+
+<li>jobId - Job ID of submitted job</li>
+</ul>
+</li>
+<li>Returns:
+<ul>
+
+<li>200 - Kills passed job.</li>
+</ul>
+</li>
+</ul></div>
+<div class="section">
+<h3><a name="GET_.2Fapi.2Fv1.2Fpcap.2F.7BjobId.7D.2Fconfig"></a><tt>GET /api/v1/pcap/{jobId}/config</tt></h3>
+<ul>
+
+<li>Description: Gets job configuration for Pcap query job.</li>
+<li>Input:
+<ul>
+
+<li>jobId - Job ID of submitted job</li>
+</ul>
+</li>
+<li>Returns:
+<ul>
+
+<li>200 - Returns a map of job properties for the Job ID.</li>
+<li>404 - Job is missing.</li>
+</ul>
+</li>
+</ul></div>
+<div class="section">
 <h3><a name="POST_.2Fapi.2Fv1.2Fsearch.2Fsearch"></a><tt>POST /api/v1/search/search</tt></h3>
 <ul>
 
@@ -1865,8 +2049,8 @@ METRON_SERVICE_KEYTAB=&quot;/etc/security/keytabs/metron.keytab&quot;
 <li>Returns:
 <ul>
 
-<li>200 - nothing</li>
-<li>404 - document not found</li>
+<li>200 - Nothing</li>
+<li>404 - Document not found</li>
 </ul>
 </li>
 </ul></div>

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-platform/Performance-tuning-guide.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-platform/Performance-tuning-guide.html b/site/current-book/metron-platform/Performance-tuning-guide.html
index 00d2907..b9134de 100644
--- a/site/current-book/metron-platform/Performance-tuning-guide.html
+++ b/site/current-book/metron-platform/Performance-tuning-guide.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-platform/Performance-tuning-guide.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-platform/Performance-tuning-guide.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Metron Performance Tuning Guide</title>
     <link rel="stylesheet" href="../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Metron Performance Tuning Guide</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -55,15 +55,16 @@
     <li><a href="../metron-platform/index.html" title="Platform"><span class="icon-chevron-down"></span>Platform</a>
     <ul class="nav nav-list">
     <li class="active"><a href="#"><span class="none"></span>Performance-tuning-guide</a></li>
-    <li><a href="../metron-platform/metron-api/index.html" title="Api"><span class="none"></span>Api</a></li>
     <li><a href="../metron-platform/metron-common/index.html" title="Common"><span class="none"></span>Common</a></li>
     <li><a href="../metron-platform/metron-data-management/index.html" title="Data-management"><span class="none"></span>Data-management</a></li>
     <li><a href="../metron-platform/metron-elasticsearch/index.html" title="Elasticsearch"><span class="none"></span>Elasticsearch</a></li>
     <li><a href="../metron-platform/metron-enrichment/index.html" title="Enrichment"><span class="icon-chevron-right"></span>Enrichment</a></li>
     <li><a href="../metron-platform/metron-indexing/index.html" title="Indexing"><span class="none"></span>Indexing</a></li>
+    <li><a href="../metron-platform/metron-job/index.html" title="Job"><span class="none"></span>Job</a></li>
     <li><a href="../metron-platform/metron-management/index.html" title="Management"><span class="none"></span>Management</a></li>
     <li><a href="../metron-platform/metron-parsers/index.html" title="Parsers"><span class="icon-chevron-right"></span>Parsers</a></li>
     <li><a href="../metron-platform/metron-pcap-backend/index.html" title="Pcap-backend"><span class="none"></span>Pcap-backend</a></li>
+    <li><a href="../metron-platform/metron-solr/index.html" title="Solr"><span class="none"></span>Solr</a></li>
     <li><a href="../metron-platform/metron-writer/index.html" title="Writer"><span class="none"></span>Writer</a></li>
     </ul>
 </li>
@@ -781,7 +782,7 @@ enrichments                    enrichments        43         29754331        297
 
 <div>
 <div>
-<pre class="source">/usr/metron/0.5.0/bin/start_parser_topology.sh \
+<pre class="source">/usr/metron/0.6.0/bin/start_parser_topology.sh \
     -e ~metron/.storm/storm-bro.config \
     -esc ~/.storm/spout-bro.config \
     -k $BROKERLIST \
@@ -966,7 +967,7 @@ export KAFKA_HOME=$HDP_HOME/kafka-broker
 export STORM_UI=http://node1:8744
 export ELASTIC=http://node1:9200
 export ZOOKEEPER=node1:2181
-export METRON_VERSION=0.5.0
+export METRON_VERSION=0.6.0
 export METRON_HOME=/usr/metron/${METRON_VERSION}
 </pre></div></div>
 

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-platform/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-platform/index.html b/site/current-book/metron-platform/index.html
index 7819640..9fa8d70 100644
--- a/site/current-book/metron-platform/index.html
+++ b/site/current-book/metron-platform/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-platform/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-platform/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Current Build</title>
     <link rel="stylesheet" href="../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Current Build</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -55,15 +55,16 @@
     <li class="active"><a href="#"><span class="icon-chevron-down"></span>Platform</a>
     <ul class="nav nav-list">
     <li><a href="../metron-platform/Performance-tuning-guide.html" title="Performance-tuning-guide"><span class="none"></span>Performance-tuning-guide</a></li>
-    <li><a href="../metron-platform/metron-api/index.html" title="Api"><span class="none"></span>Api</a></li>
     <li><a href="../metron-platform/metron-common/index.html" title="Common"><span class="none"></span>Common</a></li>
     <li><a href="../metron-platform/metron-data-management/index.html" title="Data-management"><span class="none"></span>Data-management</a></li>
     <li><a href="../metron-platform/metron-elasticsearch/index.html" title="Elasticsearch"><span class="none"></span>Elasticsearch</a></li>
     <li><a href="../metron-platform/metron-enrichment/index.html" title="Enrichment"><span class="icon-chevron-right"></span>Enrichment</a></li>
     <li><a href="../metron-platform/metron-indexing/index.html" title="Indexing"><span class="none"></span>Indexing</a></li>
+    <li><a href="../metron-platform/metron-job/index.html" title="Job"><span class="none"></span>Job</a></li>
     <li><a href="../metron-platform/metron-management/index.html" title="Management"><span class="none"></span>Management</a></li>
     <li><a href="../metron-platform/metron-parsers/index.html" title="Parsers"><span class="icon-chevron-right"></span>Parsers</a></li>
     <li><a href="../metron-platform/metron-pcap-backend/index.html" title="Pcap-backend"><span class="none"></span>Pcap-backend</a></li>
+    <li><a href="../metron-platform/metron-solr/index.html" title="Solr"><span class="none"></span>Solr</a></li>
     <li><a href="../metron-platform/metron-writer/index.html" title="Writer"><span class="none"></span>Writer</a></li>
     </ul>
 </li>
@@ -104,7 +105,7 @@ limitations under the License.
  -->
 <h1>Current Build</h1>
 <p><a name="Current_Build"></a></p>
-<p>The latest build of metron-platform is 0.5.0.</p>
+<p>The latest build of metron-platform is 0.6.0.</p>
 <p>We are still in the process of merging/porting additional features from our production code base into this open source release. This release will be followed by a number of additional beta releases until the port is complete. We will also work on getting additional documentation and user/developer guides to the community as soon as we can. At this time we offer no support for the beta software, but will try to respond to requests as promptly as we can.</p>
 <p><a name="metron-platform"></a></p>
 <h1>metron-platform</h1>

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-platform/metron-api/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-platform/metron-api/index.html b/site/current-book/metron-platform/metron-api/index.html
deleted file mode 100644
index ddcaec5..0000000
--- a/site/current-book/metron-platform/metron-api/index.html
+++ /dev/null
@@ -1,161 +0,0 @@
-<!DOCTYPE html>
-<!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-platform/metron-api/index.md at 2018-06-07
- | Rendered using Apache Maven Fluido Skin 1.7
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
-    <meta http-equiv="Content-Language" content="en" />
-    <title>Metron &#x2013; Metron PCAP Service</title>
-    <link rel="stylesheet" href="../../css/apache-maven-fluido-1.7.min.css" />
-    <link rel="stylesheet" href="../../css/site.css" />
-    <link rel="stylesheet" href="../../css/print.css" media="print" />
-    <script type="text/javascript" src="../../js/apache-maven-fluido-1.7.min.js"></script>
-<script type="text/javascript">
-              $( document ).ready( function() { $( '.carousel' ).carousel( { interval: 3500 } ) } );
-            </script>
-  </head>
-  <body class="topBarDisabled">
-    <div class="container-fluid">
-      <div id="banner">
-        <div class="pull-left"><a href="http://metron.apache.org/" id="bannerLeft"><img src="../../images/metron-logo.png"  alt="Apache Metron" width="148px" height="48px"/></a></div>
-        <div class="pull-right"></div>
-        <div class="clear"><hr/></div>
-      </div>
-
-      <div id="breadcrumbs">
-        <ul class="breadcrumb">
-      <li class=""><a href="http://www.apache.org" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>
-      <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
-      <li class=""><a href="../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
-    <li class="active ">Metron PCAP Service</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
-        </ul>
-      </div>
-      <div class="row-fluid">
-        <div id="leftColumn" class="span2">
-          <div class="well sidebar-nav">
-    <ul class="nav nav-list">
-      <li class="nav-header">User Documentation</li>
-    <li><a href="../../index.html" title="Metron"><span class="icon-chevron-down"></span>Metron</a>
-    <ul class="nav nav-list">
-    <li><a href="../../CONTRIBUTING.html" title="CONTRIBUTING"><span class="none"></span>CONTRIBUTING</a></li>
-    <li><a href="../../Upgrading.html" title="Upgrading"><span class="none"></span>Upgrading</a></li>
-    <li><a href="../../metron-analytics/index.html" title="Analytics"><span class="icon-chevron-right"></span>Analytics</a></li>
-    <li><a href="../../metron-contrib/metron-docker/index.html" title="Docker"><span class="none"></span>Docker</a></li>
-    <li><a href="../../metron-contrib/metron-performance/index.html" title="Performance"><span class="none"></span>Performance</a></li>
-    <li><a href="../../metron-deployment/index.html" title="Deployment"><span class="icon-chevron-right"></span>Deployment</a></li>
-    <li><a href="../../metron-interface/metron-alerts/index.html" title="Alerts"><span class="none"></span>Alerts</a></li>
-    <li><a href="../../metron-interface/metron-config/index.html" title="Config"><span class="none"></span>Config</a></li>
-    <li><a href="../../metron-interface/metron-rest/index.html" title="Rest"><span class="none"></span>Rest</a></li>
-    <li><a href="../../metron-platform/index.html" title="Platform"><span class="icon-chevron-down"></span>Platform</a>
-    <ul class="nav nav-list">
-    <li><a href="../../metron-platform/Performance-tuning-guide.html" title="Performance-tuning-guide"><span class="none"></span>Performance-tuning-guide</a></li>
-    <li class="active"><a href="#"><span class="none"></span>Api</a></li>
-    <li><a href="../../metron-platform/metron-common/index.html" title="Common"><span class="none"></span>Common</a></li>
-    <li><a href="../../metron-platform/metron-data-management/index.html" title="Data-management"><span class="none"></span>Data-management</a></li>
-    <li><a href="../../metron-platform/metron-elasticsearch/index.html" title="Elasticsearch"><span class="none"></span>Elasticsearch</a></li>
-    <li><a href="../../metron-platform/metron-enrichment/index.html" title="Enrichment"><span class="icon-chevron-right"></span>Enrichment</a></li>
-    <li><a href="../../metron-platform/metron-indexing/index.html" title="Indexing"><span class="none"></span>Indexing</a></li>
-    <li><a href="../../metron-platform/metron-management/index.html" title="Management"><span class="none"></span>Management</a></li>
-    <li><a href="../../metron-platform/metron-parsers/index.html" title="Parsers"><span class="icon-chevron-right"></span>Parsers</a></li>
-    <li><a href="../../metron-platform/metron-pcap-backend/index.html" title="Pcap-backend"><span class="none"></span>Pcap-backend</a></li>
-    <li><a href="../../metron-platform/metron-writer/index.html" title="Writer"><span class="none"></span>Writer</a></li>
-    </ul>
-</li>
-    <li><a href="../../metron-sensors/index.html" title="Sensors"><span class="icon-chevron-right"></span>Sensors</a></li>
-    <li><a href="../../metron-stellar/stellar-3rd-party-example/index.html" title="Stellar-3rd-party-example"><span class="none"></span>Stellar-3rd-party-example</a></li>
-    <li><a href="../../metron-stellar/stellar-common/index.html" title="Stellar-common"><span class="icon-chevron-right"></span>Stellar-common</a></li>
-    <li><a href="../../metron-stellar/stellar-zeppelin/index.html" title="Stellar-zeppelin"><span class="none"></span>Stellar-zeppelin</a></li>
-    <li><a href="../../use-cases/index.html" title="Use-cases"><span class="icon-chevron-right"></span>Use-cases</a></li>
-    </ul>
-</li>
-</ul>
-          <hr />
-          <div id="poweredBy">
-            <div class="clear"></div>
-            <div class="clear"></div>
-            <div class="clear"></div>
-            <div class="clear"></div>
-<a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="../../images/logos/maven-feather.png" /></a>
-            </div>
-          </div>
-        </div>
-        <div id="bodyColumn"  class="span10" >
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<h1>Metron PCAP Service</h1>
-<p><a name="Metron_PCAP_Service"></a></p>
-<p>The purpose of the Metron PCAP service is to provide a middle tier to negotiate retrieving packet capture data which flows into Metron.  This packet data is of a form which <tt>libpcap</tt> based tools can read.</p>
-<div class="section">
-<h2><a name="Starting_the_Service"></a>Starting the Service</h2>
-<p>You can start the service either via the init.d script installed, <tt>/etc/init.d/pcapservice</tt> or directly via the <tt>yarn jar</tt> command: <tt>yarn jar $METRON_HOME/lib/metron-api-$METRON_VERSION.jar org.apache.metron.pcapservice.rest.PcapService -port $SERVICE_PORT -query_hdfs_path $QUERY_PATH -pcap_hdfs_path $PCAP_PATH</tt></p>
-<p>where</p>
-<ul>
-
-<li><tt>METRON_HOME</tt> is the location of the metron installation</li>
-<li><tt>METRON_VERSION</tt> is the version of the metron installation</li>
-<li><tt>SERVICE_PORT</tt> is the port to bind the REST service to.</li>
-<li><tt>QUERY_PATH</tt> is the temporary location to store query results.  They are deleted after the service reads them.</li>
-<li><tt>PCAP_PATH</tt> is the path to the packet data on HDFS</li>
-</ul></div>
-<div class="section">
-<h2><a name="The_.2FpcapGetter.2FgetPcapsByIdentifiers_endpoint"></a>The <tt>/pcapGetter/getPcapsByIdentifiers</tt> endpoint</h2>
-<p>This endpoint takes the following query parameters and returns the subset of packets matching this query:</p>
-<ul>
-
-<li><tt>srcIp</tt> : The source IP to match on</li>
-<li><tt>srcPort</tt> : The source port to match on</li>
-<li><tt>dstIp</tt> : The destination IP to match on</li>
-<li><tt>dstPort</tt> : The destination port to match on</li>
-<li><tt>startTime</tt> : The start time in milliseconds</li>
-<li><tt>endTime</tt> : The end time in milliseconds</li>
-<li><tt>numReducers</tt> : Specify the number of reducers to use when executing the mapreduce job</li>
-<li><tt>includeReverseTraffic</tt> : Indicates if filter should check swapped src/dest addresses and IPs</li>
-</ul></div>
-<div class="section">
-<h2><a name="The_.2FpcapGetter.2FgetPcapsByQuery_endpoint"></a>The <tt>/pcapGetter/getPcapsByQuery</tt> endpoint</h2>
-<p>This endpoint takes the following query parameters and returns the subset of packets matching this query. This endpoint exposes Stellar querying capabilities:</p>
-<ul>
-
-<li><tt>query</tt> : The Stellar query to execute</li>
-<li><tt>startTime</tt> : The start time in milliseconds</li>
-<li><tt>endTime</tt> : The end time in milliseconds</li>
-<li><tt>numReducers</tt> : Specify the number of reducers to use when executing the mapreduce job</li>
-</ul>
-<p>Example: <tt>curl -XGET &quot;http://node1:8081/pcapGetter/getPcapsByQuery?query=ip_src_addr+==+'192.168.66.121'+and+ip_src_port+==+'60500'&amp;startTime=1476936000000&quot;</tt></p>
-<p>All of these parameters are optional.  In the case of a missing parameter, it is treated as a wildcard.</p>
-<p>Unlike the CLI tool, there is no paging mechanism. The REST API will stream back data as a single file.</p></div>
-        </div>
-      </div>
-    </div>
-    <hr/>
-    <footer>
-      <div class="container-fluid">
-        <div class="row-fluid">
-© 2015-2016 The Apache Software Foundation. Apache Metron, Metron, Apache, the Apache feather logo,
-            and the Apache Metron project logo are trademarks of The Apache Software Foundation.
-        </div>
-      </div>
-    </footer>
-  </body>
-</html>

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-platform/metron-common/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-platform/metron-common/index.html b/site/current-book/metron-platform/metron-common/index.html
index 8d0dc0e..caa5a3b 100644
--- a/site/current-book/metron-platform/metron-common/index.html
+++ b/site/current-book/metron-platform/metron-common/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-platform/metron-common/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-platform/metron-common/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Contents</title>
     <link rel="stylesheet" href="../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Contents</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -55,15 +55,16 @@
     <li><a href="../../metron-platform/index.html" title="Platform"><span class="icon-chevron-down"></span>Platform</a>
     <ul class="nav nav-list">
     <li><a href="../../metron-platform/Performance-tuning-guide.html" title="Performance-tuning-guide"><span class="none"></span>Performance-tuning-guide</a></li>
-    <li><a href="../../metron-platform/metron-api/index.html" title="Api"><span class="none"></span>Api</a></li>
     <li class="active"><a href="#"><span class="none"></span>Common</a></li>
     <li><a href="../../metron-platform/metron-data-management/index.html" title="Data-management"><span class="none"></span>Data-management</a></li>
     <li><a href="../../metron-platform/metron-elasticsearch/index.html" title="Elasticsearch"><span class="none"></span>Elasticsearch</a></li>
     <li><a href="../../metron-platform/metron-enrichment/index.html" title="Enrichment"><span class="icon-chevron-right"></span>Enrichment</a></li>
     <li><a href="../../metron-platform/metron-indexing/index.html" title="Indexing"><span class="none"></span>Indexing</a></li>
+    <li><a href="../../metron-platform/metron-job/index.html" title="Job"><span class="none"></span>Job</a></li>
     <li><a href="../../metron-platform/metron-management/index.html" title="Management"><span class="none"></span>Management</a></li>
     <li><a href="../../metron-platform/metron-parsers/index.html" title="Parsers"><span class="icon-chevron-right"></span>Parsers</a></li>
     <li><a href="../../metron-platform/metron-pcap-backend/index.html" title="Pcap-backend"><span class="none"></span>Pcap-backend</a></li>
+    <li><a href="../../metron-platform/metron-solr/index.html" title="Solr"><span class="none"></span>Solr</a></li>
     <li><a href="../../metron-platform/metron-writer/index.html" title="Writer"><span class="none"></span>Writer</a></li>
     </ul>
 </li>
@@ -231,6 +232,16 @@ limitations under the License.
 <td> String     </td>
 <td> <tt>profiler_period_units</tt>    </td></tr>
 <tr class="a">
+<td> <a href="../../metron-analytics/metron-profiler/index.html#profiler.writer.batchSize"><tt>profiler.writer.batchSize</tt></a>                      </td>
+<td> Profiler      </td>
+<td> Integer    </td>
+<td>  N/A                       </td></tr>
+<tr class="b">
+<td> <a href="../../metron-analytics/metron-profiler/index.html#profiler.writer.batchTimeout"><tt>profiler.writer.batchTimeout</tt></a>                </td>
+<td> Profiler      </td>
+<td> Integer    </td>
+<td>  N/A                       </td></tr>
+<tr class="a">
 <td> <a href="../metron-indexing/index.html#update.hbase.table"><tt>update.hbase.table</tt></a>                                                         </td>
 <td> REST/Indexing </td>
 <td> String     </td>
@@ -246,10 +257,30 @@ limitations under the License.
 <td> String     </td>
 <td> <tt>geo_hdfs_file</tt>            </td></tr>
 <tr class="b">
+<td> <a href="../metron-enrichment/index.html#enrichment.writer.batchSize"><tt>enrichment.writer.batchSize</tt></a>                                     </td>
+<td> Enrichment    </td>
+<td> Integer    </td>
+<td>  N/A                       </td></tr>
+<tr class="a">
+<td> <a href="../metron-enrichment/index.html#enrichment.writer.batchTimeout"><tt>enrichment.writer.batchTimeout</tt></a>                               </td>
+<td> Enrichment    </td>
+<td> Integer    </td>
+<td>  N/A                       </td></tr>
+<tr class="b">
+<td> <a href="../metron-enrichment/index.html#geo.hdfs.file"><tt>geo.hdfs.file</tt></a>                                                                 </td>
+<td> Enrichment    </td>
+<td> String     </td>
+<td> <tt>geo_hdfs_file</tt>            </td></tr>
+<tr class="a">
 <td> <a href="../../metron-interface/metron-alerts/index.html#source.type.field"><tt>source.type.field</tt></a>                                         </td>
 <td> UI            </td>
 <td> String     </td>
-<td>  N/A                       </td></tr>
+<td>  <tt>source_type_field</tt>       </td></tr>
+<tr class="b">
+<td> <a href="../../metron-interface/metron-alerts/index.html#threat.triage.score.field"><tt>threat.triage.score.field</tt></a>                          </td>
+<td> UI            </td>
+<td> String     </td>
+<td>  <tt>threat_triage_score_field</tt>       </td></tr>
 </tbody>
 </table>
 <div class="section">

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-platform/metron-data-management/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-platform/metron-data-management/index.html b/site/current-book/metron-platform/metron-data-management/index.html
index dea600c..610c5c6 100644
--- a/site/current-book/metron-platform/metron-data-management/index.html
+++ b/site/current-book/metron-platform/metron-data-management/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-platform/metron-data-management/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-platform/metron-data-management/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Resource Data Management</title>
     <link rel="stylesheet" href="../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Resource Data Management</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -55,15 +55,16 @@
     <li><a href="../../metron-platform/index.html" title="Platform"><span class="icon-chevron-down"></span>Platform</a>
     <ul class="nav nav-list">
     <li><a href="../../metron-platform/Performance-tuning-guide.html" title="Performance-tuning-guide"><span class="none"></span>Performance-tuning-guide</a></li>
-    <li><a href="../../metron-platform/metron-api/index.html" title="Api"><span class="none"></span>Api</a></li>
     <li><a href="../../metron-platform/metron-common/index.html" title="Common"><span class="none"></span>Common</a></li>
     <li class="active"><a href="#"><span class="none"></span>Data-management</a></li>
     <li><a href="../../metron-platform/metron-elasticsearch/index.html" title="Elasticsearch"><span class="none"></span>Elasticsearch</a></li>
     <li><a href="../../metron-platform/metron-enrichment/index.html" title="Enrichment"><span class="icon-chevron-right"></span>Enrichment</a></li>
     <li><a href="../../metron-platform/metron-indexing/index.html" title="Indexing"><span class="none"></span>Indexing</a></li>
+    <li><a href="../../metron-platform/metron-job/index.html" title="Job"><span class="none"></span>Job</a></li>
     <li><a href="../../metron-platform/metron-management/index.html" title="Management"><span class="none"></span>Management</a></li>
     <li><a href="../../metron-platform/metron-parsers/index.html" title="Parsers"><span class="icon-chevron-right"></span>Parsers</a></li>
     <li><a href="../../metron-platform/metron-pcap-backend/index.html" title="Pcap-backend"><span class="none"></span>Pcap-backend</a></li>
+    <li><a href="../../metron-platform/metron-solr/index.html" title="Solr"><span class="none"></span>Solr</a></li>
     <li><a href="../../metron-platform/metron-writer/index.html" title="Writer"><span class="none"></span>Writer</a></li>
     </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-platform/metron-elasticsearch/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-platform/metron-elasticsearch/index.html b/site/current-book/metron-platform/metron-elasticsearch/index.html
index cc360b1..bf3c630 100644
--- a/site/current-book/metron-platform/metron-elasticsearch/index.html
+++ b/site/current-book/metron-platform/metron-elasticsearch/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-platform/metron-elasticsearch/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-platform/metron-elasticsearch/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Elasticsearch in Metron</title>
     <link rel="stylesheet" href="../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Elasticsearch in Metron</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -55,15 +55,16 @@
     <li><a href="../../metron-platform/index.html" title="Platform"><span class="icon-chevron-down"></span>Platform</a>
     <ul class="nav nav-list">
     <li><a href="../../metron-platform/Performance-tuning-guide.html" title="Performance-tuning-guide"><span class="none"></span>Performance-tuning-guide</a></li>
-    <li><a href="../../metron-platform/metron-api/index.html" title="Api"><span class="none"></span>Api</a></li>
     <li><a href="../../metron-platform/metron-common/index.html" title="Common"><span class="none"></span>Common</a></li>
     <li><a href="../../metron-platform/metron-data-management/index.html" title="Data-management"><span class="none"></span>Data-management</a></li>
     <li class="active"><a href="#"><span class="none"></span>Elasticsearch</a></li>
     <li><a href="../../metron-platform/metron-enrichment/index.html" title="Enrichment"><span class="icon-chevron-right"></span>Enrichment</a></li>
     <li><a href="../../metron-platform/metron-indexing/index.html" title="Indexing"><span class="none"></span>Indexing</a></li>
+    <li><a href="../../metron-platform/metron-job/index.html" title="Job"><span class="none"></span>Job</a></li>
     <li><a href="../../metron-platform/metron-management/index.html" title="Management"><span class="none"></span>Management</a></li>
     <li><a href="../../metron-platform/metron-parsers/index.html" title="Parsers"><span class="icon-chevron-right"></span>Parsers</a></li>
     <li><a href="../../metron-platform/metron-pcap-backend/index.html" title="Pcap-backend"><span class="none"></span>Pcap-backend</a></li>
+    <li><a href="../../metron-platform/metron-solr/index.html" title="Solr"><span class="none"></span>Solr</a></li>
     <li><a href="../../metron-platform/metron-writer/index.html" title="Writer"><span class="none"></span>Writer</a></li>
     </ul>
 </li>
@@ -405,13 +406,13 @@ limitations under the License.
 </ul></div></div></div></div>
 <div class="section">
 <h2><a name="Using_Metron_with_Elasticsearch_5.6.2"></a>Using Metron with Elasticsearch 5.6.2</h2>
-<p>There is a requirement that all sensors templates have a nested alert field defined.  This field is a dummy field.  See <a class="externalLink" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-sort.html#_ignoring_unmapped_fields">Ignoring Unmapped Fields</a> for more information</p>
+<p>There is a requirement that all sensors templates have a nested <tt>metron_alert</tt> field defined.  This field is a dummy field.  See <a class="externalLink" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-sort.html#_ignoring_unmapped_fields">Ignoring Unmapped Fields</a> for more information</p>
 <p>Without this field, an error will be thrown during ALL searches (including from UIs, resulting in no alerts being found for any sensor). This error will be found in the REST service&#x2019;s logs.</p>
 <p>Exception seen:</p>
 
 <div>
 <div>
-<pre class="source">QueryParsingException[[nested] failed to find nested object under path [alert]];
+<pre class="source">QueryParsingException[[nested] failed to find nested object under path [metron_alert]];
 </pre></div></div>
 
 <p>There are two steps to resolve this issue.  First is to update the Elasticsearch template for each sensor, so any new indices have the field. This requires retrieving the template, removing an extraneous JSON field so we can put it back later, and adding our new field.</p>
@@ -424,7 +425,7 @@ export SENSOR=&quot;bro&quot;
 curl -XGET &quot;http://${ELASTICSEARCH}:9200/_template/${SENSOR}_index*?pretty=true&quot; -o &quot;${SENSOR}.template&quot;
 sed -i '' '2d;$d' ./${SENSOR}.template
 sed -i '' '/&quot;properties&quot; : {/ a\
-&quot;alert&quot;: { &quot;type&quot;: &quot;nested&quot;},' ${SENSOR}.template
+&quot;metron_alert&quot;: { &quot;type&quot;: &quot;nested&quot;},' ${SENSOR}.template
 </pre></div></div>
 
 <p>To manually verify this, you can optionally pretty print it again with:</p>
@@ -448,7 +449,7 @@ sed -i '' '/&quot;properties&quot; : {/ a\
 <pre class="source">curl -XPUT &quot;http://${ELASTICSEARCH}:9200/${SENSOR}_index*/_mapping/${SENSOR}_doc&quot; -d '
 {
   &quot;properties&quot; : {
-    &quot;alert&quot; : {
+    &quot;metron_alert&quot; : {
       &quot;type&quot; : &quot;nested&quot;
     }
   }


[3/5] metron git commit: METRON-1776 Update public web site to point at 0.6.0 new release (justinleet) closes apache/metron#1195

Posted by le...@apache.org.
http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-platform/metron-enrichment/Performance.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-platform/metron-enrichment/Performance.html b/site/current-book/metron-platform/metron-enrichment/Performance.html
index 136d939..0857ee4 100644
--- a/site/current-book/metron-platform/metron-enrichment/Performance.html
+++ b/site/current-book/metron-platform/metron-enrichment/Performance.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-platform/metron-enrichment/Performance.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-platform/metron-enrichment/Performance.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Enrichment Performance</title>
     <link rel="stylesheet" href="../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Enrichment Performance</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -55,7 +55,6 @@
     <li><a href="../../metron-platform/index.html" title="Platform"><span class="icon-chevron-down"></span>Platform</a>
     <ul class="nav nav-list">
     <li><a href="../../metron-platform/Performance-tuning-guide.html" title="Performance-tuning-guide"><span class="none"></span>Performance-tuning-guide</a></li>
-    <li><a href="../../metron-platform/metron-api/index.html" title="Api"><span class="none"></span>Api</a></li>
     <li><a href="../../metron-platform/metron-common/index.html" title="Common"><span class="none"></span>Common</a></li>
     <li><a href="../../metron-platform/metron-data-management/index.html" title="Data-management"><span class="none"></span>Data-management</a></li>
     <li><a href="../../metron-platform/metron-elasticsearch/index.html" title="Elasticsearch"><span class="none"></span>Elasticsearch</a></li>
@@ -65,9 +64,11 @@
     </ul>
 </li>
     <li><a href="../../metron-platform/metron-indexing/index.html" title="Indexing"><span class="none"></span>Indexing</a></li>
+    <li><a href="../../metron-platform/metron-job/index.html" title="Job"><span class="none"></span>Job</a></li>
     <li><a href="../../metron-platform/metron-management/index.html" title="Management"><span class="none"></span>Management</a></li>
     <li><a href="../../metron-platform/metron-parsers/index.html" title="Parsers"><span class="icon-chevron-right"></span>Parsers</a></li>
     <li><a href="../../metron-platform/metron-pcap-backend/index.html" title="Pcap-backend"><span class="none"></span>Pcap-backend</a></li>
+    <li><a href="../../metron-platform/metron-solr/index.html" title="Solr"><span class="none"></span>Solr</a></li>
     <li><a href="../../metron-platform/metron-writer/index.html" title="Writer"><span class="none"></span>Writer</a></li>
     </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-platform/metron-enrichment/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-platform/metron-enrichment/index.html b/site/current-book/metron-platform/metron-enrichment/index.html
index de1e4fa..e750946 100644
--- a/site/current-book/metron-platform/metron-enrichment/index.html
+++ b/site/current-book/metron-platform/metron-enrichment/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-platform/metron-enrichment/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-platform/metron-enrichment/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Enrichment</title>
     <link rel="stylesheet" href="../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Enrichment</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -55,7 +55,6 @@
     <li><a href="../../metron-platform/index.html" title="Platform"><span class="icon-chevron-down"></span>Platform</a>
     <ul class="nav nav-list">
     <li><a href="../../metron-platform/Performance-tuning-guide.html" title="Performance-tuning-guide"><span class="none"></span>Performance-tuning-guide</a></li>
-    <li><a href="../../metron-platform/metron-api/index.html" title="Api"><span class="none"></span>Api</a></li>
     <li><a href="../../metron-platform/metron-common/index.html" title="Common"><span class="none"></span>Common</a></li>
     <li><a href="../../metron-platform/metron-data-management/index.html" title="Data-management"><span class="none"></span>Data-management</a></li>
     <li><a href="../../metron-platform/metron-elasticsearch/index.html" title="Elasticsearch"><span class="none"></span>Elasticsearch</a></li>
@@ -65,9 +64,11 @@
     </ul>
 </li>
     <li><a href="../../metron-platform/metron-indexing/index.html" title="Indexing"><span class="none"></span>Indexing</a></li>
+    <li><a href="../../metron-platform/metron-job/index.html" title="Job"><span class="none"></span>Job</a></li>
     <li><a href="../../metron-platform/metron-management/index.html" title="Management"><span class="none"></span>Management</a></li>
     <li><a href="../../metron-platform/metron-parsers/index.html" title="Parsers"><span class="icon-chevron-right"></span>Parsers</a></li>
     <li><a href="../../metron-platform/metron-pcap-backend/index.html" title="Pcap-backend"><span class="none"></span>Pcap-backend</a></li>
+    <li><a href="../../metron-platform/metron-solr/index.html" title="Solr"><span class="none"></span>Solr</a></li>
     <li><a href="../../metron-platform/metron-writer/index.html" title="Writer"><span class="none"></span>Writer</a></li>
     </ul>
 </li>
@@ -162,14 +163,22 @@ limitations under the License.
 <p>There are two types of configurations at the moment, <tt>global</tt> and <tt>sensor</tt> specific.</p></div>
 <div class="section">
 <h2><a name="Global_Configuration"></a>Global Configuration</h2>
-<p>There are a few enrichments which have independent configurations, such as from the global config.</p>
+<p>There are a few enrichments which have independent configurations, such as from the global config. You can also configure the enrichment topology&#x2019;s writer batching settings.</p>
 <p>Also, see the &#x201c;<a href="../metron-common/index.html">Global Configuration</a>&#x201d; section for more discussion of the global config.</p>
 <div class="section">
 <h3><a name="GeoIP"></a>GeoIP</h3>
 <p>Metron supports enrichment of IP information using <a class="externalLink" href="https://dev.maxmind.com/geoip/geoip2/geolite2/">GeoLite2</a>. The location of the file is managed in the global config.</p>
 <div class="section">
 <h4><a name="geo.hdfs.file"></a><tt>geo.hdfs.file</tt></h4>
-<p>The location on HDFS of the GeoLite2 database file to use for GeoIP lookups.  This file will be localized on the storm supervisors running the topology and used from there. This is lazy, so if this property changes in a running topology, the file will be localized from HDFS upon first time the file is used via the geo enrichment.</p></div></div></div>
+<p>The location on HDFS of the GeoLite2 database file to use for GeoIP lookups.  This file will be localized on the storm supervisors running the topology and used from there. This is lazy, so if this property changes in a running topology, the file will be localized from HDFS upon first time the file is used via the geo enrichment.</p></div></div>
+<div class="section">
+<h3><a name="Writer_Batching"></a>Writer Batching</h3>
+<div class="section">
+<h4><a name="enrichment.writer.batchSize"></a><tt>enrichment.writer.batchSize</tt></h4>
+<p>The size of the batch that is written to Kafka at once. Defaults to <tt>15</tt> (size of 1 disables batching).</p></div>
+<div class="section">
+<h4><a name="enrichment.writer.batchTimeout"></a><tt>enrichment.writer.batchTimeout</tt></h4>
+<p>The timeout after which a batch will be flushed even if batchSize has not been met.  Optional. If unspecified, or set to <tt>0</tt>, it defaults to a system-determined duration which is a fraction of the Storm parameter <tt>topology.message.timeout.secs</tt>.  Ignored if batchSize is <tt>1</tt>, since this disables batching.</p></div></div></div>
 <div class="section">
 <h2><a name="Sensor_Enrichment_Configuration"></a>Sensor Enrichment Configuration</h2>
 <p>The sensor specific configuration is intended to configure the individual enrichments and threat intelligence enrichments for a given sensor type (e.g. <tt>snort</tt>).</p>

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-platform/metron-indexing/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-platform/metron-indexing/index.html b/site/current-book/metron-platform/metron-indexing/index.html
index 6d4b8d6..65c0bad 100644
--- a/site/current-book/metron-platform/metron-indexing/index.html
+++ b/site/current-book/metron-platform/metron-indexing/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-platform/metron-indexing/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-platform/metron-indexing/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Indexing</title>
     <link rel="stylesheet" href="../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Indexing</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -55,15 +55,16 @@
     <li><a href="../../metron-platform/index.html" title="Platform"><span class="icon-chevron-down"></span>Platform</a>
     <ul class="nav nav-list">
     <li><a href="../../metron-platform/Performance-tuning-guide.html" title="Performance-tuning-guide"><span class="none"></span>Performance-tuning-guide</a></li>
-    <li><a href="../../metron-platform/metron-api/index.html" title="Api"><span class="none"></span>Api</a></li>
     <li><a href="../../metron-platform/metron-common/index.html" title="Common"><span class="none"></span>Common</a></li>
     <li><a href="../../metron-platform/metron-data-management/index.html" title="Data-management"><span class="none"></span>Data-management</a></li>
     <li><a href="../../metron-platform/metron-elasticsearch/index.html" title="Elasticsearch"><span class="none"></span>Elasticsearch</a></li>
     <li><a href="../../metron-platform/metron-enrichment/index.html" title="Enrichment"><span class="icon-chevron-right"></span>Enrichment</a></li>
     <li class="active"><a href="#"><span class="none"></span>Indexing</a></li>
+    <li><a href="../../metron-platform/metron-job/index.html" title="Job"><span class="none"></span>Job</a></li>
     <li><a href="../../metron-platform/metron-management/index.html" title="Management"><span class="none"></span>Management</a></li>
     <li><a href="../../metron-platform/metron-parsers/index.html" title="Parsers"><span class="icon-chevron-right"></span>Parsers</a></li>
     <li><a href="../../metron-platform/metron-pcap-backend/index.html" title="Pcap-backend"><span class="none"></span>Pcap-backend</a></li>
+    <li><a href="../../metron-platform/metron-solr/index.html" title="Solr"><span class="none"></span>Solr</a></li>
     <li><a href="../../metron-platform/metron-writer/index.html" title="Writer"><span class="none"></span>Writer</a></li>
     </ul>
 </li>
@@ -139,15 +140,38 @@ limitations under the License.
 <li><tt>hdfs</tt></li>
 <li><tt>solr</tt></li>
 </ul>
-<p>Depending on how you start the indexing topology, it will have either elasticsearch or solr and hdfs writers running.</p>
-<p>The configuration for an individual writer-specific configuration is a JSON map with the following fields:</p>
-<ul>
+<p>Depending on how you start the indexing topology, it will have either Elasticsearch or Solr and HDFS writers running.</p>
+<table border="0" class="table table-striped">
+<thead>
 
-<li><tt>index</tt> : The name of the index to write to (defaulted to the name of the sensor).</li>
-<li><tt>batchSize</tt> : The size of the batch that is written to the indices at once. Defaults to <tt>1</tt> (no batching).</li>
-<li><tt>batchTimeout</tt> : The timeout after which a batch will be flushed even if batchSize has not been met.  Optional. If unspecified, or set to <tt>0</tt>, it defaults to a system-determined duration which is a fraction of the Storm parameter <tt>topology.message.timeout.secs</tt>.  Ignored if batchSize is <tt>1</tt>, since this disables batching.</li>
-<li><tt>enabled</tt> : Whether the writer is enabled (default <tt>true</tt>).</li>
-</ul>
+<tr class="a">
+<th> Property             </th>
+<th> Description                                                                           </th>
+<th> Default Value                                                                                                                                       </th></tr>
+</thead><tbody>
+
+<tr class="b">
+<td> <tt>index</tt>              </td>
+<td> The name of the index to write to.                                                    </td>
+<td> Defaults to the name of the sensor.                                                                                                                 </td></tr>
+<tr class="a">
+<td> <tt>batchSize</tt>          </td>
+<td> The size of the batch that is written to the indices at once.                         </td>
+<td> Defaults to <tt>1</tt>; no batching.                                                                                                                         </td></tr>
+<tr class="b">
+<td> <tt>batchTimeout</tt>       </td>
+<td> The timeout after which a batch will be flushed even if <tt>batchSize</tt> has not been met. </td>
+<td> Defaults to a duration which is a fraction of the Storm parameter <tt>topology.message.timeout.secs</tt>, if left undefined or set to 0.  Ignored if batchSize is <tt>1</tt>, since this disables batching.</td></tr>
+<tr class="a">
+<td> <tt>enabled</tt>            </td>
+<td> A boolean indicating whether the writer is enabled.                                   </td>
+<td> Defaults to <tt>true</tt>                                                                                                                                    </td></tr>
+<tr class="b">
+<td> <tt>fieldNameConverter</tt> </td>
+<td> Defines how field names are transformed before being written to the index.  Only applicable to <tt>elasticsearch</tt>.          </td>
+<td> Defaults to <tt>DEDOT</tt>.  Acceptable values are <tt>DEDOT</tt> that replaces all &#x2018;.&#x2019; with &#x2018;:&#x2019; or <tt>NOOP</tt> that does not change the field names . </td></tr>
+</tbody>
+</table>
 <div class="section">
 <h3><a name="Meta_Alerts"></a>Meta Alerts</h3>
 <p>Alerts can be grouped, after appropriate searching, into a set of alerts called a meta alert.  A meta alert is useful for maintaining the context of searching and grouping during further investigations. Standard searches can return meta alerts, but grouping and other aggregation or sorting requests will not, because there&#x2019;s not a clear way to aggregate in many cases if there are multiple alerts contained in the meta alert. All meta alerts will have the source type of metaalert, regardless of the contained alert&#x2019;s origins.</p></div>
@@ -155,6 +179,19 @@ limitations under the License.
 <h3><a name="Elasticsearch"></a>Elasticsearch</h3>
 <p>Metron comes with built-in templates for the default sensors for Elasticsearch. When adding a new sensor, it will be necessary to add a new template defining the output fields appropriately. In addition, there is a requirement for a field <tt>alert</tt> of type <tt>nested</tt> for Elasticsearch 2.x installs.  This is detailed at <a href="../metron-elasticsearch/index.html#Using_Metron_with_Elasticsearch_2.x">Using Metron with Elasticsearch 2.x</a></p></div>
 <div class="section">
+<h3><a name="Solr"></a>Solr</h3>
+<p>Metron comes with built-in schemas for the default sensors for Solr.  When adding a new sensor, it will be necessary to add a new schema defining the output fields appropriately.  In addition, these fields are used internally by Metron and also required:</p>
+<ul>
+
+<li><tt>&lt;field name=&quot;guid&quot; type=&quot;string&quot; indexed=&quot;true&quot; stored=&quot;true&quot; required=&quot;true&quot; multiValued=&quot;false&quot; /&gt;</tt></li>
+<li><tt>&lt;field name=&quot;source.type&quot; type=&quot;string&quot; indexed=&quot;true&quot; stored=&quot;true&quot; /&gt;</tt></li>
+<li><tt>&lt;field name=&quot;timestamp&quot; type=&quot;timestamp&quot; indexed=&quot;true&quot; stored=&quot;true&quot; /&gt;</tt></li>
+<li><tt>&lt;field name=&quot;comments&quot; type=&quot;string&quot; indexed=&quot;true&quot; stored=&quot;true&quot; multiValued=&quot;true&quot;/&gt;</tt></li>
+<li><tt>&lt;field name=&quot;metaalerts&quot; type=&quot;string&quot; multiValued=&quot;true&quot; indexed=&quot;true&quot; stored=&quot;true&quot;/&gt;</tt></li>
+</ul>
+<p>The unique key should be set to <tt>guid</tt> by including <tt>&lt;uniqueKey&gt;guid&lt;/uniqueKey&gt;</tt> in the schema.</p>
+<p>It is strongly suggested the <tt>fieldTypes</tt> match those in the built-in schemas.</p></div>
+<div class="section">
 <h3><a name="Indexing_Configuration_Examples"></a>Indexing Configuration Examples</h3>
 <p>For a given  sensor, the following scenarios would be indicated by the following cases:</p>
 <div class="section">
@@ -294,7 +331,7 @@ limitations under the License.
 <p>The HBase column family to use for message updates.</p></div></div>
 <div class="section">
 <h3><a name="The_MetaAlertDao"></a>The <tt>MetaAlertDao</tt></h3>
-<p>The goal of meta alerts is to be able to group together a set of alerts while being able to transparently perform actions like searches, as if meta alerts were normal alerts.  <tt>org.apache.metron.indexing.dao.MetaAlertDao</tt> extends <tt>IndexDao</tt> and enables several features:</p>
+<p>The goal of meta alerts is to be able to group together a set of alerts while being able to transparently perform actions like searches, as if meta alerts were normal alerts.  <tt>org.apache.metron.indexing.dao.metaalert.MetaAlertDao</tt> extends <tt>IndexDao</tt> and enables several features:</p>
 <ul>
 
 <li>the ability to get all meta alerts associated with an alert</li>

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-platform/metron-job/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-platform/metron-job/index.html b/site/current-book/metron-platform/metron-job/index.html
new file mode 100644
index 0000000..388ea80
--- /dev/null
+++ b/site/current-book/metron-platform/metron-job/index.html
@@ -0,0 +1,126 @@
+<!DOCTYPE html>
+<!--
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-platform/metron-job/index.md at 2018-09-12
+ | Rendered using Apache Maven Fluido Skin 1.7
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
+    <meta http-equiv="Content-Language" content="en" />
+    <title>Metron &#x2013; Metron Job</title>
+    <link rel="stylesheet" href="../../css/apache-maven-fluido-1.7.min.css" />
+    <link rel="stylesheet" href="../../css/site.css" />
+    <link rel="stylesheet" href="../../css/print.css" media="print" />
+    <script type="text/javascript" src="../../js/apache-maven-fluido-1.7.min.js"></script>
+<script type="text/javascript">
+              $( document ).ready( function() { $( '.carousel' ).carousel( { interval: 3500 } ) } );
+            </script>
+  </head>
+  <body class="topBarDisabled">
+    <div class="container-fluid">
+      <div id="banner">
+        <div class="pull-left"><a href="http://metron.apache.org/" id="bannerLeft"><img src="../../images/metron-logo.png"  alt="Apache Metron" width="148px" height="48px"/></a></div>
+        <div class="pull-right"></div>
+        <div class="clear"><hr/></div>
+      </div>
+
+      <div id="breadcrumbs">
+        <ul class="breadcrumb">
+      <li class=""><a href="http://www.apache.org" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>
+      <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
+      <li class=""><a href="../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
+    <li class="active ">Metron Job</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
+        </ul>
+      </div>
+      <div class="row-fluid">
+        <div id="leftColumn" class="span2">
+          <div class="well sidebar-nav">
+    <ul class="nav nav-list">
+      <li class="nav-header">User Documentation</li>
+    <li><a href="../../index.html" title="Metron"><span class="icon-chevron-down"></span>Metron</a>
+    <ul class="nav nav-list">
+    <li><a href="../../CONTRIBUTING.html" title="CONTRIBUTING"><span class="none"></span>CONTRIBUTING</a></li>
+    <li><a href="../../Upgrading.html" title="Upgrading"><span class="none"></span>Upgrading</a></li>
+    <li><a href="../../metron-analytics/index.html" title="Analytics"><span class="icon-chevron-right"></span>Analytics</a></li>
+    <li><a href="../../metron-contrib/metron-docker/index.html" title="Docker"><span class="none"></span>Docker</a></li>
+    <li><a href="../../metron-contrib/metron-performance/index.html" title="Performance"><span class="none"></span>Performance</a></li>
+    <li><a href="../../metron-deployment/index.html" title="Deployment"><span class="icon-chevron-right"></span>Deployment</a></li>
+    <li><a href="../../metron-interface/metron-alerts/index.html" title="Alerts"><span class="none"></span>Alerts</a></li>
+    <li><a href="../../metron-interface/metron-config/index.html" title="Config"><span class="none"></span>Config</a></li>
+    <li><a href="../../metron-interface/metron-rest/index.html" title="Rest"><span class="none"></span>Rest</a></li>
+    <li><a href="../../metron-platform/index.html" title="Platform"><span class="icon-chevron-down"></span>Platform</a>
+    <ul class="nav nav-list">
+    <li><a href="../../metron-platform/Performance-tuning-guide.html" title="Performance-tuning-guide"><span class="none"></span>Performance-tuning-guide</a></li>
+    <li><a href="../../metron-platform/metron-common/index.html" title="Common"><span class="none"></span>Common</a></li>
+    <li><a href="../../metron-platform/metron-data-management/index.html" title="Data-management"><span class="none"></span>Data-management</a></li>
+    <li><a href="../../metron-platform/metron-elasticsearch/index.html" title="Elasticsearch"><span class="none"></span>Elasticsearch</a></li>
+    <li><a href="../../metron-platform/metron-enrichment/index.html" title="Enrichment"><span class="icon-chevron-right"></span>Enrichment</a></li>
+    <li><a href="../../metron-platform/metron-indexing/index.html" title="Indexing"><span class="none"></span>Indexing</a></li>
+    <li class="active"><a href="#"><span class="none"></span>Job</a></li>
+    <li><a href="../../metron-platform/metron-management/index.html" title="Management"><span class="none"></span>Management</a></li>
+    <li><a href="../../metron-platform/metron-parsers/index.html" title="Parsers"><span class="icon-chevron-right"></span>Parsers</a></li>
+    <li><a href="../../metron-platform/metron-pcap-backend/index.html" title="Pcap-backend"><span class="none"></span>Pcap-backend</a></li>
+    <li><a href="../../metron-platform/metron-solr/index.html" title="Solr"><span class="none"></span>Solr</a></li>
+    <li><a href="../../metron-platform/metron-writer/index.html" title="Writer"><span class="none"></span>Writer</a></li>
+    </ul>
+</li>
+    <li><a href="../../metron-sensors/index.html" title="Sensors"><span class="icon-chevron-right"></span>Sensors</a></li>
+    <li><a href="../../metron-stellar/stellar-3rd-party-example/index.html" title="Stellar-3rd-party-example"><span class="none"></span>Stellar-3rd-party-example</a></li>
+    <li><a href="../../metron-stellar/stellar-common/index.html" title="Stellar-common"><span class="icon-chevron-right"></span>Stellar-common</a></li>
+    <li><a href="../../metron-stellar/stellar-zeppelin/index.html" title="Stellar-zeppelin"><span class="none"></span>Stellar-zeppelin</a></li>
+    <li><a href="../../use-cases/index.html" title="Use-cases"><span class="icon-chevron-right"></span>Use-cases</a></li>
+    </ul>
+</li>
+</ul>
+          <hr />
+          <div id="poweredBy">
+            <div class="clear"></div>
+            <div class="clear"></div>
+            <div class="clear"></div>
+            <div class="clear"></div>
+<a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="../../images/logos/maven-feather.png" /></a>
+            </div>
+          </div>
+        </div>
+        <div id="bodyColumn"  class="span10" >
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<h1>Metron Job</h1>
+<p><a name="Metron_Job"></a></p>
+<p>This module holds abstractions for creating jobs. The main actors are a JobManager interface and subsequent implementation, InMemoryJobManger, that handles maintaining a cache of running and completed Statusable jobs. Each Statusable can provide a Finalizer implementation that should be executed on completion of the underlying job. Successful jobs should return a Pageable object that allow consumers to request results on a per-page basis.</p>
+<div class="section">
+<h2><a name="Job_State_Statechart"></a>Job State Statechart</h2>
+<p><img src="../../images/metron-job_state_statechart_diagram.svg" alt="Job State Statechart" /></p></div>
+        </div>
+      </div>
+    </div>
+    <hr/>
+    <footer>
+      <div class="container-fluid">
+        <div class="row-fluid">
+© 2015-2016 The Apache Software Foundation. Apache Metron, Metron, Apache, the Apache feather logo,
+            and the Apache Metron project logo are trademarks of The Apache Software Foundation.
+        </div>
+      </div>
+    </footer>
+  </body>
+</html>

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-platform/metron-management/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-platform/metron-management/index.html b/site/current-book/metron-platform/metron-management/index.html
index f9ea1ce..0aa9eda 100644
--- a/site/current-book/metron-platform/metron-management/index.html
+++ b/site/current-book/metron-platform/metron-management/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-platform/metron-management/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-platform/metron-management/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Stellar REPL Management Utilities</title>
     <link rel="stylesheet" href="../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Stellar REPL Management Utilities</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -55,15 +55,16 @@
     <li><a href="../../metron-platform/index.html" title="Platform"><span class="icon-chevron-down"></span>Platform</a>
     <ul class="nav nav-list">
     <li><a href="../../metron-platform/Performance-tuning-guide.html" title="Performance-tuning-guide"><span class="none"></span>Performance-tuning-guide</a></li>
-    <li><a href="../../metron-platform/metron-api/index.html" title="Api"><span class="none"></span>Api</a></li>
     <li><a href="../../metron-platform/metron-common/index.html" title="Common"><span class="none"></span>Common</a></li>
     <li><a href="../../metron-platform/metron-data-management/index.html" title="Data-management"><span class="none"></span>Data-management</a></li>
     <li><a href="../../metron-platform/metron-elasticsearch/index.html" title="Elasticsearch"><span class="none"></span>Elasticsearch</a></li>
     <li><a href="../../metron-platform/metron-enrichment/index.html" title="Enrichment"><span class="icon-chevron-right"></span>Enrichment</a></li>
     <li><a href="../../metron-platform/metron-indexing/index.html" title="Indexing"><span class="none"></span>Indexing</a></li>
+    <li><a href="../../metron-platform/metron-job/index.html" title="Job"><span class="none"></span>Job</a></li>
     <li class="active"><a href="#"><span class="none"></span>Management</a></li>
     <li><a href="../../metron-platform/metron-parsers/index.html" title="Parsers"><span class="icon-chevron-right"></span>Parsers</a></li>
     <li><a href="../../metron-platform/metron-pcap-backend/index.html" title="Pcap-backend"><span class="none"></span>Pcap-backend</a></li>
+    <li><a href="../../metron-platform/metron-solr/index.html" title="Solr"><span class="none"></span>Solr</a></li>
     <li><a href="../../metron-platform/metron-writer/index.html" title="Writer"><span class="none"></span>Writer</a></li>
     </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-platform/metron-parsers/3rdPartyParser.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-platform/metron-parsers/3rdPartyParser.html b/site/current-book/metron-platform/metron-parsers/3rdPartyParser.html
index 988580b..8d75d41 100644
--- a/site/current-book/metron-platform/metron-parsers/3rdPartyParser.html
+++ b/site/current-book/metron-platform/metron-parsers/3rdPartyParser.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-platform/metron-parsers/3rdPartyParser.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-platform/metron-parsers/3rdPartyParser.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Custom Metron Parsers</title>
     <link rel="stylesheet" href="../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Custom Metron Parsers</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -55,20 +55,22 @@
     <li><a href="../../metron-platform/index.html" title="Platform"><span class="icon-chevron-down"></span>Platform</a>
     <ul class="nav nav-list">
     <li><a href="../../metron-platform/Performance-tuning-guide.html" title="Performance-tuning-guide"><span class="none"></span>Performance-tuning-guide</a></li>
-    <li><a href="../../metron-platform/metron-api/index.html" title="Api"><span class="none"></span>Api</a></li>
     <li><a href="../../metron-platform/metron-common/index.html" title="Common"><span class="none"></span>Common</a></li>
     <li><a href="../../metron-platform/metron-data-management/index.html" title="Data-management"><span class="none"></span>Data-management</a></li>
     <li><a href="../../metron-platform/metron-elasticsearch/index.html" title="Elasticsearch"><span class="none"></span>Elasticsearch</a></li>
     <li><a href="../../metron-platform/metron-enrichment/index.html" title="Enrichment"><span class="icon-chevron-right"></span>Enrichment</a></li>
     <li><a href="../../metron-platform/metron-indexing/index.html" title="Indexing"><span class="none"></span>Indexing</a></li>
+    <li><a href="../../metron-platform/metron-job/index.html" title="Job"><span class="none"></span>Job</a></li>
     <li><a href="../../metron-platform/metron-management/index.html" title="Management"><span class="none"></span>Management</a></li>
     <li><a href="../../metron-platform/metron-parsers/index.html" title="Parsers"><span class="icon-chevron-down"></span>Parsers</a>
     <ul class="nav nav-list">
     <li class="active"><a href="#"><span class="none"></span>3rdPartyParser</a></li>
+    <li><a href="../../metron-platform/metron-parsers/ParserChaining.html" title="ParserChaining"><span class="none"></span>ParserChaining</a></li>
     <li><a href="../../metron-platform/metron-parsers/parser-testing.html" title="parser-testing"><span class="none"></span>parser-testing</a></li>
     </ul>
 </li>
     <li><a href="../../metron-platform/metron-pcap-backend/index.html" title="Pcap-backend"><span class="none"></span>Pcap-backend</a></li>
+    <li><a href="../../metron-platform/metron-solr/index.html" title="Solr"><span class="none"></span>Solr</a></li>
     <li><a href="../../metron-platform/metron-writer/index.html" title="Writer"><span class="none"></span>Writer</a></li>
     </ul>
 </li>
@@ -145,18 +147,18 @@ limitations under the License.
 <p>For this demonstration, let&#x2019;s create a maven project to compile our project.  We&#x2019;ll call it <tt>extra_parsers</tt>, so in your workspace, let&#x2019;s set up the maven project:</p>
 <ul>
 
-<li>Create the maven infrastructure for <tt>extra_parsers</tt> via</li>
-</ul>
+<li>
+
+<p>Create the maven infrastructure for <tt>extra_parsers</tt> via</p>
 
 <div>
 <div>
 <pre class="source">mkdir -p extra_parsers/src/{main,test}/java
 </pre></div></div>
+</li>
+<li>
 
-<ul>
-
-<li>Create a pom file indicating how we should build our parsers by editing <tt>extra_parsers/pom.xml</tt> with the following content:</li>
-</ul>
+<p>Create a pom file indicating how we should build our parsers by editing <tt>extra_parsers/pom.xml</tt> with the following content:</p>
 
 <div>
 <div>
@@ -207,7 +209,7 @@ limitations under the License.
      &lt;!-- We will set up the shade plugin to create a single jar at the
            end of the build lifecycle.  We will exclude some things and
            relocate others to simulate a real situation.
-           
+
            One thing to note is that it's a good practice to shade and
            relocate common libraries that may be dependencies in Metron.
            Your jar will be merged with the parsers jar, so the metron
@@ -289,11 +291,10 @@ limitations under the License.
   &lt;/build&gt;
 &lt;/project&gt;
 </pre></div></div>
+</li>
+<li>
 
-<ul>
-
-<li>Now let&#x2019;s create our parser  <tt>com.thirdparty.SimpleParser</tt> by creating the file <tt>extra-parsers/src/main/java/com/thirdparty/SimpleParser.java</tt> with the following content:</li>
-</ul>
+<p>Now let&#x2019;s create our parser  <tt>com.thirdparty.SimpleParser</tt> by creating the file <tt>extra-parsers/src/main/java/com/thirdparty/SimpleParser.java</tt> with the following content:</p>
 
 <div>
 <div>
@@ -332,12 +333,13 @@ public class SimpleParser extends BasicParser {
   }
 }
 </pre></div></div>
-
-<ul>
-
+</li>
 <li>Compile the parser via <tt>mvn clean package</tt> in <tt>extra_parsers</tt></li>
-</ul>
+<li>
+
 <p>This will create a jar containing your parser and its dependencies (sans Metron dependencies) in <tt>extra-parsers/target/extra-parsers-1.0-SNAPSHOT-uber.jar</tt></p>
+</li>
+</ul>
 <p><a name="Deploying_Your_Custom_Parser"></a></p>
 <h1>Deploying Your Custom Parser</h1>
 <p>In order to deploy your newly built custom parser, you would place the jar file above in the <tt>$METRON_HOME/parser_contrib</tt> directory on the Metron host (i.e. any host you would start parsers from or, alternatively, where the Metron REST is hosted).</p></div>
@@ -362,11 +364,15 @@ public class SimpleParser extends BasicParser {
 <h3><a name="Restart_the_REST_service_in_Ambari"></a>Restart the REST service in Ambari</h3>
 <p>In order for new parsers to be picked up, the REST service must be restarted.  You can do that from within Ambari by restarting the <tt>Metron REST</tt> service.</p></div>
 <div class="section">
-<h3><a name="Push_the_Zookeeper_Configs"></a>Push the Zookeeper Configs</h3>
-<p>Now push the config to Zookeeper with the following command: <tt>$METRON_HOME/bin/zk_load_configs.sh -m PUSH -i $METRON_HOME/config/zookeeper/ -z $ZOOKEEPER</tt></p></div>
-<div class="section">
 <h3><a name="Create_a_Kafka_Topic"></a>Create a Kafka Topic</h3>
-<p>Create a kafka topic, let&#x2019;s call it <tt>test</tt> via: <tt>/usr/hdp/current/kafka-broker/bin/kafka-topics.sh --zookeeper $ZOOKEEPER --create --topic test --partitions 1 --replication-factor 1</tt></p>
+<p>Create a kafka topic, let&#x2019;s call it <tt>test</tt>.</p>
+
+<div>
+<div>
+<pre class="source">KAFKA_HOME=/usr/hdp/current/kafka-broker
+$KAFKA_HOME/bin/kafka-topics.sh --zookeeper $ZOOKEEPER --create --topic test --partitions 1 --replication-factor 1
+</pre></div></div>
+
 <p>Note, in a real deployment, that topic would be named something more descriptive and would have replication factor and partitions set to something less trivial.</p></div>
 <div class="section">
 <h3><a name="Configure_Test_Parser"></a>Configure Test Parser</h3>
@@ -381,32 +387,40 @@ public class SimpleParser extends BasicParser {
 </pre></div></div>
 </div>
 <div class="section">
+<h3><a name="Push_the_Zookeeper_Configs"></a>Push the Zookeeper Configs</h3>
+<p>Now push the config to Zookeeper with the following command.</p>
+
+<div>
+<div>
+<pre class="source">$METRON_HOME/bin/zk_load_configs.sh -m PUSH -i $METRON_HOME/config/zookeeper/ -z $ZOOKEEPER
+</pre></div></div>
+</div>
+<div class="section">
 <h3><a name="Start_Parser"></a>Start Parser</h3>
 <p>Now we can start the parser and send some data through:</p>
 <ul>
 
-<li>Start the parser</li>
-</ul>
+<li>
+
+<p>Start the parser</p>
 
 <div>
 <div>
 <pre class="source">$METRON_HOME/bin/start_parser_topology.sh -k $BROKERLIST -z $ZOOKEEPER -s test
 </pre></div></div>
+</li>
+<li>
 
-<ul>
-
-<li>Send example data through:</li>
-</ul>
+<p>Send example data through:</p>
 
 <div>
 <div>
 <pre class="source">echo &quot;apache,metron&quot; | /usr/hdp/current/kafka-broker/bin/kafka-console-producer.sh --broker-list $BROKERLIST --topic test
 </pre></div></div>
+</li>
+<li>
 
-<ul>
-
-<li>Validate data was written in ES:</li>
-</ul>
+<p>Validate data was written in ES:</p>
 
 <div>
 <div>
@@ -416,6 +430,8 @@ public class SimpleParser extends BasicParser {
 }
 '
 </pre></div></div>
+</li>
+<li>
 
 <p>This should yield something like:</p>
 
@@ -447,7 +463,8 @@ public class SimpleParser extends BasicParser {
   }
 }
 </pre></div></div>
-</div>
+</li>
+</ul></div>
 <div class="section">
 <h3><a name="Via_the_Management_UI"></a>Via the Management UI</h3>
 <p>As long as the REST service is restarted after new parsers are added to <tt>$METRON_HOME/parser_contrib</tt>, they are available in the UI to creating and deploying parsers.</p></div></div>

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-platform/metron-parsers/ParserChaining.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-platform/metron-parsers/ParserChaining.html b/site/current-book/metron-platform/metron-parsers/ParserChaining.html
new file mode 100644
index 0000000..a4c9360
--- /dev/null
+++ b/site/current-book/metron-platform/metron-parsers/ParserChaining.html
@@ -0,0 +1,259 @@
+<!DOCTYPE html>
+<!--
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-platform/metron-parsers/ParserChaining.md at 2018-09-12
+ | Rendered using Apache Maven Fluido Skin 1.7
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
+    <meta http-equiv="Content-Language" content="en" />
+    <title>Metron &#x2013; Parser Chaining</title>
+    <link rel="stylesheet" href="../../css/apache-maven-fluido-1.7.min.css" />
+    <link rel="stylesheet" href="../../css/site.css" />
+    <link rel="stylesheet" href="../../css/print.css" media="print" />
+    <script type="text/javascript" src="../../js/apache-maven-fluido-1.7.min.js"></script>
+<script type="text/javascript">
+              $( document ).ready( function() { $( '.carousel' ).carousel( { interval: 3500 } ) } );
+            </script>
+  </head>
+  <body class="topBarDisabled">
+    <div class="container-fluid">
+      <div id="banner">
+        <div class="pull-left"><a href="http://metron.apache.org/" id="bannerLeft"><img src="../../images/metron-logo.png"  alt="Apache Metron" width="148px" height="48px"/></a></div>
+        <div class="pull-right"></div>
+        <div class="clear"><hr/></div>
+      </div>
+
+      <div id="breadcrumbs">
+        <ul class="breadcrumb">
+      <li class=""><a href="http://www.apache.org" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>
+      <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
+      <li class=""><a href="../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
+    <li class="active ">Parser Chaining</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
+        </ul>
+      </div>
+      <div class="row-fluid">
+        <div id="leftColumn" class="span2">
+          <div class="well sidebar-nav">
+    <ul class="nav nav-list">
+      <li class="nav-header">User Documentation</li>
+    <li><a href="../../index.html" title="Metron"><span class="icon-chevron-down"></span>Metron</a>
+    <ul class="nav nav-list">
+    <li><a href="../../CONTRIBUTING.html" title="CONTRIBUTING"><span class="none"></span>CONTRIBUTING</a></li>
+    <li><a href="../../Upgrading.html" title="Upgrading"><span class="none"></span>Upgrading</a></li>
+    <li><a href="../../metron-analytics/index.html" title="Analytics"><span class="icon-chevron-right"></span>Analytics</a></li>
+    <li><a href="../../metron-contrib/metron-docker/index.html" title="Docker"><span class="none"></span>Docker</a></li>
+    <li><a href="../../metron-contrib/metron-performance/index.html" title="Performance"><span class="none"></span>Performance</a></li>
+    <li><a href="../../metron-deployment/index.html" title="Deployment"><span class="icon-chevron-right"></span>Deployment</a></li>
+    <li><a href="../../metron-interface/metron-alerts/index.html" title="Alerts"><span class="none"></span>Alerts</a></li>
+    <li><a href="../../metron-interface/metron-config/index.html" title="Config"><span class="none"></span>Config</a></li>
+    <li><a href="../../metron-interface/metron-rest/index.html" title="Rest"><span class="none"></span>Rest</a></li>
+    <li><a href="../../metron-platform/index.html" title="Platform"><span class="icon-chevron-down"></span>Platform</a>
+    <ul class="nav nav-list">
+    <li><a href="../../metron-platform/Performance-tuning-guide.html" title="Performance-tuning-guide"><span class="none"></span>Performance-tuning-guide</a></li>
+    <li><a href="../../metron-platform/metron-common/index.html" title="Common"><span class="none"></span>Common</a></li>
+    <li><a href="../../metron-platform/metron-data-management/index.html" title="Data-management"><span class="none"></span>Data-management</a></li>
+    <li><a href="../../metron-platform/metron-elasticsearch/index.html" title="Elasticsearch"><span class="none"></span>Elasticsearch</a></li>
+    <li><a href="../../metron-platform/metron-enrichment/index.html" title="Enrichment"><span class="icon-chevron-right"></span>Enrichment</a></li>
+    <li><a href="../../metron-platform/metron-indexing/index.html" title="Indexing"><span class="none"></span>Indexing</a></li>
+    <li><a href="../../metron-platform/metron-job/index.html" title="Job"><span class="none"></span>Job</a></li>
+    <li><a href="../../metron-platform/metron-management/index.html" title="Management"><span class="none"></span>Management</a></li>
+    <li><a href="../../metron-platform/metron-parsers/index.html" title="Parsers"><span class="icon-chevron-down"></span>Parsers</a>
+    <ul class="nav nav-list">
+    <li><a href="../../metron-platform/metron-parsers/3rdPartyParser.html" title="3rdPartyParser"><span class="none"></span>3rdPartyParser</a></li>
+    <li class="active"><a href="#"><span class="none"></span>ParserChaining</a></li>
+    <li><a href="../../metron-platform/metron-parsers/parser-testing.html" title="parser-testing"><span class="none"></span>parser-testing</a></li>
+    </ul>
+</li>
+    <li><a href="../../metron-platform/metron-pcap-backend/index.html" title="Pcap-backend"><span class="none"></span>Pcap-backend</a></li>
+    <li><a href="../../metron-platform/metron-solr/index.html" title="Solr"><span class="none"></span>Solr</a></li>
+    <li><a href="../../metron-platform/metron-writer/index.html" title="Writer"><span class="none"></span>Writer</a></li>
+    </ul>
+</li>
+    <li><a href="../../metron-sensors/index.html" title="Sensors"><span class="icon-chevron-right"></span>Sensors</a></li>
+    <li><a href="../../metron-stellar/stellar-3rd-party-example/index.html" title="Stellar-3rd-party-example"><span class="none"></span>Stellar-3rd-party-example</a></li>
+    <li><a href="../../metron-stellar/stellar-common/index.html" title="Stellar-common"><span class="icon-chevron-right"></span>Stellar-common</a></li>
+    <li><a href="../../metron-stellar/stellar-zeppelin/index.html" title="Stellar-zeppelin"><span class="none"></span>Stellar-zeppelin</a></li>
+    <li><a href="../../use-cases/index.html" title="Use-cases"><span class="icon-chevron-right"></span>Use-cases</a></li>
+    </ul>
+</li>
+</ul>
+          <hr />
+          <div id="poweredBy">
+            <div class="clear"></div>
+            <div class="clear"></div>
+            <div class="clear"></div>
+            <div class="clear"></div>
+<a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="../../images/logos/maven-feather.png" /></a>
+            </div>
+          </div>
+        </div>
+        <div id="bodyColumn"  class="span10" >
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<h1>Parser Chaining</h1>
+<p><a name="Parser_Chaining"></a></p>
+<p>Aggregating many different types sensors into a single data source (e.g. syslog) and ingesting that aggregate sensor into Metron is a common pattern.  It is not obvious precisely how to manage these types of aggregate sensors as they require two-pass parsing.  This document will walk through an example of supporting this kind of multi-pass ingest.</p>
+<p>Multi-pass parser involves the following requirements:</p>
+<ul>
+
+<li>The enveloping parser (e.g. the aggregation format such as syslog or plain CSV) may contain metadata which should be ingested along with the data.</li>
+<li>The enveloping sensor contains many different sensor types</li>
+</ul>
+<p><a name="High_Level_Solution"></a></p>
+<h1>High Level Solution</h1>
+<p><img src="../../use-cases/parser_chaining/message_routing_high_level.svg" alt="High Level Approach" /></p>
+<p>At a high level, we continue to maintain the architectural invariant of a 1-1 relationship between logical sensors and storm topologies. Eventually this relationship may become more complex, but at the moment the approach is to construct a routing parser which will have two responsibilities:</p>
+<ul>
+
+<li>Parse the envelope (e.g. syslog data) and extract any metadata fields from the envelope to pass along</li>
+<li>Route the unfolded data to the appropriate kafka topic associated with the enveloped sensor data</li>
+</ul>
+<p>Because the data emitted from the routing parser is just like any data emitted from any other parser, in that it is a JSON blob like any data emitted from any parser, we will need to adjust the downstream parsers to extract the enveloped data from the JSON blob and treat it as the data to parse.</p>
+<p><a name="Architecting_a_Parser_Chaining_Solution_in_Metron"></a></p>
+<h1>Architecting a Parser Chaining Solution in Metron</h1>
+<p>Currently the approach to fulfill this requirement involves a couple knobs in the Parser infrastructure for Metron.</p>
+<p>Consider the case, for instance, where we have many different TYPES of messages wrapped inside of syslog. As an architectural abstraction, we would want to have the following properties:</p>
+<ul>
+
+<li>separate the concerns of parsing the individual types of messages from each other</li>
+<li>separate the concerns of parsing the individual types of messages from parsing the envelope</li>
+</ul>
+<div class="section">
+<h2><a name="Data_Dependent_Parser_Writing"></a>Data Dependent Parser Writing</h2>
+<p>Parsers allow users to configure the topic which the kafka producer uses in a couple of ways (from the parser config in an individual parser):</p>
+<ul>
+
+<li><tt>kafka.topic</tt> - Specify the topic in the config.  This can be updated by updating the config, but it is data independent (e.g. not dependent on the data in a message).</li>
+<li><tt>kafka.topicField</tt> - Specify the topic as the value of a particular field.  If unpopulated, then the message is dropped.  This is inherrently data dependent.</li>
+</ul>
+<p>The <tt>kafka.topicField</tt> parameter allows for data dependent topic selection and this inherrently enables the routing capabilities necessary for handling enveloped data.</p></div>
+<div class="section">
+<h2><a name="Flexibly_Interpreting_Data"></a>Flexibly Interpreting Data</h2>
+<div class="section">
+<h3><a name="Aside:_The_Role_of_Metadata_in_Metron"></a>Aside: The Role of Metadata in Metron</h3>
+<p>Before we continue, let&#x2019;s briefly talk about metadata.  We have exposed the ability to pass along metadata and interact with metadata in a decoupled way from the actual parser logic (i.e. the GrokParser should not have to consider how to interpret metadata).</p>
+<p>There are three choices about manipulating metadata in Metron:</p>
+<ul>
+
+<li>Should you merge metadata into the downstream message?</li>
+<li>If you do, should you use a key prefix to set it off from the message by default?</li>
+</ul>
+<p>This enables users to specify metadata independent of the data that is persisted downstream and can inform the operations of enrichment and the profiler.</p></div>
+<div class="section">
+<h3><a name="Interpretation"></a>Interpretation</h3>
+<p>Now that we have an approach which enables the routing of the data, the remaining question is how to decouple <i>parsing</i> data from <i>interpreting</i> data and metadata.  By default, Metron operates like so:</p>
+<ul>
+
+<li>The kafka record key (as a JSON Map) is considered metadata</li>
+<li>The kafka record value is considered data</li>
+</ul>
+<p>Beyond that, we presume defaults for this default strategy around handling metadata.  In particular, by default we do not merge metadata and use a <tt>metron.metadata</tt> prefix for all metadata.</p>
+<p>In order to enable chained parser WITH metadata, we allow the following to be specified via strategy in the parser config:</p>
+<ul>
+
+<li>How to extract the data from the kafka record</li>
+<li>How to extract the metadata from the kafka record</li>
+<li>The default operations for merging</li>
+<li>The prefix for the metadata key</li>
+</ul>
+<p>The available strategies, specified by the <tt>rawMessageStrategy</tt> configuration is either<tt>ENVELOPE</tt> or <tt>DEFAULT</tt>.</p>
+<p>Specifically, to enable parsing enveloped data (i.e. data in a field of a JSON blob with the other fields being metadata), one can specify the strategy and configuration of that strategy in the parser config.  One must specify the <tt>rawMessageStrategy</tt> as <tt>ENVELOPE</tt> in the parser and the <tt>rawMessageStrategyConfig</tt> to indicate the field which contains the data.</p>
+<p>Together with routing, we have the complete solution to chain parsers which can:</p>
+<ul>
+
+<li>parse the envelope</li>
+<li>route the parsed data to specific parsers</li>
+<li>have the specific parsers interpret the data via the <tt>rawMessageStrategy</tt> whereby they pull the data out from JSON Map that they receive</li>
+</ul>
+<p>Together this enables a directed acyclic graph of parsers to handle single or multi-layer parsing.</p></div>
+<div class="section">
+<h3><a name="Example"></a>Example</h3>
+<p>For a complete example, look at the <a href="../../use-cases/parser_chaining/index.html">parser chaining use-case</a>, however for a simple example the following should suffice.</p>
+<p>If I want to configure a CSV parser to parse data which has 3 columns <tt>f1</tt>, <tt>f2</tt> and <tt>f3</tt> and is held in a field called <tt>payload</tt> inside of a JSON Map, I can do so like this:</p>
+
+<div>
+<div>
+<pre class="source">{
+  &quot;parserClassName&quot; : &quot;org.apache.metron.parsers.csv.CSVParser&quot;
+  ,&quot;sensorTopic&quot; : &quot;my_topic&quot;
+  ,&quot;rawMessageStrategy&quot; : &quot;ENVELOPE&quot;
+  ,&quot;rawMessageStrategyConfig&quot; : {
+      &quot;messageField&quot; : &quot;payload&quot;,
+      &quot;metadataPrefix&quot; : &quot;&quot;
+  }
+  , &quot;parserConfig&quot;: {
+     &quot;columns&quot; : { &quot;f1&quot;: 0,
+                 , &quot;f2&quot;: 1,
+                 , &quot;f3&quot;: 2
+                 } 
+   }
+}
+</pre></div></div>
+
+<p>This would parse the following message:</p>
+
+<div>
+<div>
+<pre class="source">{
+  &quot;meta_f1&quot; : &quot;val1&quot;,
+  &quot;payload&quot; : &quot;foo,bar,grok&quot;,
+  &quot;original_string&quot; : &quot;2019 Jul, 01: val1 foo,bar,grok&quot;,
+  &quot;timestamp&quot; : 10000
+}
+</pre></div></div>
+
+<p>into</p>
+
+<div>
+<div>
+<pre class="source">{
+  &quot;meta_f1&quot; : &quot;val1&quot;,
+  &quot;f1&quot; : &quot;foo&quot;,
+  &quot;f2&quot; : &quot;bar&quot;,
+  &quot;f3&quot; : &quot;grok&quot;,
+  &quot;original_string&quot; : &quot;2019 Jul, 01: val1 foo,bar,grok&quot;,
+  &quot;timestamp&quot; : 10002
+}
+</pre></div></div>
+
+<p>Note a couple of things here:</p>
+<ul>
+
+<li>The metadata field <tt>meta_f1</tt> is not prefixed here because we configured the strategy with <tt>metadataPrefix</tt> as empty string.</li>
+<li>The <tt>timestamp</tt> is not inherited from the metadata</li>
+<li>The <tt>original_string</tt> is inherited from the metadata</li>
+</ul></div></div>
+        </div>
+      </div>
+    </div>
+    <hr/>
+    <footer>
+      <div class="container-fluid">
+        <div class="row-fluid">
+© 2015-2016 The Apache Software Foundation. Apache Metron, Metron, Apache, the Apache feather logo,
+            and the Apache Metron project logo are trademarks of The Apache Software Foundation.
+        </div>
+      </div>
+    </footer>
+  </body>
+</html>

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-platform/metron-parsers/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-platform/metron-parsers/index.html b/site/current-book/metron-platform/metron-parsers/index.html
index 807a24e..0d1b7e4 100644
--- a/site/current-book/metron-platform/metron-parsers/index.html
+++ b/site/current-book/metron-platform/metron-parsers/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-platform/metron-parsers/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-platform/metron-parsers/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Parsers</title>
     <link rel="stylesheet" href="../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Parsers</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -55,20 +55,22 @@
     <li><a href="../../metron-platform/index.html" title="Platform"><span class="icon-chevron-down"></span>Platform</a>
     <ul class="nav nav-list">
     <li><a href="../../metron-platform/Performance-tuning-guide.html" title="Performance-tuning-guide"><span class="none"></span>Performance-tuning-guide</a></li>
-    <li><a href="../../metron-platform/metron-api/index.html" title="Api"><span class="none"></span>Api</a></li>
     <li><a href="../../metron-platform/metron-common/index.html" title="Common"><span class="none"></span>Common</a></li>
     <li><a href="../../metron-platform/metron-data-management/index.html" title="Data-management"><span class="none"></span>Data-management</a></li>
     <li><a href="../../metron-platform/metron-elasticsearch/index.html" title="Elasticsearch"><span class="none"></span>Elasticsearch</a></li>
     <li><a href="../../metron-platform/metron-enrichment/index.html" title="Enrichment"><span class="icon-chevron-right"></span>Enrichment</a></li>
     <li><a href="../../metron-platform/metron-indexing/index.html" title="Indexing"><span class="none"></span>Indexing</a></li>
+    <li><a href="../../metron-platform/metron-job/index.html" title="Job"><span class="none"></span>Job</a></li>
     <li><a href="../../metron-platform/metron-management/index.html" title="Management"><span class="none"></span>Management</a></li>
     <li class="active"><a href="#"><span class="icon-chevron-down"></span>Parsers</a>
     <ul class="nav nav-list">
     <li><a href="../../metron-platform/metron-parsers/3rdPartyParser.html" title="3rdPartyParser"><span class="none"></span>3rdPartyParser</a></li>
+    <li><a href="../../metron-platform/metron-parsers/ParserChaining.html" title="ParserChaining"><span class="none"></span>ParserChaining</a></li>
     <li><a href="../../metron-platform/metron-parsers/parser-testing.html" title="parser-testing"><span class="none"></span>parser-testing</a></li>
     </ul>
 </li>
     <li><a href="../../metron-platform/metron-pcap-backend/index.html" title="Pcap-backend"><span class="none"></span>Pcap-backend</a></li>
+    <li><a href="../../metron-platform/metron-solr/index.html" title="Solr"><span class="none"></span>Solr</a></li>
     <li><a href="../../metron-platform/metron-writer/index.html" title="Writer"><span class="none"></span>Writer</a></li>
     </ul>
 </li>
@@ -152,6 +154,8 @@ limitations under the License.
 </ul>
 </li>
 <li><tt>jsonpQuery</tt> : A <a href="#json_path">JSON Path</a> query string. If present, the result of the JSON Path query should be a list of messages. This is useful if you have a JSON document which contains a list or array of messages embedded in it, and you do not have another means of splitting the message.</li>
+<li><tt>wrapInEntityArray</tt> : <tt>&quot;true&quot; or &quot;false&quot;</tt>. If <tt>jsonQuery</tt> is present and this flag is present and set to <tt>&quot;true&quot;</tt>, the incoming message will be wrapped in a JSON  entity and array. for example: <tt>{&quot;name&quot;:&quot;value&quot;},{&quot;name2&quot;,&quot;value2}</tt> will be wrapped as <tt>{&quot;message&quot; : [{&quot;name&quot;:&quot;value&quot;},{&quot;name2&quot;,&quot;value2}]}</tt>. This is using the default value for <tt>wrapEntityName</tt> if that property is not set.</li>
+<li><tt>wrapEntityName</tt> : Sets the name to use when wrapping JSON using <tt>wrapInEntityArray</tt>.  The <tt>jsonpQuery</tt> should reference this name.</li>
 <li>A field called <tt>timestamp</tt> is expected to exist and, if it does not, then current time is inserted.</li>
 </ul>
 </li>
@@ -179,7 +183,9 @@ limitations under the License.
 <div class="section">
 <h2><a name="Parser_Architecture"></a>Parser Architecture</h2>
 <p><img src="../../images/parser_arch.png" alt="Architecture" /></p>
-<p>Data flows through the parser bolt via kafka and into the <tt>enrichments</tt> topology in kafka.  Errors are collected with the context of the error (e.g. stacktrace) and original message causing the error and sent to an <tt>error</tt> queue.  Invalid messages as determined by global validation functions are also treated as errors and sent to an <tt>error</tt> queue.</p></div>
+<p>Data flows through the parser bolt via kafka and into the <tt>enrichments</tt> topology in kafka.  Errors are collected with the context of the error (e.g. stacktrace) and original message causing the error and sent to an <tt>error</tt> queue.  Invalid messages as determined by global validation functions are also treated as errors and sent to an <tt>error</tt> queue.</p>
+<p>Multiple sensors can be aggregated into a single Storm topology. When this is done, there will be multiple Kafka spouts, but only a single parser bolt which will handle delegating to the correct parser as needed. There are some constraints around this, in particular regarding some configuration. Additionally, all sensors must flow to the same error topic. The Kafka topic is retrieved from the input Tuple itself.</p>
+<p>A worked example of this can be found in the <a href="../../use-cases/parser_chaining/index.html#aggregated-parsers-with-parser-chaining">Parser Chaining use case</a>.</p></div>
 <div class="section">
 <h2><a name="Message_Format"></a>Message Format</h2>
 <p>All Metron messages follow a specific format in order to ingest a message.  If a message does not conform to this format it will be dropped and put onto an error queue for further examination.  The message must be of a JSON format and must have a JSON tag message like so:</p>
@@ -200,7 +206,7 @@ limitations under the License.
 <li>timestamp (epoch)</li>
 <li>original_string: A human friendly string representation of the message</li>
 </ul>
-<p>The timestamp and original_string fields are madatory. The remaining standard fields are optional.  If any of the optional fields are not applicable then the field should be left out of the JSON.</p>
+<p>The timestamp and original_string fields are mandatory. The remaining standard fields are optional.  If any of the optional fields are not applicable then the field should be left out of the JSON.</p>
 <p>So putting it all together a typical Metron message with all 5-tuple fields present would look like the following:</p>
 
 <div>
@@ -234,7 +240,8 @@ limitations under the License.
 <li><tt>raw_message</tt> : The raw message in string form</li>
 <li><tt>raw_message_bytes</tt> : The raw message bytes</li>
 <li><tt>error_hash</tt> : A hash of the error message</li>
-</ul></div></div>
+</ul>
+<p>When aggregating multiple sensors, all sensors must be using the same error topic.</p></div></div>
 <div class="section">
 <h2><a name="Parser_Configuration"></a>Parser Configuration</h2>
 <p>The configuration for the various parser topologies is defined by JSON documents stored in zookeeper.</p>
@@ -263,20 +270,29 @@ limitations under the License.
 <ul>
 
 <li><tt>sensorTopic</tt> : The kafka topic to send the parsed messages to.  If the topic is prefixed and suffixed by <tt>/</tt> then it is assumed to be a regex and will match any topic matching the pattern (e.g. <tt>/bro.*/</tt> would match <tt>bro_cust0</tt>, <tt>bro_cust1</tt> and <tt>bro_cust2</tt>)</li>
-<li><tt>readMetadata</tt> : Boolean indicating whether to read metadata or not (<tt>false</tt> by default).  See below for a discussion about metadata.</li>
-<li><tt>mergeMetadata</tt> : Boolean indicating whether to merge metadata with the message or not (<tt>false</tt> by default).  See below for a discussion about metadata.</li>
-<li><tt>parserConfig</tt> : A JSON Map representing the parser implementation specific configuration.</li>
+<li><tt>readMetadata</tt> : Boolean indicating whether to read metadata or not (The default is raw message strategy dependent).  See below for a discussion about metadata.</li>
+<li><tt>mergeMetadata</tt> : Boolean indicating whether to merge metadata with the message or not (The default is raw message strategy dependent).  See below for a discussion about metadata.</li>
+<li><tt>rawMessageStrategy</tt> : The strategy to use when reading the raw data and metadata.  See below for a discussion about message reading strategies.</li>
+<li><tt>rawMessageStrategyConfig</tt> : The raw message strategy configuration map.  See below for a discussion about message reading strategies.</li>
+<li><tt>parserConfig</tt> : A JSON Map representing the parser implementation specific configuration. Also include batch sizing and timeout for writer configuration here.
+<ul>
+
+<li><tt>batchSize</tt> : Integer indicating number of records to batch together before sending to the writer. (default to <tt>15</tt>)</li>
+<li><tt>batchTimeout</tt> : The timeout after which a batch will be flushed even if batchSize has not been met.  Optional. If unspecified, or set to <tt>0</tt>, it defaults to a system-determined duration which is a fraction of the Storm parameter <tt>topology.message.timeout.secs</tt>.  Ignored if batchSize is <tt>1</tt>, since this disables batching.</li>
+<li>The kafka writer can be configured within the parser config as well.  (This is all configured a priori, but this is convenient for overriding the settings).  See <a href="../metron-writer/index.html#kafka-writer">here</a></li>
+</ul>
+</li>
 <li><tt>fieldTransformations</tt> : An array of complex objects representing the transformations to be done on the message generated from the parser before writing out to the kafka topic.</li>
-<li><tt>spoutParallelism</tt> : The kafka spout parallelism (default to <tt>1</tt>).  This can be overridden on the command line.</li>
-<li><tt>spoutNumTasks</tt> : The number of tasks for the spout (default to <tt>1</tt>). This can be overridden on the command line.</li>
-<li><tt>parserParallelism</tt> : The parser bolt parallelism (default to <tt>1</tt>). This can be overridden on the command line.</li>
-<li><tt>parserNumTasks</tt> : The number of tasks for the parser bolt (default to <tt>1</tt>). This can be overridden on the command line.</li>
+<li><tt>spoutParallelism</tt> : The kafka spout parallelism (default to <tt>1</tt>).  This can be overridden on the command line, and if there are multiple sensors should be in a comma separated list in the same order as the sensors.</li>
+<li><tt>spoutNumTasks</tt> : The number of tasks for the spout (default to <tt>1</tt>). This can be overridden on the command line, and if there are multiple sensors should be in a comma separated list in the same order as the sensors.</li>
+<li><tt>parserParallelism</tt> : The parser bolt parallelism (default to <tt>1</tt>). If there are multiple sensors, the last one&#x2019;s configuration will be used. This can be overridden on the command line.</li>
+<li><tt>parserNumTasks</tt> : The number of tasks for the parser bolt (default to <tt>1</tt>). If there are multiple sensors, the last one&#x2019;s configuration will be used. This can be overridden on the command line.</li>
 <li><tt>errorWriterParallelism</tt> : The error writer bolt parallelism (default to <tt>1</tt>). This can be overridden on the command line.</li>
 <li><tt>errorWriterNumTasks</tt> : The number of tasks for the error writer bolt (default to <tt>1</tt>). This can be overridden on the command line.</li>
 <li><tt>numWorkers</tt> : The number of workers to use in the topology (default is the storm default of <tt>1</tt>).</li>
 <li><tt>numAckers</tt> : The number of acker executors to use in the topology (default is the storm default of <tt>1</tt>).</li>
-<li><tt>spoutConfig</tt> : A map representing a custom spout config (this is a map). This can be overridden on the command line.</li>
-<li><tt>securityProtocol</tt> : The security protocol to use for reading from kafka (this is a string).  This can be overridden on the command line and also specified in the spout config via the <tt>security.protocol</tt> key.  If both are specified, then they are merged and the CLI will take precedence.</li>
+<li><tt>spoutConfig</tt> : A map representing a custom spout config (this is a map). If there are multiple sensors, the configs will be merged with the last specified taking precedence. This can be overridden on the command line.</li>
+<li><tt>securityProtocol</tt> : The security protocol to use for reading from kafka (this is a string).  This can be overridden on the command line and also specified in the spout config via the <tt>security.protocol</tt> key.  If both are specified, then they are merged and the CLI will take precedence. If multiple sensors are used, any non &#x201c;PLAINTEXT&#x201d; value will be used.</li>
 <li><tt>stormConfig</tt> : The storm config to use (this is a map).  This can be overridden on the command line.  If both are specified, they are merged with CLI properties taking precedence.</li>
 <li><tt>cacheConfig</tt> : Cache config for stellar field transformations.   This configures a least frequently used cache.  This is a map with the following keys.  If not explicitly configured (the default), then no cache will be used.
 <ul>
@@ -331,17 +347,52 @@ Consider the following scenarios:</p>
 </li>
 <li>Custom metadata: Custom metadata from an individual telemetry source that one might want to use within Metron.</li>
 </ul>
-<p>Metadata is controlled by two fields in the parser:</p>
+<p>Metadata is controlled by the following parser configs:</p>
+<ul>
+
+<li><tt>rawMessageStrategy</tt> : This is a strategy which indicates how to read data and metadata.  The strategies supported are:
+<ul>
+
+<li><tt>DEFAULT</tt> : Data is read directly from the kafka record value and metadata, if any, is read from the kafka record key.  This strategy defaults to not reading metadata and not merging metadata.  This is the default strategy.</li>
+<li><tt>ENVELOPE</tt> : Data from kafka record value is presumed to be a JSON blob. One of these fields must contain the raw data to pass to the parser.  All other fields should be considered metadata.  The field containing the raw data is specified in the <tt>rawMessageStrategyConfig</tt>.  Data held in the kafka key as well as the non-data fields in the JSON blob passed into the kafka value are considered metadata. Note that the exception to this is that any <tt>original_string</tt> field is inherited from the envelope data so that the original string contains the envelope data.  If you do not prefer this behavior, remove this field from the envelope data.</li>
+</ul>
+</li>
+<li><tt>rawMessageStrategyConfig</tt> : The configuration (a map) for the <tt>rawMessageStrategy</tt>.  Available configurations are strategy dependent:
+<ul>
+
+<li><tt>DEFAULT</tt>
+<ul>
+
+<li><tt>metadataPrefix</tt> defines the key prefix for metadata (default is <tt>metron.metadata</tt>).</li>
+</ul>
+</li>
+<li><tt>ENVELOPE</tt>
+<ul>
+
+<li><tt>metadataPrefix</tt> defines the key prefix for metadata (default is <tt>metron.metadata</tt>)</li>
+<li><tt>messageField</tt> defines the field from the envelope to use as the data.  All other fields are considered metadata.</li>
+</ul>
+</li>
+</ul>
+</li>
+<li><tt>readMetadata</tt> : This is a boolean indicating whether metadata will be read and made available to Field transformations (i.e. Stellar field transformations).  The default is dependent upon the <tt>rawMessageStrategy</tt>:
+<ul>
+
+<li><tt>DEFAULT</tt> : default to <tt>false</tt>.</li>
+<li><tt>ENVELOPE</tt> : default to <tt>true</tt>.</li>
+</ul>
+</li>
+<li><tt>mergeMetadata</tt> : This is a boolean indicating whether metadata fields will be merged with the message automatically.  That is to say, if this property is set to <tt>true</tt> then every metadata field will become part of the messages and, consequently, also available for use in field transformations.  The default is dependent upon the <tt>rawMessageStrategy</tt>:
 <ul>
 
-<li><tt>readMetadata</tt> : This is a boolean indicating whether metadata will be read and made available to Field transformations (i.e. Stellar field transformations).  The default is <tt>false</tt>.</li>
-<li><tt>mergeMetadata</tt> : This is a boolean indicating whether metadata fields will be merged with the message automatically.<br />
-That is to say, if this property is set to <tt>true</tt> then every metadata field will become part of the messages and, consequently, also available for use in field transformations.</li>
+<li><tt>DEFAULT</tt> : default to <tt>false</tt>.</li>
+<li><tt>ENVELOPE</tt> : default to <tt>true</tt>.</li>
+</ul>
+</li>
 </ul>
 <div class="section">
 <h4><a name="Field_Naming"></a>Field Naming</h4>
-<p>In order to avoid collisions from metadata fields, metadata fields will be prefixed with <tt>metron.metadata.</tt>.<br />
-So, for instance the kafka topic would be in the field <tt>metron.metadata.topic</tt>.</p></div>
+<p>In order to avoid collisions from metadata fields, metadata fields will be prefixed (the default is <tt>metron.metadata.</tt>, but this is configurable in the <tt>rawMessageStrategyConfig</tt>).  So, for instance the kafka topic would be in the field <tt>metron.metadata.topic</tt>.</p></div>
 <div class="section">
 <h4><a name="Specifying_Custom_Metadata"></a>Specifying Custom Metadata</h4>
 <p>Custom metadata is specified by sending a JSON Map in the key.  If no key is sent, then, obviously, no metadata will be parsed. For instance, sending a metadata field called <tt>customer_id</tt> could be done by sending</p>
@@ -470,6 +521,36 @@ So, for instance the kafka topic would be in the field <tt>metron.metadata.topic
                       ]
 }
 </pre></div></div>
+
+<ul>
+
+<li><tt>REGEX_SELECT</tt> : This transformation lets users set an output field to one of a set of possibilities based on matching regexes. This transformation is useful when the number or conditions are large enough to make a stellar language match statement unwieldy.</li>
+</ul>
+<p>The following config will set the field <tt>logical_source_type</tt> to one of the following, dependent upon the value of the <tt>pix_type</tt> field:</p>
+<ul>
+
+<li><tt>cisco-6-302</tt> if <tt>pix_type</tt> starts with either <tt>6-302</tt> or <tt>06-302</tt></li>
+<li><tt>cisco-5-304</tt> if <tt>pix_type</tt> starts with <tt>5-304</tt></li>
+</ul>
+
+<div>
+<div>
+<pre class="source">{
+...
+  &quot;fieldTransformations&quot; : [
+    {
+     &quot;transformation&quot; : &quot;REGEX_ROUTING&quot;
+    ,&quot;input&quot; :  &quot;pix_type&quot;
+    ,&quot;output&quot; :  &quot;logical_source_type&quot;
+    ,&quot;config&quot; : {
+      &quot;cisco-6-302&quot; : [ &quot;^6-302.*&quot;, &quot;^06-302.*&quot;]
+      &quot;cisco-5-304&quot; : &quot;^5-304.*&quot;
+                }
+    }
+                           ]
+...  
+}
+</pre></div></div>
 </div>
 <div class="section">
 <h3><a name="Assignment_to_null"></a>Assignment to <tt>null</tt></h3>
@@ -685,10 +766,12 @@ HH:mm:ss', MAP_GET(dc, dc2tz, 'UTC') )&quot;
 <p><a name="Notes_on_Performance_Tuning"></a></p>
 <h1>Notes on Performance Tuning</h1>
 <p>Default installed Metron is untuned for production deployment.  There are a few knobs to tune to get the most out of your system.</p>
+<p>When using aggregated parsers, it&#x2019;s highly recommended to aggregate parsers with similar velocity and parser complexity together.</p>
 <p><a name="Notes_on_Adding_a_New_Sensor"></a></p>
 <h1>Notes on Adding a New Sensor</h1>
 <p>In order to allow for meta alerts to be queries alongside regular alerts in Elasticsearch 2.x, it is necessary to add an additional field to the templates and mapping for existing sensors.</p>
-<p>Please see a description of the steps necessary to make this change in the metron-elasticsearch <a href="../../metron-platform/metron-elasticsearch/index.html#Using_Metron_with_Elasticsearch_2.x">Using Metron with Elasticsearch 2.x</a></p></div>
+<p>Please see a description of the steps necessary to make this change in the metron-elasticsearch <a href="../../metron-platform/metron-elasticsearch/index.html#Using_Metron_with_Elasticsearch_2.x">Using Metron with Elasticsearch 2.x</a></p>
+<p>If Solr is selected as the real-time store, it is also necessary to add additional fields.  See the <a href="../metron-indexing/index.html#Solr">Solr</a> section in metron-indexing for more details.</p></div>
 <div class="section">
 <h2><a name="Kafka_Queue"></a>Kafka Queue</h2>
 <p>The kafka queue associated with your parser is a collection point for all of the data sent to your parser.  As such, make sure that the number of partitions in the kafka topic is sufficient to handle the throughput that you expect from your parser topology.</p></div>

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-platform/metron-parsers/parser-testing.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-platform/metron-parsers/parser-testing.html b/site/current-book/metron-platform/metron-parsers/parser-testing.html
index ff22013..945aebc 100644
--- a/site/current-book/metron-platform/metron-parsers/parser-testing.html
+++ b/site/current-book/metron-platform/metron-parsers/parser-testing.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-platform/metron-parsers/parser-testing.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-platform/metron-parsers/parser-testing.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Parser Contribution and Testing</title>
     <link rel="stylesheet" href="../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Parser Contribution and Testing</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -55,20 +55,22 @@
     <li><a href="../../metron-platform/index.html" title="Platform"><span class="icon-chevron-down"></span>Platform</a>
     <ul class="nav nav-list">
     <li><a href="../../metron-platform/Performance-tuning-guide.html" title="Performance-tuning-guide"><span class="none"></span>Performance-tuning-guide</a></li>
-    <li><a href="../../metron-platform/metron-api/index.html" title="Api"><span class="none"></span>Api</a></li>
     <li><a href="../../metron-platform/metron-common/index.html" title="Common"><span class="none"></span>Common</a></li>
     <li><a href="../../metron-platform/metron-data-management/index.html" title="Data-management"><span class="none"></span>Data-management</a></li>
     <li><a href="../../metron-platform/metron-elasticsearch/index.html" title="Elasticsearch"><span class="none"></span>Elasticsearch</a></li>
     <li><a href="../../metron-platform/metron-enrichment/index.html" title="Enrichment"><span class="icon-chevron-right"></span>Enrichment</a></li>
     <li><a href="../../metron-platform/metron-indexing/index.html" title="Indexing"><span class="none"></span>Indexing</a></li>
+    <li><a href="../../metron-platform/metron-job/index.html" title="Job"><span class="none"></span>Job</a></li>
     <li><a href="../../metron-platform/metron-management/index.html" title="Management"><span class="none"></span>Management</a></li>
     <li><a href="../../metron-platform/metron-parsers/index.html" title="Parsers"><span class="icon-chevron-down"></span>Parsers</a>
     <ul class="nav nav-list">
     <li><a href="../../metron-platform/metron-parsers/3rdPartyParser.html" title="3rdPartyParser"><span class="none"></span>3rdPartyParser</a></li>
+    <li><a href="../../metron-platform/metron-parsers/ParserChaining.html" title="ParserChaining"><span class="none"></span>ParserChaining</a></li>
     <li class="active"><a href="#"><span class="none"></span>parser-testing</a></li>
     </ul>
 </li>
     <li><a href="../../metron-platform/metron-pcap-backend/index.html" title="Pcap-backend"><span class="none"></span>Pcap-backend</a></li>
+    <li><a href="../../metron-platform/metron-solr/index.html" title="Solr"><span class="none"></span>Solr</a></li>
     <li><a href="../../metron-platform/metron-writer/index.html" title="Writer"><span class="none"></span>Writer</a></li>
     </ul>
 </li>


[5/5] metron git commit: METRON-1776 Update public web site to point at 0.6.0 new release (justinleet) closes apache/metron#1195

Posted by le...@apache.org.
METRON-1776 Update public web site to point at 0.6.0 new release (justinleet) closes apache/metron#1195


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

Branch: refs/heads/master
Commit: a97e575f3bf6285d9893c2bc63d70a05784e22ea
Parents: 2720e53
Author: justinleet <ju...@gmail.com>
Authored: Thu Sep 13 15:19:43 2018 -0400
Committer: leet <le...@apache.org>
Committed: Thu Sep 13 15:19:43 2018 -0400

----------------------------------------------------------------------
 site/current-book/CONTRIBUTING.html             |   8 +-
 site/current-book/Upgrading.html                |   8 +-
 site/current-book/css/maven-base.css            | 168 --------
 site/current-book/css/maven-theme.css           | 161 --------
 site/current-book/css/print.css                 |  11 +-
 site/current-book/images/collapsed.gif          | Bin 53 -> 0 bytes
 site/current-book/images/expanded.gif           | Bin 52 -> 0 bytes
 site/current-book/images/external.png           | Bin 230 -> 0 bytes
 site/current-book/images/icon_error_sml.gif     | Bin 1010 -> 633 bytes
 site/current-book/images/icon_info_sml.gif      | Bin 606 -> 638 bytes
 site/current-book/images/icon_success_sml.gif   | Bin 990 -> 604 bytes
 site/current-book/images/icon_warning_sml.gif   | Bin 576 -> 625 bytes
 .../metron-job_state_statechart_diagram.svg     |  14 +
 site/current-book/images/newwindow.png          | Bin 220 -> 0 bytes
 site/current-book/index.html                    |   8 +-
 site/current-book/metron-analytics/index.html   |   8 +-
 .../metron-maas-service/index.html              |   8 +-
 .../metron-profiler-client/index.html           |   8 +-
 .../metron-analytics/metron-profiler/index.html |  53 ++-
 .../metron-statistics/HLLP.html                 |   8 +-
 .../metron-statistics/index.html                |   8 +-
 .../metron-contrib/metron-docker/index.html     |   8 +-
 .../metron-performance/index.html               |   8 +-
 .../Kerberos-ambari-setup.html                  |   8 +-
 .../Kerberos-manual-setup.html                  |  97 ++++-
 .../metron-deployment/amazon-ec2/index.html     |   8 +-
 .../metron-deployment/ansible/index.html        |   8 +-
 .../metron-deployment/ansible/roles/index.html  |   8 +-
 .../ansible/roles/opentaxii/index.html          |   8 +-
 .../ansible/roles/pcap_replay/index.html        |   8 +-
 .../ansible/roles/sensor-stubs/index.html       |   8 +-
 .../ansible/roles/sensor-test-mode/index.html   |   8 +-
 .../development/centos6/index.html              |  12 +-
 .../development/fastcapa/index.html             |   8 +-
 .../metron-deployment/development/index.html    |   8 +-
 .../development/ubuntu14/index.html             |  12 +-
 site/current-book/metron-deployment/index.html  |  13 +-
 .../metron-deployment/other-examples/index.html |   8 +-
 .../manual-install/Manual_Install_CentOS6.html  |   8 +-
 .../ambari/elasticsearch-mpack/index.html       |   8 +-
 .../packaging/ambari/index.html                 |   8 +-
 .../packaging/ambari/metron-mpack/index.html    |   8 +-
 .../packaging/docker/ansible-docker/index.html  |   8 +-
 .../packaging/docker/deb-docker/index.html      |   8 +-
 .../packaging/docker/rpm-docker/index.html      |   8 +-
 .../packaging/packer-build/index.html           |   8 +-
 .../metron-interface/metron-alerts/index.html   |  50 ++-
 .../metron-interface/metron-config/index.html   |   8 +-
 .../metron-interface/metron-rest/index.html     | 204 ++++++++-
 .../Performance-tuning-guide.html               |  15 +-
 site/current-book/metron-platform/index.html    |  13 +-
 .../metron-platform/metron-api/index.html       | 161 --------
 .../metron-platform/metron-common/index.html    |  43 +-
 .../metron-data-management/index.html           |  11 +-
 .../metron-elasticsearch/index.html             |  19 +-
 .../metron-enrichment/Performance.html          |  11 +-
 .../metron-enrichment/index.html                |  23 +-
 .../metron-platform/metron-indexing/index.html  |  65 ++-
 .../metron-platform/metron-job/index.html       | 126 ++++++
 .../metron-management/index.html                |  11 +-
 .../metron-parsers/3rdPartyParser.html          |  87 ++--
 .../metron-parsers/ParserChaining.html          | 259 ++++++++++++
 .../metron-platform/metron-parsers/index.html   | 131 ++++--
 .../metron-parsers/parser-testing.html          |  12 +-
 .../metron-pcap-backend/index.html              |  15 +-
 .../metron-platform/metron-solr/index.html      | 300 ++++++++++++++
 .../metron-platform/metron-writer/index.html    |  33 +-
 .../metron-sensors/fastcapa/index.html          |   8 +-
 site/current-book/metron-sensors/index.html     |   8 +-
 .../metron-sensors/pycapa/index.html            | 181 ++++++--
 .../stellar-3rd-party-example/index.html        |   8 +-
 .../stellar-common/3rdPartyStellar.html         |   8 +-
 .../metron-stellar/stellar-common/index.html    |  27 +-
 .../metron-stellar/stellar-zeppelin/index.html  |  14 +-
 .../use-cases/forensic_clustering/index.html    | 241 +++++++----
 .../geographic_login_outliers/index.html        |  14 +-
 site/current-book/use-cases/index.html          |   9 +-
 .../use-cases/parser_chaining/index.html        | 412 +++++++++++++++++++
 .../use-cases/typosquat_detection/index.html    |  23 +-
 site/documentation/index.md                     |  15 +-
 80 files changed, 2350 insertions(+), 988 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/CONTRIBUTING.html
----------------------------------------------------------------------
diff --git a/site/current-book/CONTRIBUTING.html b/site/current-book/CONTRIBUTING.html
index bb3119e..c44e4e2 100644
--- a/site/current-book/CONTRIBUTING.html
+++ b/site/current-book/CONTRIBUTING.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/CONTRIBUTING.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/CONTRIBUTING.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; How To Contribute</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">How To Contribute</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/Upgrading.html
----------------------------------------------------------------------
diff --git a/site/current-book/Upgrading.html b/site/current-book/Upgrading.html
index fac4db1..3a9b9a7 100644
--- a/site/current-book/Upgrading.html
+++ b/site/current-book/Upgrading.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/Upgrading.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/Upgrading.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Upgrading</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Upgrading</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/css/maven-base.css
----------------------------------------------------------------------
diff --git a/site/current-book/css/maven-base.css b/site/current-book/css/maven-base.css
deleted file mode 100644
index 322efae..0000000
--- a/site/current-book/css/maven-base.css
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-body {
-  margin: 0px;
-  padding: 0px;
-}
-table {
-  padding:0px;
-  width: 100%;
-  margin-left: -2px;
-  margin-right: -2px;
-}
-acronym {
-  cursor: help;
-  border-bottom: 1px dotted #feb;
-}
-table.bodyTable th, table.bodyTable td {
-  padding: 2px 4px 2px 4px;
-  vertical-align: top;
-}
-div.clear{
-  clear:both;
-  visibility: hidden;
-}
-div.clear hr{
-  display: none;
-}
-#bannerLeft, #bannerRight {
-  font-size: xx-large;
-  font-weight: bold;
-}
-#bannerLeft img, #bannerRight img {
-  margin: 0px;
-}
-.xleft, #bannerLeft img {
-  float:left;
-}
-.xright, #bannerRight {
-  float:right;
-}
-#banner {
-  padding: 0px;
-}
-#breadcrumbs {
-  padding: 3px 10px 3px 10px;
-}
-#leftColumn {
- width: 170px;
- float:left;
- overflow: auto;
-}
-#bodyColumn {
-  margin-right: 1.5em;
-  margin-left: 197px;
-}
-#legend {
-  padding: 8px 0 8px 0;
-}
-#navcolumn {
-  padding: 8px 4px 0 8px;
-}
-#navcolumn h5 {
-  margin: 0;
-  padding: 0;
-  font-size: small;
-}
-#navcolumn ul {
-  margin: 0;
-  padding: 0;
-  font-size: small;
-}
-#navcolumn li {
-  list-style-type: none;
-  background-image: none;
-  background-repeat: no-repeat;
-  background-position: 0 0.4em;
-  padding-left: 16px;
-  list-style-position: outside;
-  line-height: 1.2em;
-  font-size: smaller;
-}
-#navcolumn li.expanded {
-  background-image: url(../images/expanded.gif);
-}
-#navcolumn li.collapsed {
-  background-image: url(../images/collapsed.gif);
-}
-#navcolumn li.none {
-  text-indent: -1em;
-  margin-left: 1em;
-}
-#poweredBy {
-  text-align: center;
-}
-#navcolumn img {
-  margin-top: 10px;
-  margin-bottom: 3px;
-}
-#poweredBy img {
-  display:block;
-  margin: 20px 0 20px 17px;
-}
-#search img {
-    margin: 0px;
-    display: block;
-}
-#search #q, #search #btnG {
-    border: 1px solid #999;
-    margin-bottom:10px;
-}
-#search form {
-    margin: 0px;
-}
-#lastPublished {
-  font-size: x-small;
-}
-.navSection {
-  margin-bottom: 2px;
-  padding: 8px;
-}
-.navSectionHead {
-  font-weight: bold;
-  font-size: x-small;
-}
-.section {
-  padding: 4px;
-}
-#footer {
-  padding: 3px 10px 3px 10px;
-  font-size: x-small;
-}
-#breadcrumbs {
-  font-size: x-small;
-  margin: 0pt;
-}
-.source {
-  padding: 12px;
-  margin: 1em 7px 1em 7px;
-}
-.source pre {
-  margin: 0px;
-  padding: 0px;
-}
-#navcolumn img.imageLink, .imageLink {
-  padding-left: 0px;
-  padding-bottom: 0px;
-  padding-top: 0px;
-  padding-right: 2px;
-  border: 0px;
-  margin: 0px;
-}

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/css/maven-theme.css
----------------------------------------------------------------------
diff --git a/site/current-book/css/maven-theme.css b/site/current-book/css/maven-theme.css
deleted file mode 100644
index 4e2bdfb..0000000
--- a/site/current-book/css/maven-theme.css
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-body {
-  padding: 0px 0px 10px 0px;
-}
-body, td, select, input, li{
-  font-family: Verdana, Helvetica, Arial, sans-serif;
-  font-size: 13px;
-}
-code{
-  font-family: Courier, monospace;
-  font-size: 13px;
-}
-a {
-  text-decoration: none;
-}
-a:link {
-  color:#36a;
-}
-a:visited  {
-  color:#47a;
-}
-a:active, a:hover {
-  color:#69c;
-}
-#legend li.externalLink {
-  background: url(../images/external.png) left top no-repeat;
-  padding-left: 18px;
-}
-a.externalLink, a.externalLink:link, a.externalLink:visited, a.externalLink:active, a.externalLink:hover {
-  background: url(../images/external.png) right center no-repeat;
-  padding-right: 18px;
-}
-#legend li.newWindow {
-  background: url(../images/newwindow.png) left top no-repeat;
-  padding-left: 18px;
-}
-a.newWindow, a.newWindow:link, a.newWindow:visited, a.newWindow:active, a.newWindow:hover {
-  background: url(../images/newwindow.png) right center no-repeat;
-  padding-right: 18px;
-}
-h2 {
-  padding: 4px 4px 4px 6px;
-  border: 1px solid #999;
-  color: #900;
-  background-color: #ddd;
-  font-weight:900;
-  font-size: x-large;
-}
-h3 {
-  padding: 4px 4px 4px 6px;
-  border: 1px solid #aaa;
-  color: #900;
-  background-color: #eee;
-  font-weight: normal;
-  font-size: large;
-}
-h4 {
-  padding: 4px 4px 4px 6px;
-  border: 1px solid #bbb;
-  color: #900;
-  background-color: #fff;
-  font-weight: normal;
-  font-size: large;
-}
-h5 {
-  padding: 4px 4px 4px 6px;
-  color: #900;
-  font-size: medium;
-}
-p {
-  line-height: 1.3em;
-  font-size: small;
-}
-#breadcrumbs {
-  border-top: 1px solid #aaa;
-  border-bottom: 1px solid #aaa;
-  background-color: #ccc;
-}
-#leftColumn {
-  margin: 10px 0 0 5px;
-  border: 1px solid #999;
-  background-color: #eee;
-  padding-bottom: 3px; /* IE-9 scrollbar-fix */
-}
-#navcolumn h5 {
-  font-size: smaller;
-  border-bottom: 1px solid #aaaaaa;
-  padding-top: 2px;
-  color: #000;
-}
-
-table.bodyTable th {
-  color: white;
-  background-color: #bbb;
-  text-align: left;
-  font-weight: bold;
-}
-
-table.bodyTable th, table.bodyTable td {
-  font-size: 1em;
-}
-
-table.bodyTable tr.a {
-  background-color: #ddd;
-}
-
-table.bodyTable tr.b {
-  background-color: #eee;
-}
-
-.source {
-  border: 1px solid #999;
-}
-dl {
-  padding: 4px 4px 4px 6px;
-  border: 1px solid #aaa;
-  background-color: #ffc;
-}
-dt {
-  color: #900;
-}
-#organizationLogo img, #projectLogo img, #projectLogo span{
-  margin: 8px;
-}
-#banner {
-  border-bottom: 1px solid #fff;
-}
-.errormark, .warningmark, .donemark, .infomark {
-  background: url(../images/icon_error_sml.gif) no-repeat;
-}
-
-.warningmark {
-  background-image: url(../images/icon_warning_sml.gif);
-}
-
-.donemark {
-  background-image: url(../images/icon_success_sml.gif);
-}
-
-.infomark {
-  background-image: url(../images/icon_info_sml.gif);
-}
-

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/css/print.css
----------------------------------------------------------------------
diff --git a/site/current-book/css/print.css b/site/current-book/css/print.css
index 18fcbad..d4df77f 100644
--- a/site/current-book/css/print.css
+++ b/site/current-book/css/print.css
@@ -17,10 +17,7 @@
  * under the License.
  */
 
-#banner, #footer, #leftcol, #breadcrumbs, .docs #toc, .docs .courtesylinks, #leftColumn, #navColumn {
-	display: none !important;
-}
-#bodyColumn, body.docs div.docs {
-	margin: 0 !important;
-	border: none !important
-}
+/* $Id$ */
+
+#banner, #footer, #leftcol, #breadcrumbs, .docs #toc, .docs .courtesylinks, #leftColumn, #navColumn {display: none !important;}
+#bodyColumn, body.docs div.docs {margin: 0 !important;border: none !important}

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/images/collapsed.gif
----------------------------------------------------------------------
diff --git a/site/current-book/images/collapsed.gif b/site/current-book/images/collapsed.gif
deleted file mode 100644
index 6e71084..0000000
Binary files a/site/current-book/images/collapsed.gif and /dev/null differ

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/images/expanded.gif
----------------------------------------------------------------------
diff --git a/site/current-book/images/expanded.gif b/site/current-book/images/expanded.gif
deleted file mode 100644
index 0fef3d8..0000000
Binary files a/site/current-book/images/expanded.gif and /dev/null differ

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/images/external.png
----------------------------------------------------------------------
diff --git a/site/current-book/images/external.png b/site/current-book/images/external.png
deleted file mode 100644
index 3f999fc..0000000
Binary files a/site/current-book/images/external.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/images/icon_error_sml.gif
----------------------------------------------------------------------
diff --git a/site/current-book/images/icon_error_sml.gif b/site/current-book/images/icon_error_sml.gif
index 61132ef..12e9a01 100644
Binary files a/site/current-book/images/icon_error_sml.gif and b/site/current-book/images/icon_error_sml.gif differ

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/images/icon_info_sml.gif
----------------------------------------------------------------------
diff --git a/site/current-book/images/icon_info_sml.gif b/site/current-book/images/icon_info_sml.gif
index c6cb9ad..b776326 100644
Binary files a/site/current-book/images/icon_info_sml.gif and b/site/current-book/images/icon_info_sml.gif differ

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/images/icon_success_sml.gif
----------------------------------------------------------------------
diff --git a/site/current-book/images/icon_success_sml.gif b/site/current-book/images/icon_success_sml.gif
index 52e85a4..0a19527 100644
Binary files a/site/current-book/images/icon_success_sml.gif and b/site/current-book/images/icon_success_sml.gif differ

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/images/icon_warning_sml.gif
----------------------------------------------------------------------
diff --git a/site/current-book/images/icon_warning_sml.gif b/site/current-book/images/icon_warning_sml.gif
index 873bbb5..ac6ad6a 100644
Binary files a/site/current-book/images/icon_warning_sml.gif and b/site/current-book/images/icon_warning_sml.gif differ

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/images/metron-job_state_statechart_diagram.svg
----------------------------------------------------------------------
diff --git a/site/current-book/images/metron-job_state_statechart_diagram.svg b/site/current-book/images/metron-job_state_statechart_diagram.svg
new file mode 100644
index 0000000..c801eae
--- /dev/null
+++ b/site/current-book/images/metron-job_state_statechart_diagram.svg
@@ -0,0 +1,14 @@
+<!--
+  Licensed to the Apache Software
+       Foundation (ASF) under one or more contributor license agreements. See the
+       NOTICE file distributed with this work for additional information regarding
+       copyright ownership. The ASF licenses this file to You under the Apache License,
+       Version 2.0 (the "License"); you may not use this file except in compliance
+       with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+       Unless required by applicable law or agreed to in writing, software distributed
+       under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+       OR CONDITIONS OF ANY KIND, either express or implied. See the License for
+  the specific language governing permissions and limitations under the License.
+  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="656px" height="291px" version="1.1"><defs/><g transform="translate(0.5,0.5)"><ellipse cx="15" cy="150" rx="11" ry="11" fill="#000000" stroke="#ff0000" transform="rotate(90,15,150)" pointer-events="none"/><rect x="102" y="120" width="120" height="60" rx="14.4" ry="14.4" fill="#ffffc0" stroke="#ff0000" pointer-events="none"/><g transform="translate(115.5,143.5)"><switch><foreignObject style="overflow:visible;" pointer-events="all" width="92" height="12" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; font-size: 12px; font-family: Verdana; color: rgb(0, 0, 0); line-height: 1.2; vertical-align: top; width: 92px; white-space: nowrap; word-wrap: normal; text-align: center;"><div xmlns="http://www.w3.org/1999/xhtml" style="display:inline-block;text-align:inherit;text-decoration:inherit;">NOT_RUNNING</div></div>
 </foreignObject><text x="46" y="12" fill="#000000" text-anchor="middle" font-size="12px" font-family="Verdana">NOT_RUNNING</text></switch></g><path d="M 435 30 L 532.76 30" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/><path d="M 524.88 34.5 L 533.88 30 L 524.88 25.5" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/><rect x="314.5" y="0" width="120" height="60" rx="14.4" ry="14.4" fill="#ffffc0" stroke="#ff0000" pointer-events="none"/><g transform="translate(345.5,23.5)"><switch><foreignObject style="overflow:visible;" pointer-events="all" width="58" height="12" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; font-size: 12px; font-family: Verdana; color: rgb(0, 0, 0); line-height: 1.2; vertical-align: top; width: 60px; white-space: nowrap; word-wrap: normal; text-align: center;"><div xmlns="http://www.w3.org/1999/xhtml" style="display:inl
 ine-block;text-align:inherit;text-decoration:inherit;">RUNNING</div></div></foreignObject><text x="29" y="12" fill="#000000" text-anchor="middle" font-size="12px" font-family="Verdana">RUNNING</text></switch></g><rect x="534.5" y="0" width="120" height="60" rx="14.4" ry="14.4" fill="#ffffc0" stroke="#ff0000" pointer-events="none"/><g transform="translate(558.5,23.5)"><switch><foreignObject style="overflow:visible;" pointer-events="all" width="72" height="12" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; font-size: 12px; font-family: Verdana; color: rgb(0, 0, 0); line-height: 1.2; vertical-align: top; width: 74px; white-space: nowrap; word-wrap: normal; text-align: center;"><div xmlns="http://www.w3.org/1999/xhtml" style="display:inline-block;text-align:inherit;text-decoration:inherit;">FINALIZING</div></div></foreignObject><text x="36" y="12" fill="#000000" text-anchor="middle" font-size="1
 2px" font-family="Verdana">FINALIZING</text></switch></g><path d="M 30 150 L 99.76 150" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/><path d="M 91.88 154.5 L 100.88 150 L 91.88 145.5" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/><rect x="314.5" y="120" width="120" height="60" rx="14.4" ry="14.4" fill="#ffffc0" stroke="#ff0000" pointer-events="none"/><g transform="translate(352.5,143.5)"><switch><foreignObject style="overflow:visible;" pointer-events="all" width="44" height="12" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; font-size: 12px; font-family: Verdana; color: rgb(0, 0, 0); line-height: 1.2; vertical-align: top; width: 44px; white-space: nowrap; word-wrap: normal; text-align: center;"><div xmlns="http://www.w3.org/1999/xhtml" style="display:inline-block;text-align:inherit;text-decoration:inherit;">KILLED</div></div></foreig
 nObject><text x="22" y="12" fill="#000000" text-anchor="middle" font-size="12px" font-family="Verdana">KILLED</text></switch></g><rect x="314.5" y="230" width="120" height="60" rx="14.4" ry="14.4" fill="#ffffc0" stroke="#ff0000" pointer-events="none"/><g transform="translate(352.5,253.5)"><switch><foreignObject style="overflow:visible;" pointer-events="all" width="44" height="12" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; font-size: 12px; font-family: Verdana; color: rgb(0, 0, 0); line-height: 1.2; vertical-align: top; width: 44px; white-space: nowrap; word-wrap: normal; text-align: center;"><div xmlns="http://www.w3.org/1999/xhtml" style="display:inline-block;text-align:inherit;text-decoration:inherit;">FAILED</div></div></foreignObject><text x="22" y="12" fill="#000000" text-anchor="middle" font-size="12px" font-family="Verdana">FAILED</text></switch></g><rect x="534.5" y="120" width="
 120" height="60" rx="14.4" ry="14.4" fill="#ffffc0" stroke="#ff0000" pointer-events="none"/><g transform="translate(556.5,143.5)"><switch><foreignObject style="overflow:visible;" pointer-events="all" width="75" height="12" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; font-size: 12px; font-family: Verdana; color: rgb(0, 0, 0); line-height: 1.2; vertical-align: top; width: 76px; white-space: nowrap; word-wrap: normal; text-align: center;"><div xmlns="http://www.w3.org/1999/xhtml" style="display:inline-block;text-align:inherit;text-decoration:inherit;">SUCCEEDED</div></div></foreignObject><text x="38" y="12" fill="#000000" text-anchor="middle" font-size="12px" font-family="Verdana">SUCCEEDED</text></switch></g><path d="M 375 60 L 375 117.76" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/><path d="M 370.5 109.88 L 375 118.88 L 379.5 109.88" fill="none" stroke="#ff00
 00" stroke-miterlimit="10" pointer-events="none"/><path d="M 595 60 L 595 117.76" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/><path d="M 590.5 109.88 L 595 118.88 L 599.5 109.88" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/><path d="M 535 45 L 495 45 Q 485 45 485 55 L 485 250 Q 485 260 475 260 L 437.24 260" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/><path d="M 445.12 255.5 L 436.12 260 L 445.12 264.5" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/><path d="M 315 45 L 285 45 Q 275 45 275 55 L 275 250 Q 275 260 285 260 L 312.76 260" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/><path d="M 304.88 264.5 L 313.88 260 L 304.88 255.5" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/><path d="M 535 45 L 495 45 Q 485 45 485 55 L 485 140 Q 485 150 475 150 L 437.24 150" fill="none" stroke="#ff0000" stroke-miterlimit="10"
  pointer-events="none"/><path d="M 445.12 145.5 L 436.12 150 L 445.12 154.5" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/><rect x="102" y="0" width="120" height="60" rx="14.4" ry="14.4" fill="#ffffc0" stroke="#ff0000" pointer-events="none"/><g transform="translate(125.5,23.5)"><switch><foreignObject style="overflow:visible;" pointer-events="all" width="72" height="12" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; font-size: 12px; font-family: Verdana; color: rgb(0, 0, 0); line-height: 1.2; vertical-align: top; width: 73px; white-space: nowrap; word-wrap: normal; text-align: center;"><div xmlns="http://www.w3.org/1999/xhtml" style="display:inline-block;text-align:inherit;text-decoration:inherit;">SUBMITTED</div></div></foreignObject><text x="36" y="12" fill="#000000" text-anchor="middle" font-size="12px" font-family="Verdana">SUBMITTED</text></switch></g><path d
 ="M 162 120 L 162 62.24" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/><path d="M 166.5 70.12 L 162 61.12 L 157.5 70.12" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/><path d="M 222 30 L 312.76 30" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/><path d="M 304.88 34.5 L 313.88 30 L 304.88 25.5" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/></g></svg>

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/images/newwindow.png
----------------------------------------------------------------------
diff --git a/site/current-book/images/newwindow.png b/site/current-book/images/newwindow.png
deleted file mode 100644
index 6287f72..0000000
Binary files a/site/current-book/images/newwindow.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/index.html b/site/current-book/index.html
index f8d6f85..760baf9 100644
--- a/site/current-book/index.html
+++ b/site/current-book/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Apache Metron</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Apache Metron</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-analytics/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-analytics/index.html b/site/current-book/metron-analytics/index.html
index 02a9064..acbd62d 100644
--- a/site/current-book/metron-analytics/index.html
+++ b/site/current-book/metron-analytics/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-analytics/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-analytics/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Metron Analytics</title>
     <link rel="stylesheet" href="../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Metron Analytics</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-analytics/metron-maas-service/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-analytics/metron-maas-service/index.html b/site/current-book/metron-analytics/metron-maas-service/index.html
index b47dbea..3f67733 100644
--- a/site/current-book/metron-analytics/metron-maas-service/index.html
+++ b/site/current-book/metron-analytics/metron-maas-service/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-analytics/metron-maas-service/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-analytics/metron-maas-service/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Model Management Infrastructure</title>
     <link rel="stylesheet" href="../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Model Management Infrastructure</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-analytics/metron-profiler-client/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-analytics/metron-profiler-client/index.html b/site/current-book/metron-analytics/metron-profiler-client/index.html
index d05835a..b73666c 100644
--- a/site/current-book/metron-analytics/metron-profiler-client/index.html
+++ b/site/current-book/metron-analytics/metron-profiler-client/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-analytics/metron-profiler-client/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-analytics/metron-profiler-client/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Metron Profiler Client</title>
     <link rel="stylesheet" href="../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Metron Profiler Client</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-analytics/metron-profiler/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-analytics/metron-profiler/index.html b/site/current-book/metron-analytics/metron-profiler/index.html
index fe498af..eaa8529 100644
--- a/site/current-book/metron-analytics/metron-profiler/index.html
+++ b/site/current-book/metron-analytics/metron-profiler/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-analytics/metron-profiler/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-analytics/metron-profiler/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Metron Profiler</title>
     <link rel="stylesheet" href="../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Metron Profiler</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -353,18 +353,16 @@ node1:6667
 <p>Continuing the previous running example, at this point, you have seen how your profile behaves against real, live telemetry in a controlled execution environment.  The next step is to deploy your profile to the live, actively running Profiler topology.</p>
 <ol style="list-style-type: decimal">
 
-<li>
-
-<p>Start the Stellar Shell with the <tt>-z ZK:2181</tt> command line argument.  This is required when deploying a new profile to the active Profiler topology.  Replace <tt>ZK:2181</tt> with a URL that is appropriate to your environment.</p>
+<li>Start the Stellar Shell with the <tt>-z</tt> command line argument so that a connection to Zookeeper is established.  This is required when  deploying a new profile definition as shown in the steps below.
 
 <div>
 <div>
-<pre class="source">[root@node1 ~]# $METRON_HOME/bin/stellar -z ZK:2181
-Stellar, Go!
-[Stellar]&gt;&gt;&gt;
-[Stellar]&gt;&gt;&gt; %functions CONFIG CONFIG_GET, CONFIG_PUT
-</pre></div></div>
+<pre class="source"></pre></div></div>
 </li>
+</ol>
+<p>[root@node1 ~]# source /etc/default/metron [root@node1 ~]# $METRON_HOME/bin/stellar -z $ZOOKEEPER Stellar, Go! [Stellar]&gt;&gt;&gt; [Stellar]&gt;&gt;&gt; %functions CONFIG CONFIG_GET, CONFIG_PUT ```</p>
+<ol style="list-style-type: decimal">
+
 <li>
 
 <p>If you haven&#x2019;t already, define your profile.</p>
@@ -434,19 +432,20 @@ Stellar, Go!
 </li>
 <li>
 
-<p>Upload the profile definition to Zookeeper.  Change <tt>node1:2181</tt> to refer the actual Zookeeper host in your environment.</p>
+<p>Upload the profile definition to Zookeeper.</p>
 
 <div>
 <div>
-<pre class="source">$ cd $METRON_HOME
-$ bin/zk_load_configs.sh -m PUSH -i config/zookeeper/ -z node1:2181
+<pre class="source">$ source /etc/default/metron
+$ cd $METRON_HOME
+$ bin/zk_load_configs.sh -m PUSH -i config/zookeeper/ -z $ZOOKEEPER
 </pre></div></div>
 
 <p>You can validate this by reading back the Metron configuration from Zookeeper using the same script. The result should look-like the following.</p>
 
 <div>
 <div>
-<pre class="source">$ bin/zk_load_configs.sh -m DUMP -z node1:2181
+<pre class="source">$ bin/zk_load_configs.sh -m DUMP -z $ZOOKEEPER
 ...
 PROFILER Config: profiler
 {
@@ -483,7 +482,8 @@ hbase(main):001:0&gt; count 'profiler'
 
 <div>
 <div>
-<pre class="source">$ bin/stellar -z node1:2181
+<pre class="source">$ source /etc/default/metron
+$ bin/stellar -z $ZOOKEEPER
 [Stellar]&gt;&gt;&gt; PROFILE_GET( &quot;hello-world&quot;, &quot;10.0.0.1&quot;, PROFILE_FIXED(30, &quot;MINUTES&quot;))
 [451, 448]
 </pre></div></div>
@@ -789,6 +789,12 @@ hbase(main):001:0&gt; count 'profiler'
 <tr class="a">
 <td> <a href="#topology.kryo.register"><tt>topology.kryo.register</tt></a>                             </td>
 <td> Storm will use Kryo serialization for these classes.</td></tr>
+<tr class="b">
+<td> <a href="#profiler.writer.batchSize"><tt>profiler.writer.batchSize</tt></a>                       </td>
+<td> The number of records to batch when writing to Kakfa.</td></tr>
+<tr class="a">
+<td> <a href="#profiler.writer.batchTimeout"><tt>profiler.writer.batchTimeout</tt></a>                 </td>
+<td> The timeout in ms for batching when writing to Kakfa.</td></tr>
 </tbody>
 </table>
 <div class="section">
@@ -1043,7 +1049,8 @@ hbase(main):001:0&gt; count 'profiler'
 
 <div>
 <div>
-<pre class="source">$ bin/stellar -z node1:2181
+<pre class="source">$ source /etc/default/metron
+$ bin/stellar -z $ZOOKEEPER
 
 [Stellar]&gt;&gt;&gt; stats := PROFILE_GET( &quot;example4&quot;, &quot;10.0.0.1&quot;, PROFILE_FIXED(30, &quot;MINUTES&quot;))
 [Stellar]&gt;&gt;&gt; stats
@@ -1071,7 +1078,15 @@ hbase(main):001:0&gt; count 'profiler'
 </pre></div></div>
 
 <p>More information on accessing profile data can be found in the <a href="../metron-profiler-client/index.html">Profiler Client</a>.</p>
-<p>More information on using the <a href="../../metron-platform/metron-common/index.html"><tt>STATS_*</tt> functions in Stellar can be found here</a>.</p></div></div>
+<p>More information on using the <a href="../../metron-platform/metron-common/index.html"><tt>STATS_*</tt> functions in Stellar can be found here</a>.</p></div>
+<div class="section">
+<h3><a name="profiler.writer.batchSize"></a><tt>profiler.writer.batchSize</tt></h3>
+<p><i>Default</i>: 15</p>
+<p>The number of records to batch when writing to Kakfa. This is managed in the global configuration and does not require a topology restart.</p></div>
+<div class="section">
+<h3><a name="profiler.writer.batchTimeout"></a><tt>profiler.writer.batchTimeout</tt></h3>
+<p><i>Default</i>: 0</p>
+<p>The timeout after which a batch will be flushed even if batchSize has not been met.  Optional. If unspecified, or set to <tt>0</tt>, it defaults to a system-determined duration which is a fraction of the Storm parameter <tt>topology.message.timeout.secs</tt>. Ignored if batchSize is <tt>1</tt>, since this disables batching. This is managed in the global configuration and does not require a topology restart.</p></div></div>
 <div class="section">
 <h2><a name="Implementation"></a>Implementation</h2></div>
 <div class="section">

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-analytics/metron-statistics/HLLP.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-analytics/metron-statistics/HLLP.html b/site/current-book/metron-analytics/metron-statistics/HLLP.html
index fdbf631..09d967c 100644
--- a/site/current-book/metron-analytics/metron-statistics/HLLP.html
+++ b/site/current-book/metron-analytics/metron-statistics/HLLP.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-analytics/metron-statistics/HLLP.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-analytics/metron-statistics/HLLP.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; HyperLogLogPlus</title>
     <link rel="stylesheet" href="../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">HyperLogLogPlus</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-analytics/metron-statistics/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-analytics/metron-statistics/index.html b/site/current-book/metron-analytics/metron-statistics/index.html
index 0c3515d..661d068 100644
--- a/site/current-book/metron-analytics/metron-statistics/index.html
+++ b/site/current-book/metron-analytics/metron-statistics/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-analytics/metron-statistics/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-analytics/metron-statistics/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Statistics and Mathematical Functions</title>
     <link rel="stylesheet" href="../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Statistics and Mathematical Functions</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-contrib/metron-docker/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-contrib/metron-docker/index.html b/site/current-book/metron-contrib/metron-docker/index.html
index 5769043..b5661fc 100644
--- a/site/current-book/metron-contrib/metron-docker/index.html
+++ b/site/current-book/metron-contrib/metron-docker/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-contrib/metron-docker/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-contrib/metron-docker/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Metron Docker</title>
     <link rel="stylesheet" href="../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Metron Docker</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-contrib/metron-performance/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-contrib/metron-performance/index.html b/site/current-book/metron-contrib/metron-performance/index.html
index f618b06..f4495cc 100644
--- a/site/current-book/metron-contrib/metron-performance/index.html
+++ b/site/current-book/metron-contrib/metron-performance/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-contrib/metron-performance/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-contrib/metron-performance/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Performance Utilities</title>
     <link rel="stylesheet" href="../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Performance Utilities</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-deployment/Kerberos-ambari-setup.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-deployment/Kerberos-ambari-setup.html b/site/current-book/metron-deployment/Kerberos-ambari-setup.html
index ed1e96b..8b3cdfe 100644
--- a/site/current-book/metron-deployment/Kerberos-ambari-setup.html
+++ b/site/current-book/metron-deployment/Kerberos-ambari-setup.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/Kerberos-ambari-setup.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/Kerberos-ambari-setup.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Setting Up Kerberos in Vagrant Full Dev</title>
     <link rel="stylesheet" href="../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Setting Up Kerberos in Vagrant Full Dev</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-deployment/Kerberos-manual-setup.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-deployment/Kerberos-manual-setup.html b/site/current-book/metron-deployment/Kerberos-manual-setup.html
index 229b90a..ffa43f2 100644
--- a/site/current-book/metron-deployment/Kerberos-manual-setup.html
+++ b/site/current-book/metron-deployment/Kerberos-manual-setup.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/Kerberos-manual-setup.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/Kerberos-manual-setup.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Kerberos Setup</title>
     <link rel="stylesheet" href="../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Kerberos Setup</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -759,20 +759,31 @@ done
 </ul></div></div>
 <div class="section">
 <h2><a name="X-Pack"></a>X-Pack</h2>
-<p>First, stop the random_access_indexing topology through the Storm UI or from the CLI, e.g.</p>
+<ol style="list-style-type: decimal">
+
+<li>
+
+<p>Stop the random_access_indexing topology through the Storm UI or from the CLI, e.g.</p>
 
 <div>
 <div>
 <pre class="source">storm kill random_access_indexing
 </pre></div></div>
+</li>
+<li>
+
+<p><a class="externalLink" href="https://www.elastic.co/guide/en/x-pack/5.6/installing-xpack.html">Follow these instructions</a> to enable the X-Pack with Elasticsearch and Kibana.  The X-Pack plugin will need installed on each of the nodes running Elasticsearch.</p>
+</li>
+<li>
 
-<p>Here are instructions for enabling X-Pack with Elasticsearch and Kibana: <a class="externalLink" href="https://www.elastic.co/guide/en/x-pack/5.6/installing-xpack.html">https://www.elastic.co/guide/en/x-pack/5.6/installing-xpack.html</a></p>
 <p>You need to be sure to add the appropriate username and password for Elasticsearch and Kibana to enable external connections from Metron components. e.g. the following will create a user &#x201c;transport_client_user&#x201d; with password &#x201c;changeme&#x201d; and &#x201c;superuser&#x201d; credentials.</p>
 
 <div>
 <div>
 <pre class="source">sudo /usr/share/elasticsearch/bin/x-pack/users useradd transport_client_user -p changeme -r superuser
 </pre></div></div>
+</li>
+<li>
 
 <p>Once you&#x2019;ve picked a password to connect to ES, you need to upload a 1-line file to HDFS with that password in it. Metron will use this file to securely read the password in order to connect to ES securely.</p>
 <p>Here is an example using &#x201c;changeme&#x201d; as the password</p>
@@ -784,13 +795,15 @@ sudo -u hdfs hdfs dfs -mkdir /apps/metron/elasticsearch/
 sudo -u hdfs hdfs dfs -put /tmp/xpack-password /apps/metron/elasticsearch/
 sudo -u hdfs hdfs dfs -chown metron:metron /apps/metron/elasticsearch/xpack-password
 </pre></div></div>
+</li>
+<li>
 
 <p>New settings have been added to configure the Elasticsearch client. By default the client will run as the normal ES prebuilt transport client. If you enable X-Pack you should set the es.client.class as shown below.</p>
-<p>Add the es settings to global.json</p>
+<p>Add the <tt>es.client.settings</tt> to global.json</p>
 
 <div>
 <div>
-<pre class="source">/usr/metron/0.5.0/config/zookeeper/global.json -&gt;
+<pre class="source">/usr/metron/0.6.0/config/zookeeper/global.json -&gt;
 
   &quot;es.client.settings&quot; : {
       &quot;es.client.class&quot; : &quot;org.elasticsearch.xpack.client.PreBuiltXPackTransportClient&quot;,
@@ -803,8 +816,10 @@ sudo -u hdfs hdfs dfs -chown metron:metron /apps/metron/elasticsearch/xpack-pass
 
 <div>
 <div>
-<pre class="source">$METRON_HOME/bin/zk_load_configs.sh -m PUSH -i METRON_HOME/config/zookeeper/ -z $ZOOKEEPER
+<pre class="source">$METRON_HOME/bin/zk_load_configs.sh -m PUSH -i $METRON_HOME/config/zookeeper/ -z $ZOOKEEPER
 </pre></div></div>
+</li>
+<li>
 
 <p>The last step before restarting the topology is to create a custom X-Pack shaded and relocated jar. This is up to you because of licensing restrictions, but here is a sample Maven pom file that should help.</p>
 
@@ -852,10 +867,6 @@ sudo -u hdfs hdfs dfs -chown metron:metron /apps/metron/elasticsearch/xpack-pass
             &lt;exclusions&gt;
               &lt;exclusion&gt;
                 &lt;groupId&gt;com.fasterxml.jackson.dataformat&lt;/groupId&gt;
-                &lt;artifactId&gt;jackson-dataformat-smile&lt;/artifactId&gt;
-              &lt;/exclusion&gt;
-              &lt;exclusion&gt;
-                &lt;groupId&gt;com.fasterxml.jackson.dataformat&lt;/groupId&gt;
                 &lt;artifactId&gt;jackson-dataformat-yaml&lt;/artifactId&gt;
               &lt;/exclusion&gt;
               &lt;exclusion&gt;
@@ -952,13 +963,17 @@ sudo -u hdfs hdfs dfs -chown metron:metron /apps/metron/elasticsearch/xpack-pass
     &lt;/build&gt;
 &lt;/project&gt;
 </pre></div></div>
+</li>
+<li>
 
-<p>Once you&#x2019;ve built the elasticsearch-xpack-shaded-5.6.2.jar, it needs to be made available to Storm when you submit the topology. Create a contrib directory for indexing and put the jar file in this directory.</p>
+<p>Once you&#x2019;ve built the <tt>elasticsearch-xpack-shaded-5.6.2.jar</tt>, it needs to be made available to Storm when you submit the topology. Create a contrib directory for indexing and put the jar file in this directory.</p>
 
 <div>
 <div>
-<pre class="source">/usr/metron/0.5.0/indexing_contrib/elasticsearch-xpack-shaded-5.6.2.jar
+<pre class="source">/usr/metron/0.6.0/indexing_contrib/elasticsearch-xpack-shaded-5.6.2.jar
 </pre></div></div>
+</li>
+<li>
 
 <p>Now you can restart the Elasticsearch topology. Note, you should perform this step manually, as follows.</p>
 
@@ -966,8 +981,58 @@ sudo -u hdfs hdfs dfs -chown metron:metron /apps/metron/elasticsearch/xpack-pass
 <div>
 <pre class="source">$METRON_HOME/bin/start_elasticsearch_topology.sh
 </pre></div></div>
+</li>
+<li>
 
-<p>Once you&#x2019;ve performed these steps, you shoud be able to start seeing data in your ES indexes.</p></div>
+<p>Restart the metron-rest service, and make sure the elasticsearch-xpack-shaded-5.6.2.jar is in the METRON_REST_CLASSPATH when the metron-rest starts.</p>
+</li>
+</ol>
+<p>Once you&#x2019;ve performed these steps, you should be able to start seeing data in your ES indexes.</p>
+<div class="section">
+<h3><a name="X-Pack_Common_Problems"></a>X-Pack Common Problems</h3>
+<div class="section">
+<h4><a name="java.io.FileNotFoundException:_File_.2Fapps.2Fmetron.2Felasticsearch.2Fxpack-password_does_not_exist"></a>java.io.FileNotFoundException: File /apps/metron/elasticsearch/xpack-password does not exist</h4></div>
+<div class="section">
+<h4><a name="Problem"></a>Problem</h4>
+<p>The random access indexer topology fails with the following exception.  This exception might occur on only some of the Storm worker nodes.</p>
+
+<div>
+<div>
+<pre class="source">  2018-07-02 10:24:08.267 o.a.s.util Thread-8-indexingBolt-executor[3 3] [ERROR] Async loop died!
+  java.lang.RuntimeException: java.lang.IllegalArgumentException: Unable to read XPack password file from HDFS location '/apps/metron/elasticsearch/xpack-password'
+  	at org.apache.metron.writer.bolt.BulkMessageWriterBolt.prepare(BulkMessageWriterBolt.java:201) ~[stormjar.jar:?]
+  	at org.apache.storm.daemon.executor$fn__10195$fn__10208.invoke(executor.clj:800) ~[storm-core-1.1.0.2.6.5.0-292.jar:1.1.0.2.6.5.0-292]
+  	at org.apache.storm.util$async_loop$fn__1221.invoke(util.clj:482) [storm-core-1.1.0.2.6.5.0-292.jar:1.1.0.2.6.5.0-292]
+  	at clojure.lang.AFn.run(AFn.java:22) [clojure-1.7.0.jar:?]
+  	at java.lang.Thread.run(Thread.java:748) [?:1.8.0_162]
+  Caused by: java.lang.IllegalArgumentException: Unable to read XPack password file from HDFS location '/apps/metron/elasticsearch/xpack-password'
+  	at org.apache.metron.elasticsearch.utils.ElasticsearchUtils.getPasswordFromFile(ElasticsearchUtils.java:201) ~[stormjar.jar:?]
+  	at org.apache.metron.elasticsearch.utils.ElasticsearchUtils.setXPackSecurityOrNone(ElasticsearchUtils.java:187) ~[stormjar.jar:?]
+  	at org.apache.metron.elasticsearch.utils.ElasticsearchUtils.getClient(ElasticsearchUtils.java:147) ~[stormjar.jar:?]
+  	at org.apache.metron.elasticsearch.writer.ElasticsearchWriter.init(ElasticsearchWriter.java:53) ~[stormjar.jar:?]
+  	at org.apache.metron.writer.bolt.BulkMessageWriterBolt.prepare(BulkMessageWriterBolt.java:199) ~[stormjar.jar:?]
+  	... 4 more
+  Caused by: java.io.FileNotFoundException: File /apps/metron/elasticsearch/xpack-password does not exist
+  	at org.apache.hadoop.fs.RawLocalFileSystem.deprecatedGetFileStatus(RawLocalFileSystem.java:606) ~[stormjar.jar:?]
+  	at org.apache.hadoop.fs.RawLocalFileSystem.getFileLinkStatusInternal(RawLocalFileSystem.java:819) ~[stormjar.jar:?]
+  	at org.apache.hadoop.fs.RawLocalFileSystem.getFileStatus(RawLocalFileSystem.java:596) ~[stormjar.jar:?]
+  	at org.apache.hadoop.fs.FilterFileSystem.getFileStatus(FilterFileSystem.java:421) ~[stormjar.jar:?]
+  	at org.apache.hadoop.fs.ChecksumFileSystem$ChecksumFSInputChecker.&lt;init&gt;(ChecksumFileSystem.java:140) ~[stormjar.jar:?]
+  	at org.apache.hadoop.fs.ChecksumFileSystem.open(ChecksumFileSystem.java:341) ~[stormjar.jar:?]
+  	at org.apache.hadoop.fs.FileSystem.open(FileSystem.java:767) ~[stormjar.jar:?]
+  	at org.apache.metron.common.utils.HDFSUtils.readFile(HDFSUtils.java:55) ~[stormjar.jar:?]
+  	at org.apache.metron.common.utils.HDFSUtils.readFile(HDFSUtils.java:40) ~[stormjar.jar:?]
+  	at org.apache.metron.elasticsearch.utils.ElasticsearchUtils.getPasswordFromFile(ElasticsearchUtils.java:198) ~[stormjar.jar:?]
+  	at org.apache.metron.elasticsearch.utils.ElasticsearchUtils.setXPackSecurityOrNone(ElasticsearchUtils.java:187) ~[stormjar.jar:?]
+  	at org.apache.metron.elasticsearch.utils.ElasticsearchUtils.getClient(ElasticsearchUtils.java:147) ~[stormjar.jar:?]
+  	at org.apache.metron.elasticsearch.writer.ElasticsearchWriter.init(ElasticsearchWriter.java:53) ~[stormjar.jar:?]
+  	at org.apache.metron.writer.bolt.BulkMessageWriterBolt.prepare(BulkMessageWriterBolt.java:199) ~[stormjar.jar:?]
+  	... 4 more
+</pre></div></div>
+</div>
+<div class="section">
+<h4><a name="Solution"></a>Solution</h4>
+<p>This can occur when an HDFS Client is not installed on the Storm worker nodes.  This might occur on any Storm worker node where an HDFS Client is not installed.  Installing the HDFS Client on all Storm worker nodes should resolve the problem.</p></div></div></div>
         </div>
       </div>
     </div>

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-deployment/amazon-ec2/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-deployment/amazon-ec2/index.html b/site/current-book/metron-deployment/amazon-ec2/index.html
index 8bf69a8..902637a 100644
--- a/site/current-book/metron-deployment/amazon-ec2/index.html
+++ b/site/current-book/metron-deployment/amazon-ec2/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/amazon-ec2/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/amazon-ec2/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Apache Metron on Amazon EC2</title>
     <link rel="stylesheet" href="../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Apache Metron on Amazon EC2</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-deployment/ansible/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-deployment/ansible/index.html b/site/current-book/metron-deployment/ansible/index.html
index 383898a..9a8ed32 100644
--- a/site/current-book/metron-deployment/ansible/index.html
+++ b/site/current-book/metron-deployment/ansible/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/ansible/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/ansible/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Ansible Assets</title>
     <link rel="stylesheet" href="../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Ansible Assets</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-deployment/ansible/roles/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-deployment/ansible/roles/index.html b/site/current-book/metron-deployment/ansible/roles/index.html
index 62cc911..c52c997 100644
--- a/site/current-book/metron-deployment/ansible/roles/index.html
+++ b/site/current-book/metron-deployment/ansible/roles/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/ansible/roles/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/ansible/roles/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Ansible Roles</title>
     <link rel="stylesheet" href="../../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Ansible Roles</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-deployment/ansible/roles/opentaxii/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-deployment/ansible/roles/opentaxii/index.html b/site/current-book/metron-deployment/ansible/roles/opentaxii/index.html
index c3c8fdd..be7baaa 100644
--- a/site/current-book/metron-deployment/ansible/roles/opentaxii/index.html
+++ b/site/current-book/metron-deployment/ansible/roles/opentaxii/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/ansible/roles/opentaxii/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/ansible/roles/opentaxii/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; OpenTAXII</title>
     <link rel="stylesheet" href="../../../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">OpenTAXII</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-deployment/ansible/roles/pcap_replay/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-deployment/ansible/roles/pcap_replay/index.html b/site/current-book/metron-deployment/ansible/roles/pcap_replay/index.html
index d97a97d..8be9cf6 100644
--- a/site/current-book/metron-deployment/ansible/roles/pcap_replay/index.html
+++ b/site/current-book/metron-deployment/ansible/roles/pcap_replay/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/ansible/roles/pcap_replay/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/ansible/roles/pcap_replay/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Pcap Replay</title>
     <link rel="stylesheet" href="../../../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Pcap Replay</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-deployment/ansible/roles/sensor-stubs/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-deployment/ansible/roles/sensor-stubs/index.html b/site/current-book/metron-deployment/ansible/roles/sensor-stubs/index.html
index 650fc89..7e252f2 100644
--- a/site/current-book/metron-deployment/ansible/roles/sensor-stubs/index.html
+++ b/site/current-book/metron-deployment/ansible/roles/sensor-stubs/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/ansible/roles/sensor-stubs/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/ansible/roles/sensor-stubs/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Sensor Stubs</title>
     <link rel="stylesheet" href="../../../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Sensor Stubs</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-deployment/ansible/roles/sensor-test-mode/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-deployment/ansible/roles/sensor-test-mode/index.html b/site/current-book/metron-deployment/ansible/roles/sensor-test-mode/index.html
index b989235..e950fe9 100644
--- a/site/current-book/metron-deployment/ansible/roles/sensor-test-mode/index.html
+++ b/site/current-book/metron-deployment/ansible/roles/sensor-test-mode/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/ansible/roles/sensor-test-mode/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/ansible/roles/sensor-test-mode/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Sensor Test Mode</title>
     <link rel="stylesheet" href="../../../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Sensor Test Mode</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-deployment/development/centos6/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-deployment/development/centos6/index.html b/site/current-book/metron-deployment/development/centos6/index.html
index b036e37..51acc09 100644
--- a/site/current-book/metron-deployment/development/centos6/index.html
+++ b/site/current-book/metron-deployment/development/centos6/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/development/centos6/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/development/centos6/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Metron on CentOS 6</title>
     <link rel="stylesheet" href="../../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Metron on CentOS 6</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -190,8 +190,8 @@ vagrant up
 <p>Navigate to the following resources to explore your newly minted Apache Metron environment.</p>
 <ul>
 
-<li><a class="externalLink" href="http://node1:4201">Metron Alerts</a></li>
-<li><a class="externalLink" href="http://node1:8080">Ambari</a></li>
+<li><a class="externalLink" href="http://node1:4201">Metron Alerts</a> credentials: user/password</li>
+<li><a class="externalLink" href="http://node1:8080">Ambari</a> credentials: admin/admin</li>
 </ul>
 <p>Connecting to the host through SSH is as simple as running the following command.</p>
 

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-deployment/development/fastcapa/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-deployment/development/fastcapa/index.html b/site/current-book/metron-deployment/development/fastcapa/index.html
index d471576..43f5c90 100644
--- a/site/current-book/metron-deployment/development/fastcapa/index.html
+++ b/site/current-book/metron-deployment/development/fastcapa/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/development/fastcapa/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-deployment/development/fastcapa/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Fastcapa Test Environment</title>
     <link rel="stylesheet" href="../../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Fastcapa Test Environment</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">


[2/5] metron git commit: METRON-1776 Update public web site to point at 0.6.0 new release (justinleet) closes apache/metron#1195

Posted by le...@apache.org.
http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-platform/metron-pcap-backend/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-platform/metron-pcap-backend/index.html b/site/current-book/metron-platform/metron-pcap-backend/index.html
index 5206fd0..e1c3000 100644
--- a/site/current-book/metron-platform/metron-pcap-backend/index.html
+++ b/site/current-book/metron-platform/metron-pcap-backend/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-platform/metron-pcap-backend/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-platform/metron-pcap-backend/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Metron PCAP Backend</title>
     <link rel="stylesheet" href="../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Metron PCAP Backend</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -55,15 +55,16 @@
     <li><a href="../../metron-platform/index.html" title="Platform"><span class="icon-chevron-down"></span>Platform</a>
     <ul class="nav nav-list">
     <li><a href="../../metron-platform/Performance-tuning-guide.html" title="Performance-tuning-guide"><span class="none"></span>Performance-tuning-guide</a></li>
-    <li><a href="../../metron-platform/metron-api/index.html" title="Api"><span class="none"></span>Api</a></li>
     <li><a href="../../metron-platform/metron-common/index.html" title="Common"><span class="none"></span>Common</a></li>
     <li><a href="../../metron-platform/metron-data-management/index.html" title="Data-management"><span class="none"></span>Data-management</a></li>
     <li><a href="../../metron-platform/metron-elasticsearch/index.html" title="Elasticsearch"><span class="none"></span>Elasticsearch</a></li>
     <li><a href="../../metron-platform/metron-enrichment/index.html" title="Enrichment"><span class="icon-chevron-right"></span>Enrichment</a></li>
     <li><a href="../../metron-platform/metron-indexing/index.html" title="Indexing"><span class="none"></span>Indexing</a></li>
+    <li><a href="../../metron-platform/metron-job/index.html" title="Job"><span class="none"></span>Job</a></li>
     <li><a href="../../metron-platform/metron-management/index.html" title="Management"><span class="none"></span>Management</a></li>
     <li><a href="../../metron-platform/metron-parsers/index.html" title="Parsers"><span class="icon-chevron-right"></span>Parsers</a></li>
     <li class="active"><a href="#"><span class="none"></span>Pcap-backend</a></li>
+    <li><a href="../../metron-platform/metron-solr/index.html" title="Solr"><span class="none"></span>Solr</a></li>
     <li><a href="../../metron-platform/metron-writer/index.html" title="Writer"><span class="none"></span>Writer</a></li>
     </ul>
 </li>
@@ -227,12 +228,14 @@ limitations under the License.
  -nr,--num_reducers &lt;arg&gt;        The number of reducers to use.  Default
                                  is 10.
  -h,--help                       Display help
+ -ps,--print_status              Print the status of the job as it runs
  -ir,--include_reverse           Indicates if filter should check swapped
                                  src/dest addresses and IPs
  -p,--protocol &lt;arg&gt;             IP Protocol
  -sa,--ip_src_addr &lt;arg&gt;         Source IP address
  -sp,--ip_src_port &lt;arg&gt;         Source port
  -st,--start_time &lt;arg&gt;          (required) Packet start time range.
+ -yq,--yarn_queue &lt;arg&gt;          Yarn queue this job will be submitted to
 </pre></div></div>
 
 <div>
@@ -250,8 +253,10 @@ limitations under the License.
  -nr,--num_reducers &lt;arg&gt;        The number of reducers to use.  Default
                                  is 10.
  -h,--help                       Display help
+ -ps,--print_status              Print the status of the job as it runs
  -q,--query &lt;arg&gt;                Query string to use as a filter
  -st,--start_time &lt;arg&gt;          (required) Packet start time range.
+ -yq,--yarn_queue &lt;arg&gt;          Yarn queue this job will be submitted to
 </pre></div></div>
 
 <p>The Query filter&#x2019;s <tt>--query</tt> argument specifies the Stellar expression to execute on each packet.  To interact with the packet, a few variables are exposed:</p>

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-platform/metron-solr/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-platform/metron-solr/index.html b/site/current-book/metron-platform/metron-solr/index.html
new file mode 100644
index 0000000..1afb245
--- /dev/null
+++ b/site/current-book/metron-platform/metron-solr/index.html
@@ -0,0 +1,300 @@
+<!DOCTYPE html>
+<!--
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-platform/metron-solr/index.md at 2018-09-12
+ | Rendered using Apache Maven Fluido Skin 1.7
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
+    <meta http-equiv="Content-Language" content="en" />
+    <title>Metron &#x2013; Solr in Metron</title>
+    <link rel="stylesheet" href="../../css/apache-maven-fluido-1.7.min.css" />
+    <link rel="stylesheet" href="../../css/site.css" />
+    <link rel="stylesheet" href="../../css/print.css" media="print" />
+    <script type="text/javascript" src="../../js/apache-maven-fluido-1.7.min.js"></script>
+<script type="text/javascript">
+              $( document ).ready( function() { $( '.carousel' ).carousel( { interval: 3500 } ) } );
+            </script>
+  </head>
+  <body class="topBarDisabled">
+    <div class="container-fluid">
+      <div id="banner">
+        <div class="pull-left"><a href="http://metron.apache.org/" id="bannerLeft"><img src="../../images/metron-logo.png"  alt="Apache Metron" width="148px" height="48px"/></a></div>
+        <div class="pull-right"></div>
+        <div class="clear"><hr/></div>
+      </div>
+
+      <div id="breadcrumbs">
+        <ul class="breadcrumb">
+      <li class=""><a href="http://www.apache.org" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>
+      <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
+      <li class=""><a href="../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
+    <li class="active ">Solr in Metron</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
+        </ul>
+      </div>
+      <div class="row-fluid">
+        <div id="leftColumn" class="span2">
+          <div class="well sidebar-nav">
+    <ul class="nav nav-list">
+      <li class="nav-header">User Documentation</li>
+    <li><a href="../../index.html" title="Metron"><span class="icon-chevron-down"></span>Metron</a>
+    <ul class="nav nav-list">
+    <li><a href="../../CONTRIBUTING.html" title="CONTRIBUTING"><span class="none"></span>CONTRIBUTING</a></li>
+    <li><a href="../../Upgrading.html" title="Upgrading"><span class="none"></span>Upgrading</a></li>
+    <li><a href="../../metron-analytics/index.html" title="Analytics"><span class="icon-chevron-right"></span>Analytics</a></li>
+    <li><a href="../../metron-contrib/metron-docker/index.html" title="Docker"><span class="none"></span>Docker</a></li>
+    <li><a href="../../metron-contrib/metron-performance/index.html" title="Performance"><span class="none"></span>Performance</a></li>
+    <li><a href="../../metron-deployment/index.html" title="Deployment"><span class="icon-chevron-right"></span>Deployment</a></li>
+    <li><a href="../../metron-interface/metron-alerts/index.html" title="Alerts"><span class="none"></span>Alerts</a></li>
+    <li><a href="../../metron-interface/metron-config/index.html" title="Config"><span class="none"></span>Config</a></li>
+    <li><a href="../../metron-interface/metron-rest/index.html" title="Rest"><span class="none"></span>Rest</a></li>
+    <li><a href="../../metron-platform/index.html" title="Platform"><span class="icon-chevron-down"></span>Platform</a>
+    <ul class="nav nav-list">
+    <li><a href="../../metron-platform/Performance-tuning-guide.html" title="Performance-tuning-guide"><span class="none"></span>Performance-tuning-guide</a></li>
+    <li><a href="../../metron-platform/metron-common/index.html" title="Common"><span class="none"></span>Common</a></li>
+    <li><a href="../../metron-platform/metron-data-management/index.html" title="Data-management"><span class="none"></span>Data-management</a></li>
+    <li><a href="../../metron-platform/metron-elasticsearch/index.html" title="Elasticsearch"><span class="none"></span>Elasticsearch</a></li>
+    <li><a href="../../metron-platform/metron-enrichment/index.html" title="Enrichment"><span class="icon-chevron-right"></span>Enrichment</a></li>
+    <li><a href="../../metron-platform/metron-indexing/index.html" title="Indexing"><span class="none"></span>Indexing</a></li>
+    <li><a href="../../metron-platform/metron-job/index.html" title="Job"><span class="none"></span>Job</a></li>
+    <li><a href="../../metron-platform/metron-management/index.html" title="Management"><span class="none"></span>Management</a></li>
+    <li><a href="../../metron-platform/metron-parsers/index.html" title="Parsers"><span class="icon-chevron-right"></span>Parsers</a></li>
+    <li><a href="../../metron-platform/metron-pcap-backend/index.html" title="Pcap-backend"><span class="none"></span>Pcap-backend</a></li>
+    <li class="active"><a href="#"><span class="none"></span>Solr</a></li>
+    <li><a href="../../metron-platform/metron-writer/index.html" title="Writer"><span class="none"></span>Writer</a></li>
+    </ul>
+</li>
+    <li><a href="../../metron-sensors/index.html" title="Sensors"><span class="icon-chevron-right"></span>Sensors</a></li>
+    <li><a href="../../metron-stellar/stellar-3rd-party-example/index.html" title="Stellar-3rd-party-example"><span class="none"></span>Stellar-3rd-party-example</a></li>
+    <li><a href="../../metron-stellar/stellar-common/index.html" title="Stellar-common"><span class="icon-chevron-right"></span>Stellar-common</a></li>
+    <li><a href="../../metron-stellar/stellar-zeppelin/index.html" title="Stellar-zeppelin"><span class="none"></span>Stellar-zeppelin</a></li>
+    <li><a href="../../use-cases/index.html" title="Use-cases"><span class="icon-chevron-right"></span>Use-cases</a></li>
+    </ul>
+</li>
+</ul>
+          <hr />
+          <div id="poweredBy">
+            <div class="clear"></div>
+            <div class="clear"></div>
+            <div class="clear"></div>
+            <div class="clear"></div>
+<a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="../../images/logos/maven-feather.png" /></a>
+            </div>
+          </div>
+        </div>
+        <div id="bodyColumn"  class="span10" >
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<h1>Solr in Metron</h1>
+<p><a name="Solr_in_Metron"></a></p>
+<div class="section">
+<h2><a name="Table_of_Contents"></a>Table of Contents</h2>
+<ul>
+
+<li><a href="#Introduction">Introduction</a></li>
+<li><a href="#Configuration">Configuration</a></li>
+<li><a href="#Installing">Installing</a></li>
+<li><a href="#Schemas">Schemas</a></li>
+<li><a href="#Collections">Collections</a></li>
+</ul></div>
+<div class="section">
+<h2><a name="Introduction"></a>Introduction</h2>
+<p>Metron ships with Solr 6.6.2 support. Solr Cloud can be used as the real-time portion of the datastore resulting from <a href="../metron-indexing/index.html">metron-indexing</a>.</p></div>
+<div class="section">
+<h2><a name="Configuration"></a>Configuration</h2>
+<div class="section">
+<h3><a name="The_Indexing_Topology"></a>The Indexing Topology</h3>
+<p>Solr is a viable option for the <tt>random access topology</tt> and, similar to the Elasticsearch Writer, can be configured via the global config.  The following settings are possible as part of the global config:</p>
+<ul>
+
+<li><tt>solr.zookeeper</tt>
+<ul>
+
+<li>The zookeeper quorum associated with the SolrCloud instance.  This is a required field with no default.</li>
+</ul>
+</li>
+<li><tt>solr.commitPerBatch</tt>
+<ul>
+
+<li>This is a boolean which defines whether the writer commits every batch.  The default is <tt>true</tt>.</li>
+<li><i>WARNING</i>: If you set this to <tt>false</tt>, then commits will happen based on the SolrClient&#x2019;s internal mechanism and worker failure <i>may</i> result data being acknowledged in storm but not written in Solr.</li>
+</ul>
+</li>
+<li><tt>solr.commit.soft</tt>
+<ul>
+
+<li>This is a boolean which defines whether the writer makes a soft commit or a durable commit.  See <a class="externalLink" href="https://lucene.apache.org/solr/guide/6_6/near-real-time-searching.html#NearRealTimeSearching-AutoCommits">here</a>  The default is <tt>false</tt>.</li>
+<li><i>WARNING</i>: If you set this to <tt>true</tt>, then commits will happen based on the SolrClient&#x2019;s internal mechanism and worker failure <i>may</i> result data being acknowledged in storm but not written in Solr.</li>
+</ul>
+</li>
+<li><tt>solr.commit.waitSearcher</tt>
+<ul>
+
+<li>This is a boolean which defines whether the writer blocks the commit until the data is available to search.  See <a class="externalLink" href="https://lucene.apache.org/solr/guide/6_6/near-real-time-searching.html#NearRealTimeSearching-AutoCommits">here</a>  The default is <tt>true</tt>.</li>
+<li><i>WARNING</i>: If you set this to <tt>false</tt>, then commits will happen based on the SolrClient&#x2019;s internal mechanism and worker failure <i>may</i> result data being acknowledged in storm but not written in Solr.</li>
+</ul>
+</li>
+<li><tt>solr.commit.waitFlush</tt>
+<ul>
+
+<li>This is a boolean which defines whether the writer blocks the commit until the data is flushed.  See <a class="externalLink" href="https://lucene.apache.org/solr/guide/6_6/near-real-time-searching.html#NearRealTimeSearching-AutoCommits">here</a>  The default is <tt>true</tt>.</li>
+<li><i>WARNING</i>: If you set this to <tt>false</tt>, then commits will happen based on the SolrClient&#x2019;s internal mechanism and worker failure <i>may</i> result data being acknowledged in storm but not written in Solr.</li>
+</ul>
+</li>
+<li><tt>solr.collection</tt>
+<ul>
+
+<li>The default solr collection (if unspecified, the name is <tt>metron</tt>).  By default, sensors will write to a collection associated with the index name in the indexing config for that sensor.  If that index name is the empty string, then the default collection will be used.</li>
+</ul>
+</li>
+<li><tt>solr.http.config</tt>
+<ul>
+
+<li>This is a map which allows users to configure the Solr client&#x2019;s HTTP client.</li>
+<li>Possible fields here are:
+<ul>
+
+<li><tt>socketTimeout</tt> : Socket timeout measured in ms, closes a socket if read takes longer than x ms to complete throws <tt>java.net.SocketTimeoutException: Read timed out exception</tt></li>
+<li><tt>connTimeout</tt> : Connection timeout measures in ms, closes a socket if connection cannot be established within x ms with a <tt>java.net.SocketTimeoutException: Connection timed out</tt></li>
+<li><tt>maxConectionsPerHost</tt> : Maximum connections allowed per host</li>
+<li><tt>maxConnections</tt> :  Maximum total connections allowed</li>
+<li><tt>retry</tt> : Retry http requests on error</li>
+<li><tt>allowCompression</tt> :  Allow compression (deflate,gzip) if server supports it</li>
+<li><tt>followRedirects</tt> : Follow redirects</li>
+<li><tt>httpBasicAuthUser</tt> : Basic auth username</li>
+<li><tt>httpBasicAuthPassword</tt> : Basic auth password</li>
+<li><tt>solr.ssl.checkPeerName</tt> : Check peer name</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul></div></div>
+<div class="section">
+<h2><a name="Installing"></a>Installing</h2>
+<p>Solr is installed in the <a href="../../metron-deployment/development/centos6/index.html">full dev environment for CentOS</a> by default but is not started initially.  Navigate to <tt>$METRON_HOME/bin</tt> and start Solr Cloud by running <tt>start_solr.sh</tt>.</p>
+<p>Metron&#x2019;s Ambari MPack installs several scripts in <tt>$METRON_HOME/bin</tt> that can be used to manage Solr.  A script is also provided for installing Solr Cloud outside of full dev. The script performs the following tasks</p>
+<ul>
+
+<li>Stops ES and Kibana</li>
+<li>Downloads Solr</li>
+<li>Installs Solr</li>
+<li>Starts Solr Cloud</li>
+</ul>
+<p><i>Note: for details on setting up Solr Cloud in production mode, see <a class="externalLink" href="https://lucene.apache.org/solr/guide/6_6/taking-solr-to-production.html">https://lucene.apache.org/solr/guide/6_6/taking-solr-to-production.html</a></i></p>
+<p>Navigate to <tt>$METRON_HOME/bin</tt> and spin up Solr Cloud by running <tt>install_solr.sh</tt>.  After running this script, Elasticsearch and Kibana will have been stopped and you should now have an instance of Solr Cloud up and running at <a class="externalLink" href="http://localhost:8983/solr/#/~cloud">http://localhost:8983/solr/#/~cloud</a>.  This manner of starting Solr will also spin up an embedded Zookeeper instance at port 9983. More information can be found <a class="externalLink" href="https://lucene.apache.org/solr/guide/6_6/getting-started-with-solrcloud.html">here</a></p>
+<p>Solr can also be installed using <a class="externalLink" href="https://docs.hortonworks.com/HDPDocuments/HDP2/HDP-2.6.4/bk_solr-search-installation/content/ch_hdp_search_30.html">HDP Search 3</a>.  HDP Search 3 sets the Zookeeper root to <tt>/solr</tt> so this will need to be added to each url in the comma-separated list in Ambari UI -&gt; Services -&gt; Metron -&gt; Configs -&gt; Index Settings -&gt; Solr Zookeeper Urls.  For example, in full dev this would be <tt>node1:2181/solr</tt>.</p></div>
+<div class="section">
+<h2><a name="Enabling_Solr"></a>Enabling Solr</h2>
+<p>Elasticsearch is the real-time store used by default in Metron.  Solr can be enabled following these steps:</p>
+<ol style="list-style-type: decimal">
+
+<li>Stop the Metron Indexing component in Ambari.</li>
+<li>Update Ambari UI -&gt; Services -&gt; Metron -&gt; Configs -&gt; Index Settings -&gt; Solr Zookeeper Urls to match the Solr installation described in the previous section.</li>
+<li>Change Ambari UI -&gt; Services -&gt; Metron -&gt; Configs -&gt; Indexing -&gt; Index Writer - Random Access -&gt; Random Access Search Engine to <tt>Solr</tt>.</li>
+<li>Set the <tt>source.type.field</tt> property to <tt>source.type</tt> in the <a href="../metron-common/index.html#Global_Configuration">Global Configuration</a>.</li>
+<li>Set the <tt>threat.triage.score.field</tt> property to <tt>threat.triage.score</tt> in the <a href="../metron-common/index.html#Global_Configuration">Global Configuration</a>.</li>
+<li>Start the Metron Indexing component in Ambari.</li>
+<li>Restart Metron REST and the Alerts UI in Ambari.</li>
+</ol>
+<p>This will automatically create collections for the schemas shipped with Metron:</p>
+<ul>
+
+<li>bro</li>
+<li>snort</li>
+<li>yaf</li>
+<li>error (used internally by Metron)</li>
+<li>metaalert (used internall by Metron)</li>
+</ul>
+<p>Any other collections must be created manually before starting the Indexing component.  Alerts should be present in the Alerts UI after enabling Solr.</p></div>
+<div class="section">
+<h2><a name="Schemas"></a>Schemas</h2>
+<p>As of now, we have mapped out the Schemas in <tt>src/main/config/schema</tt>. Ambari will eventually install these, but at the moment it&#x2019;s manual and you should refer to the Solr documentation <a href="here/index.html">https://lucene.apache.org/solr/guide/6_6</a> in general and <a class="externalLink" href="https://lucene.apache.org/solr/guide/6_6/documents-fields-and-schema-design.html">here</a> if you&#x2019;d like to know more about schemas in Solr.</p>
+<p>In Metron&#x2019;s Solr DAO implementation, document updates involve reading a document, applying the update and replacing the original by reindexing the whole document.<br />
+Indexing LatLonType and PointType field types stores data in internal fields that should not be returned in search results.  For these fields a dynamic field type matching the suffix needs to be added to store the data points. Solr 6+ comes with a new LatLonPointSpatialField field type that should be used instead of LatLonType if possible.  Otherwise, a LatLongType field should be defined as:</p>
+
+<div>
+<div>
+<pre class="source">&lt;dynamicField name=&quot;*.location_point&quot; type=&quot;location&quot; multiValued=&quot;false&quot; docValues=&quot;false&quot;/&gt;
+&lt;dynamicField name=&quot;*_coordinate&quot; type=&quot;pdouble&quot; indexed=&quot;true&quot; stored=&quot;false&quot; docValues=&quot;false&quot;/&gt;
+&lt;fieldType name=&quot;location&quot; class=&quot;solr.LatLonType&quot; subFieldSuffix=&quot;_coordinate&quot;/&gt;
+</pre></div></div>
+
+<p>A PointType field should be defined as:</p>
+
+<div>
+<div>
+<pre class="source">&lt;dynamicField name=&quot;*.point&quot; type=&quot;point&quot; multiValued=&quot;false&quot; docValues=&quot;false&quot;/&gt;
+&lt;dynamicField name=&quot;*_point&quot; type=&quot;pdouble&quot; indexed=&quot;true&quot; stored=&quot;false&quot; docValues=&quot;false&quot;/&gt;
+&lt;fieldType name=&quot;point&quot; class=&quot;solr.PointType&quot; subFieldSuffix=&quot;_point&quot;/&gt;
+</pre></div></div>
+
+<p>If any copy fields are defined, stored and docValues should be set to false.</p></div>
+<div class="section">
+<h2><a name="Collections"></a>Collections</h2>
+<p>Convenience scripts are provided with Metron to create and delete collections.  Ambari uses these scripts to automatically create collections.  To use them outside of Ambari, a few environment variables must be set first:</p>
+
+<div>
+<div>
+<pre class="source"># Path to the zookeeper node used by Solr
+export ZOOKEEPER=node1:2181/solr
+# Set to true if Kerberos is enabled
+export SECURITY_ENABLED=true 
+</pre></div></div>
+
+<p>The scripts can then be called directly with the collection name as the first argument .  For example, to create the bro collection:</p>
+
+<div>
+<div>
+<pre class="source">$METRON_HOME/bin/create_collection.sh bro
+</pre></div></div>
+
+<p>To delete the bro collection:</p>
+
+<div>
+<div>
+<pre class="source">$METRON_HOME/bin/delete_collection.sh bro
+</pre></div></div>
+
+<p>The <tt>create_collection.sh</tt> script depends on schemas installed in <tt>$METRON_HOME/config/schema</tt>.  There are several schemas that come with Metron:</p>
+<ul>
+
+<li>bro</li>
+<li>snort</li>
+<li>yaf</li>
+<li>metaalert</li>
+<li>error</li>
+</ul>
+<p>Additional schemas should be installed in that location if using the <tt>create_collection.sh</tt> script.  Any collection can be deleted with the <tt>delete_collection.sh</tt> script. These scripts use the <a class="externalLink" href="http://lucene.apache.org/solr/guide/6_6/collections-api.html">Solr Collection API</a>.</p></div>
+        </div>
+      </div>
+    </div>
+    <hr/>
+    <footer>
+      <div class="container-fluid">
+        <div class="row-fluid">
+© 2015-2016 The Apache Software Foundation. Apache Metron, Metron, Apache, the Apache feather logo,
+            and the Apache Metron project logo are trademarks of The Apache Software Foundation.
+        </div>
+      </div>
+    </footer>
+  </body>
+</html>

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-platform/metron-writer/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-platform/metron-writer/index.html b/site/current-book/metron-platform/metron-writer/index.html
index cb1a26f..bee846f 100644
--- a/site/current-book/metron-platform/metron-writer/index.html
+++ b/site/current-book/metron-platform/metron-writer/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-platform/metron-writer/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-platform/metron-writer/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Writer</title>
     <link rel="stylesheet" href="../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Writer</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -55,15 +55,16 @@
     <li><a href="../../metron-platform/index.html" title="Platform"><span class="icon-chevron-down"></span>Platform</a>
     <ul class="nav nav-list">
     <li><a href="../../metron-platform/Performance-tuning-guide.html" title="Performance-tuning-guide"><span class="none"></span>Performance-tuning-guide</a></li>
-    <li><a href="../../metron-platform/metron-api/index.html" title="Api"><span class="none"></span>Api</a></li>
     <li><a href="../../metron-platform/metron-common/index.html" title="Common"><span class="none"></span>Common</a></li>
     <li><a href="../../metron-platform/metron-data-management/index.html" title="Data-management"><span class="none"></span>Data-management</a></li>
     <li><a href="../../metron-platform/metron-elasticsearch/index.html" title="Elasticsearch"><span class="none"></span>Elasticsearch</a></li>
     <li><a href="../../metron-platform/metron-enrichment/index.html" title="Enrichment"><span class="icon-chevron-right"></span>Enrichment</a></li>
     <li><a href="../../metron-platform/metron-indexing/index.html" title="Indexing"><span class="none"></span>Indexing</a></li>
+    <li><a href="../../metron-platform/metron-job/index.html" title="Job"><span class="none"></span>Job</a></li>
     <li><a href="../../metron-platform/metron-management/index.html" title="Management"><span class="none"></span>Management</a></li>
     <li><a href="../../metron-platform/metron-parsers/index.html" title="Parsers"><span class="icon-chevron-right"></span>Parsers</a></li>
     <li><a href="../../metron-platform/metron-pcap-backend/index.html" title="Pcap-backend"><span class="none"></span>Pcap-backend</a></li>
+    <li><a href="../../metron-platform/metron-solr/index.html" title="Solr"><span class="none"></span>Solr</a></li>
     <li class="active"><a href="#"><span class="none"></span>Writer</a></li>
     </ul>
 </li>
@@ -108,6 +109,28 @@ limitations under the License.
 <h2><a name="Introduction"></a>Introduction</h2>
 <p>The writer module provides some utilties for writing to outside components from within Storm.  This includes managing bulk writing.  An implemention is included for writing to HDFS in this module. Other writers can be found in their own modules.</p></div>
 <div class="section">
+<h2><a name="Kafka_Writer"></a>Kafka Writer</h2>
+<p>We have an implementation of a writer which will write batches of messages to Kafka.  An interesting aspect of this writer is that it can be configured to allow users to specify a message field which contains the topic for the message.</p>
+<p>The configuration for this writer is held in the individual Sensor Configurations:</p>
+<ul>
+
+<li><a href="../metron-enrichment/index.html#sensor-enrichment-configuration">Enrichment</a> under the <tt>config</tt> element</li>
+<li><a href="../metron-parsers/index.html#parser-configuration">Parsers</a> in the <tt>parserConfig</tt> element</li>
+<li>Profiler - Unsupported currently</li>
+</ul>
+<p>In each of these, the kafka writer can be configured via a map which has the following elements:</p>
+<ul>
+
+<li><tt>kafka.brokerUrl</tt> : The broker URL</li>
+<li><tt>kafka.keySerializer</tt> : The key serializer (defaults to <tt>StringSerializer</tt>)</li>
+<li><tt>kafka.valueSerializer</tt> : The key serializer (defaults to <tt>StringSerializer</tt>)</li>
+<li><tt>kafka.zkQuorum</tt> : The zookeeper quorum</li>
+<li><tt>kafka.requiredAcks</tt> : Whether to require acks.</li>
+<li><tt>kafka.topic</tt> : The topic to write to</li>
+<li><tt>kafka.topicField</tt> : The field to pull the topic from.  If this is specified, then the producer will use this.  If it is unspecified, then it will default to the <tt>kafka.topic</tt> property.  If neither are specified, then an error will occur.</li>
+<li><tt>kafka.producerConfigs</tt> : A map of kafka producer configs for advanced customization.</li>
+</ul></div>
+<div class="section">
 <h2><a name="HDFS_Writer"></a>HDFS Writer</h2>
 <p>The HDFS writer included here expands on what Storm has in several ways. There&#x2019;s customization in syncing to HDFS, rotation policy, etc. In addition, the writer allows for users to define output paths based on the fields in the provided JSON message.  This can be defined using Stellar.</p>
 <p>To manage the output path, a base path argument is provided by the Flux file, with the FileNameFormat as follows</p>

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-sensors/fastcapa/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-sensors/fastcapa/index.html b/site/current-book/metron-sensors/fastcapa/index.html
index 1b23080..8aef549 100644
--- a/site/current-book/metron-sensors/fastcapa/index.html
+++ b/site/current-book/metron-sensors/fastcapa/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-sensors/fastcapa/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-sensors/fastcapa/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Fastcapa</title>
     <link rel="stylesheet" href="../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Fastcapa</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-sensors/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-sensors/index.html b/site/current-book/metron-sensors/index.html
index a40e51d..ea514b7 100644
--- a/site/current-book/metron-sensors/index.html
+++ b/site/current-book/metron-sensors/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-sensors/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-sensors/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Metron Sensors</title>
     <link rel="stylesheet" href="../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Metron Sensors</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-sensors/pycapa/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-sensors/pycapa/index.html b/site/current-book/metron-sensors/pycapa/index.html
index f81aee9..e7a507e 100644
--- a/site/current-book/metron-sensors/pycapa/index.html
+++ b/site/current-book/metron-sensors/pycapa/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-sensors/pycapa/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-sensors/pycapa/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Pycapa</title>
     <link rel="stylesheet" href="../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Pycapa</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -99,7 +99,13 @@ limitations under the License.
 <ul>
 
 <li><a href="#Overview">Overview</a></li>
-<li><a href="#Installation">Installation</a></li>
+<li><a href="#Installation">Installation</a>
+<ul>
+
+<li><a href="#Centos_7">Centos 7</a></li>
+<li><a href="#Centos_6">Centos 6</a></li>
+</ul>
+</li>
 <li><a href="#Usage">Usage</a>
 <ul>
 
@@ -109,24 +115,30 @@ limitations under the License.
 </ul>
 </li>
 <li><a href="#FAQs">FAQs</a></li>
-</ul>
-<h1>Overview</h1>
-<p>Pycapa performs network packet capture, both off-the-wire and from a Kafka topic, which is useful for the testing and development of <a class="externalLink" href="https://github.com/apache/metron">Apache Metron</a>.  It is not intended for production use. The tool will capture packets from a specified interface and push them into a Kafka Topic.  The tool can also do the reverse.  It can consume packets from Kafka and reconstruct each network packet.  This can then be used to create a <a class="externalLink" href="https://wiki.wireshark.org/Development/LibpcapFileFormat">libpcap-compliant file</a> or even to feed directly into a tool like Wireshark to monitor ongoing activity.</p>
-<h1>Installation</h1>
+</ul></div>
+<div class="section">
+<h2><a name="Overview"></a>Overview</h2>
+<p>Pycapa performs network packet capture, both off-the-wire and from a Kafka topic, which is useful for the testing and development of <a class="externalLink" href="https://github.com/apache/metron">Apache Metron</a>.  It is not intended for production use. The tool will capture packets from a specified interface and push them into a Kafka Topic.  The tool can also do the reverse.  It can consume packets from Kafka and reconstruct each network packet.  This can then be used to create a <a class="externalLink" href="https://wiki.wireshark.org/Development/LibpcapFileFormat">libpcap-compliant file</a> or even to feed directly into a tool like Wireshark to monitor ongoing activity.</p></div>
+<div class="section">
+<h2><a name="Installation"></a>Installation</h2>
 <p>General notes on the installation of Pycapa.</p>
 <ul>
 
 <li>Python 2.7 is required.</li>
-<li>The following package dependencies are required and can be installed automatically with <tt>pip</tt>.
+<li>The following package dependencies are required and can be installed automatically with <tt>pip</tt>. The requirements are installed as part of step 4
 <ul>
 
 <li><a class="externalLink" href="https://github.com/confluentinc/confluent-kafka-python">confluent-kafka-python</a></li>
 <li><a class="externalLink" href="https://github.com/CoreSecurity/pcapy">pcapy</a></li>
 </ul>
 </li>
+</ul>
+<div class="section">
+<h3><a name="Centos_7"></a>Centos 7</h3>
+<ul>
+
 <li>These instructions can be used directly on CentOS 7+.</li>
 <li>Other Linux distributions that come with Python 2.7 can use these instructions with some minor modifications.</li>
-<li>Older distributions, like CentOS 6, that come with Python 2.6 installed, should install Python 2.7 within a virtual environment and then run Pycapa from within the virtual environment.</li>
 </ul>
 <ol style="list-style-type: decimal">
 
@@ -146,8 +158,8 @@ limitations under the License.
 <div>
 <div>
 <pre class="source">export PREFIX=/usr
-wget https://github.com/edenhill/librdkafka/archive/v0.9.4.tar.gz   -O - | tar -xz
-cd librdkafka-0.9.4/
+wget https://github.com/edenhill/librdkafka/archive/v0.11.5.tar.gz   -O - | tar -xz
+cd librdkafka-0.11.5/
 ./configure --prefix=$PREFIX
 make
 make install
@@ -174,8 +186,115 @@ pip install -r requirements.txt
 python setup.py install
 </pre></div></div>
 </li>
+</ol></div>
+<div class="section">
+<h3><a name="Centos_6"></a>Centos 6</h3>
+<ul>
+
+<li>These instructions can be used directly on CentOS 6 - useful for developers using the Full Dev Vagrant test box.</li>
+<li>Older distributions, like CentOS 6, that come with Python 2.6 installed, should install Python 2.7 within a virtual environment and then run Pycapa from within the virtual environment.</li>
+</ul>
+<ol style="list-style-type: decimal">
+
+<li>
+
+<p>Set up a couple environment variables.</p>
+
+<div>
+<div>
+<pre class="source">PYCAPA_HOME=/opt/pycapa
+PYTHON27_HOME=/opt/rh/python27/root
+</pre></div></div>
+</li>
+<li>
+
+<p>Install required packages.</p>
+
+<div>
+<div>
+<pre class="source">for item in epel-release centos-release-scl &quot;@Development tools&quot; python27 python27-scldevel python27-python-virtualenv libpcap-devel libselinux-python; do yum install -y $item; done
+</pre></div></div>
+</li>
+<li>
+
+<p>Setup Pycapa directory.</p>
+
+<div>
+<div>
+<pre class="source">mkdir $PYCAPA_HOME &amp;&amp; chmod 755 $PYCAPA_HOME
+</pre></div></div>
+</li>
+<li>
+
+<p>Create the virtualenv.</p>
+
+<div>
+<div>
+<pre class="source">export LD_LIBRARY_PATH=&quot;/opt/rh/python27/root/usr/lib64&quot;
+cd $PYCAPA_HOME
+${PYTHON27_HOME}/usr/bin/virtualenv pycapa-venv
+</pre></div></div>
+</li>
+<li>
+
+<p>Install Librdkafka at your chosen $PREFIX.</p>
+
+<div>
+<div>
+<pre class="source">export PREFIX=/usr
+wget https://github.com/edenhill/librdkafka/archive/v0.11.5.tar.gz   -O - | tar -xz
+cd librdkafka-0.11.5/
+./configure --prefix=$PREFIX
+make
+make install
+</pre></div></div>
+</li>
+<li>
+
+<p>Add Librdkafka to the dynamic library load path.</p>
+
+<div>
+<div>
+<pre class="source">echo &quot;$PREFIX/lib&quot; &gt;&gt; /etc/ld.so.conf.d/pycapa.conf
+ldconfig -v
+</pre></div></div>
+</li>
+<li>
+
+<p>Copy the Pycapa source files from the Metron project to your chosen $PYCAPA_HOME (e.g. <tt>/opt/pycapa</tt>). You should have pycapa source files in <tt>/opt/pycapa/pycapa</tt>.</p>
+
+<div>
+<div>
+<pre class="source">scp -r metron-sensors/pycapa root@node1:$PYCAPA_HOME
+</pre></div></div>
+</li>
+<li>
+
+<p>Install Pycapa using the <tt>pycapa-venv</tt> virtualenv you created earlier.</p>
+
+<div>
+<div>
+<pre class="source">cd ${PYCAPA_HOME}/pycapa
+# activate the virtualenv
+source ${PYCAPA_HOME}/pycapa-venv/bin/activate
+pip install -r requirements.txt
+python setup.py install
+</pre></div></div>
+</li>
+<li>
+
+<p>Special notes on running pycapa on Centos 6. You should run it using the virtualenv.</p>
+
+<div>
+<div>
+<pre class="source">cd ${PYCAPA_HOME}/pycapa-venv/bin
+pycapa --producer --kafka-topic pcap --interface eth1 --kafka-broker $BROKERLIST
+</pre></div></div>
+</li>
 </ol>
-<h1>Usage</h1>
+<p><b>Note:</b> To deactivate your virtualenv, simply type &#x201c;deactivate&#x201d; and hit enter.</p></div></div>
+<div class="section">
+<h2><a name="Usage"></a>Usage</h2>
 <p>Pycapa has two primary runtime modes.</p>
 <ul>
 
@@ -341,7 +460,7 @@ Capturing on 'Standard input'
 </div></div>
 <div class="section">
 <h3><a name="Kerberos"></a>Kerberos</h3>
-<p>The probe can be used in a Kerberized environment.  Follow these additional steps to use Pycapa with Kerberos.  The following assumptions have been made.  These may need altered to fit your environment.</p>
+<p>The probe can be used in a Kerberized environment. The Python client README (<a class="externalLink" href="https://github.com/confluentinc/confluent-kafka-python">https://github.com/confluentinc/confluent-kafka-python</a>) has an important note for Kerberos case that the pre-built Linux wheels do NOT contain SASL Kerberos support. You will need to use the non-binary wheel to install confluent-kafka-python and build/install librdkafka separately. Follow these additional steps to use Pycapa with Kerberos.  The following assumptions have been made.  These may need altered to fit your environment.</p>
 <ul>
 
 <li>The Kafka broker is at <tt>kafka1:6667</tt></li>
@@ -354,12 +473,21 @@ Capturing on 'Standard input'
 
 <li>
 
+<p>If it is not, ensure that you have <tt>libsasl</tt> or <tt>libsasl2</tt> installed.  On CentOS, this can be installed with the following command.</p>
+
+<div>
+<div>
+<pre class="source">    yum install -y cyrus-sasl cyrus-sasl-devel cyrus-sasl-gssapi
+</pre></div></div>
+</li>
+<li>
+
 <p>Build Librdkafka with SASL support (<tt>--enable-sasl</tt>) and install at your chosen $PREFIX.</p>
 
 <div>
 <div>
-<pre class="source">wget https://github.com/edenhill/librdkafka/archive/v0.9.4.tar.gz  -O - | tar -xz
-cd librdkafka-0.9.4/
+<pre class="source">wget https://github.com/edenhill/librdkafka/archive/v0.11.5.tar.gz  -O - | tar -xz
+cd librdkafka-0.11.5/
 ./configure --prefix=$PREFIX --enable-sasl
 make
 make install
@@ -371,15 +499,21 @@ make install
 
 <div>
 <div>
-<pre class="source">$ examples/rdkafka_example -X builtin.features
-builtin.features = gzip,snappy,ssl,sasl,regex
+<pre class="source">$ examples/rdkafka_example -X builtin.features    
+  builtin.features = gzip,snappy,ssl,sasl,regex,lz4,sasl_gssapi,sasl_plain,sasl_scram,plugins
 </pre></div></div>
+</li>
+<li>The source install of confluent-kafka.
+<p>If you have already installed, remove the binary wheel python client first, repeat until it says no longer installed</p>
 
-<p>If it is not, ensure that you have <tt>libsasl</tt> or <tt>libsasl2</tt> installed.  On CentOS, this can be installed with the following command.</p>
+<div>
+<div>
+<pre class="source">   pip uninstall -y confluent-kafka 
+</pre></div></div>
 
 <div>
 <div>
-<pre class="source">yum install -y cyrus-sasl cyrus-sasl-devel cyrus-sasl-gssapi
+<pre class="source">   pip install --no-binary :all: confluent-kafka
 </pre></div></div>
 </li>
 <li>
@@ -428,8 +562,9 @@ INFO:root:'10' packet(s) in, '10' packet(s) out
 </li>
 </ul>
 </li>
-</ol>
-<h1>FAQs</h1></div>
+</ol></div></div>
+<div class="section">
+<h2><a name="FAQs"></a>FAQs</h2>
 <div class="section">
 <h3><a name="How_do_I_get_more_logs.3F"></a>How do I get more logs?</h3>
 <p>Use the following two command-line arguments to get detailed logging.</p>

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-stellar/stellar-3rd-party-example/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-stellar/stellar-3rd-party-example/index.html b/site/current-book/metron-stellar/stellar-3rd-party-example/index.html
index 4e19e16..c04add7 100644
--- a/site/current-book/metron-stellar/stellar-3rd-party-example/index.html
+++ b/site/current-book/metron-stellar/stellar-3rd-party-example/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-stellar/stellar-3rd-party-example/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-stellar/stellar-3rd-party-example/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Introduction</title>
     <link rel="stylesheet" href="../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Introduction</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-stellar/stellar-common/3rdPartyStellar.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-stellar/stellar-common/3rdPartyStellar.html b/site/current-book/metron-stellar/stellar-common/3rdPartyStellar.html
index 88d7ac6..157d632 100644
--- a/site/current-book/metron-stellar/stellar-common/3rdPartyStellar.html
+++ b/site/current-book/metron-stellar/stellar-common/3rdPartyStellar.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-stellar/stellar-common/3rdPartyStellar.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-stellar/stellar-common/3rdPartyStellar.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Custom Stellar Functions</title>
     <link rel="stylesheet" href="../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Custom Stellar Functions</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-stellar/stellar-common/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-stellar/stellar-common/index.html b/site/current-book/metron-stellar/stellar-common/index.html
index 1160156..8ead4c6 100644
--- a/site/current-book/metron-stellar/stellar-common/index.html
+++ b/site/current-book/metron-stellar/stellar-common/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-stellar/stellar-common/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-stellar/stellar-common/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Stellar Language</title>
     <link rel="stylesheet" href="../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Stellar Language</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -120,6 +120,7 @@ limitations under the License.
 <ul>
 
 <li>Referencing fields in the enriched JSON</li>
+<li>Referencing all fields in the enriched JSON via the <tt>_</tt> reserved variable name.</li>
 <li>String literals are quoted with either <tt>'</tt> or <tt>&quot;</tt></li>
 <li>String literals support escaping for <tt>'</tt>, <tt>&quot;</tt>, <tt>\t</tt>, <tt>\r</tt>, <tt>\n</tt>, and backslash
 <ul>
@@ -141,6 +142,16 @@ limitations under the License.
 <li>User defined functions, including Lambda expressions</li>
 </ul>
 <div class="section">
+<h3><a name="Boolean_Expressions"></a>Boolean Expressions</h3>
+<p>Variables may be used in boolean expressions and variables which are not explicitly boolean may be interpreted as booleans subject to the following rules:</p>
+<ul>
+
+<li>Similar to python and javascript, empty collections (e.g. <tt>[]</tt>) will be interpreted as <tt>false</tt></li>
+<li>Similar to python and javascript, missing variables will be interpreted as <tt>false</tt></li>
+<li>Variables set to <tt>null</tt> will be interpreted as <tt>false</tt></li>
+</ul>
+<p>Otherwise, boolean variables will be interpreted as their values reflect.</p></div>
+<div class="section">
 <h3><a name="Stellar_Language_Keywords"></a>Stellar Language Keywords</h3>
 <p>The following keywords need to be single quote escaped in order to be used in Stellar expressions:</p>
 <table border="0" class="table table-striped">
@@ -1772,12 +1783,12 @@ limitations under the License.
 <h3><a name="REGEXP_MATCH"></a><tt>REGEXP_MATCH</tt></h3>
 <ul>
 
-<li>Description: Determines whether a regex matches a string</li>
+<li>Description: Determines whether a regex matches a string.  If a list of patterns is passed, then the matching is an OR operation</li>
 <li>Input:
 <ul>
 
 <li>string - The string to test</li>
-<li>pattern - The proposed regex pattern</li>
+<li>pattern - The proposed regex pattern or a list of patterns</li>
 </ul>
 </li>
 <li>Returns: True if the regex pattern matches the string and false if otherwise.</li>
@@ -2674,7 +2685,7 @@ ABS, APPEND_IF_MISSING, BIN, BLOOM_ADD, BLOOM_EXISTS, BLOOM_INIT, BLOOM_MERGE, C
 
 <div>
 <div>
-<pre class="source">metron-stellar/stellar-common/target/stellar-common-0.5.0-stand-alone.tar.gz
+<pre class="source">metron-stellar/stellar-common/target/stellar-common-0.6.0-stand-alone.tar.gz
 </pre></div></div>
 
 <p>When unpacked, the following structure will be created:</p>
@@ -2685,7 +2696,7 @@ ABS, APPEND_IF_MISSING, BIN, BLOOM_ADD, BLOOM_EXISTS, BLOOM_INIT, BLOOM_MERGE, C
 &#x251c;&#x2500;&#x2500; bin
 &#x2502;&#xa0;&#xa0; &#x2514;&#x2500;&#x2500; stellar
 &#x2514;&#x2500;&#x2500; lib
-    &#x2514;&#x2500;&#x2500; stellar-common-0.5.0-uber.jar
+    &#x2514;&#x2500;&#x2500; stellar-common-0.6.0-uber.jar
 </pre></div></div>
 
 <p>To run the Stellar Shell run the following from the directory you unpacked to:</p>

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/metron-stellar/stellar-zeppelin/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/metron-stellar/stellar-zeppelin/index.html b/site/current-book/metron-stellar/stellar-zeppelin/index.html
index 54bc800..128edba 100644
--- a/site/current-book/metron-stellar/stellar-zeppelin/index.html
+++ b/site/current-book/metron-stellar/stellar-zeppelin/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-stellar/stellar-zeppelin/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/metron-stellar/stellar-zeppelin/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Stellar Interpreter for Apache Zeppelin</title>
     <link rel="stylesheet" href="../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Stellar Interpreter for Apache Zeppelin</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -132,11 +132,11 @@ mvn clean install -DskipTests
 <li>
 
 <p>Use Zeppelin&#x2019;s installation utility to install the Stellar Interpreter.</p>
-<p>If Zeppelin was already installed, make sure that it is stopped before running this command.  Update the version, &#x2018;0.5.0&#x2019; in the example below, to whatever is appropriate for your environment.</p>
+<p>If Zeppelin was already installed, make sure that it is stopped before running this command.  Update the version, &#x2018;0.6.0&#x2019; in the example below, to whatever is appropriate for your environment.</p>
 
 <div>
 <div>
-<pre class="source">bin/install-interpreter.sh --name stellar --artifact org.apache.metron:stellar-zeppelin:0.5.0
+<pre class="source">bin/install-interpreter.sh --name stellar --artifact org.apache.metron:stellar-zeppelin:0.6.0
 </pre></div></div>
 </li>
 <li>
@@ -208,7 +208,7 @@ mvn clean install -DskipTests
 
 <div>
 <div>
-<pre class="source">org.apache.metron:metron-statistics:0.5.0
+<pre class="source">org.apache.metron:metron-statistics:0.6.0
 </pre></div></div>
 </li>
 <li>

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/use-cases/forensic_clustering/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/use-cases/forensic_clustering/index.html b/site/current-book/use-cases/forensic_clustering/index.html
index f67a830..916a6c9 100644
--- a/site/current-book/use-cases/forensic_clustering/index.html
+++ b/site/current-book/use-cases/forensic_clustering/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/use-cases/forensic_clustering/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/use-cases/forensic_clustering/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Problem Statement</title>
     <link rel="stylesheet" href="../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Problem Statement</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -61,6 +61,7 @@
     <ul class="nav nav-list">
     <li class="active"><a href="#"><span class="none"></span>Forensic_clustering</a></li>
     <li><a href="../../use-cases/geographic_login_outliers/index.html" title="Geographic_login_outliers"><span class="none"></span>Geographic_login_outliers</a></li>
+    <li><a href="../../use-cases/parser_chaining/index.html" title="Parser_chaining"><span class="none"></span>Parser_chaining</a></li>
     <li><a href="../../use-cases/typosquat_detection/index.html" title="Typosquat_detection"><span class="none"></span>Typosquat_detection</a></li>
     </ul>
 </li>
@@ -226,30 +227,140 @@ tar xzvf ~/180424243034750.tar.gz
 
 </pre></div></div>
 
-<p>Before we start, we will want to install ES mappings so ES knows how to interpret our fields:</p>
+<p>Before we start, we will want to install ES template mappings so ES knows how to interpret our fields:</p>
 
 <div>
 <div>
-<pre class="source">curl -XPUT 'http://$ES_HOST/cowrie*/_mapping/cowrie_doc' -d '
+<pre class="source">curl -XPUT $ES_HOST'/_template/cowrie_index' -d '
 {
+  &quot;template&quot;: &quot;cowrie_index*&quot;,
+  &quot;mappings&quot;: {
+    &quot;cowrie_doc&quot;: {
+        &quot;dynamic_templates&quot;: [
+        {
+          &quot;geo_location_point&quot;: {
+            &quot;match&quot;: &quot;enrichments:geo:*:location_point&quot;,
+            &quot;match_mapping_type&quot;: &quot;*&quot;,
+            &quot;mapping&quot;: {
+              &quot;type&quot;: &quot;geo_point&quot;
+            }
+          }
+        },
+        {
+          &quot;geo_country&quot;: {
+            &quot;match&quot;: &quot;enrichments:geo:*:country&quot;,
+            &quot;match_mapping_type&quot;: &quot;*&quot;,
+            &quot;mapping&quot;: {
+              &quot;type&quot;: &quot;keyword&quot;
+            }
+          }
+        },
+        {
+          &quot;geo_city&quot;: {
+            &quot;match&quot;: &quot;enrichments:geo:*:city&quot;,
+            &quot;match_mapping_type&quot;: &quot;*&quot;,
+            &quot;mapping&quot;: {
+              &quot;type&quot;: &quot;keyword&quot;
+            }
+          }
+        },
+        {
+          &quot;geo_location_id&quot;: {
+            &quot;match&quot;: &quot;enrichments:geo:*:locID&quot;,
+            &quot;match_mapping_type&quot;: &quot;*&quot;,
+            &quot;mapping&quot;: {
+              &quot;type&quot;: &quot;keyword&quot;
+            }
+          }
+        },
+        {
+          &quot;geo_dma_code&quot;: {
+            &quot;match&quot;: &quot;enrichments:geo:*:dmaCode&quot;,
+            &quot;match_mapping_type&quot;: &quot;*&quot;,
+            &quot;mapping&quot;: {
+              &quot;type&quot;: &quot;keyword&quot;
+            }
+          }
+        },
+        {
+          &quot;geo_postal_code&quot;: {
+            &quot;match&quot;: &quot;enrichments:geo:*:postalCode&quot;,
+            &quot;match_mapping_type&quot;: &quot;*&quot;,
+            &quot;mapping&quot;: {
+              &quot;type&quot;: &quot;keyword&quot;
+            }
+          }
+        },
+        {
+          &quot;geo_latitude&quot;: {
+            &quot;match&quot;: &quot;enrichments:geo:*:latitude&quot;,
+            &quot;match_mapping_type&quot;: &quot;*&quot;,
+            &quot;mapping&quot;: {
+              &quot;type&quot;: &quot;float&quot;
+            }
+          }
+        },
+        {
+          &quot;geo_longitude&quot;: {
+            &quot;match&quot;: &quot;enrichments:geo:*:longitude&quot;,
+            &quot;match_mapping_type&quot;: &quot;*&quot;,
+            &quot;mapping&quot;: {
+              &quot;type&quot;: &quot;float&quot;
+            }
+          }
+        },
+        {
+          &quot;timestamps&quot;: {
+            &quot;match&quot;: &quot;*:ts&quot;,
+            &quot;match_mapping_type&quot;: &quot;*&quot;,
+            &quot;mapping&quot;: {
+              &quot;type&quot;: &quot;date&quot;,
+              &quot;format&quot;: &quot;epoch_millis&quot;
+            }
+          }
+        },
+        {
+          &quot;threat_triage_score&quot;: {
+            &quot;mapping&quot;: {
+              &quot;type&quot;: &quot;float&quot;
+            },
+            &quot;match&quot;: &quot;threat:triage:*score&quot;,
+            &quot;match_mapping_type&quot;: &quot;*&quot;
+          }
+        },
+        {
+          &quot;threat_triage_reason&quot;: {
+            &quot;mapping&quot;: {
+              &quot;type&quot;: &quot;text&quot;,
+              &quot;fielddata&quot;: &quot;true&quot;
+            },
+            &quot;match&quot;: &quot;threat:triage:rules:*:reason&quot;,
+            &quot;match_mapping_type&quot;: &quot;*&quot;
+          }
+        },
+        {
+          &quot;threat_triage_name&quot;: {
+            &quot;mapping&quot;: {
+              &quot;type&quot;: &quot;text&quot;,
+              &quot;fielddata&quot;: &quot;true&quot;
+            },
+            &quot;match&quot;: &quot;threat:triage:rules:*:name&quot;,
+            &quot;match_mapping_type&quot;: &quot;*&quot;
+          }
+        }
+        ],
         &quot;properties&quot; : {
-          &quot;adapter:stellaradapter:begin:ts&quot; : {
-            &quot;type&quot; : &quot;string&quot;
-          },
-          &quot;adapter:stellaradapter:end:ts&quot; : {
-            &quot;type&quot; : &quot;string&quot;
-          },
           &quot;blacklisted&quot; : {
             &quot;type&quot; : &quot;boolean&quot;
           },
           &quot;compCS&quot; : {
-            &quot;type&quot; : &quot;string&quot;
+            &quot;type&quot; : &quot;keyword&quot;
           },
           &quot;data&quot; : {
-            &quot;type&quot; : &quot;string&quot;
+            &quot;type&quot; : &quot;keyword&quot;
           },
           &quot;dst_ip&quot; : {
-            &quot;type&quot; : &quot;string&quot;
+            &quot;type&quot; : &quot;keyword&quot;
           },
           &quot;dst_port&quot; : {
             &quot;type&quot; : &quot;long&quot;
@@ -258,117 +369,87 @@ tar xzvf ~/180424243034750.tar.gz
             &quot;type&quot; : &quot;double&quot;
           },
           &quot;encCS&quot; : {
-            &quot;type&quot; : &quot;string&quot;
-          },
-          &quot;enrichmentjoinbolt:joiner:ts&quot; : {
-            &quot;type&quot; : &quot;string&quot;
-          },
-          &quot;enrichmentsplitterbolt:splitter:begin:ts&quot; : {
-            &quot;type&quot; : &quot;string&quot;
-          },
-          &quot;enrichmentsplitterbolt:splitter:end:ts&quot; : {
-            &quot;type&quot; : &quot;string&quot;
+            &quot;type&quot; : &quot;keyword&quot;
           },
           &quot;eventid&quot; : {
-            &quot;type&quot; : &quot;string&quot;
+            &quot;type&quot; : &quot;keyword&quot;
           },
           &quot;guid&quot; : {
-            &quot;type&quot; : &quot;string&quot;
+            &quot;type&quot; : &quot;keyword&quot;
           },
           &quot;input&quot; : {
-            &quot;type&quot; : &quot;string&quot;
+            &quot;type&quot; : &quot;keyword&quot;
           },
           &quot;isError&quot; : {
             &quot;type&quot; : &quot;long&quot;
           },
           &quot;is_alert&quot; : {
-            &quot;type&quot; : &quot;string&quot;
+            &quot;type&quot; : &quot;keyword&quot;
           },
           &quot;kexAlgs&quot; : {
-            &quot;type&quot; : &quot;string&quot;
+            &quot;type&quot; : &quot;keyword&quot;
           },
           &quot;keyAlgs&quot; : {
-            &quot;type&quot; : &quot;string&quot;
+            &quot;type&quot; : &quot;keyword&quot;
           },
           &quot;macCS&quot; : {
-            &quot;type&quot; : &quot;string&quot;
+            &quot;type&quot; : &quot;keyword&quot;
           },
           &quot;message&quot; : {
-            &quot;type&quot; : &quot;string&quot;
+            &quot;type&quot; : &quot;keyword&quot;
           },
-          &quot;original_string&quot; : {
-            &quot;type&quot; : &quot;string&quot;
+          &quot;original_keyword&quot; : {
+            &quot;type&quot; : &quot;keyword&quot;
           },
           &quot;password&quot; : {
-            &quot;type&quot; : &quot;string&quot;
+            &quot;type&quot; : &quot;keyword&quot;
           },
           &quot;sensor&quot; : {
-            &quot;type&quot; : &quot;string&quot;
+            &quot;type&quot; : &quot;keyword&quot;
           },
           &quot;session&quot; : {
-            &quot;type&quot; : &quot;string&quot;
+            &quot;type&quot; : &quot;keyword&quot;
           },
           &quot;similarity_bin&quot; : {
-            &quot;type&quot; : &quot;string&quot;
+            &quot;type&quot; : &quot;keyword&quot;
           },
           &quot;size&quot; : {
             &quot;type&quot; : &quot;long&quot;
           },
           &quot;source:type&quot; : {
-            &quot;type&quot; : &quot;string&quot;
+            &quot;type&quot; : &quot;keyword&quot;
           },
           &quot;src_ip&quot; : {
-            &quot;type&quot; : &quot;string&quot;
+            &quot;type&quot; : &quot;keyword&quot;
           },
           &quot;src_port&quot; : {
             &quot;type&quot; : &quot;long&quot;
           },
           &quot;system&quot; : {
-            &quot;type&quot; : &quot;string&quot;
-          },
-          &quot;threat:triage:rules:0:comment&quot; : {
-            &quot;type&quot; : &quot;string&quot;
-          },
-          &quot;threat:triage:rules:0:name&quot; : {
-            &quot;type&quot; : &quot;string&quot;
+            &quot;type&quot; : &quot;keyword&quot;
           },
-          &quot;threat:triage:rules:0:reason&quot; : {
-            &quot;type&quot; : &quot;string&quot;
-          },
-          &quot;threat:triage:rules:0:score&quot; : {
-            &quot;type&quot; : &quot;long&quot;
-          },
-          &quot;threat:triage:score&quot; : {
-            &quot;type&quot; : &quot;double&quot;
-          },
-          &quot;threatinteljoinbolt:joiner:ts&quot; : {
-            &quot;type&quot; : &quot;string&quot;
-          },
-          &quot;threatintelsplitterbolt:splitter:begin:ts&quot; : {
-            &quot;type&quot; : &quot;string&quot;
-          },
-          &quot;threatintelsplitterbolt:splitter:end:ts&quot; : {
-            &quot;type&quot; : &quot;string&quot;
-          },
-          &quot;timestamp&quot; : {
-            &quot;type&quot; : &quot;long&quot;
+          &quot;timestamp&quot;: {
+            &quot;type&quot;: &quot;date&quot;,
+            &quot;format&quot;: &quot;epoch_millis&quot;
           },
           &quot;tlsh&quot; : {
-            &quot;type&quot; : &quot;string&quot;
+            &quot;type&quot; : &quot;keyword&quot;
           },
           &quot;ttylog&quot; : {
-            &quot;type&quot; : &quot;string&quot;
+            &quot;type&quot; : &quot;keyword&quot;
           },
           &quot;username&quot; : {
-            &quot;type&quot; : &quot;string&quot;
+            &quot;type&quot; : &quot;keyword&quot;
           },
           &quot;version&quot; : {
-            &quot;type&quot; : &quot;string&quot;
+            &quot;type&quot; : &quot;keyword&quot;
           },
-          &quot;alert&quot; : {
+          &quot;metron_alert&quot; : {
             &quot;type&quot; : &quot;nested&quot;
           }
         }
+     }
+  }
 }
 '
 </pre></div></div>
@@ -474,7 +555,7 @@ tar xzvf ~/180424243034750.tar.gz
       &quot;stellar&quot; : {
         &quot;config&quot; : [
           &quot;blacklisted := ENRICHMENT_EXISTS( 'blacklist', src_ip, 'threatintel', 't')&quot;,
-          &quot;is_alert := (exists(is_alert) &amp;&amp; is_alert) || blacklisted&quot;
+          &quot;is_alert := is_alert || blacklisted&quot;
         ]
       }
 
@@ -514,7 +595,7 @@ I arrived at that by trial and error, which is not always tenable, frankly.  Wha
 <pre class="source">COWRIE_HOME=~/cowrie
 for i in cowrie.1626302-1636522.json cowrie.16879981-16892488.json cowrie.21312194-21331475.json cowrie.698260-710913.json cowrie.762933-772239.json cowrie.929866-939552.json cowrie.1246880-1248235.json cowrie.19285959-19295444.json cowrie.16542668-16581213.json cowrie.5849832-5871517.json cowrie.6607473-6609163.json;do
   echo $i
-  cat $COWRIE_HOME/$i | /usr/hdp/current/kafka-broker/bin/kafka-console-producer.sh --broker-list node1:6667 --topic cowrie
+  cat $COWRIE_HOME/$i | /usr/hdp/current/kafka-broker/bin/kafka-console-producer.sh --broker-list $BROKERLIST --topic cowrie
   sleep 2
 done
 </pre></div></div>
@@ -582,7 +663,15 @@ done
 <li>177.238.236.21</li>
 <li>94.78.80.45</li>
 </ul>
-<p>Now we can look at <i>other</i> things that they&#x2019;re doing to build and refine our definition of what an alert is without resorting to hard-coding of rules.  Note that nothing in our enrichments actually used the string <tt>busybox</tt>, so this is a more general purpose way of navigating similar things.</p></div>
+<p>Now we can look at <i>other</i> things that they&#x2019;re doing to build and refine our definition of what an alert is without resorting to hard-coding of rules.  Note that nothing in our enrichments actually used the string <tt>busybox</tt>, so this is a more general purpose way of navigating similar things.</p>
+<div class="section">
+<h3><a name="Version_Info"></a>Version Info</h3>
+<p>Verified against:</p>
+<ul>
+
+<li>METRON_VERSION=0.5.0</li>
+<li>ELASTIC_VERSION=5.6.2</li>
+</ul></div></div>
         </div>
       </div>
     </div>

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/use-cases/geographic_login_outliers/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/use-cases/geographic_login_outliers/index.html b/site/current-book/use-cases/geographic_login_outliers/index.html
index 2c0441a..34d25e1 100644
--- a/site/current-book/use-cases/geographic_login_outliers/index.html
+++ b/site/current-book/use-cases/geographic_login_outliers/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/use-cases/geographic_login_outliers/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/use-cases/geographic_login_outliers/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Problem Statement</title>
     <link rel="stylesheet" href="../../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Problem Statement</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -61,6 +61,7 @@
     <ul class="nav nav-list">
     <li><a href="../../use-cases/forensic_clustering/index.html" title="Forensic_clustering"><span class="none"></span>Forensic_clustering</a></li>
     <li class="active"><a href="#"><span class="none"></span>Geographic_login_outliers</a></li>
+    <li><a href="../../use-cases/parser_chaining/index.html" title="Parser_chaining"><span class="none"></span>Parser_chaining</a></li>
     <li><a href="../../use-cases/typosquat_detection/index.html" title="Typosquat_detection"><span class="none"></span>Typosquat_detection</a></li>
     </ul>
 </li>
@@ -233,7 +234,7 @@ if __name__ == '__main__':
     {
       &quot;profile&quot;: &quot;geo_distribution_from_centroid&quot;,
       &quot;foreach&quot;: &quot;'global'&quot;,
-      &quot;onlyif&quot;: &quot;exists(geo_distance) &amp;&amp; geo_distance != null&quot;,
+      &quot;onlyif&quot;: &quot;geo_distance != null&quot;,
       &quot;init&quot; : {
         &quot;s&quot;: &quot;STATS_INIT()&quot;
                },
@@ -245,7 +246,7 @@ if __name__ == '__main__':
     {
       &quot;profile&quot;: &quot;locations_by_user&quot;,
       &quot;foreach&quot;: &quot;user&quot;,
-      &quot;onlyif&quot;: &quot;exists(hash) &amp;&amp; hash != null &amp;&amp; LENGTH(hash) &gt; 0&quot;,
+      &quot;onlyif&quot;: &quot;hash != null &amp;&amp; LENGTH(hash) &gt; 0&quot;,
       &quot;init&quot; : {
         &quot;s&quot;: &quot;MULTISET_INIT()&quot;
                },
@@ -303,7 +304,6 @@ if __name__ == '__main__':
           &quot;dist_median := STATS_PERCENTILE(geo_distance_distr, 50.0)&quot;,
           &quot;dist_sd := STATS_SD(geo_distance_distr)&quot;,
           &quot;geo_outlier := ABS(dist_median - geo_distance) &gt;= 5*dist_sd&quot;,
-          &quot;is_alert := exists(is_alert) &amp;&amp; is_alert&quot;,
           &quot;is_alert := is_alert || (geo_outlier != null &amp;&amp; geo_outlier == true)&quot;,
           &quot;geo_distance_distr := null&quot;
         ]

http://git-wip-us.apache.org/repos/asf/metron/blob/a97e575f/site/current-book/use-cases/index.html
----------------------------------------------------------------------
diff --git a/site/current-book/use-cases/index.html b/site/current-book/use-cases/index.html
index 684cc14..d12b1ab 100644
--- a/site/current-book/use-cases/index.html
+++ b/site/current-book/use-cases/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/use-cases/index.md at 2018-06-07
+ | Generated by Apache Maven Doxia Site Renderer 1.8 from src/site/markdown/use-cases/index.md at 2018-09-12
  | Rendered using Apache Maven Fluido Skin 1.7
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180607" />
+    <meta name="Date-Revision-yyyymmdd" content="20180912" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Metron &#x2013; Worked Examples</title>
     <link rel="stylesheet" href="../css/apache-maven-fluido-1.7.min.css" />
@@ -32,8 +32,8 @@
       <li class=""><a href="http://metron.apache.org/" class="externalLink" title="Metron">Metron</a><span class="divider">/</span></li>
       <li class=""><a href="../index.html" title="Documentation">Documentation</a><span class="divider">/</span></li>
     <li class="active ">Worked Examples</li>
-        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-06-07</li>
-          <li id="projectVersion" class="pull-right">Version: 0.5.0</li>
+        <li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 2018-09-12</li>
+          <li id="projectVersion" class="pull-right">Version: 0.6.0</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -61,6 +61,7 @@
     <ul class="nav nav-list">
     <li><a href="../use-cases/forensic_clustering/index.html" title="Forensic_clustering"><span class="none"></span>Forensic_clustering</a></li>
     <li><a href="../use-cases/geographic_login_outliers/index.html" title="Geographic_login_outliers"><span class="none"></span>Geographic_login_outliers</a></li>
+    <li><a href="../use-cases/parser_chaining/index.html" title="Parser_chaining"><span class="none"></span>Parser_chaining</a></li>
     <li><a href="../use-cases/typosquat_detection/index.html" title="Typosquat_detection"><span class="none"></span>Typosquat_detection</a></li>
     </ul>
 </li>