jsoriano
diff --git a/‎libbeat/autodiscover/providers/kubernetes/pod.go‎
Lines changed: 11 additions & 8 deletions b/‎libbeat/autodiscover/providers/kubernetes/pod.go‎
Lines changed: 11 additions & 8 deletions
@@ -284,6 +284,7 @@ func (p *pod) emitEvents(pod *kubernetes.Pod, flag string, containers []kubernet
 	var (
 		annotations = common.MapStr{}
 		nsAnn       = common.MapStr{}
+		events      = make([]bus.Event, 0)
 	)
 	for k, v := range pod.GetObjectMeta().GetAnnotations() {
 		safemapstr.Put(annotations, k, v)
@@ -299,7 +300,6 @@ func (p *pod) emitEvents(pod *kubernetes.Pod, flag string, containers []kubernet
 		}
 	}
 
-	emitted := 0
 	// Emit container and port information
 	for _, c := range containers {
 		// If it doesn't have an ID, container doesn't exist in
@@ -345,8 +345,7 @@ func (p *pod) emitEvents(pod *kubernetes.Pod, flag string, containers []kubernet
 					"kubernetes": meta,
 				},
 			}
-			p.publish(event)
-			emitted++
+			events = append(events, event)
 		}
 
 		for _, port := range c.Ports {
@@ -361,16 +360,16 @@ func (p *pod) emitEvents(pod *kubernetes.Pod, flag string, containers []kubernet
 					"kubernetes": meta,
 				},
 			}
-			p.publish(event)
-			emitted++
+			events = append(events, event)
 		}
 	}
 
-	// Finally publish a pod level event so that hints that have no exposed ports can get processed.
+	// Publish a pod level event so that hints that have no exposed ports can get processed.
 	// Log hints would just ignore this event as there is no ${data.container.id}
-	// Publish the pod level hint only if atleast one container level hint was emitted. This ensures that there is
+	// Publish the pod level hint only if at least one container level hint was generated. This ensures that there is
 	// no unnecessary pod level events emitted prematurely.
-	if emitted != 0 {
+	// We publish the pod level hint first so that it doesn't override a valid container level event.
+	if len(events) != 0 {
 		meta := p.metagen.Generate(pod)
 
 		// Information that can be used in discovering a workload
@@ -392,6 +391,10 @@ func (p *pod) emitEvents(pod *kubernetes.Pod, flag string, containers []kubernet
 			},
 		}
 		p.publish(event)
+	}
 
+	// Publish the container level hints finally.
+	for _, event := range events {
+		p.publish(event)
 	}
 }
Original file line number	Diff line number	Diff line change
`@@ -284,6 +284,7 @@ func (p pod) emitEvents(pod kubernetes.Pod, flag string, containers []kubernet`
`284`	`284`	`var (`
`285`	`285`	`annotations = common.MapStr{}`
`286`	`286`	`nsAnn = common.MapStr{}`
	`287`	`+ events = make([]bus.Event, 0)`
`287`	`288`	`)`
`288`	`289`	`for k, v := range pod.GetObjectMeta().GetAnnotations() {`
`289`	`290`	`safemapstr.Put(annotations, k, v)`
`@@ -299,7 +300,6 @@ func (p pod) emitEvents(pod kubernetes.Pod, flag string, containers []kubernet`
`299`	`300`	`}`
`300`	`301`	`}`
`301`	`302`
`302`		`- emitted := 0`
`303`	`303`	`// Emit container and port information`
`304`	`304`	`for _, c := range containers {`
`305`	`305`	`// If it doesn't have an ID, container doesn't exist in`
`@@ -345,8 +345,7 @@ func (p pod) emitEvents(pod kubernetes.Pod, flag string, containers []kubernet`
`345`	`345`	`"kubernetes": meta,`
`346`	`346`	`},`
`347`	`347`	`}`
`348`		`- p.publish(event)`
`349`		`- emitted++`
	`348`	`+ events = append(events, event)`
`350`	`349`	`}`
`351`	`350`
`352`	`351`	`for _, port := range c.Ports {`
`@@ -361,16 +360,16 @@ func (p pod) emitEvents(pod kubernetes.Pod, flag string, containers []kubernet`
`361`	`360`	`"kubernetes": meta,`
`362`	`361`	`},`
`363`	`362`	`}`
`364`		`- p.publish(event)`
`365`		`- emitted++`
	`363`	`+ events = append(events, event)`
`366`	`364`	`}`
`367`	`365`	`}`
`368`	`366`
`369`		`- // Finally publish a pod level event so that hints that have no exposed ports can get processed.`
	`367`	`+ // Publish a pod level event so that hints that have no exposed ports can get processed.`
`370`	`368`	`// Log hints would just ignore this event as there is no ${data.container.id}`
`371`		`- // Publish the pod level hint only if atleast one container level hint was emitted. This ensures that there is`
	`369`	`+ // Publish the pod level hint only if at least one container level hint was generated. This ensures that there is`
`372`	`370`	`// no unnecessary pod level events emitted prematurely.`
`373`		`- if emitted != 0 {`
	`371`	`+ // We publish the pod level hint first so that it doesn't override a valid container level event.`
	`372`	`+ if len(events) != 0 {`
`374`	`373`	`meta := p.metagen.Generate(pod)`
`375`	`374`
`376`	`375`	`// Information that can be used in discovering a workload`
`@@ -392,6 +391,10 @@ func (p pod) emitEvents(pod kubernetes.Pod, flag string, containers []kubernet`
`392`	`391`	`},`
`393`	`392`	`}`
`394`	`393`	`p.publish(event)`
	`394`	`+ }`
`395`	`395`
	`396`	`+ // Publish the container level hints finally.`
	`397`	`+ for _, event := range events {`
	`398`	`+ p.publish(event)`
`396`	`399`	`}`
`397`	`400`	`}`