diff --git a/CHANGELOG.md b/CHANGELOG.md index e8e69a13..9f092861 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,7 +39,7 @@ All notable changes to this project will be documented in this file. producing a duplicated entry whose precedence depended on Kubernetes' duplicate-name handling ([#1077]). - Make operations infallible where dependent on static inputs ([#1084]). -- test: Bump vector-aggregator to 0.58.0 ([#1093]). +- Support Vector 0.58.0 ([#1093], [#1098]). - All pods now set `securityContext.seccompProfile.type` to `RuntimeDefault` ([#1097]). - Replace the unmaintained `serde_yaml` with `yaml_serde` ([#1097]). @@ -64,6 +64,7 @@ All notable changes to this project will be documented in this file. [#1090]: https://github.com/stackabletech/zookeeper-operator/pull/1090 [#1093]: https://github.com/stackabletech/zookeeper-operator/pull/1093 [#1097]: https://github.com/stackabletech/zookeeper-operator/pull/1097 +[#1098]: https://github.com/stackabletech/zookeeper-operator/pull/1098 ## [26.7.0] - 2026-07-21 diff --git a/rust/operator-binary/src/zk_controller/build/properties/product_logging/test-vector.sh b/rust/operator-binary/src/zk_controller/build/properties/product_logging/test-vector.sh index 82178254..a13c9086 100755 --- a/rust/operator-binary/src/zk_controller/build/properties/product_logging/test-vector.sh +++ b/rust/operator-binary/src/zk_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=test-zk \ -ROLE_NAME=server \ -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=test-zk +export ROLE_NAME=server +export ROLE_GROUP_NAME=default +export VECTOR_AGGREGATOR_ADDRESS=vector-aggregator +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/zk_controller/build/properties/product_logging/vector-test.yaml b/rust/operator-binary/src/zk_controller/build/properties/product_logging/vector-test.yaml index cc65e58c..14f36d8c 100644 --- a/rust/operator-binary/src/zk_controller/build/properties/product_logging/vector-test.yaml +++ b/rust/operator-binary/src/zk_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: | @@ -116,6 +119,7 @@ tests: timestamp: 2025-10-02T09:27:29.473487331Z outputs: - extract_from: extended_logs + expected_event_count: 1 conditions: - type: vrl source: | @@ -153,6 +157,7 @@ tests: version: 0.49.0 outputs: - extract_from: extended_logs + expected_event_count: 1 conditions: - type: vrl source: | @@ -181,6 +186,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/zk_controller/build/properties/product_logging/vector.yaml b/rust/operator-binary/src/zk_controller/build/properties/product_logging/vector.yaml index deb19f6d..1d4e04b0 100644 --- a/rust/operator-binary/src/zk_controller/build/properties/product_logging/vector.yaml +++ b/rust/operator-binary/src/zk_controller/build/properties/product_logging/vector.yaml @@ -119,7 +119,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) @@ -157,7 +159,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}" @@ -171,4 +174,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/05-install-zookeeper-vector-aggregator.yaml b/tests/templates/kuttl/logging/05-install-zookeeper-vector-aggregator.yaml index beba6716..aed68355 100644 --- a/tests/templates/kuttl/logging/05-install-zookeeper-vector-aggregator.yaml +++ b/tests/templates/kuttl/logging/05-install-zookeeper-vector-aggregator.yaml @@ -14,4 +14,4 @@ kind: ConfigMap metadata: name: zookeeper-vector-aggregator-discovery data: - ADDRESS: zookeeper-vector-aggregator:6123 + ADDRESS: http://zookeeper-vector-aggregator:6123