From b5c3ad24b8ffab6682e11953376b5120e0eb4783 Mon Sep 17 00:00:00 2001 From: Tim Scheuermann Date: Wed, 25 May 2016 14:39:01 +0200 Subject: [PATCH] Removed reference to prometheus in sample and readme --- plugins/inputs/docker/README.md | 3 +-- plugins/inputs/docker/docker.go | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/plugins/inputs/docker/README.md b/plugins/inputs/docker/README.md index bae40aefd..1f5e9b37d 100644 --- a/plugins/inputs/docker/README.md +++ b/plugins/inputs/docker/README.md @@ -22,8 +22,7 @@ for the stat structure can be found endpoint = "unix:///var/run/docker.sock" # Only collect metrics for these containers, collect all if empty container_names = [] - ## Only collect these container labels from docker daemon, collect all if empty but note that - ## this will break prometheus output if containers have inconsistent label sets. + ## Only collect these container labels from docker daemon, collect all if empty container_labels = [] ``` diff --git a/plugins/inputs/docker/docker.go b/plugins/inputs/docker/docker.go index 4f1643eb3..1cebd8628 100644 --- a/plugins/inputs/docker/docker.go +++ b/plugins/inputs/docker/docker.go @@ -57,8 +57,7 @@ var sampleConfig = ` endpoint = "unix:///var/run/docker.sock" ## Only collect metrics for these containers, collect all if empty container_names = [] - ## Only collect these container labels from docker daemon, collect all if empty but note that - ## this will break prometheus output if containers have inconsistent label sets. + ## Only collect these container labels from docker daemon, collect all if empty container_labels = [] ## Timeout for docker list, info, and stats commands timeout = "5s"