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

Use DefaultMetaGeneratorConfig in MetadataEnrichers to initialize configurations #13414

Merged
merged 2 commits into from
Aug 30, 2019
Merged

Use DefaultMetaGeneratorConfig in MetadataEnrichers to initialize configurations #13414

merged 2 commits into from
Aug 30, 2019

Conversation

ChrsMark
Copy link
Member

@ChrsMark ChrsMark commented Aug 29, 2019 •
edited
Loading

@ChrsMark ChrsMark requested a review from a team as a code owner August 29, 2019 15:29
jsoriano
jsoriano reviewed Aug 29, 2019
View reviewed changes
Copy link
Member

@jsoriano jsoriano left a comment

Choose a reason for hiding this comment

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

Thanks for working on this, looks mostly good to me, I have added some suggestions, and please also add a changelog entry.

libbeat/common/kubernetes/metadata.go Show resolved Hide resolved
libbeat/common/kubernetes/metadata.go Show resolved Hide resolved
@jsoriano jsoriano requested a review from kaiyan-sheng August 29, 2019 16:08
@ChrsMark ChrsMark force-pushed the fix_k8s_dedot branch 3 times, most recently from 1873774 to 02ca266 Compare August 30, 2019 07:48
@ChrsMark
Copy link
Member Author

@jsoriano thanks for reviewing!
Comments have been addressed and I also manually tested to confirm:

apiVersion: v1
kind: Pod
metadata:
  name: memory-demo
  namespace: kube-system
  labels:
    environment: production
    app: nginx
    app.kubernetes.io/name: botelastic
spec:
  containers:
  - name: detodedpod
    image: nginx

Screenshot 2019-08-30 at 10 41 12

Seems to be working as expected.

jsoriano
jsoriano reviewed Aug 30, 2019
View reviewed changes
Copy link
Member

@jsoriano jsoriano left a comment

Choose a reason for hiding this comment

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

Code LGTM, let's wait to see why container._module appears in fields.

@jsoriano jsoriano mentioned this pull request Aug 30, 2019
Closed
jsoriano
jsoriano approved these changes Aug 30, 2019
View reviewed changes
Copy link
Member

@jsoriano jsoriano left a comment

Choose a reason for hiding this comment

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

Approving, I think this will be fine after #13433

@zube zube bot removed the [zube]: Inbox label Aug 30, 2019
@jsoriano jsoriano added needs_backport PR is waiting to be backported to other branches. v7.4.0 labels Aug 30, 2019
@ChrsMark
Use DefaultMetaGeneratorConfig in MetadataEnrichers to initialize con…
bb648a2 
…figurations

Signed-off-by: chrismark <chrismarkou92@gmail.com>
@ChrsMark
Add changelog entry
2c29c1d 
Signed-off-by: chrismark <chrismarkou92@gmail.com>
@ChrsMark
Copy link
Member Author

Code LGTM, let's wait to see why container._module appears in fields.

After rebasing on top of #13433 it works fine!
Screenshot 2019-08-30 at 16 09 58

@ChrsMark ChrsMark added the test-plan Add this PR to be manual test plan label Aug 30, 2019
@ChrsMark
Copy link
Member Author

Failing Jenkins test seems irrelevant. I'm gonna merge this since Travis went green.

@ChrsMark ChrsMark merged commit abec6ba into elastic:master Aug 30, 2019
ChrsMark added a commit to ChrsMark/beats that referenced this pull request Aug 30, 2019
@ChrsMark
Use DefaultMetaGeneratorConfig in MetadataEnrichers to initialize con…
27f2528 
…figurations (elastic#13414)

(cherry picked from commit abec6ba)
@ChrsMark ChrsMark mentioned this pull request Aug 30, 2019
Closed
ChrsMark added a commit to ChrsMark/beats that referenced this pull request Aug 30, 2019
@ChrsMark
Use DefaultMetaGeneratorConfig in MetadataEnrichers to initialize con…
5144d88 
…figurations (elastic#13414)

(cherry picked from commit abec6ba)
@ChrsMark ChrsMark mentioned this pull request Aug 30, 2019
Merged
@jsoriano jsoriano removed the needs_backport PR is waiting to be backported to other branches. label Aug 30, 2019
ChrsMark added a commit that referenced this pull request Aug 30, 2019
@ChrsMark
Cherry-pick #13446 to 7.4
070e887 
* Use DefaultMetaGeneratorConfig in MetadataEnrichers to initialize configurations (#13414)

(cherry picked from commit abec6ba)
@urso urso added the v7.5.0 label Oct 22, 2019
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
@ChrsMark
Cherry-pick elastic#13446 to 7.4
85441f8 
* Use DefaultMetaGeneratorConfig in MetadataEnrichers to initialize configurations (elastic#13414)

(cherry picked from commit cf48299)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kaiyan-sheng kaiyan-sheng kaiyan-sheng approved these changes

@jsoriano jsoriano jsoriano approved these changes

Assignees

@ChrsMark ChrsMark

Labels
bug Metricbeat Metricbeat module review Team:Integrations Label for the Integrations team test-plan Add this PR to be manual test plan v7.4.0 v7.5.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Dedotting by default is not working on metricbeat Kubernetes module
5 participants
@ChrsMark @jsoriano @kaiyan-sheng @urso @andresrc