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

Add autodiscover for kubernetes #6055

Merged
merged 4 commits into from
Jan 12, 2018
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Fixing failed Indexers UT
vjsamuel committed Jan 12, 2018
commit 012f5a247d6f6411b33aad1063026939eed1c95a
2 changes: 1 addition & 1 deletion libbeat/processors/add_kubernetes_metadata/indexers.go
Original file line number Diff line number Diff line change
@@ -142,7 +142,7 @@ func NewContainerIndexer(_ common.Config, metaGen kubernetes.MetaGenerator) (Ind
func (c *ContainerIndexer) GetMetadata(pod *kubernetes.Pod) []MetadataIndex {
var metadata []MetadataIndex
for _, status := range append(pod.Status.ContainerStatuses, pod.Status.InitContainerStatuses...) {
cID := status.ContainerID
cID := status.GetContainerID()
if cID == "" {
continue
}
16 changes: 14 additions & 2 deletions libbeat/processors/add_kubernetes_metadata/indexers_test.go
Original file line number Diff line number Diff line change
@@ -28,7 +28,9 @@ func TestPodIndexer(t *testing.T) {
"labelkey": "labelvalue",
},
},
Spec: kubernetes.PodSpec{},
Spec: kubernetes.PodSpec{
NodeName: "testnode",
},
}

indexers := podIndexer.GetMetadata(&pod)
@@ -43,6 +45,9 @@ func TestPodIndexer(t *testing.T) {
"labels": common.MapStr{
"labelkey": "labelvalue",
},
"node": common.MapStr{
"name": "testnode",
},
}

assert.Equal(t, expected.String(), indexers[0].Data.String())
@@ -89,8 +94,11 @@ func TestContainerIndexer(t *testing.T) {
"labels": common.MapStr{
"labelkey": "labelvalue",
},
"node": common.MapStr{
"name": "testnode",
},
}

pod.Spec.NodeName = "testnode"
pod.Status.ContainerStatuses = []kubernetes.PodContainerStatus{
{
Name: container,
@@ -282,6 +290,9 @@ func TestIpPortIndexer(t *testing.T) {
"labels": common.MapStr{
"labelkey": "labelvalue",
},
"node": common.MapStr{
"name": "testnode",
},
}

pod.Spec.Containers = []kubernetes.Container{
@@ -295,6 +306,7 @@ func TestIpPortIndexer(t *testing.T) {
},
},
}
pod.Spec.NodeName = "testnode"

indexers = ipIndexer.GetMetadata(&pod)
assert.Equal(t, 2, len(indexers))