From 8267744ecb08419e6846dddc7c988dea814b9523 Mon Sep 17 00:00:00 2001 From: Siegfried Weber Date: Thu, 15 Oct 2026 11:50:05 +0200 Subject: [PATCH 1/2] feat: Support Vector 0.58.0 --- CHANGELOG.md | 3 ++- .../properties/product_logging/test-vector.sh | 26 ++++++++++++------- .../product_logging/vector-test.yaml | 5 ++++ .../properties/product_logging/vector.yaml | 13 +++++++--- .../01-install-hbase-vector-aggregator.yaml | 2 +- 5 files changed, 35 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 309966e7..e2f97ed1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,7 +41,7 @@ All notable changes to this project will be documented in this file. the new labels ([#748]). - Make operations infallible where dependent on static inputs ([#759], [#764]). - Bump stackable-operator to 0.119.0 ([#770]). -- test: Bump vector-aggregator to 0.58.0 ([#776]). +- Support Vector 0.58.0 ([#776], [#780]). - test: Update OPA to 1.20.2 in integration tests ([#778]). - Bump stackable-operator to 0.121.0 and replace `serde_yaml` with `yaml_serde` ([#779]). - All pods now set `securityContext.seccompProfile.type` to `RuntimeDefault` ([#779]). @@ -75,6 +75,7 @@ All notable changes to this project will be documented in this file. [#776]: https://github.com/stackabletech/hive-operator/pull/776 [#778]: https://github.com/stackabletech/hive-operator/pull/778 [#779]: https://github.com/stackabletech/hive-operator/pull/779 +[#780]: https://github.com/stackabletech/hive-operator/pull/780 ## [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 8028d880..58ab75a8 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=hive \ -ROLE_NAME=metastore \ -ROLE_GROUP_NAME=default \ -VECTOR_AGGREGATOR_ADDRESS=vector-aggregator \ -VECTOR_FILE_LOG_LEVEL=info \ -vector test vector.yaml vector-test.yaml +set -eu + +export DATA_DIR=/stackable/log/_vector-state +export LOG_DIR=/stackable/log +export NAMESPACE=default +export CLUSTER_NAME=hive +export ROLE_NAME=metastore +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 test-config.yaml 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 3efb0200..cc6dc24d 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: | @@ -82,6 +84,7 @@ tests: timestamp: 2025-10-02T09:27:29.473487331Z outputs: - extract_from: extended_logs + expected_event_count: 1 conditions: - type: vrl source: | @@ -119,6 +122,7 @@ tests: version: 0.49.0 outputs: - extract_from: extended_logs + expected_event_count: 1 conditions: - type: vrl source: | @@ -147,6 +151,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 e4d40b6e..2fd3d923 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 @@ -176,7 +176,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_log4j2 type: remap source: | del(.source_type) @@ -214,7 +216,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}" @@ -228,4 +231,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-hbase-vector-aggregator.yaml b/tests/templates/kuttl/logging/01-install-hbase-vector-aggregator.yaml index a67c8280..a7a69e2b 100644 --- a/tests/templates/kuttl/logging/01-install-hbase-vector-aggregator.yaml +++ b/tests/templates/kuttl/logging/01-install-hbase-vector-aggregator.yaml @@ -14,4 +14,4 @@ kind: ConfigMap metadata: name: hive-vector-aggregator-discovery data: - ADDRESS: hive-vector-aggregator:6123 + ADDRESS: http://hive-vector-aggregator:6123 From 40fe00e5c0fc6282915be23a47754e7313ad0fbb Mon Sep 17 00:00:00 2001 From: Siegfried Weber Date: Thu, 15 Oct 2026 16:25:27 +0200 Subject: [PATCH 2/2] fix: Fix the smoke test --- tests/templates/kuttl/smoke/60-assert.yaml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/templates/kuttl/smoke/60-assert.yaml.j2 b/tests/templates/kuttl/smoke/60-assert.yaml.j2 index 1fb78827..6008f6c5 100644 --- a/tests/templates/kuttl/smoke/60-assert.yaml.j2 +++ b/tests/templates/kuttl/smoke/60-assert.yaml.j2 @@ -294,7 +294,7 @@ spec: - |- mkdir --parents /stackable/log/_vector-state # Vector will ignore SIGTERM (as PID != 1) and must be shut down by writing a shutdown trigger file - vector & vector_pid=$! + /stackable/bin/vector-with-env-var-interpolation & vector_pid=$! if [ ! -f "/stackable/log/_vector/shutdown" ]; then mkdir -p /stackable/log/_vector inotifywait -qq --event create /stackable/log/_vector;