Cherry-pick #14329 to 7.4: [Metricbeat]Kubernetes: add nil check for kubernetes parent object check #14469

odacremolbap · 2019-11-11T19:49:34Z

Cherry-pick of PR #14329 to 7.4 branch. Original message:

Any object using libbeat's common/kubernetes.metagenerator.ResourceMetadata method will try to grab its parent(s) object(s).

If an object has no parent, ref.Controller (pointer to bool) will be nil which is making metricbeat panic in such cases.

beats/libbeat/common/kubernetes/metadata.go

Lines 112 to 122 in 2a526ac

    
           for _, ref := range accessor.GetOwnerReferences() { 
        
           	if *ref.Controller { 
        
           		switch ref.Kind { 
        
           		// TODO grow this list as we keep adding more `state_*` metricsets 
        
           		case "Deployment", 
        
           			"ReplicaSet", 
        
           			"StatefulSet": 
        
           			safemapstr.Put(meta, strings.ToLower(ref.Kind)+".name", ref.Name) 
        
           		} 
        
           	} 
        
           }

This PR adds a single liner to make sure the reference is not nil.

Fixes #14320
Related https://discuss.elastic.co/t/metricbeat-7-4-kubernetes-crash-on-startup/205479

…eck (elastic#14329) add nil check for kubernetes parent object (cherry picked from commit d7d2c17)

odacremolbap · 2019-11-12T08:34:12Z

CI issues are unrelated

…ck for kubernetes parent object check (elastic#14469) * [Metricbeat]Kubernetes: add nil check for kubernetes parent object check (elastic#14329)

[Metricbeat]Kubernetes: add nil check for kubernetes parent object ch…

9c7b6f2

…eck (elastic#14329) add nil check for kubernetes parent object (cherry picked from commit d7d2c17)

odacremolbap added backport review labels Nov 11, 2019

removed non backported entries from changelog

2122496

odacremolbap added the Team:Integrations Label for the Integrations team label Nov 12, 2019

andresrc added the [zube]: In Review label Nov 12, 2019

exekias approved these changes Nov 12, 2019

View reviewed changes

odacremolbap merged commit 123214c into elastic:7.4 Nov 12, 2019

odacremolbap deleted the backport_14329_7.4 branch November 12, 2019 09:43

zube bot added [zube]: Done and removed [zube]: In Review labels Nov 12, 2019

andresrc removed the [zube]: Done label Nov 12, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Cherry-pick #14329 to 7.4: [Metricbeat]Kubernetes: add nil check for kubernetes parent object check #14469

Cherry-pick #14329 to 7.4: [Metricbeat]Kubernetes: add nil check for kubernetes parent object check #14469

odacremolbap commented Nov 11, 2019 •

edited by andresrc

Loading

odacremolbap commented Nov 12, 2019

	for _, ref := range accessor.GetOwnerReferences() {
	if *ref.Controller {
	switch ref.Kind {
	// TODO grow this list as we keep adding more `state_*` metricsets
	case "Deployment",
	"ReplicaSet",
	"StatefulSet":
	safemapstr.Put(meta, strings.ToLower(ref.Kind)+".name", ref.Name)
	}
	}
	}

Cherry-pick #14329 to 7.4: [Metricbeat]Kubernetes: add nil check for kubernetes parent object check #14469

Cherry-pick #14329 to 7.4: [Metricbeat]Kubernetes: add nil check for kubernetes parent object check #14469

Conversation

odacremolbap commented Nov 11, 2019 • edited by andresrc Loading

odacremolbap commented Nov 12, 2019

odacremolbap commented Nov 11, 2019 •

edited by andresrc

Loading