Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/jjb/operator_custom_tests.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion apps/jjb/operator_weekly_tests.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 5 additions & 0 deletions apps/src/modules/.cluster_logging/vector-agent-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions apps/src/modules/cluster_logging.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note to self: add this as an instruction to the vector bump issue template.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've added instructions in stackabletech/docker-images#1711

"helm install",
)
if exit_code != 0:
Expand All @@ -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:
Expand Down