From dfa9d3a3204f360879ea784c1dea420cc898db6b Mon Sep 17 00:00:00 2001
From: Matteo Gazzetta <matteo_gazzetta@hotmail.it>
Date: Mon, 14 Jan 2019 23:38:07 +0100
Subject: [PATCH] Update metricbeat to 6.5.4 and added required cluster role
 permission for kubelet auth (#10592)

Signed-off-by: Matteo Gazzetta <matteo_gazzetta@hotmail.it>
---
 stable/metricbeat/Chart.yaml                 | 4 ++--
 stable/metricbeat/templates/clusterrole.yaml | 4 ++++
 stable/metricbeat/values.yaml                | 9 ++++++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/stable/metricbeat/Chart.yaml b/stable/metricbeat/Chart.yaml
index 44dc18dd57..51426706d3 100644
--- a/stable/metricbeat/Chart.yaml
+++ b/stable/metricbeat/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v1
 description: A Helm chart to collect Kubernetes logs with metricbeat
 icon: https://www.elastic.co/assets/blt47799dcdcf08438d/logo-elastic-beats-lt.svg
 name: metricbeat
-version: 0.4.3
-appVersion: 6.5.1
+version: 0.4.4
+appVersion: 6.5.4
 home: https://www.elastic.co/products/beats/metricbeat
 sources:
 - https://www.elastic.co/guide/en/beats/metricbeat/current/index.html
diff --git a/stable/metricbeat/templates/clusterrole.yaml b/stable/metricbeat/templates/clusterrole.yaml
index eccc796cdd..ab985f798e 100644
--- a/stable/metricbeat/templates/clusterrole.yaml
+++ b/stable/metricbeat/templates/clusterrole.yaml
@@ -25,6 +25,10 @@ rules:
   - statefulsets
   - deployments
   verbs: ["get", "list", "watch"]
+- apiGroups: [""]
+  resources:
+  - nodes/stats
+  verbs: ["get"]
 - nonResourceURLs: ["/metrics"]
   verbs: ["get"]
 {{- end -}}
diff --git a/stable/metricbeat/values.yaml b/stable/metricbeat/values.yaml
index 13d56da94f..d20814e664 100644
--- a/stable/metricbeat/values.yaml
+++ b/stable/metricbeat/values.yaml
@@ -1,6 +1,6 @@
 image:
   repository: docker.elastic.co/beats/metricbeat
-  tag: 6.5.1
+  tag: 6.5.4
   pullPolicy: IfNotPresent
 
 # The instances created by daemonset retrieve most metrics from the host
@@ -62,7 +62,14 @@ daemonset:
             - container
             - volume
           period: 10s
+          host: ${NODE_NAME}
           hosts: ["localhost:10255"]
+          # If using Red Hat OpenShift remove the previous hosts entry and
+          # uncomment these settings:
+          # hosts: ["https://${HOSTNAME}:10250"]
+          # bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
+          # ssl.certificate_authorities:
+            # - /var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt
 # The instance created by deployment retrieves metrics that are unique for the whole cluster, like Kubernetes events or kube-state-metrics
 deployment:
   podAnnotations: []