Skip to content

Cherry-pick #18818 to 7.8: Use indexers and matchers in config when defaults are enabled#18857

Merged
jsoriano merged 1 commit intoelastic:7.8from
jsoriano:backport_18818_7.8
Jun 2, 2020
Merged

Cherry-pick #18818 to 7.8: Use indexers and matchers in config when defaults are enabled#18857
jsoriano merged 1 commit intoelastic:7.8from
jsoriano:backport_18818_7.8

Conversation

@jsoriano
Copy link
Copy Markdown
Member

Cherry-pick of PR #18818 to 7.8 branch. Original message:

Before 7.7.0, indexers and matchers defined in add_kubernetes_metadata
configuration were used even when defaults were not disabled. Revert to
this behaviour and add tests to avoid changing it unexpectedly in the
future.

Reverts part of #16979, fixes #18481.

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label May 29, 2020
…c#18818)

Before 7.7.0, indexers and matchers defined in `add_kubernetes_metadata`
configuration were used even when defaults were not disabled. Revert to
this behaviour and add tests to avoid changing it unexpectedly in the
future.

(cherry picked from commit 600998b)

Co-authored-by: Chris Mark <chrismarkou92@gmail.com>
@jsoriano jsoriano force-pushed the backport_18818_7.8 branch from 11f48b8 to 13b1985 Compare May 29, 2020 15:12
@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 #18857 opened]

  • Start Time: 2020-05-29T15:12:42.676+0000

  • Duration: 78 min 38 sec

Test stats 🧪

Test Results
Failed 0
Passed 6612
Skipped 1053
Total 7665

Steps errors

Expand to view the steps failures

  • Name: Report to Codecov
    • Description: curl -sSLo codecov https://codecov.io/bash for i in auditbeat filebeat heartbeat libbeat metricbeat packetbeat winlogbeat journalbeat do FILE="${i}/build/coverage/full.cov" if [ -f "${FILE}" ]; then bash codecov -f "${FILE}" fi done

    • Duration: 2 min 22 sec

    • Start Time: 2020-05-29T15:40:49.091+0000

    • log

@andresrc andresrc added the Team:Integrations Label for the Integrations team label Jun 1, 2020
@elasticmachine
Copy link
Copy Markdown
Contributor

Pinging @elastic/integrations (Team:Integrations)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jun 1, 2020
@jsoriano jsoriano merged commit 2c8f314 into elastic:7.8 Jun 2, 2020
@jsoriano jsoriano deleted the backport_18818_7.8 branch June 2, 2020 11:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport review Team:Integrations Label for the Integrations team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants