Compare commits

...

1 Commits

Author SHA1 Message Date
Greg Linton b319ddd2ea Filter on all container names, use proper name
Resolves #4376
2018-07-05 18:03:46 -06:00
2 changed files with 24 additions and 10 deletions

View File

@ -366,9 +366,22 @@ func (d *Docker) gatherContainer(
var v *types.StatsJSON var v *types.StatsJSON
// Parse container name // Parse container name
cname := "unknown" cname := "unknown"
if len(container.Names) > 0 { match := false
// Not sure what to do with other names, just take the first. if len(container.Names) == 0 { // for tests
cname = strings.TrimPrefix(container.Names[0], "/") match = true
}
for i := range container.Names {
if !match {
match = d.containerFilter.Match(strings.TrimPrefix(container.Names[i], "/"))
if match {
cname = strings.TrimPrefix(container.Names[i], "/")
}
}
}
if !match {
return nil
} }
// the image name sometimes has a version part, or a private repo // the image name sometimes has a version part, or a private repo
@ -391,10 +404,6 @@ func (d *Docker) gatherContainer(
"container_version": imageVersion, "container_version": imageVersion,
} }
if !d.containerFilter.Match(cname) {
return nil
}
ctx, cancel := context.WithTimeout(context.Background(), d.Timeout.Duration) ctx, cancel := context.WithTimeout(context.Background(), d.Timeout.Duration)
defer cancel() defer cancel()
r, err := d.client.ContainerStats(ctx, container.ID, false) r, err := d.client.ContainerStats(ctx, container.ID, false)
@ -411,6 +420,11 @@ func (d *Docker) gatherContainer(
} }
daemonOSType := r.OSType daemonOSType := r.OSType
// use common (printed at `docker ps`) name for container
if cname != strings.TrimPrefix(v.Name, "/") && 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) {
@ -461,12 +475,12 @@ func (d *Docker) gatherContainer(
acc.AddFields("docker_container_health", healthfields, tags, time.Now()) acc.AddFields("docker_container_health", healthfields, tags, time.Now())
} }
gatherContainerStats(v, acc, tags, container.ID, d.PerDevice, d.Total, daemonOSType) parseContainerStats(v, acc, tags, container.ID, d.PerDevice, d.Total, daemonOSType)
return nil return nil
} }
func gatherContainerStats( func parseContainerStats(
stat *types.StatsJSON, stat *types.StatsJSON,
acc telegraf.Accumulator, acc telegraf.Accumulator,
tags map[string]string, tags map[string]string,

View File

@ -107,7 +107,7 @@ func TestDockerGatherContainerStats(t *testing.T) {
"container_image": "redis/image", "container_image": "redis/image",
} }
gatherContainerStats(stats, &acc, tags, "123456789", true, true, "linux") parseContainerStats(stats, &acc, tags, "123456789", true, true, "linux")
// test docker_container_net measurement // test docker_container_net measurement
netfields := map[string]interface{}{ netfields := map[string]interface{}{