commit b9ffb5d905716efe9f6fcf44306e37e07989e65d
author mcp-jenkins <mcp-jenkins@mirantis.com> Mon Oct 22 14:18:54 2018 +0000
committer Gerrit Code Review <mail@domain.com> Mon Oct 22 14:18:54 2018 +0000
tree 50cda5302f41ba5bfb6d51ae41716d7afe73c549
parent 0cb3f24393eed7e279edf3d6e702619b27dd111e
parent 52cd5c2aa35129acc5db4693500268b66f68e996

Merge "Move few docker_images* under 'defaults' logic"

docker/swarm/manager.yml

diff --git a/docker/swarm/manager.yml b/docker/swarm/manager.yml
index 3b2d916..a1eb8b7 100644
--- a/docker/swarm/manager.yml
+++ b/docker/swarm/manager.yml
@@ -15,3 +15,8 @@
       options:
         log-opts:
           labels: "com.docker.stack.namespace,com.docker.swarm.service.name,com.docker.swarm.task.name"
+  telegraf:
+    agent:
+      input:
+        docker:
+          gather_services: true

docker/swarm/master.yml

diff --git a/docker/swarm/master.yml b/docker/swarm/master.yml
index d327796..a51a5c4 100644
--- a/docker/swarm/master.yml
+++ b/docker/swarm/master.yml
@@ -11,3 +11,8 @@
       options:
         log-opts:
           labels: "com.docker.stack.namespace,com.docker.swarm.service.name,com.docker.swarm.task.name"
+  telegraf:
+    agent:
+      input:
+        docker:
+          gather_services: true

docker/swarm/worker.yml

diff --git a/docker/swarm/worker.yml b/docker/swarm/worker.yml
index 4bed790..6958efb 100644
--- a/docker/swarm/worker.yml
+++ b/docker/swarm/worker.yml
@@ -11,3 +11,8 @@
       master:
         host: ${_param:cluster_node01_address}
         port: ${_param:docker_swarm_master_port}
+  telegraf:
+    agent:
+      input:
+        docker:
+          gather_services: true