corrected index variable default and elimianted hardcoded value in co…

…nfigmap (helm#10298) Signed-off-by: Jason Ertel <[email protected]>
agolo · Jan 4, 2019 · 52a3a75 · 52a3a75
1 parent d8aa6b5
commit 52a3a75
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/stable/elastabot/Chart.yaml b/stable/elastabot/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 1.1.0
 description: A Helm chart for Elastabot - a Slack bot companion for Elasticsearch and ElastAlert
 name: elastabot
-version: 1.1.0
+version: 1.2.0
 home: https://github.com/jertel/elastabot
 sources:
 - https://github.com/jertel/elastabot

diff --git a/stable/elastabot/README.md b/stable/elastabot/README.md
@@ -40,7 +40,7 @@ The command removes all the Kubernetes components associated with the chart and
 | elasticsearch.sslStrictEnabled | If true, the SSL/TLS certificates will be validated against known certificate authorities                                | `false`
 | elasticsearch.timeoutSeconds   | Number of seconds to wait for an Elasticsearch response                                                                  | `10`
 | elasticsearch.urlPrefix        | URL prefix for Elasticsearch, typically an empty string                                                                  |
-| elastalert.index               | The index prefix used by Elastalert within Elasticsearch, typically elastalert or elastalert_status                      | `elastalert_status`
+| elastalert.index               | The index prefix used by Elastalert within Elasticsearch, typically elastalert                                           | `elastalert`
 | elastalert.silenceMinutes      | Number of minutes to silence an acknowledge alert if a silence duration is not explicitly given with the ack command.    | `240`
 | elastalert.recentMinutes       | Number of minutes to look back through Elasticsearch indices for a matching triggered alert                              | `4320`
 | smtp.host                      | Hostname for the SMTP server                                                                                             |

diff --git a/stable/elastabot/templates/configmap.yaml b/stable/elastabot/templates/configmap.yaml
@@ -19,7 +19,7 @@ data:
         "urlPrefix":""
       },
       "elastalert": {
-        "index": "elastalert_status",
+        "index": "{{ .Values.elastalert.index }}",
         "silenceMinutes": {{ .Values.elastalert.defaultSilenceMinutes }},
         "recentMinutes": {{ .Values.elastalert.recentAlertMinutes }}
       },

diff --git a/stable/elastabot/values.yaml b/stable/elastabot/values.yaml
@@ -21,6 +21,9 @@ elasticsearch:
 # Elastalert settings. Elastalert chart information is available here:
 # https://github.com/kubernetes/charts/tree/master/stable/elastalert
 elastalert:
+  # Index prefix for elastalert
+  index: "elastalert"
+
   # How far back in time to search for recently-fired alerts, in Elasticsearch
   recentAlertMinutes: 4320