From 9183e6a0a1b735781a930ad0b101b51453cebadd Mon Sep 17 00:00:00 2001 From: Cameron Sparr Date: Tue, 12 Apr 2016 14:59:19 -0600 Subject: [PATCH] Remove cont_id tag from docker plugin also renaming cont_name and cont_image to container_name and container_image. closes #1014 --- plugins/inputs/docker/docker.go | 5 ++--- plugins/inputs/docker/docker_test.go | 17 +++++++---------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/plugins/inputs/docker/docker.go b/plugins/inputs/docker/docker.go index 094bad8ca71ed..5d1ddfb106d56 100644 --- a/plugins/inputs/docker/docker.go +++ b/plugins/inputs/docker/docker.go @@ -200,9 +200,8 @@ func (d *Docker) gatherContainer( } tags := map[string]string{ - "cont_id": container.ID, - "cont_name": cname, - "cont_image": container.Image, + "container_name": cname, + "container_image": container.Image, } if len(d.ContainerNames) > 0 { if !sliceContains(cname, d.ContainerNames) { diff --git a/plugins/inputs/docker/docker_test.go b/plugins/inputs/docker/docker_test.go index c9fe6cea17927..ee845abbf6d81 100644 --- a/plugins/inputs/docker/docker_test.go +++ b/plugins/inputs/docker/docker_test.go @@ -21,9 +21,8 @@ func TestDockerGatherContainerStats(t *testing.T) { stats := testStats() tags := map[string]string{ - "cont_id": "foobarbaz", - "cont_name": "redis", - "cont_image": "redis/image", + "container_name": "redis", + "container_image": "redis/image", } gatherContainerStats(stats, &acc, tags) @@ -372,10 +371,9 @@ func TestDockerGatherInfo(t *testing.T) { "usage_total": uint64(1231652), }, map[string]string{ - "cont_id": "b7dfbb9478a6ae55e237d4d74f8bbb753f0817192b5081334dc78476296e2173", - "cont_name": "etcd2", - "cont_image": "quay.io/coreos/etcd:v2.2.2", - "cpu": "cpu3", + "container_name": "etcd2", + "container_image": "quay.io/coreos/etcd:v2.2.2", + "cpu": "cpu3", }, ) acc.AssertContainsTaggedFields(t, @@ -417,9 +415,8 @@ func TestDockerGatherInfo(t *testing.T) { "limit": uint64(18935443456), }, map[string]string{ - "cont_id": "b7dfbb9478a6ae55e237d4d74f8bbb753f0817192b5081334dc78476296e2173", - "cont_name": "etcd2", - "cont_image": "quay.io/coreos/etcd:v2.2.2", + "container_name": "etcd2", + "container_image": "quay.io/coreos/etcd:v2.2.2", }, )