You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metron.apache.org by ma...@apache.org on 2017/06/01 21:41:56 UTC

[37/44] metron git commit: METRON-953: Complete migration away from incubator-metron to metron for links and docs (justinleet via mmiklavc) closes apache/incubator-metron#590

METRON-953: Complete migration away from incubator-metron to metron for links and docs (justinleet via mmiklavc) closes apache/incubator-metron#590


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

Branch: refs/heads/Metron_0.4.0
Commit: ae05f38d8728bcc8737b0a4261ab7df35710b97f
Parents: 08f95dc
Author: justinleet <ju...@gmail.com>
Authored: Thu May 25 22:53:29 2017 -0600
Committer: Michael Miklavcic <mi...@gmail.com>
Committed: Thu May 25 22:53:29 2017 -0600

----------------------------------------------------------------------
 README.md                                               |  4 ++--
 Upgrading.md                                            |  2 +-
 metron-analytics/pom.xml                                |  6 +++---
 metron-deployment/Kerberos-manual-setup.md              |  2 +-
 metron-deployment/README.md                             |  4 ++--
 .../packaging/docker/ansible-docker/README.md           |  4 ++--
 metron-interface/metron-config/README.md                |  2 +-
 metron-interface/metron-rest/README.md                  |  2 +-
 .../metron-rest/src/test/resources/README.vm            |  2 +-
 metron-interface/pom.xml                                |  6 +++---
 .../src/main/config/zeppelin/metron/metron-pcap.json    |  2 +-
 metron-platform/pom.xml                                 |  6 +++---
 metron-sensors/fastcapa/README.md                       |  2 +-
 metron-sensors/pycapa/README.md                         |  4 ++--
 site-book/README.md                                     |  4 ++--
 site-book/pom.xml                                       |  6 +++---
 site/BUILD.md                                           |  2 +-
 site/README.md                                          |  2 +-
 site/_config.yml                                        |  2 +-
 site/community/index.md                                 |  4 ++--
 site/develop/index.md                                   | 12 ++++++------
 site/help/index.md                                      |  4 ++--
 site/index.html                                         |  2 +-
 23 files changed, 43 insertions(+), 43 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/metron/blob/ae05f38d/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 06e5471..dcea8fa 100644
--- a/README.md
+++ b/README.md
@@ -58,8 +58,8 @@ This repository is a collection of submodules for convenience which is regularly
 updated to point to the latest versions. Github provides multiple ways to obtain
 Metron's code:
 
-1. git clone --recursive https://github.com/apache/incubator-metron
-2. [Download ZIP](https://github.com/apache/incubator-metron/archive/master.zip)
+1. git clone --recursive https://github.com/apache/metron
+2. [Download ZIP](https://github.com/apache/metron/archive/master.zip)
 3. Clone or download each repository individually
 
 Option 3 is more likely to have the latest code.

http://git-wip-us.apache.org/repos/asf/metron/blob/ae05f38d/Upgrading.md
----------------------------------------------------------------------
diff --git a/Upgrading.md b/Upgrading.md
index b05acbc..3864ae3 100644
--- a/Upgrading.md
+++ b/Upgrading.md
@@ -15,7 +15,7 @@ As of 0.3.0 the indexing configuration
 In the 0.3.1 release, this configuration has been broken out
 and control for individual writers are separated.
 
-Please see the description of the configurations in the indexing [README](https://github.com/apache/incubator-metron/tree/Metron_0.3.1/metron-platform/metron-indexing#sensor-indexing-configuration)
+Please see the description of the configurations in the indexing [README](https://github.com/apache/metron/tree/Metron_0.3.1/metron-platform/metron-indexing#sensor-indexing-configuration)
 
 #### Migration
 

http://git-wip-us.apache.org/repos/asf/metron/blob/ae05f38d/metron-analytics/pom.xml
----------------------------------------------------------------------
diff --git a/metron-analytics/pom.xml b/metron-analytics/pom.xml
index 7670e8f..2377702 100644
--- a/metron-analytics/pom.xml
+++ b/metron-analytics/pom.xml
@@ -27,10 +27,10 @@
 	<description>Stream analytics for Metron</description>
 	<url>https://metron.apache.org/</url>
 	<scm>
-		<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-metron.git</connection>
-		<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-metron.git</developerConnection>
+		<connection>scm:git:https://git-wip-us.apache.org/repos/asf/metron.git</connection>
+		<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/metron.git</developerConnection>
 		<tag>HEAD</tag>
-		<url>https://git-wip-us.apache.org/repos/asf/incubator-metron</url>
+		<url>https://git-wip-us.apache.org/repos/asf/metron</url>
 	</scm>
 	<licenses>
 		<license>

http://git-wip-us.apache.org/repos/asf/metron/blob/ae05f38d/metron-deployment/Kerberos-manual-setup.md
----------------------------------------------------------------------
diff --git a/metron-deployment/Kerberos-manual-setup.md b/metron-deployment/Kerberos-manual-setup.md
index fc46572..76d3701 100644
--- a/metron-deployment/Kerberos-manual-setup.md
+++ b/metron-deployment/Kerberos-manual-setup.md
@@ -379,7 +379,7 @@ Metron should be ready to receive data.
 
 Push Data
 ---------
-1. Push some sample data to one of the parser topics. E.g for Bro we took raw data from [incubator-metron/metron-platform/metron-integration-test/src/main/sample/data/bro/raw/BroExampleOutput](../metron-platform/metron-integration-test/src/main/sample/data/bro/raw/BroExampleOutput)
+1. Push some sample data to one of the parser topics. E.g for Bro we took raw data from [metron/metron-platform/metron-integration-test/src/main/sample/data/bro/raw/BroExampleOutput](../metron-platform/metron-integration-test/src/main/sample/data/bro/raw/BroExampleOutput)
 
     ```
   	cat sample-bro.txt | ${KAFKA_HOME}/kafka-broker/bin/kafka-console-producer.sh \

http://git-wip-us.apache.org/repos/asf/metron/blob/ae05f38d/metron-deployment/README.md
----------------------------------------------------------------------
diff --git a/metron-deployment/README.md b/metron-deployment/README.md
index 012b7b6..f2f4b43 100644
--- a/metron-deployment/README.md
+++ b/metron-deployment/README.md
@@ -42,10 +42,10 @@ Use quick-dev for testing out changes to core Metron services.
 installed
 
 ### Full-Dev
-Navigate to `incubator-metron/metron-deployment/vagrant/full-dev-platform` and run `vagrant up`.
+Navigate to `metron/metron-deployment/vagrant/full-dev-platform` and run `vagrant up`.
 
 ### Quick-Dev
-Navigate to `incubator-metron/metron-deployment/vagrant/quick-dev-platform` and run `vagrant up`.
+Navigate to `metron/metron-deployment/vagrant/quick-dev-platform` and run `vagrant up`.
 
 ## Ambari Management Pack
 An Ambari Management Pack can be built in order to make the Metron service available on top of an existing stack, rather than needing a direct stack update.

http://git-wip-us.apache.org/repos/asf/metron/blob/ae05f38d/metron-deployment/packaging/docker/ansible-docker/README.md
----------------------------------------------------------------------
diff --git a/metron-deployment/packaging/docker/ansible-docker/README.md b/metron-deployment/packaging/docker/ansible-docker/README.md
index 6ee7618..ebd594a 100644
--- a/metron-deployment/packaging/docker/ansible-docker/README.md
+++ b/metron-deployment/packaging/docker/ansible-docker/README.md
@@ -12,6 +12,6 @@ Full instructions are found on the wiki [https://cwiki.apache.org/confluence/pag
 
 tl;dr
 
-1. docker run -it -v \<project-directory\>:/root/incubator-metron ansible-docker:2.0.0.2 bash
-2. cd /root/incubator-metron
+1. docker run -it -v \<project-directory\>:/root/metron ansible-docker:2.0.0.2 bash
+2. cd /root/metron
 3. mvn clean package -DskipTests

http://git-wip-us.apache.org/repos/asf/metron/blob/ae05f38d/metron-interface/metron-config/README.md
----------------------------------------------------------------------
diff --git a/metron-interface/metron-config/README.md b/metron-interface/metron-config/README.md
index 92878b5..070668f 100644
--- a/metron-interface/metron-config/README.md
+++ b/metron-interface/metron-config/README.md
@@ -13,7 +13,7 @@ This module provides a user interface for management functions in Metron.
     mvn clean package -DskipTests
     ```
   
-1. Copy `incubator-metron/metron-interface/metron-config/target/metron-config-METRON_VERSION-archive.tar.gz` to the desired host.
+1. Copy `metron/metron-interface/metron-config/target/metron-config-METRON_VERSION-archive.tar.gz` to the desired host.
 
 1. Untar the archive in the target directory.  The directory structure will look like:
     ```

http://git-wip-us.apache.org/repos/asf/metron/blob/ae05f38d/metron-interface/metron-rest/README.md
----------------------------------------------------------------------
diff --git a/metron-interface/metron-rest/README.md b/metron-interface/metron-rest/README.md
index 674f524..3309691 100644
--- a/metron-interface/metron-rest/README.md
+++ b/metron-interface/metron-rest/README.md
@@ -32,7 +32,7 @@ lib
 
 ### From Package Manager
 
-1. Deploy the RPM at `/incubator-metron/metron-deployment/packaging/docker/rpm-docker/target/RPMS/noarch/metron-rest-$METRON_VERSION-*.noarch.rpm`
+1. Deploy the RPM at `/metron/metron-deployment/packaging/docker/rpm-docker/target/RPMS/noarch/metron-rest-$METRON_VERSION-*.noarch.rpm`
 
 1. Install the RPM with:
   ```

http://git-wip-us.apache.org/repos/asf/metron/blob/ae05f38d/metron-interface/metron-rest/src/test/resources/README.vm
----------------------------------------------------------------------
diff --git a/metron-interface/metron-rest/src/test/resources/README.vm b/metron-interface/metron-rest/src/test/resources/README.vm
index 2d8fd75..e6e6472 100644
--- a/metron-interface/metron-rest/src/test/resources/README.vm
+++ b/metron-interface/metron-rest/src/test/resources/README.vm
@@ -32,7 +32,7 @@ lib
 
 #[[###]]# From Package Manager
 
-1. Deploy the RPM at `/incubator-metron/metron-deployment/packaging/docker/rpm-docker/target/RPMS/noarch/metron-rest-$METRON_VERSION-*.noarch.rpm`
+1. Deploy the RPM at `/metron/metron-deployment/packaging/docker/rpm-docker/target/RPMS/noarch/metron-rest-$METRON_VERSION-*.noarch.rpm`
 
 1. Install the RPM with:
    ```

http://git-wip-us.apache.org/repos/asf/metron/blob/ae05f38d/metron-interface/pom.xml
----------------------------------------------------------------------
diff --git a/metron-interface/pom.xml b/metron-interface/pom.xml
index 58e066f..4f3edea 100644
--- a/metron-interface/pom.xml
+++ b/metron-interface/pom.xml
@@ -26,10 +26,10 @@
     <description>Interfaces for Metron</description>
     <url>https://metron.apache.org/</url>
     <scm>
-        <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-metron.git</connection>
-        <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-metron.git</developerConnection>
+        <connection>scm:git:https://git-wip-us.apache.org/repos/asf/metron.git</connection>
+        <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/metron.git</developerConnection>
         <tag>HEAD</tag>
-        <url>https://git-wip-us.apache.org/repos/asf/incubator-metron</url>
+        <url>https://git-wip-us.apache.org/repos/asf/metron</url>
     </scm>
     <licenses>
         <license>

http://git-wip-us.apache.org/repos/asf/metron/blob/ae05f38d/metron-platform/metron-pcap-backend/src/main/config/zeppelin/metron/metron-pcap.json
----------------------------------------------------------------------
diff --git a/metron-platform/metron-pcap-backend/src/main/config/zeppelin/metron/metron-pcap.json b/metron-platform/metron-pcap-backend/src/main/config/zeppelin/metron/metron-pcap.json
index 8c853a5..c18b5fb 100644
--- a/metron-platform/metron-pcap-backend/src/main/config/zeppelin/metron/metron-pcap.json
+++ b/metron-platform/metron-pcap-backend/src/main/config/zeppelin/metron/metron-pcap.json
@@ -1 +1 @@
-{"paragraphs":[{"text":"%md\n# Execute Packet Capture Queries\n\nSpecify the following to filter the packet capture query:\n* *end time* - The ending time of the query in yyyyMMdd format (e.g. 20170428)\n* *start time* - The starting time of the query in yyyyMMdd format (e.g. 20170428)\n* *query* - The [Stellar](https://github.com/apache/incubator-metron/tree/master/metron-platform/metron-common#stellar-language) query (i.e. a Stellar expression that returns `true` or `false`) to specify the packets.\n\nThe available fields to use in the queries are as follows:\n* `ip_src_addr` - The source IP address of the packets filtered\n* `ip_src_port` - The source port of the packets filtered\n* `ip_dst_addr` - The destination IP address of the packets filtered\n* `ip_dst_port` - The destination port of the packets filtered\n* `packet` - The raw packet (for use with the `BYTEARRAY_MATCHER` function)\n\nYou can use any [Stellar function](https://github.com/apache/incubator-metron/tree/maste
 r/metron-platform/metron-common#stellar-core-functions)\n\n## Simple Boolean Expressions\n\nFor example:\n* `ip_dst_port == 8080` would return all packets where the destination port is `8080`\n* `ip_dst_port in [ 8080, 80 ]` would return all packets where the destination port is either `8080` or `80`\n\n## Common Network Functions on Metadata\n\nFor example:\n* `IN_SUBNET(ip_dst_addr, '192.168.0.0/24')` would return all packets whose destination conforms to the CIDR `192.168.0.0/24`\n* `IN_SUBNET(ip_dst_addr, '192.168.0.0/24') && ip_dst_port == 8080` would return all packets matching the CIDR and whose destination port is `8080`\n \n## Filtering based on the Packet Contents\n\nWe use byteseek regular expressions to filter packets.  The syntax for these is described [here](https://github.com/nishihatapalmer/byteseek/blob/master/sequencesyntax.md).\n* `BYTEARRAY_MATCHER('\\\\'/api/v1\\\\'', packet)` would return all packets that contain the string `/api/v1` in them anywhere.\n* `ip_ds
 t_port==8080 && BYTEARRAY_MATCHER('\\\\'/api/v1\\\\'', packet)` would return all packets that contain the string `/api/v1` and have a destination port of `8080`\n* `BYTEARRAY_MATCHER('ff(.){5}ff', packet)` would return all packets containing a binary regex with `0xff` followed by any 5 bytes and then `0xff`\n\n# The Output\nThe output will be a table of links to the various parts of the packet capture files.  The files will be named in temporal order.","dateUpdated":"2017-05-01T17:36:27+0000","config":{"colWidth":12,"editorMode":"ace/mode/markdown","editorHide":true,"graph":{"mode":"table","height":300,"optionOpen":false,"keys":[],"values":[],"groups":[],"scatter":{}},"enabled":true},"settings":{"params":{"query":"ip_dst_port==8080 && BYTEARRAY_MATCHER('\\\\\\'/api/v1/\\\\\\'', packet)"},"forms":{}},"jobName":"paragraph_1493658709556_1010155640","id":"20170428-183346_777875025","result":{"code":"SUCCESS","type":"HTML","msg":"<h1>Execute Packet Capture Queries</h1>\n<p>Specify the fo
 llowing to filter the packet capture query:</p>\n<ul>\n<li><em>end time</em> - The ending time of the query in yyyyMMdd format (e.g. 20170428)</li>\n<li><em>start time</em> - The starting time of the query in yyyyMMdd format (e.g. 20170428)</li>\n<li><em>query</em> - The <a href=\"https://github.com/apache/incubator-metron/tree/master/metron-platform/metron-common#stellar-language\">Stellar</a> query (i.e. a Stellar expression that returns <code>true</code> or <code>false</code>) to specify the packets.</li>\n</ul>\n<p>The available fields to use in the queries are as follows:</p>\n<ul>\n<li><code>ip_src_addr</code> - The source IP address of the packets filtered</li>\n<li><code>ip_src_port</code> - The source port of the packets filtered</li>\n<li><code>ip_dst_addr</code> - The destination IP address of the packets filtered</li>\n<li><code>ip_dst_port</code> - The destination port of the packets filtered</li>\n<li><code>packet</code> - The raw packet (for use with the <code>BYTEARR
 AY_MATCHER</code> function)</li>\n</ul>\n<p>You can use any <a href=\"https://github.com/apache/incubator-metron/tree/master/metron-platform/metron-common#stellar-core-functions\">Stellar function</a></p>\n<h2>Simple Boolean Expressions</h2>\n<p>For example:</p>\n<ul>\n<li><code>ip_dst_port == 8080</code> would return all packets where the destination port is <code>8080</code></li>\n<li><code>ip_dst_port in [ 8080, 80 ]</code> would return all packets where the destination port is either <code>8080</code> or <code>80</code></li>\n</ul>\n<h2>Common Network Functions on Metadata</h2>\n<p>For example:</p>\n<ul>\n<li><code>IN_SUBNET(ip_dst_addr, '192.168.0.0/24')</code> would return all packets whose destination conforms to the CIDR <code>192.168.0.0/24</code></li>\n<li><code>IN_SUBNET(ip_dst_addr, '192.168.0.0/24') &amp;&amp; ip_dst_port == 8080</code> would return all packets matching the CIDR and whose destination port is <code>8080</code></li>\n</ul>\n<h2>Filtering based on the Pack
 et Contents</h2>\n<p>We use byteseek regular expressions to filter packets.  The syntax for these is described <a href=\"https://github.com/nishihatapalmer/byteseek/blob/master/sequencesyntax.md\">here</a>.</p>\n<ul>\n<li><code>BYTEARRAY_MATCHER('\\\\'/api/v1\\\\'', packet)</code> would return all packets that contain the string <code>/api/v1</code> in them anywhere.</li>\n<li><code>ip_dst_port==8080 &amp;&amp; BYTEARRAY_MATCHER('\\\\'/api/v1\\\\'', packet)</code> would return all packets that contain the string <code>/api/v1</code> and have a destination port of <code>8080</code></li>\n<li><code>BYTEARRAY_MATCHER('ff(.){5}ff', packet)</code> would return all packets containing a binary regex with <code>0xff</code> followed by any 5 bytes and then <code>0xff</code></li>\n</ul>\n<h1>The Output</h1>\n<p>The output will be a table of links to the various parts of the packet capture files.  The files will be named in temporal order.</p>\n"},"dateCreated":"2017-05-01T17:11:49+0000","stat
 us":"FINISHED","progressUpdateIntervalMs":500,"$$hashKey":"object:1724","dateFinished":"2017-05-01T17:36:26+0000","dateStarted":"2017-05-01T17:36:26+0000","focus":true},{"text":"%sh\nexport PCAP_ZEPPELIN_RUN=$(find /usr -name pcap_zeppelin_run.sh)\nexport RECORDS_PER_FILE=10000\nexport NUMBER_OF_REDUCERS=10\nexport DATE_FORMAT=\"yyyyMMdd\"\nexport PCAP_DATA_PATH=\"/apps/metron/pcap\"\n\n$PCAP_ZEPPELIN_RUN \"${query}\" \"${start time}\" \"${optional end time}\"","dateUpdated":"2017-05-01T17:35:04+0000","config":{"colWidth":12,"editorMode":"ace/mode/sh","editorHide":false,"graph":{"mode":"table","height":164,"optionOpen":false,"keys":[{"name":"Packets conforming to BYTEARRAY_MATCHER('\\'/api/v1\\'', packet) && ip_dst_port == 8080 starting at 20170428 ending now","index":0,"aggr":"sum"}],"values":[],"groups":[],"scatter":{"xAxis":{"name":"Packets conforming to BYTEARRAY_MATCHER('\\'/api/v1\\'', packet) && ip_dst_port == 8080 starting at 20170428 ending now","index":0,"aggr":"sum"}}},"e
 nabled":true},"settings":{"params":{"start time":"20170428","end time":"","query":"BYTEARRAY_MATCHER('\\\\'/api/v1\\\\'', packet) && ip_dst_port == 8080","optional end time":""},"forms":{"optional end time":{"name":"optional end time","defaultValue":"","hidden":false},"query":{"name":"query","defaultValue":"","hidden":false},"start time":{"name":"start time","defaultValue":"","hidden":false}}},"jobName":"paragraph_1493658709562_1009386142","id":"20170428-181957_829993114","result":{"code":"SUCCESS","type":"TABLE","msg":"Packets conforming to BYTEARRAY_MATCHER('\\'/api/v1\\'', packet) && ip_dst_port == 8080 starting at 20170428 ending now\n%html <a href=\"http://node1:50070/webhdfs/v1/user/zeppelin/queries/pcap-data-20170501173442578/pcap-data-20170501173442578%2B0000.pcap?op=OPEN\">pcap-data-20170501173442578+0000.pcap</a>\n","comment":"","msgTable":[[{"value":"%html <a href=\"http://node1:50070/webhdfs/v1/user/zeppelin/queries/pcap-data-20170501173442578/pcap-data-20170501173442578
 %2B0000.pcap?op=OPEN\">pcap-data-20170501173442578+0000.pcap</a>"}]],"columnNames":[{"name":"Packets conforming to BYTEARRAY_MATCHER('\\'/api/v1\\'', packet) && ip_dst_port == 8080 starting at 20170428 ending now","index":0,"aggr":"sum"}],"rows":[["%html <a href=\"http://node1:50070/webhdfs/v1/user/zeppelin/queries/pcap-data-20170501173442578/pcap-data-20170501173442578%2B0000.pcap?op=OPEN\">pcap-data-20170501173442578+0000.pcap</a>"]]},"dateCreated":"2017-05-01T17:11:49+0000","dateStarted":"2017-05-01T17:35:04+0000","dateFinished":"2017-05-01T17:34:55+0000","status":"RUNNING","progressUpdateIntervalMs":500,"$$hashKey":"object:1725","focus":true},{"dateUpdated":"2017-05-01T17:34:55+0000","config":{"colWidth":12,"graph":{"mode":"table","height":300,"optionOpen":false,"keys":[],"values":[],"groups":[],"scatter":{}},"enabled":true,"editorMode":"ace/mode/markdown","editorHide":true},"settings":{"params":{},"forms":{}},"jobName":"paragraph_1493658709563_1009001393","id":"20170428-184335_
 1604096389","dateCreated":"2017-05-01T17:11:49+0000","status":"FINISHED","progressUpdateIntervalMs":500,"$$hashKey":"object:1726","dateFinished":"2017-05-01T17:34:54+0000","dateStarted":"2017-05-01T17:34:54+0000","result":{"code":"SUCCESS","type":"HTML","msg":"<h1>Troubleshooting</h1>\n<p>If you are having problems with the above form, the following may help.</p>\n<h2>I see <code>Terminated by SIGINTERRUPT</code> or something similar in the output!</h2>\n<p>PCAP filtering happens via a batch process and on busy systems, this can take some time.  You very well may need to request this of your system administrator.\n<br  />They can do this by changing the <code>shell.command.timeout.millisecs</code> property for the <code>sh</code> interpreter to a larger value, likely <code>100000</code>.</p>\n<h2>I do not see a table of URLs to pcap files in my output, what happened?</h2>\n<p>If an error happens, the log of the pcap querying utility will be displayed instead of an output.  Please co
 ntact an administrator with this output to debug further.</p>\n"},"text":"%md\n# Troubleshooting\n\nIf you are having problems with the above form, the following may help.\n\n## I see `Terminated by SIGINTERRUPT` or something similar in the output!\n\nPCAP filtering happens via a batch process and on busy systems, this can take some time.  You very well may need to request this of your system administrator.\nThey can do this by changing the `shell.command.timeout.millisecs` property for the `sh` interpreter to a larger value, likely `100000`.\n\n## I do not see a table of URLs to pcap files in my output, what happened?\n\nIf an error happens, the log of the pcap querying utility will be displayed instead of an output.  Please contact an administrator with this output to debug further.","focus":true},{"config":{"colWidth":12,"graph":{"mode":"table","height":300,"optionOpen":false,"keys":[],"values":[],"groups":[],"scatter":{}},"enabled":true},"settings":{"params":{},"forms":{}},"jobN
 ame":"paragraph_1493659778398_1082698332","id":"20170501-172938_213921861","dateCreated":"2017-05-01T17:29:38+0000","status":"READY","progressUpdateIntervalMs":500,"focus":true,"$$hashKey":"object:1972"}],"name":"metron/pcap","id":"2CEEXVR1W","angularObjects":{"2CFNGE6TP:shared_process":[],"2CGUX5TSW:shared_process":[],"2CETVR2AB:shared_process":[],"2CF163WFX:shared_process":[],"2CG4YXKUV:shared_process":[],"2CG6QDFF7:shared_process":[]},"config":{"looknfeel":"default"},"info":{}}
\ No newline at end of file
+{"paragraphs":[{"text":"%md\n# Execute Packet Capture Queries\n\nSpecify the following to filter the packet capture query:\n* *end time* - The ending time of the query in yyyyMMdd format (e.g. 20170428)\n* *start time* - The starting time of the query in yyyyMMdd format (e.g. 20170428)\n* *query* - The [Stellar](https://github.com/apache/metron/tree/master/metron-platform/metron-common#stellar-language) query (i.e. a Stellar expression that returns `true` or `false`) to specify the packets.\n\nThe available fields to use in the queries are as follows:\n* `ip_src_addr` - The source IP address of the packets filtered\n* `ip_src_port` - The source port of the packets filtered\n* `ip_dst_addr` - The destination IP address of the packets filtered\n* `ip_dst_port` - The destination port of the packets filtered\n* `packet` - The raw packet (for use with the `BYTEARRAY_MATCHER` function)\n\nYou can use any [Stellar function](https://github.com/apache/metron/tree/master/metron-platform/me
 tron-common#stellar-core-functions)\n\n## Simple Boolean Expressions\n\nFor example:\n* `ip_dst_port == 8080` would return all packets where the destination port is `8080`\n* `ip_dst_port in [ 8080, 80 ]` would return all packets where the destination port is either `8080` or `80`\n\n## Common Network Functions on Metadata\n\nFor example:\n* `IN_SUBNET(ip_dst_addr, '192.168.0.0/24')` would return all packets whose destination conforms to the CIDR `192.168.0.0/24`\n* `IN_SUBNET(ip_dst_addr, '192.168.0.0/24') && ip_dst_port == 8080` would return all packets matching the CIDR and whose destination port is `8080`\n \n## Filtering based on the Packet Contents\n\nWe use byteseek regular expressions to filter packets.  The syntax for these is described [here](https://github.com/nishihatapalmer/byteseek/blob/master/sequencesyntax.md).\n* `BYTEARRAY_MATCHER('\\\\'/api/v1\\\\'', packet)` would return all packets that contain the string `/api/v1` in them anywhere.\n* `ip_dst_port==8080 && BYTE
 ARRAY_MATCHER('\\\\'/api/v1\\\\'', packet)` would return all packets that contain the string `/api/v1` and have a destination port of `8080`\n* `BYTEARRAY_MATCHER('ff(.){5}ff', packet)` would return all packets containing a binary regex with `0xff` followed by any 5 bytes and then `0xff`\n\n# The Output\nThe output will be a table of links to the various parts of the packet capture files.  The files will be named in temporal order.","dateUpdated":"2017-05-01T17:36:27+0000","config":{"colWidth":12,"editorMode":"ace/mode/markdown","editorHide":true,"graph":{"mode":"table","height":300,"optionOpen":false,"keys":[],"values":[],"groups":[],"scatter":{}},"enabled":true},"settings":{"params":{"query":"ip_dst_port==8080 && BYTEARRAY_MATCHER('\\\\\\'/api/v1/\\\\\\'', packet)"},"forms":{}},"jobName":"paragraph_1493658709556_1010155640","id":"20170428-183346_777875025","result":{"code":"SUCCESS","type":"HTML","msg":"<h1>Execute Packet Capture Queries</h1>\n<p>Specify the following to filter th
 e packet capture query:</p>\n<ul>\n<li><em>end time</em> - The ending time of the query in yyyyMMdd format (e.g. 20170428)</li>\n<li><em>start time</em> - The starting time of the query in yyyyMMdd format (e.g. 20170428)</li>\n<li><em>query</em> - The <a href=\"https://github.com/apache/metron/tree/master/metron-platform/metron-common#stellar-language\">Stellar</a> query (i.e. a Stellar expression that returns <code>true</code> or <code>false</code>) to specify the packets.</li>\n</ul>\n<p>The available fields to use in the queries are as follows:</p>\n<ul>\n<li><code>ip_src_addr</code> - The source IP address of the packets filtered</li>\n<li><code>ip_src_port</code> - The source port of the packets filtered</li>\n<li><code>ip_dst_addr</code> - The destination IP address of the packets filtered</li>\n<li><code>ip_dst_port</code> - The destination port of the packets filtered</li>\n<li><code>packet</code> - The raw packet (for use with the <code>BYTEARRAY_MATCHER</code> function)</l
 i>\n</ul>\n<p>You can use any <a href=\"https://github.com/apache/metron/tree/master/metron-platform/metron-common#stellar-core-functions\">Stellar function</a></p>\n<h2>Simple Boolean Expressions</h2>\n<p>For example:</p>\n<ul>\n<li><code>ip_dst_port == 8080</code> would return all packets where the destination port is <code>8080</code></li>\n<li><code>ip_dst_port in [ 8080, 80 ]</code> would return all packets where the destination port is either <code>8080</code> or <code>80</code></li>\n</ul>\n<h2>Common Network Functions on Metadata</h2>\n<p>For example:</p>\n<ul>\n<li><code>IN_SUBNET(ip_dst_addr, '192.168.0.0/24')</code> would return all packets whose destination conforms to the CIDR <code>192.168.0.0/24</code></li>\n<li><code>IN_SUBNET(ip_dst_addr, '192.168.0.0/24') &amp;&amp; ip_dst_port == 8080</code> would return all packets matching the CIDR and whose destination port is <code>8080</code></li>\n</ul>\n<h2>Filtering based on the Packet Contents</h2>\n<p>We use byteseek reg
 ular expressions to filter packets.  The syntax for these is described <a href=\"https://github.com/nishihatapalmer/byteseek/blob/master/sequencesyntax.md\">here</a>.</p>\n<ul>\n<li><code>BYTEARRAY_MATCHER('\\\\'/api/v1\\\\'', packet)</code> would return all packets that contain the string <code>/api/v1</code> in them anywhere.</li>\n<li><code>ip_dst_port==8080 &amp;&amp; BYTEARRAY_MATCHER('\\\\'/api/v1\\\\'', packet)</code> would return all packets that contain the string <code>/api/v1</code> and have a destination port of <code>8080</code></li>\n<li><code>BYTEARRAY_MATCHER('ff(.){5}ff', packet)</code> would return all packets containing a binary regex with <code>0xff</code> followed by any 5 bytes and then <code>0xff</code></li>\n</ul>\n<h1>The Output</h1>\n<p>The output will be a table of links to the various parts of the packet capture files.  The files will be named in temporal order.</p>\n"},"dateCreated":"2017-05-01T17:11:49+0000","status":"FINISHED","progressUpdateIntervalMs
 ":500,"$$hashKey":"object:1724","dateFinished":"2017-05-01T17:36:26+0000","dateStarted":"2017-05-01T17:36:26+0000","focus":true},{"text":"%sh\nexport PCAP_ZEPPELIN_RUN=$(find /usr -name pcap_zeppelin_run.sh)\nexport RECORDS_PER_FILE=10000\nexport NUMBER_OF_REDUCERS=10\nexport DATE_FORMAT=\"yyyyMMdd\"\nexport PCAP_DATA_PATH=\"/apps/metron/pcap\"\n\n$PCAP_ZEPPELIN_RUN \"${query}\" \"${start time}\" \"${optional end time}\"","dateUpdated":"2017-05-01T17:35:04+0000","config":{"colWidth":12,"editorMode":"ace/mode/sh","editorHide":false,"graph":{"mode":"table","height":164,"optionOpen":false,"keys":[{"name":"Packets conforming to BYTEARRAY_MATCHER('\\'/api/v1\\'', packet) && ip_dst_port == 8080 starting at 20170428 ending now","index":0,"aggr":"sum"}],"values":[],"groups":[],"scatter":{"xAxis":{"name":"Packets conforming to BYTEARRAY_MATCHER('\\'/api/v1\\'', packet) && ip_dst_port == 8080 starting at 20170428 ending now","index":0,"aggr":"sum"}}},"enabled":true},"settings":{"params":{"sta
 rt time":"20170428","end time":"","query":"BYTEARRAY_MATCHER('\\\\'/api/v1\\\\'', packet) && ip_dst_port == 8080","optional end time":""},"forms":{"optional end time":{"name":"optional end time","defaultValue":"","hidden":false},"query":{"name":"query","defaultValue":"","hidden":false},"start time":{"name":"start time","defaultValue":"","hidden":false}}},"jobName":"paragraph_1493658709562_1009386142","id":"20170428-181957_829993114","result":{"code":"SUCCESS","type":"TABLE","msg":"Packets conforming to BYTEARRAY_MATCHER('\\'/api/v1\\'', packet) && ip_dst_port == 8080 starting at 20170428 ending now\n%html <a href=\"http://node1:50070/webhdfs/v1/user/zeppelin/queries/pcap-data-20170501173442578/pcap-data-20170501173442578%2B0000.pcap?op=OPEN\">pcap-data-20170501173442578+0000.pcap</a>\n","comment":"","msgTable":[[{"value":"%html <a href=\"http://node1:50070/webhdfs/v1/user/zeppelin/queries/pcap-data-20170501173442578/pcap-data-20170501173442578%2B0000.pcap?op=OPEN\">pcap-data-2017050
 1173442578+0000.pcap</a>"}]],"columnNames":[{"name":"Packets conforming to BYTEARRAY_MATCHER('\\'/api/v1\\'', packet) && ip_dst_port == 8080 starting at 20170428 ending now","index":0,"aggr":"sum"}],"rows":[["%html <a href=\"http://node1:50070/webhdfs/v1/user/zeppelin/queries/pcap-data-20170501173442578/pcap-data-20170501173442578%2B0000.pcap?op=OPEN\">pcap-data-20170501173442578+0000.pcap</a>"]]},"dateCreated":"2017-05-01T17:11:49+0000","dateStarted":"2017-05-01T17:35:04+0000","dateFinished":"2017-05-01T17:34:55+0000","status":"RUNNING","progressUpdateIntervalMs":500,"$$hashKey":"object:1725","focus":true},{"dateUpdated":"2017-05-01T17:34:55+0000","config":{"colWidth":12,"graph":{"mode":"table","height":300,"optionOpen":false,"keys":[],"values":[],"groups":[],"scatter":{}},"enabled":true,"editorMode":"ace/mode/markdown","editorHide":true},"settings":{"params":{},"forms":{}},"jobName":"paragraph_1493658709563_1009001393","id":"20170428-184335_1604096389","dateCreated":"2017-05-01T17
 :11:49+0000","status":"FINISHED","progressUpdateIntervalMs":500,"$$hashKey":"object:1726","dateFinished":"2017-05-01T17:34:54+0000","dateStarted":"2017-05-01T17:34:54+0000","result":{"code":"SUCCESS","type":"HTML","msg":"<h1>Troubleshooting</h1>\n<p>If you are having problems with the above form, the following may help.</p>\n<h2>I see <code>Terminated by SIGINTERRUPT</code> or something similar in the output!</h2>\n<p>PCAP filtering happens via a batch process and on busy systems, this can take some time.  You very well may need to request this of your system administrator.\n<br  />They can do this by changing the <code>shell.command.timeout.millisecs</code> property for the <code>sh</code> interpreter to a larger value, likely <code>100000</code>.</p>\n<h2>I do not see a table of URLs to pcap files in my output, what happened?</h2>\n<p>If an error happens, the log of the pcap querying utility will be displayed instead of an output.  Please contact an administrator with this output 
 to debug further.</p>\n"},"text":"%md\n# Troubleshooting\n\nIf you are having problems with the above form, the following may help.\n\n## I see `Terminated by SIGINTERRUPT` or something similar in the output!\n\nPCAP filtering happens via a batch process and on busy systems, this can take some time.  You very well may need to request this of your system administrator.\nThey can do this by changing the `shell.command.timeout.millisecs` property for the `sh` interpreter to a larger value, likely `100000`.\n\n## I do not see a table of URLs to pcap files in my output, what happened?\n\nIf an error happens, the log of the pcap querying utility will be displayed instead of an output.  Please contact an administrator with this output to debug further.","focus":true},{"config":{"colWidth":12,"graph":{"mode":"table","height":300,"optionOpen":false,"keys":[],"values":[],"groups":[],"scatter":{}},"enabled":true},"settings":{"params":{},"forms":{}},"jobName":"paragraph_1493659778398_1082698332
 ","id":"20170501-172938_213921861","dateCreated":"2017-05-01T17:29:38+0000","status":"READY","progressUpdateIntervalMs":500,"focus":true,"$$hashKey":"object:1972"}],"name":"metron/pcap","id":"2CEEXVR1W","angularObjects":{"2CFNGE6TP:shared_process":[],"2CGUX5TSW:shared_process":[],"2CETVR2AB:shared_process":[],"2CF163WFX:shared_process":[],"2CG4YXKUV:shared_process":[],"2CG6QDFF7:shared_process":[]},"config":{"looknfeel":"default"},"info":{}}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/metron/blob/ae05f38d/metron-platform/pom.xml
----------------------------------------------------------------------
diff --git a/metron-platform/pom.xml b/metron-platform/pom.xml
index cc48851..718c7be 100644
--- a/metron-platform/pom.xml
+++ b/metron-platform/pom.xml
@@ -27,10 +27,10 @@
 	<description>Stream analytics for Metron</description>
 	<url>https://metron.apache.org/</url>
 	<scm>
-		<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-metron.git</connection>
-		<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-metron.git</developerConnection>
+		<connection>scm:git:https://git-wip-us.apache.org/repos/asf/metron.git</connection>
+		<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/metron.git</developerConnection>
 		<tag>HEAD</tag>
-		<url>https://git-wip-us.apache.org/repos/asf/incubator-metron</url>
+		<url>https://git-wip-us.apache.org/repos/asf/metron</url>
 	</scm>
 
 	<licenses>

http://git-wip-us.apache.org/repos/asf/metron/blob/ae05f38d/metron-sensors/fastcapa/README.md
----------------------------------------------------------------------
diff --git a/metron-sensors/fastcapa/README.md b/metron-sensors/fastcapa/README.md
index 5efdb3f..707b491 100644
--- a/metron-sensors/fastcapa/README.md
+++ b/metron-sensors/fastcapa/README.md
@@ -181,7 +181,7 @@ The probe has been tested with [Librdkafka 0.9.4](https://github.com/edenhill/li
 
 2. Build Fastcapa.  The resulting binary will be placed at `build/app/fastcapa`.
     ```
-    cd incubator-metron/metron-sensors/fastcapa
+    cd metron/metron-sensors/fastcapa
     make
     ```
     

http://git-wip-us.apache.org/repos/asf/metron/blob/ae05f38d/metron-sensors/pycapa/README.md
----------------------------------------------------------------------
diff --git a/metron-sensors/pycapa/README.md b/metron-sensors/pycapa/README.md
index 1e8c2c5..6f41d63 100644
--- a/metron-sensors/pycapa/README.md
+++ b/metron-sensors/pycapa/README.md
@@ -12,7 +12,7 @@ Pycapa
 Overview
 ========
 
-Pycapa performs network packet capture, both off-the-wire and from a Kafka topic, which is useful for the testing and development of [Apache Metron](https://github.com/apache/incubator-metron).  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 [libpcap-compliant file](https://wiki.wireshark.org/Development/LibpcapFileFormat) or even to feed directly into a tool like Wireshark to monitor ongoing activity.
+Pycapa performs network packet capture, both off-the-wire and from a Kafka topic, which is useful for the testing and development of [Apache Metron](https://github.com/apache/metron).  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 [libpcap-compliant file](https://wiki.wireshark.org/Development/LibpcapFileFormat) or even to feed directly into a tool like Wireshark to monitor ongoing activity.
 
 Installation
 ============
@@ -55,7 +55,7 @@ General notes on the installation of Pycapa.
 1. Install Pycapa.  This assumes that you already have the Metron source code on the host.
 
     ```
-    cd incubator-metron/metron-sensors/pycapa
+    cd metron/metron-sensors/pycapa
     pip install -r requirements.txt
     python setup.py install
     ```

http://git-wip-us.apache.org/repos/asf/metron/blob/ae05f38d/site-book/README.md
----------------------------------------------------------------------
diff --git a/site-book/README.md b/site-book/README.md
index bf579de..52aae51 100644
--- a/site-book/README.md
+++ b/site-book/README.md
@@ -12,7 +12,7 @@ The site-book is also part of the Maven site lifecycle, and will be included by
 
 To build only the book, do the following:
 
-In any git clone of incubator-metron containing the site-book subdirectory,
+In any git clone of metron containing the site-book subdirectory,
 
 ```
 cd site-book
@@ -22,7 +22,7 @@ mvn site
 It only takes a few seconds. You may now view your copy of the book in a browser by opening 
 
 ```
-file:///your/path/to/incubator-metron/site-book/target/site/index.html
+file:///your/path/to/metron/site-book/target/site/index.html
 ```
 
 On a Mac, you can just type the following on the command line

http://git-wip-us.apache.org/repos/asf/metron/blob/ae05f38d/site-book/pom.xml
----------------------------------------------------------------------
diff --git a/site-book/pom.xml b/site-book/pom.xml
index 71e4879..a6e4873 100644
--- a/site-book/pom.xml
+++ b/site-book/pom.xml
@@ -27,10 +27,10 @@
 	<description>User Documentation for Metron</description>
 	<url>https://metron.apache.org/</url>
 	<scm>
-		<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-metron.git</connection>
-		<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-metron.git</developerConnection>
+		<connection>scm:git:https://git-wip-us.apache.org/repos/asf/metron.git</connection>
+		<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/metron.git</developerConnection>
 		<tag>HEAD</tag>
-		<url>https://git-wip-us.apache.org/repos/asf/incubator-metron</url>
+		<url>https://git-wip-us.apache.org/repos/asf/metron</url>
 	</scm>
 
 	<licenses>

http://git-wip-us.apache.org/repos/asf/metron/blob/ae05f38d/site/BUILD.md
----------------------------------------------------------------------
diff --git a/site/BUILD.md b/site/BUILD.md
index 20c0f5e..6475d55 100644
--- a/site/BUILD.md
+++ b/site/BUILD.md
@@ -6,7 +6,7 @@ This directory contains the code for the Apache Metron web site,
 ## Setup
 
 1. `cd site`
-2. `git clone https://git-wip-us.apache.org/repos/asf/incubator-metron.git -b asf-site target`
+2. `git clone https://git-wip-us.apache.org/repos/asf/metron.git -b asf-site target`
 3. `sudo gem install bundler`
 4. `sudo gem install github-pages jekyll`
 4. `bundle install`

http://git-wip-us.apache.org/repos/asf/metron/blob/ae05f38d/site/README.md
----------------------------------------------------------------------
diff --git a/site/README.md b/site/README.md
index fd2d8cc..2d3d943 100644
--- a/site/README.md
+++ b/site/README.md
@@ -4,4 +4,4 @@ This branch contains the generated HTML for the
 [Metron website](https://metron.apache.org).
 
 You are probably looking for the
-[Metron master branch](https://github.com/apache/incubator-metron/tree/master).
+[Metron master branch](https://github.com/apache/metron/tree/master).

http://git-wip-us.apache.org/repos/asf/metron/blob/ae05f38d/site/_config.yml
----------------------------------------------------------------------
diff --git a/site/_config.yml b/site/_config.yml
index cfc3054..0ddd560 100644
--- a/site/_config.yml
+++ b/site/_config.yml
@@ -3,7 +3,7 @@ highlighter: rouge
 permalink: /news/:year/:month/:day/:title/
 excerpt_separator: ""
 
-repository: https://github.com/apache/incubator-metron
+repository: https://github.com/apache/metron
 destination: target
 exclude: [BUILD.md, Gemfile*]
 keep_files: [.git]

http://git-wip-us.apache.org/repos/asf/metron/blob/ae05f38d/site/community/index.md
----------------------------------------------------------------------
diff --git a/site/community/index.md b/site/community/index.md
index ac61708..5797ef2 100644
--- a/site/community/index.md
+++ b/site/community/index.md
@@ -117,11 +117,11 @@ title: Apache Metron Community
             <h4> General & Public Discussion </h4>
                 [<a href="mailto:user-subscribe@metron.apache.org">Subscribe</a>]
                 [<a href="mailto:user-unsubscribe@metron.apache.org">Unsubscribe</a>]
-                [<a href="http://mail-archives.apache.org/mod_mbox/incubator-metron-user/">Archives</a>]
+                [<a href="http://mail-archives.apache.org/mod_mbox/metron-user/">Archives</a>]
             <h4> Code & Documentation Change </h4>
                 [<a href="mailto:dev-subscribe@metron.apache.org">Subscribe</a>]
                 [<a href="mailto:dev-unsubscribe@metron.apache.org">Unsubscribe</a>]
-                [<a href="http://mail-archives.apache.org/mod_mbox/incubator-metron-dev/">Archives</a>]
+                [<a href="http://mail-archives.apache.org/mod_mbox/metron-dev/">Archives</a>]
         </div>
 </section>
 

http://git-wip-us.apache.org/repos/asf/metron/blob/ae05f38d/site/develop/index.md
----------------------------------------------------------------------
diff --git a/site/develop/index.md b/site/develop/index.md
index ca917fa..7db04fa 100644
--- a/site/develop/index.md
+++ b/site/develop/index.md
@@ -30,11 +30,11 @@ George Vetticaden       | gvetticaden    | PMC
 There are several development mailing lists for Metron
 
 * [dev@metron.apache.org](mailto:dev@metron.apache.org) - Development discussions
-  with archive [here](https://mail-archives.apache.org/mod_mbox/incubator-metron-dev/)
+  with archive [here](https://mail-archives.apache.org/mod_mbox/metron-dev/)
 * [issues@metron.apache.org](mailto:issues@metron.apache.org) - Bug tracking
-  with archive [here](https://mail-archives.apache.org/mod_mbox/incubator-metron-issues/)
+  with archive [here](https://mail-archives.apache.org/mod_mbox/metron-issues/)
 * [commits@metron.apache.org](mailto:commits@metron.apache.org) - Git tracking
-  with archive [here](https://mail-archives.apache.org/mod_mbox/incubator-metron-commits/)
+  with archive [here](https://mail-archives.apache.org/mod_mbox/metron-commits/)
 
 You can subscribe to the lists by sending email to
 *list*-subscribe@metron.apache.org and unsubscribe by sending email to
@@ -44,13 +44,13 @@ You can subscribe to the lists by sending email to
 
 Metron uses git for version control. Get the source code:
 
-`% git clone https://git-wip-us.apache.org/repos/asf/incubator-metron.git`
+`% git clone https://git-wip-us.apache.org/repos/asf/metron.git`
 
 The important branches are:
 
-* [master](https://github.com/apache/incubator-metron/tree/master) -
+* [master](https://github.com/apache/metron/tree/master) -
   The trunk for all developement
-* [asf-site](https://github.com/apache/incubator-metron/tree/asf-site) -
+* [asf-site](https://github.com/apache/metron/tree/asf-site) -
   The pages that are deployed to https://metron.apache.org/
 
 Please check our [coding guidelines](/develop/coding.html).

http://git-wip-us.apache.org/repos/asf/metron/blob/ae05f38d/site/help/index.md
----------------------------------------------------------------------
diff --git a/site/help/index.md b/site/help/index.md
index c91f4e1..00a3f4c 100644
--- a/site/help/index.md
+++ b/site/help/index.md
@@ -10,7 +10,7 @@ Need help with Metron? Try these resources.
 The best option is to send email to the user list
 [user@metron.apache.org](mailto:user@metron.apache.org), which is for user
 discussions. All of the historic traffic is available in the
-[archive](http://mail-archives.apache.org/mod_mbox/incubator-metron-user/). To
+[archive](http://mail-archives.apache.org/mod_mbox/metron-user/). To
 subscribe to the user list, please send email to
 [user-subscribe@metron.apache.org](mailto:user-subscribe@metron.apache.org).
 
@@ -29,4 +29,4 @@ your question.
 ## Browse the code
 
 One of the advantages of open source software is that you can browse the code.
-The code is available on [github](https://github.com/apache/incubator-metron/tree/master).
+The code is available on [github](https://github.com/apache/metron/tree/master).

http://git-wip-us.apache.org/repos/asf/metron/blob/ae05f38d/site/index.html
----------------------------------------------------------------------
diff --git a/site/index.html b/site/index.html
index 4800e4d..0157ea7 100644
--- a/site/index.html
+++ b/site/index.html
@@ -12,7 +12,7 @@ overview: true
         <div class="v-middle-inner">
             <div class="v-middle">
               <h1>real-time big data security </h1>
-                <a href="https://github.com/apache/incubator-metron" target="_blank"><button type="button" class="button-default">GitHub</button></a>
+                <a href="https://github.com/apache/metron" target="_blank"><button type="button" class="button-default">GitHub</button></a>
                 <a href="https://cwiki.apache.org/confluence/display/METRON/Community+Resources" target="_blank"><button type="button" class="button-default">Community Home</button></a>