From 1efbb07e7109e735ef5e730855bef2e4b07afef6 Mon Sep 17 00:00:00 2001 From: Richard Maynard Date: Thu, 13 Sep 2018 17:05:47 -0500 Subject: [PATCH] conditionally include certs (#7725) Signed-off-by: Richard Maynard --- stable/elastalert/Chart.yaml | 2 +- stable/elastalert/templates/config.yaml | 6 ++++++ stable/elastalert/values.yaml | 7 ++++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/stable/elastalert/Chart.yaml b/stable/elastalert/Chart.yaml index 151238f546..1fc1c5fb02 100644 --- a/stable/elastalert/Chart.yaml +++ b/stable/elastalert/Chart.yaml @@ -1,6 +1,6 @@ description: ElastAlert is a simple framework for alerting on anomalies, spikes, or other patterns of interest from data in Elasticsearch. name: elastalert -version: 0.8.1 +version: 0.8.2 appVersion: 0.1.35 home: https://github.com/Yelp/elastalert icon: https://static-www.elastic.co/assets/blteb1c97719574938d/logo-elastic-elasticsearch-lt.svg diff --git a/stable/elastalert/templates/config.yaml b/stable/elastalert/templates/config.yaml index b02dff0db6..66279f4f9b 100644 --- a/stable/elastalert/templates/config.yaml +++ b/stable/elastalert/templates/config.yaml @@ -31,8 +31,14 @@ data: writeback_index: {{ .Values.writebackIndex }} use_ssl: {{ .Values.elasticsearch.useSsl }} verify_certs: {{ .Values.elasticsearch.verifyCerts }} +{{- if .Values.elasticsearch.clientCert }} client_cert: {{ .Values.elasticsearch.clientCert }} +{{- end }} +{{- if .Values.elasticsearch.clientKey }} client_key: {{ .Values.elasticsearch.clientKey }} +{{- end }} +{{- if .Values.elasticsearch.caCerts }} ca_certs: {{ .Values.elasticsearch.caCerts }} +{{- end }} alert_time_limit: minutes: {{ .Values.alertRetryLimitMins }} diff --git a/stable/elastalert/values.yaml b/stable/elastalert/values.yaml index 0c2e65be77..097fd56083 100644 --- a/stable/elastalert/values.yaml +++ b/stable/elastalert/values.yaml @@ -45,12 +45,13 @@ elasticsearch: password: "" # whether or not to verify TLS certificates verifyCerts: "True" + # Enable certificate based authentication # path to a PEM certificate to use as the client certificate - clientCert: "/certs/client.pem" + # clientCert: "/certs/client.pem" # path to a private key file to use as the client key - clientKey: "/certs/client-key.pem" + # clientKey: "/certs/client-key.pem" # path to a CA cert bundle to use to verify SSL connections - caCerts: "/certs/ca.pem" + # caCerts: "/certs/ca.pem" # # certs volumes, required to mount ssl certificates when elasticsearch has tls enabled # certsVolumes: # - name: es-certs