From 55e608505ae38897f744d41330d679877afcbb44 Mon Sep 17 00:00:00 2001
From: Thomas Burton <tburton@isenpai.com>
Date: Mon, 6 Jul 2020 14:25:57 -0400
Subject: [PATCH 1/2] initial private fluentbit repo

---
 README.md            |  44 +++++++++++++++++-
 config-map.yaml      | 106 +++++++++++++++++++++++++++++++++++++++++++
 daemon-set.yaml      |  52 +++++++++++++++++++++
 kustomization.yml    |  11 +++++
 role-binding.yaml    |  12 +++++
 role.yaml            |  10 ++++
 service-account.yaml |   5 ++
 7 files changed, 239 insertions(+), 1 deletion(-)
 create mode 100644 config-map.yaml
 create mode 100644 daemon-set.yaml
 create mode 100644 kustomization.yml
 create mode 100644 role-binding.yaml
 create mode 100644 role.yaml
 create mode 100644 service-account.yaml

diff --git a/README.md b/README.md
index d8a4f15..190cfd2 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,44 @@
-# fluentbit
+# Fluentbit
 
+Manifests pulled from official Fluentbit docs [here](https://docs.fluentbit.io/manual/installation/kubernetes).
+
+Most of the time, you will have to use kustomize to patch elasticsearch usernames and passwords. We don't include it here cause nothing in this repo will be responsible for creating the secrets in kubernetes.
+
+Check this out:
+
+kustomization.yaml
+```
+namespace: elastic
+
+bases:
+  - fluentbit-pkg/
+
+patchesStrategicMerge:
+- patch.yaml
+
+```
+
+
+patch.yaml
+```
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: fluent-bit
+spec:
+  template:
+    spec:
+      containers:
+      - name: fluent-bit
+        env:
+        - name: FLUENT_ELASTICSEARCH_HOST
+          value: elasticsearch-es-http
+        - name: FLUENT_ELASTICSEARCH_USER
+          value: elastic
+        - name: FLUENT_ELASTICSEARCH_PASS
+          valueFrom:
+            secretKeyRef:
+              name: elasticsearch-es-elastic-user
+              key: elastic
+
+```
\ No newline at end of file
diff --git a/config-map.yaml b/config-map.yaml
new file mode 100644
index 0000000..e723323
--- /dev/null
+++ b/config-map.yaml
@@ -0,0 +1,106 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: fluent-bit-config
+  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
+        HTTP_Server   On
+        HTTP_Listen   0.0.0.0
+        HTTP_Port     2020
+
+    @INCLUDE input-kubernetes.conf
+    @INCLUDE filter-kubernetes.conf
+    @INCLUDE output-elasticsearch.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
+        Kube_CA_File        /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
+        Kube_Token_File     /var/run/secrets/kubernetes.io/serviceaccount/token
+        Kube_Tag_Prefix     kube.var.log.containers.
+        Merge_Log           On
+        Merge_Log_Key       log_processed
+        K8S-Logging.Parser  On
+        K8S-Logging.Exclude On
+
+  output-elasticsearch.conf: |
+    [OUTPUT]
+        Name            es
+        Match           *
+        Host            ${FLUENT_ELASTICSEARCH_HOST}
+        Port            9200
+        HTTP_User       ${FLUENT_ELASTICSEARCH_USER}
+        HTTP_Passwd     ${FLUENT_ELASTICSEARCH_PASS}
+        Logstash_Format On
+        Replace_Dots    On
+        Retry_Limit     False
+        Logstash_Prefix kubernetes
+
+  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
+        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/daemon-set.yaml b/daemon-set.yaml
new file mode 100644
index 0000000..4554a47
--- /dev/null
+++ b/daemon-set.yaml
@@ -0,0 +1,52 @@
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: fluent-bit
+  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"
+      annotations:
+        prometheus.io/scrape: "true"
+        prometheus.io/port: "2020"
+        prometheus.io/path: /api/v1/metrics/prometheus
+        fluentbit.io/exclude-istio-proxy: "true"
+    spec:
+      containers:
+      - name: fluent-bit
+        image: fluent/fluent-bit:1.4.2
+        imagePullPolicy: Always
+        ports:
+          - containerPort: 2020
+        env:
+        - name: FLUENT_ELASTICSEARCH_HOST
+          value: $(ELASTICSEARCH_HOST)
+        volumeMounts:
+        - name: varlog
+          mountPath: /var/log
+        - name: fluent-bit-config
+          mountPath: /fluent-bit/etc/
+      terminationGracePeriodSeconds: 10
+      volumes:
+      - name: varlog
+        hostPath:
+          path: /var/log
+      - name: fluent-bit-config
+        configMap:
+          name: fluent-bit-config
+      serviceAccountName: fluent-bit
+      tolerations:
+      - key: node-role.kubernetes.io/master
+        operator: Exists
+        effect: NoSchedule
+      - operator: "Exists"
+        effect: "NoExecute"
+      - operator: "Exists"
+        effect: "NoSchedule"
diff --git a/kustomization.yml b/kustomization.yml
new file mode 100644
index 0000000..c59c0c6
--- /dev/null
+++ b/kustomization.yml
@@ -0,0 +1,11 @@
+namespace: elastic
+
+commonLabels:
+  app: fluentbit
+
+resources:
+  - role.yaml
+  - role-binding.yaml
+  - service-account.yaml
+  - config-map.yaml
+  - daemon-set.yaml
diff --git a/role-binding.yaml b/role-binding.yaml
new file mode 100644
index 0000000..ff6f258
--- /dev/null
+++ b/role-binding.yaml
@@ -0,0 +1,12 @@
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRoleBinding
+metadata:
+  name: fluent-bit-read
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: fluent-bit-read
+subjects:
+- kind: ServiceAccount
+  name: fluent-bit
+  namespace: logging
diff --git a/role.yaml b/role.yaml
new file mode 100644
index 0000000..e55463a
--- /dev/null
+++ b/role.yaml
@@ -0,0 +1,10 @@
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRole
+metadata:
+  name: fluent-bit-read
+rules:
+- apiGroups: [""]
+  resources:
+  - namespaces
+  - pods
+  verbs: ["get", "list", "watch"]
diff --git a/service-account.yaml b/service-account.yaml
new file mode 100644
index 0000000..c541d81
--- /dev/null
+++ b/service-account.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: fluent-bit
+  namespace: logging
-- 
GitLab


From 7ccf9376e6db41ef583dae4e9fe35465a8cc2e01 Mon Sep 17 00:00:00 2001
From: Thomas Burton <tburton@isenpai.com>
Date: Tue, 7 Jul 2020 10:02:36 -0400
Subject: [PATCH 2/2] added changelog and contributing

---
 docs/CHANGELOG.md    |  3 +++
 docs/CONTRIBUTING.md | 20 ++++++++++++++++++++
 docs/README.md       | 44 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 67 insertions(+)
 create mode 100644 docs/CHANGELOG.md
 create mode 100644 docs/CONTRIBUTING.md
 create mode 100644 docs/README.md

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
new file mode 100644
index 0000000..9f7063c
--- /dev/null
+++ b/docs/CHANGELOG.md
@@ -0,0 +1,3 @@
+# v0.1.0 - July 6, 2020
+
+Initial copy from Private Big Bang
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
new file mode 100644
index 0000000..bbf3df6
--- /dev/null
+++ b/docs/CONTRIBUTING.md
@@ -0,0 +1,20 @@
+Contributing
+Thanks for contributing to this repository!
+This repository follows the following conventions:
+
+Semantic Versioning
+Keep a Changelog
+Conventional Commits
+
+Development requires the Kubernetes CLI tool as well as a local Kubernetes cluster. KIND is recommended as a lightweight local option for standing up Kubernetes clusters.
+To contribute a change:
+
+Create a branch on the cloned repository with a descriptive name, prefixed with your name. For example, gd/add-ingress is an appropriate branch name.
+Make the changes in code.
+Write tests using KUTTL and Conftest
+
+Make commits using the Conventional Commits format. This helps with automation for changelog. Update CHANGELOG.md in the same commit using the Keep a Changelog. Depending on tooling maturity, this step may be automated.
+Open a merge request using one of the provided templates. If this merge request is solving a preexisting issue, add the issue reference into the description of the MR.
+During this time, ensure that all new commits are rebased into your branch so that it remains up to date with the development branch.
+Wait for a maintainer of the repository (see CODEOWNERS) to approve.
+If you have permissions to merge, you are responsible for merging. Otherwise, a CODEOWNER will merge the commit.
\ No newline at end of file
diff --git a/docs/README.md b/docs/README.md
new file mode 100644
index 0000000..190cfd2
--- /dev/null
+++ b/docs/README.md
@@ -0,0 +1,44 @@
+# Fluentbit
+
+Manifests pulled from official Fluentbit docs [here](https://docs.fluentbit.io/manual/installation/kubernetes).
+
+Most of the time, you will have to use kustomize to patch elasticsearch usernames and passwords. We don't include it here cause nothing in this repo will be responsible for creating the secrets in kubernetes.
+
+Check this out:
+
+kustomization.yaml
+```
+namespace: elastic
+
+bases:
+  - fluentbit-pkg/
+
+patchesStrategicMerge:
+- patch.yaml
+
+```
+
+
+patch.yaml
+```
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: fluent-bit
+spec:
+  template:
+    spec:
+      containers:
+      - name: fluent-bit
+        env:
+        - name: FLUENT_ELASTICSEARCH_HOST
+          value: elasticsearch-es-http
+        - name: FLUENT_ELASTICSEARCH_USER
+          value: elastic
+        - name: FLUENT_ELASTICSEARCH_PASS
+          valueFrom:
+            secretKeyRef:
+              name: elasticsearch-es-elastic-user
+              key: elastic
+
+```
\ No newline at end of file
-- 
GitLab