Merge pull request #5 from Diesel-Net/development

patch for docker role breaking changes

meta/main.yaml

@@ -26,4 +26,4 @@ galaxy_info:
     - name: docker
       scm: git
       src: "[email protected]:Diesel-Net/ansible-role-docker.git"
-      version: 2.0.4
+      version: 2.1.0

tasks/deploy.yaml

@@ -9,7 +9,7 @@
     name: docker
     tasks_from: service_update
   vars:
-    options: --force
+    opts: --force
     app_name: fluentd
     docker_service: daemon
 

templates/loki.conf

@@ -45,25 +45,11 @@
   @type null
 </match>
 
-# use service_name for container_name for the rare case of adhoc containers (non-swarm services)
-# <filter raw.**>
-#   @type record_transformer
-#   enable_ruby
-#   <record>
-#     service_name ${record["service_name"] or record["container_name"]}
-#   </record>
-# </filter>
-
-# uncomment for debugging
-# <match **>
-#   @type stdout
-# </match>
-
 <match raw.**>
   @type detect_exceptions
   remove_tag_prefix raw
   message log
-  languages python
+  languages all
 </match>
 
 <match **>
@@ -91,7 +77,7 @@
 
     extra_labels {"environment":"{{ version }}", "vm_hostname":"{{ inventory_hostname }}", "job":"{{ loki_job }}"}
 
-    <buffer service_name>
+    <buffer container_id>
       @type file
       path /fluentd/log/dlog/loki-buffer
       flush_thread_count 8