Merge pull request docker-archive#476 from docker/aws-log

Updated CloudWatch to include tag format

Author: FrenchBen

aws/cloudformation/docker_for_aws.json

@@ -617,7 +617,7 @@
                                 "export LOCAL_IP=$(wget -qO- http://169.254.169.254/latest/meta-data/local-ipv4)\n",
                                 "echo '{\"experimental\": true, \"log-driver\": \"awslogs\",\"log-opts\": {\"awslogs-group\":\"",
                                 { "Fn::Join": [ "-", [ { "Ref": "AWS::StackName"}, "lg" ] ] },
-                                "\" }}' > /etc/docker/daemon.json \n",
+                                "\", \"tag\": \"{{.Name}}-{{.ID}}\" }}' > /etc/docker/daemon.json \n",
                                 "chown -R docker /home/docker/\n",
                                 "chgrp -R docker /home/docker/\n",
                                 "rc-service docker restart\n",
@@ -770,7 +770,7 @@
                                 "export DOCKER_FOR_IAAS_VERSION='", { "Fn::FindInMap" : [ "DockerForAWS", "version", "forAws" ] }, "'\n",
                                 "echo '{\"experimental\": true, \"log-driver\": \"awslogs\",\"log-opts\": {\"awslogs-group\":\"",
                                 { "Fn::Join": [ "-", [ { "Ref": "AWS::StackName"}, "lg" ] ] },
-                                "\" }}' > /etc/docker/daemon.json \n",
+                                "\", \"tag\": \"{{.Name}}-{{.ID}}\" }}' > /etc/docker/daemon.json \n",
                                 "chown -R docker /home/docker/\n",
                                 "chgrp -R docker /home/docker/\n",
                                 "rc-service docker restart\n",

aws/cloudformation/docker_for_aws_cloud.json

@@ -576,7 +576,7 @@
                                 "export LOCAL_IP=$(wget -qO- http://169.254.169.254/latest/meta-data/local-ipv4)\n",
                                 "echo '{\"experimental\": true, \"log-driver\": \"awslogs\",\"log-opts\": {\"awslogs-group\":\"",
                                 { "Fn::Join": [ "-", [ { "Ref": "AWS::StackName"}, "lg" ] ] },
-                                "\" }}' > /etc/docker/daemon.json \n",
+                                "\", \"tag\": \"{{.Name}}-{{.ID}}\" }}' > /etc/docker/daemon.json \n",
                                 "chown -R docker /home/docker/\n",
                                 "chgrp -R docker /home/docker/\n",
                                 "rc-service docker restart\n",
@@ -732,7 +732,7 @@
                                 "export DOCKER_FOR_IAAS_VERSION='", { "Fn::FindInMap" : [ "DockerForAWS", "version", "forAws" ] }, "'\n",
                                 "echo '{\"experimental\": true, \"log-driver\": \"awslogs\",\"log-opts\": {\"awslogs-group\":\"",
                                 { "Fn::Join": [ "-", [ { "Ref": "AWS::StackName"}, "lg" ] ] },
-                                "\" }}' > /etc/docker/daemon.json \n",
+                                "\", \"tag\": \"{{.Name}}-{{.ID}}\" }}' > /etc/docker/daemon.json \n",
                                 "chown -R docker /home/docker/\n",
                                 "chgrp -R docker /home/docker/\n",
                                 "rc-service docker restart\n",

aws/cloudformation/docker_for_aws_ddc.json

@@ -577,7 +577,7 @@
                                 "export LOCAL_IP=$(wget -qO- http://169.254.169.254/latest/meta-data/local-ipv4)\n",
                                 "echo '{\"log-driver\": \"awslogs\",\"log-opts\": {\"awslogs-group\":\"",
                                 { "Fn::Join": [ "-", [ { "Ref": "AWS::StackName"}, "lg" ] ] },
-                                "\" }}' > /etc/docker/daemon.json \n",
+                                "\", \"tag\": \"{{.Name}}-{{.ID}}\" }}' > /etc/docker/daemon.json \n",
                                 "chown -R docker /home/docker/\n",
                                 "chgrp -R docker /home/docker/\n",
                                 "rc-service docker restart\n",
@@ -740,7 +740,7 @@
                                 "export DOCKER_FOR_IAAS_VERSION='", { "Fn::FindInMap" : [ "DockerForAWS", "version", "forAws" ] }, "'\n",
                                 "echo '{\"log-driver\": \"awslogs\",\"log-opts\": {\"awslogs-group\":\"",
                                 { "Fn::Join": [ "-", [ { "Ref": "AWS::StackName"}, "lg" ] ] },
-                                "\" }}' > /etc/docker/daemon.json \n",
+                                "\", \"tag\": \"{{.Name}}-{{.ID}}\" }}' > /etc/docker/daemon.json \n",
                                 "chown -R docker /home/docker/\n",
                                 "chgrp -R docker /home/docker/\n",
                                 "rc-service docker restart\n",