You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ab...@apache.org on 2020/09/15 12:32:41 UTC
[nifi-minifi-cpp] branch main updated (ab57c5e -> 85d44cc)
This is an automated email from the ASF dual-hosted git repository.
aboda pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git.
from ab57c5e MINIFICPP-1366 - CWEL fails to receive timezone information in case the current timezone has no DST dates
new 0132188 MINIFICPP-1370 clarify README.md
new 85d44cc MINIFICPP-1365 Use minimal docker image for integration tests
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/ci.yml | 2 +-
README.md | 35 ++++++++++++++----------------
docker/test/integration/minifi/__init__.py | 2 +-
3 files changed, 18 insertions(+), 21 deletions(-)
[nifi-minifi-cpp] 02/02: MINIFICPP-1365 Use minimal docker image
for integration tests
Posted by ab...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aboda pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 85d44cc2d5082bc9d9e09732209ef7ef55e6b67f
Author: Gabor Gyimesi <ga...@gmail.com>
AuthorDate: Mon Sep 14 19:50:05 2020 +0200
MINIFICPP-1365 Use minimal docker image for integration tests
Signed-off-by: Arpad Boda <ab...@apache.org>
This closes #907
---
.github/workflows/ci.yml | 2 +-
docker/test/integration/minifi/__init__.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e281fef..71e3216 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -272,7 +272,7 @@ jobs:
- id: checkout
uses: actions/checkout@v2
- id: build
- run: ./bootstrap.sh -e -t && cd build && cmake -DUSE_SHARED_LIBS= -DSTRICT_GSL_CHECKS=AUDIT .. && make docker
+ run: ./bootstrap.sh -e -t && cd build && cmake -DUSE_SHARED_LIBS= -DSTRICT_GSL_CHECKS=AUDIT .. && make docker-minimal
- id: install_deps
run: sudo apt install -y python3-virtualenv
- id: test
diff --git a/docker/test/integration/minifi/__init__.py b/docker/test/integration/minifi/__init__.py
index 876ca21..67bfe62 100644
--- a/docker/test/integration/minifi/__init__.py
+++ b/docker/test/integration/minifi/__init__.py
@@ -117,7 +117,7 @@ class SingleNodeDockerCluster(Cluster):
RUN chown minificpp:minificpp {minifi_root}/conf/config.yml
USER minificpp
""".format(name=name,hostname=name,
- base_image='apacheminificpp:' + self.minifi_version,
+ base_image='apacheminificpp:minimal-' + self.minifi_version,
minifi_root=self.minifi_root))
test_flow_yaml = minifi_flow_yaml(flow)
[nifi-minifi-cpp] 01/02: MINIFICPP-1370 clarify README.md
Posted by ab...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aboda pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 013218801a3afbe4b743dc81f3f5698601644f70
Author: Marton Szasz <sz...@gmail.com>
AuthorDate: Mon Sep 14 23:40:31 2020 +0200
MINIFICPP-1370 clarify README.md
...and fix obvious issues
Signed-off-by: Arpad Boda <ab...@apache.org>
This closes #908
---
README.md | 35 ++++++++++++++++-------------------
1 file changed, 16 insertions(+), 19 deletions(-)
diff --git a/README.md b/README.md
index 3b41037..a6ef548 100644
--- a/README.md
+++ b/README.md
@@ -62,7 +62,7 @@ The following table lists the base set of processors.
| Extension Set | Processors |
| ------------- |:-------------|
-| **Base** | [AppendHostInfo](PROCESSORS.md#appendhostinfo)<br/>[ExecuteProcess](PROCESSORS.md#executeprocess)<br/>[ExtractText](PROCESSORS.md#extracttext)<br/> [GenerateFlowFile](PROCESSORS.md#generateflowfile)<br/>[GetFile](PROCESSORS.md#getfile)<br/>[GetTCP](PROCESSORS.md#gettcp)<br/>[HashContent](PROCESSORS.md#hashcontent)<br/>[LogAttribute](PROCESSORS.md#logattribute)<br/>[ListenSyslog](PROCESSORS.md#listensyslog)<br/>[PutFile](PROCESSORS.md#putfile)<br/>[RouteOnAttribute](PROCES [...]
+| **Base** | [AppendHostInfo](PROCESSORS.md#appendhostinfo)<br/>[ExecuteProcess](PROCESSORS.md#executeprocess)<br/>[ExtractText](PROCESSORS.md#extracttext)<br/> [GenerateFlowFile](PROCESSORS.md#generateflowfile)<br/>[GetFile](PROCESSORS.md#getfile)<br/>[GetTCP](PROCESSORS.md#gettcp)<br/>[HashContent](PROCESSORS.md#hashcontent)<br/>[ListenSyslog](PROCESSORS.md#listensyslog)<br/>[LogAttribute](PROCESSORS.md#logattribute)<br/>[PutFile](PROCESSORS.md#putfile)<br/>[RetryFlowFile](PROCESSOR [...]
The next table outlines CMAKE flags that correspond with MiNiFi extensions. Extensions that are enabled by default ( such as CURL ), can be disabled with the respective CMAKE flag on the command line.
@@ -73,24 +73,29 @@ Through JNI extensions you can run NiFi processors using NARs. The JNI extension
| ------------- |:-------------| :-----|
| Archive Extensions | [ApplyTemplate](PROCESSORS.md#applytemplate)<br/>[CompressContent](PROCESSORS.md#compresscontent)<br/>[ManipulateArchive](PROCESSORS.md#manipulatearchive)<br/>[MergeContent](PROCESSORS.md#mergecontent)<br/>[FocusArchiveEntry](PROCESSORS.md#focusarchiveentry)<br/>[UnfocusArchiveEntry](PROCESSORS.md#unfocusarchiveentry) | -DBUILD_LIBARCHIVE=ON |
| AWS | [AWSCredentialsService](CONTROLLERS.md#awsCredentialsService) | -DENABLE_AWS=ON |
+| CivetWeb | [ListenHTTP](PROCESSORS.md#listenhttp) | -DDISABLE_CIVET=ON |
| CURL | [InvokeHTTP](PROCESSORS.md#invokehttp) | -DDISABLE_CURL=ON |
| GPS | GetGPS | -DENABLE_GPS=ON |
| Kafka | [PublishKafka](PROCESSORS.md#publishkafka) | -DENABLE_LIBRDKAFKA=ON |
| JNI | **NiFi Processors** | -DENABLE_JNI=ON |
| MQTT | [ConsumeMQTT](PROCESSORS.md#consumeMQTT)<br/>[PublishMQTT](PROCESSORS.md#publishMQTT) | -DENABLE_MQTT=ON |
| OpenCV | [CaptureRTSPFrame](PROCESSORS.md#captureRTSPFrame) | -DENABLE_OPENCV=ON |
+| OpenWSMAN | SourceInitiatedSubscriptionListener | -DENABLE_OPENWSMAN=ON |
| PCAP | [CapturePacket](PROCESSORS.md#capturepacket) | -DENABLE_PCAP=ON |
| Scripting | [ExecuteScript](PROCESSORS.md#executescript)<br/>**Custom Python Processors** | -DDISABLE_SCRIPTING=ON |
-| SQLLite | [ExecuteSQL](PROCESSORS.md#executesql)<br/>[PutSQL](PROCESSORS.md#putsql) | -DENABLE_SQLITE=ON |
+| Sensors | GetEnvironmentalSensors<br/>GetMovementSensors | -DENABLE_SENSORS=ON |
+| SFTP | [FetchSFTP](PROCESSORS.md#fetchsftp)<br/>[ListSFTP](PROCESSORS.md#listsftp)<br/>[PutSFTP](PROCESSORS.md#putsftp) | -DENABLE_SFTP=ON |
+| SQL | ExecuteSQL<br/>PutSQL<br/>QueryDatabaseTable<br/> | -DENABLE_SQL=ON |
+| SQLite | [ExecuteSQL](PROCESSORS.md#executesql)<br/>[PutSQL](PROCESSORS.md#putsql) | -DENABLE_SQLITE=ON |
| Tensorflow | [TFApplyGraph](PROCESSORS.md#tfapplygraph)<br/>[TFConvertImageToTensor](PROCESSORS.md#tfconvertimagetotensor)<br/>[TFExtractTopLabels](PROCESSORS.md#tfextracttoplabels)<br/> | -DENABLE_TENSORFLOW=ON |
| USB Camera | [GetUSBCamera](PROCESSORS.md#getusbcamera) | -DENABLE_USB_CAMERA=ON |
+| Windows Event Log (Windows only) | CollectorInitiatedSubscription<br/>ConsumeWindowsEventLog<br/>TailEventLog | -DENABLE_WEL=ON |
Please see our [Python guide](extensions/script/README.md) on how to write Python processors and use them within MiNiFi C++.
## Caveats
-* 0.7.0 represents a GA-release. We follow semver so you can expect API and ABI compatibility within minor releases. See [semver's website](https://semver.org/) for more information
-* Build and usage currently only supports Linux and OS X environments. MiNiFi C++ can be built and run through the Windows Subsystem for Linux but we provide no support for this platform.
-* Native Windows builds are possible with limited support. OPENSSL_ROOT_DIR must be specified to support OpenSSL support within your build.
+* We follow semver with regards to API compatibility, but no ABI compatibility is provided. See [semver's website](https://semver.org/) for more information
+* Build and usage currently only supports Windows, Linux and OS X environments. MiNiFi C++ can be built and run through the Windows Subsystem for Linux but we provide no support for this platform.
* Provenance events generation is supported and are persisted using RocksDB. Volatile repositories can be used on systems without persistent storage.
* If MiNiFi C++ is built with the OPC-UA extension enabled, it bundles [open62541](https://open62541.org/), which is available under the Mozilla Public License Version 2.0, a Category B license under [ASF 3rd party license policy](https://www.apache.org/legal/resolved.html#category-b).
@@ -139,19 +144,13 @@ or greater is recommended.
and rebuild.
#### Libraries / Development Headers
-* libboost and boost-devel
- * 1.48.0 or greater
* libcurl-openssl (If not available or desired, NSS will be used)
-* librocksdb4.1 and librocksdb-dev
* libuuid and uuid-dev
* openssl
* Python 3 and development headers -- Required, unless Python support is disabled
* Lua and development headers -- Optional, unless Lua support is enabled
* libgps-dev -- Required if building libGPS support
-** NOTE: IF ROCKSDB IS NOT INSTALLED, IT WILL BE BUILT FROM THE THIRD PARTY
-DIRECTORY UNLESS YOU SPECIFY -DDISABLE_ROCKSDB=true WITH CMAKE ***
-
#### CentOS 6
Additional environmental preparations are required for CentOS 6 support. Before
@@ -192,21 +191,21 @@ On all distributions please use -DUSE_SHARED_LIBS=OFF to statically link zlib, l
below.
#### Windows
- Build and Installation has been tested with Windows 10 using Visual Studio. You can build
+ Build and Installation has been tested with Windows 10 using Visual Studio 2017. You can build
and create an MSI via the CPACK command. This requires the installation of the WiX
toolset (http://wixtoolset.org/). To do this, open up a prompt into your build directory and
type 'cpack' . The CPACK command will automatically generate and provide you a path to the distributable
- msi file.
+ msi file. See [Windows.md](Windows.md) for more details.
### To run
#### Libraries
* libuuid
-* librocksdb *** IF NOT INSTALLED, WILL BE BUILT FROM THIRD PARTY DIRECTORY ***
+* librocksdb (built and statically linked)
* libcurl-openssl (If not available or desired, NSS will be used)
-* libssl and libcrypto from openssl
-* libarchive
-* librdkafka
+* libssl and libcrypto from openssl (built and statically linked)
+* libarchive (built and statically linked)
+* librdkafka (built and statically linked)
* Python 3 -- Required, unless Python support is disabled
* Lua -- Optional, unless Lua support is enabled
* libusb -- Optional, unless USB Camera support is enabled
@@ -533,8 +532,6 @@ MiNiFi can also be installed as a system service using minifi.sh with an optiona
$ ./bin/minifi.sh install [service name]
-*** Currently windows does not support installing a windows service. ***
-
### Deploying
MiNiFi C++ comes with a deployment script. This will build and package minifi. Additionally, a file named build_output will be
created within the build directory that contains a manifest of build artifacts.