Skip to content
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

Jump to bottom

Install gawk as a replacement for mawk in Docker containers. #30452

Merged
merged 2 commits into from
Feb 17, 2022
Merged

Install gawk as a replacement for mawk in Docker containers. #30452

merged 2 commits into from
Feb 17, 2022

Conversation

blakerouse
Copy link
Contributor

@blakerouse blakerouse commented Feb 17, 2022 •
edited
Loading

What does this PR do?

Fixes an issue where the docker-entrypoint inside of the beats containers no longer worked the same as it did before the switch to Ubuntu 20.04 as the base image in 7.17.0.

This is because Ubuntu ships with mawk instead of gawk. This change switches the container back to using gawk.

Why is it important?

Allows the docker-entrypoint to provide the same behavior that was provided in <7.16.x in 7.17.1+. Switch to gawk also ensures that any one that uses awk in a derived container with one of the beats as a base the same awk commands will work.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • [ ] I have made corresponding changes to the documentation
  • [ ] I have made corresponding change to the default configuration files
  • [ ] I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

How to test this PR locally

setup should now be executed, before this change it would not work.

$ PLATFORMS="linux/amd64" mage package
$ docker run -it docker.elastic.co/beats/filebeat:8.2.0 setup

Related issues

@blakerouse blakerouse added backport-v8.0.0 Automated backport with mergify Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team backport-v8.1.0 Automated backport with mergify backport-7.17 Automated backport to the 7.17 branch with mergify labels Feb 17, 2022
@blakerouse blakerouse self-assigned this Feb 17, 2022
@blakerouse blakerouse requested a review from a team as a code owner February 17, 2022 14:08
@elasticmachine
Copy link
Collaborator

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Feb 17, 2022
ph
ph approved these changes Feb 17, 2022
View reviewed changes
Copy link
Contributor

@ph ph left a comment

Choose a reason for hiding this comment

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

The changes LGTM, I've tested previously and with the change and it does fix the problems.

@elasticmachine
Copy link
Collaborator

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2022-02-17T14:10:36.069+0000

  • Duration: 219 min 11 sec

Test stats 🧪

Test Results
Failed 0
Passed 38335
Skipped 3297
Total 41632

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@blakerouse
Copy link
Contributor Author

Everything passed except the autodiscover test in e2e-testing, that one is known to fail, so this is good to go.

@blakerouse blakerouse merged commit 2020a27 into elastic:main Feb 17, 2022
@blakerouse blakerouse deleted the fix-ubuntu-gawk branch February 17, 2022 19:08
mergify bot pushed a commit that referenced this pull request Feb 17, 2022
@blakerouse
Install gawk as a replacement for mawk in Docker containers. (#30452)
31ce01a 
* Install gawk as a replacement for mawk in Docker containers.

* Add changelog entry.

(cherry picked from commit 2020a27)
@mergify mergify bot mentioned this pull request Feb 17, 2022
Merged
mergify bot pushed a commit that referenced this pull request Feb 17, 2022
@blakerouse
Install gawk as a replacement for mawk in Docker containers. (#30452)
31ba0a8 
* Install gawk as a replacement for mawk in Docker containers.

* Add changelog entry.

(cherry picked from commit 2020a27)
@mergify mergify bot mentioned this pull request Feb 17, 2022
Merged
mergify bot pushed a commit that referenced this pull request Feb 17, 2022
@blakerouse
Install gawk as a replacement for mawk in Docker containers. (#30452)
cdeed60 
* Install gawk as a replacement for mawk in Docker containers.

* Add changelog entry.

(cherry picked from commit 2020a27)
@mergify mergify bot mentioned this pull request Feb 17, 2022
Merged
v1v added a commit to v1v/beats that referenced this pull request Feb 21, 2022
@v1v
Merge remote-tracking branch 'upstream/main' into feature/use-with-ki…
6c6cce5 
…nd-k8s-env

* upstream/main:
  fix typos and improve sentences (elastic#30432)
  Add drop and explicit tests to avoid duplicate ingest of elasticsearch logs (elastic#30440)
  {,x-pack/}auditbeat: replace uses of github.com/pkg/errors with stdlib equivalents (elastic#30321)
  Spelling fix (elastic#30439)
  packetbeat/beater: make sure Npcap installation runs before interfaces are needed in all cases (elastic#30438)
  Add BC about Homebrew no longer being available in 8.0 (elastic#30419)
  Install gawk as a replacement for mawk in Docker containers. (elastic#30452)
  Clean up python-related system tests (elastic#30415)
  Fix TestNewModuleRegistry flakiness (elastic#30453)
  [Filebeat] [auditd]: Support EXECVE events with truncated argument list (elastic#30382)
  Set `log.offset` to the start of the reported line in filestream (elastic#30445)
  clarify SelectedPackageTypes meaning and improve its usage (elastic#30142)
  [elasticsearch module] serialize shards properties (elastic#30408)
  Add docs about hints and templates autodiscovery priority (elastic#30343)
v1v added a commit to v1v/beats that referenced this pull request Feb 22, 2022
@v1v
Merge remote-tracking branch 'upstream/main' into feature/refactor-pa…
29471a7 
…ckaging-docker

* upstream/main: (26 commits)
  Update docker/distribution to 2.8.0 (elastic#30462)
  Add `parsers` examples to `filestream` reference configuration (elastic#30529)
  extend documentation about setting orchestrator.cluster fields (elastic#30518)
  Forward-port 8.0.1 changelog to main (elastic#30522)
  Switch skip to use `CI` (elastic#30512)
  packetbeat/beater: don't attempt to install npcap when already installed (elastic#30509)
  Fix Docker module: rename fields on dashboards (elastic#30500)
  fix typos and improve sentences (elastic#30432)
  Add drop and explicit tests to avoid duplicate ingest of elasticsearch logs (elastic#30440)
  {,x-pack/}auditbeat: replace uses of github.com/pkg/errors with stdlib equivalents (elastic#30321)
  Spelling fix (elastic#30439)
  packetbeat/beater: make sure Npcap installation runs before interfaces are needed in all cases (elastic#30438)
  Add BC about Homebrew no longer being available in 8.0 (elastic#30419)
  Install gawk as a replacement for mawk in Docker containers. (elastic#30452)
  Clean up python-related system tests (elastic#30415)
  Fix TestNewModuleRegistry flakiness (elastic#30453)
  [Filebeat] [auditd]: Support EXECVE events with truncated argument list (elastic#30382)
  Set `log.offset` to the start of the reported line in filestream (elastic#30445)
  clarify SelectedPackageTypes meaning and improve its usage (elastic#30142)
  [elasticsearch module] serialize shards properties (elastic#30408)
  ...
blakerouse added a commit that referenced this pull request Feb 24, 2022
@mergify @blakerouse
Install gawk as a replacement for mawk in Docker containers. (#30452) (…
611dd92 
…#30465)

* Install gawk as a replacement for mawk in Docker containers.

* Add changelog entry.

(cherry picked from commit 2020a27)

Co-authored-by: Blake Rouse <[email protected]>
blakerouse added a commit that referenced this pull request Feb 24, 2022
@mergify @blakerouse
Install gawk as a replacement for mawk in Docker containers. (#30452) (…
3fcddb6 
…#30464)

* Install gawk as a replacement for mawk in Docker containers.

* Add changelog entry.

(cherry picked from commit 2020a27)

Co-authored-by: Blake Rouse <[email protected]>
blakerouse added a commit that referenced this pull request Feb 24, 2022
@mergify @blakerouse
Install gawk as a replacement for mawk in Docker containers. (#30452) (…
4d9042d 
…#30463)

* Install gawk as a replacement for mawk in Docker containers.

* Add changelog entry.

(cherry picked from commit 2020a27)

Co-authored-by: Blake Rouse <[email protected]>
v1v added a commit that referenced this pull request Mar 2, 2022
@v1v
Merge branch '8.1' of github.com:elastic/beats into mergify/bp/8.1/pr…
0112148 
…-29710

* '8.1' of github.com:elastic/beats: (51 commits)
  refactor pushDockerImages (#30414) (#30624)
  ci: add windows-2022 in the extended meta-stage (#30528) (#30630)
  Curate k8s testing versions to only keep the actively maintained (#30619) (#30625)
  [8.1](backport #30355) Add Beats upgrade docs for 8.0 (#30612)
  Remove references to gcp from the Functionbeat docs (#30579) (#30609)
  x-pack/auditbeat/module/system/socket: defend against exec with zero arguments (#30586) (#30597)
  [MySQL Enterprise] Adding default paths values to manifest.yml (#30598) (#30604)
  metricbeat - fix elasticsearch and kibana integration tests failures in 8.0 (#30566) (#30594)
  Install gawk as a replacement for mawk in Docker containers. (#30452) (#30465)
  [Filebeat] Remove RecordedFuture dataset from Threat Intel module (#30564) (#30568)
  Adjust the documentation of `backoff` options in filestream input (#30552) (#30557)
  packetbeat/beater: help the GC clean up the Npcap installer if it's not used (#30513) (#30546)
  Osquerybeat: Add install verification for osquerybeat (#30388) (#30404)
  Update docker/distribution to 2.8.0 (#30462) (#30540)
  Add `parsers` examples to `filestream` reference configuration (#30529) (#30537)
  [8.1](backport #30068) ZooKeeper module: Adapt to ZooKeeper 3.6+ `mntr` response fields' changes. (#30360)
  [8.1](backport #30512) Switch skip to use `CI` (#30525)
  Forward-port 8.0.1 changelog to 8.1 (#30517)
  packetbeat/beater: don't attempt to install npcap when already installed (#30509) (#30511)
  Add drop and explicit tests to avoid duplicate ingest of elasticsearch logs (#30440) (#30488)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ph ph ph approved these changes

Assignees

@blakerouse blakerouse

Labels
backport-7.17 Automated backport to the 7.17 branch with mergify backport-v8.0.0 Automated backport with mergify backport-v8.1.0 Automated backport with mergify Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

7.17.0 awk entrypoint broken
3 participants
@blakerouse @elasticmachine @ph