From a3b23ad6fe65cc336379e887e748d739d9814dc4 Mon Sep 17 00:00:00 2001
From: Taylor Shaulis <taylor.shaulis@cfa.harvard.edu>
Date: Fri, 30 Mar 2018 11:59:39 -0400
Subject: [PATCH 1/2] Created Forward output yamls

---
 output/forward/fluent-bit-configmap.yaml | 95 ++++++++++++++++++++++++
 output/forward/fluent-bit-ds.yaml        | 49 ++++++++++++
 2 files changed, 144 insertions(+)
 create mode 100644 output/forward/fluent-bit-configmap.yaml
 create mode 100644 output/forward/fluent-bit-ds.yaml

diff --git a/output/forward/fluent-bit-configmap.yaml b/output/forward/fluent-bit-configmap.yaml
new file mode 100644
index 0000000..f8a0c55
--- /dev/null
+++ b/output/forward/fluent-bit-configmap.yaml
@@ -0,0 +1,95 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: fluent-bit-config
+  namespace: logging
+  labels:
+    k8s-app: fluent-bit
+data:
+  # Configuration files: server, input, filters and output
+  # ======================================================
+  fluent-bit.conf: |
+    [SERVICE]
+        Flush         1
+        Log_Level     info
+        Daemon        off
+        Parsers_File  parsers.conf
+
+    @INCLUDE input-kubernetes.conf
+    @INCLUDE filter-kubernetes.conf
+    @INCLUDE output-forward.conf
+
+  input-kubernetes.conf: |
+    [INPUT]
+        Name              tail
+        Tag               kube.*
+        Path              /var/log/containers/*.log
+        Parser            docker
+        DB                /var/log/flb_kube.db
+        Mem_Buf_Limit     5MB
+        Skip_Long_Lines   On
+        Refresh_Interval  10
+
+  filter-kubernetes.conf: |
+    [FILTER]
+        Name           kubernetes
+        Match          kube.*
+        Kube_URL       https://kubernetes.default.svc:443
+        Merge_JSON_Log On
+
+  output-forward.conf: |
+    [OUTPUT]
+        Name            forward
+        Match           *
+        Host            ${FLUENT_FORWARD_HOST}
+        Port            ${FLUENT_FORWARD_PORT}
+        Logstash_Format On
+        Retry_Limit     False
+        Time_as_Integer True
+
+  parsers.conf: |
+    [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-test
+        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
+
+    [PARSER]
+        Name        syslog
+        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
diff --git a/output/forward/fluent-bit-ds.yaml b/output/forward/fluent-bit-ds.yaml
new file mode 100644
index 0000000..e8fd838
--- /dev/null
+++ b/output/forward/fluent-bit-ds.yaml
@@ -0,0 +1,49 @@
+apiVersion: extensions/v1beta1
+kind: DaemonSet
+metadata:
+  name: fluent-bit
+  namespace: logging
+  labels:
+    k8s-app: fluent-bit-logging
+    version: v1
+    kubernetes.io/cluster-service: "true"
+spec:
+  template:
+    metadata:
+      labels:
+        k8s-app: fluent-bit-logging
+        version: v1
+        kubernetes.io/cluster-service: "true"
+    spec:
+      containers:
+      - name: fluent-bit
+        image: fluent/fluent-bit:0.12.14
+        env:
+        - name: FLUENT_FORWARD_HOST
+          value: "fluentd"
+        - name: FLUENT_FORWARD_PORT
+          value: "24224"
+        volumeMounts:
+        - name: varlog
+          mountPath: /var/log
+        - name: varlibdockercontainers
+          mountPath: /var/lib/docker/containers
+          readOnly: true
+        - name: fluent-bit-config
+          mountPath: /fluent-bit/etc/
+      terminationGracePeriodSeconds: 10
+      volumes:
+      - name: varlog
+        hostPath:
+          path: /var/log
+      - name: varlibdockercontainers
+        hostPath:
+          path: /var/lib/docker/containers
+      - name: fluent-bit-config
+        configMap:
+          name: fluent-bit-config
+      serviceAccountName: fluent-bit
+      tolerations:
+      - key: node-role.kubernetes.io/master
+        operator: Exists
+        effect: NoSchedule

From fe5160aa93f9f281fbb5f0ec90bc84aa2a7ab5ff Mon Sep 17 00:00:00 2001
From: Taylor Shaulis <tshaulis@sofi.org>
Date: Thu, 27 Sep 2018 10:22:14 -0600
Subject: [PATCH 2/2] Release v0.14.3

---
 output/forward/fluent-bit-ds.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/output/forward/fluent-bit-ds.yaml b/output/forward/fluent-bit-ds.yaml
index e8fd838..4c3009e 100644
--- a/output/forward/fluent-bit-ds.yaml
+++ b/output/forward/fluent-bit-ds.yaml
@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
       - name: fluent-bit
-        image: fluent/fluent-bit:0.12.14
+        image: fluent/fluent-bit:0.14.3
         env:
         - name: FLUENT_FORWARD_HOST
           value: "fluentd"