Skip to content

Fix dir name for moving elasticsearch connectors #11106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ebeahan merged 8 commits into from
Nov 13, 2025
Merged

Fix dir name for moving elasticsearch connectors #11106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c99db67
Fix dir name for moving elasticsearch connectors
artem-shelkovnikov Nov 10, 2025
81fa5ec
Also change the pattern in packages.yml
artem-shelkovnikov Nov 10, 2025
b98d65d
Try USE_PACKAGE_VERSION=false
artem-shelkovnikov Nov 11, 2025
bc1fb37
Merge branch 'main' into patch-1
ebeahan Nov 11, 2025
fe1c1d6
set USE_PACKAGE_VERSION to false
ebeahan Nov 11, 2025
576c4fe
Update the unzip command to the correct folder
artem-shelkovnikov Nov 12, 2025
f1df742
Update connectors.sh to point to the right dir
artem-shelkovnikov Nov 12, 2025
c1b713f
Merge branch 'main' into patch-1
artem-shelkovnikov Nov 13, 2025
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 .buildkite/scripts/steps/integration-cloud-image-push.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ echo "CI_ELASTIC_AGENT_DOCKER_IMAGE: ${CI_ELASTIC_AGENT_DOCKER_IMAGE}"


export CUSTOM_IMAGE_TAG="git-${BUILDKITE_COMMIT:0:12}"
export USE_PACKAGE_VERSION="true"
export USE_PACKAGE_VERSION="false"

mage cloud:push
2 changes: 1 addition & 1 deletion .buildkite/scripts/steps/integration-package.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ source .buildkite/scripts/common.sh

export SNAPSHOT="true"
export EXTERNAL="true"
export USE_PACKAGE_VERSION="true"
export USE_PACKAGE_VERSION="false"

mage package
2 changes: 1 addition & 1 deletion dev-tools/packaging/files/linux/connectors.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

PY_AGENT_CLIENT_PATH=/usr/share/connectors
PY_AGENT_CLIENT_PATH=/usr/share/connectors/app/connectors_service
PYTHON_PATH=$PY_AGENT_CLIENT_PATH/.venv/bin/python
COMPONENT_PATH=$PY_AGENT_CLIENT_PATH/connectors/agent/cli.py
$PYTHON_PATH $COMPONENT_PATH
2 changes: 1 addition & 1 deletion dev-tools/packaging/packages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ components:
# using the beat_version or similar
# We don't support that yet, so we are defining a rootDir that will error out if rendered. This is not a problem since
# we don't extract/manipulate the archive during packaging, it has its own special handling in the 'service' docker image
rootDir: elasticsearch_connectors-{{beat_version}}
rootDir: connectors-{{beat_version}}
binaryName: connectors
fips: false
platforms:
Expand Down
4 changes: 2 additions & 2 deletions dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,8 @@ RUN mkdir /app && \

{{- if eq .Variant "service" }}
RUN apk add --no-cache git make python-3.11 py3.11-pip && \
unzip {{ $beatHome }}/data/service/connectors-*.zip -d {{ $beatHome }}/data/service && \
mv {{ $beatHome }}/data/service/elasticsearch_connectors-* /usr/share/connectors && \
unzip {{ $beatHome }}/data/service/connectors-*.zip -d {{ $beatHome }}/data/service/connectors && \
mv {{ $beatHome }}/data/service/connectors /usr/share/connectors && \
PYTHON=python3.11 make -C /usr/share/connectors clean install install-agent && \
chmod 0755 {{ $beatHome }}/data/elastic-agent-*/components/connectors
{{- end }}
Expand Down