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.

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

[Heartbeat] Only setuid in elastic-agent image #28577

Merged
merged 1 commit into from
Oct 21, 2021

Conversation

andrewvc
Copy link
Contributor

Fixes #28572 by only invoking setuid in the elastic-agent container, and no longer in the heartbeat container. See the linked issue for details.

No changelog bump needed as the setuid feature is still unreleased.

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.

Fixes elastic#28572 by only invoking setuid in the elastic-agent container, and
no longer in the heartbeat container. See the linked issue for details.
@andrewvc andrewvc added bug Heartbeat Team:obs-ds-hosted-services Label for the Observability Hosted Services team v7.16.0 backport-v7.16.0 Automated backport with mergify labels Oct 20, 2021
@andrewvc andrewvc self-assigned this Oct 20, 2021
@elasticmachine
Copy link
Collaborator

Pinging @elastic/uptime (Team:Uptime)

@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 Oct 20, 2021
@elasticmachine
Copy link
Collaborator

elasticmachine commented Oct 20, 2021

💚 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: 2021-10-20T21:49:00.661+0000

  • Duration: 248 min 15 sec

  • Commit: 6778cf8

Test stats 🧪

Test Results
Failed 0
Passed 53944
Skipped 5344
Total 59288

💚 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.

@mdelapenya
Copy link
Contributor

/package

@andrewvc andrewvc merged commit da2bc89 into elastic:master Oct 21, 2021
@andrewvc andrewvc deleted the no-setuid-hb branch October 21, 2021 17:19
mergify bot pushed a commit that referenced this pull request Oct 21, 2021
Fixes #28572 by only invoking setuid in the elastic-agent container, and
no longer in the heartbeat container. See the linked issue for details.

(cherry picked from commit da2bc89)
andrewvc added a commit that referenced this pull request Oct 22, 2021
Fixes #28572 by only invoking setuid in the elastic-agent container, and
no longer in the heartbeat container. See the linked issue for details.

(cherry picked from commit da2bc89)

Co-authored-by: Andrew Cholakian <[email protected]>
v1v added a commit to v1v/beats that referenced this pull request Oct 26, 2021
…urnalbeat-ci

* upstream/master: (49 commits)
  [CI]: use the downstream packaging pipeline for branches/tags (elastic#28589)
  fix: use declarative style for complete variant of the elastic-agent (elastic#28526)
  x-pack/auditbeat/tracing: fix regexp for kprobe description line (elastic#28609)
  docs: Update `api_key` example on elasticsearch output (elastic#28606)
  chore: add build scripts to CODEOWNERS (elastic#28615)
  Osquerybeat: Fix host_processes missing cmdline arguments (elastic#28622)
  Add note about changes to regexp package in Golang (elastic#28616)
  CI: nightly/weekly builds for 7.x targeting 7.16 instead (elastic#28612)
  Osquerybeat: Fix extenstion unable to start on windows (elastic#28598)
  Osquerybeat: Return the query result count with the action response (elastic#28576)
  Agent: Allow custom response properties in the action response (elastic#28575)
  [Heartbeat] Only setuid in elastic-agent image (elastic#28577)
  Fix formatting of `mapStateJSON` and `layerListJSON` in dashboard assets (elastic#28530)
  CI: refactor the run e2e build (elastic#28502)
  Use fsnotify with long windows name-safe changes (elastic#28517)
  Remove unneeded mergify config
  backport: Add 7.16 branch (elastic#28560)
  Add proxy_url support to threatintel module's malwarebazaar fileset (elastic#28533)
  Osquerybeat: Implement host_users, host_groups, host_processes tables as a part of our osquery_extension. (elastic#28434)
  [Heartbeat] Make run_once syntax a boolean (elastic#28548)
  ...
Icedroid pushed a commit to Icedroid/beats that referenced this pull request Nov 1, 2021
Fixes elastic#28572 by only invoking setuid in the elastic-agent container, and
no longer in the heartbeat container. See the linked issue for details.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-v7.16.0 Automated backport with mergify bug Heartbeat Team:obs-ds-hosted-services Label for the Observability Hosted Services team v7.16.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Heartbeat] Setuid has perms issues with user controlled config files
4 participants