From 159af01fbde1afaf57a95a0f3a79a6b27286aa20 Mon Sep 17 00:00:00 2001 From: dervoeti Date: Thu, 26 Jun 2025 14:01:30 +0200 Subject: [PATCH 1/3] fix: determine nifi version in nifi 1 create reporting task script --- nifi/python/create_nifi_reporting_task.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/nifi/python/create_nifi_reporting_task.py b/nifi/python/create_nifi_reporting_task.py index 672fd1605..fdf86ab7d 100755 --- a/nifi/python/create_nifi_reporting_task.py +++ b/nifi/python/create_nifi_reporting_task.py @@ -47,8 +47,11 @@ def find_reporting_task(name: str, port: str): return None -def create_reporting_task(name: str, port: str, version: str): +def create_reporting_task(name: str, port: str): """Create a ReportingTask""" + nifi_version = ( + nipyapi.system.get_system_diagnostics().system_diagnostics.aggregate_snapshot.version_info.ni_fi_version + ) task = nipyapi.nifi.models.reporting_task_entity.ReportingTaskEntity( revision=nipyapi.nifi.models.revision_dto.RevisionDTO(version=0), disconnected_node_acknowledged=False, @@ -56,7 +59,9 @@ def create_reporting_task(name: str, port: str, version: str): name=name, type="org.apache.nifi.reporting.prometheus.PrometheusReportingTask", bundle=nipyapi.nifi.models.bundle_dto.BundleDTO( - group="org.apache.nifi", artifact="nifi-prometheus-nar", version=version + group="org.apache.nifi", + artifact="nifi-prometheus-nar", + version=nifi_version, ), properties={ "prometheus-reporting-task-metrics-endpoint-port": port, @@ -159,7 +164,7 @@ def main(): if reporting_task is None: reporting_task = create_reporting_task( - name=task_name, port=port, version=args["nifi_version"] + name=task_name, port=port ) print( get_reporting_task_name(task=reporting_task) From fe91f0454ce7733df0d0031565942ba4a3cece70 Mon Sep 17 00:00:00 2001 From: dervoeti Date: Thu, 26 Jun 2025 14:05:14 +0200 Subject: [PATCH 2/3] chore: changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 274f12eab..b4f3a43be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -114,6 +114,7 @@ All notable changes to this project will be documented in this file. - hive: Patch for postgres CVE-2024-1597 ([#1100]). - bump image-tools (for `bake`) and nixpkgs (for `nodejs_20`, used by pre-commit) ([#1100]). - bump image-tools (for `bake`) to fix `RELEASE` arg ([#1188]). +- nifi: automatically determine NiFi version create reporting task script ([#1189]). ### Removed @@ -211,6 +212,7 @@ All notable changes to this project will be documented in this file. [#1184]: https://github.com/stackabletech/docker-images/pull/1184 [#1185]: https://github.com/stackabletech/docker-images/pull/1185 [#1188]: https://github.com/stackabletech/docker-images/pull/1188 +[#1189]: https://github.com/stackabletech/docker-images/pull/1189 ## [25.3.0] - 2025-03-21 From c23f4cc09c6e0e45a4cd03fb15b89061e044d333 Mon Sep 17 00:00:00 2001 From: dervoeti Date: Thu, 26 Jun 2025 14:19:01 +0200 Subject: [PATCH 3/3] chore: formatting --- nifi/python/create_nifi_reporting_task.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/nifi/python/create_nifi_reporting_task.py b/nifi/python/create_nifi_reporting_task.py index fdf86ab7d..1c0edcd99 100755 --- a/nifi/python/create_nifi_reporting_task.py +++ b/nifi/python/create_nifi_reporting_task.py @@ -49,9 +49,7 @@ def find_reporting_task(name: str, port: str): def create_reporting_task(name: str, port: str): """Create a ReportingTask""" - nifi_version = ( - nipyapi.system.get_system_diagnostics().system_diagnostics.aggregate_snapshot.version_info.ni_fi_version - ) + nifi_version = nipyapi.system.get_system_diagnostics().system_diagnostics.aggregate_snapshot.version_info.ni_fi_version task = nipyapi.nifi.models.reporting_task_entity.ReportingTaskEntity( revision=nipyapi.nifi.models.revision_dto.RevisionDTO(version=0), disconnected_node_acknowledged=False, @@ -163,9 +161,7 @@ def main(): reporting_task = find_reporting_task(name=task_name, port=port) if reporting_task is None: - reporting_task = create_reporting_task( - name=task_name, port=port - ) + reporting_task = create_reporting_task(name=task_name, port=port) print( get_reporting_task_name(task=reporting_task) + " [%s] -> CREATED" % reporting_task.id