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.

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

Use indexers and matchers in config when defaults are enabled #18818

Merged
merged 3 commits into from
May 29, 2020

Conversation

jsoriano
Copy link
Member

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.

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.
@jsoriano jsoriano added bug review needs_backport PR is waiting to be backported to other branches. [zube]: In Review Team:Platforms Label for the Integrations - Platforms team v7.8.0 v7.7.2 labels May 28, 2020
@jsoriano jsoriano self-assigned this May 28, 2020
@elasticmachine
Copy link
Collaborator

Pinging @elastic/integrations-platforms (Team:Platforms)

@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 May 28, 2020
@elasticmachine
Copy link
Collaborator

elasticmachine commented May 28, 2020

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #18818 updated]

  • Start Time: 2020-05-29T13:34:28.638+0000

  • Duration: 76 min 11 sec

Test stats 🧪

Test Results
Failed 0
Passed 9259
Skipped 1542
Total 10801

Steps errors

Expand to view the steps failures

  • Name: Install Go 1.13.10

    • Description: .ci/scripts/install-go.sh

    • Duration: 3 min 52 sec

    • Start Time: 2020-05-29T13:56:46.104+0000

    • log

  • Name: Install Go 1.13.10

    • Description: .ci/scripts/install-go.sh

    • Duration: 2 min 22 sec

    • Start Time: 2020-05-29T13:57:01.074+0000

    • log

  • Name: Install Go 1.13.10

    • Description: .ci/scripts/install-go.sh

    • Duration: 2 min 22 sec

    • Start Time: 2020-05-29T13:56:59.837+0000

    • log

  • Name: Make -C generator/_templates/beat test

    • Description: make -C generator/_templates/beat test

    • Duration: 6 min 1 sec

    • Start Time: 2020-05-29T14:42:23.893+0000

    • log

Copy link
Member

@ChrsMark ChrsMark left a comment

Choose a reason for hiding this comment

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

lgtm

libbeat/processors/add_kubernetes_metadata/kubernetes.go Outdated Show resolved Hide resolved
libbeat/processors/add_kubernetes_metadata/kubernetes.go Outdated Show resolved Hide resolved
@jsoriano jsoriano merged commit 600998b into elastic:master May 29, 2020
@jsoriano jsoriano deleted the indexers-matchers-defaults-enabled branch May 29, 2020 15:09
@jsoriano jsoriano added v7.9.0 and removed needs_backport PR is waiting to be backported to other branches. labels May 29, 2020
jsoriano added a commit to jsoriano/beats that referenced this pull request 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 <[email protected]>
jsoriano added a commit to jsoriano/beats that referenced this pull request 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 <[email protected]>
jsoriano added a commit to jsoriano/beats that referenced this pull request 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 <[email protected]>
v1v added a commit to v1v/beats that referenced this pull request Jun 2, 2020
…-stage-level

* upstream/master: (30 commits)
  Add a GRPC listener service for Agent (elastic#18827)
  Disable host.* fields by default for iptables module (elastic#18756)
  [WIP] Clarify capabilities of the Filebeat auditd module (elastic#17068)
  fix: rename file and remove extra separator (elastic#18881)
  ci: enable JJBB (elastic#18812)
  Disable host.* fields by default for Checkpoint module (elastic#18754)
  Disable host.* fields by default for Cisco module (elastic#18753)
  Update latest.yml testing env to 7.7.0 (elastic#18535)
  Upgrade k8s.io/client-go and k8s keystore tests (elastic#18817)
  Add missing Jenkins stages for Auditbeat (elastic#18835)
  [Elastic Log Driver] Create a config shim between libbeat and the user (elastic#18605)
  Use indexers and matchers in config when defaults are enabled (elastic#18818)
  Fix panic on `metricbeat test modules` (elastic#18797)
  [CI] Fix permissions in MacOSX agents (elastic#18847)
  [Ingest Manager] When not port are specified and the https is used fallback to 443 (elastic#18844)
  [Ingest Manager] Fix install service script for windows (elastic#18814)
  [Metricbeat] Fix getting compute instance metadata with partial zone/region config (elastic#18757)
  Improve error messages in s3 input (elastic#18824)
  Add memory metrics into compute googlecloud (elastic#18802)
  include bucket name when logging error (elastic#18679)
  ...
jsoriano added a commit that referenced this pull request Jun 2, 2020
#18856)

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 <[email protected]>
jsoriano added a commit that referenced this pull request Jun 2, 2020
#18857)

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 <[email protected]>
jsoriano added a commit that referenced this pull request Jun 2, 2020
#18859)

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 <[email protected]>
lucabelluccini added a commit that referenced this pull request May 24, 2021
When using the Kubernetes add metadata processor, the error `Error extracting container id - source value does not contain matcher's logs_path` might be reported in some cases.
Typical issues:
- The `logs_path` is incorrect
- We had some problems in the past (7.7.0) due to a change in behavior (#18818), which was restored in 7.7.2 onwards.
- The Kubernetes pod is crashing
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
…c#18818) (elastic#18859)

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 5c65f6d)

Co-authored-by: Chris Mark <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

How fix add_kubernetes_metadata in new version 7.7.0?
4 participants