From 6b15aac2afc75fae44036c8f4b518770f87bc577 Mon Sep 17 00:00:00 2001
From: Ryan Luckie <rtluckie@users.noreply.github.com>
Date: Sun, 15 Jul 2018 11:44:55 -0500
Subject: [PATCH] [stable/filebeat] filebeat fixes (#6332)

* Filebeat fixes

- remove opinionated tolerations
- use oss image
- bump image version to 6.3.0
- include `/var/log/messages` and `/var/log/syslog`
- fix indent in .Values.config
- bump chart version
- bump appVersion

* requested changes

* requested changes

- bump chart minor version
- bump filebeat image version to 6.3.1

* Requested changes

- update default `.Values.tolerations` to ensure filebeat pod is scheduled on every node (including masters)
---
 stable/filebeat/Chart.yaml               |  4 +--
 stable/filebeat/templates/daemonset.yaml | 18 ++++++----
 stable/filebeat/values.yaml              | 43 ++++++++++++++----------
 3 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/stable/filebeat/Chart.yaml b/stable/filebeat/Chart.yaml
index 4fdd296999..ff16f4f144 100644
--- a/stable/filebeat/Chart.yaml
+++ b/stable/filebeat/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v1
 description: A Helm chart to collect Kubernetes logs with filebeat
 icon: https://www.elastic.co/assets/blt47799dcdcf08438d/logo-elastic-beats-lt.svg
 name: filebeat
-version: 0.3.0
-appVersion: 6.2.3
+version: 0.4.0
+appVersion: 6.3.1
 home: https://www.elastic.co/products/beats/filebeat
 sources:
 - https://www.elastic.co/guide/en/beats/filebeat/current/index.html
diff --git a/stable/filebeat/templates/daemonset.yaml b/stable/filebeat/templates/daemonset.yaml
index aae1b05e95..d13dcf0700 100644
--- a/stable/filebeat/templates/daemonset.yaml
+++ b/stable/filebeat/templates/daemonset.yaml
@@ -91,11 +91,15 @@ spec:
 {{- end }}
       terminationGracePeriodSeconds: 60
       serviceAccountName: {{ template "filebeat.serviceAccountName" . }}
-      tolerations:
-      - key: node-role.kubernetes.io/master
-        operator: Exists
-        effect: NoSchedule
-{{- if .Values.nodeSelector }}
+    {{- with .Values.nodeSelector }}
       nodeSelector:
-{{ toYaml .Values.nodeSelector | indent 8 }}
-{{- end }}
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
diff --git a/stable/filebeat/values.yaml b/stable/filebeat/values.yaml
index f98e024efa..722c64f2e0 100644
--- a/stable/filebeat/values.yaml
+++ b/stable/filebeat/values.yaml
@@ -1,6 +1,6 @@
 image:
-  repository: docker.elastic.co/beats/filebeat
-  tag: 6.2.3
+  repository: docker.elastic.co/beats/filebeat-oss
+  tag: 6.3.1
   pullPolicy: IfNotPresent
 
 config:
@@ -16,23 +16,25 @@ config:
       reload.enabled: false
 
   processors:
-  - add_cloud_metadata:
+    - add_cloud_metadata:
 
   filebeat.prospectors:
-  - type: log
-    enabled: true
-    paths:
-    - /var/log/*.log
-  - type: docker
-    containers.ids:
-    - "*"
-    processors:
-    - add_kubernetes_metadata:
-        in_cluster: true
-    - drop_event:
-        when:
-          equals:
-            kubernetes.container.name: "filebeat"
+    - type: log
+      enabled: true
+      paths:
+        - /var/log/*.log
+        - /var/log/messages
+        - /var/log/syslog
+    - type: docker
+      containers.ids:
+      - "*"
+      processors:
+        - add_kubernetes_metadata:
+            in_cluster: true
+        - drop_event:
+            when:
+              equals:
+                kubernetes.container.name: "filebeat"
 
   output.file:
     path: "/usr/share/filebeat/data"
@@ -75,6 +77,13 @@ resources: {}
   #  cpu: 100m
   #  memory: 100Mi
 
+nodeSelector: {}
+
+tolerations:
+  - operator: Exists
+
+affinity: {}
+
 rbac:
   # Specifies whether RBAC resources should be created
   create: true