Use consistent container name in docker input plugin (influxdata#8703)

arstercz · Mar 2, 2021 · a2725ef · a2725ef
1 parent f8a7654
commit a2725ef
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/plugins/inputs/docker/docker.go b/plugins/inputs/docker/docker.go
@@ -434,8 +434,7 @@ func (d *Docker) gatherContainer(
 	var cname string
 	for _, name := range container.Names {
 		trimmedName := strings.TrimPrefix(name, "/")
-		match := d.containerFilter.Match(trimmedName)
-		if match {
+		if !strings.Contains(trimmedName, "/") {
 			cname = trimmedName
 			break
 		}
@@ -445,6 +444,10 @@ func (d *Docker) gatherContainer(
 		return nil
 	}
 
+	if !d.containerFilter.Match(cname) {
+		return nil
+	}
+
 	imageName, imageVersion := docker.ParseImage(container.Image)
 
 	tags := map[string]string{
@@ -480,11 +483,6 @@ func (d *Docker) gatherContainer(
 	}
 	daemonOSType := r.OSType
 
-	// use common (printed at `docker ps`) name for container
-	if v.Name != "" {
-		tags["container_name"] = strings.TrimPrefix(v.Name, "/")
-	}
-
 	// Add labels to tags
 	for k, label := range container.Labels {
 		if d.labelFilter.Match(k) {