diff --git a/apps/jjb/operator_custom_tests.j2 b/apps/jjb/operator_custom_tests.j2 index 6d1365c..19a7722 100644 --- a/apps/jjb/operator_custom_tests.j2 +++ b/apps/jjb/operator_custom_tests.j2 @@ -109,7 +109,7 @@ --env GIT_BRANCH=$GIT_BRANCH \ --env TEST_SCRIPT_PARAMS="$TEST_SCRIPT_PARAMS" \ --env TEST_SCRIPT="$TEST_SCRIPT" \ - --env VECTOR_AGGREGATOR='vector-aggregator.default.svc.cluster.local:6000' \ + --env VECTOR_AGGREGATOR='http://vector-aggregator.default.svc.cluster.local:6000' \ oci.stackable.tech/operator-test-runner:latest publishers: - archive: diff --git a/apps/jjb/operator_weekly_tests.j2 b/apps/jjb/operator_weekly_tests.j2 index f8e828d..cf249e0 100644 --- a/apps/jjb/operator_weekly_tests.j2 +++ b/apps/jjb/operator_weekly_tests.j2 @@ -75,7 +75,7 @@ --env CLUSTER_LOGGING_PASSWORD="$CLUSTER_LOGGING_PASSWORD" \ --env OPENSEARCH_DASHBOARDS_URL='{{ opensearch_dashboards_url }}' \ --env TEST_SCRIPT_PARAMS="{{ testsuite.weekly_test.test_script_params }}" \ - --env VECTOR_AGGREGATOR='vector-aggregator.default.svc.cluster.local:6000' \ + --env VECTOR_AGGREGATOR='http://vector-aggregator.default.svc.cluster.local:6000' \ oci.stackable.tech/operator-test-runner:latest publishers: - archive: diff --git a/apps/src/modules/.cluster_logging/vector-agent-values.yaml b/apps/src/modules/.cluster_logging/vector-agent-values.yaml index 90f9836..6cde0f0 100644 --- a/apps/src/modules/.cluster_logging/vector-agent-values.yaml +++ b/apps/src/modules/.cluster_logging/vector-agent-values.yaml @@ -109,6 +109,11 @@ envFrom: - configMapRef: name: cluster-metadata env: + # Vector 0.57 disabled the interpolation of environment variables in the + # configuration by default. The configuration above relies on it, so it must + # be enabled again. + - name: VECTOR_DANGEROUSLY_ALLOW_ENV_VAR_INTERPOLATION + value: "true" - name: OPENSEARCH_ENDPOINT valueFrom: secretKeyRef: diff --git a/apps/src/modules/.cluster_logging/vector-aggregator-values.yaml b/apps/src/modules/.cluster_logging/vector-aggregator-values.yaml index 4bd54f8..23c75b1 100644 --- a/apps/src/modules/.cluster_logging/vector-aggregator-values.yaml +++ b/apps/src/modules/.cluster_logging/vector-aggregator-values.yaml @@ -48,6 +48,11 @@ envFrom: - configMapRef: name: cluster-metadata env: + # Vector 0.57 disabled the interpolation of environment variables in the + # configuration by default. The configuration above relies on it, so it must + # be enabled again. + - name: VECTOR_DANGEROUSLY_ALLOW_ENV_VAR_INTERPOLATION + value: "true" - name: OPENSEARCH_ENDPOINT valueFrom: secretKeyRef: diff --git a/apps/src/modules/cluster_logging.py b/apps/src/modules/cluster_logging.py index 2bbe150..0665496 100644 --- a/apps/src/modules/cluster_logging.py +++ b/apps/src/modules/cluster_logging.py @@ -52,7 +52,7 @@ def install_cluster_logging(cluster_id, endpoint, username, password, logger): logger("Install Vector agent using Helm...") exit_code, output = run_command( - "helm install vector-agent vector/vector --version 0.40.0 --values /src/modules/.cluster_logging/vector-agent-values.yaml --wait", + "helm install vector-agent vector/vector --version 0.58.0 --values /src/modules/.cluster_logging/vector-agent-values.yaml --wait", "helm install", ) if exit_code != 0: @@ -62,7 +62,7 @@ def install_cluster_logging(cluster_id, endpoint, username, password, logger): logger("Install Vector aggregator using Helm...") exit_code, output = run_command( - "helm install vector-aggregator vector/vector --version 0.40.0 --values /src/modules/.cluster_logging/vector-aggregator-values.yaml --wait", + "helm install vector-aggregator vector/vector --version 0.58.0 --values /src/modules/.cluster_logging/vector-aggregator-values.yaml --wait", "helm install", ) if exit_code != 0: