Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
7e6caf2
Enable Filebeat's Journald input in all docker image variants
belimawr Apr 25, 2025
80f1fd8
Merge branch 'main' into 44040-journalctl-on-docker-iamges
belimawr Apr 25, 2025
f406282
Add changelog
belimawr Apr 25, 2025
423fd25
Merge branch '44040-journalctl-on-docker-iamges' of github.com:belima…
belimawr Apr 25, 2025
be5dce0
Merge branch 'main' of github.com:elastic/elastic-agent into 44040-jo…
belimawr May 9, 2025
c81ba47
Systemd installed only in complete and otel docker Images
belimawr May 22, 2025
d8a8ac1
Merge branch 'main' of github.com:elastic/elastic-agent into 44040-jo…
belimawr May 22, 2025
d0c0d4c
Fix condition to add systemd/journalctl
belimawr May 22, 2025
eee9aab
update changelog
belimawr May 22, 2025
6b8003b
Fix changelog
belimawr May 22, 2025
17c38c3
fix changelog one more time
belimawr May 22, 2025
c4f8c50
Update changelog/fragments/1745609163-journalctl-on-all-docker-varian…
belimawr May 23, 2025
a57d788
Merge branch 'main' of github.com:elastic/elastic-agent into 44040-jo…
belimawr May 28, 2025
7f11fd5
Merge branch 'main' of github.com:elastic/elastic-agent into 44040-jo…
belimawr May 29, 2025
d4bffe4
Add test to ensure docker images contain journalctl
belimawr May 29, 2025
a888305
Fix namespace on test
belimawr May 29, 2025
89e92ba
Add more docker images and improve docs
belimawr May 29, 2025
4d13e5e
Merge branch '44040-journalctl-on-docker-iamges' of github.com:belima…
belimawr May 29, 2025
3ccead5
Add integration build tag
belimawr May 30, 2025
7b1112e
Add otelcollector tests
belimawr May 30, 2025
a3d7535
Merge branch 'main' of github.com:elastic/elastic-agent into 44040-jo…
belimawr May 30, 2025
fca29ac
update notice files
belimawr May 30, 2025
f80ebea
Reduce verbosity
belimawr May 30, 2025
551b664
Fix notice files
belimawr May 30, 2025
fe8f78e
Fix parsing of ES host and add integration:kubernetesSingle
belimawr May 30, 2025
5861ff3
Merge branch 'main' of github.com:elastic/elastic-agent into 44040-jo…
belimawr Jun 3, 2025
d4957c6
Refactor tests
belimawr Jun 5, 2025
9634981
Consolidate package installation
belimawr Jun 9, 2025
c22981e
Merge branch 'main' of github.com:elastic/elastic-agent into 44040-jo…
belimawr Jun 9, 2025
4c321fb
Update dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.…
belimawr Jun 10, 2025
48d8cfa
Use k8s namespace as data_stream.namespace
belimawr Jun 10, 2025
c8c7907
Merge branch '44040-journalctl-on-docker-iamges' of github.com:belima…
belimawr Jun 10, 2025
176ab26
Merge branch 'main' of github.com:elastic/elastic-agent into 44040-jo…
belimawr Jun 10, 2025
9b64e84
Update changelog
belimawr Jun 10, 2025
72e3a0e
Update Elastic-Agent test to use username + password
belimawr Jun 12, 2025
5b15246
Merge branch 'main' of github.com:elastic/elastic-agent into 44040-jo…
belimawr Jun 12, 2025
b10a886
Update function call
belimawr Jun 12, 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
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Kind can be one of:
# - breaking-change: a change to previously-documented behavior
# - deprecation: functionality that is being removed in a later release
# - bug-fix: fixes a problem in a previous version
# - enhancement: extends functionality but does not break or fix existing behavior
# - feature: new functionality
# - known-issue: problems that we are aware of in a given version
# - security: impacts on the security of a product or a user’s deployment.
# - upgrade: important information for someone upgrading from a prior version
# - other: does not fit into any of the other categories
kind: bug-fix

# Change summary; a 80ish characters long description of the change.
summary: Ship journalctl on all Docker image variants

# Long description; in case the summary is not enough to describe the change
# this field accommodate a description without length limits.
# NOTE: This field will be rendered only for breaking-change and known-issue kinds at the moment.
description: |
Filebeat's Journald input requires journalctl, so the systemd package is added to all docker image variants.

# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc.
component: elastic-agent

# PR URL; optional; the PR number that added the changeset.
# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
# Please provide it if you are adding a fragment for a different PR.
pr: https://github.com/elastic/elastic-agent/pull/7995

# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of).
# If not present is automatically filled by the tooling with the issue linked to the PR number.
issue: https://github.com/elastic/beats/issues/44040
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,15 @@ ENV BEAT_SETUID_AS={{ .user }}
{{- if contains .from "ubi-minimal" }}
RUN for iter in {1..10}; do \
microdnf update -y && \
microdnf install -y tar gzip findutils shadow-utils ca-certificates gawk libcap xz && \
microdnf install -y tar gzip findutils shadow-utils ca-certificates gawk libcap xz systemd && \
microdnf clean all && \
exit_code=0 && break || exit_code=$? && echo "microdnf error: retry $iter in 10s" && sleep 10; done; (exit $exit_code)
{{- end }}

{{- if contains .from "wolfi" }}
RUN for iter in {1..10}; do \
apk fix && \
apk add --no-cache ca-certificates curl gawk shadow bash && \
apk add --no-cache ca-certificates curl gawk shadow bash systemd && \
exit_code=0 && break || exit_code=$? && echo "apk error: retry $iter in 10s" && sleep 10; \
done; \
(exit $exit_code)
Expand Down