From 34bb8c376946ee49934c1006fa5fe90f364fe185 Mon Sep 17 00:00:00 2001 From: Siegfried Weber Date: Thu, 15 Oct 2026 10:08:06 +0200 Subject: [PATCH] feat: Support Vector 0.58.0 --- CHANGELOG.md | 3 ++- .../properties/product_logging/test-vector.sh | 24 ++++++++++++------- .../product_logging/vector-test.yaml | 5 ++++ .../properties/product_logging/vector.yaml | 13 +++++++--- .../01-install-nifi-vector-aggregator.yaml | 2 +- 5 files changed, 34 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f346ec64..5fb46bb3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -48,7 +48,7 @@ All notable changes to this project will be documented in this file. - Make operations infallible where dependent on static inputs ([#990]). - Deprecate support for 2.9.0 ([#997]). - Bump stackable-operator to 0.119.0 ([#999]). -- test: Bump vector-aggregator to 0.58.0 ([#1006]). +- Support Vector 0.58.0 ([#1006], [#1012]). - Bump stackable-operator to 0.121.0 and replace the unmaintained `serde_yaml` with `yaml_serde` ([#1011]). - All pods now set `securityContext.seccompProfile.type` to `RuntimeDefault` ([#1011]). - test: Update OPA to 1.20.2 in integration tests ([#1010]). @@ -82,6 +82,7 @@ All notable changes to this project will be documented in this file. [#1006]: https://github.com/stackabletech/nifi-operator/pull/1006 [#1010]: https://github.com/stackabletech/nifi-operator/pull/1010 [#1011]: https://github.com/stackabletech/nifi-operator/pull/1011 +[#1012]: https://github.com/stackabletech/nifi-operator/pull/1012 ## [26.7.0] - 2026-07-21 diff --git a/rust/operator-binary/src/controller/build/properties/product_logging/test-vector.sh b/rust/operator-binary/src/controller/build/properties/product_logging/test-vector.sh index 6977f395..6c8a69fe 100755 --- a/rust/operator-binary/src/controller/build/properties/product_logging/test-vector.sh +++ b/rust/operator-binary/src/controller/build/properties/product_logging/test-vector.sh @@ -1,11 +1,19 @@ #!/usr/bin/env sh -DATA_DIR=/stackable/log/_vector-state \ -LOG_DIR=/stackable/log \ -NAMESPACE=default \ -CLUSTER_NAME=nifi \ -ROLE_NAME=node \ -ROLE_GROUP_NAME=default \ -VECTOR_AGGREGATOR_ADDRESS=vector-aggregator \ -VECTOR_FILE_LOG_LEVEL=info \ +set -eu + +export DATA_DIR=/stackable/log/_vector-state +export LOG_DIR=/stackable/log +export NAMESPACE=default +export CLUSTER_NAME=nifi +export ROLE_NAME=node +export ROLE_GROUP_NAME=default +export VECTOR_AGGREGATOR_ADDRESS=http://vector-aggregator:6000 +export VECTOR_FILE_LOG_LEVEL=info + +# Required because vector.yaml contains ${...} placeholders +export VECTOR_DANGEROUSLY_ALLOW_ENV_VAR_INTERPOLATION=true + +vector validate --no-environment vector.yaml + vector test vector.yaml vector-test.yaml diff --git a/rust/operator-binary/src/controller/build/properties/product_logging/vector-test.yaml b/rust/operator-binary/src/controller/build/properties/product_logging/vector-test.yaml index bc0ec026..3ac29fd1 100644 --- a/rust/operator-binary/src/controller/build/properties/product_logging/vector-test.yaml +++ b/rust/operator-binary/src/controller/build/properties/product_logging/vector-test.yaml @@ -17,6 +17,7 @@ tests: timestamp: 2025-10-02T09:27:28.582Z outputs: - extract_from: extended_logs + expected_event_count: 1 conditions: - type: vrl source: | @@ -47,6 +48,7 @@ tests: timestamp: 2025-10-02T09:27:28.582Z outputs: - extract_from: extended_logs + expected_event_count: 1 conditions: - type: vrl source: | @@ -81,6 +83,7 @@ tests: timestamp: 2025-10-02T09:27:29.473487331Z outputs: - extract_from: extended_logs + expected_event_count: 1 conditions: - type: vrl source: | @@ -118,6 +121,7 @@ tests: version: 0.49.0 outputs: - extract_from: extended_logs + expected_event_count: 1 conditions: - type: vrl source: | @@ -146,6 +150,7 @@ tests: level: INFO outputs: - extract_from: filtered_logs_vector + expected_event_count: 1 conditions: - type: vrl source: | diff --git a/rust/operator-binary/src/controller/build/properties/product_logging/vector.yaml b/rust/operator-binary/src/controller/build/properties/product_logging/vector.yaml index cae311b7..d42c109f 100644 --- a/rust/operator-binary/src/controller/build/properties/product_logging/vector.yaml +++ b/rust/operator-binary/src/controller/build/properties/product_logging/vector.yaml @@ -120,7 +120,9 @@ transforms: # Extends the processed files with the fields "container" and "file" extended_logs_files: inputs: - - processed_files_* + - processed_files_stdout + - processed_files_stderr + - processed_files_log4j type: remap source: | del(.source_type) @@ -158,7 +160,8 @@ transforms: # Add the fields "namespace", "cluster", "role" and "roleGroup" to all logs extended_logs: inputs: - - extended_logs_* + - extended_logs_files + - extended_logs_vector type: remap source: | .namespace = "${NAMESPACE}" @@ -172,4 +175,8 @@ sinks: inputs: - extended_logs type: vector - address: ${VECTOR_AGGREGATOR_ADDRESS} + routing: + endpoints: + - ${VECTOR_AGGREGATOR_ADDRESS} + compression: zstd + keepalive: {} diff --git a/tests/templates/kuttl/logging/01-install-nifi-vector-aggregator.yaml b/tests/templates/kuttl/logging/01-install-nifi-vector-aggregator.yaml index de7c33a4..c9369587 100644 --- a/tests/templates/kuttl/logging/01-install-nifi-vector-aggregator.yaml +++ b/tests/templates/kuttl/logging/01-install-nifi-vector-aggregator.yaml @@ -14,4 +14,4 @@ kind: ConfigMap metadata: name: nifi-vector-aggregator-discovery data: - ADDRESS: nifi-vector-aggregator:6123 + ADDRESS: http://nifi-vector-aggregator:6123