Skip to content

Cherry-pick #21285 to 7.x: Send snapshot flag together with metadata #21460

Merged
michalpristas merged 1 commit intoelastic:7.xfrom
michalpristas:backport_21285_7.x
Oct 5, 2020
Merged

Cherry-pick #21285 to 7.x: Send snapshot flag together with metadata #21460
michalpristas merged 1 commit intoelastic:7.xfrom
michalpristas:backport_21285_7.x

Conversation

@michalpristas
Copy link
Copy Markdown
Contributor

Cherry-pick of PR #21285 to 7.x branch. Original message:

What does this PR do?

For correct Source URI resolution fleet needs to be aware whether or not agent is a SNAPSHOT build or not.
This PR includes this information in two forms in local metadata which is sent during enroll and checkin

  • elastic.agent.snapshot - additional field set to true if agent is in snapshot mode
  • elastic.agent.build.original - long version info, in case of snapshot it will contain it e.g.8.0.0-SNAPSHOT (build: 3f1e3a5d016487f4cc995b019a846f3f13104f03 at 2020-09-24 08:57:34 +0000 UTC)

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.

…1285)

[Ingest Manager] Send snapshot flag together with metadata (elastic#21285)
@elasticmachine
Copy link
Copy Markdown
Contributor

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

@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 2, 2020
@elasticmachine
Copy link
Copy Markdown
Contributor

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #21460 opened]

  • Start Time: 2020-10-02T08:09:54.541+0000

  • Duration: 35 min 28 sec

Test stats 🧪

Test Results
Failed 0
Passed 1390
Skipped 4
Total 1394

Copy link
Copy Markdown
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.

Backport looks good.

@michalpristas michalpristas merged commit b0471ca into elastic:7.x Oct 5, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Ingest Management:beta2 Group issues for ingest management beta2 review

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants