Merge pull request Yelp#805 from louzadod/master

Make scan subdirectories an option in helm chart
freshdesk · Apr 6, 2022 · cf1ebb9 · cf1ebb9
2 parents 4fe37e5 + 5c2c137
commit cf1ebb9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -31,6 +31,7 @@
 - Upgrade pylint 2.13.2 to 2.13.3 - [#792](https://github.com/jertel/elastalert2/pull/792) - @nsano-rururu
 - Upgrade pylint 2.13.3 to 2.13.4 - [#801](https://github.com/jertel/elastalert2/pull/801) - @nsano-rururu
 - Fix SpikeRule - [#804](https://github.com/jertel/elastalert2/pull/804) - @nsano-rururu
+- [Kubernetes] Add scanSubdirectories (defaults to true) as an option in Helm Chart - [#805](https://github.com/jertel/elastalert2/pull/805) - @louzadod
 
 # 2.4.0
 

diff --git a/chart/elastalert2/README.md b/chart/elastalert2/README.md
@@ -86,6 +86,7 @@ The command removes all the Kubernetes components associated with the chart and
 | `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`                                                   |
+| `scanSubdirectories`                        | Enable/disable subdirectory scanning for rules                                                                                 | `true`                                                   |
 | `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                                               |

diff --git a/chart/elastalert2/templates/config.yaml b/chart/elastalert2/templates/config.yaml
@@ -12,7 +12,9 @@ data:
   elastalert_config: |-
     ---
     rules_folder: /opt/elastalert/rules
-    scan_subdirectories: false
+{{- if .Values.scanSubdirectories }}    
+    scan_subdirectories: {{ .Values.scanSubdirectories }}
+{{- end }}
     run_every:
       minutes: {{ .Values.runIntervalMins }}
 {{- if .Values.realertIntervalMins }}

diff --git a/chart/elastalert2/values.yaml b/chart/elastalert2/values.yaml
@@ -7,6 +7,9 @@ revisionHistoryLimit: 5
 # Default internal between alert checks against the elasticsearch datasource, in minutes
 runIntervalMins: 1
 
+# Enable/disabe subdirectory scanning for rules
+scanSubdirectories: true
+
 # Default rule buffer duration, in minutes
 bufferTimeMins: 15