You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ex...@apache.org on 2024/01/08 19:42:58 UTC

(nifi-site) 01/06: MINIFICPP-2273 Updated and Restructed MiNiFi Documentation

This is an automated email from the ASF dual-hosted git repository.

exceptionfactory pushed a commit to branch main-staging
in repository https://gitbox.apache.org/repos/asf/nifi-site.git

commit c59633713057a8b1c7b7c940aa1b78a03b33d3b0
Author: Martin Zink <ma...@apache.org>
AuthorDate: Tue Dec 12 23:26:07 2023 -0600

    MINIFICPP-2273 Updated and Restructed MiNiFi Documentation
    
    This closes #79
    
    Signed-off-by: David Handermann <ex...@apache.org>
    (cherry picked from commit e35683afd80eea0e1f1ff4462965f7e8f87de608)
---
 config.toml                                        |   6 +
 layouts/partials/minifi-topbar.html                |  28 ++--
 layouts/shortcodes/cpp-download-links.html         |  11 +-
 source/minifi/__index.md                           |  25 ++--
 source/minifi/cpp-download.md                      |  33 +++++
 source/minifi/faq.md                               |  11 --
 source/minifi/getting-started.md                   | 124 ------------------
 source/minifi/{download.md => java-download.md}    |  29 +----
 ...va-agent-quick-start.md => java-quick-start.md} |  40 +++---
 ...m-admin-guide.md => java-system-admin-guide.md} |  14 +-
 .../minifi/{minifi-toolkit.md => java-toolkit.md}  |  34 +----
 source/people.md                                   | 142 ++++++++++-----------
 12 files changed, 168 insertions(+), 329 deletions(-)

diff --git a/config.toml b/config.toml
index 1adcf53..f43c3d8 100644
--- a/config.toml
+++ b/config.toml
@@ -51,3 +51,9 @@ currentProjectVersion = "2.0.0-M1"
 currentProjectVersionReleased = "2023-11-25"
 previousProjectVersion = "1.24.0"
 previousProjectVersionReleased = "2023-11-27"
+
+minifiCppCurrentProjectVersion = "0.15.0"
+minifiCppCurrentProjectVersionReleased = "2023-09-01"
+
+minifiCppPreviousProjectVersion = "0.14.0"
+minifiCppPreviousProjectVersionReleased = "2023-04-17"
diff --git a/layouts/partials/minifi-topbar.html b/layouts/partials/minifi-topbar.html
index bbfcdfe..639c9b8 100644
--- a/layouts/partials/minifi-topbar.html
+++ b/layouts/partials/minifi-topbar.html
@@ -16,30 +16,32 @@
             <!-- Right Nav Section -->
             <ul class="right">
                 <li class="has-dropdown">
-                    <a href="#">Documentation</a>
+                    <a href="#">MiNiFi Java</a>
                     <ul class="dropdown">
-                        <li><a href="getting-started.html"><i class="fa"></i>Getting Started</a></li>
-                        <li><a href="minifi-java-agent-quick-start.html"><i class="fa"></i>MiNiFi Java Quick Start Guide</a></li>
-                        <li><a href="system-admin-guide.html"><i class="fa"></i>Administrator's Guide</a></li>
-                        <li><a href="minifi-toolkit.html"><i class="fa"></i>Converter Toolkit</a></li>
-                        <li><a href="faq.html"><i class="fa"></i>FAQ</a></li>
-                        <li><a href="https://cwiki.apache.org/confluence/display/MiNiFi"><i class="fa fa-external-link external-link"></i>Wiki</a></li>
+                        <li><a href="java-quick-start.html"><i class="fa"></i>Quick Start</a></li>
+                        <li><a href="java-toolkit.html"><i class="fa"></i>Converter Toolkit</a></li>
+                        <li><a href="java-system-admin-guide.html"><i class="fa"></i>Administrator's Guide</a></li>
+                        <li><a href="java-download.html"><i class="fa fa-download external-link"></i>Download</a></li>
                     </ul>
                 </li>
                 <li class="has-dropdown">
-                    <a href="#">Downloads</a>
+                    <a href="#">MiNiFi C++</a>
                     <ul class="dropdown">
-                        <li><a href="download.html">Download MiNiFi Components</a></li>
-                        <li><a href="https://cwiki.apache.org/confluence/display/MINIFI/Release+Notes"><i class="fa fa-external-link external-link"></i>MiNiFi Java Release Notes</a></li>
-                        <li><a href="https://cwiki.apache.org/confluence/display/MINIFI/Release+Notes#ReleaseNotes-MiNiFi(C++)"><i class="fa fa-external-link external-link"></i>MiNiFi C++ Release Notes</a></li>
+                        <li><a href="https://github.com/apache/nifi-minifi-cpp?tab=readme-ov-file#installing-as-a-service"><i class="fa fa-external-link external-link"></i>Installation</a></li>
+                        <li><a href="https://github.com/apache/nifi-minifi-cpp/blob/main/CONFIGURE.md"><i class="fa fa-external-link external-link"></i>Configuration</a></li>
+                        <li><a href="https://github.com/apache/nifi-minifi-cpp/blob/main/PROCESSORS.md"><i class="fa fa-external-link external-link"></i>Processors</a></li>
+                        <li><a href="https://github.com/apache/nifi-minifi-cpp/blob/main/examples/README.md"><i class="fa fa-external-link external-link"></i>Examples</a></li>
+                        <li><a href="cpp-download.html"><i class="fa fa-download external-link"></i>Download</a></li>
                     </ul>
                 </li>
+
                 <li class="has-dropdown">
                     <a href="#">Community</a>
                     <ul class="dropdown">
                         <li><a href="https://cwiki.apache.org/confluence/display/NIFI/Contributor+Guide"><i class="fa fa-external-link external-link"></i>Contributor Guide</a></li>
                         <li><a href="../mailing_lists.html">Mailing Lists &amp; Chat</a></li>
                         <li><a href="../people.html">People</a></li>
+                        <li><a href="https://cwiki.apache.org/confluence/display/MiNiFi"><i class="fa fa-external-link external-link"></i>Wiki</a></li>
                     </ul>
                 </li>
                 <li class="has-dropdown">
@@ -48,9 +50,9 @@
                         <li><a href="../release-guide.html">Release Guide</a></li>
                         <li><a href="../licensing-guide.html">Licensing Guide</a></li>
                         <li><a href="https://gitbox.apache.org/repos/asf?p=nifi.git"><i class="fa fa-external-link external-link"></i>Source - Java Agent</a></li>
-                        <li><a href="https://github.com/apache/nifi"><i class="fa fa-external-link external-link"></i>Source - GitHub - Java Agent</a></li>
+                        <li><a href="https://github.com/apache/nifi"><i class="fa fa-github external-link"></i>Source - GitHub - Java Agent</a></li>
                         <li><a href="https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git"><i class="fa fa-external-link external-link"></i>Source - C++ Agent</a></li>
-                        <li><a href="https://github.com/apache/nifi-minifi-cpp"><i class="fa fa-external-link external-link"></i>Source - GitHub - C++ Agent</a></li>
+                        <li><a href="https://github.com/apache/nifi-minifi-cpp"><i class="fa fa-github external-link"></i>Source - GitHub - C++ Agent</a></li>
                         <li><a href="https://issues.apache.org/jira/issues/?jql=project%20%3D%20NIFI%20AND%20resolution%20%3D%20Unresolved%20AND%20component%20%3D%20%22MiNiFi%22%20ORDER%20BY%20priority%20DESC%2C%20updated%20DESC"><i class="fa fa-external-link external-link"></i>MiNiFi Java Issues</a></li>
                         <li><a href="https://issues.apache.org/jira/browse/MINIFICPP"><i class="fa fa-external-link external-link"></i>MiNiFi C++ Issues</a></li>
                     </ul>
diff --git a/layouts/shortcodes/cpp-download-links.html b/layouts/shortcodes/cpp-download-links.html
index f19dac8..5f8f620 100644
--- a/layouts/shortcodes/cpp-download-links.html
+++ b/layouts/shortcodes/cpp-download-links.html
@@ -1,14 +1,9 @@
 {{- $primaryDownloadUrl := (.Site.Params.dynamicDownloadPathUrl) -}}
 {{- $secondaryDownloadUrl := (.Site.Params.downloadPathUrl) -}}
+{{- $downloadVersion := (.Site.Params.minifiCppCurrentProjectVersion) -}}
 
-{{- if eq (.Get "site") "archives" -}}
-  {{- $primaryDownloadUrl = (.Site.Params.archiveDownloadPathUrl) -}}
-  {{- $secondaryDownloadUrl = (.Site.Params.archiveDownloadPathUrl) -}}
-{{- end -}}
-
-{{- $downloadVersion := "" -}}
-{{- with .Get "version" -}}
-  {{- $downloadVersion = . -}}
+{{- if eq (.Get "version") "previous" -}}
+  {{- $downloadVersion = (.Site.Params.minifiCppPreviousProjectVersion) -}}
 {{- end -}}
 
 {{- $extension := "" -}}
diff --git a/source/minifi/__index.md b/source/minifi/__index.md
index 090f133..b51c4e3 100644
--- a/source/minifi/__index.md
+++ b/source/minifi/__index.md
@@ -11,17 +11,20 @@ containerEnabled: true
 
 <p class="description">A subproject of Apache NiFi to collect data from the point of origin.</p>
 
-# Features
+## Overview
 
-MiNiFi - a subproject of Apache NiFi - is a complementary data collection approach that supplements the core tenets of
-NiFi in dataflow management, focusing on the collection of data at the source of its creation.
+Apache NiFi MiNiFi is an Apache NiFi project, designed to collect data at its source. MiNiFi was developed with the following objectives in mind:
+* Small and lightweight footprint
+* Central agent management
+* Data provenance generation
+* NiFi integration for follow-on dataflow management and chain of custody information
 
-Apache NiFi MiNiFi provides the following features:
+### MiNiFi Java
+The Java agent is built from the same codebase as NiFi, enabling it to run most of [NiFi's processors](http://nifi.apache.org/docs.html).
+However, it results in a larger binary distribution, consumes greater system resources, and requires JRE, compared to MiNiFi C++.
+If you require maximum flexibility to make routing and processing decisions at your data's point of origin, the Java agent is a good fit.
 
-- Small size and low resource consumption
-- Central management of agents
-- Generation of data provenance with full chain of custody of information
-- Integration with NiFi for follow-on dataflow management
-
-MiNiFi functions in the role of an agent acting immediately at, or directly adjacent to, source sensors, systems, or
-servers.
+### MiNiFi C++
+The C++ agent is a native reimplementation of MiNiFi Java.
+Due to the absence of a JVM, it consumes fewer system resources but has a [limited subset of processors](https://github.com/apache/nifi-minifi-cpp/blob/main/PROCESSORS.md), and their properties might slightly differ from NiFi.
+If your primary concern is gathering and pushing data to downstream consumers while minimizing system impact, the C++ agent is a good fit.
diff --git a/source/minifi/cpp-download.md b/source/minifi/cpp-download.md
new file mode 100644
index 0000000..54e8c28
--- /dev/null
+++ b/source/minifi/cpp-download.md
@@ -0,0 +1,33 @@
+---
+title: Apache NiFi MiNiFi C++ Downloads
+menu: minifi-topbar.html
+containerEnabled: true
+---
+
+# Apache {{< project-label >}} MiNiFi C++ Downloads
+
+Apache NiFi [Project Keys](https://downloads.apache.org/nifi/KEYS) can be used to
+[verify downloads](https://www.apache.org/info/verification.html).
+
+Please allow up to 24 hours for mirrors to synchronize following the release of a new version.
+
+Previous releases can be found in [release archives](https://archive.apache.org/dist/nifi/).
+Please avoid repeated downloads from archives to avoid infrastructure rate limits.
+
+## {{< param minifiCppCurrentProjectVersion >}}
+
+- Released: {{< param minifiCppCurrentProjectVersionReleased >}}
+  - [Release Notes](https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=65145325#ReleaseNotesMiNiFi(C++)-Versioncpp-{{< param minifiCppCurrentProjectVersion >}})
+- Sources
+  - {{< cpp-download-links label="Apache NiFi MiNiFi C++ Sources" extension=source.tar.gz >}}
+- Binaries
+  - {{< cpp-download-links label="Apache NiFi MiNiFi C++ Binary for Linux x86_64" extension=bin.tar.gz >}}
+
+## {{< param minifiCppPreviousProjectVersion >}}
+
+- Released: {{< param minifiCppPreviousProjectVersionReleased >}}
+  - [Release Notes](https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=65145325#ReleaseNotesMiNiFi(C++)-Versioncpp-{{< param minifiCppPreviousProjectVersion >}})
+- Sources
+  - {{< cpp-download-links label="Apache NiFi MiNiFi C++ Sources" version=previous extension=source.tar.gz >}}
+- Binaries
+  - {{< cpp-download-links label="Apache NiFi MiNiFi C++ Binary for Linux x86_64" version=previous extension=bin-linux.tar.gz >}}
diff --git a/source/minifi/faq.md b/source/minifi/faq.md
deleted file mode 100644
index 7cccfd9..0000000
--- a/source/minifi/faq.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-title: Apache NiFi MiNiFi FAQ
-menu: minifi-topbar.html
-containerEnabled: true
----
-
-# Apache {{< project-label >}} MiNiFi FAQ
-
-### How do you pronounce MiNiFi?
-
-"minify" (_min_-uh-fahy) is the preferred pronunciation.
diff --git a/source/minifi/getting-started.md b/source/minifi/getting-started.md
deleted file mode 100644
index bdded94..0000000
--- a/source/minifi/getting-started.md
+++ /dev/null
@@ -1,124 +0,0 @@
----
-title:     Apache NiFi MiNiFi Getting Started
-menu: minifi-topbar.html
-containerEnabled: true
----
-
-# Getting started with MiNiFi
-
-This page explains how to configure and deploy MiNiFi agents.
-
-The Java agent is able to run most of [NiFi's available processors](http://nifi.apache.org/docs.html), but is a larger binary distribution (49MB) and consumes greater system resources (24MB max JVM heapsize by default). If you need maximum flexibility to make routing and processing decisions at your data's point of origin, the Java agent is a good fit.
-
-The C++ agent is a smaller binary (3.2MB), consumes low system memory (about 5MB at idle) but has [a limited subset of processors](https://github.com/apache/nifi-minifi-cpp#caveats). If your primary concern is gathering and pushing data to downstream consumers and minimizing system impact, the C++ agent is a good fit.
-
-
-1. Install the appropriate OS level dependencies:
-
-  #### MiNiFi Java:
-
-  - Java 1.8+
-
-  #### MiNiFi C++:
-   ###### RHEL/CentOS:
-   - yum install -y epel-release
-   - yum install -y leveldb
-
-   ###### Debian/Ubuntu:
-   - apt install -y libleveldb-dev
-   - apt install -y libxml2
-2. Download the relevant compressed binary from the [Downloads](download.html) page
-3. Copy and decompress the binary to your target deployment environment
-4. Set the MINIFI_HOME environment variable to your decompressed binary directory
-5. From $MINIFI_HOME, ./bin/minifi.sh {start|stop|run|restart|status|flowStatus|dump|install}
-
-*flowStatus* and *dump* are available only for MiNiFi Java.
-
-For MiNiFi Java, the agent logs to $MINIFI_HOME/logs/minifi-app.log.
-
-For MiNiFi C++, the agent logs to $MINIFI_HOME/minifi-app.log.txt
-
-# Configuring MiNiFi Agent Flows
-
-Agents execute the flow defined in $MINIFI_HOME/conf/config.yml. The shipped config.yml file has an "empty" flow.
-
-While it's possible to create and modify config.yml programmatically or by hand, the more common scenario is to:
-1. Use NiFi's web interface to define a flow
-2. Save the flow as a template and download its XML file
-3. Use the [Converter Toolkit](minifi-toolkit.html) to convert the template XML to an equivalent config.yml
-4. Put the config.yml file in $MINIFI_HOME/conf and start the agent.
-
-# Pushing Data From MiNiFi to NiFi
-
-What follows is an illustrated walkthrough of configuring MiNiFi and NiFi to generate and collect log data.
-
-If you're new to NiFi, watch the [NiFi introductory video series](http://nifi.apache.org/videos.html) before proceeding. If you don't already have NiFi, you can download it from [here](http://nifi.apache.org/download.html).
-
-## Configuring NiFi to Receive Data
-
-First, check that $NIFI_HOME/conf/nifi.properties has a Site to Site input socket port specified:
-```
-# Site to Site properties
-nifi.remote.input.host=
-nifi.remote.input.secure=false
-nifi.remote.input.socket.port=1026
-nifi.remote.input.http.enabled=true
-nifi.remote.input.http.transaction.ttl=30 sec
-```
-
-Restart NiFi so changes take effect.
-
-On NiFi's web UI, place an Input Port "From MiNiFi" and connect it to a downstream processor:
-![](../assets/images/minifi/nifi-receive.png)
-
-## Creating the MiNiFi Flow
-
-Create a new process group, and double click on it to enter it. Working inside this new processor group will let us create a clean template that includes flow components meant to run in MiNiFi.
-
-Inside the process group, create a Remote Process Group (RPG) and give it the URL of your NiFi instance. The RPG will connect to NiFi and discover the input port created earlier.
-
-Create a TailFile processor and connect it to the RPG, selecting the "From MiNiFi" input port.
-![](../assets/images/minifi/minifi-flow.png)
-
-Now create a template, download it as an XML file, and download the [Converter ToolKit](download.html).
-
-From the toolkit directory:
-```
-[user@host minifi-toolkit-0.0.1]# ./bin/config.sh transform /path/to/template.xml /output/path/config.yml
-
-Java home: /usr/lib/jvm/jre-1.8.0-openjdk
-MiNiFi Toolkit home: /minifi-toolkit-0.0.1
-
-
-No validation errors found in template.
-```
-
-Open the config.yml file and add Port and Host to a Properties section at the end of the Input Ports section (at the end of the file):
-```
-Remote Processing Groups:
-- name: http://localhost:8080/nifi
-  url: http://localhost:8080/nifi
-  comment: ''
-  timeout: 30 sec
-  yield period: 10 sec
-  Input Ports:
-  - id: AUTOGENERATED_NIFI_PORT_ID_HERE
-    name: MiNiFi-input
-    comment: ''
-    max concurrent tasks: 1
-    use compression: false
-    Properties: # Deviates from spec and will later be removed when this is autonegotiated		
-        Port: 1026		
-        Host Name: localhost
-```
-
-Copy the generated config.yml file into $MINIFI/conf/config.yml, and start MiNiFi:
-```
-[user@host nifi-minifi-cpp-0.1.0]# ./bin/minifi.sh start
-Starting MiNiFi with PID 463 and pid file /nifi-minifi-cpp-0.1.0/bin/.minifi.pid
-```
-
-After a few seconds, you should see NiFi receiving data on the input port:
-![](../assets/images/minifi/nifi-received.png)
-
-If you do not see data in the queue, it may have already been consumed by the downstream processor (PutFile in this case). If no data is arriving on the input port at all, check the MiNiFi log files, and confirm that the file being tailed exists and is not empty.
diff --git a/source/minifi/download.md b/source/minifi/java-download.md
similarity index 52%
rename from source/minifi/download.md
rename to source/minifi/java-download.md
index d1cf448..138e12f 100644
--- a/source/minifi/download.md
+++ b/source/minifi/java-download.md
@@ -1,10 +1,10 @@
 ---
-title: Apache NiFi MiNiFi Downloads
+title: Apache NiFi MiNiFi Java Downloads
 menu: minifi-topbar.html
 containerEnabled: true
 ---
 
-# Apache {{< project-label >}} MiNiFi Downloads
+# Apache {{< project-label >}} MiNiFi Java Downloads
 
 Apache NiFi [Project Keys](https://downloads.apache.org/nifi/KEYS) can be used to
 [verify downloads](https://www.apache.org/info/verification.html).
@@ -14,9 +14,7 @@ Please allow up to 24 hours for mirrors to synchronize following the release of
 Previous releases can be found in [release archives](https://archive.apache.org/dist/nifi/).
 Please avoid repeated downloads from archives to avoid infrastructure rate limits.
 
-## MiNiFi Java Releases
-
-### {{< param currentProjectVersion >}}
+## {{< param currentProjectVersion >}}
 
 - Released: {{< param currentProjectVersionReleased >}}
   - [Release Notes](https://cwiki.apache.org/confluence/display/NIFI/Release+Notes#ReleaseNotes-Version{{< param currentProjectVersion >}})
@@ -26,24 +24,3 @@ Please avoid repeated downloads from archives to avoid infrastructure rate limit
   - {{< download-links label="Apache NiFi MiNiFi Binary" project=minifi extension=bin.zip >}}
   - {{< download-links label="Apache NiFi MiNiFi Toolkit Binary" project=minifi qualifier=toolkit extension=bin.zip >}}
   - {{< download-links label="Apache NiFi MiNiFi Command and Control Binary" project=minifi qualifier=c2 extension=bin.zip >}}
-
-## MiNiFi C++ Releases
-
-### 0.15.0
-
-- Released: 2023-09-01
-  - [Release Notes](https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=65145325#ReleaseNotesMiNiFi(C++)-Versioncpp-0.15.0)
-- Sources
-  - {{< cpp-download-links label="Apache NiFi MiNiFi C++ Sources" version=0.15.0 extension=source.tar.gz >}}
-- Binaries
-  - {{< cpp-download-links label="Apache NiFi MiNiFi C++ Binary for Linux x86_64" version=0.15.0 extension=bin.tar.gz >}}
-
-### 0.14.0
-
-- Released: 2023-04-17
-  - [Release Notes](https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=65145325#ReleaseNotesMiNiFi(C++)-Versioncpp-0.14.0)
-- Sources
-  - {{< cpp-download-links label="Apache NiFi MiNiFi C++ Sources" version=0.14.0 extension=source.tar.gz >}}
-- Binaries
-  - {{< cpp-download-links label="Apache NiFi MiNiFi C++ Binary for Linux x86_64" version=0.14.0 extension=bin-linux.tar.gz >}}
-
diff --git a/source/minifi/minifi-java-agent-quick-start.md b/source/minifi/java-quick-start.md
similarity index 89%
rename from source/minifi/minifi-java-agent-quick-start.md
rename to source/minifi/java-quick-start.md
index e2a15e5..7e022dd 100644
--- a/source/minifi/minifi-java-agent-quick-start.md
+++ b/source/minifi/java-quick-start.md
@@ -1,22 +1,12 @@
 ---
-title:     Apache NiFi MiNiFi Java Agent Quick Start Guide
+title: Apache NiFi MiNiFi Java Agent Quick Start Guide
 menu: minifi-topbar.html
 containerEnabled: true
 ---
 
-[Apache NiFi Team](dev@nifi.apache.org>)
+# Apache {{< project-label >}} MiNiFi Java Quick Start
 
-[NiFi Homepage](http://nifi.apache.org)
-
-# Overview
-
-Apache NiFi MiNiFi is an Apache NiFi project, designed to collect data at its source. MiNiFi was developed with the following objectives in mind:
-* Small and lightweight footprint
-* Central agent management
-* Data provenance generation
-* NiFi integration for follow-on dataflow management and chain of custody information
-
-# Before You Begin
+## Before You Begin
 MiNiFi Java Agent is supported on the following operating systems:
 * Red Hat Enterprise Linux / CentOS 6 (64-bit)
 * Red Hat Enterprise Linux / CentOS 7 (64-bit)
@@ -25,14 +15,14 @@ MiNiFi Java Agent is supported on the following operating systems:
 * Debian 7
 * SUSE Linux Enterprise Server (SLES) 11 SP3 (64-bit)
 
-You can download the MiNiFi Java Agent and the MiNiFi Toolkit from the [MiNiFi download page](http://nifi.apache.org/minifi/download.html).
+You can download the MiNiFi Java Agent and the MiNiFi Toolkit from the [MiNiFi download page](minifi-java-download.html).
 
-# Installing and Starting MiNiFi
+## Installing and Starting MiNiFi
 You have several options for installing and starting MiNiFi.
 
-## For Linux and Mac OS X Users
+### For Linux and Mac OS X Users
 To install MiNiFi:
-1. [Download](http://nifi.apache.org/minifi/download.html) MiNiFi.
+1. [Download](minifi-java-download.html) MiNiFi.
 2. Extract the file to the location from which you want to the application.
 
 You can also install MiNiFi as a service:
@@ -94,7 +84,7 @@ config.sh transform input_file output_file
 
 **Result:** Once you have your _config.yml_ file in the `minifi/conf` directory, launch that instance of MiNiFi and your dataflow begins automatically.
 
-## Using Processors Not Packaged with MiNiFi
+### Using Processors Not Packaged with MiNiFi
 MiNiFi is able to use following processors out of the box:
 * UpdateAttribute
 * AttributesToJSON
@@ -185,7 +175,7 @@ If you want to create a dataflow with a processor not shipped with MiNiFi, you c
   * HandleHttpResponse
 
 
-# Securing your Dataflow
+## Securing your Dataflow
 You can secure your MiNiFi dataflow using keystore or trust store SSL protocols, however, this information is not automatically generated. You will need to generate your security configuration information yourself.
 
 To run a MiNiFi dataflow securely:
@@ -209,10 +199,10 @@ algorithm: PBEWITHMD5AND256BITAES-CBC-OPENSSL
 provider: BC
 ```
 
-# Managing MiNiFi
+## Managing MiNiFi
 You can also perform some management tasks using MiNiFi.
 
-## Monitoring Status
+### Monitoring Status
 You can use the `minifi.sh flowStatus` option to monitor a range of aspects of your MiNiFi operational and dataflow status. You can use the `flowStatus` option to get information about dataflow component health and functionality, a MiNiFi instance, or system diagnostics.
 
 FlowStatus accepts the following flags and options:
@@ -258,14 +248,14 @@ minifi.sh flowStatus processor:TailFile:health,stats,bulletins
 
 For details on the `flowStatus` option, see the "FlowStatus Query Option" section of the [Administration Guide](http://nifi.apache.org/minifi/system-admin-guide.html).
 
-## Loading a New Dataflow
+### Loading a New Dataflow
 You can load a new dataflow for a MiNiFi instance to run:
 
 1. Create a new _config.yml_ file with the new dataflow.
 2. Replace the existing _config.yml_ in `minifi/conf` with the new file.
 3. Restart MiNiFi.
 
-## Stopping MiNiFi
+### Stopping MiNiFi
 
 You can stop MiNiFi at any time.
 
@@ -283,3 +273,7 @@ Stopping MiNiFi as a service:
 ```
 sudo service minifi stop
 ```
+
+# Guides
+
+[Pushing Data From MiNiFi to NiFi Guide](pushing-nifi-minifi-java.html)
\ No newline at end of file
diff --git a/source/minifi/system-admin-guide.md b/source/minifi/java-system-admin-guide.md
similarity index 99%
rename from source/minifi/system-admin-guide.md
rename to source/minifi/java-system-admin-guide.md
index d5e28e6..5a85fe6 100644
--- a/source/minifi/system-admin-guide.md
+++ b/source/minifi/java-system-admin-guide.md
@@ -1,16 +1,10 @@
 ---
-title:     Apache NiFi MiNiFi System Administrator's Guide
+title: Apache NiFi MiNiFi Java System Administrator's Guide
 menu: minifi-topbar.html
 containerEnabled: true
 ---
 
-[Apache NiFi Team](dev@nifi.apache.org>)
-
-[MiNiFi Homepage](https://nifi.apache.org/minifi/index.html)
-
-This documentation is for MiNiFi 0.5.0.
-
-# Automatic Warm-Redeploy
+# Apache {{< project-label >}} MiNiFi System Administrator's Guide
 
 When many MiNiFi agents running on the edge, it may not be possible to manually stop, edit the *config.yml* and then restart every one every time their configuration needs to change. The Config Change Coordinator and its Ingestors were designed to automatically redeploy in response to a configuration update.
 
@@ -333,8 +327,8 @@ The *config.yml* in the `conf` directory is the main configuration file for cont
 and follows the YAML format laid out [here](http://www.yaml.org/).
 
 Alternatively, the MiNiFi Toolkit Converter can aid in creating a *config.yml* from a generated template exported from a NiFi instance.  This
-tool can be downloaded from https://nifi.apache.org/minifi/download.html under the "MiNiFi Toolkit Binaries" section.  Information on the toolkit's usage is
-available at https://nifi.apache.org/minifi/minifi-toolkit.html.
+tool can be downloaded from https://nifi.apache.org/minifi/minifi-java-download.html under the "MiNiFi Toolkit Binaries" section.  Information on the toolkit's usage is
+available at https://nifi.apache.org/minifi/minifi-java-toolkit.html.
 
 **Note:** Values for periods of time and data sizes must include the unit of measure,
 for example "10 sec" or "10 MB", not simply "10".
diff --git a/source/minifi/minifi-toolkit.md b/source/minifi/java-toolkit.md
similarity index 70%
rename from source/minifi/minifi-toolkit.md
rename to source/minifi/java-toolkit.md
index c588b07..92e42a5 100644
--- a/source/minifi/minifi-toolkit.md
+++ b/source/minifi/java-toolkit.md
@@ -1,43 +1,13 @@
 ---
-title:     Apache NiFi MiNiFi Toolkit Guide
+title: Apache NiFi MiNiFi Toolkit Guide
 menu: minifi-topbar.html
 containerEnabled: true
 ---
 
-<!--
-  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.
--->
-# Apache NiFi - MiNiFi - Toolkit
-
-MiNiFi is a child project effort of Apache NiFi.  The MiNiFi toolkit aids in creating MiNiFi configuration files from exported NiFi templates.
-
-## Table of Contents
-
-- [Requirements](#requirements)
-- [Getting Started](#getting-started)
-- [Getting Help](#getting-help)
-- [Documentation](#documentation)
-- [License](#license)
-- [Export Control](#export-control)
-
-## Requirements
-* JRE 1.8
+# Apache {{< project-label >}} MiNiFi Toolkit
 
 ## Getting Started
 
-The latest version of the MiNiFi Toolkit Converter can be found at https://nifi.apache.org/minifi/download.html under the `MiNiFi Toolkit Binaries` section.
-
 After downloading the binary and extracting it, to run the MiNiFi Toolkit Converter:
 - Change directory to the location where you installed MiNiFi Toolkit and run it and view usage information
   - Linux / OS X
diff --git a/source/people.md b/source/people.md
index 18b8ba0..60ef14d 100644
--- a/source/people.md
+++ b/source/people.md
@@ -10,86 +10,86 @@ or author documentation. Others are valuable as testers, submitting patches and
 
 ### PMC Members
 
-| Apache Username | Name |
-| --------------- | ---- |
-| aboda | Arpad Boda |
-| afucs | Andre Fucs de Miranda |
-| aldrin | Aldrin Piri |
-| alopresto | Andy LoPresto |
-| andrewmlim | Andrew M. Lim |
-| bbende | Bryan Bende |
-| busbey | Sean Busbey |
-| danbress | Dan Bress |
-| devriesb | Brandon DeVries |
-| exceptionfactory | David Handermann |
-| ijokarumawak | Koji Kawamura |
-| jcarey | Jason Carey |
-| jeremydyer | Jeremy Dyer |
-| jfrazee | Joey Frazee |
-| joewitt | Joe Witt |
-| jskora | Joe Skora |
-| jvwing | James Wing |
-| kevdoran | Kevin Doran |
-| markap14 | Mark Payne |
-| mattyb149 | Matt Burgess |
-| mcgilman | Matt Gilman |
-| mosermw | Michael W Moser |
-| mthomsen | Mike Thomsen |
-| ozhurakousky | Oleg Zhurakousky |
-| phrocker | Marc Parisi |
-| pvillard | Pierre Villard |
-| scottyaslan | Scott Aslan |
-| szaszm | Marton Szasz |
-| taftster | Adam Taft |
-| tkurc | Tony Kurc |
-| turcsanyi | Peter Turcsanyi |
-| ymdavis | Yolanda Davis |
+| Apache Username  | Name                  |
+|------------------|-----------------------|
+| aboda            | Arpad Boda            |
+| afucs            | Andre Fucs de Miranda |
+| aldrin           | Aldrin Piri           |
+| alopresto        | Andy LoPresto         |
+| andrewmlim       | Andrew M. Lim         |
+| bbende           | Bryan Bende           |
+| busbey           | Sean Busbey           |
+| danbress         | Dan Bress             |
+| devriesb         | Brandon DeVries       |
+| exceptionfactory | David Handermann      |
+| ijokarumawak     | Koji Kawamura         |
+| jcarey           | Jason Carey           |
+| jeremydyer       | Jeremy Dyer           |
+| jfrazee          | Joey Frazee           |
+| joewitt          | Joe Witt              |
+| jskora           | Joe Skora             |
+| jvwing           | James Wing            |
+| kevdoran         | Kevin Doran           |
+| markap14         | Mark Payne            |
+| mattyb149        | Matt Burgess          |
+| mcgilman         | Matt Gilman           |
+| mosermw          | Michael W Moser       |
+| mthomsen         | Mike Thomsen          |
+| ozhurakousky     | Oleg Zhurakousky      |
+| phrocker         | Marc Parisi           |
+| pvillard         | Pierre Villard        |
+| scottyaslan      | Scott Aslan           |
+| szaszm           | Marton Szasz          |
+| taftster         | Adam Taft             |
+| tkurc            | Tony Kurc             |
+| turcsanyi        | Peter Turcsanyi       |
+| ymdavis          | Yolanda Davis         |
 
 ### Committers
 
-| Apache Username | Name |
-| --------------- | ---- |
-| adebreceni | Adam Debreceni |
-| aichrist | Andy I.C. |
-| amarkovics | Ádám Markovics |
-| bakaid | Dániel Bakai |
-| bqiu | Ben Qiu |
-| brosander | Bryan Rosander |
-| bsimon | Simon Bence |
-| chriss | Chris Sampson |
-| denes | Denes Arvay |
-| edbe | Ed Berezitsky |
-| fgerlits | Ferenc Gerlits |
-| greyp | Paul Grey |
-| jgresock | Joe Gresock |
-| kotarot | Kotaro Terada |
-| lordgamez | Gábor Gyimesi |
-| martinzink | Martin Zink |
-| mhogue | Mike Hogue |
-| mtien | Margot Tien |
-| otto | Otto Fowler |
-| rfellows | Rob Fellows |
-| rickysaltzer | Ricky Saltzer |
-| rmoran | Rob Moran |
-| thenatog | Nathan Gough |
-| toivoadams | Toivo Adams |
-| tpalfy | Tamas Palfy |
-| zenfenan | Sivaprasanna Sethuraman |
+| Apache Username | Name                    |
+|-----------------|-------------------------|
+| adebreceni      | Adam Debreceni          |
+| aichrist        | Andy I.C.               |
+| amarkovics      | Ádám Markovics          |
+| bakaid          | Dániel Bakai            |
+| bqiu            | Ben Qiu                 |
+| brosander       | Bryan Rosander          |
+| bsimon          | Simon Bence             |
+| chriss          | Chris Sampson           |
+| denes           | Denes Arvay             |
+| edbe            | Ed Berezitsky           |
+| fgerlits        | Ferenc Gerlits          |
+| greyp           | Paul Grey               |
+| jgresock        | Joe Gresock             |
+| kotarot         | Kotaro Terada           |
+| lordgamez       | Gábor Gyimesi           |
+| martinzink      | Martin Zink             |
+| mhogue          | Mike Hogue              |
+| mtien           | Margot Tien             |
+| otto            | Otto Fowler             |
+| rfellows        | Rob Fellows             |
+| rickysaltzer    | Ricky Saltzer           |
+| rmoran          | Rob Moran               |
+| thenatog        | Nathan Gough            |
+| toivoadams      | Toivo Adams             |
+| tpalfy          | Tamas Palfy             |
+| zenfenan        | Sivaprasanna Sethuraman |
 
 ### In Memoriam
 
-| Apache Username | Name |
-| --------------- | ---- |
-| jstorck | Jeff Storck |
+| Apache Username | Name        |
+|-----------------|-------------|
+| jstorck         | Jeff Storck |
 
 ### Emeritus Members
 
-| Apache Username | Name |
-| --------------- | ---- |
-| bimargulies | Benson Margulies |
-| jbarnabee | Jennifer Barnabee |
-| pwicks | Peter Wicks |
-| jpercivall | Joe Percivall |
+| Apache Username | Name              |
+|-----------------|-------------------|
+| bimargulies     | Benson Margulies  |
+| jbarnabee       | Jennifer Barnabee |
+| pwicks          | Peter Wicks       |
+| jpercivall      | Joe Percivall     |
 
 The team consists of Project Management Committee Members, Committers, and Contributors.