CL-Softwares
/
telegraf
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Patrick Koenig 2021-03-02 11:19:08 -08:00 committed by GitHub
parent 8a6907a186
commit 6bc731be92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/inputs/docker/docker.go
View File

@ -434,8 +434,7 @@ func (d *Docker) gatherContainer(
var cname string var cname string
for _, name := range container.Names { for _, name := range container.Names {
trimmedName := strings.TrimPrefix(name, "/") trimmedName := strings.TrimPrefix(name, "/")
match := d.containerFilter.Match(trimmedName) if !strings.Contains(trimmedName, "/") {
if match {
cname = trimmedName cname = trimmedName
break break
} }
@ -445,6 +444,10 @@ func (d *Docker) gatherContainer(
return nil return nil
} }
if !d.containerFilter.Match(cname) {
return nil
}
imageName, imageVersion := docker.ParseImage(container.Image) imageName, imageVersion := docker.ParseImage(container.Image)
tags := map[string]string{ tags := map[string]string{
@ -480,11 +483,6 @@ func (d *Docker) gatherContainer(
} }
daemonOSType := r.OSType 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 // Add labels to tags
for k, label := range container.Labels { for k, label := range container.Labels {
if d.labelFilter.Match(k) { if d.labelFilter.Match(k) {