elastic · Crazybus · May 9, 2019 · May 3, 2019 · May 3, 2019 · May 3, 2019
diff --git a/elasticsearch/README.md b/elasticsearch/README.md
@@ -42,7 +42,7 @@ This chart is tested with the latest supported versions. The currently tested ve
 
 | 5.x    | 6.x   | 7.x   |
 | ------ | ----- | ----- |
-| 5.6.16 | 6.7.1 | 7.0.1 |
+| 5.6.16 | 6.7.2 | 7.0.1 |
 
 Examples of installing older major versions can be found in the [examples](./examples) directory.
 

diff --git a/elasticsearch/examples/6.x/test/goss.yaml b/elasticsearch/examples/6.x/test/goss.yaml
@@ -11,7 +11,7 @@ http:
     status: 200
     timeout: 2000
     body:
-      - '"number" : "6.7.1"'
+      - '"number" : "6.7.2"'
       - '"cluster_name" : "six"'
       - '"name" : "six-master-0"'
       - 'You Know, for Search'
diff --git a/elasticsearch/examples/6.x/values.yaml b/elasticsearch/examples/6.x/values.yaml
@@ -1,5 +1,5 @@
 ---
 
 clusterName: "six"
-imageTag: "6.7.1"
+imageTag: "6.7.2"
 esMajorVersion: 6
diff --git a/elasticsearch/examples/oss/Makefile b/elasticsearch/examples/oss/Makefile
@@ -0,0 +1,12 @@
+default: test
+include ../../../helpers/examples.mk
+
+RELEASE := helm-es-oss
+
+install:
+	helm upgrade --wait --timeout=600 --install $(RELEASE) --values ./values.yaml ../../ ; \
+
+test: install goss
+
+purge:
+	helm del --purge $(RELEASE)
diff --git a/elasticsearch/examples/oss/test/goss.yaml b/elasticsearch/examples/oss/test/goss.yaml
@@ -0,0 +1,17 @@
+http:
+  http://localhost:9200/_cluster/health:
+    status: 200
+    timeout: 2000
+    body:
+      - 'green'
+      - '"number_of_nodes":3'
+      - '"number_of_data_nodes":3'
+
+  http://localhost:9200:
+    status: 200
+    timeout: 2000
+    body:
+      - '"number" : "7.0.1"'
+      - '"cluster_name" : "oss"'
+      - '"name" : "oss-master-0"'
+      - 'You Know, for Search'
diff --git a/elasticsearch/examples/oss/values.yaml b/elasticsearch/examples/oss/values.yaml
@@ -0,0 +1,4 @@
+---
+
+clusterName: "oss"
+image: "docker.elastic.co/elasticsearch/elasticsearch-oss"
diff --git a/filebeat/Chart.yaml b/filebeat/Chart.yaml
@@ -4,8 +4,8 @@ maintainers:
 - email: helm-charts@elastic.co
   name: Elastic
 name: filebeat
-version: 7.0.0-alpha1
-appVersion: 7.0.0
+version: 7.0.1-alpha1
+appVersion: 7.0.1
 sources:
   - https://github.com/elastic/beats
 icon: https://helm.elastic.co/icons/filebeat.png
diff --git a/filebeat/README.md b/filebeat/README.md
diff --git a/filebeat/examples/6.x/Makefile b/filebeat/examples/6.x/Makefile
@@ -0,0 +1,13 @@
+default: test
+
+include ../../../helpers/examples.mk
+
+RELEASE := helm-filebeat-six
+
+install:
+	helm upgrade --wait --timeout=600 --install $(RELEASE) --values values.yaml ../../
+
+test: install goss
+
+purge:
+	helm del --purge $(RELEASE)
diff --git a/filebeat/examples/6.x/test/goss.yaml b/filebeat/examples/6.x/test/goss.yaml
@@ -0,0 +1,21 @@
+port:
+  tcp:5066:
+    listening: true
+    ip:
+    - '127.0.0.1'
+
+mount:
+  /usr/share/filebeat/data:
+    exists: true
+user:
+  filebeat:
+    exists: true
+    uid: 1000
+    gid: 1000
+
+http:
+  http://six-master:9200/_cat/indices:
+    status: 200
+    timeout: 2000
+    body:
+      - 'filebeat-6.7.2'
diff --git a/filebeat/examples/6.x/values.yaml b/filebeat/examples/6.x/values.yaml
@@ -0,0 +1,5 @@
+imageTag: 6.7.2
+
+extraEnvs:
+  - name: ELASTICSEARCH_HOSTS
+    value: six-master:9200
diff --git a/filebeat/examples/default/Makefile b/filebeat/examples/default/Makefile
@@ -5,7 +5,7 @@ include ../../../helpers/examples.mk
 RELEASE := helm-filebeat-default
 
 install:
-	helm upgrade --wait --timeout=600 --values values.yaml --install $(RELEASE) ../../
+	helm upgrade --wait --timeout=600 --install $(RELEASE) ../../
 
 test: install goss
 

diff --git a/filebeat/examples/default/test/goss.yaml b/filebeat/examples/default/test/goss.yaml
@@ -7,9 +7,41 @@ port:
 mount:
   /usr/share/filebeat/data:
     exists: true
+  /run/docker.sock:
+    exists: true
+  /var/lib/docker/containers:
+    exists: true
+    opts:
+      - ro
+  /usr/share/filebeat/filebeat.yml:
+    exists: true
+    opts:
+      - ro
 
 user:
   filebeat:
     exists: true
     uid: 1000
     gid: 1000
+
+http:
+  http://elasticsearch-master:9200/_cat/indices:
+    status: 200
+    timeout: 2000
+    body:
+      - 'filebeat-7.0.1'
+
+file:
+  /usr/share/filebeat/filebeat.yml:
+    exists: true
+    contains:
+      - 'add_kubernetes_metadata'
+      - 'output.elasticsearch'
+      - 'elasticsearch-master:9200'
+
+command:
+  cd /usr/share/filebeat && filebeat test output:
+    exit-status: 0
+    stdout:
+      - 'elasticsearch: http://elasticsearch-master:9200'
+      - 'version: 7.0.1'
diff --git a/filebeat/examples/default/values.yaml b/filebeat/examples/default/values.yaml
diff --git a/filebeat/examples/oss/Makefile b/filebeat/examples/oss/Makefile
@@ -0,0 +1,13 @@
+default: test
+
+include ../../../helpers/examples.mk
+
+RELEASE := helm-filebeat-oss
+
+install:
+	helm upgrade --wait --timeout=600 --install $(RELEASE) --values values.yaml ../../
+
+test: install goss
+
+purge:
+	helm del --purge $(RELEASE)
diff --git a/filebeat/examples/oss/test/goss.yaml b/filebeat/examples/oss/test/goss.yaml
@@ -0,0 +1,22 @@
+port:
+  tcp:5066:
+    listening: true
+    ip:
+    - '127.0.0.1'
+
+mount:
+  /usr/share/filebeat/data:
+    exists: true
+
+user:
+  filebeat:
+    exists: true
+    uid: 1000
+    gid: 1000
+
+http:
+  http://oss-master:9200/_cat/indices:
+    status: 200
+    timeout: 2000
+    body:
+      - 'filebeat-7.0.1'
diff --git a/filebeat/examples/oss/values.yaml b/filebeat/examples/oss/values.yaml
@@ -0,0 +1,5 @@
+image: docker.elastic.co/beats/filebeat-oss
+
+extraEnvs:
+  - name: ELASTICSEARCH_HOSTS
+    value: oss-master:9200
diff --git a/filebeat/examples/security/Makefile b/filebeat/examples/security/Makefile
@@ -0,0 +1,13 @@
+default: test
+
+include ../../../helpers/examples.mk
+
+RELEASE := helm-filebeat-security
+
+install:
+	helm upgrade --wait --timeout=600 --install $(RELEASE) --values values.yaml ../../
+
+test: install goss
+
+purge:
+	helm del --purge $(RELEASE)
diff --git a/filebeat/examples/security/test/goss.yaml b/filebeat/examples/security/test/goss.yaml
@@ -0,0 +1,9 @@
+http:
+  https://security-master:9200/_cat/indices:
+    status: 200
+    timeout: 2000
+    body:
+      - 'filebeat-7.0.1'
+    allow-insecure: true
+    username: '{{ .Env.ELASTICSEARCH_USERNAME }}'
+    password: '{{ .Env.ELASTICSEARCH_PASSWORD }}'
diff --git a/filebeat/examples/security/values.yaml b/filebeat/examples/security/values.yaml
@@ -0,0 +1,34 @@
+filebeatConfig:
+  filebeat.yml: |
+    filebeat.inputs:
+    - type: docker
+      containers.ids:
+      - '*'
+      processors:
+      - add_kubernetes_metadata:
+          in_cluster: true
+
+    output.elasticsearch:
+      username: '${ELASTICSEARCH_USERNAME}'
+      password: '${ELASTICSEARCH_PASSWORD}'
+      protocol: https
+      hosts: ["security-master:9200"]
+      ssl.certificate_authorities:
+        - /usr/share/filebeat/config/certs/elastic-certificate.pem
+
+secretMounts:
+  - name: elastic-certificate-pem
+    secretName: elastic-certificate-pem
+    path: /usr/share/filebeat/config/certs
+
+extraEnvs:
+  - name: 'ELASTICSEARCH_USERNAME'
+    valueFrom:
+      secretKeyRef:
+        name: elastic-credentials
+        key: username
+  - name: 'ELASTICSEARCH_PASSWORD'
+    valueFrom:
+      secretKeyRef:
+        name: elastic-credentials
+        key: password
diff --git a/filebeat/templates/NOTES.txt b/filebeat/templates/NOTES.txt
@@ -1,4 +1,2 @@
-1. Watch all cluster members come up.
+1. Watch all containers come up.
   $ kubectl get pods --namespace={{ .Release.Namespace }} -l app={{ template "fullname" . }} -w
-2. Test cluster health using Helm test.
-  $ helm test {{ .Release.Name }}
diff --git a/filebeat/templates/_helpers.tpl b/filebeat/templates/_helpers.tpl
@@ -14,3 +14,15 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- $name := default .Chart.Name .Values.nameOverride -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+
+{{/*
+Use the fullname if the serviceAccount value is not set
+*/}}
+{{- define "serviceAccount" -}}
+{{- if .Values.serviceAccount }}
+{{- .Values.serviceAccount -}}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
diff --git a/filebeat/templates/clusterrole.yaml b/filebeat/templates/clusterrole.yaml
@@ -2,7 +2,7 @@
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRole
 metadata:
-  name: {{ .Values.serviceAccount }}-cluster-role
+  name: {{ template "serviceAccount" . }}-cluster-role
   labels:
     app: "{{ template "fullname" . }}"
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"

diff --git a/filebeat/templates/clusterrolebinding.yaml b/filebeat/templates/clusterrolebinding.yaml
@@ -2,18 +2,18 @@
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRoleBinding
 metadata:
-  name: {{ .Values.serviceAccount }}-cluster-role-binding
+  name: {{ template "serviceAccount" . }}-cluster-role-binding
   labels:
     app: "{{ template "fullname" . }}"
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     heritage: {{ .Release.Service | quote }}
     release: {{ .Release.Name | quote }}
 roleRef:
   kind: ClusterRole
-  name: {{ .Values.serviceAccount }}-cluster-role
+  name: {{ template "serviceAccount" . }}-cluster-role
   apiGroup: rbac.authorization.k8s.io
 subjects:
 - kind: ServiceAccount
-  name: {{ .Values.serviceAccount }}
+  name: {{ template "serviceAccount" . }}
   namespace: {{ .Release.Namespace }}
 {{- end -}}
diff --git a/filebeat/templates/configmap.yaml b/filebeat/templates/configmap.yaml
@@ -3,9 +3,9 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ template "name" . }}-config
+  name: {{ template "fullname" . }}-config
   labels:
-    app: "{{ template "name" . }}"
+    app: "{{ template "fullname" . }}"
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     heritage: {{ .Release.Service | quote }}
     release: {{ .Release.Name | quote }}