Remove container_name from Metricbeat autodiscover eventID

In Metricbeat we don't want to have different eventIDs for
containers within the same Pod, since these containers
share the same IP and handling them seperately can lead in
launching hint based modules for all of the containers.

Signed-off-by: chrismark <[email protected]>

libbeat/autodiscover/providers/kubernetes/kubernetes.go

@@ -217,7 +217,10 @@ func (p *Provider) emitEvents(pod *kubernetes.Pod, flag string, containers []kub
 
 		// This must be an id that doesn't depend on the state of the container
 		// so it works also on `stop` if containers have been already deleted.
-		eventID := fmt.Sprintf("%s.%s", pod.GetObjectMeta().GetUID(), c.Name)
+		eventID := fmt.Sprintf("%s", pod.GetObjectMeta().GetUID())
+		if p.bus.GetName() != "metricbeat" {
+			eventID = fmt.Sprintf("%s.%s", eventID, c.Name)
+		}
 
 		cmeta := common.MapStr{
 			"id":      cid,

libbeat/common/bus/bus.go

@@ -29,6 +29,9 @@ type Event common.MapStr
 
 // Bus provides a common channel to emit and listen for Events
 type Bus interface {
+	// New initializes a new bus with the given name and returns it
+	GetName() string
+
 	// Publish an event to the bus
 	Publish(Event)
 
@@ -76,6 +79,11 @@ func NewBusWithStore(name string, size int) Bus {
 	}
 }
 
+// GetName returns the name of the bus
+func (b *bus) GetName() string {
+	return b.name
+}
+
 func (b *bus) Publish(e Event) {
 	b.RLock()
 	defer b.RUnlock()