Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MINIFICPP-2416 & MINIFICPP-2414 Drop Sensors and PCAP extensions #1835

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 3 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,9 @@ jobs:
-DENABLE_OPC=ON
-DENABLE_OPENCV=ON
-DENABLE_OPS=ON
-DENABLE_PCAP=OFF
-DENABLE_PROMETHEUS=ON
-DENABLE_PYTHON_SCRIPTING=ON
-DENABLE_ROCKSDB=ON
-DENABLE_SENSORS=OFF
-DENABLE_SFTP=OFF
-DENABLE_SPLUNK=ON
-DENABLE_SQL=ON
Expand Down Expand Up @@ -150,12 +148,10 @@ jobs:
-DENABLE_OPC=ON
-DENABLE_OPENCV=OFF
-DENABLE_OPS=ON
-DENABLE_PCAP=OFF
-DENABLE_PDH=ON
-DENABLE_PROMETHEUS=ON
-DENABLE_PYTHON_SCRIPTING=ON
-DENABLE_ROCKSDB=ON
-DENABLE_SENSORS=OFF
-DENABLE_SFTP=OFF
-DENABLE_SMB=ON
-DENABLE_SPLUNK=ON
Expand Down Expand Up @@ -265,12 +261,10 @@ jobs:
-DENABLE_OPC=OFF
-DENABLE_OPENCV=OFF
-DENABLE_OPS=ON
-DENABLE_PCAP=ON
-DENABLE_PROCFS=OFF
-DENABLE_PROMETHEUS=ON
-DENABLE_PYTHON_SCRIPTING=OFF
-DENABLE_ROCKSDB=ON
-DENABLE_SENSORS=OFF
-DENABLE_SFTP=ON
-DENABLE_SPLUNK=OFF
-DENABLE_SQL=OFF
Expand All @@ -296,7 +290,7 @@ jobs:
- id: install_deps
run: |
sudo apt update
sudo apt install -y ccache libfl-dev libpcap-dev python3 python3-venv
sudo apt install -y ccache libfl-dev python3 python3-venv
echo "PATH=/usr/lib/ccache:$PATH" >> $GITHUB_ENV
echo -e "127.0.0.1\t$HOSTNAME" | sudo tee -a /etc/hosts > /dev/null
- name: build
Expand Down Expand Up @@ -367,12 +361,10 @@ jobs:
-DENABLE_OPC=ON
-DENABLE_OPENCV=ON
-DENABLE_OPS=ON
-DENABLE_PCAP=ON
-DENABLE_PROCFS=ON
-DENABLE_PROMETHEUS=ON
-DENABLE_PYTHON_SCRIPTING=ON
-DENABLE_ROCKSDB=ON
-DENABLE_SENSORS=ON
-DENABLE_SFTP=ON
-DENABLE_SPLUNK=ON
-DENABLE_SQL=ON
Expand Down Expand Up @@ -403,7 +395,7 @@ jobs:
echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main" | sudo tee -a /etc/apt/sources.list
echo "deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main" | sudo tee -a /etc/apt/sources.list
sudo apt update
sudo apt install -y ccache libfl-dev libpcap-dev libgps-dev clang-16 clang-tidy-16 libc++-16-dev libc++abi-16-dev libc++1-16 libc++abi1-16 libunwind-16 libsqliteodbc flake8 parallel
sudo apt install -y ccache libfl-dev libgps-dev clang-16 clang-tidy-16 libc++-16-dev libc++abi-16-dev libc++1-16 libc++abi1-16 libunwind-16 libsqliteodbc flake8 parallel
echo "PATH=/usr/lib/ccache:$PATH" >> $GITHUB_ENV
echo -e "127.0.0.1\t$HOSTNAME" | sudo tee -a /etc/hosts > /dev/null
- id: free_disk_space
Expand Down Expand Up @@ -516,7 +508,7 @@ jobs:
# rocky build can run out of the github runners' disk space if built with RelWithDebInfo so we keep the Release build here
mkdir build && cd build && cmake -DUSE_SHARED_LIBS=ON -DCI_BUILD=ON -DCMAKE_BUILD_TYPE=Release -DSTRICT_GSL_CHECKS=AUDIT -DMINIFI_FAIL_ON_WARNINGS=OFF -DENABLE_AWS=ON -DENABLE_AZURE=ON \
-DENABLE_ENCRYPT_CONFIG=ON -DENABLE_GPS=ON -DENABLE_LIBRDKAFKA=ON -DENABLE_MQTT=ON -DENABLE_OPC=ON \
-DENABLE_OPENCV=ON -DENABLE_OPS=ON -DENABLE_SENSORS=ON -DENABLE_SQL=ON -DENABLE_SYSTEMD=ON \
-DENABLE_OPENCV=ON -DENABLE_OPS=ON -DENABLE_SQL=ON -DENABLE_SYSTEMD=ON \
-DENABLE_PYTHON_SCRIPTING=ON -DENABLE_LUA_SCRIPTING=ON -DENABLE_KUBERNETES=ON -DENABLE_GCP=ON -DENABLE_PROCFS=ON -DENABLE_PROMETHEUS=ON \
-DENABLE_ELASTICSEARCH=ON -DENABLE_GRAFANA_LOKI=ON -DDOCKER_SKIP_TESTS=OFF -DDOCKER_BUILD_ONLY=ON -DDOCKER_CCACHE_DUMP_LOCATION=${{ env.CCACHE_DIR }} .. && make rocky-test
- name: cache save
Expand Down
72 changes: 0 additions & 72 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -666,34 +666,6 @@ BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
=======================================================================
This project includes PcapPlusPlus (https://github.com/seladb/PcapPlusPlus)
which is available under the unlicense

This is free and unencumbered software released into the public domain.

Anyone is free to copy, modify, publish, use, compile, sell, or
distribute this software, either in source code form or as a compiled
binary, for any purpose, commercial or non-commercial, and by any
means.

In jurisdictions that recognize copyright laws, the author or authors
of this software dedicate any and all copyright interest in the
software to the public domain. We make this dedication for the benefit
of the public at large and to the detriment of our heirs and
successors. We intend this dedication to be an overt act of
relinquishment in perpetuity of all present and future rights to this
software under copyright law.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.

For more information, please refer to <http://unlicense.org>
========================================================================
This projects includes libarchive bundle (https://www.libarchive.org)
which is available under a BSD License by Tim Kientzle and others
Expand Down Expand Up @@ -1155,50 +1127,6 @@ LICENSE.wingetopt
* POSSIBILITY OF SUCH DAMAGE.
*/

This product bundles LightPcapNg within PcapPlusPlus under the MIT license below.

Copyright (c) 2016 Radu Velea, radu.velea@gmail.com

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

This product bundles dirent for visual studio within within PcapPlusPlus under the MIT license below.

Copyright (c) 2015 Toni Rönkkö

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

This product bundles 'bustache' which is available under a Boost Software License.
Bustache Copyright (c) 2014-2017 Jamboree

Expand Down
67 changes: 0 additions & 67 deletions PROCESSORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ limitations under the License.
- [AttributeRollingWindow](#AttributeRollingWindow)
- [AttributesToJSON](#AttributesToJSON)
- [BinFiles](#BinFiles)
- [CapturePacket](#CapturePacket)
- [CaptureRTSPFrame](#CaptureRTSPFrame)
- [CollectKubernetesPodMetrics](#CollectKubernetesPodMetrics)
- [CollectorInitiatedSubscription](#CollectorInitiatedSubscription)
Expand Down Expand Up @@ -49,10 +48,8 @@ limitations under the License.
- [FetchSmb](#FetchSmb)
- [FocusArchiveEntry](#FocusArchiveEntry)
- [GenerateFlowFile](#GenerateFlowFile)
- [GetEnvironmentalSensors](#GetEnvironmentalSensors)
- [GetFile](#GetFile)
- [GetGPS](#GetGPS)
- [GetMovementSensors](#GetMovementSensors)
- [GetTCP](#GetTCP)
- [HashContent](#HashContent)
- [InvokeHTTP](#InvokeHTTP)
Expand Down Expand Up @@ -240,30 +237,6 @@ In the list below, the names of required properties appear in bold. Any other pr
| original | The FlowFiles that were used to create the bundle |


## CapturePacket

### Description

CapturePacket captures and writes one or more packets into a PCAP file that will be used as the content of a flow file. Configuration options exist to adjust the batching of PCAP files. PCAP batching will place a single PCAP into a flow file. A regular expression selects network interfaces. Bluetooth network interfaces can be selected through a separate option.

### Properties

In the list below, the names of required properties appear in bold. Any other properties (not in bold) are considered optional. The table also indicates any default values, and whether a property supports the NiFi Expression Language.

| Name | Default Value | Allowable Values | Description |
|---------------------|---------------|------------------|-------------------------------------------------------------------------|
| Batch Size | 50 | | The number of packets to combine within a given PCAP |
| Network Controllers | .* | | Regular expression of the network controller(s) to which we will attach |
| Base Directory | /tmp/ | | Scratch directory for PCAP files |
| Capture Bluetooth | false | true<br/>false | True indicates that we support bluetooth interfaces |

### Relationships

| Name | Description |
|---------|---------------------------------|
| success | All files are routed to success |


## CaptureRTSPFrame

### Description
Expand Down Expand Up @@ -1124,26 +1097,6 @@ In the list below, the names of required properties appear in bold. Any other pr
| success | success operational on the flow record |


## GetEnvironmentalSensors

### Description

Provides sensor information from known sensors to include humidity and pressure data

### Properties

In the list below, the names of required properties appear in bold. Any other properties (not in bold) are considered optional. The table also indicates any default values, and whether a property supports the NiFi Expression Language.

| Name | Default Value | Allowable Values | Description |
|------|---------------|------------------|-------------|

### Relationships

| Name | Description |
|---------|---------------------------------|
| success | All files are routed to success |


## GetFile

### Description
Expand Down Expand Up @@ -1198,26 +1151,6 @@ In the list below, the names of required properties appear in bold. Any other pr
| success | All files are routed to success |


## GetMovementSensors

### Description

Defines a processor that is able to retrieve sensor information from a class of known servo sensors

### Properties

In the list below, the names of required properties appear in bold. Any other properties (not in bold) are considered optional. The table also indicates any default values, and whether a property supports the NiFi Expression Language.

| Name | Default Value | Allowable Values | Description |
|------|---------------|------------------|-------------|

### Relationships

| Name | Description |
|---------|---------------------------------|
| success | All files are routed to success |


## GetTCP

### Description
Expand Down
Loading
Loading