Merge pull request #732 from ChrisFraun/feat/make-rules-folder-variable

Feat/make rules folder variable
jertel · Feb 21, 2022 · d9e3dc2 · d9e3dc2
2 parents af11e9b + 1964ae9
commit d9e3dc2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -32,6 +32,8 @@
 - Pytest 7.0.0 to 7.0.1 - [#710](https://github.com/jertel/elastalert2/pull/710) - @nsano-rururu
 - Fixing jira_transition_to schema bug. Change property type from boolean to string [#721](https://github.com/jertel/elastalert2/pull/721) - @toxisch
 - Begin Elasticsearch 8 support - ElastAlert 2 now supports setup with fresh ES 8 instances, and works with some alert types [#731](https://github.com/jertel/elastalert2/pull/731) - @ferozsalam
+- Enable dynamic setting of rules volume in helm chart [#732] - @ChrisFraun
+
 
 # 2.3.0
 

diff --git a/chart/elastalert2/README.md b/chart/elastalert2/README.md
@@ -82,6 +82,7 @@ The command removes all the Kubernetes components associated with the chart and
 | `serviceAccount.annotations`                 | ServiceAccount annotations                                                                                                    |                                                          |
 | `podSecurityPolicy.create`                   | [DEPRECATED] Create pod security policy resources                                                                             | `false`                                                  |
 | `resources`                                  | Container resource requests and limits                                                                                        | {}                                                       |
+| `rulesVolumeName`                            | Specifies the rules volume to be mounted. Can be changed for mounting a custom rules folder via the extraVolumes parameter, instead of using the default rules configMap or secret rule mounting method.                                                                                 | "rules"                                                  |
 | `rules`                                      | Rule and alert configuration for ElastAlert 2                                                                                 | {} example shown in values.yaml                          |
 | `runIntervalMins`                            | Default interval between alert checks, in minutes                                                                             | 1                                                        |
 | `realertIntervalMins`                        | Time between alarms for same rule, in minutes                                                                                 | `NULL`                                                   |

diff --git a/chart/elastalert2/templates/deployment.yaml b/chart/elastalert2/templates/deployment.yaml
@@ -56,7 +56,7 @@ spec:
           - name: config
             mountPath: '/opt/elastalert/config.yaml'
             subPath: config.yaml
-          - name: rules
+          - name: {{ .Values.rulesVolumeName }}
             mountPath: '/opt/elastalert/rules'
 {{- if .Values.elasticsearch.certsVolumeMounts }}
 {{ toYaml .Values.elasticsearch.certsVolumeMounts | indent 10 }}

diff --git a/chart/elastalert2/values.yaml b/chart/elastalert2/values.yaml
@@ -150,7 +150,10 @@ extraConfigOptions: {}
 # command: ["YOUR_CUSTOM_COMMAND"]
 # args: ["YOUR", "CUSTOM", "ARGS"]
 
-# rule configurations e.g. (http://elastalert2.readthedocs.io/en/latest/)
+# specifies the rules volume to be used
+rulesVolumeName: "rules"
+
+# additional rule configurations e.g. (http://elastalert2.readthedocs.io/en/latest/)
 rules: {}
   # deadman_slack: |-
   #   ---