Add deployment name in pod's meta#23610
Merged
ChrsMark merged 5 commits intoelastic:masterfrom Jan 27, 2021
Merged
Conversation
Signed-off-by: chrismark <chrismarkou92@gmail.com>
Contributor
|
Pinging @elastic/integrations (Team:Integrations) |
Contributor
💔 Build Failed
Expand to view the summary
Build stats
Test stats 🧪
Steps errors
Expand to view the steps failures
|
| Test | Results |
|---|---|
| Failed | 0 |
| Passed | 44470 |
| Skipped | 4612 |
| Total | 49082 |
Signed-off-by: chrismark <chrismarkou92@gmail.com>
Signed-off-by: chrismark <chrismarkou92@gmail.com>
jsoriano
reviewed
Jan 26, 2021
Member
jsoriano
left a comment
There was a problem hiding this comment.
I am ok with following with this approach, but we have to take into account that add_kubernetes_metadata won't add the deployment name, we have to think if this is something we have to support, but we can do it as a separate issue.
Comment on lines
+66
to
+67
| if rsName != nil { | ||
| rsName := rsName.(string) |
Member
There was a problem hiding this comment.
Nit. Make it slightly safer in case rsName is not a string.
Suggested change
| if rsName != nil { | |
| rsName := rsName.(string) | |
| if rsName, ok := rsName.(string); ok { |
| }, | ||
| } | ||
|
|
||
| _, err := client.AppsV1().ReplicaSets(namespace).Create(context.TODO(), rs, metav1.CreateOptions{}) |
Member
There was a problem hiding this comment.
Nit. In tests it is ok to use context.Background() 🙂
Suggested change
| _, err := client.AppsV1().ReplicaSets(namespace).Create(context.TODO(), rs, metav1.CreateOptions{}) | |
| _, err := client.AppsV1().ReplicaSets(namespace).Create(context.Background(), rs, metav1.CreateOptions{}) |
Signed-off-by: chrismark <chrismarkou92@gmail.com>
Contributor
|
the CI failure is unrelated to the PR, were taking a look |
Member
Author
|
Thanks for looking into this @kuisathaverat, I'm gonna merge this one. |
ChrsMark
added a commit
to ChrsMark/beats
that referenced
this pull request
Jan 27, 2021
(cherry picked from commit 2d7e7b4)
ChrsMark
added a commit
that referenced
this pull request
Jan 27, 2021
This was referenced Jan 27, 2021
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
This PR adds
kubernetes.deployment.namein Pods' metadata. Right now we only addkubernetes.replicaset.namewhen a Pod is handled by a Deployment since a Deployment controls the Pod through a ReplicaSet and the ReplicaSet is considered as the direct owner of the Pod in k8s API. In this we need an extra step check to retrieve the owner of the ReplicaSet if possible.NOTE: Since with this addition Beats will try to get replicaset objects from k8s API the following addition in the clusterrole is required:
See: #23716
Why is it important?
So as to correlate Pods with Deployments controlling them.
How to test this PR locally
kubectl apply -f https://k8s.io/examples/controllers/nginx-deployment.yamlpodandstate_podmetricset includekubernetes.deployment.namewhenkubernetes.replicaset.nameexists. As an example see screenshots below.Extra: Verify that
add_kubernetes_metadataaddskubernetes.deployment.namewhenkubernetes.replicaset.nameexists, using the following configuration with Filebeat on k8s:Related issues
Screenshots