Merge pull request #4 from Diesel-Net/development

Promotion

.drone.yaml

@@ -10,7 +10,26 @@ clone:
   depth: 1
 
 steps:
-  - name: docker build & push
+
+  - name: docker build (${DRONE_BRANCH}-latest)
+    image: plugins/docker
+    settings:
+      mirror: dockerhub.nexus.diesel.net
+      registry: docker.nexus.diesel.net
+      username: 
+        from_secret: nexus_user
+      password:
+        from_secret: nexus_pass
+      repo: docker.nexus.diesel.net/fluentd
+      tags:
+        - ${DRONE_BRANCH}-latest
+    when:
+      event:
+        - push
+
+
+
+  - name: docker build (${DRONE_TAG})
     image: plugins/docker
     settings:
       mirror: dockerhub.nexus.diesel.net
@@ -22,11 +41,16 @@ steps:
       repo: docker.nexus.diesel.net/fluentd
       tags:
         - latest
+        - ${DRONE_TAG}
+    when:
+      event:
+        - tag
 
 trigger:
   branch:
     - development
     - stable
   event:
     - push
+    - tag
 ...

Dockerfile

@@ -1,4 +1,4 @@
-FROM fluent/fluentd:v1.14.6-debian-1.0
+FROM fluent/fluentd:v1.16.3-debian-1.0
 USER root
 RUN ["gem", "install", "fluent-plugin-grafana-loki"]
 RUN ["gem", "install", "fluent-plugin-rewrite-tag-filter"]

README.md

@@ -5,5 +5,5 @@
 Log Collector on Docker Swarm
 
 - [Fluentd - Grafana Loki Docs](https://grafana.com/docs/loki/latest/clients/fluentd/)
-- [Fluentd Congiguration](https://docs.fluentd.org/configuration)
+- [Fluentd Configuration](https://docs.fluentd.org/configuration)
     - When this IaC was written, the YAML config file format did not exist. Perhaps we convert to that config file format in the future?

templates/loki.conf

@@ -84,6 +84,8 @@
       namespace
       service_name
       container_name
+      container_hostname
+      container_id
       stream
     </label>
 
@@ -94,7 +96,7 @@
       path /fluentd/log/dlog/loki-buffer
       flush_thread_count 8
       flush_mode interval
-      flush_interval 1s
+      flush_interval 3s
       retry_timeout 72h
       overflow_action throw_exception
     </buffer>