Skip to content

Cherry-pick #21616 to 7.x: Prevent reporting ecs version twice #21969

Merged
michalpristas merged 1 commit intoelastic:7.xfrom
michalpristas:backport_21616_7.x
Oct 21, 2020
Merged

Cherry-pick #21616 to 7.x: Prevent reporting ecs version twice #21969
michalpristas merged 1 commit intoelastic:7.xfrom
michalpristas:backport_21616_7.x

Conversation

@michalpristas
Copy link
Copy Markdown
Contributor

@michalpristas michalpristas commented Oct 19, 2020 •
edited
Loading

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

What does this PR do?

Fixes: #20666

Due to this, we get two ecs.versions in a resulting event.

e.g

...

        "ecs": {
            "version": "1.6.0"
        },
        "ecs.version": "1.5.0",
        "event": {
            "dataset": "elastic.agent.metricbeat"
        },
...

Funny thing is also that it might differ in version as in the example above. But this may be just due to different builds of agent and beat locally.

Why is it important?

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.

@michalpristas
[Ingest Manager] Prevent reporting ecs version twice (elastic#21616)
0f77360 
[Ingest Manager] Prevent reporting ecs version twice (elastic#21616)
@michalpristas michalpristas self-assigned this Oct 19, 2020
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Oct 19, 2020

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

elasticmachine commented Oct 19, 2020

💚 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 #21969 opened]

  • Start Time: 2020-10-19T12:16:08.769+0000

  • Duration: 37 min 24 sec

Test stats 🧪

Test Results
Failed 0
Passed 1394
Skipped 4
Total 1398

blakerouse
blakerouse approved these changes Oct 21, 2020
View reviewed changes
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 77e4432 into elastic:7.x Oct 21, 2020
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

backport bug review

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@michalpristas @elasticmachine @blakerouse