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

[Agent] Remove heartbeat from bundled beats in agent. #21602

Merged
merged 2 commits into from
Oct 14, 2020
Merged

[Agent] Remove heartbeat from bundled beats in agent. #21602

merged 2 commits into from
Oct 14, 2020

Conversation

andrewvc
Copy link
Contributor

@andrewvc andrewvc commented Oct 6, 2020 •
edited
Loading

This keeps most of the changes in #20488 but un-bundles heartbeat since it's not ready for prime time yet. We may as well keep the work that has been done already, but keep it somewhat out of the way and undocumented / unsupported for now. We will open a separate issue for removing the package.

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.

@andrewvc
Remove heartbeat from bundled beats in agent.
8a2fa34 
This keeps most of the changes in
elastic#20488 but unbundles heartbeat
since it's not ready for prime time yet. We may as well keep the work
that has been done already IMHO.
@andrewvc andrewvc requested review from ph and blakerouse October 6, 2020 21:58
@andrewvc andrewvc self-assigned this Oct 6, 2020
@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label Team:Ingest Management labels Oct 6, 2020
@elasticmachine
Copy link
Collaborator

Pinging @elastic/ingest-management (Team:Ingest Management)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Oct 6, 2020
@elasticmachine
Copy link
Collaborator

elasticmachine commented Oct 6, 2020 •
edited by jenkins-beats-ci bot
Loading

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #21602 updated]

  • Start Time: 2020-10-08T19:01:54.416+0000

  • Duration: 88 min 59 sec

Test stats 🧪

Test Results
Failed 0
Passed 16323
Skipped 1343
Total 17666

@michalpristas
Copy link
Contributor

you need to update packages.yml as well otherwise it will be looking for heartbeat in a drop location provided by release build
look for downloads/heartbeat-{{ beat_version }

@ph ph requested a review from michalpristas October 7, 2020 11:47
@ph ph added the bug label Oct 8, 2020
@andrewvc
Copy link
Contributor Author

andrewvc commented Oct 8, 2020

@michalpristas thanks for taking a look. I've updated packages.yml, can you take a look?

@michalpristas
Copy link
Contributor

looking/testing

michalpristas
michalpristas approved these changes Oct 12, 2020
View reviewed changes
Copy link
Contributor

@michalpristas michalpristas left a comment

Choose a reason for hiding this comment

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

Looks ok

@ph
Copy link
Contributor

ph commented Oct 14, 2020 •
edited
Loading

@andrewvc Can we merge this? backport it?

@ph
Copy link
Contributor

ph commented Oct 14, 2020

/package

@andrewvc andrewvc merged commit 39b1db8 into elastic:master Oct 14, 2020
@andrewvc andrewvc deleted the revert-heartbeat-agent branch October 14, 2020 18:48
@andrewvc andrewvc mentioned this pull request Oct 14, 2020
Merged
6 tasks
andrewvc added a commit to andrewvc/beats that referenced this pull request Oct 14, 2020
@andrewvc
[Agent] Remove heartbeat from bundled beats in agent. (elastic#21602)
8d4adb2 
This keeps most of the changes in
elastic#20488 but unbundles heartbeat
since it's not ready for prime time yet. We may as well keep the work
that has been done already IMHO.

(cherry picked from commit 39b1db8)
@andrewvc andrewvc mentioned this pull request Oct 14, 2020
Merged
6 tasks
andrewvc added a commit to andrewvc/beats that referenced this pull request Oct 14, 2020
@andrewvc
[Agent] Remove heartbeat from bundled beats in agent. (elastic#21602)
bf3580a 
This keeps most of the changes in
elastic#20488 but unbundles heartbeat
since it's not ready for prime time yet. We may as well keep the work
that has been done already IMHO.

(cherry picked from commit 39b1db8)
andrewvc added a commit that referenced this pull request Oct 14, 2020
@andrewvc
[Agent] Remove heartbeat from bundled beats in agent. (#21602) (#21819)
2c67862 
This keeps most of the changes in
#20488 but unbundles heartbeat
since it's not ready for prime time yet. We may as well keep the work
that has been done already IMHO.

(cherry picked from commit 39b1db8)
andrewvc added a commit that referenced this pull request Oct 14, 2020
@andrewvc
[Agent] Remove heartbeat from bundled beats in agent. (#21602) (#21820)
81dc892 
This keeps most of the changes in
#20488 but unbundles heartbeat
since it's not ready for prime time yet. We may as well keep the work
that has been done already IMHO.

(cherry picked from commit 39b1db8)
v1v added a commit to v1v/beats that referenced this pull request Oct 15, 2020
@v1v
Merge remote-tracking branch 'upstream/master' into feature/windows-10
1997de1 
* upstream/master: (29 commits)
  [CI] Enable build stage for arm architecture (elastic#21284)
  [BUILD][CI] fetch dependencies with retry (elastic#21614)
  Add proxy metricset (elastic#21751)
  [Filebeat][httpjson] Fix date_cursor validation (elastic#21756)
  Update endpoint-related terminology in Elastic Agent docs (elastic#21458)
  Move s3_daily_storage and s3_request metricsets to use cloudwatch input (elastic#21703)
  [Agent] Remove heartbeat from bundled beats in agent. (elastic#21602)
  [Elastic Agent] Don't perform install until after enroll (elastic#21772)
  [Elastic Agent] Update path from policy change for Kibana connection. (elastic#21804)
  Change cloud.provider from googlecloud to gcp (elastic#21775)
  Fix stress test package list (elastic#21719)
  [Elastic Agent] Remove the service installer scripts from packaging (elastic#21694)
  [CI] Support Windows-2012 in pipeline 2.0 (elastic#21338)
  Fix non-windows fields on system/filesystem (elastic#21758)
  disable TestReceiveEventsAndMetadata/TestSocketCleanup/TestReceiveNewEventsConcurrently in Windows (elastic#21750)
  Use badger code from upstream repository (elastic#21705)
  Disable writes sync in persistent cache (elastic#21754)
  Make API address and Shard ID required in Cloud Foundry settings (elastic#21759)
  [CI] Support skip-ci label (elastic#21377)
  Increase recommended memory when deploying in Cloud foundry (elastic#21755)
  ...
v1v added a commit to v1v/beats that referenced this pull request Oct 15, 2020
@v1v
Merge remote-tracking branch 'upstream/master' into feature/windows-7-64
662166b 
* upstream/master: (216 commits)
  [CI] Enable build stage for arm architecture (elastic#21284)
  [BUILD][CI] fetch dependencies with retry (elastic#21614)
  Add proxy metricset (elastic#21751)
  [Filebeat][httpjson] Fix date_cursor validation (elastic#21756)
  Update endpoint-related terminology in Elastic Agent docs (elastic#21458)
  Move s3_daily_storage and s3_request metricsets to use cloudwatch input (elastic#21703)
  [Agent] Remove heartbeat from bundled beats in agent. (elastic#21602)
  [Elastic Agent] Don't perform install until after enroll (elastic#21772)
  [Elastic Agent] Update path from policy change for Kibana connection. (elastic#21804)
  Change cloud.provider from googlecloud to gcp (elastic#21775)
  Fix stress test package list (elastic#21719)
  [Elastic Agent] Remove the service installer scripts from packaging (elastic#21694)
  [CI] Support Windows-2012 in pipeline 2.0 (elastic#21338)
  Fix non-windows fields on system/filesystem (elastic#21758)
  disable TestReceiveEventsAndMetadata/TestSocketCleanup/TestReceiveNewEventsConcurrently in Windows (elastic#21750)
  Use badger code from upstream repository (elastic#21705)
  Disable writes sync in persistent cache (elastic#21754)
  Make API address and Shard ID required in Cloud Foundry settings (elastic#21759)
  [CI] Support skip-ci label (elastic#21377)
  Increase recommended memory when deploying in Cloud foundry (elastic#21755)
  ...
v1v added a commit to v1v/beats that referenced this pull request Oct 15, 2020
@v1v
Merge remote-tracking branch 'upstream/master' into feature/windows-2008
a21f05c 
* upstream/master: (156 commits)
  [CI] Enable build stage for arm architecture (elastic#21284)
  [BUILD][CI] fetch dependencies with retry (elastic#21614)
  Add proxy metricset (elastic#21751)
  [Filebeat][httpjson] Fix date_cursor validation (elastic#21756)
  Update endpoint-related terminology in Elastic Agent docs (elastic#21458)
  Move s3_daily_storage and s3_request metricsets to use cloudwatch input (elastic#21703)
  [Agent] Remove heartbeat from bundled beats in agent. (elastic#21602)
  [Elastic Agent] Don't perform install until after enroll (elastic#21772)
  [Elastic Agent] Update path from policy change for Kibana connection. (elastic#21804)
  Change cloud.provider from googlecloud to gcp (elastic#21775)
  Fix stress test package list (elastic#21719)
  [Elastic Agent] Remove the service installer scripts from packaging (elastic#21694)
  [CI] Support Windows-2012 in pipeline 2.0 (elastic#21338)
  Fix non-windows fields on system/filesystem (elastic#21758)
  disable TestReceiveEventsAndMetadata/TestSocketCleanup/TestReceiveNewEventsConcurrently in Windows (elastic#21750)
  Use badger code from upstream repository (elastic#21705)
  Disable writes sync in persistent cache (elastic#21754)
  Make API address and Shard ID required in Cloud Foundry settings (elastic#21759)
  [CI] Support skip-ci label (elastic#21377)
  Increase recommended memory when deploying in Cloud foundry (elastic#21755)
  ...
v1v added a commit to v1v/beats that referenced this pull request Oct 15, 2020
@v1v
Merge remote-tracking branch 'upstream/master' into feature/windows-7-32
b359f40 
* upstream/master: (156 commits)
  [CI] Enable build stage for arm architecture (elastic#21284)
  [BUILD][CI] fetch dependencies with retry (elastic#21614)
  Add proxy metricset (elastic#21751)
  [Filebeat][httpjson] Fix date_cursor validation (elastic#21756)
  Update endpoint-related terminology in Elastic Agent docs (elastic#21458)
  Move s3_daily_storage and s3_request metricsets to use cloudwatch input (elastic#21703)
  [Agent] Remove heartbeat from bundled beats in agent. (elastic#21602)
  [Elastic Agent] Don't perform install until after enroll (elastic#21772)
  [Elastic Agent] Update path from policy change for Kibana connection. (elastic#21804)
  Change cloud.provider from googlecloud to gcp (elastic#21775)
  Fix stress test package list (elastic#21719)
  [Elastic Agent] Remove the service installer scripts from packaging (elastic#21694)
  [CI] Support Windows-2012 in pipeline 2.0 (elastic#21338)
  Fix non-windows fields on system/filesystem (elastic#21758)
  disable TestReceiveEventsAndMetadata/TestSocketCleanup/TestReceiveNewEventsConcurrently in Windows (elastic#21750)
  Use badger code from upstream repository (elastic#21705)
  Disable writes sync in persistent cache (elastic#21754)
  Make API address and Shard ID required in Cloud Foundry settings (elastic#21759)
  [CI] Support skip-ci label (elastic#21377)
  Increase recommended memory when deploying in Cloud foundry (elastic#21755)
  ...
shahzad31 added a commit that referenced this pull request Nov 20, 2020
@shahzad31
Revert "[Agent] Remove heartbeat from bundled beats in agent. (#21602)"
3518c28 
This reverts commit 39b1db8.
@shahzad31 shahzad31 mentioned this pull request Nov 20, 2020
Merged
@andrewvc andrewvc added Heartbeat Team:obs-ds-hosted-services Label for the Observability Hosted Services team labels Jan 25, 2021
@elasticmachine
Copy link
Collaborator

Pinging @elastic/uptime (Team:Uptime)

@andrewvc andrewvc mentioned this pull request Feb 8, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@michalpristas michalpristas michalpristas approved these changes

@ph ph Awaiting requested review from ph

@blakerouse blakerouse Awaiting requested review from blakerouse

Assignees

@andrewvc andrewvc

Labels
bug Heartbeat Team:obs-ds-hosted-services Label for the Observability Hosted Services team v7.10.0 v7.11.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@andrewvc @elasticmachine @michalpristas @ph @andresrc