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

[Ingest Manager] Always try snapshot repo for agent upgrade #21951

Merged
merged 4 commits into from
Oct 20, 2020
Merged

[Ingest Manager] Always try snapshot repo for agent upgrade #21951

merged 4 commits into from
Oct 20, 2020

Conversation

michalpristas
Copy link
Contributor

@michalpristas michalpristas commented Oct 19, 2020 •
edited
Loading

What does this PR do?

This PR adds ability of agent to download new version from snapshot repo. This makes update from stable version e.g 7.10 to 8.0.0 SNAPSHOT possible.

Why is it important?

For this to be possible user needs to initiate upgrade using API and provide sourceURI or Kibana needs to be upgraded from stable to SNAPSHOT before agent, so this is not a very common scenario but we're not blocking it.

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.

cc @EricDavisX

@michalpristas michalpristas added review needs_backport PR is waiting to be backported to other branches. Team:Ingest Management Ingest Management:beta2 Group issues for ingest management beta2 labels Oct 19, 2020
@michalpristas michalpristas self-assigned this Oct 19, 2020
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Oct 19, 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 19, 2020
@elasticmachine
Copy link
Collaborator

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

💚 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

Expand to view the summary

Build stats

  • Build Cause: [Pull request #21951 updated]

  • Start Time: 2020-10-19T12:38:40.007+0000

  • Duration: 36 min 17 sec

Test stats 🧪

Test Results
Failed 0
Passed 1394
Skipped 4
Total 1398

blakerouse
blakerouse reviewed Oct 19, 2020
View reviewed changes
Copy link
Contributor

@blakerouse blakerouse left a comment

Choose a reason for hiding this comment

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

Confused on this? Does this mean we always check SNAPSHOT first? Does that mean that on an upgrade request if there is a newer SNAPSHOT it will be downloaded over a released version?

@michalpristas
Copy link
Contributor Author

michalpristas commented Oct 19, 2020 •
edited
Loading

@blakerouse should not as snapshot versions has -SNAPSHOT suffix
we have it commented out as we're not mixing agent-beats versions, they are always equal so there's not point to check snapshot repo if it is not a snapshot agent. also it spares cycles spent on computing URI and performing 4xx call to snapshot repo

blakerouse
blakerouse approved these changes Oct 19, 2020
View reviewed changes
Copy link
Contributor

@blakerouse blakerouse left a comment

Choose a reason for hiding this comment

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

Okay so your saying that the version string must included -SNAPSHOT at the end. In that case this looks good.

@michalpristas michalpristas merged commit e7fd212 into elastic:master Oct 20, 2020
michalpristas added a commit to michalpristas/beats that referenced this pull request Oct 20, 2020
@michalpristas
[Ingest Manager] Always try snapshot repo for agent upgrade (elastic#…
1cdfa21 
…21951)

[Ingest Manager] Always try snapshot repo for agent upgrade (elastic#21951)
michalpristas added a commit to michalpristas/beats that referenced this pull request Oct 20, 2020
@michalpristas
[Ingest Manager] Always try snapshot repo for agent upgrade (elastic#…
ff0e7c9 
…21951)

[Ingest Manager] Always try snapshot repo for agent upgrade (elastic#21951)
This was referenced Oct 20, 2020
Merged
Merged
michalpristas added a commit that referenced this pull request Oct 21, 2020
@michalpristas
[Ingest Manager] Always try snapshot repo for agent upgrade (#21951) (#…
8532820 
…22010)

[Ingest Manager] Always try snapshot repo for agent upgrade (#21951)
michalpristas added a commit that referenced this pull request Oct 21, 2020
@michalpristas
[Ingest Manager] Always try snapshot repo for agent upgrade (#21951) (#…
66172ad 
…22011)

[Ingest Manager] Always try snapshot repo for agent upgrade (#21951)
v1v added a commit to v1v/beats that referenced this pull request Oct 21, 2020
@v1v
Merge remote-tracking branch 'upstream/master' into feature/windows-10
91e9d54 
* upstream/master:
  feat: package aliases for snapshots (elastic#21960)
  [DOC] Add firewall as possible troubleshooting issue (elastic#21743)
  [Filebeat] Add max_number_of_messages config parameter for S3 input (elastic#21993)
  [Elastic Agent] Fix missing elastic_agent event data  (elastic#21994)
  Document auditbeat system process module config (elastic#21766)
  Update links (elastic#22012)
  dynamically find librpm (elastic#21936)
  Fix Istio docs (elastic#22019)
  [beats-tester][packaging] store packages in another location (elastic#21903)
  [Kubernetes] Remove redundant dockersock volume mount (elastic#22009)
  [Ingest Manager] Always try snapshot repo for agent upgrade (elastic#21951)
  Azure storage metricset values not inside the metricset name (elastic#21845)
  fix diskio and memory bugs under windows (elastic#21992)
  Fix TestDockerStart flaky test (elastic#21681)
  filebeat: add SSL options to checkpoint module (elastic#19560)
  Stop storing stateless kubernetes keystores (elastic#21880)
  [Elastic Agent] Fix named pipe communication on Windows 7 (elastic#21931)
  [Elastic Agent] Fix index for Agent monitoring to to elastic_agent. (elastic#21932)
v1v added a commit to v1v/beats that referenced this pull request Oct 22, 2020
@v1v
Merge remote-tracking branch 'upstream/master' into feature/windows-2008
2080cc2 
* upstream/master: (27 commits)
  chore: use ubuntu 18 as linux agent (elastic#22084)
  docs: Prepare Changelog for 7.9.3 (elastic#22073) (elastic#22075)
  docs: Prepare Changelog for 6.8.13 (elastic#22072) (elastic#22079)
  [build][packaging] Add resilience when docker build (elastic#22050)
  Fix the url of reviewdog (elastic#21981)
  revert WSS process reporting for windows (elastic#22055)
  Fix typo (elastic#19585) (elastic#22061)
  [Ingest Manager] Use ML_SYSTEM to detect if agent is running as a service (elastic#21884)
  Prevent log input from sending duplicate messages due to file renaming (elastic#21911)
  feat: package aliases for snapshots (elastic#21960)
  [DOC] Add firewall as possible troubleshooting issue (elastic#21743)
  [Filebeat] Add max_number_of_messages config parameter for S3 input (elastic#21993)
  [Elastic Agent] Fix missing elastic_agent event data  (elastic#21994)
  Document auditbeat system process module config (elastic#21766)
  Update links (elastic#22012)
  dynamically find librpm (elastic#21936)
  Fix Istio docs (elastic#22019)
  [beats-tester][packaging] store packages in another location (elastic#21903)
  [Kubernetes] Remove redundant dockersock volume mount (elastic#22009)
  [Ingest Manager] Always try snapshot repo for agent upgrade (elastic#21951)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@blakerouse blakerouse blakerouse approved these changes

Assignees

@michalpristas michalpristas

Labels
Ingest Management:beta2 Group issues for ingest management beta2 needs_backport PR is waiting to be backported to other branches. review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@michalpristas @elasticmachine @blakerouse