Modified: nifi/site/trunk/docs/nifi-docs/html/expression-language-guide.html URL: http://svn.apache.org/viewvc/nifi/site/trunk/docs/nifi-docs/html/expression-language-guide.html?rev=1730775&r1=1730774&r2=1730775&view=diff ============================================================================== --- nifi/site/trunk/docs/nifi-docs/html/expression-language-guide.html (original) +++ nifi/site/trunk/docs/nifi-docs/html/expression-language-guide.html Wed Feb 17 02:15:29 2016 @@ -495,6 +495,7 @@ body.book #toc,body.book #preamble,body. <li><a href="#substringbeforelast">substringBeforeLast</a></li> <li><a href="#substringafter">substringAfter</a></li> <li><a href="#substringafterlast">substringAfterLast</a></li> +<li><a href="#getdelimitedfield">getDelimitedField</a></li> <li><a href="#append">append</a></li> <li><a href="#prepend">prepend</a></li> <li><a href="#replace">replace</a></li> @@ -620,7 +621,7 @@ by the Expression Language to achieve ma manipulation, such as the <code>toUpper</code> function. Others, such as the <code>equals</code> and <code>matches</code> functions, provide comparison functionality. Functions also exist for manipulating dates and times and for performing mathematical operations. Each of these functions is described below, in the -<<functions> section, with an explanation of what the function does, the arguments that it +<a href="#functions">Functions</a> section, with an explanation of what the function does, the arguments that it requires, and the type of information that it returns.</p> </div> <div class="paragraph"> @@ -793,8 +794,14 @@ special characters.</p> </li> <li> <p><strong>Number</strong>: A Number is an integer comprised of one or more digits (<code>0</code> through <code>9</code>). The Expression Language -does not provide support for fractional numbers. Dates and times are represented in the -Expression Language as Numbers, representing the number of milliseconds since midnight GMT on January 1, 1970.</p> +does not provide support for fractional numbers. When converting to numbers from Date data types, they are represented as +the number of milliseconds since midnight GMT on January 1, 1970.</p> +</li> +<li> +<p><strong>Date</strong>: A Date is an object that holds a Date and Time. Utilizing the <a href="#dates">Date Manipulation</a> and <a href="#type_cast">Type Coercion</a> functions this data +type can be converted to/from Strings and numbers. If the whole Expression Language expression is evaluated to be a +date then it will be converted to a String with the format: "<Day of Week> <Month> <Day of Month> <Hour>:<Minute>:<Second> <Time Zone> <Year>". +Also expressed as "E MMM dd HH:mm:ss z yyyy" in Java SimpleDateFormat format. For example: "Wed Dec 31 12:00:04 UTC 2016".</p> </li> <li> <p><strong>Boolean</strong>: A Boolean is one of either <code>true</code> or <code>false</code>.</p> @@ -838,7 +845,7 @@ if an attribute exists.</span></p> </div> <div class="paragraph"> <p><strong>Examples</strong>: <code>${filename:isNull()}</code> returns <code>true</code> if the "filename" attribute does not exist. - It returns <code>true</code> if the attribute exists.</p> + It returns <code>false</code> if the attribute exists.</p> </div> </div> <div class="sect2 function"> @@ -857,7 +864,7 @@ subject exists and <code>false</code> ot <p><strong>Return Type</strong>: <span class="returnType">Boolean</span></p> </div> <div class="paragraph"> -<p><strong>Examples</strong>: <code>${filename:notNull()}</code> returns <code>true</code> if the "filename" attribute exists. It returns "false" if the attribute +<p><strong>Examples</strong>: <code>${filename:notNull()}</code> returns <code>true</code> if the "filename" attribute exists. It returns <code>false</code> if the attribute does not exist.</p> </div> </div> @@ -1377,7 +1384,7 @@ then the following Expressions will resu <td class="tableblock halign-left valign-top"><p class="tableblock"><code>a brand</code></p></td> </tr> <tr> -<td class="tableblock halign-left valign-top"><p class="tableblock"><code>${filename:sbustringBefore('missing')}</code></p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock"><code>${filename:substringBefore('missing')}</code></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock"><code>a brand new filename.txt</code></p></td> </tr> </tbody> @@ -1404,7 +1411,7 @@ then the following Expressions will resu </ul> </div> <div class="paragraph"> -<p><strong>Return Type</strong>: [.returnType]#String3</p> +<p><strong>Return Type</strong>: <span class="returnType">String</span></p> </div> <div class="paragraph"> <p><strong>Examples</strong>: If the "filename" attribute has the value "a brand new filename.txt", @@ -1555,6 +1562,87 @@ then the following Expressions will resu </table> </div> <div class="sect2 function"> +<h3 id="getdelimitedfield"><a class="anchor" href="#getdelimitedfield"></a>getDelimitedField</h3> +<div class="paragraph"> +<p><strong>Description</strong>: <span class="description">Parses the Subject as a delimited line of text and returns just a single field + from that delimited text.</span></p> +</div> +<div class="paragraph"> +<p><strong>Subject Type</strong>: <span class="subject">String</span></p> +</div> +<div class="paragraph"> +<p><strong>Arguments</strong>:</p> +</div> +<div class="ulist"> +<ul> +<li> +<p><span class="argName"><em>index</em></span> : <span class="argDesc">The index of the field to return. A value of 1 will return the first field, +a value of 2 will return the second field, and so on.</span></p> +</li> +<li> +<p><span class="argName"><em>delimiter</em></span> : <span class="argDesc">Optional argument that provides the character to use as a field separator. +If not specified, a comma will be used. This value must be exactly 1 character.</span></p> +</li> +<li> +<p><span class="argName"><em>quoteChar</em></span> : <span class="argDesc">Optional argument that provides the character that can be used to quote values +so that the delimiter can be used within a single field. If not specified, a double-quote (") will be used. This value +must be exactly 1 character.</span></p> +</li> +<li> +<p><span class="argName"><em>escapeChar</em></span> : <span class="argDesc">Optional argument that provides the character that can be used to escape the Quote Character +or the Delimiter within a field. If not specified, a backslash (\) is used. This value must be exactly 1 character.</span></p> +</li> +<li> +<p><span class="argName"><em>stripChars</em></span> : <span class="argDesc">Optional argument that specifies whether or not quote characters and escape characters should +be stripped. For example, if we have a field value "1, 2, 3" and this value is true, we will get the value <code>1, 2, 3</code>, but if this +value is false, we will get the value <code>"1, 2, 3"</code> with the quotes. The default value is false. This value must be either <code>true</code> +or <code>false</code>.</span></p> +</li> +</ul> +</div> +<div class="paragraph"> +<p><strong>Return Type</strong>: <span class="returnType">String</span></p> +</div> +<div class="paragraph"> +<p><strong>Examples</strong>: If the "line" attribute contains the value <em>"Jacobson, John", 32, Mr.</em> + and the "altLine" attribute contains the value <em>Jacobson, John|32|Mr.</em> + then the following Expressions will result in the following values:</p> +</div> +<table class="tableblock frame-all grid-all spread"> +<caption class="title">Table 6. GetDelimitedField Examples</caption> +<colgroup> +<col style="width: 50%;"> +<col style="width: 50%;"> +</colgroup> +<tbody> +<tr> +<td class="tableblock halign-left valign-top"><p class="tableblock">Expression</p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock">Value</p></td> +</tr> +<tr> +<td class="tableblock halign-left valign-top"><p class="tableblock"><code>${line:getDelimitedField(2)}</code></p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock">_(space)_32</p></td> +</tr> +<tr> +<td class="tableblock halign-left valign-top"><p class="tableblock"><code>${line:getDelimitedField(2):trim()}</code></p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock">32</p></td> +</tr> +<tr> +<td class="tableblock halign-left valign-top"><p class="tableblock"><code>${line:getDelimitedField(1)}</code></p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock">"Jacobson, John"</p></td> +</tr> +<tr> +<td class="tableblock halign-left valign-top"><p class="tableblock"><code>${line:getDelimitedField(1, ',', '"', '\\', true)}</code></p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock">Jacobson, John</p></td> +</tr> +<tr> +<td class="tableblock halign-left valign-top"><p class="tableblock">`${altLine:getDelimitedField(1, '</p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock">')}</p></td> +</tr> +</tbody> +</table> +</div> +<div class="sect2 function"> <h3 id="append"><a class="anchor" href="#append"></a>append</h3> <div class="paragraph"> <p><strong>Description</strong>: <span class="description">The <code>append</code> function returns the result of appending the argument to the value of @@ -1637,7 +1725,7 @@ then the following Expressions will resu Expressions will provide the following results:</p> </div> <table class="tableblock frame-all grid-all spread"> -<caption class="title">Table 6. Replace Examples</caption> +<caption class="title">Table 7. Replace Examples</caption> <colgroup> <col style="width: 50%;"> <col style="width: 50%;"> @@ -1701,7 +1789,7 @@ argument uses Capturing Groups, back ref Expressions will provide the following results:</p> </div> <table class="tableblock frame-all grid-all spread"> -<caption class="title">Table 7. replaceAll Examples</caption> +<caption class="title">Table 8. replaceAll Examples</caption> <colgroup> <col style="width: 50%;"> <col style="width: 50%;"> @@ -1928,7 +2016,7 @@ Expressions will provide the following r Expressions will provide the following results:</p> </div> <table class="tableblock frame-all grid-all spread"> -<caption class="title">Table 8. find Examples</caption> +<caption class="title">Table 9. find Examples</caption> <colgroup> <col style="width: 50%;"> <col style="width: 50%;"> @@ -1982,7 +2070,7 @@ Expressions will provide the following r Expressions will provide the following results:</p> </div> <table class="tableblock frame-all grid-all spread"> -<caption class="title">Table 9. matches Examples</caption> +<caption class="title">Table 10. matches Examples</caption> <colgroup> <col style="width: 50%;"> <col style="width: 50%;"> @@ -2037,7 +2125,7 @@ Expressions will provide the following r Expressions will provide the following results:</p> </div> <table class="tableblock frame-all grid-all spread"> -<caption class="title">Table 10. indexOf Examples</caption> +<caption class="title">Table 11. indexOf Examples</caption> <colgroup> <col style="width: 50%;"> <col style="width: 50%;"> @@ -2096,7 +2184,7 @@ Expressions will provide the following r Expressions will provide the following results:</p> </div> <table class="tableblock frame-all grid-all spread"> -<caption class="title">Table 11. lastIndexOf Examples</caption> +<caption class="title">Table 12. lastIndexOf Examples</caption> <colgroup> <col style="width: 50%;"> <col style="width: 50%;"> @@ -2293,7 +2381,7 @@ Expressions will provide the following r the following results:</p> </div> <table class="tableblock frame-all grid-all spread"> -<caption class="title">Table 12. toRadix Examples</caption> +<caption class="title">Table 13. toRadix Examples</caption> <colgroup> <col style="width: 50%;"> <col style="width: 50%;"> @@ -2344,7 +2432,7 @@ Expressions will provide the following r <div class="paragraph"> <p><strong>Description</strong>: <span class="description">Formats a number as a date/time according to the format specified by the argument. The argument must be a String that is a valid Java SimpleDateFormat format. The Subject is expected to be a Number that - represents the number of milliseconds since Midnight GMT January 1, 1970.</span></p> + represents the number of milliseconds since Midnight GMT on January 1, 1970.</span></p> </div> <div class="paragraph"> <p><strong>Subject Type</strong>: <span class="subject">Number</span></p> @@ -2367,7 +2455,7 @@ Expressions will provide the following r the following results:</p> </div> <table class="tableblock frame-all grid-all spread"> -<caption class="title">Table 13. format Examples</caption> +<caption class="title">Table 14. format Examples</caption> <colgroup> <col style="width: 50%;"> <col style="width: 50%;"> @@ -2399,10 +2487,9 @@ Expressions will provide the following r <div class="sect2 function"> <h3 id="todate"><a class="anchor" href="#todate"></a>toDate</h3> <div class="paragraph"> -<p><strong>Description</strong>: <span class="description">Converts a String into a Number, based on the format specified by the argument. The argument - must be a String that is a valid Java SimpleDateFormat syntax. The Subject is expected to be a String - that is formatted according the argument. The return value is the numbr of milliseconds since - Midnight GMT January 1, 1979.</span></p> +<p><strong>Description</strong>: <span class="description">Converts a String into a Date data type, based on the format specified by the argument. The argument + must be a String that is a valid Java SimpleDateFormat syntax. The Subject is expected to be a String that is formatted + according the argument.</span></p> </div> <div class="paragraph"> <p><strong>Subject Type</strong>: <span class="subject">String</span></p> @@ -2418,13 +2505,13 @@ Expressions will provide the following r </ul> </div> <div class="paragraph"> -<p><strong>Return Type</strong>: <span class="returnType">Number</span></p> +<p><strong>Return Type</strong>: <span class="returnType">Date</span></p> </div> <div class="paragraph"> <p><strong>Examples</strong>: If the attribute "year" has the value "2014" and the attribute "time" has the value "2014/12/31 15:36:03.264Z", - then the Expression <code>${year:toDate('yyyy')}</code> will return the number of milliseconds between Midnight GMT on January 1, 1970 - and Midnight GMT on January 1, 2014. The Expression <code>${time:toDate("yyyy/MM/dd HH:mm:ss.SSS'Z'")}</code> will result in the - number of milliseconds between Midnight GMT on January 1, 1970 and 15:36:03.264 GMT on December 31, 2014.</p> + then the Expression <code>${year:toDate('yyyy')}</code> will return a Date data type with a value representing Midnight GMT on + January 1, 2014. The Expression <code>${time:toDate("yyyy/MM/dd HH:mm:ss.SSS'Z'")}</code> will result in a Date data type for + 15:36:03.264 GMT on December 31, 2014.</p> </div> <div class="paragraph"> <p>Often, this function is used in conjunction with the <a href="#format">format</a> function to change the format of a date/time. For example, @@ -2435,8 +2522,7 @@ chaining together the two functions: <co <div class="sect2 function"> <h3 id="now"><a class="anchor" href="#now"></a>now</h3> <div class="paragraph"> -<p><strong>Description</strong>: <span class="description">The <code>now</code> function returns the current date and time as the number of milliseconds since Midnight GMT on - January 1, 1970.</span></p> +<p><strong>Description</strong>: <span class="description">Returns the current date and time as a Date data type object.</span></p> </div> <div class="paragraph"> <p><strong>Subject Type</strong>: <span class="subjectless">No Subject</span></p> @@ -2445,12 +2531,54 @@ chaining together the two functions: <co <p><strong>Arguments</strong>: No arguments</p> </div> <div class="paragraph"> -<p><strong>Return Type</strong>: <span class="returnType">Number</span></p> +<p><strong>Return Type</strong>: <span class="returnType">Date</span></p> +</div> +<div class="paragraph"> +<p><strong>Examples</strong>: We can get the current date and time as a Date data type by using the <code>now</code> function: <code>${now()}</code>. As an example, + on Wednesday December 31st 2014 at 36 minutes after 3pm and 36.123 seconds EST <code>${now()}</code> would be evaluated to be a + Date type representing that time. Since whole Expression Language expressions can only return Strings it would formatted as + <code>Wed Dec 31 15:36:03 EST 2014</code> when the expression completes.</p> </div> <div class="paragraph"> -<p><strong>Examples</strong>: We can format the current date and time by using the <code>now</code> function in conjunction with the <a href="#format">format</a> function: - <code>${now():format('yyyy/MM/dd HH:mm:ss')}</code>.</p> +<p>Utilizing the <a href="#tonumber">toNumber</a> method, <code>now</code> can provide the current date and time as the number of milliseconds since +Midnight GMT on January 1, 1970. For instance, if instead of executing <code>${now()}</code> in the previous example <code>${now():toNumber()}</code> +was run then it would output <code>1453843201123</code>. This method provides millisecond-level precision and provides the ability to +manipulate the value.</p> </div> +<table class="tableblock frame-all grid-all spread"> +<caption class="title">Table 15. now Examples</caption> +<colgroup> +<col style="width: 50%;"> +<col style="width: 50%;"> +</colgroup> +<tbody> +<tr> +<td class="tableblock halign-left valign-top"><p class="tableblock">Expression</p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock">Value</p></td> +</tr> +<tr> +<td class="tableblock halign-left valign-top"><p class="tableblock"><code>${now()}</code></p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock">A Date type representing the current date and time to the nearest millisecond</p></td> +</tr> +<tr> +<td class="tableblock halign-left valign-top"><p class="tableblock"><code>${now():toNumber()}</code></p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock">The number of milliseconds since midnight GMT Jan 1, 1970 (<code>1453843201123</code>, for example)</p></td> +</tr> +<tr> +<td class="tableblock halign-left valign-top"><p class="tableblock"><code>${now():toNumber():minus(86400000)</code></p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock">A number presenting the time 24 hours ago</p></td> +</tr> +<tr> +<td class="tableblock halign-left valign-top"><p class="tableblock"><code>${now():format('yyyy')}</code></p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock">The current year</p></td> +</tr> +<tr> +<td class="tableblock halign-left valign-top"><p class="tableblock"><code>${now():toNumber():minus(86400000):format('E')}</code></p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock">The day of the week that was yesterday, + as a 3-letter abbreviation (For example, <code>Wed</code>)</p></td> +</tr> +</tbody> +</table> </div> </div> </div> @@ -2666,7 +2794,7 @@ provides several functions for evaluatin and "filename" contains "file.txt" consider the following examples:</p> </div> <table class="tableblock frame-all grid-all spread"> -<caption class="title">Table 14. anyAttribute Examples</caption> +<caption class="title">Table 16. anyAttribute Examples</caption> <colgroup> <col style="width: 50%;"> <col style="width: 50%;"> @@ -2716,7 +2844,7 @@ provides several functions for evaluatin and "filename" contains "file.txt" consider the following examples:</p> </div> <table class="tableblock frame-all grid-all spread"> -<caption class="title">Table 15. allAttributes Example</caption> +<caption class="title">Table 17. allAttributes Example</caption> <colgroup> <col style="width: 50%;"> <col style="width: 50%;"> @@ -2767,7 +2895,7 @@ provides several functions for evaluatin and "filename" contains "file.txt" consider the following examples:</p> </div> <table class="tableblock frame-all grid-all spread"> -<caption class="title">Table 16. anyMatchingAttribute Example</caption> +<caption class="title">Table 18. anyMatchingAttribute Example</caption> <colgroup> <col style="width: 50%;"> <col style="width: 50%;"> @@ -2815,7 +2943,7 @@ provides several functions for evaluatin and "filename" contains "file.txt" consider the following examples:</p> </div> <table class="tableblock frame-all grid-all spread"> -<caption class="title">Table 17. anyMatchingAttributes Examples</caption> +<caption class="title">Table 19. anyMatchingAttributes Examples</caption> <colgroup> <col style="width: 50%;"> <col style="width: 50%;"> @@ -2872,7 +3000,7 @@ though it does not have to be.</span></p consider the following examples:</p> </div> <table class="tableblock frame-all grid-all spread"> -<caption class="title">Table 18. anyDelineatedValue Examples</caption> +<caption class="title">Table 20. anyDelineatedValue Examples</caption> <colgroup> <col style="width: 50%;"> <col style="width: 50%;"> @@ -2925,7 +3053,7 @@ an embedded Expression, though it does n consider the following examples:</p> </div> <table class="tableblock frame-all grid-all spread"> -<caption class="title">Table 19. allDelineatedValues Examples</caption> +<caption class="title">Table 21. allDelineatedValues Examples</caption> <colgroup> <col style="width: 50%;"> <col style="width: 50%;"> @@ -2982,7 +3110,7 @@ an embedded Expression, though it does n and "filename" contains "file.txt" consider the following examples:</p> </div> <table class="tableblock frame-all grid-all spread"> -<caption class="title">Table 20. join Examples</caption> +<caption class="title">Table 22. join Examples</caption> <colgroup> <col style="width: 50%;"> <col style="width: 50%;"> @@ -3025,7 +3153,7 @@ an embedded Expression, though it does n and "number_list" contains "1,2,3,4,5" consider the following examples:</p> </div> <table class="tableblock frame-all grid-all spread"> -<caption class="title">Table 21. count Examples</caption> +<caption class="title">Table 23. count Examples</caption> <colgroup> <col style="width: 50%;"> <col style="width: 50%;"> @@ -3063,7 +3191,7 @@ an embedded Expression, though it does n </div> <div id="footer"> <div id="footer-text"> -Last updated 2015-12-08 13:53:16 -05:00 +Last updated 2016-02-16 10:19:45 EST </div> </div> </body>
Modified: nifi/site/trunk/docs/nifi-docs/html/getting-started.html URL: http://svn.apache.org/viewvc/nifi/site/trunk/docs/nifi-docs/html/getting-started.html?rev=1730775&r1=1730774&r2=1730775&view=diff ============================================================================== --- nifi/site/trunk/docs/nifi-docs/html/getting-started.html (original) +++ nifi/site/trunk/docs/nifi-docs/html/getting-started.html Wed Feb 17 02:15:29 2016 @@ -1592,7 +1592,7 @@ work back to the Apache NiFi community s </div> <div id="footer"> <div id="footer-text"> -Last updated 2015-12-08 13:53:16 -05:00 +Last updated 2016-02-16 10:19:45 EST </div> </div> </body> Added: nifi/site/trunk/docs/nifi-docs/html/images/allow-weak-crypto.png URL: http://svn.apache.org/viewvc/nifi/site/trunk/docs/nifi-docs/html/images/allow-weak-crypto.png?rev=1730775&view=auto ============================================================================== Binary file - no diff available. Propchange: nifi/site/trunk/docs/nifi-docs/html/images/allow-weak-crypto.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: nifi/site/trunk/docs/nifi-docs/html/images/bcrypt-salt.png URL: http://svn.apache.org/viewvc/nifi/site/trunk/docs/nifi-docs/html/images/bcrypt-salt.png?rev=1730775&view=auto ============================================================================== Binary file - no diff available. Propchange: nifi/site/trunk/docs/nifi-docs/html/images/bcrypt-salt.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: nifi/site/trunk/docs/nifi-docs/html/images/iconDetails.png URL: http://svn.apache.org/viewvc/nifi/site/trunk/docs/nifi-docs/html/images/iconDetails.png?rev=1730775&view=auto ============================================================================== Binary file - no diff available. Propchange: nifi/site/trunk/docs/nifi-docs/html/images/iconDetails.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: nifi/site/trunk/docs/nifi-docs/html/images/nifi-connection-bend-points.png URL: http://svn.apache.org/viewvc/nifi/site/trunk/docs/nifi-docs/html/images/nifi-connection-bend-points.png?rev=1730775&view=auto ============================================================================== Binary file - no diff available. Propchange: nifi/site/trunk/docs/nifi-docs/html/images/nifi-connection-bend-points.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: nifi/site/trunk/docs/nifi-docs/html/images/nifi-legacy-salt.png URL: http://svn.apache.org/viewvc/nifi/site/trunk/docs/nifi-docs/html/images/nifi-legacy-salt.png?rev=1730775&view=auto ============================================================================== Binary file - no diff available. Propchange: nifi/site/trunk/docs/nifi-docs/html/images/nifi-legacy-salt.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: nifi/site/trunk/docs/nifi-docs/html/images/openssl-salt.png URL: http://svn.apache.org/viewvc/nifi/site/trunk/docs/nifi-docs/html/images/openssl-salt.png?rev=1730775&view=auto ============================================================================== Binary file - no diff available. Propchange: nifi/site/trunk/docs/nifi-docs/html/images/openssl-salt.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: nifi/site/trunk/docs/nifi-docs/html/images/pbkdf2-salt.png URL: http://svn.apache.org/viewvc/nifi/site/trunk/docs/nifi-docs/html/images/pbkdf2-salt.png?rev=1730775&view=auto ============================================================================== Binary file - no diff available. Propchange: nifi/site/trunk/docs/nifi-docs/html/images/pbkdf2-salt.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: nifi/site/trunk/docs/nifi-docs/html/images/scrypt-salt.png URL: http://svn.apache.org/viewvc/nifi/site/trunk/docs/nifi-docs/html/images/scrypt-salt.png?rev=1730775&view=auto ============================================================================== Binary file - no diff available. Propchange: nifi/site/trunk/docs/nifi-docs/html/images/scrypt-salt.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: nifi/site/trunk/docs/nifi-docs/html/overview.html URL: http://svn.apache.org/viewvc/nifi/site/trunk/docs/nifi-docs/html/overview.html?rev=1730775&r1=1730774&r2=1730775&view=diff ============================================================================== --- nifi/site/trunk/docs/nifi-docs/html/overview.html (original) +++ nifi/site/trunk/docs/nifi-docs/html/overview.html Wed Feb 17 02:15:29 2016 @@ -891,7 +891,7 @@ about loading, and to exchange data on s </div> <div id="footer"> <div id="footer-text"> -Last updated 2015-12-08 13:53:16 -05:00 +Last updated 2016-02-16 10:19:45 EST </div> </div> </body> Modified: nifi/site/trunk/docs/nifi-docs/html/user-guide.html URL: http://svn.apache.org/viewvc/nifi/site/trunk/docs/nifi-docs/html/user-guide.html?rev=1730775&r1=1730774&r2=1730775&view=diff ============================================================================== --- nifi/site/trunk/docs/nifi-docs/html/user-guide.html (original) +++ nifi/site/trunk/docs/nifi-docs/html/user-guide.html Wed Feb 17 02:15:29 2016 @@ -456,6 +456,11 @@ body.book #toc,body.book #preamble,body. <div id="toctitle">Table of Contents</div> <ul class="sectlevel1"> <li><a href="#introduction">Introduction</a></li> +<li><a href="#browser-support">Browser Support</a> +<ul class="sectlevel2"> +<li><a href="#unsupported-browsers">Unsupported Browsers</a></li> +</ul> +</li> <li><a href="#terminology">Terminology</a></li> <li><a href="#User_Interface">NiFi User Interface</a></li> <li><a href="#logging-in">Logging In</a></li> @@ -485,6 +490,7 @@ body.book #toc,body.book #preamble,body. <li><a href="#processor_anatomy">Anatomy of a Processor</a></li> <li><a href="#process_group_anatomy">Anatomy of a Process Group</a></li> <li><a href="#remote_group_anatomy">Anatomy of a Remote Process Group</a></li> +<li><a href="#Queue_Interaction">Queue Interaction</a></li> <li><a href="#Summary_Page">Summary Page</a></li> <li><a href="#Stats_History">Historical Statistics of a Component</a></li> </ul> @@ -522,26 +528,60 @@ cloned, modified, sent, and ultimately d </div> <div class="paragraph"> <p>See the Admin Guide for information about system requirements, installation, and configuration. Once NiFi is installed, -use a supported web browser to view the User Interface. Supported web browsers include:</p> +use a supported web browser to view the User Interface (UI).</p> </div> -<div class="ulist"> -<ul> -<li> -<p>Internet Explorer 9+ (see note below)</p> -</li> -<li> -<p>Mozilla FireFox 24+</p> -</li> -<li> -<p>Google Chrome 36+</p> -</li> -<li> -<p>Safari 8</p> -</li> -</ul> +</div> +</div> +<div class="sect1"> +<h2 id="browser-support"><a class="anchor" href="#browser-support"></a>Browser Support</h2> +<div class="sectionbody"> +<table class="tableblock frame-all grid-all spread"> +<colgroup> +<col style="width: 50%;"> +<col style="width: 50%;"> +</colgroup> +<thead> +<tr> +<th class="tableblock halign-left valign-top">Browser</th> +<th class="tableblock halign-left valign-top">Version</th> +</tr> +</thead> +<tbody> +<tr> +<td class="tableblock halign-left valign-top"><p class="tableblock">Chrome</p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock">Current and Current - 1</p></td> +</tr> +<tr> +<td class="tableblock halign-left valign-top"><p class="tableblock">FireFox</p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock">Current and Current - 1</p></td> +</tr> +<tr> +<td class="tableblock halign-left valign-top"><p class="tableblock">Edge</p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock">Current</p></td> +</tr> +<tr> +<td class="tableblock halign-left valign-top"><p class="tableblock">Safari</p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock">Current and Current - 1</p></td> +</tr> +</tbody> +</table> +<div class="paragraph"> +<p>Current and Current - 1 indicates that the UI is supported in the current stable release of that browser and the preceding one. For instance, if +the current stable release is 45.X then the officially supported versions will be 45.X and 44.X.</p> +</div> +<div class="paragraph"> +<p>Current indicates that the UI is supported in the current stable release of that browser.</p> </div> <div class="paragraph"> -<p>Note that there is a known issue in Internet Explorer (IE) 10 and 11 that can cause problems when moving items on the NiFi canvas. If you encounter this problem, we suggest using a browser other than IE. This known issue is described here: <a href="https://connect.microsoft.com/IE/Feedback/Details/1050422"; class="bare">https://connect.microsoft.com/IE/Feedback/Details/1050422</a>.</p> +<p>The supported browser versions are driven by the capabilities the UI employs and the dependencies it uses. UI features will be developed and tested +against the supported browsers. Any problem using a supported browser should be reported to Apache NiFi.</p> +</div> +<div class="sect2"> +<h3 id="unsupported-browsers"><a class="anchor" href="#unsupported-browsers"></a>Unsupported Browsers</h3> +<div class="paragraph"> +<p>While the UI may run successfully in unsupported browsers, it is not actively tested against them. Additionally, the UI is designed as a desktop +experience and is not currently supported in mobile browsers.</p> +</div> </div> </div> </div> @@ -1488,6 +1528,17 @@ prioritizers’ list to the ‘A </ul> </div> </div> +<div class="sect3"> +<h4 id="bending-connections"><a class="anchor" href="#bending-connections"></a>Bending Connections</h4> +<div class="paragraph"> +<p>To add a bend point (or elbow) to an existing connection, simply double-click on the connection in the spot where you want the bend point to be. Then, you can use the mouse to grab +the bend point and drag it so that the connection is bent in the desired way. You can add as many bend points as you want. You can also use the mouse to drag and move the label on the connection to any existing +bend point. To remove a bend point, simply double-click it again.</p> +</div> +<div class="paragraph"> +<p><span class="image"><img src="./images/nifi-connection-bend-points.png" alt="Connection Bend Points" width="500"></span></p> +</div> +</div> </div> <div class="sect2"> <h3 id="processor-validation"><a class="anchor" href="#processor-validation"></a>Processor Validation</h3> @@ -2287,6 +2338,27 @@ on the Remote Process Group and choosing </div> </div> <div class="sect2"> +<h3 id="Queue_Interaction"><a class="anchor" href="#Queue_Interaction"></a>Queue Interaction</h3> +<div class="paragraph"> +<p>The FlowFiles enqueued in a Connection can be viewed when necessary. The Queue listing is opened via a menu item in +a Connection’s context menu. The listing will return the top 100 FlowFiles in the active queue according to the +configured priority. The listing can be performed even if the source and destination are actively running.</p> +</div> +<div class="paragraph"> +<p>Additionally, details for a Flowfile in the listing can be viewed by clicking on the Details icon ( +<span class="image"><img src="./images/iconDetails.png" alt="Details"></span> +) in the left most column. From here, the FlowFile details and attributes are available as well buttons for +downloading or viewing the content. Viewing the content is only available if the nifi.content.viewer.url has been configured. +If the source or destination of the Connection are actively running, there is a chance that the desired FlowFile will +no longer be in the active queue.</p> +</div> +<div class="paragraph"> +<p>The FlowFiles enqueued in a Connection can also be deleted when necessary. The removal of the FlowFiles is initiated +via a menu item in the Connection’s context menu. This action can also be performed if the source and destination +are actively running.</p> +</div> +</div> +<div class="sect2"> <h3 id="Summary_Page"><a class="anchor" href="#Summary_Page"></a>Summary Page</h3> <div class="paragraph"> <p>While the NiFi canvas is useful for understanding how the configured DataFlow is laid out, this view is not always optimal @@ -2382,7 +2454,8 @@ by right-clicking on a component and cho for more information).</p> </div> <div class="paragraph"> -<p>The amount of historical information that is stored is configurable in the NiFi properties but defaults to 24 hours. +<p>The amount of historical information that is stored is configurable in the NiFi properties but defaults to 24 hours. For specific +configuration information reference the Component Status Repository of the Administration guide. When the Stats dialog is opened, it provides a graph of historical statistics:</p> </div> <div class="imageblock"> @@ -2697,7 +2770,7 @@ lineage graph and select "Find parents" </div> <div id="footer"> <div id="footer-text"> -Last updated 2015-12-08 13:53:16 -05:00 +Last updated 2016-02-16 10:19:45 EST </div> </div> </body>
