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.

Sign up for GitHub

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

Jump to bottom

MINIFICPP-2464 Drop the GPS extension #1871

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

MINIFICPP-2464 Drop the GPS extension #1871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 2 additions & 7 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ jobs:
-DENABLE_ENCRYPT_CONFIG=ON
-DENABLE_EXPRESSION_LANGUAGE=ON
-DENABLE_GCP=ON
-DENABLE_GPS=OFF
-DENABLE_KUBERNETES=ON
-DENABLE_LIBARCHIVE=ON
-DENABLE_LIBRDKAFKA=ON
Expand Down Expand Up @@ -137,7 +136,6 @@ jobs:
-DENABLE_ENCRYPT_CONFIG=ON
-DENABLE_EXPRESSION_LANGUAGE=ON
-DENABLE_GCP=ON
-DENABLE_GPS=OFF
-DENABLE_GRAFANA_LOKI=ON
-DENABLE_KUBERNETES=ON
-DENABLE_LIBARCHIVE=ON
Expand Down Expand Up @@ -251,7 +249,6 @@ jobs:
-DENABLE_ENCRYPT_CONFIG=ON
-DENABLE_EXPRESSION_LANGUAGE=ON
-DENABLE_GCP=OFF
-DENABLE_GPS=OFF
-DENABLE_KUBERNETES=OFF
-DENABLE_LIBARCHIVE=ON
-DENABLE_LIBRDKAFKA=OFF
Expand Down Expand Up @@ -350,7 +347,6 @@ jobs:
-DENABLE_EXPRESSION_LANGUAGE=ON
-DENABLE_EXECUTE_PROCESS=ON
-DENABLE_GCP=ON
-DENABLE_GPS=ON
-DENABLE_GRAFANA_LOKI=ON
-DENABLE_KUBERNETES=ON
-DENABLE_LIBARCHIVE=ON
Expand Down Expand Up @@ -395,7 +391,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 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 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 @@ -507,8 +503,7 @@ jobs:
run: |
# 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_SQL=ON -DENABLE_SYSTEMD=ON \
-DENABLE_ENCRYPT_CONFIG=ON -DENABLE_LIBRDKAFKA=ON -DENABLE_MQTT=ON -DENABLE_OPC=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
4 changes: 2 additions & 2 deletions Extensions.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ nifi.extension.path=../extensions/*
### Exlusion
If you want to exclude some extensions from being loaded, without having to specify the rest, you can do so by prefixing the pattern with `!`.
```
// This loads all extensions but the gps extension. (the exact name differs by platform: dylib, dll, so)
nifi.extension.path=../extensions/*,!../extensions/libminifi-gps.so
// This loads all extensions but the azure extension. (the exact name differs by platform: dylib, dll, so)
nifi.extension.path=../extensions/*,!../extensions/libminifi-azure.so
```

You could even exclude some subdirectory and then re-include specific extensions/subdirectories in that.
Expand Down
24 changes: 0 additions & 24 deletions PROCESSORS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ limitations under the License.
- [FocusArchiveEntry](#FocusArchiveEntry)
- [GenerateFlowFile](#GenerateFlowFile)
- [GetFile](#GetFile)
- [GetGPS](#GetGPS)
- [GetTCP](#GetTCP)
- [HashContent](#HashContent)
- [InvokeHTTP](#InvokeHTTP)
Expand Down Expand Up @@ -1124,29 +1123,6 @@ In the list below, the names of required properties appear in bold. Any other pr
| success | All files are routed to success |


## GetGPS

### Description

Obtains GPS coordinates from the GPSDHost and port.

### 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 |
|----------------|---------------|------------------|-----------------------------------------------------------|
| GPSD Host | localhost | | The host running the GPSD daemon |
| GPSD Port | 2947 | | The GPSD daemon port |
| GPSD Wait Time | 50000000 | | Timeout value for waiting for data from the GPSD instance |

### Relationships

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


## GetTCP

### Description
Expand Down
9 changes: 0 additions & 9 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ The next table outlines CMAKE flags that correspond with MiNiFi extensions. Exte
| CivetWeb | [ListenHTTP](PROCESSORS.md#listenhttp) | -DENABLE_CIVET=ON |
| Elasticsearch | [ElasticsearchCredentialsControllerService](CONTROLLERS.md#elasticsearchcredentialscontrollerservice)<br/>[PostElasticsearch](PROCESSORS.md#postelasticsearch) | -DENABLE_ELASTICSEARCH=ON |
| ExecuteProcess (Linux and macOS) | [ExecuteProcess](PROCESSORS.md#executeprocess) | -DENABLE_EXECUTE_PROCESS=ON |
| GPS (Linux and macOS) | [GetGPS](PROCESSORS.md#getgps) | -DENABLE_GPS=ON |
| Google Cloud Platform | [DeleteGCSObject](PROCESSORS.md#deletegcsobject)<br>[FetchGCSObject](PROCESSORS.md#fetchgcsobject)<br>[GCPCredentialsControllerService](CONTROLLERS.md#gcpcredentialscontrollerservice)<br>[ListGCSBucket](PROCESSORS.md#listgcsbucket)<br>[PutGCSObject](PROCESSORS.md#putgcsobject) | -DENABLE_GCP=ON |
| Grafana Loki | [PushGrafanaLokiREST](PROCESSORS.md#pushgrafanalokirest)<br>[PushGrafanaLokiGrpc](PROCESSORS.md#pushgrafanalokigrpc) | -DENABLE_GRAFANA_LOKI=ON |
| Kafka | [PublishKafka](PROCESSORS.md#publishkafka)<br>[ConsumeKafka](PROCESSORS.md#consumekafka) | -DENABLE_LIBRDKAFKA=ON |
Expand Down Expand Up @@ -138,7 +137,6 @@ and rebuild.

#### System Libraries / Development Headers Required
* Python 3 and development headers -- Required if Python support is enabled
* libgps-dev -- Required if building libGPS support
* perl -- Required for OpenSSL configuration
* NASM -- Required for OpenSSL only on Windows
* jom (optional) -- for parallel build of OpenSSL on Windows
Expand Down Expand Up @@ -206,8 +204,6 @@ dnf install python36-devel
dnf install docker
# (Optional) for system integration tests
dnf install docker python-virtualenv
# If building with GPS support
dnf install gpsd-devel
```

##### Aptitude based Linux Distributions
Expand Down Expand Up @@ -235,8 +231,6 @@ apt install libpython3-dev
apt install docker.io
# (Optional) for system integration tests
apt install docker.io python-virtualenv
# (Optional) If building with GPS support
apt install libgps-dev
```

##### macOS Using Homebrew (with XCode Command Line Tools installed)
Expand All @@ -260,8 +254,6 @@ brew link curl --force
# (Optional) for building docker image/running system integration tests
# Install docker using instructions at https://docs.docker.com/docker-for-mac/install/
sudo pip install virtualenv
# If building with GPS support
brew install gpsd
# It is recommended that you install bison from source as HomeBrew now uses an incompatible version of Bison
```

Expand Down Expand Up @@ -327,7 +319,6 @@ This will set up a virtual environment in the bootstrap folder, and guide you th
D. Python Scripting support ....Enabled
E. Expression Language support .Enabled
F. Kafka support ...............Enabled
I. GPS support .................Disabled
K. Bustache Support ............Disabled
L. Lua Scripting Support .......Enabled
M. MQTT Support ................Enabled
Expand Down
2 changes: 1 addition & 1 deletion Windows.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ A basic working CMake configuration can be inferred from the `win_build_vs.bat`.
```
mkdir build
cd build
cmake -G "Visual Studio 17 2022" -A x64 -DMINIFI_INCLUDE_VC_REDIST_MERGE_MODULES=OFF -DTEST_CUSTOM_WEL_PROVIDER=OFF -DENABLE_SQL=OFF -DMINIFI_USE_REAL_ODBC_TEST_DRIVER=OFF -DCMAKE_BUILD_TYPE_INIT=Release -DCMAKE_BUILD_TYPE=Release -DWIN32=WIN32 -DENABLE_LIBRDKAFKA=OFF -DENABLE_AWS=OFF -DENABLE_PDH= -DENABLE_AZURE=OFF -DENABLE_SFTP=OFF -DENABLE_SPLUNK= -DENABLE_GCP= -DENABLE_OPENCV=OFF -DENABLE_PROMETHEUS=OFF -DENABLE_ELASTICSEARCH= -DUSE_SHARED_LIBS=OFF -DENABLE_CONTROLLER=ON -DENABLE_BUSTACHE=OFF -DENABLE_ENCRYPT_CONFIG=OFF -DENABLE_GPS=OFF -DENABLE_LUA_SCRIPTING=OFF -DENABLE_MQTT=OFF -DENABLE_OPC=OFF -DENABLE_OPS=OFF -DENABLE_PYTHON_SCRIPTING= -DBUILD_ROCKSDB=ON -DUSE_SYSTEM_UUID=OFF -DENABLE_LIBARCHIVE=ON -DENABLE_WEL=ON -DMINIFI_FAIL_ON_WARNINGS=OFF -DSKIP_TESTS=OFF ..
cmake -G "Visual Studio 17 2022" -A x64 -DMINIFI_INCLUDE_VC_REDIST_MERGE_MODULES=OFF -DTEST_CUSTOM_WEL_PROVIDER=OFF -DENABLE_SQL=OFF -DMINIFI_USE_REAL_ODBC_TEST_DRIVER=OFF -DCMAKE_BUILD_TYPE_INIT=Release -DCMAKE_BUILD_TYPE=Release -DWIN32=WIN32 -DENABLE_LIBRDKAFKA=OFF -DENABLE_AWS=OFF -DENABLE_PDH= -DENABLE_AZURE=OFF -DENABLE_SFTP=OFF -DENABLE_SPLUNK= -DENABLE_GCP= -DENABLE_OPENCV=OFF -DENABLE_PROMETHEUS=OFF -DENABLE_ELASTICSEARCH= -DUSE_SHARED_LIBS=OFF -DENABLE_CONTROLLER=ON -DENABLE_BUSTACHE=OFF -DENABLE_ENCRYPT_CONFIG=OFF -DENABLE_LUA_SCRIPTING=OFF -DENABLE_MQTT=OFF -DENABLE_OPC=OFF -DENABLE_OPS=OFF -DENABLE_PYTHON_SCRIPTING= -DBUILD_ROCKSDB=ON -DUSE_SYSTEM_UUID=OFF -DENABLE_LIBARCHIVE=ON -DENABLE_WEL=ON -DMINIFI_FAIL_ON_WARNINGS=OFF -DSKIP_TESTS=OFF ..
msbuild /m nifi-minifi-cpp.sln /property:Configuration=Release /property:Platform=x64
copy minifi_main\Release\minifi.exe minifi_main\
cpack
Expand Down
2 changes: 0 additions & 2 deletions aptitude.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,6 @@ build_deps(){
INSTALLED+=("libtool")
elif [ "$FOUND_VALUE" = "python" ]; then
INSTALLED+=("libpython3-dev")
elif [ "$FOUND_VALUE" = "gpsd" ]; then
INSTALLED+=("libgps-dev")
elif [ "$FOUND_VALUE" = "libarchive" ]; then
INSTALLED+=("liblzma-dev")
fi
Expand Down
2 changes: 0 additions & 2 deletions arch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,6 @@ build_deps(){
INSTALLED+=("libtool")
elif [ "$FOUND_VALUE" = "python" ]; then
INSTALLED+=("python")
elif [ "$FOUND_VALUE" = "gpsd" ]; then
INSTALLED+=("gpsd")
elif [ "$FOUND_VALUE" = "libarchive" ]; then
INSTALLED+=("libarchive")
fi
Expand Down
3 changes: 0 additions & 3 deletions bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,9 +277,6 @@ add_option EXPRESSION_LANGUAGE_ENABLED ${TRUE} "ENABLE_EXPRESSION_LANGUAGE"
add_dependency EXPRESSION_LANGUAGE_ENABLED "bison"
add_dependency EXPRESSION_LANGUAGE_ENABLED "flex"

add_option GPS_ENABLED ${FALSE} "ENABLE_GPS"
add_dependency GPS_ENABLED "gpsd"

add_option AWS_ENABLED ${TRUE} "ENABLE_AWS"

add_option KAFKA_ENABLED ${TRUE} "ENABLE_LIBRDKAFKA"
Expand Down
7 changes: 2 additions & 5 deletions bootstrap/package_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,7 @@ def install(self, dependencies: Dict[str, Set[str]]) -> bool:
return self._install(dependencies=dependencies,
install_cmd="sudo apt install -y",
replace_dict={"libarchive": {"liblzma-dev"},
"python": {"libpython3-dev"},
"gpsd": {"libgps-dev"}})
"python": {"libpython3-dev"}})

def _get_installed_packages(self) -> Set[str]:
result = subprocess.run(['dpkg', '--get-selections'], text=True, capture_output=True, check=True)
Expand Down Expand Up @@ -150,8 +149,7 @@ def install(self, dependencies: Dict[str, Set[str]]) -> bool:
install_cmd = "sudo dnf install -y"
return self._install(dependencies=dependencies,
install_cmd=install_cmd,
replace_dict={"gpsd": {"gpsd-devel"},
"python": {"python3-devel"}})
replace_dict={"python": {"python3-devel"}})

def _get_installed_packages(self) -> Set[str]:
result = subprocess.run(['dnf', 'list', 'installed'], text=True, capture_output=True, check=True)
Expand Down Expand Up @@ -275,7 +273,6 @@ def install(self, dependencies: Dict[str, Set[str]]) -> bool:
"bison": set(),
"flex": set(),
"libarchive": set(),
"gpsd": set(),
"automake": set(),
"autoconf": set(),
"libtool": set(),
Expand Down
2 changes: 0 additions & 2 deletions bootstrap/system_dependency.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ def _create_system_dependencies(minifi_options: MinifiOptions) -> Dict[str, Set[
system_dependencies['m4'] = {'m4'}
if minifi_options.is_enabled("ENABLE_LIBARCHIVE"):
system_dependencies['libarchive'] = {'libarchive'}
if minifi_options.is_enabled("ENABLE_GPS"):
system_dependencies['gpsd'] = {'gpsd'}
if minifi_options.is_enabled("ENABLE_SQL"):
system_dependencies['automake'] = {'automake'}
system_dependencies['autoconf'] = {'autoconf'}
Expand Down
2 changes: 0 additions & 2 deletions bstrp_functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,6 @@ show_supported_features() {
echo "D. Python Scripting support ....$(print_feature_status PYTHON_SCRIPTING_ENABLED)"
echo "E. Expression Language support .$(print_feature_status EXPRESSION_LANGUAGE_ENABLED)"
echo "F. Kafka support ...............$(print_feature_status KAFKA_ENABLED)"
echo "I. GPS support .................$(print_feature_status GPS_ENABLED)"
echo "K. Bustache Support ............$(print_feature_status BUSTACHE_ENABLED)"
echo "L. Lua Scripting Support .......$(print_feature_status LUA_SCRIPTING_ENABLED)"
echo "M. MQTT Support ................$(print_feature_status MQTT_ENABLED)"
Expand Down Expand Up @@ -432,7 +431,6 @@ read_feature_options(){
d) ToggleFeature PYTHON_SCRIPTING_ENABLED ;;
e) ToggleFeature EXPRESSION_LANGUAGE_ENABLED ;;
f) ToggleFeature KAFKA_ENABLED ;;
i) ToggleFeature GPS_ENABLED ;;
k) ToggleFeature BUSTACHE_ENABLED ;;
l) ToggleFeature LUA_SCRIPTING_ENABLED ;;
m) ToggleFeature MQTT_ENABLED ;;
Expand Down
2 changes: 0 additions & 2 deletions centos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,6 @@ build_deps() {
INSTALLED+=("automake")
elif [ "$FOUND_VALUE" = "python" ]; then
INSTALLED+=("python36-devel")
elif [ "$FOUND_VALUE" = "gpsd" ]; then
INSTALLED+=("gpsd-devel")
elif [ "$FOUND_VALUE" = "libarchive" ]; then
INSTALLED+=("xz-devel")
INSTALLED+=("bzip2-devel")
Expand Down
1 change: 0 additions & 1 deletion cmake/DockerConfig.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ add_custom_target(
-DENABLE_PROMETHEUS=OFF
-DENABLE_GRPC_FOR_LOKI=OFF
-DENABLE_PROCFS=OFF
-DENABLE_GPS=OFF
-DENABLE_OPENCV=OFF
-DENABLE_BUSTACHE=OFF
-DENABLE_SFTP=OFF
Expand Down
Loading