From 3a13ea84d215e492faabb8fd7bfcc36f23dca8fe Mon Sep 17 00:00:00 2001 From: Morgan Christiansson Date: Tue, 5 Nov 2019 17:08:48 +0000 Subject: [PATCH] [stable/elastalert] Add podAnnotations field (#18592) * [stable/elastalert] Reformat table Signed-off-by: Morgan Christiansson * [stable/elastalert] Add podAnnotations Signed-off-by: Morgan Christiansson * [stable/elastalert] Bump chart to 1.2.3 Signed-off-by: Morgan Christiansson --- stable/elastalert/Chart.yaml | 2 +- stable/elastalert/README.md | 65 +++++++++++---------- stable/elastalert/templates/deployment.yaml | 3 + stable/elastalert/values.yaml | 4 ++ 4 files changed, 41 insertions(+), 33 deletions(-) diff --git a/stable/elastalert/Chart.yaml b/stable/elastalert/Chart.yaml index 90b1a108fc..5bceb1a52f 100644 --- a/stable/elastalert/Chart.yaml +++ b/stable/elastalert/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: ElastAlert is a simple framework for alerting on anomalies, spikes, or other patterns of interest from data in Elasticsearch. name: elastalert -version: 1.2.2 +version: 1.2.3 appVersion: 0.2.1 home: https://github.com/Yelp/elastalert icon: https://static-www.elastic.co/assets/blteb1c97719574938d/logo-elastic-elasticsearch-lt.svg diff --git a/stable/elastalert/README.md b/stable/elastalert/README.md index 38b2484ee6..cc0f9cdf38 100644 --- a/stable/elastalert/README.md +++ b/stable/elastalert/README.md @@ -49,35 +49,36 @@ The command removes all the Kubernetes components associated with the chart and ## Configuration -| Parameter | Description | Default | -| ------------------------ | ------------------------------------------------- | ------------------------------- | -| `image.repository` | docker image | jertel/elastalert-docker | -| `image.tag` | docker image tag | 0.2.1 | -| `image.pullPolicy` | image pull policy | IfNotPresent | -| `command` | command override for container | `NULL` | -| `args` | args override for container | `NULL` | -| `replicaCount` | number of replicas to run | 1 | -| `elasticsearch.host` | elasticsearch endpoint to use | elasticsearch | -| `elasticsearch.port` | elasticsearch port to use | 80 | -| `elasticsearch.useSsl` | whether or not to connect to es_host using SSL | False | -| `elasticsearch.username` | Username for ES with basic auth | `NULL` | -| `elasticsearch.password` | Password for ES with basic auth | `NULL` | -| `elasticsearch.verifyCerts` | whether or not to verify TLS certificates | True | -| `elasticsearch.clientCert` | path to a PEM certificate to use as the client certificate | /certs/client.pem | -| `elasticsearch.clientKey` | path to a private key file to use as the client key | /certs/client-key.pem | -| `elasticsearch.caCerts` | path to a CA cert bundle to use to verify SSL connections | /certs/ca.pem | -| `elasticsearch.certsVolumes` | certs volumes, required to mount ssl certificates when elasticsearch has tls enabled | `NULL` | -| `elasticsearch.certsVolumeMounts` | mount certs volumes, required to mount ssl certificates when elasticsearch has tls enabled | `NULL` | -| `extraConfigOptions` | Additional options to propagate to all rules, cannot be `alert`, `type`, `name` or `index` | `{}` | -| `optEnv` | Additional pod environment variable definitions | [] | -| `extraVolumes` | Additional volume definitions | [] | -| `extraVolumeMounts` | Additional volumeMount definitions | [] | -| `resources` | Container resource requests and limits | {} | -| `rules` | Rule and alert configuration for Elastalert | {} example shown in values.yaml | -| `runIntervalMins` | Default interval between alert checks, in minutes | 1 | -| `realertIntervalMins` | Time between alarms for same rule, in minutes | `NULL` | -| `alertRetryLimitMins` | Time to retry failed alert deliveries, in minutes | 2880 (2 days) | -| `bufferTimeMins` | Default rule buffer time, in minutes | 15 | -| `writebackIndex` | Name or prefix of elastalert index(es) | elastalert_status | -| `nodeSelector` | Node selector for deployment | {} | -| `tolerations` | Tolerations for deployment | [] | +| Parameter | Description | Default | +|-----------------------------------|--------------------------------------------------------------------------------------------|---------------------------------| +| `image.repository` | docker image | jertel/elastalert-docker | +| `image.tag` | docker image tag | 0.2.1 | +| `image.pullPolicy` | image pull policy | IfNotPresent | +| `podAnnotations` | Annotations to be added to pods | {} | +| `command` | command override for container | `NULL` | +| `args` | args override for container | `NULL` | +| `replicaCount` | number of replicas to run | 1 | +| `elasticsearch.host` | elasticsearch endpoint to use | elasticsearch | +| `elasticsearch.port` | elasticsearch port to use | 80 | +| `elasticsearch.useSsl` | whether or not to connect to es_host using SSL | False | +| `elasticsearch.username` | Username for ES with basic auth | `NULL` | +| `elasticsearch.password` | Password for ES with basic auth | `NULL` | +| `elasticsearch.verifyCerts` | whether or not to verify TLS certificates | True | +| `elasticsearch.clientCert` | path to a PEM certificate to use as the client certificate | /certs/client.pem | +| `elasticsearch.clientKey` | path to a private key file to use as the client key | /certs/client-key.pem | +| `elasticsearch.caCerts` | path to a CA cert bundle to use to verify SSL connections | /certs/ca.pem | +| `elasticsearch.certsVolumes` | certs volumes, required to mount ssl certificates when elasticsearch has tls enabled | `NULL` | +| `elasticsearch.certsVolumeMounts` | mount certs volumes, required to mount ssl certificates when elasticsearch has tls enabled | `NULL` | +| `extraConfigOptions` | Additional options to propagate to all rules, cannot be `alert`, `type`, `name` or `index` | `{}` | +| `optEnv` | Additional pod environment variable definitions | [] | +| `extraVolumes` | Additional volume definitions | [] | +| `extraVolumeMounts` | Additional volumeMount definitions | [] | +| `resources` | Container resource requests and limits | {} | +| `rules` | Rule and alert configuration for Elastalert | {} example shown in values.yaml | +| `runIntervalMins` | Default interval between alert checks, in minutes | 1 | +| `realertIntervalMins` | Time between alarms for same rule, in minutes | `NULL` | +| `alertRetryLimitMins` | Time to retry failed alert deliveries, in minutes | 2880 (2 days) | +| `bufferTimeMins` | Default rule buffer time, in minutes | 15 | +| `writebackIndex` | Name or prefix of elastalert index(es) | elastalert_status | +| `nodeSelector` | Node selector for deployment | {} | +| `tolerations` | Tolerations for deployment | [] | diff --git a/stable/elastalert/templates/deployment.yaml b/stable/elastalert/templates/deployment.yaml index 2c2e5f4848..ec367cf304 100644 --- a/stable/elastalert/templates/deployment.yaml +++ b/stable/elastalert/templates/deployment.yaml @@ -20,6 +20,9 @@ spec: annotations: checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }} checksum/rules: {{ include (print $.Template.BasePath "/rules.yaml") . | sha256sum }} +{{- if .Values.podAnnotations }} +{{ toYaml .Values.podAnnotations | indent 8 }} +{{- end }} labels: name: {{ template "elastalert.fullname" . }}-elastalert app: {{ template "elastalert.name" . }} diff --git a/stable/elastalert/values.yaml b/stable/elastalert/values.yaml index 5b1e49269e..f79bb6b454 100644 --- a/stable/elastalert/values.yaml +++ b/stable/elastalert/values.yaml @@ -30,8 +30,12 @@ image: # docker image tag tag: 0.2.1 pullPolicy: IfNotPresent + resources: {} +# Annotations to be added to pods +podAnnotations: {} + elasticsearch: # elasticsearch endpoint e.g. (svc.namespace||svc) host: ""