From 5b0d15c6ba07243efc6b1e2e6d0b1c9ff85a3706 Mon Sep 17 00:00:00 2001
From: Michael Miklavcic <michael.miklavcic@gmail.com>
Date: Wed, 12 Sep 2018 14:06:24 -0600
Subject: [PATCH 1/3] Update xpack install instructions

---
 metron-deployment/Kerberos-manual-setup.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/metron-deployment/Kerberos-manual-setup.md b/metron-deployment/Kerberos-manual-setup.md
index d34a62a8e9..4a06c5b99e 100644
--- a/metron-deployment/Kerberos-manual-setup.md
+++ b/metron-deployment/Kerberos-manual-setup.md
@@ -568,7 +568,7 @@ X-Pack
     Add the `es.client.settings` to global.json
 
     ```
-    /usr/metron/0.6.0/config/zookeeper/global.json ->
+    $METRON_HOME/config/zookeeper/global.json ->
 
       "es.client.settings" : {
           "es.client.class" : "org.elasticsearch.xpack.client.PreBuiltXPackTransportClient",
@@ -728,7 +728,8 @@ X-Pack
 1. Once you'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.
 
     ```
-    /usr/metron/0.6.0/indexing_contrib/elasticsearch-xpack-shaded-5.6.2.jar
+    mkdir $METRON_HOME/indexing_contrib
+    cp elasticsearch-xpack-shaded-5.6.2.jar $METRON_HOME/indexing_contrib/elasticsearch-xpack-shaded-5.6.2.jar
     ```
 
 1. Now you can restart the Elasticsearch topology. Note, you should perform this step manually, as follows.

From be646e8d681c1d9cab2fcb02cbf00d55c6c57ead Mon Sep 17 00:00:00 2001
From: Michael Miklavcic <michael.miklavcic@gmail.com>
Date: Wed, 12 Sep 2018 17:30:22 -0600
Subject: [PATCH 2/3] Update sample pom for xpack client

---
 metron-deployment/Kerberos-manual-setup.md | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/metron-deployment/Kerberos-manual-setup.md b/metron-deployment/Kerberos-manual-setup.md
index 4a06c5b99e..1fc4d229cb 100644
--- a/metron-deployment/Kerberos-manual-setup.md
+++ b/metron-deployment/Kerberos-manual-setup.md
@@ -650,10 +650,6 @@ X-Pack
                     <groupId>log4j</groupId>
                     <artifactId>log4j</artifactId>
                   </exclusion>
-                  <exclusion> <!-- this is causing a weird build error if not excluded - Error creating shaded jar: null: IllegalArgumentException -->
-                        <groupId>org.apache.logging.log4j</groupId>
-                        <artifactId>log4j-api</artifactId>
-                    </exclusion>
                 </exclusions>
               </dependency>
         </dependencies>
@@ -662,7 +658,7 @@ X-Pack
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-shade-plugin</artifactId>
-                    <version>2.4.3</version>
+                    <version>3.2.0</version>
                     <configuration>
                         <createDependencyReducedPom>true</createDependencyReducedPom>
                     </configuration>

From a725bc758ff7bcd0209bb67b53afd3f9f8739fa2 Mon Sep 17 00:00:00 2001
From: Michael Miklavcic <michael.miklavcic@gmail.com>
Date: Wed, 12 Sep 2018 17:51:10 -0600
Subject: [PATCH 3/3] Fix anchor link for Doxia

---
 metron-deployment/Kerberos-manual-setup.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metron-deployment/Kerberos-manual-setup.md b/metron-deployment/Kerberos-manual-setup.md
index 1fc4d229cb..4bd4516643 100644
--- a/metron-deployment/Kerberos-manual-setup.md
+++ b/metron-deployment/Kerberos-manual-setup.md
@@ -30,7 +30,7 @@ This document provides instructions for kerberizing Metron's Vagrant-based devel
 * [Start Metron](#start-metron)
 * [Push Data](#push-data)
 * [More Information](#more-information)
-* [Elasticseach X-Pack](#x-pack)
+* [Elasticseach X-Pack](#X-Pack)
 
 Setup
 -----