Commit Graph

1083 Commits

Author SHA1 Message Date
Matt Brown a7c912ac18 PutTCP Processor created.
Signed-off-by: jpercivall <joepercivall@yahoo.com>
2016-06-21 12:05:13 -04:00
Mark Payne ce8a0de368 NIFI-1994: Fixed issue with Controller Service Fully Qualified Class Names and ensure that services are added to the process groups as appropriate when instantiating templates
NIFI-1882: Ensuring Controller Services are copied as part of a ProcessGroupDTO. This closes #517
2016-06-20 22:24:25 -04:00
Oleg Zhurakousky d64fe416be
NIFI-2032 put back bulletinRepo reporting logic
NIFI-2032 polishing (+2 squashed commits)
Squashed commits:
[4549443] NIFI-2032 fixed 'enableControllerServices' logic
added getRequiredControllerServices() operation to ControllerServiceNode
[3d95c8e] NIFI-2032 Removed legacy references to bulletin repository in StandardControllerServiceProvider. (+1 squashed commit)
Squashed commits:
[6402eb9] NIFI-2032 fixed 'enableControllerServices' logic
added getRequiredControllerServices() operation to ControllerServiceNode

This closes #541.

Signed-off-by: Andy LoPresto <alopresto@apache.org>
2016-06-20 18:56:41 -07:00
Yolanda M. Davis cb3aa8f5c9 NIFI-1850 - Initial Commit for JSON-to-JSON Schema Converter Editor (merge from 0.7.0 - refactor for masterless cluster). This closes #511 2016-06-20 20:30:25 -04:00
Ryan Persaud 274dc0902e NIFI-1909 Adding ability to process schemaless Avro records to ConvertAvrotoJson.
- Made suggested changes and removed unused imports found by checkstyle
 - This closes #459.
2016-06-20 13:48:03 -04:00
Bryan Bende 8593bd771f NIFI-1895 Adding a property to PutHBaseJSON to allow specifying how to store the values
This closes #542.

Signed-off-by: Bryan Bende <bbende@apache.org>
2016-06-20 13:19:20 -04:00
rtempleton 0d2a9dc7e5 NIFI-1895 PutHBaseJSON processor treats all values as Strings
The operator will now inspect the node value to determine type and convert as such.
Numeric integral - Long (assumes widest type)
Numeric not integral - Double (assumes widest type)
Logical - Boolean
everything else (including current Complex Type logic) - String

Values that represent the row key continue to be implictly treated as Strings by the processor

Removed depenency on HBase utility Bytes class from the PutHBaseJSON processor.
Convenience methods to encode to byte array are now wrapped by the appropriate HBaseClientService instance.

Signed-off-by: Bryan Bende <bbende@apache.org>
2016-06-20 13:19:13 -04:00
ricky f5060a6d63 NIFI-1568: Add Filter Capability to UnpackContent
Adds a "File Filter" property to the `UnpackContent` processor
to allow users to specify which files are eligible for extraction.
By default, all files will be extracted.

Signed-off-by: Matt Burgess <mattyb149@apache.org>

Refactor how Unpacker is initialized

Re-uses unpackers to avoid creating them each time a
flowfile is received. Moved the package formats into
an enum for clarity.

Signed-off-by: Matt Burgess <mattyb149@apache.org>

Fix packaging format enum warning

The `AUTO_DETECT_FORMAT` enum for PackagingFormat
is not valid for initilization. When this value
is set, then we use the mime.type to determine
which packaging format to use.

We never pass `AUTO_DETECT_FORMAT` to the
`initUnpacker` method.

Signed-off-by: Matt Burgess <mattyb149@apache.org>

This closes #248
2016-06-20 10:44:38 -04:00
Pierre Villard 86bba1b202 NIFI-1537 Added SNMP processors
This closes #257
2016-06-19 14:58:41 -04:00
ijokarumawak b1b7e35bed NIFI-1843 Default log level for LogAttribute.
- added a logger entry for LogAttribute to specify INFO as log level
- replaced some tab characters to whitespace (existing checkstyle error)

This closes #414.

Signed-off-by: Aldrin Piri <aldrin@apache.org>
2016-06-19 02:21:50 -04:00
Jeremy Dyer 406d8a1991 NIFI-1805
Expose BackPressureObjectThreshold and BackPressureDataSizeThreshold to
ConnectionStatus

This closes #377.

Signed-off-by: Aldrin Piri <aldrin@apache.org>
2016-06-18 23:05:32 -04:00
Pierre Villard e6250d18cf NIFI-1620 Allow empty Content-Type in InvokeHTTP processor
This closes #272.

Signed-off-by: Aldrin Piri <aldrin@apache.org>
2016-06-18 12:47:07 -04:00
Bryan Bende 679ad93f57 NIFI-1804 Adding ability for FileAuthorizer to automatically convert existing authorized-users.xml to new model
- Removing Resources class from file authorizer and updating ResourceType enum
- Updating ResourceFactory to be in sync with ResourceType enum and adding additional required permissions to the auto-conversion
- Adding root process group to the seeding of the initial admin
- Improvement so that users that are already part of a read-write policy, won't end up in a read policy for the same resource
- Removing rootGroupId from authorization context and auto-detecting it from the flow provided through nifi.properties
- This closes #507
2016-06-17 16:33:00 -04:00
Adam Lamar db9a79f79d NIFI-1578: Create PutSlack processor
Signed-off-by: Matt Burgess <mattyb149@apache.org>

This closes #256
2016-06-17 15:32:17 -04:00
Mark Payne c955ec1689 NIFI-2033: Allow Controller Services to be scoped at Controller level instead of just group level. This closes #540 2016-06-17 13:26:30 -04:00
Matt Gilman 2c69c25323 NIFI-2007:
- Restoring bulletin functionality.
- Ensuring appropriate merging of bulletins in clustered responses.

- Updated the phrasing for cluster-related bulletins

This closes #531.
2016-06-17 13:20:20 -04:00
Matt Gilman 0b437e09a7 NIFI-2007:
- Restoring bulletin functionality.
- Ensuring appropriate merging of bulletins in clustered responses.
2016-06-17 13:20:20 -04:00
Joshi 541bbc0932 NIFI-1549: Fix JMSConsumer exception
This closes #539
2016-06-17 12:16:36 -04:00
João Henrique Ferreira de Freitas e27c2556db NIFI-1594: Add support to expression language to define index operation
The index operation should be one of "index", "update", " upsert ".

This lets the operation could be defined by incoming flowfile.

Signed-off-by: João Henrique Ferreira de Freitas <joaohf@gmail.com>
Signed-off-by: Matt Burgess <mattyb149@apache.org>

This closes #255
2016-06-17 11:22:47 -04:00
Matt Gilman fbd299e885 NIFI-1901: - Building component based access control tests for Connections, Funnels, Labels, Input Ports, Output Ports, Processors, and Process Groups. - Restoring Access Token Endpoint tests.
This closes #518

Signed-off-by: Bryan Bende <bbende@apache.org>
2016-06-17 10:16:09 -04:00
James Wing c2b26eb311 Merging NIFI-1941 Child Group Contents in Exported Templates
Signed-off-by: James Wing <jvwing@gmail.com>
This closes #532
2016-06-16 22:05:59 -07:00
Matt Gilman edce66d34f NIFI-1941:
- Ensuring descendent components are scheduled/unscheduled according to their respective ProcessGroups.
2016-06-16 20:17:16 -04:00
Matt Gilman 3156220a57 NIFI-1941:
- Ensuring child group contents are included in exported templates.
2016-06-16 20:00:39 -04:00
Oleg Zhurakousky 8e4a4532df
NIFI-1690 Changed MonitorMemory to use allowable values for pool names
- removed dead code from MonitorMemory
- added MonitorMemoryTest
- minor refactoring in MonitorMemory
- initial fix for NIFI-1731 (WARN/INFO logging) that was required by MonitorMemoryTest

NIFI-1690 polishing

NIFI-1690 address PR comments, removed default value for MEMORY_POOL_PROPERTY

NIFI-1690 addressed latest PR comments

NIFI-1690 fixed breaking changes

Fixed checkstyle issue in StandardProcessScheduler. (+2 squashed commits)
Squashed commits:
[03829c4] Fixed checkstyle issues.
[cb20fe6]

This closes #328.

Signed-off-by: Andy LoPresto <alopresto@apache.org>
2016-06-16 15:17:13 -07:00
JJ 2ce785766d NIFI-1037 Created a processor for HDFS' inotify events. This processor gets notifications for a select path.
This closes #493.
2016-06-17 00:02:28 +02:00
Joe Skora 4723f8e24c NIFI-1829 - Create new DebugFlow processor.
Signed-off-by: Mike Moser <mosermw@apache.org>
This closes #458
2016-06-16 17:23:19 -04:00
Matt Gilman 6e74c10f49 NIFI-2041:
- Fixing issue when attempting to refresh Controller Services when scoped by Process Group.
- This closes #535
2016-06-16 16:51:35 -04:00
Matt Gilman b3de8f76fe Addressing contrib-check issues. 2016-06-16 09:55:10 -04:00
Mark Payne b753a82d7e NIFI-2000: Ensure that if we override setters in ApplicationResource that we call the super class's setter as well
NIFI-2000: Updated to avoid multiple instance variables and instead just provide a getter in ApplicationResource

This closes #522
2016-06-15 13:00:37 -04:00
Pierre Villard 849c43b162 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/nifi 2016-06-15 18:55:18 +02:00
Mark Payne 7facf95cc5 NIFI-1997: Use the 'autoResumeState' property defined in nifi.properties on each node instead of inheriting the property from the Cluster Coordinator
This closes #520
2016-06-15 12:55:34 -04:00
Oleg Zhurakousky 83d5cb365d NIFI-2009 removed 'annotationData' and 'validationContextFactory' instance variables from StandardProcessNode
NIFI-2009 fixed import ordering

This closes #527.
2016-06-15 18:54:25 +02:00
Mark Payne 992b5552bb NIFI-1996: Fixed bug in the generation of UUID's for components when dealing with Snippets
This closes #519
2016-06-15 09:33:30 -04:00
Oleg Zhurakousky a8b42c26b6 NIFI-2006 fixed NPE in PersistentProvenanceRepository
Fixed NPE in PersistentProvenanceRepository caused by attribute value being null
added test

This closes #528
2016-06-14 15:15:37 -04:00
Andy LoPresto 8b0c5a4911 NIFI-1981 Resolved issue where cluster communication without client certificates would fail even if needClientAuth set to false.
Fixed IDE setting for import wildcarding on Groovy files. (+4 squashed commits)
Squashed commits:
[4c3b174] NIFI-1981 Lowered logging level of client auth setting on cluster connection receive.
[b50f473] NIFI-1981 Finished logic to suppress exception on missing client certificates when clientAuth is set to WANT.
Added unit tests for CertificateUtil methods.
[ace35a2] NIFI-1981 Added test scope dependency on BouncyCastle and BC PKIX modules for CertificateUtils tests.
[2c463d1] NIFI-1981 Added ClientAuth enum and CertificateUtil methods to extract this setting from an SSLSocket.
Added logic to compare X509Certificate DNs regardless of RDN element order.
Added logic to suppress peer certificate exceptions when client authentication is not required.
Removed duplicate dependency in pom.xml.
2016-06-14 11:18:31 -04:00
Matt Burgess 6cbc585438 NIFI-1998: Upgraded Cassandra driver to 3.0.2
This closes #521.
2016-06-13 23:28:14 +02:00
Matt Gilman 75bb4bfaa2 NIFI-1781:
- Listening for window resize events more selectively.
- Fixing malformed request when configuring remote process group ports.
- Fixing malformed request when starting/stopping a selected process group.
- Fixing default value for authorizers.xml.
- This closes #524
2016-06-13 16:55:01 -04:00
Mike Moser cc95e5d8c5 NIFI-1937 GetHTTP configurable redirect cookie policy
Reviewed by Tony Kurc (tkurc@apache.org). This closes #479
2016-06-11 11:22:33 -04:00
Koji Kawamura c120c4982d NIFI-1857: HTTPS Site-to-Site
- Enable HTTP(S) for Site-to-Site communication
- Support HTTP Proxy in the middle of local and remote NiFi
- Support BASIC and DIGEST auth with Proxy Server
- Provide 2-phase style commit same as existing socket version
- [WIP] Test with the latest cluster env (without NCM) hasn't tested yet

- Fixed Buffer handling issues at asyc http client POST
- Fixed JS error when applying Remote Process Group Port setting from UI
- Use compression setting from UI
- Removed already finished TODO comments

- Added additional buffer draining code after receiving EOF
- Added inspection and assert code to make sure Site-to-Site client has
  written data fully to output
stream
- Changed default nifi.remote.input.secure from true to false

This closes #497.
2016-06-09 15:09:57 -04:00
Bryan Rosander a5fecda5a2 NIFI-1975 - Processor for parsing evtx files
Signed-off-by: Matt Burgess <mattyb149@apache.org>

This closes #492
2016-06-09 12:07:00 -04:00
Pierre Villard 9e705a8468 NIFI-1866 ProcessException handling in StandardProcessSession 2016-06-08 15:58:27 -04:00
Mark Payne 8a447eec66 NIFI-1052: Added Ghost Processors, Ghost Reporting Tasks, Ghost Controller Services
This closes #499.

Signed-off-by: Bryan Bende <bbende@apache.org>
2016-06-08 15:23:29 -04:00
Mark Payne 18133988a0 NIFI-1984: Ensure that if an Exception is thrown by the 'Deletion Task' when calling NaiveRevisionManager.deleteRevision() that the locking is appropriately cleaned up
This closes #510
2016-06-08 10:31:36 -04:00
Matt Burgess 3b99e12352 NIFI-1973 Allow ExecuteSQL to use flow file content as SQL query
This closes #498.

Signed-off-by: Bryan Bende <bbende@apache.org>
2016-06-07 17:26:58 -04:00
Mark Payne 6de738fd04 NIFI-1660: Fix formatting; update to NOTICE files of nars that bring in EL. Closed Reader that was opened in TestQuery. 2016-06-07 15:34:37 -04:00
Scott Aslan 6710094bd7 create bower.options mvn property to support bower cli options...including --offline
Signed-off-by: Matt Burgess <mattyb149@apache.org>

This closes #505
2016-06-07 14:05:32 -04:00
Mark Bean 1ac44a0a4b NIFI-1118 adding SplitText features of size limit and header marker characters
Signed-off-by: Mike Moser <mosermw@apache.org>

This closes #444
2016-06-07 11:37:23 -04:00
Joey Frazee a490c29a4f Moved HL7 test file into TestExtractHL7Attributes, fixes NIFI-1979
Signed-off-by: Matt Burgess <mattyb149@apache.org>
2016-06-07 11:20:21 -04:00
Joey Frazee d4395a8a08 Fixes NIFI-1968 so ExtractHL7Attributes keeps empty components
Signed-off-by: Matt Burgess <mattyb149@apache.org>
2016-06-06 21:37:53 -04:00
Oleg Zhurakousky 91cdd78ebc NIFI-1668 modified TestProcessorLifecycle to ensure FlowController is always shut down
This closes #324
2016-06-06 13:55:49 -04:00
Oleg Zhurakousky cee2426df6 NIFI-1956 added 'keyboard-interactive' option to SFTPTransfer
This closes #487.
2016-06-06 19:32:16 +02:00
Simon Elliston Ball 55d32ae610 NIFI-1925 Fixed typo
This closes #468
2016-06-06 10:33:28 -04:00
Thad Guidry c090cdf29a Added details about data size in description.
added "in bytes" to further explain the Segment Size property.

This closes #494
2016-06-06 09:50:57 -04:00
Matt Burgess b32c70c419 NIFI-1929: Improvements for PutHDFS attribute handling
This closes #486.
2016-06-06 11:58:55 +02:00
Bryan Bende 8d8a9cba79 NIFI-1916 Updating FileAuthorizer to extend AbstractPolicyBasedAuthorizer and adding intial loading of data users, groups, and policies
- Implementing CRUD operations and unit tests for Users
- Implementing CRUD operations and unit tests for Groups
- Implementing CRUD operations and unit tests for AccessPolicies
- Adding support for seeding with an initial admin user
- Fixing delete for user and group so it removes references from policies
- Adding example to authorizations.xml
- Adding back the old users schema in preparation for auto-converting to the new format, and providing the AuthorizationConfigurationContext with access to the root process group id
- Refactoring some of the FileAuthorizer to ensure thread safety
- Adding /groups to policies created for initial admin
- This closes #473
2016-06-03 17:26:22 -04:00
Matt Gilman 806f4d549d NIFI-1951:
- Removing deprecated NiFiWebContext and related classes.
- Adding authorization to Custom UIs.
- Fixing issue when creating ControllerService inline.
- Addressing contentType issue when attempting to clear component state.
- This closes #489
2016-06-03 16:52:02 -04:00
Mark Payne df0e4e7960 NIFI-1897:
- Refactoring to allow requests to be replicated from a node to other nodes
- Renaming cluster node connection/read timeout properties.
- Renaming NCM DN to Cluster Coordinator DN.
- Fixing default values in properties.
- Starting to fix Spring context to load correctly in standalone mode.
- Using the cluster protocol to handle connection failures instead of heartbeats.
- Ensured replicate call is returned from ControllerResource.
- Ensure the appropriate classloader when serializing templates.
- Handling when the flow contents are null.
- This closes #488
2016-06-03 15:29:16 -04:00
Andre F de Miranda 5a8979150c NIFI-856 - Implements ListenLumberjack Processor
This closes #290.

Signed-off-by: Aldrin Piri <aldrin@apache.org>
2016-06-02 21:58:41 -04:00
jpercivall 54c5c28cbb NIFI-1943 added proper ReadsAttribute to PutFile
This closes #480
2016-06-02 13:04:14 -04:00
Matt Gilman f0f74fe404 NIFI-1928:
- Fixing UI action for bulk delete.
- Removing registration form.
- Fixing default visibility of the anonymous user warning.
2016-06-02 11:56:10 -04:00
Matt Gilman 950e0cfa58 NIFI-1265:
- Upgrading the jspc maven plugin.
2016-06-02 09:49:57 -04:00
jpercivall 4f101294eb NIFI-1265 Fixing InvokeHttp tests.
Signed-off-by: Matt Gilman <matt.c.gilman@gmail.com>
2016-06-02 09:49:57 -04:00
Matt Gilman e587c99855 NIFI-1265:
- Upgrading to Jetty 9.3.
2016-06-02 09:49:57 -04:00
Jeff Storck 3e064101e9 NIFI-1948 Fixed encoding-version attribute not getting created in exported templates. This closes #485 2016-06-02 09:29:11 -04:00
Andre F de Miranda bcead3500d NIFI-1945 - Corrects minor issue in "<Hash Attribute Name>" description
This closes #481.

Signed-off-by: Pierre Villard <pierre.villard.fr@gmail.com>
2016-06-01 21:13:59 +02:00
Oleg Zhurakousky 93795bc7ba NIFI-1915 Fixed '$' escape logic.
Fixed '$' escape logic (if not followed by number) to use Matcher.quoteReplacement(java.lang.String) to
suppress its special meaning so it could be treated as literal.

This closes #466.

Signed-off-by: Pierre Villard <pierre.villard.fr@gmail.com>
2016-06-01 20:17:59 +02:00
Joe Skora c6af6be44c NIFI-1754 Rollback log messages should include the flowfile filename and UUID to assist in flow management. Incorporates debug logging into StandardProcessSession.rollback() to list Flowfile records retreived from the session.
Reviewed with slight style amendment (see Jira for details) by Tony Kurc (tkurc@apache.org). This closes #478.
2016-06-01 08:43:54 -07:00
jpercivall f47af1ce83 NIFI-1808 Adding proper license information to Nar and provenance reporting to PublishMQTT
NIFI-1808 changing ConsumeMQTT messageArrived() logging

This closes #484
2016-06-01 11:37:06 -04:00
Jeff Storck 893daf567d NIFI-1908 Added encoding-version attribute to TemplateDTO
added scaling of templates upon instantiation for placement on the canvas
added template-0.7.0.xml for live-testing the import of templates

Fixing issue with potentially uninitialized RemoteGroupPorts in copySnippet.

This closes #471
2016-05-30 14:40:52 -04:00
Matt Gilman b075f238a5 NIFI-1564:
- Addressing issue referencing the global jQuery variable in the content viewer.
- This closes #421
2016-05-26 15:23:29 -04:00
Matt Gilman a0ff2f7a9f NIFI-1554:
- Refactoring Cluster endpoints.
- Updating frontend to accomodate clustering endpoints.
- Remove the 'Make Primary' action.
- This closes #470
2016-05-26 14:28:24 -04:00
Matt Gilman 9152a9fdbb NIFI-1800:
- UI style updates to make the components stand out better.
- Reusing controller service table in different contexts (controller, process group, etc).
- This closes #469
2016-05-26 14:15:56 -04:00
Andy LoPresto ae3012a992 NIFI-1918 Ignored failing test because timing is not deterministic and should not be used in unit test.
Signed-off-by: Matt Burgess <mattyb149@apache.org>

This closes #465
2016-05-24 22:43:17 -04:00
Jeff Storck 433db23567
NIFI-1799 Implements auto-scaling flow layout
added utility class to scale positions of components on the canvas,
extracted get/setPosition methods from ProcesGroup, RemoteProcessGroup, Label, and Connectable into new interface Positionable
added interface method for finding all Positionables in a ProcessGroup to the ProcessGroup interface and added implementation to StandardProcessGroup
added test flow for position rescaling
added Spock config to POM and a spec for testing the scaling of Positionables
forced Surefire to use JUnit (TestNG was on classpath and Surefire seems to prioritize that over JUnit),
added check in StandardFlowSynchronizer to scale positions only when flow encoding version is less than 1.0
added spec for StandardFlowfileSynchronizer
updated FlowConfiguration.xsd to allow encoding-version attribute
added new test flow used in StandardFlowSynchronizerSpec

This closes #442.

Signed-off-by: Andy LoPresto <alopresto@apache.org>
2016-05-24 14:26:28 -07:00
jpercivall 7923fd04c3 NIFI-1808 Refactored MQTT processors, and added proper unit and integration tests
This closes #392
2016-05-24 13:18:25 -04:00
info@richards-tech.com 7a4c71fec7 Added mqtt
Fixed attribute name in PutMQTT
2016-05-24 13:17:31 -04:00
jpercivall e1b654655a NIFI-1913 Properly removing flowfile in HandleHttpRequest when the Context Map fails to register the request
This closes #462
2016-05-24 10:54:46 -04:00
James Wing 9bb6dcb5e5 NIFI-786 AWS credential refactoring and enhancements
Signed-off-by: Joe Skora <jskora@gmail.com>
This closes #244.
2016-05-24 00:27:13 -04:00
Matt Gilman 4dd50c80a4 NIFI-1781:
- Including access policies in the breadcrumb's trail.
- Updating toolbox according to group access policies.
- Updating actions in palette based on selection access policies.
NIFI-1554:
- Introducing authorization during two phase commit.
- Introducing snippet authorization according to the encapsulated components and the action performed.
- This closes #461
2016-05-23 14:15:32 -04:00
Oleg Zhurakousky f40a090073 NIFI-1905 enabled ExecuteProcess to terminate process
NIFI-1905 polishing

NIFI-1905 changed WARN to INFO during shutdown
This closes #456
2016-05-22 10:36:03 -04:00
Mark Payne 4b74e4de74 NIFI-1745: Refactor how revisions are handled at NCM/Distributed to Node. This closes #454 2016-05-20 14:04:24 -04:00
DomenicPuzio afc8c645a1 NIFI-1498: putFile - Flowfiles routed to failure relationship produce INFO level log messages
This closes #445.

Signed-off-by: Aldrin Piri <aldrin@apache.org>
2016-05-19 16:21:45 -04:00
Oleg Zhurakousky d6674fbb8e NIFI-1898 Fixed Flume processor @OnScheduled methods to accept ProcessContext
This closes #455.

Signed-off-by: Aldrin Piri <aldrin@apache.org>
2016-05-19 16:07:57 -04:00
Aldrin Piri 1bd2cf0d09 NIFI-1811 Renaming MockProcessorLogger to MockComponentLogger for consistency. Removing unused imports from ExecuteScript causing checkstyle failures. 2016-05-19 14:38:41 -04:00
Pierre Villard 372ffb8aa0 NIFI-1811 Removed ProcessorLog and updated dependent interfaces
This closes #403.

Signed-off-by: Aldrin Piri <aldrin@apache.org>
2016-05-19 13:08:09 -04:00
Oleg Zhurakousky 2d03489ec5 NIFI-1296, NIFI-1680, NIFI-1764, NIFI-1837, NIFI-1827, NIFI-1699 implemented new Kafka processors that leverage Kafka 0.9 API
- Improved StreamScanner for better performance
- Renamed StreamScanner to StreamDemarcator as suggested by Joe
- Added failure handling logic to ensure both processors can be reset to their initial state (as if they were just started)
- Provided comprehensive test suite to validate various aspects of both Publish and Consume from Kafka
- Added relevant javadocs
- Added initial additionalDetails docs
- Addressed NPE reported by NIFI-1764
- Life-cycle refactoring for the existing PutKafka to ensure producer restart after errors
- Incorporated code changes contributed by Ralph Perko (see NIFI-1837)
- Addressed partition issue in RoundRobinPartitioner discussed in NIFI-1827
- Updated PropertyDescriptor descriptions to reflect their purpose

NIFI-1296 added @Ignore on some Kafka tests to improve test time

NIFI-1296 reworked tests to avoid dependency on embedded Kafka

NIFI-1296 fixed spelling error

NIFI-1296 fixed trailing whitespaces in non-java files

This closes #366
2016-05-19 07:33:03 -04:00
Matt Burgess c13fb3159f
NIFI-1822 Enabled pooled ExecuteScript engines to facilitate concurrent processing.
Removed unused variable in unit test. (+10 squashed commits)
Squashed commits:
[7c5acc1] NIFI-1822 Removed trailing whitespace to conform with checkstyle rules.
[cb108cd] NIFI-1822 Added ASF License to unit test.
[9264428] NIFI-1822 Removed debugging log statements for script engine queue size.
Added unit tests demonstrating pooled execution timing and thread usage.
[bdbc4ba] NIFI-1822 Renamed reference to MockProcessorContext#setNumThreads to setMaxConcurrentTasks after refactor.
[12bbe82] NIFI-1822 Moved unit test to correct directory.
Added test script resource which generates flowfile and updates attribute with current thread.
Added tests for single run, serial run, and pooled run (not complete).
[4c174c8] NIFI-1822 Added debugging messages to script execution.
[8ab0ce5] NIFI-1822 Added for loop to instantiate multiple script engines in queue.
[8c5ba51] NIFI-1822 Added variable max concurrent task field in MockProcessorContext because it was previously hardcoded to 1. Changed setNumThreads to setMaxConcurrentTasks to maintain naming convention.
[fd9120c] NIFI-1822 Added unit test skeleton for pooled script processor execution.
[23e4f68] NIFI-1822: Allow concurrent execution in ExecuteScript

This closes #443.

Signed-off-by: Andy LoPresto <alopresto@apache.org>
2016-05-17 14:58:00 -07:00
Bryan Bende 17c5496c04 NIFI-1858 Adding site-to-site reporting bundle
This closes #436.
2016-05-17 10:38:47 -04:00
Matt Gilman 8bb56fca68 NIFI-1554:
- Introducing ControllerService and ReportingTask authorization and revision.
- Removing the revision where appropriate.
NIFI-1883
- Restoring referencing components automatically.
- This closes #448
2016-05-17 10:32:55 -04:00
rkarthik29 cfd36c5539 fix for 1864
Signed-off-by: Matt Gilman <matt.c.gilman@gmail.com>
2016-05-17 08:38:26 -04:00
Mark Payne 270944ec69 NIFI-1801: Scope Templates to Process Groups. This closes #446. 2016-05-16 16:12:43 -04:00
Pierre Villard b2ce6f1f96 NIFI-1755 Fixed remote process group status counts by only considering connected remote ports
This closes #347
2016-05-16 13:37:51 -04:00
Mark Payne 87d96c0225 NIFI-1872: Allow sufficient time for embedded server to startup for unit tests 2016-05-13 13:28:38 -04:00
Mark Payne 707aeb4231 NIFI-1872: Ignored unit test that sporadically fails 2016-05-13 11:27:54 -04:00
Matt Gilman 3cc16d35ed NIFI-1742:
- Addressing issues when creating a new inline controller service.
- Ensuring controller service referencing components are updated.
- Including revisions and status with each component.
- Dynamically updating component and authorization states.
- This closes #435
2016-05-12 12:41:11 -04:00
Mark Payne 687a686b21 NIFI-1872: Ignore failing unit test for now until we can properly address; since it is on master it's best to ignore, since the problem appears to be the lifecycle of the unit test 2016-05-12 11:57:40 -04:00
Scott Aslan 3c3304aff4 [NIFI-1782] new search UX and add angular control of flow status values. This closes #433 2016-05-11 16:39:38 -04:00
Mark Payne 25e7f314b1 NIFI-1800: Tie Controller Services to Process Groups. This closes #431 2016-05-11 14:56:05 -04:00
Koji Kawamura 7bd2c64adb NIFI-1865 Close StreamThrottler when processor stops.
- Also, replaced copyrighted sample texts for tests

Signed-off-by: Matt Burgess <mattyb149@apache.org>
2016-05-10 22:02:15 -04:00
Yolanda M. Davis 1370eefdd7
NIFI-1812 initial commit for nifi-env script, includes updates to linux/windows scripts, logback changes, RunNifi/Shutdownhook changes
This closes #386.

Signed-off-by: Andy LoPresto <alopresto@apache.org>
2016-05-10 16:37:30 -07:00
Pierre Villard 887648c86f NIFI-1863 extended caught exception in cleaning task for HTTPContextMap
Signed-off-by: Matt Burgess <mattyb149@apache.org>

This closes #428
2016-05-10 13:46:40 -04:00
Scott Aslan cb67520129 [NIFI-1707] upgradeable angular components 2016-05-09 15:16:12 -04:00
ijokarumawak 5fb27e608f NIFI-1860 Added ContainerRequestFilter to redirect. This closes #422
- redirect /controller to /site-to-site
2016-05-09 08:17:46 -04:00
James Wing 257590dec3 NIFI-1711 Client-side JS for proxy-friendly URLs. This closes #316 2016-05-08 21:32:34 -04:00
Jeremy Dyer 7a5d53b8d3 NIFI-1747 add maven-jar-plugin to create jar as part of the existing nifi-web-api build process
This closes #340.

Signed-off-by: Aldrin Piri <aldrin@apache.org>
2016-05-08 14:31:25 -04:00
Aldrin Piri b4e4f3eed5 Removing erroneously included files. 2016-05-07 15:01:24 -04:00
Pierre Villard 9064b97631 NIFI-1816 Added provenance event SEND in HandleHttpResponse
This closes #389
2016-05-07 11:51:26 -04:00
Aldrin Piri 993d3cd78f NIFI-1859 Using .equals instead of == for default locale check. Adding some additional information for the input and output schema properties.
This closes #418.

Signed-off-by: Aldrin Piri <aldrin@apache.org>
2016-05-06 23:04:11 -04:00
Pierre Villard 63a0d0c211 NIFI-1732 set jetty timeout to Long.MAX_VALUE
This closes #337
2016-05-06 19:38:52 -04:00
jpercivall e5925ff4b3 Fixing contrib check 2016-05-06 18:02:44 -04:00
Pierre Villard e2bbea1c53 NIFI-1814 Extended caught exceptions
This closes #382
2016-05-06 18:00:40 -04:00
Matt Gilman 9db1def6c6 NIFI-1781:
- Incorporating updated styles to reflect component level authorization.
- Updating canvas for new look and feel.
- This closes #417
2016-05-06 15:50:06 -04:00
Mark Payne 04c41c0654 NIFI-1678:
- Started refactoring heartbeating mechanism, using a new package: org.apache.nifi.cluster.coordination
- Added configuration options for ZooKeeper username & password for heartbeat management. Also addressed issue where nodes that were previously disconnected were asked to disconnect upon restart
- Ensure that ACL is set properly when creating heartbeat node. Removed unused ControllerStartupFailureMessage.java
- Changed ZooKeeper ACL's so that container nodes that would not be sensitive are wide open and removed the usage of username & password when communicating with ZooKeeper. This was done specifically because username/password combination is considered a 'testing' feature that should not be used in production and is not supported by Apache Curator
- Refactored CuratorHeartbeatMonitor into an abstract heartbeat monitor that is responsible for processing heartbeats and CuratorHeartbeatMonitor that is responsible for retrieving heartbeat information
- Refactored so that heartbeats are sent to Cluster Coordinator directly instead of to ZooKeeper. ZooKeeper is used to know which node is the cluster coordinator but heartbeats to the Cluster Coordinator provide additional information about the nodes.
- Started refactoring heartbeating mechanism, using a new package: org.apache.nifi.cluster.coordination
- Added configuration options for ZooKeeper username & password for heartbeat management. Also addressed issue where nodes that were previously disconnected were asked to disconnect upon restart
- Changed ZooKeeper ACL's so that container nodes that would not be sensitive are wide open and removed the usage of username & password when communicating with ZooKeeper. This was done specifically because username/password combination is considered a 'testing' feature that should not be used in production and is not supported by Apache Curator

NIFI-1727:
- Refactored logic for merging HTTP Requests that are federated across cluster

NIFI-1745:
- Refactoring how HTTP Requests are replicated to nodes
- Bug fixes and continuing to work on replication refactoring. Still need to handle cluster locking and revisions
- Begin work on RevisionManager
- Resolved some issues that resulted from rebase
- Fixed URIs to align with new URI's that will be used in 1.0.0
- This closes #413
2016-05-06 15:23:12 -04:00
Scott Aslan c527f64230 [NIFI-1762] Remove bower and npm from convenience binaries. This closes #412. 2016-05-04 15:23:11 -04:00
Adam Lamar ddf8c6f8fa NIFI-840: Create ListS3 processor
This closes #238

Signed-off-by: Aldrin Piri <aldrin@apache.org>
2016-05-04 12:15:45 -04:00
Scott Aslan 2824f5a23c NIFI-1782 cleanup whitespace and code styles
This closes #411
2016-05-03 15:32:49 -04:00
Yolanda M. Davis defb6f5b61 NIFI-361 - Create Processors to mutate JSON data
Signed-off-by: Matt Burgess <mattyb149@apache.org>

This closes #354
2016-05-03 14:38:11 -04:00
Mark Payne e3bdee8b1e NIFI-1824: If attempting to archive content, and there are no claimant counts for it, ensure that the stream is closed. 2016-05-03 14:27:13 -04:00
Scott Aslan 1df8fe44c4 [NIFI-1782] update toolbox, new global menu, and new pallattes...also introduced frontend-maven-plugin to allow bower to manage pulling in 3rd party libs at build time and not shipped with the source. This closes #395 2016-05-03 14:20:46 -04:00
jpercivall 0557095613 NIFI-1028 initial commit of NiFi In Depth documentation
NIFI-1028 addressing review comments
This closes #339
2016-05-03 14:01:45 -04:00
Matt Burgess 106b0fa0fc NIFI-981: Added SelectHiveQL and PutHiveQL processors
This closes #410.

Signed-off-by: Bryan Bende <bbende@apache.org>
2016-05-03 13:51:38 -04:00
Devin Fisher 8336014064 NIFI-1560:
- Fixing a copy and paste error
- Looks like when the original coder copied code from AuthenticationStrategy for the ReferralStrategy and did not change this reference for the error case.
- Also addressing the typo in the message.
- This closes #402
2016-05-03 08:00:34 -04:00
Mark Payne 45ca978498 NIFI-1830: Fixed problems in the merging logic for Drop FlowFile Requests. This closes #394 2016-05-02 08:46:50 -04:00
Matt Gilman ff98d823e2 NIFI-1554:
- Populating component entities in the REST API to decouple key fields from the configuration DTOs.
- Added initial support for components in UI when access isn't allowed. Formal styling to come later.
2016-04-29 14:49:14 -04:00
Andy LoPresto a4409d366c
Fixed typo in ScryptCipherProviderGroovyTest Javadoc.
This closes #380.
2016-04-27 16:05:16 -07:00
Aldrin Piri 11cff0dd39
NIFI-1818 Adjusting exceptions to reflect the appropriate repository instantiation that caused the issue.
This closes #385.

Signed-off-by: Andy LoPresto <alopresto@apache.org>
2016-04-27 15:52:54 -07:00
Aldrin Piri 6938c3db54 NIFI-1817 Respecting when run.as is commented out by ensuring the chosen line starts with run.as optionally preceded by whitespace
This closes #383.
2016-04-27 15:22:19 -04:00
Mark Payne fb7b3fe4b8 NIFI-1678: Started refactoring heartbeating mechanism, using a new package: org.apache.nifi.cluster.coordination
Added configuration options for ZooKeeper username & password for heartbeat management. Also addressed issue where nodes that were previously disconnected were asked to disconnect upon restart

Ensure that ACL is set properly when creating heartbeat node. Removed unused ControllerStartupFailureMessage.java

Changed ZooKeeper ACL's so that container nodes that would not be sensitive are wide open and removed the usage of username & password when communicating with ZooKeeper. This was done specifically because username/password combination is considered a 'testing' feature that should not be used in production and is not supported by Apache Curator

Refactored CuratorHeartbeatMonitor into an abstract heartbeat monitor that is responsible for processing heartbeats and CuratorHeartbeatMonitor that is responsible for retrieving heartbeat information

Refactored so that heartbeats are sent to Cluster Coordinator directly instead of to ZooKeeper. ZooKeeper is used to know which node is the cluster coordinator but heartbeats to the Cluster Coordinator provide additional information about the nodes.

Code cleanup and incorporate comments from peer review

This closes #323
2016-04-22 15:01:04 -04:00
Andy LoPresto 9ea2275677
NIFI-1802 Separated /access REST API endpoints into separate section in API docs.
Fixed typo in DocGenerator comments.

This closes #376.

Signed-off-by: Andy LoPresto <alopresto@apache.org>
2016-04-21 21:18:14 -07:00
Matt Gilman add298168d NIFI-1554:
- Introducing new REST endpoints to align with the authorizable resources.
- Additionally changes to support the new endpoints.
- Addressing comments in PR.
- This closes #374.
2016-04-21 17:29:58 -04:00
Pierre Villard b50cf7d4d4
NIFI-1521 Added SSL configuration to AMQP processor.
fixed build failure (+5 squashed commits)
Squashed commits:
[a3405f8] NIFI-1521 fixed build failure
[bf91743] NIFI-1521 fixed name/displayName in properties
[a44beaa] NIFI-1521 Added unit test
[c523689] NIFI-1521 Added client auth property and reverted modification on SSL context service
[75f3457] NIFI-1521 Allows use of SSL in AMQP Processor

This closes #232.

Signed-off-by: Andy LoPresto <alopresto@apache.org>
2016-04-20 22:23:38 -07:00
Andy LoPresto f94b0f2ed2
NIFI-1789 Temporarily ignored incorrectly failing TestPutUDP#testUnknownHostname.
This closes #373.
2016-04-20 19:20:41 -07:00
Pierre Villard 293a3042cd NIFI-1788 Fixed listed allowable values
NIFI-1788 Added UT

NIFI-1788 modified test name
This closes #368
2016-04-20 10:48:54 -04:00
Pierre Villard 3d6e664097 NIFI-1672 Improved the Provenance Events emitted by PutKafka
This closes #355
2016-04-20 10:33:03 -04:00
Mark Payne dd8c26e35c NIFI-1790: Updated the URI patterns used in NCM for determining whether or not responses should be merged. This closes #369 2016-04-20 10:07:18 -04:00
Pierre Villard b5a8f4f73b NIFI-1787 fixed typo
This closes #367
2016-04-20 06:57:43 -04:00
Pierre Villard 0f05c77a73
NIFI-1197 checkstyle (+2 squashed commits)
Squashed commits:
[b4e9b5f] NIFI-1197 fixed name/displayName on properties
[d39f82b] NIFI-1197 Added SSL support for MongoDB processors

This closes #360.

Signed-off-by: Andy LoPresto <alopresto@apache.org>
2016-04-19 20:25:19 -07:00
Matt Gilman f54e5d4b1b NIFI-1551: - Ensuring the datum is included when getting the entity key in nf-actions.
This closes #364.

Signed-off-by: Bryan Bende <bbende@apache.org>
2016-04-19 10:23:10 -04:00
Matt Gilman 8c09a5c8d2 NIFI-1783: - Addressing mistake in exmample XML. - Ensuring the configured Authorizer is loaded correctly.
This closes #363.

Signed-off-by: Bryan Bende <bbende@apache.org>
2016-04-19 09:53:26 -04:00
Oleg Zhurakousky 5b2490f1e8 NIFI-1738 hot patch to fix reflection mistake that was made while modifying @jvwing test 2016-04-18 08:59:44 -04:00
Pierre Villard 5e55a543eb NIFI-1724 Added properties to configure log level when file not found and permission denied on FetchFile processor
NIFI-1724 Added unit test for logging with level
This closes #348
2016-04-18 08:15:27 -04:00
Pierre Villard f719cbf60c NIFI-1777 Prevent deleting a connection going to a running processor
NIFI-1777 Added unit tests to test processor removal
This closes #357
2016-04-18 07:55:59 -04:00
Hejki 1a57b37dc9 NIFI-1738 - Repair logger names for ControllerStatusReportingTask
NIFI-1738 amending this commit with tests provided by @jvwing
This closes #334
2016-04-17 15:53:13 -04:00
Pierre Villard ad56f1f853 NIFI-1776 Allowed application/x-gzip as Gzip mime type
This closes #358
2016-04-17 14:36:13 -04:00
Toivo Adams 678d64d1d4 NIFI-1685 Optimize database Junit tests to reduce execution time. Removed commented blocks.
This closes #304.

Signed-off-by: Joe Skora <jskora@apache.org>
2016-04-16 20:15:42 -04:00
Scott Aslan 10986553aa [NIFI-1761] UI - Remove reminants of cluster-indicator. This closes #356 2016-04-15 16:12:51 -04:00
Matt Gilman 153f63ef43 NIFI-1551:
- Removing the AuthorityProvider.
- Refactoring REST API in preparation for introduction of the Authorizer.
- Updating UI accordingly.
- Removing unneeded properties from nifi.properties.
- Addressing comments from PR.
- This closes #359.
2016-04-15 16:03:00 -04:00
Scott Aslan 7db78e87a5 [NIFI-1761] UI - Introduce AngularJS application bootstrapping, Roboto fonts, and breadcrumbs directive. This closes #331 2016-04-15 09:46:06 -04:00
Mark Payne b59d3ece75 NIFI-1762: Changed Java dependency to 1.8 instead of 1.7 and refactored StandardNiFiServiceFacade to make use of Lambda expressions to simplify code base. Also had to address a unit test because changing to Java 8 results in calls to assertEquals to become ambiguous. This closes #352 2016-04-14 10:38:03 -04:00
Andy LoPresto 378ccf53c2
NIFI-1753 Replaced usage of javax.security.cert.X509Certificate with java.security.cert.X509Certificate and resolved user-reported ClassCastException when handling client certificates during TLS mutual authentication.
Fixed nifi-utils pom.xml comment about additional dependencies. (+5 squashed commits)
Squashed commits:
[965b766] NIFI-1753 Removed temporary work-around of duplicate certificate conversion util method and added nifi-security-utils as dependency of nifi-utils.
[cd35f9b] NIFI-1753 Replaced legacy X.509 certificate declarations with new declarations in SSLSocketChannel and EndpointConnectionPool.
Temporary work-around of duplicate certificate conversion util method because nifi-utils cannot depend on nifi-security-utils.
[6420897] NIFI-1753 Replaced legacy X.509 certificate declarations with new declarations in PostHTTP.
[b9868ef] NIFI-1753 Added convenience method for extracting DN from peer certificate chain in SSL socket (canonical implementation to reduce code duplication and references to legacy certificate implementations).
Refactored logic retrieving legacy X.509 certificates with reference to convenience method in NodeProtocolSenderImpl.
Replaced logic retrieving legacy X.509 certificates with reference to convenience method in SocketProtocolListener.
Cleaned up exception handling in SocketProtocolListener.
Replaced legacy X.509 certificate declarations with new declarations in HandleHttpRequest (needs manual test).
[e2d1c35] NIFI-1753 Added convenience methods for converting legacy X.509 certificates and abstract certificates to correct X.509 format.
Added unit tests for certificate manipulation.
Replaced logic retrieving legacy X.509 certificates with new logic in NodeProtocolSenderImpl.
Added bcpkix (Bouncy Castle PKI implementation) dependency to nifi-standard-processors pom.

This closes #346.

Signed-off-by: Andy LoPresto <alopresto@apache.org>
2016-04-13 18:30:21 -07:00
ijokarumawak dfa27263d2
NIFI-1180 Adding more IT tests.
This closes #336.

Signed-off-by: Andy LoPresto <alopresto@apache.org>
2016-04-12 17:44:29 -07:00
Oleg Zhurakousky bd1f0a82ae NIFI-1748 removed un-used test data
This closes #344.

Signed-off-by: Joe Skora <jskora@apache.org>
2016-04-11 19:50:22 -04:00
Aldrin Piri e76a75c26b NIFI-1749 This closes #342. Adjusting tests that fail without a connection to the Internet and removing attributable elements from test resources.
Signed-off-by: joewitt <joewitt@apache.org>
2016-04-11 13:22:00 -04:00
Oleg Zhurakousky 95dda1d920 NIFI-1748 removed un-used test data
This closes #341.

Signed-off-by: Aldrin Piri <aldrin@apache.org>
2016-04-11 02:24:45 -04:00
Mike Moser 5625686ea4 NIFI-1746 avoid exceptions if configuration dir is a symbolic link
Signed-off-by:  Joe Skora <jskora@apache.org>
2016-04-11 02:05:48 -04:00
Joe Skora 696a12e4e7 Revert "NIFI-1748 removed un-used test data"
This reverts commit 47cd9ff22c.
2016-04-11 02:05:24 -04:00
Oleg Zhurakousky 47cd9ff22c NIFI-1748 removed un-used test data
This closes #341.

Signed-off-by: Aldrin Piri <aldrin@apache.org>
2016-04-10 13:21:37 -04:00
mans2singh e3155a8a4b NIFI-1516 Provide AWS DynamoDB Delete/Put/Get processors
This closes #224.

Signed-off-by: Aldrin Piri <aldrin@apache.org>
2016-04-08 11:23:04 -04:00
Zachary Jaffee 41583e6dc0 NIFI-400 remove deprecated processor EvaluateRegularExpression
This closes #77

Signed-off-by: Aldrin Piri <aldrin@apache.org>
2016-04-08 09:11:20 -04:00
Matt Gilman 5de40ccec3 NIFI-1553:
- Implementing a file based authorizer.
- Providing an example authorizations files.
- Address comments from PR.
- This closes #330
2016-04-07 16:28:42 -04:00
Matt Gilman 3f4ac3156c Revert "NIFI-1551:"
This reverts commit c4d06f203d. Accidently merged wrong branch.
2016-04-07 16:22:35 -04:00
Matt Gilman c4d06f203d NIFI-1551:
- Starting to remove the AuthorityProvider.
- This closes #330
2016-04-07 16:18:36 -04:00
Adam Lamar 2bcc31330c
NIFI-1180: Modify PutS3Object to enable encryption
This closes #246.

Signed-off-by: Andy LoPresto <alopresto@apache.org>
2016-04-07 11:19:22 -07:00
ijokarumawak 9235a28f82 NIFI-1736 Move kafka.StreamScanner to nifi-utils. This closes #333 2016-04-07 07:37:28 -04:00
Bryan Bende 3adb45eafc NIFI-1630 This closes #332. Making TestPutUDP select an open port for testing to avoid conflicts
Signed-off-by: joewitt <joewitt@apache.org>
2016-04-06 23:39:30 -04:00
Mark Payne 84b1c60d54 NIFI-1726: Addressed issue where we can run into an infinite loop if we are expiring data based on a timestamp instead of disk space usage and we have a file whose timestamp is exactly equal to our threshold for deletion
Signed-off-by: joewitt <joewitt@apache.org>
2016-04-06 11:27:53 -04:00
Matt Brown b0cc6ae7e8 NIFI-1630 PutUDP processor created.
Signed-off-by: Bryan Bende <bbende@apache.org>
2016-04-06 11:04:01 -04:00
Aldrin Piri 3effc6cca5 NIFI-1689 Correcting TimeUnit conversion to be milliseconds instead of the incorrect microseconds and using historical modified times to avoid issues with second granularity of HFS+
Signed-off-by: joewitt <joewitt@apache.org>
2016-04-05 09:38:48 -04:00
Aldrin Piri 0e9e9b36d9 NIFI-1728 Specifying charsets for messages sent to/received from Kafka in Kafka processor and related tests to remedy failures in Windows environments. Specifying EOF as an int instead of a byte.
Signed-off-by: joewitt <joewitt@apache.org>
2016-04-05 09:38:39 -04:00
Mike Moser 1c025dd4be NIFI-1714 use standard HttpClient cookie policy instead of default
Signed-off-by: jpercivall <joepercivall@yahoo.com>
2016-04-04 13:13:17 -04:00
Matt Gilman 9aa69b242e NIFI-1552: - Introducing the Authorizer API and additional components necessary for discovery and creation of configured instances. - Minor refactoring of existing Authority Provider API code/configuration to avoid some xsd naming conflicts. These components will be removed in NIFI-1551. - Introducing a number of the resource definitions that the Authorizer will make access decisions on. This list is likely not finalized may see some changes in NIFI-1554. - Address comments from PR. - This closes #318.
Signed-off-by: Matt Gilman <matt.c.gilman@gmail.com>
2016-04-04 11:47:43 -04:00
Mark Payne 1ac05266a5 NIFI-483: Use ZooKeeper's Leader Election to determine Primary Node. This closes #301
Signed-off-by: Matt Gilman <matt.c.gilman@gmail.com>
2016-04-04 11:47:08 -04:00
Mark Payne 0d3bd2c401 NIFI-1563: - Federate requests and merge responses from nodes instead of storing bulletins and stats at NCM - Updating UI to support restructured status history DTO. - Return 'Insufficient History' message if aggregate stats don't have enough data points, even if all nodes do (which can be the case if the node performing the aggregation has a different value for the 'nifi.components.status.snapshot.frequency' property than the other nodes) - Bug fixes; code cleanup; replicate requests to bulletin board endpoint - Refactored the <Component>StatusDTO objects into <Component>StatusDTO, <Component>StatusSnapshotDTO, Node<Component>StatusSnapshotDTO objects - Introducing endpoints for accessing individual component status. - Wiring up new endpoints and updated core. - Code clean up. - Starting to handling status merging of individual components. - Nodewise breakdown has been added to Processors but the remaining components still need to be updated. - Refactor so that System Diagnostics requests are replicated to nodes instead of the information being pulled from Heartbeats - Replicate request for counters instead of pulling them from heartbeats - Removed the getCounters / setCounters method from HeartbeatPayload - Implementing component specific endpoints. - Removing unused endpoints. - Supporting nodewise breakdown for system diagnostics and counters. - Updating DTOs to use more consistent naming. - Code clean up. - Addressing contrib issues. - Removed ProcessGroupStatus from HeartbeatPayload - Removing nodewise from the system diagnostics endpoint. Had included it for testing that option but did not intend for it to be committed. - Addressing comments in PR #294. - This closes #294
Signed-off-by: Matt Gilman <matt.c.gilman@gmail.com>
2016-04-04 11:42:39 -04:00
Matt Gilman 2de7f3f884 Updating versions to 1.0.0-SNAPSHOT. 2016-04-04 11:36:20 -04:00
Matt Gilman 16108467c1 NIFI-1695:
- Removing hidden control characters that were affecting graph styles. This closes #311
2016-04-04 11:26:55 -04:00
Bryan Bende 04c6830937 NIFI-1698 Improving customValidate in AbstractHadoopProcessor and HBaseClient service to not reload Configuration unless it changed. This closes #313 2016-04-04 10:14:05 -04:00
Stephen Harper e02c79975e NIFI-1686 - NiFi is unable to populate over 1/4 of AMQP properties from flow properties
This closes #305
2016-04-04 10:07:50 -04:00
Oleg Zhurakousky 25290cedc4 NIFI-1701 fixed StreamScanner, added more tests
NIFI-1701 additional refactoring, clean up and more tests
2016-04-04 09:55:16 -04:00
Bryan Bende 65b5c1a5f1 NIFI-1697 Ensuring FlowController appropriately wraps code with NarCloseable. This closes #312 2016-04-04 09:22:55 -04:00
Matt Burgess 65b26e6f41 NIFI-1691: Add Fetch Size property to QueryDatabaseTable
This closes #307

Signed-off-by: Bryan Bende <bbende@apache.org>
2016-03-29 10:51:30 -04:00
Oleg Zhurakousky c3d54ab724 NIFI-1684 This closes #308. fixed ZKClient connection leak
Signed-off-by: joewitt <joewitt@apache.org>
2016-03-29 09:56:24 -04:00
Oleg Zhurakousky 9912f18de5 NIFI-1684 This closes #302. fixed random partitioner initialization
Signed-off-by: joewitt <joewitt@apache.org>
2016-03-29 09:56:08 -04:00
Oleg Zhurakousky 1292581ec8 NIFI-1684 added penalization on failure
Signed-off-by: joewitt <joewitt@apache.org>
2016-03-29 09:56:04 -04:00
Oleg Zhurakousky 8d960f5243 NIFI-1684 fixed NPE in PutKafka when retrieving key attribute bytes
Signed-off-by: joewitt <joewitt@apache.org>
2016-03-29 09:56:04 -04:00
Oleg Zhurakousky e35c40b0fd NIFI-1684 fixed NPE, added tests
Signed-off-by: joewitt <joewitt@apache.org>
2016-03-29 09:56:04 -04:00
Mark Payne 8000304e6a NIFI-1442: This closes #306. Use CircularFifoQueue instead of Set to store nodes' bulletins
Joint effort by Toivo Adams from PR306 and and Mark Payne

Signed-off-by: joewitt <joewitt@apache.org>
2016-03-28 13:35:36 -04:00
Aldrin Piri e977729b56 NIFI-1634-rc2 prepare for next development iteration 2016-03-23 18:56:34 -04:00
Aldrin Piri 0b9bd20d31 NIFI-1634-rc2 prepare release nifi-0.6.0-RC2 2016-03-23 18:56:22 -04:00
Mark Payne e4b7e47836 Merge branch 'NIFI-1676' 2016-03-23 12:14:35 -04:00
Mark Payne b95a82f4a5 NIFI-1676: Do not allow Processor to be started if state is STOPPING; ensure that it is STOPPED 2016-03-23 11:31:20 -04:00
Mark Payne f7ecb47e29 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/nifi 2016-03-23 11:24:28 -04:00
Mark Payne 9e39653192 Merge branch 'NIFI-1645' of https://github.com/olegz/nifi into NIFI-1645 2016-03-23 10:31:57 -04:00
Oleg Zhurakousky e0e00ff282 NIFI-1645 refactored PutKafka
- used newest API available in 0.8.* version
- added PutKafka integration tests
- Kafka module code coverage is at 85%

NIFI-1645 polishing

NIFI-1645 PR comments round 1

NIFI-1645 PR comments round 2

NIFI-1645 change to use async Kafka producer

NIFI-1645 polishing

NIFI-1645 polishing

NIFI-1645 polishing

NIFI-1645 changed from java.util.Scanner to custom StreamScanner

NIFI-1645 polishing

NIFI-1645 final polish
2016-03-23 10:31:34 -04:00
Oleg Zhurakousky a68f87f96e NIFI-1665 This closes #296. fixed GetKafka to reset consumer in case of timeout
NIFI-1665 polishing

Signed-off-by: joewitt <joewitt@apache.org>
2016-03-22 21:48:47 -06:00
Bryan Bende 423b333b71 NIFI-1420 Fixing minor bugs in GetSplunk
- Adding a Time Zone property so the Managed time ranges use the provided time zone when formatting the date strings
- Adding a Time Field Strategy property to choose between searching event time or index time
- Making the next iteration use previousLastTime + 1 ms to avoid overlap
- Fixing bug where GetSplunk incorrectly cleared state on a restart of NiFi
- This closes #299
2016-03-22 15:23:42 -04:00
Matt Burgess bbbc77707f NIFI-1666: Fixed bug with EL evaluation in PutElasticsearch processor 2016-03-22 15:10:27 -04:00
Aldrin Piri 4babd067c1 NIFI-1664 Preferring System.nanoTime to System.currentTimeMillis and providing explicit handling of timestamps for files in those tests that are testing other attributes of the ListFile process besides timestamp which could lead to erroneous transmissions depending on exactly when files were created.
Adding unsalted_128_raw.enc and salted_128_raw.enc to the list of exclusions for the RAT plugin which caused issues in the Windows environment for contrib-checks.

This closes #297.
2016-03-22 14:13:37 -04:00
Mark Payne 736896246c NIFI-1649: Addressed bug in SplitText that resulted in improper handling of input data if Remove Trailing Newlines is true and there is a FlowFile that is only made up of newlines 2016-03-21 13:26:32 -04:00
Mark Payne 38c782c30b NIFI-1650: Ensure that proper size and offset are specified for Content Claim when viewing FlowFiles still in queue 2016-03-21 10:30:24 -04:00
Mark Payne d3578a7c03 NIFI-1650: Ensure that we seek to the appropriate offset within the Content Claim when downloading content of a FlowFile 2016-03-21 10:30:23 -04:00
trkurc 9cde92da16 NIFI-1656 Added locale support to ConvertAvroSchema and fixed locale problems in unit tests
Reviewed by Joe Witt (joewitt@apache.org). This closes #292
2016-03-21 01:44:46 -04:00
trkurc 3921ab827b NIFI-1651 unit tests work on windows. removed contributor name/package from data and schema
Reviewed by Aldrin Piri (aldrin@apache.org) and Mike Moser (mosermw@apache.org). This closes #291
2016-03-20 15:01:57 -04:00
Oleg Zhurakousky bb738f978a NIFI-1647 This closes #288. fixed validators and config resolution
Signed-off-by: joewitt <joewitt@apache.org>
2016-03-18 10:11:00 -04:00
Joey Frazee 3a4546c08a NIFI-1617 Add source filename metadata to IdentifyMimeType
Signed-off-by: Matt Burgess <mattyb149@apache.org>
2016-03-18 00:23:16 -04:00
Oleg Zhurakousky 8f40d2b181 NIFI-1571 initial commit of SpringContext support
Reviewed by Tony Kurc (tkurc@apache.org) and Joe Witt (joewitt@apache.org). This closes #271
2016-03-17 23:43:47 -04:00
Michal Klempa e12e7a55b7 NIFI-1562 ExecuteStreamCommand and ExecuteProcess now support empty command line arguments
This closes #247

Signed-off-by: Matt Burgess <mattyb149@apache.org>
2016-03-17 23:15:12 -04:00
Pierre Villard e7a254f78e NIFI-1332 Fixed HTTP-204 handling + unit test
This closes #259.

Signed-off-by: Aldrin Piri <aldrin@apache.org>
2016-03-17 23:03:51 -04:00
Aldrin Piri b44b177039 NIFI-1605 Adjust documentation and resources to reflect nifi.provenance.repository.rollover.time default
This closes #263

Signed-off-by: Matt Burgess <mattyb149@apache.org>
2016-03-17 22:14:24 -04:00
Oleg Zhurakousky 138c71de82 NIFI-1464 This closes #287. removed e.printStackTrace() from onTrigger in StandarProcessScheduler
Signed-off-by: joewitt <joewitt@apache.org>
2016-03-17 17:18:56 -04:00
Bryan Bende 8773ec3d3e NIFI-1488 Refactoring HBase Kerberos support
- Storing UGI so we can support multiple HBaseClientServices with different configs
- Creating nifi-hadoop-utils to hold utility code shared between HDFS and HBase processors
- Incorporating KerberosProperties into existing hadoop processors

This closes #281
2016-03-17 17:12:57 -04:00
Matt Burgess 94cf1beeba NIFI-901: Fixed unit test to verify IP address of Cassandra contact point This closes #286
Signed-off-by: Matt Gilman <matt.c.gilman@gmail.com>
2016-03-17 13:53:07 -04:00
Andy LoPresto 76f2d5702f NIFI-1274 Added Kerberos authentication mechanism.
NIFI-1274 Cleaned up TODO statements. (+3 squashed commits)
Squashed commits:
[fd101cd] Removed logic to check for presence of services to determine if token support is enabled when username/password authentication is enabled (Kerberos also requires tokens).
[c2ce29f] Reverted import changes to RulesResource.java.
[c269d72] Added Kerberos authentication mechanism.

Moved Kerberos service wiring from XML to Java to handle scenario where admin has not configured Kerberos (previously threw NullPointerException in FileSystemResource constructor). (+15 squashed commits)
Squashed commits:
[09fc694] Added Kerberos documentation to Admin Guide.
[ecfb864] Cleaned up unused logic.
[157efb3] Added logic to determine if client certificates are required for REST API (login, anonymous, and Kerberos service authentication all disabled).
Cleaned up KerberosService by moving logic to NiFiProperties.
[5438619] Added documentation for Kerberos login-identity-providers.xml.
[3332d9f] Added NiFi properties for Kerberos SSO.
[b14a557] Fixed canvas call to only attempt Kerberos login if JWT not present in local storage.
Added logic to handle ticket validation failure in AccessResource.
Changed wiring of Kerberos service beans to XML in nifi-web-security-context.xml for consistency.
[c31ae3d] Kerberos SPNEGO works without additional filter (new entry endpoint accepts Kerberos ticket in Authorization header and returns JWT so the rest of the application functions the same as LDAP).
[98460e7] Added check to only instantiate beans when Kerberos enabled to allow access control integration tests to pass.
[6ed0724] Renamed Kerberos discovery method to be explicit about service vs. credential login.
[ed67d2e] Removed temporary solution for Rules Resource access via Kerberos ticket.
[c8b2b01] Added temporary solution for Rules Resource access via Kerberos ticket.
[81ca80f] NIFI-1274 Added KerberosAuthenticationFilter to conduct SPNEGO authentication with local (client) Kerberos ticket.
Added properties and accessors for service principal and keytab location for NiFi app server.
Added KAF to NiFiWebApiSecurityConfiguration.
Added AlternateKerberosUserDetailsService to provide user lookup without dependency on extension bundle (nifi-kerberos-iaa-provider).
Added dependencies on spring-security-kerberos-core and -web modules to pom.xml.
[0605ba8] Added working configuration files to test/resources in kerberos module to document necessary config. This version requires the user to enter their Kerberos username (without realm) and password into the NiFi login screen and will authenticate them against the running KDC.
Also includes a sample keystore and root CA public key for configuring a secure instance.
[49236c8] Added kerberos module dependencies to nifi/pom.xml and nifi-assembly/pom.xml.
Added default properties to login-identity-providers.xml.
[928c52b] Added nifi-kerberos-iaa-providers-bundle module to nifi/pom.xml.
Added skeleton of Kerberos authenticator using Spring Security Kerberos plugin.
This closes #284

Signed-off-by: Matt Gilman <matt.c.gilman@gmail.com>
2016-03-17 13:10:09 -04:00
Bryan Bende b188b0abd6 NIFI-1420 Fixing bug where a FlowFile should route to failure when PutSplunk can't createa connection, defaulting PutSplunk to TCP
Signed-off-by: joewitt <joewitt@apache.org>
2016-03-16 17:43:28 -04:00
Mark Payne a7b97419e5 NIFI-1626: Throw an Exception proactively if too much state is attempting to be stored via ZooKeeperStateProvider
NIFI-1626: Updated State Management section of Developer Guide

Signed-off-by: jpercivall <joepercivall@yahoo.com>
2016-03-16 16:12:00 -04:00
Matt Burgess 98395de74f NIFI-1575: Add QueryDatabaseTable processor 2016-03-16 15:55:57 -04:00
Oleg Zhurakousky 148b4497b4 NIFI-1629 This closes #282. downgraded Kafka back to 0.8 - added context.yield to PutKafka - added lifecycle hooks to defend from Kafka deadlocks
NIFI-1629 changd thread pool implementation in Get/PutKafka

Signed-off-by: joewitt <joewitt@apache.org>
2016-03-16 15:38:46 -04:00
Mark Payne 68cfc8c612 NIFI-1632: Fixed NPE that occurs if a capturing group is optional and not matched; updated docs to illustrate how this is handled
Signed-off-by: joewitt <joewitt@apache.org>
2016-03-16 15:19:17 -04:00
Matt Burgess 0f61079300 NIFI-901: Add QueryCassandra and PutCassandraQL processors
This closes #237

Signed-off-by: jpercivall <joepercivall@yahoo.com>
2016-03-16 14:09:15 -04:00
Oleg Zhurakousky e83429a08c NIFI-1631 This closes #283. increased timeouts on test
Signed-off-by: joewitt <joewitt@apache.org>
2016-03-16 11:06:21 -04:00
mans2singh 19bc5ba999 NIFI-1495 Adding support for AWS Kinesis Firehose
This closes #213

Signed-off-by: Aldrin Piri <aldrin@apache.org>
2016-03-16 09:56:08 -04:00
joewitt 8ed64c9083 NIFI-1420 added missing properties to block javadocs/sources generation on nar 2016-03-15 21:43:06 -04:00
joewitt 2b0a0c0597 NIFI-614 added necessary pom element to skip javadocs/sources for nar pom itself in jms proc nar. 2016-03-15 21:40:08 -04:00
joewitt d78c7faf14 NIFI-614 added necessary pom element to skip javadocs/sources for nar pom itself. 2016-03-15 21:35:50 -04:00
Oleg Zhurakousky 812da19cad NIFI-614 Added initial support for new style JMS
NIFI-614 finalized JMSConnectionFactoryProvider ControllerService

NIFI-614 finalized implementation of both Processors and ControllerService

NIFI-614 added initial documentation

NIFI-614 addressed PR comment with unused import and squashed

NIFI-614 added @OnDisabled method

NIFI-614 changed POMs to 0.6

NIFI-614 removed local .gitignore

NIFI-614 added support for parsing Tibco URL

NIFI-614 removed setting of jms message id

NIFI-614 addressed PR comments, fixed tests

NIFI-614 addressed latest PR comments

NIFI-614 second round of PR comments addressed

NIFI-614 3rd round of PR comments addressed

NIFI-614 finalizing on PR comments

NIFI-614 more PR comments

This closes #222

Signed-off-by: jpercivall <joepercivall@yahoo.com>
2016-03-15 15:48:03 -04:00
Oleg Zhurakousky cfeebfe7c7 NIFI-1464 fixed OnScheduled invocation to pass ProcessContext
NIFI-1464 removed unused imports

Signed-off-by: joewitt <joewitt@apache.org>
2016-03-15 12:54:13 -04:00
Mark Payne a4a7d53769 NIFI-1627: Do not call context.yield for funnels and local ports; use batch size of 100 instead of 10 for local ports and funnels
Signed-off-by: joewitt <joewitt@apache.org>
2016-03-15 12:54:03 -04:00
trkurc f22db218e3 NIFI-1481 fixed a couple bugs in bash script for cygwin and when JAVA_HOME not set
Reviewed by Aldrin Piri (aldrin@apache.org). This closes #277
2016-03-14 22:40:25 -04:00
puspendu.banerjee@gmail.com 76ce3f7520 NIFI-1481 support for dumping environment using nifi.sh env
Reviewed and amended (Amendments reviewed by Aldrin Piri (aldrin@apache.org)) by Tony Kurc (tkurc@apache.org). This closes #218
2016-03-14 19:24:21 -04:00
Oleg Zhurakousky c7df94e00f NIFI-1464 life-cycle refactoring part-2
Signed-off-by: joewitt <joewitt@apache.org>
2016-03-14 17:13:55 -04:00
Mark Payne 56f79e1e85 NIFI-1588: Reworked how ListHDFS store state so that only 2 timestamps are stored and no paths
Signed-off-by: joewitt <joewitt@apache.org>
2016-03-14 15:59:24 -04:00
Mark Payne 8c488d7e8e NIFI-1587: Always poll state from State Manager when running ListHDFS instead of relying on local state over the cluster state
Signed-off-by: joewitt <joewitt@apache.org>
2016-03-13 14:36:36 -04:00
Mark Payne 5a8b2cf7f1 NIFI-1606: Run the onComponentRemoved logic of state providers in a background thread
Signed-off-by: joewitt <joewitt@apache.org>
2016-03-13 14:08:24 -04:00
Mark Payne ce068ffc6c NIFI-1612: Do not ignore Remote Process Group's timeout configuration
Signed-off-by: joewitt <joewitt@apache.org>
2016-03-13 13:40:45 -04:00
joewitt 730d999d4b NIFI-627 minor formating adjustments and removed exception based handling logic. This closes #268. This closes #274.
Signed-off-by: joewitt <joewitt@apache.org>
2016-03-13 13:28:48 -04:00
Mike Moser 0cb4047add NIFI-627 removed flowfile penalization which could skew behavior when processor's Time Duration was less than Penalty Duration, improved over throttle penalization NIFI-990 corrected failure path NIFI-1329 refactored using FlowFileFilter to avoid repeatedly returning flowfiles to the input queue, producing misleading stats and excessive Tasks/Time used
Signed-off-by: joewitt <joewitt@apache.org>
2016-03-13 13:28:43 -04:00
Mark Payne 7400b6f7c5 NIFI-1622: Ensure that the Nar Context Class Loader is used when calling Processor lifecycle methods
Signed-off-by: joewitt <joewitt@apache.org>
2016-03-12 20:06:23 -05:00
Mark Payne a85c119533 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/nifi 2016-03-11 12:55:23 -05:00
Oleg Zhurakousky 59fac58c96 NIFI-1464 ensured that OnUnscheduled is treated the same as OnScheduled
NIFI-1464 polished javadocs, error messages and docs
2016-03-11 12:54:50 -05:00
Oleg Zhurakousky 1c22f3f012 NIFI-1464 refactored the latest commit 2016-03-11 12:54:50 -05:00
Oleg Zhurakousky 48af0bfbc5 NIFI-1464 addressed latest PR comments
NIFI-1464 polishing
2016-03-11 12:54:50 -05:00
Oleg Zhurakousky f53f45def3 NIFI-1464 addressed PR comments from @apiri and @markap14 2016-03-11 12:54:50 -05:00
Oleg Zhurakousky 0c5b1c27f2 NIFI-1464, Refactored Processor's life-cycle operation sequence
* Simplified and cleaned StandardProcessScheduler.start/stopProcessor methods
* Added stop/start operations to ProcessorNode.
* Removed unnecessary synchronization blocks related to ScheduledState in favor of enforcing order and idempotency via CAS operations. Those synchronization blocks were causing intermittent deadlocks whenever @OnScheduled blocks indefinitely.
* Added support for stopping the service when @OnScheduled operation hangs.
* Fixed the order of life-cycle operation invocation ensuring that each operation can *only* be invoked at the appropriate time
* Removed unnecessary locks from StandardProcessNode since Atomic variables are used.
* Removed calls to @OnStopped from ContinuallyRunningProcessTask while ensuring that procesor's full shut down in implementation of StandardProcessorNode.stop() method.
* Removed dead code
* Added comprehensive tests suite that covers 95% of Processor's life-cycle operations within the scope of FlowController, StandardProcesssScheduler and StandardProcessNode
* Improved and added javadocs on covered operations with detailed explanations.
2016-03-11 12:54:50 -05:00
Matt Burgess e1cf37fb89 NIFI-1619: Fix Elasticsearch processor bug when flow file missing ID attribute
This closes #269

Signed-off-by: Aldrin Piri <aldrin@apache.org>
2016-03-11 12:01:28 -05:00
Bryan Bende 1373bf6725 NIFI-899 Rewrite of ListenUDP to use new listener framework, includes the following changes:
- Adding Network Interface property to AbstractListenEventProcessor and ListenSyslog
- Adding sending host and sending port to DatagramChannelDispatcher
- Creation of common base class AbstractListenEventBatchingProcessor
- Refactor of ListenUDP, ListenTCP, and ListenRELP to all extend from AbstractListenEventBatchingProcessor
- Changing DatagramChannelDispatcher, socket handlers, and RELP handler to use offer() when queueing instead of put(), and log an error if the offer failed

This closes #266
2016-03-11 09:07:05 -05:00
Pierre Villard 8f0116544a NIFI-1491 Deprecated existing method and added new one throwing eception
Reviewed and amended (to add javadoc @deprecation link and to carry forward other deprecated methods) by Tony Kurc (tkurc@apache.org). This closes #227
2016-03-10 22:15:13 -05:00
Michal Klempa 784f2a2c20 NIFI-1518 InferAvroSchema note has an option to set CSV delimiter
Reviewed (and amended based on acknowledgement in PR review) by Tony Kurc (tkurc@apache.org). This closes #235.
2016-03-10 21:36:31 -05:00
Mark Payne d3367a7dc3 nNFI-1618: Updated unit test to use 30,000 FlowFiles to test dropping of swapped out FlowFiles intead of using 210,000. Thiss unit test creates a lot of objects and when reducing the number of FlowFiles generated to 30K instead of 210K, all appears to work okay 2016-03-10 16:01:29 -05:00
Pasqualino Ferrentino 73e168e954 NIFI-1003 A relationship can be auto-terminable. In this case the processor will auto-terminate the relationship and allow the user to run it even if he does not connect those relationships and does not terminate them.
This closes #217

Signed-off-by: Aldrin Piri <aldrin@apache.org>
2016-03-10 14:56:46 -05:00
Aldrin Piri da234abd76 NIFI-1488 Adjusting unused imports and adding license exclusions to RAT plugin for build. 2016-03-10 08:58:12 -05:00
Mark Payne 2839a2f215 NIFI-15: Address issue where incomplete swap files can result in continually attempting to swap in data without ever being successful
Signed-off-by: Aldrin Piri <aldrin@apache.org>
2016-03-09 23:46:53 -05:00