commit 40601a6a13872774d9bb7a6701e36481e1799ef7
author Bartosz Kupidura <bkupidura@mirantis.com> Fri Dec 08 15:16:18 2017 +0100
committer Bartosz Kupidura <bkupidura@mirantis.com> Fri Dec 15 09:11:30 2017 +0000
tree 94b1cd6f6aea52896a71f42133a3444fef78319f
parent 8fef373a34febb52f7561b62b65c06a66fec965d

Pass labels from docker containers to logs

Closes-Bug: PROD-16326
Change-Id: Icdc43f74aad50e5ec0543bab6ba8f2619004bae9

docker/swarm/manager.yml

diff --git a/docker/swarm/manager.yml b/docker/swarm/manager.yml
index 12bfc0c..3b2d916 100644
--- a/docker/swarm/manager.yml
+++ b/docker/swarm/manager.yml
@@ -11,3 +11,7 @@
       master:
         host: ${_param:cluster_node01_address}
         port: ${_param:docker_swarm_master_port}
+    host:
+      options:
+        log-opts:
+          labels: "com.docker.stack.namespace,com.docker.swarm.service.name,com.docker.swarm.task.name"

docker/swarm/master.yml

diff --git a/docker/swarm/master.yml b/docker/swarm/master.yml
index fba9af3..d327796 100644
--- a/docker/swarm/master.yml
+++ b/docker/swarm/master.yml
@@ -7,3 +7,7 @@
     swarm:
       role: master
       advertise_addr: ${_param:single_address}
+    host:
+      options:
+        log-opts:
+          labels: "com.docker.stack.namespace,com.docker.swarm.service.name,com.docker.swarm.task.name"

kubernetes/pool/cluster.yml

diff --git a/kubernetes/pool/cluster.yml b/kubernetes/pool/cluster.yml
index 0f961a3..3dd0c40 100644
--- a/kubernetes/pool/cluster.yml
+++ b/kubernetes/pool/cluster.yml
@@ -22,3 +22,5 @@
     host:
       options:
         iptables: false
+        log-opts:
+          labels: "io.kubernetes.pod.name"

kubernetes/pool/single.yml

diff --git a/kubernetes/pool/single.yml b/kubernetes/pool/single.yml
index 00f22b8..67363a6 100644
--- a/kubernetes/pool/single.yml
+++ b/kubernetes/pool/single.yml
@@ -20,3 +20,5 @@
     host:
       options:
         iptables: false
+        log-opts:
+          labels: "io.kubernetes.pod.name"