nifi git commit: NIFI-2304: If node address is not set, default to localhost, as the admin guide says it should
Repository: nifi
Updated Branches:
refs/heads/master 9a2f8c598 -> 09840027a
NIFI-2304: If node address is not set, default to localhost, as the admin guide
says it should
This closes #688
Signed-off-by: Koji Kawamura
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/09840027
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/09840027
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/09840027
Branch: refs/heads/master
Commit: 09840027a37c076f5df6239c669fc77315b761d9
Parents: 9a2f8c5
Author: Mark Payne
Authored: Wed Jul 20 12:21:58 2016 -0400
Committer: Koji Kawamura
Committed: Tue Aug 2 12:09:34 2016 +0900
--
.../heartbeat/ClusterProtocolHeartbeatMonitor.java | 12 +++-
1 file changed, 3 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/nifi/blob/09840027/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/heartbeat/ClusterProtocolHeartbeatMonitor.java
--
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/heartbeat/ClusterProtocolHeartbeatMonitor.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/heartbeat/ClusterProtocolHeartbeatMonitor.java
index 934c81b..f206a07 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/heartbeat/ClusterProtocolHeartbeatMonitor.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/heartbeat/ClusterProtocolHeartbeatMonitor.java
@@ -17,8 +17,6 @@
package org.apache.nifi.cluster.coordination.heartbeat;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.HashMap;
@@ -91,16 +89,12 @@ public class ClusterProtocolHeartbeatMonitor extends
AbstractHeartbeatMonitor im
this.clusterNodesPath = zkClientConfig.resolvePath("cluster/nodes");
String hostname =
properties.getProperty(NiFiProperties.CLUSTER_NODE_ADDRESS);
-if (hostname == null) {
-try {
-hostname = InetAddress.getLocalHost().getHostName();
-} catch (UnknownHostException e) {
-throw new RuntimeException("Unable to determine local hostname
and the '" + NiFiProperties.CLUSTER_NODE_ADDRESS + "' property is not set");
-}
+if (hostname == null || hostname.trim().isEmpty()) {
+hostname = "localhost";
}
final String port =
properties.getProperty(NiFiProperties.CLUSTER_NODE_PROTOCOL_PORT);
-if (port == null) {
+if (port == null || port.trim().isEmpty()) {
throw new RuntimeException("Unable to determine which port Cluster
Coordinator Protocol is listening on because the '"
+ NiFiProperties.CLUSTER_NODE_PROTOCOL_PORT + "' property is
not set");
}
nifi git commit: NIFI-2441 This closes #766. View state fails with a JS error
Repository: nifi
Updated Branches:
refs/heads/master 7a5560c33 -> 9a2f8c598
NIFI-2441 This closes #766. View state fails with a JS error
Removed permission check causing "Cannot read property 'canRead' of
undefined". A given user won't have record level permission
difference for component state. It's not required here.
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/9a2f8c59
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/9a2f8c59
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/9a2f8c59
Branch: refs/heads/master
Commit: 9a2f8c598e7e067b371a6cb8f67f227e982f5b9a
Parents: 7a5560c
Author: Koji Kawamura
Authored: Tue Aug 2 10:58:48 2016 +0900
Committer: joewitt
Committed: Mon Aug 1 22:54:37 2016 -0400
--
.../main/webapp/js/nf/canvas/nf-component-state.js | 17 +++--
1 file changed, 3 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/nifi/blob/9a2f8c59/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-component-state.js
--
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-component-state.js
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-component-state.js
index c92942b..ce659d7 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-component-state.js
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-component-state.js
@@ -90,20 +90,9 @@ nf.ComponentState = (function () {
var sort = function (sortDetails, data) {
// defines a function for sorting
var comparer = function (a, b) {
-if(a.permissions.canRead && b.permissions.canRead) {
-var aString =
nf.Common.isDefinedAndNotNull(a.component[sortDetails.columnId]) ?
a.component[sortDetails.columnId] : '';
-var bString =
nf.Common.isDefinedAndNotNull(b.component[sortDetails.columnId]) ?
b.component[sortDetails.columnId] : '';
-return aString === bString ? 0 : aString > bString ? 1 : -1;
-} else {
-if (!a.permissions.canRead && !b.permissions.canRead){
-return 0;
-}
-if(a.permissions.canRead){
-return 1;
-} else {
-return -1;
-}
-}
+var aString =
nf.Common.isDefinedAndNotNull(a[sortDetails.columnId]) ?
a[sortDetails.columnId] : '';
+var bString =
nf.Common.isDefinedAndNotNull(b[sortDetails.columnId]) ?
b[sortDetails.columnId] : '';
+return aString === bString ? 0 : aString > bString ? 1 : -1;
};
// perform the sort
[1/2] nifi git commit: NIFI-2450 Update Getting Started guide, Data Provenance section graphics
Repository: nifi Updated Branches: refs/heads/master 05a99a93c -> 7a5560c33 NIFI-2450 Update Getting Started guide, Data Provenance section graphics Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/73105035 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/73105035 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/73105035 Branch: refs/heads/master Commit: 731050352d987e781cdbf726fe6546fd4c589c05 Parents: 05a99a9 Author: Rob Moran Authored: Mon Aug 1 15:05:25 2016 -0400 Committer: joewitt Committed: Mon Aug 1 21:55:52 2016 -0400 -- .../src/main/asciidoc/getting-started.adoc | 10 +++--- .../main/asciidoc/images/event-attributes.png | Bin 42173 -> 55373 bytes .../asciidoc/images/event-content-replay.png| Bin 59119 -> 0 bytes .../src/main/asciidoc/images/event-content.png | Bin 59490 -> 62054 bytes .../src/main/asciidoc/images/event-details.png | Bin 75995 -> 73053 bytes .../asciidoc/images/lineage-graph-annotated.png | Bin 79524 -> 69156 bytes 6 files changed, 3 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/nifi/blob/73105035/nifi-docs/src/main/asciidoc/getting-started.adoc -- diff --git a/nifi-docs/src/main/asciidoc/getting-started.adoc b/nifi-docs/src/main/asciidoc/getting-started.adoc index 3bf2078..9837a61 100644 --- a/nifi-docs/src/main/asciidoc/getting-started.adoc +++ b/nifi-docs/src/main/asciidoc/getting-started.adoc @@ -698,15 +698,11 @@ Finally, we have the Content tab: image:event-content.png[Event Content] This tab provides us information about where in the Content Repository the FlowFile's content was stored. If the event modified the content -of the FlowFile, we will see the 'before' and 'after' content claims. We are then given the option to Download the content or to View the +of the FlowFile, we will see the 'before' (input) and 'after' (output) content claims. We are then given the option to Download the content or to View the content within NiFi itself, if the data format is one that NiFi understands how to render. -Additionally, in the Replay section of the tab, there is a 'Submit' button that allows the user to re-insert the FlowFile into the flow and re-process it from exactly the point -at which the event happened. - -image:event-content-replay.png[Event Content Replay] - -This provides a very powerful mechanism, as we are able to modify our flow in real time, re-process a FlowFile, +Additionally, in the Replay section of the tab, there is a 'Replay' button that allows the user to re-insert the FlowFile into the flow and re-process it from exactly the point +at which the event happened. This provides a very powerful mechanism, as we are able to modify our flow in real time, re-process a FlowFile, and then view the results. If they are not as expected, we can modify the flow again, and re-process the FlowFile again. We are able to perform this iterative development of the flow until it is processing the data exactly as intended. http://git-wip-us.apache.org/repos/asf/nifi/blob/73105035/nifi-docs/src/main/asciidoc/images/event-attributes.png -- diff --git a/nifi-docs/src/main/asciidoc/images/event-attributes.png b/nifi-docs/src/main/asciidoc/images/event-attributes.png index 0415c73..1602542 100644 Binary files a/nifi-docs/src/main/asciidoc/images/event-attributes.png and b/nifi-docs/src/main/asciidoc/images/event-attributes.png differ http://git-wip-us.apache.org/repos/asf/nifi/blob/73105035/nifi-docs/src/main/asciidoc/images/event-content-replay.png -- diff --git a/nifi-docs/src/main/asciidoc/images/event-content-replay.png b/nifi-docs/src/main/asciidoc/images/event-content-replay.png deleted file mode 100644 index f739bd0..000 Binary files a/nifi-docs/src/main/asciidoc/images/event-content-replay.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/nifi/blob/73105035/nifi-docs/src/main/asciidoc/images/event-content.png -- diff --git a/nifi-docs/src/main/asciidoc/images/event-content.png b/nifi-docs/src/main/asciidoc/images/event-content.png index 994ef4d..3fd38e2 100644 Binary files a/nifi-docs/src/main/asciidoc/images/event-content.png and b/nifi-docs/src/main/asciidoc/images/event-content.png differ http://git-wip-us.apache.org/repos/asf/nifi/blob/73105035/nifi-docs/src/main/asciidoc/images/event-details.png -- diff --git a/nifi-docs/src/main/asciidoc/images/event-details.png b/nifi-docs/src/main/asciidoc/images/event-details.pn
[2/2] nifi git commit: NIFI-2420 This closes #763. This closes #762. Updated Admin Guide with Multi-tenant Auth section and related system properties
NIFI-2420 This closes #763. This closes #762. Updated Admin Guide with Multi-tenant Auth section and related system properties Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/7a5560c3 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/7a5560c3 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/7a5560c3 Branch: refs/heads/master Commit: 7a5560c33f3171d2934ae12f1b8828e579e3805f Parents: 7310503 Author: Andrew Lim Authored: Mon Aug 1 14:00:23 2016 -0400 Committer: joewitt Committed: Mon Aug 1 22:25:08 2016 -0400 -- .../src/main/asciidoc/administration-guide.adoc | 415 ++- .../images/access-policy-config-start.png | Bin 0 -> 146821 bytes .../asciidoc/images/group-creation-dialog.png | Bin 0 -> 22155 bytes .../main/asciidoc/images/iconAccessPolicies.png | Bin 0 -> 1059 bytes .../src/main/asciidoc/images/iconAddUser.png| Bin 0 -> 1004 bytes .../main/asciidoc/images/nifi-users-dialog.png | Bin 0 -> 55868 bytes .../process-group-modify-policy-add-user2.png | Bin 0 -> 59160 bytes .../images/process-group-modify-policy.png | Bin 0 -> 82788 bytes .../process-group-view-policy-add-user2.png | Bin 0 -> 59064 bytes .../images/process-group-view-policy.png| Bin 0 -> 82721 bytes .../processor-inherited-modify-policy.png | Bin 0 -> 74404 bytes .../asciidoc/images/processor-modify-policy.png | Bin 0 -> 100835 bytes .../processor-replacement-modify-policy.png | Bin 0 -> 61262 bytes .../processor-replacement-view-policy.png | Bin 0 -> 60817 bytes .../asciidoc/images/processor-view-policy.png | Bin 0 -> 101687 bytes .../images/replacetext-processor-added.png | Bin 0 -> 179579 bytes .../asciidoc/images/user-creation-dialog.png| Bin 0 -> 20122 bytes .../asciidoc/images/user1-create-connection.png | Bin 0 -> 160503 bytes .../asciidoc/images/user1-edit-connection.png | Bin 0 -> 185060 bytes .../main/asciidoc/images/user1-full-access.png | Bin 0 -> 183790 bytes .../main/asciidoc/images/user2-can-connect.png | Bin 0 -> 179306 bytes .../images/user2-connected-processors.png | Bin 0 -> 185050 bytes .../asciidoc/images/user2-edit-connection.png | Bin 0 -> 183074 bytes .../asciidoc/images/user2-edit-processor.png| Bin 0 -> 188768 bytes .../asciidoc/images/user2-moved-processor.png | Bin 0 -> 189742 bytes .../asciidoc/images/user2-no-connection.png | Bin 0 -> 174751 bytes .../images/user2-no-edit-connection.png | Bin 0 -> 271325 bytes .../asciidoc/images/user2-restricted-access.png | Bin 0 -> 187504 bytes 28 files changed, 414 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/nifi/blob/7a5560c3/nifi-docs/src/main/asciidoc/administration-guide.adoc -- diff --git a/nifi-docs/src/main/asciidoc/administration-guide.adoc b/nifi-docs/src/main/asciidoc/administration-guide.adoc index b8dea71..e39dee4 100644 --- a/nifi-docs/src/main/asciidoc/administration-guide.adoc +++ b/nifi-docs/src/main/asciidoc/administration-guide.adoc @@ -282,6 +282,401 @@ nifi.security.user.login.identity.provider=kerberos-provider See also <> to allow single sign-on access via client Kerberos tickets. +[[multi-tenant-authorization]] +Multi-Tenant Authorization +-- + +After you have configured NiFi to run securely and with an authentication mechanism, you must configure who has access to the system, and the level of their access. +You can do this using 'multi-tenant authorization'. Multi-tenant authorization enables multiple groups of users (tenants) to command, control, and observe different +parts of the dataflow, with varying levels of authorization. When an authenticated user attempts to view or modify a NiFi resource, the system checks whether the +user has privileges to perform that action. These privileges are defined by policies that you can apply system-wide or to individual components. + +[[authorizer-configuration]] +Authorizer Configuration + + +An 'authorizer' grants users the privileges to manage users and policies by creating preliminary authorizations at startup. + +Authorizers are configured using two properties in the 'nifi.properties' file: + +* The `nifi.authorizer.configuration.file` property specifies the configuration file where authorizers are defined. By default, the 'authorizers.xml' file located in the root installation conf directory is selected. +* The `nifi.security.user.authorizer` property indicates which of the configured authorizers in the 'authorizers.xml' file to use. + +[[authorizers-setup]] +Authorizers.xml Setup +~ + +The 'authorizers.xml' file is used to define and configure available authorizers. The de
[jira] [Commented] (MINIFI-68) YAML config ingest by C++ version
[ https://issues.apache.org/jira/browse/MINIFI-68?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15402889#comment-15402889 ] Aldrin Piri commented on MINIFI-68: --- Have completed this and done some testing both on OS X and Linux. Ran into some other environmental things specific to Linux in terms of needed dependencies to be documented. > YAML config ingest by C++ version > - > > Key: MINIFI-68 > URL: https://issues.apache.org/jira/browse/MINIFI-68 > Project: Apache NiFi MiNiFi > Issue Type: Improvement > Components: Processing Configuration >Reporter: Aldrin Piri >Assignee: Aldrin Piri > > The C++ version should also ingest configuration in the same format as used > by the Java version. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (MINIFI-73) Perform release of C++ 0.0.1
[ https://issues.apache.org/jira/browse/MINIFI-73?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15402857#comment-15402857 ] Aldrin Piri commented on MINIFI-73: --- Need to document dependencies for building on OS X and Linux systems. These include Boost (for yaml-cpp) and libxml2 with associated devel packages for needed headers. > Perform release of C++ 0.0.1 > > > Key: MINIFI-73 > URL: https://issues.apache.org/jira/browse/MINIFI-73 > Project: Apache NiFi MiNiFi > Issue Type: Task > Components: C++ >Reporter: Aldrin Piri >Assignee: Aldrin Piri > Fix For: cpp-0.0.1 > > > This ticket will be to track the process of providing the initial C++ > release, 0.0.1 and track any additional tasks needed for the initial release. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[1/4] nifi git commit: NIFI-2208 This closes #754. refactored as per comments on JIRA. Reduced API expsosure and tightened lifecycle management.
Repository: nifi
Updated Branches:
refs/heads/master 7f45251bb -> 05a99a93c
http://git-wip-us.apache.org/repos/asf/nifi/blob/05a99a93/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/processor/TestStandardPropertyValue.java
--
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/processor/TestStandardPropertyValue.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/processor/TestStandardPropertyValue.java
index 33327eb..1504ed0 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/processor/TestStandardPropertyValue.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/processor/TestStandardPropertyValue.java
@@ -29,19 +29,16 @@ import org.apache.nifi.controller.ControllerService;
import org.apache.nifi.controller.ControllerServiceLookup;
import org.apache.nifi.controller.repository.StandardFlowFileRecord;
import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.registry.VariableRegistry;
-import org.apache.nifi.registry.VariableRegistryUtils;
import org.junit.Test;
public class TestStandardPropertyValue {
private final ControllerServiceLookup lookup = new
TestControllerServiceLookup();
-private final VariableRegistry variableRegistry =
VariableRegistryUtils.createSystemVariableRegistry();
@Test
public void testSubstituteAttributesWithOneMatchingArg() {
-final PropertyValue value = new StandardPropertyValue("Hello,
${audience}!", lookup, variableRegistry);
+final PropertyValue value = new StandardPropertyValue("Hello,
${audience}!", lookup);
final Map attributes = new HashMap<>();
attributes.put("audience", "World");
assertEquals("Hello, World!",
value.evaluateAttributeExpressions(createFlowFile(attributes)).getValue());
@@ -49,7 +46,7 @@ public class TestStandardPropertyValue {
@Test
public void testMissingEndBraceEvaluatesToStringLiteral() {
-final PropertyValue value = new StandardPropertyValue("Hello,
${audience!", lookup, variableRegistry);
+final PropertyValue value = new StandardPropertyValue("Hello,
${audience!", lookup);
final Map attributes = new HashMap<>();
attributes.put("audience", "World");
assertEquals("Hello, ${audience!",
value.evaluateAttributeExpressions(createFlowFile(attributes)).getValue());
@@ -57,7 +54,7 @@ public class TestStandardPropertyValue {
@Test
public void testEscaped() {
-final PropertyValue value = new StandardPropertyValue("Hello,
$${audience}!", lookup, variableRegistry);
+final PropertyValue value = new StandardPropertyValue("Hello,
$${audience}!", lookup);
final Map attributes = new HashMap<>();
attributes.put("audience", "World");
assertEquals("Hello, ${audience}!",
value.evaluateAttributeExpressions(createFlowFile(attributes)).getValue());
@@ -65,7 +62,7 @@ public class TestStandardPropertyValue {
@Test
public void testSubstituteAttributesWithMultipleMatchingArgs() {
-final PropertyValue value = new StandardPropertyValue("Hello,
${audience}${comma}${question}!", lookup, variableRegistry);
+final PropertyValue value = new StandardPropertyValue("Hello,
${audience}${comma}${question}!", lookup);
final Map attributes = new HashMap<>();
attributes.put("audience", "World");
attributes.put("comma", ",");
@@ -75,14 +72,14 @@ public class TestStandardPropertyValue {
@Test
public void testSubstituteAttributesWithNoMatch() {
-final PropertyValue value = new StandardPropertyValue("Hello,
${audience}${comma}${question:replaceNull('')}!", lookup, variableRegistry);
+final PropertyValue value = new StandardPropertyValue("Hello,
${audience}${comma}${question:replaceNull('')}!", lookup);
final Map attributes = new HashMap<>();
assertEquals("Hello, !",
value.evaluateAttributeExpressions(createFlowFile(attributes)).getValue());
}
@Test
public void testSubstituteAttributesRecursively() {
-final PropertyValue value = new StandardPropertyValue("Hello,
${'${a}${b}'}!", lookup, variableRegistry);
+final PropertyValue value = new StandardPropertyValue("Hello,
${'${a}${b}'}!", lookup);
final Map attributes = new HashMap<>();
attributes.put("a", "b");
attributes.put("b", "World");
@@ -92,7 +89,7 @@ public class TestStandardPropertyValue {
@Test
public void testGetValueAsIntegerAfterSubstitute() {
-final PropertyValue value = new StandardPropertyValue("1${value}",
lookup, variableRegistry);
+final PropertyValue value = new Sta
[2/4] nifi git commit: NIFI-2208 This closes #754. refactored as per comments on JIRA. Reduced API expsosure and tightened lifecycle management.
http://git-wip-us.apache.org/repos/asf/nifi/blob/05a99a93/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
--
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
index 8879726..0417693 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
@@ -238,7 +238,7 @@ import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import static java.util.Objects.requireNonNull;
-
+import static java.util.Objects.requireNonNull;
public class FlowController implements EventAccess, ControllerServiceProvider,
ReportingTaskProvider, QueueProvider, Authorizable,
ProvenanceAuthorizableFactory, NodeTypeProvider {
@@ -324,7 +324,6 @@ public class FlowController implements EventAccess,
ControllerServiceProvider, R
*/
private final StringEncryptor encryptor;
-
private final ScheduledExecutorService clusterTaskExecutor = new
FlowEngine(3, "Clustering Tasks", true);
private final ResourceClaimManager resourceClaimManager = new
StandardResourceClaimManager();
@@ -376,19 +375,21 @@ public class FlowController implements EventAccess,
ControllerServiceProvider, R
final Authorizer authorizer,
final AuditService auditService,
final StringEncryptor encryptor,
-final BulletinRepository bulletinRepo, VariableRegistry
variableRegistry) {
+final BulletinRepository bulletinRepo,
+final VariableRegistry variableRegistry) {
return new FlowController(
-flowFileEventRepo,
-properties,
-authorizer,
-auditService,
-encryptor,
-/* configuredForClustering */ false,
-/* NodeProtocolSender */ null,
-bulletinRepo,
-/* cluster coordinator */ null,
-/* heartbeat monitor */ null, variableRegistry);
+flowFileEventRepo,
+properties,
+authorizer,
+auditService,
+encryptor,
+/* configuredForClustering */ false,
+/* NodeProtocolSender */ null,
+bulletinRepo,
+/* cluster coordinator */ null,
+/* heartbeat monitor */ null,
+/* variable registry */ variableRegistry);
}
public static FlowController createClusteredInstance(
@@ -404,16 +405,16 @@ public class FlowController implements EventAccess,
ControllerServiceProvider, R
VariableRegistry variableRegistry) {
final FlowController flowController = new FlowController(
-flowFileEventRepo,
-properties,
-authorizer,
-auditService,
-encryptor,
-/* configuredForClustering */ true,
-protocolSender,
-bulletinRepo,
-clusterCoordinator,
-heartbeatMonitor, variableRegistry);
+flowFileEventRepo,
+properties,
+authorizer,
+auditService,
+encryptor,
+/* configuredForClustering */ true,
+protocolSender,
+bulletinRepo,
+clusterCoordinator,
+heartbeatMonitor, variableRegistry);
return flowController;
}
@@ -429,7 +430,7 @@ public class FlowController implements EventAccess,
ControllerServiceProvider, R
final BulletinRepository bulletinRepo,
final ClusterCoordinator clusterCoordinator,
final HeartbeatMonitor heartbeatMonitor,
-VariableRegistry variableRegistry) {
+final VariableRegistry variableRegistry) {
maxTimerDrivenThreads = new AtomicInteger(10);
maxEventDrivenThreads = new AtomicInteger(5);
@@ -447,11 +448,10 @@ public class FlowController implements EventAccess,
ControllerServiceProvider, R
final FlowFileRepository flowFileRepo =
createFlowFileRepository(properties, resourceClaimManager);
flowFileRepository = flowFileRepo;
flowFileEventRepository = flowFileEventRepo;
-counterRepositoryRef = new AtomicReference(new
StandardCounterRepository());
+counterRepositoryRef = new AtomicReference<>(new
StandardCounterRepository());
bulletinRepository = bulletinRepo;
-this.variableRegistry = variab
[3/4] nifi git commit: NIFI-2208 This closes #754. refactored as per comments on JIRA. Reduced API expsosure and tightened lifecycle management.
http://git-wip-us.apache.org/repos/asf/nifi/blob/05a99a93/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/StandardAttributeExpression.java
--
diff --git
a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/StandardAttributeExpression.java
b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/StandardAttributeExpression.java
index 1e18953..a7ed184 100644
---
a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/StandardAttributeExpression.java
+++
b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/StandardAttributeExpression.java
@@ -21,13 +21,17 @@ import org.apache.nifi.expression.AttributeValueDecorator;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.processor.exception.ProcessException;
import org.apache.nifi.registry.VariableRegistry;
-import org.apache.nifi.registry.VariableRegistryUtils;
public class StandardAttributeExpression implements AttributeExpression {
private final Query query;
private final VariableRegistry variableRegistry;
+public StandardAttributeExpression(final Query query) {
+this.query = query;
+this.variableRegistry = null;
+}
+
public StandardAttributeExpression(final Query query, final
VariableRegistry variableRegistry) {
this.query = query;
this.variableRegistry = variableRegistry;
@@ -40,7 +44,7 @@ public class StandardAttributeExpression implements
AttributeExpression {
@Override
public String evaluate() throws ProcessException {
-return evaluate((AttributeValueDecorator) null);
+return evaluate(null, null);
}
@Override
@@ -55,8 +59,8 @@ public class StandardAttributeExpression implements
AttributeExpression {
@Override
public String evaluate(final FlowFile flowFile, final
AttributeValueDecorator decorator) throws ProcessException {
-VariableRegistry flowFileRegistry =
VariableRegistryUtils.createFlowVariableRegistry(variableRegistry,flowFile,null);
-final Object evaluationResult =
query.evaluate(flowFileRegistry).getValue();
+final ValueLookup lookup = new ValueLookup(variableRegistry, flowFile);
+final Object evaluationResult = query.evaluate(lookup).getValue();
if (evaluationResult == null) {
return "";
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/05a99a93/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/StandardExpressionLanguageCompiler.java
--
diff --git
a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/StandardExpressionLanguageCompiler.java
b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/StandardExpressionLanguageCompiler.java
index e85853f..01a4eb9 100644
---
a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/StandardExpressionLanguageCompiler.java
+++
b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/StandardExpressionLanguageCompiler.java
@@ -26,6 +26,10 @@ public class StandardExpressionLanguageCompiler implements
ExpressionLanguageCom
private final VariableRegistry variableRegistry;
+public StandardExpressionLanguageCompiler() {
+this.variableRegistry = VariableRegistry.EMPTY_REGISTRY;
+}
+
public StandardExpressionLanguageCompiler(final VariableRegistry
variableRegistry) {
this.variableRegistry = variableRegistry;
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/05a99a93/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/StandardPreparedQuery.java
--
diff --git
a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/StandardPreparedQuery.java
b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/StandardPreparedQuery.java
index 4ee3e02..7473b3b 100644
---
a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/StandardPreparedQuery.java
+++
b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/StandardPreparedQuery.java
@@ -25,7 +25,6 @@ import org.apache.nifi.expression.AttributeValueDecorator;
import org.apache.nifi.processor.exception.ProcessException;
import org.antlr.runtime.tree.Tree;
-import org.apache.nifi.registry.VariableRegistry;
public class StandardPreparedQuery implement
[4/4] nifi git commit: NIFI-2208 This closes #754. refactored as per comments on JIRA. Reduced API expsosure and tightened lifecycle management.
NIFI-2208 This closes #754. refactored as per comments on JIRA. Reduced API expsosure and tightened lifecycle management. Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/05a99a93 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/05a99a93 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/05a99a93 Branch: refs/heads/master Commit: 05a99a93cbd24c7b52313a4c5505c55d6572 Parents: 7f45251 Author: joewitt Authored: Sun Jul 31 15:14:22 2016 -0400 Committer: joewitt Committed: Mon Aug 1 14:17:26 2016 -0400 -- .../nifi/components/PropertyDescriptor.java | 2 +- .../apache/nifi/components/PropertyValue.java | 154 --- .../nifi/expression/AttributeExpression.java| 33 +- .../expression/AttributeValueDecorator.java | 5 +- .../nifi/registry/FileVariableRegistry.java | 67 --- .../apache/nifi/registry/ImmutableMultiMap.java | 145 --- .../nifi/registry/MultiMapVariableRegistry.java | 70 --- .../registry/PropertiesVariableRegistry.java| 82 .../nifi/registry/VariableDescriptor.java | 154 +++ .../apache/nifi/registry/VariableRegistry.java | 118 - .../nifi/registry/VariableRegistryFactory.java | 48 -- .../nifi/registry/VariableRegistryProvider.java | 23 - .../nifi/registry/VariableRegistryUtils.java| 87 .../nifi/registry/TestVariableRegistry.java | 170 ++-- .../registry/TestVariableRegistryUtils.java | 143 -- .../TestVariableRegistry/foobar.properties | 16 - .../TestVariableRegistry/test.properties| 17 - nifi-bootstrap/pom.xml | 85 ++-- .../bootstrap/NotificationServiceManager.java | 5 +- .../expression/language/EmptyPreparedQuery.java | 4 +- .../language/InvalidPreparedQuery.java | 4 +- .../expression/language/PreparedQuery.java | 4 +- .../attribute/expression/language/Query.java| 17 +- .../language/StandardAttributeExpression.java | 12 +- .../StandardExpressionLanguageCompiler.java | 4 + .../language/StandardPreparedQuery.java | 5 +- .../language/StandardPropertyValue.java | 26 +- .../expression/language/ValueLookup.java| 184 .../expression/language/QueryGroovyTest.groovy | 17 +- .../expression/language/TestQuery.java | 154 +++ .../language/TestStandardPreparedQuery.java | 7 +- .../expression/language/TestValueLookup.java| 150 +++ .../org/apache/nifi/util/NiFiProperties.java| 2 +- .../nifi/web/NiFiWebConfigurationContext.java | 3 +- .../nifi/util/MockConfigurationContext.java | 16 +- .../apache/nifi/util/MockProcessContext.java| 6 +- .../org/apache/nifi/util/MockPropertyValue.java | 8 + .../apache/nifi/util/MockValidationContext.java | 4 + .../java/org/apache/nifi/util/TestRunners.java | 3 +- .../CurrentTestStandardProcessorTestRunner.java | 4 +- .../nifi/util/TestMockProcessContext.java | 3 +- .../ambari/TestAmbariReportingTask.java | 10 +- .../elasticsearch/TestFetchElasticsearch.java | 6 +- .../authorization/AuthorizerFactoryBean.java| 7 +- .../main/resources/nifi-authorizer-context.xml | 1 - .../nifi/authorization/FileAuthorizerTest.java | 36 +- .../StandardAuthorizerConfigurationContext.java | 7 +- .../apache/nifi/controller/FlowController.java | 433 +++ .../nifi/util/FileBasedVariableRegistry.java| 88 .../src/main/resources/nifi-context.xml | 2 +- .../controller/StandardFlowServiceTest.java | 4 +- .../nifi/controller/TestFlowController.java | 4 +- .../scheduling/TestProcessorLifecycle.java | 4 +- .../TestStandardProcessScheduler.java | 3 +- .../StandardControllerServiceProviderTest.java | 4 +- .../TestStandardControllerServiceProvider.java | 3 +- .../local/TestWriteAheadLocalStateProvider.java | 7 +- .../zookeeper/TestZooKeeperStateProvider.java | 8 +- .../processor/TestStandardPropertyValue.java| 36 +- .../util/TestFileBasedVariableRegistry.java | 45 ++ .../TestVariableRegistry/foobar.properties | 16 + .../TestVariableRegistry/test.properties| 17 + .../StandardNiFiWebConfigurationContext.java| 6 - .../authorization/TestRangerNiFiAuthorizer.java | 34 +- .../processors/script/TestInvokeGroovy.java | 13 +- .../TestSiteToSiteProvenanceReportingTask.java | 3 +- .../standard/TestRouteOnAttribute.java | 9 +- .../nifi/controller/MonitorMemoryTest.java | 15 +- .../cache/server/TestServerAndClient.java | 14 +- .../attributes/UpdateAttributeModelFactory.java | 8 +- .../update/attributes/api/RuleResource.java | 20 +- 71 files changed, 1436 insertions(+), 1488 deletions(-) -- http://git-wip-us.apache.o
nifi git commit: [NIFI-2426] Update visibility of New service/task button in Controller Settings - Ensuring button is hidden when the user doesn't have permissions to modify the controller. - This clo
Repository: nifi
Updated Branches:
refs/heads/master 5d63ba6a1 -> 7f45251bb
[NIFI-2426] Update visibility of New service/task button in Controller Settings
- Ensuring button is hidden when the user doesn't have permissions to modify
the controller.
- This closes #759
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/7f45251b
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/7f45251b
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/7f45251b
Branch: refs/heads/master
Commit: 7f45251bbd735c8941db384e4d31860798c66b4d
Parents: 5d63ba6
Author: Scott Aslan
Authored: Mon Aug 1 12:54:09 2016 -0400
Committer: Matt Gilman
Committed: Mon Aug 1 13:32:42 2016 -0400
--
.../src/main/webapp/js/nf/canvas/nf-settings.js | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/nifi/blob/7f45251b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
--
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
index 5456a02..b18339e 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
@@ -952,17 +952,14 @@ nf.Settings = (function () {
* Shows the process group configuration.
*/
var showSettings = function () {
-if (nf.Common.canModifyController()) {
-$('#new-service-or-task').show();
-} else {
-$('#new-service-or-task').hide();
-}
-
// show the settings dialog
nf.Shell.showContent('#settings').done(function () {
reset();
});
+//reset content to account for possible policy changes
+$('#settings-tabs').find('.selected-tab').click();
+
// adjust the table size
nf.Settings.resetTableSize();
};
@@ -1014,6 +1011,8 @@ nf.Settings = (function () {
return 'Create a new reporting task';
}
});
+} else {
+$('#new-service-or-task').hide();
}
// resize the table
nifi git commit: NIFI-2303 This closes #749. Update lineage styles
Repository: nifi Updated Branches: refs/heads/master 8c011d91e -> 5d63ba6a1 NIFI-2303 This closes #749. Update lineage styles Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/5d63ba6a Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/5d63ba6a Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/5d63ba6a Branch: refs/heads/master Commit: 5d63ba6a19289889f81559b7929bee0b62dae68c Parents: 8c011d9 Author: Scott Aslan Authored: Mon Aug 1 13:11:54 2016 -0400 Committer: joewitt Committed: Mon Aug 1 13:30:58 2016 -0400 -- .../src/main/webapp/WEB-INF/pages/canvas.jsp| 2 +- .../partials/provenance/provenance-content.jsp | 4 +- .../provenance/provenance-search-dialog.jsp | 2 +- .../src/main/webapp/css/common-ui.css | 54 + .../nifi-web-ui/src/main/webapp/css/main.css| 52 - .../src/main/webapp/css/provenance.css | 132 +-- .../js/nf/provenance/nf-provenance-lineage.js | 230 --- .../js/nf/provenance/nf-provenance-table.js | 59 +++-- .../webapp/js/nf/provenance/nf-provenance.js| 63 ++--- 9 files changed, 284 insertions(+), 314 deletions(-) -- http://git-wip-us.apache.org/repos/asf/nifi/blob/5d63ba6a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp -- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp index c6662ca..752e82a 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp @@ -142,7 +142,7 @@ - + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi/blob/5d63ba6a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-content.jsp -- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-content.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-content.jsp index ba86185..10bf887 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-content.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-content.jsp @@ -57,9 +57,9 @@ - + - + http://git-wip-us.apache.org/repos/asf/nifi/blob/5d63ba6a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-search-dialog.jsp -- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-search-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-search-dialog.jsp index 0430518..565d016 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-search-dialog.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-search-dialog.jsp @@ -18,7 +18,7 @@ -Fields +Fields No searchable fields have been configured. http://git-wip-us.apache.org/repos/asf/nifi/blob/5d63ba6a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/common-ui.css -- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/common-ui.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/common-ui.css index a0a3cab..3a5c793 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/w
nifi git commit: NIFI-2060 - fixed unit tests to be compatible with 2.7.x
Repository: nifi
Updated Branches:
refs/heads/master 372a316de -> 8c011d91e
NIFI-2060 - fixed unit tests to be compatible with 2.7.x
This closes #547
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/8c011d91
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/8c011d91
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/8c011d91
Branch: refs/heads/master
Commit: 8c011d91e147a9bab0e2ab5b2d59f5926269a654
Parents: 372a316
Author: Pierre Villard
Authored: Mon Jun 20 19:15:09 2016 +0200
Committer: Matt Burgess
Committed: Mon Aug 1 12:46:51 2016 -0400
--
.../hadoop/inotify/TestGetHDFSEvents.java | 23 +---
.../hadoop/inotify/util/EventTestUtils.java | 12 --
2 files changed, 10 insertions(+), 25 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/nifi/blob/8c011d91/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/inotify/TestGetHDFSEvents.java
--
diff --git
a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/inotify/TestGetHDFSEvents.java
b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/inotify/TestGetHDFSEvents.java
index 3cd0cb3..f8c1cce 100644
---
a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/inotify/TestGetHDFSEvents.java
+++
b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/inotify/TestGetHDFSEvents.java
@@ -133,7 +133,7 @@ public class TestGetHDFSEvents {
runner.run();
List successfulFlowFiles =
runner.getFlowFilesForRelationship(GetHDFSEvents.REL_SUCCESS);
-assertEquals(6, successfulFlowFiles.size());
+assertEquals(3, successfulFlowFiles.size());
verify(eventBatch).getTxid();
assertEquals("100",
runner.getProcessContext().getStateManager().getState(Scope.CLUSTER).get("last.tx.id"));
}
@@ -176,13 +176,13 @@ public class TestGetHDFSEvents {
TestRunner runner = TestRunners.newTestRunner(processor);
runner.setProperty(GetHDFSEvents.HDFS_PATH_TO_WATCH,
"/some/path(/.*)?");
-runner.setProperty(GetHDFSEvents.EVENT_TYPES, "create, metadata,
rename");
+runner.setProperty(GetHDFSEvents.EVENT_TYPES, "create, metadata");
runner.run();
List successfulFlowFiles =
runner.getFlowFilesForRelationship(GetHDFSEvents.REL_SUCCESS);
-assertEquals(3, successfulFlowFiles.size());
+assertEquals(2, successfulFlowFiles.size());
-List expectedEventTypes = Arrays.asList("CREATE", "METADATA",
"RENAME");
+List expectedEventTypes = Arrays.asList("CREATE", "METADATA");
for (MockFlowFile f : successfulFlowFiles) {
String eventType = f.getAttribute(EventAttributes.EVENT_TYPE);
assertTrue(expectedEventTypes.contains(eventType));
@@ -195,9 +195,9 @@ public class TestGetHDFSEvents {
@Test
public void
makeSureExpressionLanguageIsWorkingProperlyWithinTheHdfsPathToWatch() throws
Exception {
Event[] events = new Event[] {
-new Event.AppendEvent("/some/path/1/2/3/t.txt"),
-new Event.AppendEvent("/some/path/1/2/4/t.txt"),
-new Event.AppendEvent("/some/path/1/2/3/.t.txt")
+new
Event.CreateEvent.Builder().path("/some/path/1/2/3/t.txt").build(),
+new
Event.CreateEvent.Builder().path("/some/path/1/2/4/t.txt").build(),
+new
Event.CreateEvent.Builder().path("/some/path/1/2/3/.t.txt").build()
};
EventBatch eventBatch = mock(EventBatch.class);
@@ -211,7 +211,7 @@ public class TestGetHDFSEvents {
TestRunner runner = TestRunners.newTestRunner(processor);
runner.setProperty(GetHDFSEvents.HDFS_PATH_TO_WATCH,
"/some/path/${literal(1)}/${literal(2)}/${literal(3)}/.*.txt");
-runner.setProperty(GetHDFSEvents.EVENT_TYPES, "append");
+runner.setProperty(GetHDFSEvents.EVENT_TYPES, "create");
runner.setProperty(GetHDFSEvents.IGNORE_HIDDEN_FILES, "true");
runner.run();
@@ -220,7 +220,7 @@ public class TestGetHDFSEvents {
for (MockFlowFile f : successfulFlowFiles) {
String eventType = f.getAttribute(EventAttributes.EVENT_TYPE);
-assertTrue(eventType.equals("APPEND"));
+assertTrue(eventType.equals("CREATE"));
}
verify(eventBatch).getTxid();
@@ -231,10 +231,7 @@ public class TestGetHDFSEvents {
return new Event[]{
EventTestUtils.createCreateEvent(),
EventTestUtils.cre
nifi git commit: NIFI-2434 This closes #747. Correct outdated info in Admin Guide: remove Java 8 refs, update browser versions, new weak crypto screenshot, new cluster screenshot, edit Site-to-Sitepro
Repository: nifi Updated Branches: refs/heads/master bfdf94d52 -> 4d17504a0 NIFI-2434 This closes #747. Correct outdated info in Admin Guide: remove Java 8 refs, update browser versions, new weak crypto screenshot, new cluster screenshot, edit Site-to-Siteproperty descriptions, move cluster node properties to proper section Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/4d17504a Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/4d17504a Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/4d17504a Branch: refs/heads/master Commit: 4d17504a0fd1a78f55aad2241bb426583f3a6c5a Parents: bfdf94d Author: Andrew Lim Authored: Fri Jul 29 12:29:46 2016 -0400 Committer: joewitt Committed: Mon Aug 1 11:38:59 2016 -0400 -- .../src/main/asciidoc/administration-guide.adoc | 62 +++ .../main/asciidoc/images/allow-weak-crypto.png | Bin 130449 -> 82057 bytes nifi-docs/src/main/asciidoc/images/ncm.png | Bin 339522 -> 244418 bytes 3 files changed, 24 insertions(+), 38 deletions(-) -- http://git-wip-us.apache.org/repos/asf/nifi/blob/4d17504a/nifi-docs/src/main/asciidoc/administration-guide.adoc -- diff --git a/nifi-docs/src/main/asciidoc/administration-guide.adoc b/nifi-docs/src/main/asciidoc/administration-guide.adoc index ba5e16a..b8dea71 100644 --- a/nifi-docs/src/main/asciidoc/administration-guide.adoc +++ b/nifi-docs/src/main/asciidoc/administration-guide.adoc @@ -23,21 +23,17 @@ System Requirements --- Apache NiFi can run on something as simple as a laptop, but it can also be clustered across many enterprise-class servers. Therefore, the amount of hardware and memory needed will depend on the size and nature of the dataflow involved. The data is stored on disk while NiFi is processing it. So NiFi needs to have sufficient disk space allocated for its various repositories, particularly the content repository, flowfile repository, and provenance repository (see the <> section for more information about these repositories). NiFi has the following minimum system requirements: -* Requires Java 7 or newer +* Requires Java 8 or newer * Supported Operating Systems: ** Linux ** Unix ** Windows ** Mac OS X * Supported Web Browsers: -** Internet Explorer 9+ (see note below) -** Mozilla FireFox 24+ -** Google Chrome 36+ -** Safari 8 - -**Note** There is a known issue in Internet Explorer (IE) 10 and 11 that can cause problems when moving items on the NiFi graph. If you encounter this problem, we suggest using a browser other than IE. This known issue is described here: https://connect.microsoft.com/IE/Feedback/Details/1050422. - -**Note** Java 7 default perm gen sizing can result in 'out of memory errors' due to the amount of classes loaded by NiFi. See the <> section for more information. +** Microsoft Edge: Current & (Current - 1) +** Mozilla FireFox: Current & (Current - 1) +** Google Chrome: Current & (Current - 1) +** Safari: Current & (Current - 1) **Note** Under sustained and extremely high throughput the CodeCache settings may need to be tuned to avoid sudden performance loss. See the <> section for more information. @@ -613,7 +609,7 @@ For each Node, the minimum properties to configure are as follows: Now, it is possible to start up the cluster. It does not matter which order the instances start up. Navigate to the URL for one of the nodes, and the User Interface should look similar to the following: -image:ncm.png["Clustered User Interface", width=940] +image:ncm.png["Clustered User Interface"] *Troubleshooting* @@ -984,17 +980,8 @@ take effect only after NiFi has been stopped and restarted. configured recipients if the bootstrap determines that NiFi has unexpectedly died. | -*Java 7 PermGen Sizing* -The provided _bootstrap.conf_ file may include a line such as - -#java.arg.11=-XX:PermSize=128M -#java.arg.12=-XX:MaxPermSize=128M - -If running in Java 7 it is recommended to uncomment those lines to ensure the PermGen size and maximum can be larger than is available by default. This is important because NiFi -can load a significant number of classes which will result in OutOfMemoryError due to PermGen being full. You might choose a value larger than 128MB as well. - -*Java 7 and 8 handling of codecache* -It has been observed in both Java 7 and Java 8 runtime environments that performance can suddenly drop by more than an order of magnitude after days or weeks of otherwise ideal +*Java 8 handling of codecache* +It has been observed in Java 8 runtime environments that performance can suddenly drop by more than an order of magnitude after days or weeks of otherwise ideal behavior. This has only
nifi git commit: NIFI-2401: - Returning the enabled state of play and stop buttons in the palette. Allowing the user to always press if they have permissions to modify the selection. - Only attempting
Repository: nifi
Updated Branches:
refs/heads/master 4d17504a0 -> 372a316de
NIFI-2401:
- Returning the enabled state of play and stop buttons in the palette.
Allowing the user to always press if they have permissions to modify the
selection.
- Only attempting to schedule components that are not running, not disabled,
and valid.
This closes #745
Signed-off-by: jpercivall
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/372a316d
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/372a316d
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/372a316d
Branch: refs/heads/master
Commit: 372a316debcf271ff959d09b57e3b25f05c68cb6
Parents: 4d17504
Author: Matt Gilman
Authored: Fri Jul 29 10:36:25 2016 -0400
Committer: jpercivall
Committed: Mon Aug 1 11:39:55 2016 -0400
--
.../src/main/java/org/apache/nifi/groups/ProcessGroup.java | 6 +++---
.../src/main/webapp/WEB-INF/partials/canvas/navigation.jsp | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/nifi/blob/372a316d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/groups/ProcessGroup.java
--
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/groups/ProcessGroup.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/groups/ProcessGroup.java
index e989c84..d06d49c 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/groups/ProcessGroup.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/groups/ProcessGroup.java
@@ -50,7 +50,7 @@ public interface ProcessGroup extends Authorizable,
Positionable {
/**
* Predicate for filtering schedulable Processors.
*/
-Predicate SCHEDULABLE_PROCESSORS = node ->
!node.isRunning() && node.getScheduledState() != ScheduledState.DISABLED;
+Predicate SCHEDULABLE_PROCESSORS = node ->
!node.isRunning() && !ScheduledState.DISABLED.equals(node.getScheduledState())
&& node.isValid();
/**
* Predicate for filtering unschedulable Processors.
@@ -60,12 +60,12 @@ public interface ProcessGroup extends Authorizable,
Positionable {
/**
* Predicate for filtering schedulable Ports
*/
-Predicate SCHEDULABLE_PORTS = port -> port.getScheduledState() !=
ScheduledState.DISABLED;
+Predicate SCHEDULABLE_PORTS = port -> !port.isRunning() &&
!ScheduledState.DISABLED.equals(port.getScheduledState()) && port.isValid();
/**
* Predicate for filtering schedulable Ports
*/
-Predicate UNSCHEDULABLE_PORTS = port -> port.getScheduledState() ==
ScheduledState.RUNNING;
+Predicate UNSCHEDULABLE_PORTS = port ->
ScheduledState.RUNNING.equals(port.getScheduledState());
/**
* @return a reference to this ProcessGroup's parent. This will be
http://git-wip-us.apache.org/repos/asf/nifi/blob/372a316d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/navigation.jsp
--
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/navigation.jsp
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/navigation.jsp
index 7babfa0..b09382f 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/navigation.jsp
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/navigation.jsp
@@ -120,13 +120,13 @@
+
ng-disabled="!appCtrl.nf.CanvasUtils.getSelection().empty() &&
!appCtrl.nf.CanvasUtils.canModify(appCtrl.nf.CanvasUtils.getSelection());">
+
ng-disabled="!appCtrl.nf.CanvasUtils.getSelection().empty() &&
!appCtrl.nf.CanvasUtils.canModify(appCtrl.nf.CanvasUtils.getSelection());">
[jira] [Created] (MINIFI-75) Externalize log level configuration
Aldrin Piri created MINIFI-75: - Summary: Externalize log level configuration Key: MINIFI-75 URL: https://issues.apache.org/jira/browse/MINIFI-75 Project: Apache NiFi MiNiFi Issue Type: Improvement Components: Agent Configuration/Installation, C++ Reporter: Aldrin Piri Priority: Minor Currently the log level is hardcoded within MiNiFIMain.cpp#main and should be externalized to a properties/bootstrap file. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
nifi git commit: Removing extraneous authorizations.xml from nifi-resources/src/main/resources/conf, created automatically in secure mode
Repository: nifi Updated Branches: refs/heads/master 1bf10944e -> bfdf94d52 Removing extraneous authorizations.xml from nifi-resources/src/main/resources/conf, created automatically in secure mode Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/bfdf94d5 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/bfdf94d5 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/bfdf94d5 Branch: refs/heads/master Commit: bfdf94d522b2f812e447d5a973e8a880cc9233bb Parents: 1bf1094 Author: Bryan Bende Authored: Mon Aug 1 11:07:26 2016 -0400 Committer: Bryan Bende Committed: Mon Aug 1 11:07:26 2016 -0400 -- .../src/main/resources/conf/authorizations.xml | 23 1 file changed, 23 deletions(-) -- http://git-wip-us.apache.org/repos/asf/nifi/blob/bfdf94d5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/authorizations.xml -- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/authorizations.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/authorizations.xml deleted file mode 100644 index a4aa839..000 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/authorizations.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - \ No newline at end of file
[jira] [Updated] (MINIFI-74) Create multiple build profiles
[ https://issues.apache.org/jira/browse/MINIFI-74?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Aldrin Piri updated MINIFI-74: -- Component/s: C++ > Create multiple build profiles > -- > > Key: MINIFI-74 > URL: https://issues.apache.org/jira/browse/MINIFI-74 > Project: Apache NiFi MiNiFi > Issue Type: Improvement > Components: Build, C++ >Reporter: Aldrin Piri >Priority: Minor > > Depending on intended use, multiple build profiles that can optimize the > compiler flags would be helpful. At minimum one should be a more verbose > option '-Og' for debugging and build and then a size optimized '-Os' for > compact binaries. > https://gcc.gnu.org/onlinedocs/gcc/Optimize-Options.html -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Created] (MINIFI-74) Create multiple build profiles
Aldrin Piri created MINIFI-74: - Summary: Create multiple build profiles Key: MINIFI-74 URL: https://issues.apache.org/jira/browse/MINIFI-74 Project: Apache NiFi MiNiFi Issue Type: Improvement Components: Build Reporter: Aldrin Piri Priority: Minor Depending on intended use, multiple build profiles that can optimize the compiler flags would be helpful. At minimum one should be a more verbose option '-Og' for debugging and build and then a size optimized '-Os' for compact binaries. https://gcc.gnu.org/onlinedocs/gcc/Optimize-Options.html -- This message was sent by Atlassian JIRA (v6.3.4#6332)
