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

Fix k8s metadata issue #16834

Merged
merged 11 commits into from
Mar 12, 2020
Merged

Fix k8s metadata issue #16834

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f2852aa
Fix labels in k8s meta
ChrsMark Mar 5, 2020
95b2e90
Merge remote-tracking branch 'upstream/master' into k8s_meta_issue
ChrsMark Mar 5, 2020
73f2367
fmt code
ChrsMark Mar 5, 2020
8acd54a
flatten namespace metadata
ChrsMark Mar 11, 2020
d138c72
fix
ChrsMark Mar 11, 2020
dd58165
Merge remote-tracking branch 'upstream/master' into k8s_meta_issue
ChrsMark Mar 11, 2020
ca3b66f
keep namesapce flattened metadata under pod
ChrsMark Mar 11, 2020
fe92073
keep namesapce flattened metadata under service
ChrsMark Mar 11, 2020
518eab5
remove WithLabels option when geting namespace for service resource
ChrsMark Mar 11, 2020
41b65d2
fmt code
ChrsMark Mar 11, 2020
7439844
add changelog
ChrsMark Mar 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions libbeat/common/kubernetes/metadata/metadata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
package metadata

import (
"strings"

"github.com/elastic/beats/v7/libbeat/common"
"github.com/elastic/beats/v7/libbeat/common/kubernetes"
"github.com/elastic/beats/v7/libbeat/common/safemapstr"
Expand All @@ -40,3 +42,11 @@ func WithFields(key string, value interface{}) FieldOptions {
safemapstr.Put(meta, key, value)
}
}

// WithLabels FieldOption allows adding labels under sub-resource(kind)
// example if kind=namespace namespace.labels key will be added
func WithLabels(kind string) FieldOptions {
return func(meta common.MapStr) {
safemapstr.Put(meta, strings.ToLower(kind)+".labels", meta["labels"])
}
}
26 changes: 17 additions & 9 deletions libbeat/common/kubernetes/metadata/namespace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,17 +60,16 @@ func (n *namespace) GenerateFromName(name string, opts ...FieldOptions) common.M
return nil
}

obj, ok, _ := n.store.GetByKey(name)
if !ok {
return nil
}
if obj, ok, _ := n.store.GetByKey(name); ok {
no, ok := obj.(*kubernetes.Namespace)
if !ok {
return nil
}

no, ok := obj.(*kubernetes.Namespace)
if !ok {
return nil
return n.Generate(no, opts...)
}

return n.Generate(no, opts...)
return nil
}

func flattenMetadata(in common.MapStr) common.MapStr {
Expand All @@ -84,7 +83,6 @@ func flattenMetadata(in common.MapStr) common.MapStr {
if !ok {
return nil
}

for k, v := range fields {
if k == "name" {
out[resource] = v
Expand All @@ -93,5 +91,15 @@ func flattenMetadata(in common.MapStr) common.MapStr {
}
}

rawLabels, err := in.GetValue("labels")
if err != nil {
return out
}
labels, ok := rawLabels.(common.MapStr)
if !ok {
return out
}
out[resource+"_labels"] = labels

return out
}
23 changes: 12 additions & 11 deletions libbeat/common/kubernetes/metadata/namespace_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,17 +58,18 @@ func TestNamespace_Generate(t *testing.T) {
},
},
// Use this for 8.0
/*output: common.MapStr{
"namespace": common.MapStr{
"name": "obj",
"uid": uid,
"labels": common.MapStr{
"foo": "bar",
/*
output: common.MapStr{
"namespace": common.MapStr{
"name": name,
"uid": uid,
"labels": common.MapStr{
"foo": "bar",
},
},
},
},*/
},*/
output: common.MapStr{
"namespace": "obj",
"namespace": name,
"namespace_uid": uid,
"namespace_labels": common.MapStr{
"foo": "bar",
Expand Down Expand Up @@ -114,15 +115,15 @@ func TestNamespace_GenerateFromName(t *testing.T) {
/*
output: common.MapStr{
"namespace": common.MapStr{
"name": "obj",
"name": name,
"uid": uid,
"labels": common.MapStr{
"foo": "bar",
},
},
},*/
output: common.MapStr{
"namespace": "obj",
jsoriano marked this conversation as resolved.
Show resolved Hide resolved
"namespace": name,
"namespace_uid": uid,
"namespace_labels": common.MapStr{
"foo": "bar",
Expand Down
12 changes: 6 additions & 6 deletions libbeat/common/kubernetes/metadata/node_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ func TestNode_Generate(t *testing.T) {
"node": common.MapStr{
"name": "obj",
"uid": uid,
"labels": common.MapStr{
"foo": "bar",
},
},
"labels": common.MapStr{
"foo": "bar",
},
},
},
Expand Down Expand Up @@ -106,9 +106,9 @@ func TestNode_GenerateFromName(t *testing.T) {
"node": common.MapStr{
"name": "obj",
"uid": uid,
"labels": common.MapStr{
"foo": "bar",
},
},
"labels": common.MapStr{
"foo": "bar",
},
},
},
Expand Down
22 changes: 1 addition & 21 deletions libbeat/common/kubernetes/metadata/pod.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,9 @@ func (p *pod) Generate(obj kubernetes.Resource, opts ...FieldOptions) common.Map
}

out := p.resource.Generate("pod", obj, opts...)
// TODO: remove this call when moving to 8.0
out = p.exportPodLabelsAndAnnotations(out)

if p.node != nil {
meta := p.node.GenerateFromName(po.Spec.NodeName)
meta := p.node.GenerateFromName(po.Spec.NodeName, WithLabels("node"))
if meta != nil {
out.Put("node", meta["node"])
} else {
Expand Down Expand Up @@ -91,21 +89,3 @@ func (p *pod) GenerateFromName(name string, opts ...FieldOptions) common.MapStr

return nil
}

func (p *pod) exportPodLabelsAndAnnotations(in common.MapStr) common.MapStr {
labels, err := in.GetValue("pod.labels")
if err != nil {
return in
}
in.Put("labels", labels)
in.Delete("pod.labels")

annotations, err := in.GetValue("pod.annotations")
if err != nil {
return in
}
in.Put("annotations", annotations)
in.Delete("pod.annotations")

return in
}
4 changes: 2 additions & 2 deletions libbeat/common/kubernetes/metadata/resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,11 @@ func (r *Resource) Generate(kind string, obj kubernetes.Resource, options ...Fie
}

if len(labelMap) != 0 {
safemapstr.Put(meta, strings.ToLower(kind)+".labels", labelMap)
safemapstr.Put(meta, "labels", labelMap)
}

if len(annotationsMap) != 0 {
safemapstr.Put(meta, strings.ToLower(kind)+".annotations", annotationsMap)
safemapstr.Put(meta, "annotations", annotationsMap)
}

for _, option := range options {
Expand Down
12 changes: 6 additions & 6 deletions libbeat/common/kubernetes/metadata/resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ func TestResource_Generate(t *testing.T) {
"pod": common.MapStr{
"name": "obj",
"uid": uid,
"labels": common.MapStr{
"foo": "bar",
},
},
"labels": common.MapStr{
"foo": "bar",
},
"namespace": "default",
},
Expand Down Expand Up @@ -99,9 +99,9 @@ func TestResource_Generate(t *testing.T) {
"pod": common.MapStr{
"name": "obj",
"uid": uid,
"labels": common.MapStr{
"foo": "bar",
},
},
"labels": common.MapStr{
"foo": "bar",
},
"namespace": "default",
"deployment": common.MapStr{
Expand Down
39 changes: 24 additions & 15 deletions libbeat/common/kubernetes/metadata/service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ func TestService_Generate(t *testing.T) {
"service": common.MapStr{
"name": "obj",
"uid": uid,
"labels": common.MapStr{
"foo": "bar",
},
},
"labels": common.MapStr{
"foo": "bar",
},
"namespace": "default",
},
Expand Down Expand Up @@ -101,9 +101,9 @@ func TestService_Generate(t *testing.T) {
"service": common.MapStr{
"name": "obj",
"uid": uid,
"labels": common.MapStr{
"foo": "bar",
},
},
"labels": common.MapStr{
"foo": "bar",
},
"namespace": "default",
"deployment": common.MapStr{
Expand Down Expand Up @@ -153,9 +153,9 @@ func TestService_GenerateFromName(t *testing.T) {
"service": common.MapStr{
"name": "obj",
"uid": uid,
"labels": common.MapStr{
"foo": "bar",
},
},
"labels": common.MapStr{
"foo": "bar",
},
"namespace": "default",
},
Expand Down Expand Up @@ -190,9 +190,9 @@ func TestService_GenerateFromName(t *testing.T) {
"service": common.MapStr{
"name": "obj",
"uid": uid,
"labels": common.MapStr{
"foo": "bar",
},
},
"labels": common.MapStr{
"foo": "bar",
},
"namespace": "default",
"deployment": common.MapStr{
Expand Down Expand Up @@ -262,10 +262,19 @@ func TestService_GenerateWithNamespace(t *testing.T) {
"service": common.MapStr{
"name": "obj",
"uid": uid,
"labels": common.MapStr{
"foo": "bar",
},
},
"labels": common.MapStr{
"foo": "bar",
},
// Use this for 8.0
/*
"namespace": common.MapStr{
"name": "default",
"uid": uid,
"labels": common.MapStr{
"nskey": "nsvalue",
},
},*/
"namespace": "default",
"namespace_uid": uid,
"namespace_labels": common.MapStr{
Expand Down