Skip to content

Add daemonset name in pods controlled by DaemonSets#26808

Merged
MichaelKatsoulis merged 2 commits intoelastic:masterfrom
MichaelKatsoulis:add-daemonset-name-as-pod-controller
Jul 9, 2021
Merged

Add daemonset name in pods controlled by DaemonSets#26808
MichaelKatsoulis merged 2 commits intoelastic:masterfrom
MichaelKatsoulis:add-daemonset-name-as-pod-controller

Conversation

@MichaelKatsoulis
Copy link
Copy Markdown
Contributor

@MichaelKatsoulis MichaelKatsoulis commented Jul 9, 2021 •
edited
Loading

What does this PR do?

This PR adds kubernetes.daemonset.name in Pods' metadata.

Why is it important?

It enriches the documents of pods belonging to DaemonSets with the DaemonSet name.

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.

How to test this PR locally

  1. Deploy a sample DaemonSet on k8s: kubectl apply -f https://k8s.io/examples/controllers/daemonset.yaml
  2. Deploy Metricbeat (instructions) on k8s and verify that events shipped by pod and state_pod metricset include kubernetes.daemonset.name . As an example see screenshots below.

Related issues

Screenshots

Screenshot 2021-07-09 at 1 31 55 PM

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jul 9, 2021
@MichaelKatsoulis MichaelKatsoulis requested a review from ChrsMark July 9, 2021 10:34
@MichaelKatsoulis MichaelKatsoulis added backport-v7.15.0 Automated backport with mergify Team:Integrations Label for the Integrations team labels Jul 9, 2021
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jul 9, 2021
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Jul 9, 2021

Pinging @elastic/integrations (Team:Integrations)

@ChrsMark ChrsMark mentioned this pull request Jul 9, 2021
Closed
ChrsMark
ChrsMark approved these changes Jul 9, 2021
View reviewed changes
Copy link
Copy Markdown
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. It will need a changelog. Also since merging this will close the respective issue please make sure we follow up properly with a new issue about the workload fields (I left a comment there too).

@MichaelKatsoulis MichaelKatsoulis changed the title Add daemonset name in pods controller by DaemonSets Add daemonset name in pods controlled by DaemonSets Jul 9, 2021
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Jul 9, 2021 •
edited by jenkins-beats-ci bot
Loading

💚 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 preview

Expand to view the summary

Build stats

  • Start Time: 2021-07-09T11:14:19.457+0000

  • Duration: 136 min 24 sec

  • Commit: 4a74ab6

Test stats 🧪

Test Results
Failed 0
Passed 49189
Skipped 5395
Total 54584

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 49189
Skipped 5395
Total 54584

@MichaelKatsoulis MichaelKatsoulis merged commit 4933aef into elastic:master Jul 9, 2021
mergify bot pushed a commit that referenced this pull request Jul 9, 2021
@MichaelKatsoulis
Add daemonset name in pods controlled by DaemonSets (#26808)
be6870d 
* Add daemonset name in pods controller by DaemonSets

(cherry picked from commit 4933aef)
@mergify mergify bot mentioned this pull request Jul 9, 2021
Merged
MichaelKatsoulis added a commit that referenced this pull request Jul 12, 2021
@mergify @MichaelKatsoulis
Add daemonset name in pods controlled by DaemonSets (#26808) (#26822)
e65ecce 
* Add daemonset name in pods controller by DaemonSets

(cherry picked from commit 4933aef)

Co-authored-by: Michael Katsoulis <michaelkatsoulis88@gmail.com>
@ChrsMark ChrsMark mentioned this pull request Jul 20, 2021
Merged
@MichaelKatsoulis MichaelKatsoulis mentioned this pull request Aug 9, 2021
Merged
@wilsonge wilsonge mentioned this pull request Nov 14, 2021
Merged
6 tasks
@tetianakravchenko tetianakravchenko mentioned this pull request Jan 4, 2022
Merged
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jsoriano jsoriano jsoriano approved these changes

@ChrsMark ChrsMark ChrsMark approved these changes

Assignees

No one assigned

Labels

backport-v7.15.0 Automated backport with mergify enhancement Team:Integrations Label for the Integrations team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Add daemonset name when enriching pod logs or metrics

4 participants

@MichaelKatsoulis @elasticmachine @jsoriano @ChrsMark