From bb45a89206da617236c6db1f1ae2fcf30f4f05ed Mon Sep 17 00:00:00 2001
From: Yash Thakkar <thakkaryash94@gmail.com>
Date: Fri, 29 Sep 2017 05:09:07 +0530
Subject: [PATCH 01/10] Update pull request command

without fluent prefix in image name, docker is not able to pull the image
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c963821..ec89fda 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ docker build -t fluent-bit:0.11 ./
 Once the image is built, it's ready to run:
 
 ```
-docker run -p 127.0.0.1:24224:24224 fluent-bit:latest
+docker run -p 127.0.0.1:24224:24224 fluent/fluent-bit:latest
 ```
 
 By default, the configuration set a listener on TCP port 24224 through Forward protocol and prints to the standard output interface each message. So this can be used to forward Docker log messages from one container to the Fluent Bit image, e.g:

From 2f5d436017bfe4952a2faaf74184b709e5fe1598 Mon Sep 17 00:00:00 2001
From: James Ravn <james@r-vn.org>
Date: Fri, 27 Oct 2017 17:22:06 +0100
Subject: [PATCH 02/10] Fix ca certificate installation

The subsequent removal of openssl was removing ca-certificates and
`/etc/ssl`. This causes the tls options to fail on output plugins.

This change rearranges the order to ensure CA certificates will be
present.
---
 0.12/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/0.12/Dockerfile b/0.12/Dockerfile
index d698ca1..156251d 100644
--- a/0.12/Dockerfile
+++ b/0.12/Dockerfile
@@ -14,7 +14,6 @@ RUN mkdir -p /fluent-bit/bin /fluent-bit/etc /fluent-bit/log
 
 RUN apt-get -qq update \
     && apt-get install -y -qq \
-       ca-certificates \
        build-essential \
        cmake \
        make \
@@ -37,6 +36,7 @@ RUN apt-get -qq update \
        bzip2 \
        openssl \
        manpages \
+    && apt-get install -y -qq --no-install-recommends ca-certificates \
     && rm -rf /tmp/*
 
 # Configuration files

From ed858e385161276652df07c50adedf8902273571 Mon Sep 17 00:00:00 2001
From: Sergei Zyubin <sergei.zyubin@gmail.com>
Date: Wed, 27 Feb 2019 12:46:59 +0100
Subject: [PATCH 03/10] Update Tags Available

Signed-off-by: Sergei Zyubin <sergei.zyubin@gmail.com>
---
 README.md | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 6303d49..123a1ea 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,9 @@ Fluent Bit Dockerfiles are located in separated branches with proper tags:
 
 | Branch | Tags Available                                               |
 | ------ | ------------------------------------------------------------ |
-| 0.13   | 0.13, 0.13.0                                                 |
+| 1.0    | 1.0, 1.0-debug, 1.0.0, 1.0.1, 1.0.2, 1.0.3, 1.0.3-debug, 1.0.4, 1.0.4-debug |
+| 0.14   | 0.14, 0.14.0, 0.14.1, 0.14.2, 0.14.3, 0.14.4, 0.14.5, 0.14.6, 0.14.7, 0.14.8, 0.14.9 |
+| 0.13   | 0.13, 0.13.0, 0.13.1, 0.13.2, 0.13.3, 0.13.4, 0.13.5, 0.13.6, 0.13.7, 0.13.8 |
 | 0.12   | 0.12, 0.12.19, 0.12.18, 0.12.17, 0.12.16, 0.12.15, 0.12.14, 0.12.13, 0.12.12, 0.12.11, 0.12.10, 0.12.9, 0.12.8, 0.12.7, 0.12.6, 0.12.5, 0.12.4, 0.12.3, 0.12.2, 0.12.1, 0.12.0 |
 
 ## 2. Build image
@@ -18,8 +20,8 @@ Fluent Bit Dockerfiles are located in separated branches with proper tags:
 Use `docker build` command to build the image. This example names the image "fluent-bit:latest":
 
 ```
-$ cd 0.13/
-$ docker build -t fluent/fluent-bit:0.13 ./
+$ cd 1.0/
+$ docker build -t fluent/fluent-bit:1.0 ./
 ```
 
 ## 3. Test it
@@ -40,7 +42,7 @@ $ docker run --log-driver=fluentd -t ubuntu echo "Testing a log message"
 On Fluent Bit container will print to stdout something like this:
 
 ```
-Fluent-Bit v0.13.0
+Fluent Bit v1.0.4
 Copyright (C) Treasure Data
 
 [0] docker.31c94ceb86ca: [1487548735, {"container_id"=>"31c94ceb86cae7055564eb4d65cd2e2897addd252fe6b86cd11bddd70a871c08", "container_name"=>"/admiring_shannon", "source"=>"stdout","}]og"=>"Testing a log message

From 91e3edaa5efdde059b4be56b7e5b0ab151f11fe9 Mon Sep 17 00:00:00 2001
From: Eduardo Silva <eduardo@treasure-data.com>
Date: Fri, 22 Mar 2019 14:00:16 -0600
Subject: [PATCH 04/10] remove old directories

Signed-off-by: Eduardo Silva <eduardo@treasure-data.com>
---
 0.12/Dockerfile             |  48 -----------------
 0.14/Dockerfile             |  65 -----------------------
 0.14/fluent-bit.conf        |  15 ------
 0.14/parsers.conf           | 101 ------------------------------------
 0.14/parsers_cinder.conf    |  10 ----
 0.14/parsers_extra.conf     |  78 ----------------------------
 0.14/parsers_java.conf      |   6 ---
 0.14/parsers_mult.conf      |  26 ----------
 0.14/parsers_openstack.conf |  53 -------------------
 9 files changed, 402 deletions(-)
 delete mode 100644 0.12/Dockerfile
 delete mode 100644 0.14/Dockerfile
 delete mode 100644 0.14/fluent-bit.conf
 delete mode 100644 0.14/parsers.conf
 delete mode 100644 0.14/parsers_cinder.conf
 delete mode 100644 0.14/parsers_extra.conf
 delete mode 100644 0.14/parsers_java.conf
 delete mode 100644 0.14/parsers_mult.conf
 delete mode 100644 0.14/parsers_openstack.conf

diff --git a/0.12/Dockerfile b/0.12/Dockerfile
deleted file mode 100644
index 156251d..0000000
--- a/0.12/Dockerfile
+++ /dev/null
@@ -1,48 +0,0 @@
-FROM gcr.io/google-containers/debian-base-amd64:0.1
-MAINTAINER Eduardo Silva <eduardo@treasure-data.com>
-LABEL Description="Fluent Bit docker image" Vendor="Fluent Organization" Version="1.1"
-
-# Fluent Bit version
-ENV FLB_MAJOR 0
-ENV FLB_MINOR 12
-ENV FLB_PATCH 5
-ENV FLB_VERSION 0.12.5
-
-ENV FLB_TARBALL http://github.com/fluent/fluent-bit/archive/v$FLB_VERSION.zip
-
-RUN mkdir -p /fluent-bit/bin /fluent-bit/etc /fluent-bit/log
-
-RUN apt-get -qq update \
-    && apt-get install -y -qq \
-       build-essential \
-       cmake \
-       make \
-       wget \
-       unzip \
-       libsystemd-dev \
-    && wget -O "/tmp/fluent-bit-${FLB_VERSION}.zip" ${FLB_TARBALL} \
-    && cd /tmp && unzip "fluent-bit-$FLB_VERSION.zip" \
-    && cd "fluent-bit-$FLB_VERSION"/build/ \
-    && cmake -DFLB_DEBUG=On -DFLB_TRACE=On -DFLB_JEMALLOC=On -DFLB_BUFFERING=On ../ \
-    && make \
-    && install bin/fluent-bit /fluent-bit/bin/ \
-    && apt-get remove --purge --auto-remove -y -qq \
-       build-essential \
-       cmake \
-       make \
-       wget \
-       unzip \
-       libsystemd-dev \
-       bzip2 \
-       openssl \
-       manpages \
-    && apt-get install -y -qq --no-install-recommends ca-certificates \
-    && rm -rf /tmp/*
-
-# Configuration files
-COPY fluent-bit.conf /fluent-bit/etc/
-COPY parsers.conf /fluent-bit/etc/
-COPY parsers_java.conf /fluent-bit/etc/
-
-# Entry point
-CMD ["/fluent-bit/bin/fluent-bit", "-c", "/fluent-bit/etc/fluent-bit.conf"]
diff --git a/0.14/Dockerfile b/0.14/Dockerfile
deleted file mode 100644
index b5e165d..0000000
--- a/0.14/Dockerfile
+++ /dev/null
@@ -1,65 +0,0 @@
-FROM gcr.io/google-containers/debian-base-amd64:0.3.1 as builder
-
-# Fluent Bit version
-ENV FLB_MAJOR 0
-ENV FLB_MINOR 14
-ENV FLB_PATCH 9
-ENV FLB_VERSION 0.14.9
-
-ENV DEBIAN_FRONTEND noninteractive
-
-ENV FLB_TARBALL http://github.com/fluent/fluent-bit/archive/v$FLB_VERSION.zip
-
-RUN mkdir -p /fluent-bit/bin /fluent-bit/etc /fluent-bit/log /tmp/src/
-
-RUN apt-get update \
-    && apt-get dist-upgrade -y \
-    && apt-get install -y \
-       build-essential \
-       cmake \
-       make \
-       wget \
-       unzip \
-       libsystemd-dev \
-       libssl1.0-dev \
-       libasl-dev \
-       libsasl2-dev \
-    && wget -O "/tmp/fluent-bit-${FLB_VERSION}.zip" ${FLB_TARBALL} \
-    && cd /tmp && unzip "fluent-bit-$FLB_VERSION.zip" \
-    && cd "fluent-bit-$FLB_VERSION"/build/ \
-    && cmake -DFLB_DEBUG=On \
-          -DFLB_TRACE=Off \
-          -DFLB_JEMALLOC=On \
-          -DFLB_BUFFERING=On \
-          -DFLB_TLS=On \
-          -DFLB_SHARED_LIB=Off \
-          -DFLB_EXAMPLES=Off \
-          -DFLB_HTTP_SERVER=On \
-          -DFLB_OUT_KAFKA=On .. \
-    && make \
-    && install bin/fluent-bit /fluent-bit/bin/
-
-# Configuration files
-COPY fluent-bit.conf \
-     parsers.conf \
-     parsers_java.conf \
-     parsers_mult.conf \
-     parsers_openstack.conf \
-     parsers_cinder.conf \
-     /fluent-bit/etc/
-
-FROM gcr.io/google-containers/debian-base-amd64:0.3.1
-MAINTAINER Eduardo Silva <eduardo@treasure-data.com>
-LABEL Description="Fluent Bit docker image" Vendor="Fluent Organization" Version="1.1"
-
-RUN apt-get update \
-    && apt-get dist-upgrade -y \
-    && apt-get install --no-install-recommends ca-certificates libssl1.0.2 -y libsasl2-2 \
-    && rm -rf /var/lib/apt/lists/* \
-    && apt-get autoclean
-COPY --from=builder /fluent-bit /fluent-bit
-
-EXPOSE 2020
-
-# Entry point
-CMD ["/fluent-bit/bin/fluent-bit", "-c", "/fluent-bit/etc/fluent-bit.conf"]
diff --git a/0.14/fluent-bit.conf b/0.14/fluent-bit.conf
deleted file mode 100644
index ec81989..0000000
--- a/0.14/fluent-bit.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-[SERVICE]
-    Flush        1
-    Daemon       Off
-    Log_Level    info
-    Log_File     /fluent-bit/log/fluent-bit.log
-    Parsers_File parsers.conf
-    Parsers_File parsers_java.conf
-
-[INPUT]
-    Name Forward
-    Port 24224
-
-[OUTPUT]
-    Name  stdout
-    Match *
diff --git a/0.14/parsers.conf b/0.14/parsers.conf
deleted file mode 100644
index 1b1d0eb..0000000
--- a/0.14/parsers.conf
+++ /dev/null
@@ -1,101 +0,0 @@
-[PARSER]
-    Name   apache
-    Format regex
-    Regex  ^(?<host>[^ ]*) [^ ]* (?<user>[^ ]*) \[(?<time>[^\]]*)\] "(?<method>\S+)(?: +(?<path>[^\"]*?)(?: +\S*)?)?" (?<code>[^ ]*) (?<size>[^ ]*)(?: "(?<referer>[^\"]*)" "(?<agent>[^\"]*)")?$
-    Time_Key time
-    Time_Format %d/%b/%Y:%H:%M:%S %z
-
-[PARSER]
-    Name   apache2
-    Format regex
-    Regex  ^(?<host>[^ ]*) [^ ]* (?<user>[^ ]*) \[(?<time>[^\]]*)\] "(?<method>\S+)(?: +(?<path>[^ ]*) +\S*)?" (?<code>[^ ]*) (?<size>[^ ]*)(?: "(?<referer>[^\"]*)" "(?<agent>.*)")?$
-    Time_Key time
-    Time_Format %d/%b/%Y:%H:%M:%S %z
-
-[PARSER]
-    Name   apache_error
-    Format regex
-    Regex  ^\[[^ ]* (?<time>[^\]]*)\] \[(?<level>[^\]]*)\](?: \[pid (?<pid>[^\]]*)\])?( \[client (?<client>[^\]]*)\])? (?<message>.*)$
-
-[PARSER]
-    Name   nginx
-    Format regex
-    Regex ^(?<remote>[^ ]*) (?<host>[^ ]*) (?<user>[^ ]*) \[(?<time>[^\]]*)\] "(?<method>\S+)(?: +(?<path>[^\"]*?)(?: +\S*)?)?" (?<code>[^ ]*) (?<size>[^ ]*)(?: "(?<referer>[^\"]*)" "(?<agent>[^\"]*)")?$
-    Time_Key time
-    Time_Format %d/%b/%Y:%H:%M:%S %z
-
-[PARSER]
-    Name   json
-    Format json
-    Time_Key time
-    Time_Format %d/%b/%Y:%H:%M:%S %z
-
-[PARSER]
-    Name         docker
-    Format       json
-    Time_Key     time
-    Time_Format  %Y-%m-%dT%H:%M:%S.%L
-    Time_Keep    On
-    # Command      |  Decoder | Field | Optional Action
-    # =============|==================|=================
-    Decode_Field_As   escaped    log
-
-[PARSER]
-    Name        docker-daemon
-    Format      regex
-    Regex       time="(?<time>[^ ]*)" level=(?<level>[^ ]*) msg="(?<msg>[^ ].*)"
-    Time_Key    time
-    Time_Format %Y-%m-%dT%H:%M:%S.%L
-    Time_Keep   On
-
-[PARSER]
-    Name        syslog-rfc5424
-    Format      regex
-    Regex       ^\<(?<pri>[0-9]{1,5})\>1 (?<time>[^ ]+) (?<host>[^ ]+) (?<ident>[^ ]+) (?<pid>[-0-9]+) (?<msgid>[^ ]+) (?<extradata>(\[(.*)\]|-)) (?<message>.+)$
-    Time_Key    time
-    Time_Format %Y-%m-%dT%H:%M:%S.%L
-    Time_Keep   On
-
-[PARSER]
-    Name        syslog-rfc3164-local
-    Format      regex
-    Regex       ^\<(?<pri>[0-9]+)\>(?<time>[^ ]* {1,2}[^ ]* [^ ]*) (?<ident>[a-zA-Z0-9_\/\.\-]*)(?:\[(?<pid>[0-9]+)\])?(?:[^\:]*\:)? *(?<message>.*)$
-    Time_Key    time
-    Time_Format %b %d %H:%M:%S
-    Time_Keep   On
-
-[PARSER]
-    Name        syslog-rfc3164
-    Format      regex
-    Regex       /^\<(?<pri>[0-9]+)\>(?<time>[^ ]* {1,2}[^ ]* [^ ]*) (?<host>[^ ]*) (?<ident>[a-zA-Z0-9_\/\.\-]*)(?:\[(?<pid>[0-9]+)\])?(?:[^\:]*\:)? *(?<message>.*)$/
-    Time_Key    time
-    Time_Format %b %d %H:%M:%S
-    Time_Format %Y-%m-%dT%H:%M:%S.%L
-    Time_Keep   On
-
-[PARSER]
-    Name    mongodb
-    Format  regex
-    Regex   ^(?<time>[^ ]*)\s+(?<severity>\w)\s+(?<component>[^ ]+)\s+\[(?<context>[^\]]+)]\s+(?<message>.*?) *(?<ms>(\d+))?(:?ms)?$
-    Time_Format %Y-%m-%dT%H:%M:%S.%L
-    Time_Keep   On
-    Time_Key time
-
-[PARSER]
-    # http://rubular.com/r/izM6olvshn
-    Name crio
-    Format Regex
-    Regex /^(?<time>.+)\b(?<stream>stdout|stderr)\b(?<log>.*)$/
-    Time_Key    time
-    Time_Format %Y-%m-%dT%H:%M:%S.%N%:z
-    Time_Keep   On
-
-[PARSER]
-    Name    kube-custom
-    Format  regex
-    Regex   var\.log\.containers\.(?<pod_name>[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*)_(?<namespace_name>[^_]+)_(?<container_name>.+)-(?<docker_id>[a-z0-9]{64})\.log$
-
-[PARSER]
-    Name    filter-kube-test
-    Format  regex
-    Regex   .*kubernetes.(?<pod_name>[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*)_(?<namespace_name>[^_]+)_(?<container_name>.+)-(?<docker_id>[a-z0-9]{64})\.log$
diff --git a/0.14/parsers_cinder.conf b/0.14/parsers_cinder.conf
deleted file mode 100644
index b67ee99..0000000
--- a/0.14/parsers_cinder.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-
-[PARSER]
-    # http://rubular.com/r/IvZVElTgNl
-    Name ceph
-    Format regex
-    Regex ^(?<log_time>[^ ][-.\d\+:T]+[ ]*[.:\d]*)\s+(?<message>.*)$
-    Time_Format %Y-%m-%d %H:%M:%S.%L
-    Time_Keep Off
-    Time_Key log_time
-
diff --git a/0.14/parsers_extra.conf b/0.14/parsers_extra.conf
deleted file mode 100644
index 8e14f3c..0000000
--- a/0.14/parsers_extra.conf
+++ /dev/null
@@ -1,78 +0,0 @@
-# Extra set of common parsers
-
-[PARSER]
-    # http://rubular.com/r/cCVd1HLCAO
-    Name crowbar
-    Format regex
-    Regex ^.*\[(?<log_time>[^ ][-.\d\+:]+T[:\d]*)([^\]])*?\]\s+?(?<severity>[^ ]\w+)([\s-]*):?\s+(?<message>.*)
-    Time_Format %Y-%m-%dT%H:%M:%S
-    Time_Keep Off
-    Time_Key log_time
-
-[PARSER]
-    # http://rubular.com/r/frDgnElXW9 
-    Name chefclient
-    Format regex
-    Regex ^\[(?<log_time>[^ ][-.\d\+:]+T[:\d]*)([^\]])*?\]\s+(?<severity>[^ ]\w+):\s+(?<message>.*)$
-    Time_Format %Y-%m-%dT%H:%M:%S
-    Time_Keep Off
-    Time_Key log_time
-
-[PARSER]
-    Name mysql_error
-    Format regex
-    #Regex ^(?<log_time>[^ +][ -:0-9TZ]+|[[:upper:]][[:lower:]]{2})(\+\d+:\d+[TZ]*){0,1}\s*(?<myid>[^ ]\d+)\s+\[(?<severity>[^ ]\w+)\](\s+(?<subsystem>[^ ]\w+):){0,1}\s+(?<message>.*)$
-    Regex ^(?<log_time>[^ +][-\d]+[\ T]*[:\dZ]+)\s*(?<myid>[^ ]\d+)\s+\[(?<severity>[^ ]\w+)\](\s+(?<subsystem>[^ ]\w+):){0,1}\s+(?<message>.*)$
-    Time_Format %Y-%m-%d %H:%M:%S
-    Time_Keep   Off
-    Time_Key log_time
-
-[PARSER]
-    Name mysql_slow
-    Format regex
-    Regex ^# User\@Host:\s+(?<user>[^\@][\w\[\]]+)[@\s]+(?<dbhost>[^ ][-.\w]+)\s+(\[(?<dbhost_address>[.\d]+)\]){0,1}\s+(?<message>.*)$
-
-[PARSER]
-    Name pacemaker
-    Format regex
-    Regex ^\s*(?<log_time>[^ ]* {1,2}[^ ]* [^ ]*) \[(?<pid>\d+)\] (?<node>[\-\w]*)\s*(?<component>\w*):\s+(?<severity>\w+):\s+(?<message>.*)$
-    #Time_Format %Y-%m-%dT%H:%M:%S
-    Time_Format %b %d %H:%M:%S
-    Time_Keep   Off
-    Time_Key log_time
-    #Types pid:integer
-
-[PARSER]
-    Name rabbitmq
-    Format regex
-    Regex ^=(?<severity>[^ ]\w+)\s+REPORT[=\s]*(?<log_time>[^ =][-:.\d\w]+)[\s=]+(?<message>.*)$
-    Time_Format %d-%b-%Y::%H:%M:%S
-    Time_Keep   Off
-    Time_Key log_time
-
-[PARSER]
-    Name http_statement
-    Format regex
-    Regex ^.*((?<req_method>GET|POST|PUT|DELETE|CONNECT|OPTIONS|HEAD[^ ]\w+)\s*(?<req_path>[^ ][-._?=%&\/[:alnum:]]*)\s*(?<req_protocol>[^ ][.\/\dHTFSP]+){0,1})(['"\s]*){0,1}((\s*status:\s*(?<req_status>[^ ]\d+)){0,1}(\s*len:\ (?<req_len>[^ ]\d+)){0,1}(\s*time:\s*(?<req_log_time>[^ ][.\d]+)){0,1}(\s*microversion:\s*(?<req_mver>[^ ][.\d]+)){0,1}){0,1}$
-
-[PARSER]
-    Name universal
-    Format regex
-    Regex ^(?<message>.*)$
-
-[PARSER]
-    Name uuid
-    Format regex
-    Regex (?<uuid>[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12})
-#UUID v1 :
-#/^[0-9A-F]{8}-[0-9A-F]{4}-[1][0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i
-#UUID v2 :
-#/^[0-9A-F]{8}-[0-9A-F]{4}-[2][0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i
-#UUID v3 :
-#/^[0-9A-F]{8}-[0-9A-F]{4}-[3][0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i
-#UUID v4 :
-#/^[0-9A-F]{8}-[0-9A-F]{4}-[4][0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i
-#UUID v5 :
-#/^[0-9A-F]{8}-[0-9A-F]{4}-[5][0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i
-
-
diff --git a/0.14/parsers_java.conf b/0.14/parsers_java.conf
deleted file mode 100644
index b03729a..0000000
--- a/0.14/parsers_java.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[PARSER]
-    Name        java_multiline
-    Format      regex
-    Regex       /^(?<time>\d{4}-\d{1,2}-\d{1,2} \d{1,2}:\d{1,2}:\d{1,2}) \[(?<thread>.*)\] (?<level>[^\s]+)(?<message>.*)/
-    Time_Key    time
-    Time_Format %Y-%m-%d %H:%M:%S
diff --git a/0.14/parsers_mult.conf b/0.14/parsers_mult.conf
deleted file mode 100644
index af9025f..0000000
--- a/0.14/parsers_mult.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-[PARSER]
-    Name        mult_first
-    Format      regex
-    Regex       Started (?<method>[^ ]+) "(?<path>[^"]+)" for (?<host>[^ ]+) at (?<time>[^ ]+ [^ ]+ [^ ]+)
-    Time_Key    time
-    Time_Format %Y-%m-%d %H:%M:%S %z
-
-[PARSER]
-    Name        mult_1
-    Format      regex
-    Regex       /Processing by (?<controller>[^\u0023]+)\u0023(?<controller_method>[^ ]+) as (?<format>[^ ]+?)$/
-
-[PARSER]
-    Name        mult_2
-    Format      regex
-    Regex       (  Parameters: (?<parameters>[^ ]+))?
-
-[PARSER]
-    Name        mult_3
-    Format      regex
-    Regex       /  Rendered (?<template>[^ ]+) within (?<layout>.+) \([\d\.]+ms\)/
-
-[PARSER]
-    Name        mult_4
-    Format      regex
-    Regex       Completed (?<code>[^ ]+) [^ ]+ in (?<runtime>[\d\.]+)ms \(Views: (?<view_runtime>[\d\.]+)ms \| ActiveRecord: (?<ar_runtime>[\d\.]+)ms\)
diff --git a/0.14/parsers_openstack.conf b/0.14/parsers_openstack.conf
deleted file mode 100644
index e1bbc80..0000000
--- a/0.14/parsers_openstack.conf
+++ /dev/null
@@ -1,53 +0,0 @@
-# Example openstack parsers, see source for recent updates:
-# https://github.com/salt-formulas/salt-formula-fluentbit/tree/master/metadata/service/config/parser
-
-# Take these parsers as an example, as they may not fully fit all possible
-# openstack deployments from all vendors, etc..
-
-[PARSER]
-    Name cinder
-    Format regex
-    Regex ^(?<log_time>[^ ][-.\d\+:T]+[ ]*[.:\d]*)\s+(?<pid>[^ ]\d+)\s+(?<severity>[^ ][.-_\w]+)\s+(?<component>[^ ][.-_\w]+)(\s+\[(-|(?<req_id>[^ ][-\w]*) (?<req_user>[^ ][-\w]*) (?<req_project>[^ ][-\w]*) (?<req_domain>[^ ][-\w]*) (?<req_user_domain>[^ ][-\w]*) (?<req_project_domain>[^ ][-\w]*))\]){1}\s+(?<message>.*)$
-    Time_Format %Y-%m-%d %H:%M:%S.%L
-    Time_Keep   Off
-    Time_Key log_time
-
-[PARSER]
-    Name glance
-    Format regex
-    Regex ^(?<log_time>[^ ][-.\d\+:T]+[ ]*[.:\d]*)\s+(?<pid>[^ ]\d+)\s+(?<severity>[^ ][.-_\w]+)\s+(?<component>[^ ][.-_\w]+)(\s+\[(-|(?<req_id>[^ ][-\w]*) (?<req_user>[^ ][-\w]*) (?<req_project>[^ ][-\w]*) (?<req_domain>[^ ][-\w]*) (?<req_user_domain>[^ ][-\w]*) (?<req_project_domain>[^ ][-\w]*))\]){1}\s+(?<message>.*)$
-    Time_Format %Y-%m-%d %H:%M:%S.%L
-    Time_Keep   Off
-    Time_Key log_time
-
-[PARSER]
-    Name heat
-    Format regex
-    Regex ^(?<log_time>[^ ][-.\d\+:T]+[ ]*[.:\d]*)\s+(?<pid>[^ ]\d+)\s+(?<severity>[^ ][.-_\w]+)\s+(?<component>[^ ][.-_\w]+)(\s+\[(-|(?<req_id>[^ ][-\w]*) (?<req_user>[^ ][-\w]*) (?<req_project>[^ ][-\w]*) (?<req_domain>[^ ][-\w]*) (?<req_user_domain>[^ ][-\w]*) (?<req_project_domain>[^ ][-\w]*))\]){1}\s+(?<message>.*)$
-    Time_Format %Y-%m-%d %H:%M:%S.%L
-    Time_Keep   Off
-    Time_Key log_time
-
-[PARSER]
-    Name keystone
-    Format regex
-    Regex ^(?<log_time>[^ ][-.\d\+:T]+[ ]*[.:\d]*)\s+(?<pid>[^ ]\d+)\s+(?<severity>[^ ][.-_\w]+)\s+(?<component>[^ ][.-_\w]+)(\s+\[(-|(?<req_id>[^ ][-\w]*) (?<req_user>[^ ][-\w]*) (?<req_project>[^ ][-\w]*) (?<req_domain>[^ ][-\w]*) (?<req_user_domain>[^ ][-\w]*) (?<req_project_domain>[^ ][-\w]*))\]){1}\s+(?<message>.*)$
-    Time_Format %Y-%m-%d %H:%M:%S.%L
-    Time_Keep   Off
-    Time_Key log_time
-
-[PARSER]
-    Name neutron
-    Format regex
-    Regex ^(?<log_time>[^ ][-.\d\+:T]+[ ]*[.:\d]*)\s+(?<pid>[^ ]\d+)\s+(?<severity>[^ ][.-_\w]+)\s+(?<component>[^ ][.-_\w]+)(\s+\[(-|(?<req_id>[^ ][-\w]*) (?<req_user>[^ ][-\w]*) (?<req_project>[^ ][-\w]*) (?<req_domain>[^ ][-\w]*) (?<req_user_domain>[^ ][-\w]*) (?<req_project_domain>[^ ][-\w]*))\]){1}\s+(?<message>.*)$
-    Time_Format %Y-%m-%d %H:%M:%S.%L
-    Time_Keep   Off
-    Time_Key log_time
-
-[PARSER]
-    Name nova
-    Format regex
-    Regex ^(?<log_time>[^ ][-.\d\+:T]+[ ]*[.:\d]*)\s+(?<pid>[^ ]\d+)\s+(?<severity>[^ ][.-_\w]+)\s+(?<component>[^ ][.-_\w]+)(\s+\[(-|(?<req_id>[^ ][-\w]*) (?<req_user>[^ ][-\w]*) (?<req_project>[^ ][-\w]*) (?<req_domain>[^ ][-\w]*) (?<req_user_domain>[^ ][-\w]*) (?<req_project_domain>[^ ][-\w]*))\]){1}\s+(?<message>.*)$
-    Time_Format %Y-%m-%d %H:%M:%S.%L
-    Time_Keep   Off
-    Time_Key log_time

From 27ff95a618932084715a52deec9ffe89832f3533 Mon Sep 17 00:00:00 2001
From: Eduardo Silva <eduardo@treasure-data.com>
Date: Fri, 22 Mar 2019 14:00:25 -0600
Subject: [PATCH 05/10] doc: update README instructions

Signed-off-by: Eduardo Silva <eduardo@treasure-data.com>
---
 README.md | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 123a1ea..cb72c9c 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,12 @@
 # Fluent Bit Docker Image
 
-[Fluent Bit](http://fluentbit.io) Docker image based on Debian base image from Google.
+[Fluent Bit](https://fluentbit.io) container images are available on Docker Hub ready for production usage. Our stable images are based in [Distroless](https://github.com/GoogleContainerTools/distroless) focusing on security containing just the Fluent Bit binary, minimal system libraries and basic configuration.
+
+Optionally, we provide debug images which contains Busybox that can be used to troubleshoot or testing purposes.
+
+For a detailed list of Tags and versions available, please refer to the the official documentation:
+
+https://docs.fluentbit.io/manual/installation/docker
 
 
 
@@ -20,7 +26,6 @@ Fluent Bit Dockerfiles are located in separated branches with proper tags:
 Use `docker build` command to build the image. This example names the image "fluent-bit:latest":
 
 ```
-$ cd 1.0/
 $ docker build -t fluent/fluent-bit:1.0 ./
 ```
 

From 16886eea7b0c3c918be159ad7c1a8c2d7f2c132c Mon Sep 17 00:00:00 2001
From: Eduardo Silva <eduardo@treasure-data.com>
Date: Mon, 20 May 2019 17:07:02 +0200
Subject: [PATCH 06/10] doc: update README with latest tags

Signed-off-by: Eduardo Silva <eduardo@treasure-data.com>
---
 README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index cb72c9c..6cbc261 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,8 @@ Fluent Bit Dockerfiles are located in separated branches with proper tags:
 
 | Branch | Tags Available                                               |
 | ------ | ------------------------------------------------------------ |
-| 1.0    | 1.0, 1.0-debug, 1.0.0, 1.0.1, 1.0.2, 1.0.3, 1.0.3-debug, 1.0.4, 1.0.4-debug |
+| 1.1    | 1.1, 1.1-debug, 1.1.0, 1.1.0-debug, 1.1.1, 1.1.1-debug       |
+| 1.0    | 1.0, 1.0-debug, 1.0.0, 1.0.1, 1.0.2, 1.0.3, 1.0.3-debug, 1.0.4, 1.0.4-debug, 1.0.5, 1.0.5-debug, 1.0.6, 1.0.6-debug |
 | 0.14   | 0.14, 0.14.0, 0.14.1, 0.14.2, 0.14.3, 0.14.4, 0.14.5, 0.14.6, 0.14.7, 0.14.8, 0.14.9 |
 | 0.13   | 0.13, 0.13.0, 0.13.1, 0.13.2, 0.13.3, 0.13.4, 0.13.5, 0.13.6, 0.13.7, 0.13.8 |
 | 0.12   | 0.12, 0.12.19, 0.12.18, 0.12.17, 0.12.16, 0.12.15, 0.12.14, 0.12.13, 0.12.12, 0.12.11, 0.12.10, 0.12.9, 0.12.8, 0.12.7, 0.12.6, 0.12.5, 0.12.4, 0.12.3, 0.12.2, 0.12.1, 0.12.0 |
@@ -47,7 +48,7 @@ $ docker run --log-driver=fluentd -t ubuntu echo "Testing a log message"
 On Fluent Bit container will print to stdout something like this:
 
 ```
-Fluent Bit v1.0.4
+Fluent Bit v1.1.x
 Copyright (C) Treasure Data
 
 [0] docker.31c94ceb86ca: [1487548735, {"container_id"=>"31c94ceb86cae7055564eb4d65cd2e2897addd252fe6b86cd11bddd70a871c08", "container_name"=>"/admiring_shannon", "source"=>"stdout","}]og"=>"Testing a log message

From 811c98afa87db8c3d0275412269d145346a26d9a Mon Sep 17 00:00:00 2001
From: Eduardo Silva <eduardo@treasure-data.com>
Date: Tue, 9 Jul 2019 16:55:50 -0600
Subject: [PATCH 07/10] doc: update tags

Signed-off-by: Eduardo Silva <eduardo@treasure-data.com>
---
 README.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 6cbc261..0cee231 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,8 @@ Fluent Bit Dockerfiles are located in separated branches with proper tags:
 
 | Branch | Tags Available                                               |
 | ------ | ------------------------------------------------------------ |
-| 1.1    | 1.1, 1.1-debug, 1.1.0, 1.1.0-debug, 1.1.1, 1.1.1-debug       |
+| 1.2    | 1.2, 1.2-debug, 1.2.0, 1.2.0-debug, 1.2.1, 1.2.1-debug |
+| 1.1    | 1.1, 1.1-debug, 1.1.0, 1.1.0-debug, 1.1.1, 1.1.1-debug, 1.1.2, 1.1.2-debug, 1.1.3, 1.1.3-debug |
 | 1.0    | 1.0, 1.0-debug, 1.0.0, 1.0.1, 1.0.2, 1.0.3, 1.0.3-debug, 1.0.4, 1.0.4-debug, 1.0.5, 1.0.5-debug, 1.0.6, 1.0.6-debug |
 | 0.14   | 0.14, 0.14.0, 0.14.1, 0.14.2, 0.14.3, 0.14.4, 0.14.5, 0.14.6, 0.14.7, 0.14.8, 0.14.9 |
 | 0.13   | 0.13, 0.13.0, 0.13.1, 0.13.2, 0.13.3, 0.13.4, 0.13.5, 0.13.6, 0.13.7, 0.13.8 |
@@ -27,7 +28,7 @@ Fluent Bit Dockerfiles are located in separated branches with proper tags:
 Use `docker build` command to build the image. This example names the image "fluent-bit:latest":
 
 ```
-$ docker build -t fluent/fluent-bit:1.0 ./
+$ docker build -t fluent/fluent-bit:1.2 ./
 ```
 
 ## 3. Test it
@@ -48,7 +49,7 @@ $ docker run --log-driver=fluentd -t ubuntu echo "Testing a log message"
 On Fluent Bit container will print to stdout something like this:
 
 ```
-Fluent Bit v1.1.x
+Fluent Bit v1.2.x
 Copyright (C) Treasure Data
 
 [0] docker.31c94ceb86ca: [1487548735, {"container_id"=>"31c94ceb86cae7055564eb4d65cd2e2897addd252fe6b86cd11bddd70a871c08", "container_name"=>"/admiring_shannon", "source"=>"stdout","}]og"=>"Testing a log message

From 0bb95b0516bc0bb9fe6eba718e2c8c32debf5951 Mon Sep 17 00:00:00 2001
From: robertyoung81 <robertyoung81@users.noreply.github.com>
Date: Wed, 20 May 2020 17:24:12 -0700
Subject: [PATCH 08/10] Fix "Test it" section

Fix "Test it" section so fluent-bit container starts up with listener on TCP port 24224 since the default configuration is missing this.

Signed-off-by: Robert Young <robert.young1@zebra.com>
---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0cee231..2eff6cf 100644
--- a/README.md
+++ b/README.md
@@ -37,9 +37,11 @@ Once the image is built, it's ready to run:
 
 ```
 docker run -p 127.0.0.1:24224:24224 fluent/fluent-bit:latest
+docker run -p 127.0.0.1:24224:24224 fluent/fluent-bit:latest /fluent-bit/bin/fluent-bit -i forward://0.0.0.0:24224 -o stdout
+
 ```
 
-By default, the configuration set a listener on TCP port 24224 through Forward protocol and prints to the standard output interface each message. So this can be used to forward Docker log messages from one container to the Fluent Bit image, e.g:
+This starts fluent-bit with a listener on TCP port 24224 through Forward protocol and prints to the standard output interface each message. So this can be used to forward Docker log messages from one container to the Fluent Bit image, e.g:
 
 ```
 $ docker run --log-driver=fluentd -t ubuntu echo "Testing a log message"

From 26fd4aba0b6d4a072d8917c7fe10d8376494468d Mon Sep 17 00:00:00 2001
From: robertyoung81 <robertyoung81@users.noreply.github.com>
Date: Wed, 20 May 2020 17:27:16 -0700
Subject: [PATCH 09/10] Update README.md

Signed-off-by: Robert Young <robert.young1@zebra.com>
---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 2eff6cf..a5df77b 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,6 @@ $ docker build -t fluent/fluent-bit:1.2 ./
 Once the image is built, it's ready to run:
 
 ```
-docker run -p 127.0.0.1:24224:24224 fluent/fluent-bit:latest
 docker run -p 127.0.0.1:24224:24224 fluent/fluent-bit:latest /fluent-bit/bin/fluent-bit -i forward://0.0.0.0:24224 -o stdout
 
 ```

From 241d97e0b7360b8de75e3cbaf22f8a98da6c1af4 Mon Sep 17 00:00:00 2001
From: robertyoung81 <robertyoung81@users.noreply.github.com>
Date: Wed, 20 May 2020 17:30:33 -0700
Subject: [PATCH 10/10] Update README.md

Signed-off-by: Robert Young <robert.young1@zebra.com>
---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index a5df77b..215283f 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,6 @@ Once the image is built, it's ready to run:
 
 ```
 docker run -p 127.0.0.1:24224:24224 fluent/fluent-bit:latest /fluent-bit/bin/fluent-bit -i forward://0.0.0.0:24224 -o stdout
-
 ```
 
 This starts fluent-bit with a listener on TCP port 24224 through Forward protocol and prints to the standard output interface each message. So this can be used to forward Docker log messages from one container to the Fluent Bit image, e.g: