2.13.1

[jertel]

Breaking changes

• None

New features

• None

Other changes

• [Helm] Add support for generating rule config from a directory of rules, during chart deployment - #1236 - @mehrdad-khojastefar
• [AlertManager] Fix typo with new feature released in 2.13.0 - #1237 - @eveningcafe

---

This discussion was created from the release 2.13.1.

[jim-barber-he]

This seems to be broken for me.
Commit d3a6ab9 has made the following change

diff --git a/chart/elastalert2/templates/rules.yaml b/chart/elastalert2/templates/rules.yaml
index b0b52ffd..e2498d7c 100644
--- a/chart/elastalert2/templates/rules.yaml
+++ b/chart/elastalert2/templates/rules.yaml
@@ -8,16 +8,19 @@ metadata:
   {{- end }}
 data:
 {{- if .Values.rootRulesFolder }}
-  {{- $rulesDirectory := printf "%v/**.yaml" .Values.rootRulesFolder -}}
-  {{- range $rule, $_ :=  .Files.Glob $rulesDirectory }}
-  {{ base $rule }}: |- 
-{{ $.Files.Get $rule | indent 6 }}
-  {{ end }}
+{{- $rulesDirectory := printf "%v/**.{yaml,yml}" .Values.rootRulesFolder -}}
+{{- $enabledRules := .Values.enabledRules -}}
+{{- range $rule, $_ :=  .Files.Glob $rulesDirectory -}}
+  {{- $ruleBase := base $rule -}}
+  {{- $ruleName := regexReplaceAll "\\.(yaml|yml)$" $ruleBase "" -}}
+  {{- if has $ruleName $enabledRules }}
+  {{ $ruleBase }}: |-
+{{ $.Files.Get $rule | indent 4 }}
+  {{- end }}
+{{- end }}
 {{- else }}
 {{- range $key, $value := .Values.rules }}
-    {{ $key | indent 2}}: |-
-    {{ $value | indent 4}}
+  {{ $key }}: |-
+{{ $value | indent 2 }}
 {{- end }}
 {{- end }}

Specifically the last part probably shouldn't have happened?

-    {{ $key | indent 2}}: |-
-    {{ $value | indent 4}}
+  {{ $key }}: |-
+{{ $value | indent 2 }}

The Helm deployment is showing the indentation changes like so:

So the content of the rules is no longer indented properly.

[jertel]

Investigating now. Thanks for reporting this.

[jim-barber-he]

Specifically the last part probably shouldn't have happened?

Or rather the leading white-space changes are fine, but the indent 2 should have probably have stayed as indent 4

[jertel]

Please review #1239 when you get a moment.

[jim-barber-he]

Yep looks good. I checked out your branch locally and tested a deploy and it now no longer shows all our rules are going to change.

Comparing release=elastalert, chart=helm/charts/elastalert2
elastalert, elastalert2, Deployment (apps) has changed:
...
    name: elastalert2
    labels: 
      app: elastalert2
-     chart: "elastalert2-2.13.0"
+     chart: "elastalert2-2.13.1"
      release: elastalert
      heritage: Helm
  spec:
...
    template:
      metadata:
        annotations:
-         checksum/config: b40c3119104fdbf872ecc4d02f8529308c58cd495dbaf91d6dc2cf8f5c41a5c7
-         checksum/rules: a6fec56b24c61112027b4902fc06729fce5c946df6e1d7d2981f76d41f850219
+         checksum/config: 48ddc2f90ef84ae08622cb8d2f6038dc2e6fed72f73a51273bab89c7fd57fb02
+         checksum/rules: 4cd0599894b6646bbef16924cf4bbb0d67a7f524c8b961f8c9e815a07e29c84e
          prometheus.io/path: /
          prometheus.io/scrape: "true"
          prometheus.io/port: "8080"
        labels:
          app.kubernetes.io/name: elastalert2
-         helm.sh/chart: elastalert2-2.13.0
+         helm.sh/chart: elastalert2-2.13.1
          app.kubernetes.io/instance: elastalert
          app.kubernetes.io/managed-by: Helm
          app.kubernetes.io/component: elastalert2
...
          runAsUser: 1000
        containers:
        - name: elastalert
-         image: "jertel/elastalert2:2.13.0"
+         image: "jertel/elastalert2:2.13.1"
          imagePullPolicy: IfNotPresent
          ports:
          - containerPort: 8080
...
elastalert, elastalert2, PrometheusRule (monitoring.coreos.com) has changed:
...
    namespace: "elastalert"
    labels:
      app.kubernetes.io/name: elastalert2
-     helm.sh/chart: elastalert2-2.13.0
+     helm.sh/chart: elastalert2-2.13.1
      app.kubernetes.io/instance: elastalert
      app.kubernetes.io/managed-by: Helm
    annotations:
...
elastalert, elastalert2, ServiceAccount (v1) has changed:
...
    name: elastalert2
    labels:
      app.kubernetes.io/name: elastalert2
-     helm.sh/chart: elastalert2-2.13.0
+     helm.sh/chart: elastalert2-2.13.1
      app.kubernetes.io/instance: elastalert
      app.kubernetes.io/managed-by: Helm
elastalert, elastalert2-config, ConfigMap (v1) has changed:
...
    name: elastalert2-config
    labels:
      app.kubernetes.io/name: elastalert2
-     helm.sh/chart: elastalert2-2.13.0
+     helm.sh/chart: elastalert2-2.13.1
      app.kubernetes.io/instance: elastalert
      app.kubernetes.io/managed-by: Helm
  data:
...
elastalert, elastalert2-metrics, Service (v1) has changed:
...
    name: "elastalert2-metrics"
    labels:
      app.kubernetes.io/name: elastalert2
-     helm.sh/chart: elastalert2-2.13.0
+     helm.sh/chart: elastalert2-2.13.1
      app.kubernetes.io/instance: elastalert
      app.kubernetes.io/managed-by: Helm
      app.kubernetes.io/component: elastalert2    
...
elastalert, elastalert2-metrics, ServiceMonitor (monitoring.coreos.com) has changed:
...
    namespace: "elastalert"
    labels:
      app.kubernetes.io/name: elastalert2
-     helm.sh/chart: elastalert2-2.13.0
+     helm.sh/chart: elastalert2-2.13.1
      app.kubernetes.io/instance: elastalert
      app.kubernetes.io/managed-by: Helm
      app.kubernetes.io/component: elastalert2
...
elastalert, elastalert2-rules, ConfigMap (v1) has changed:
...
    name: elastalert2-rules
    labels:
      app.kubernetes.io/name: elastalert2
-     helm.sh/chart: elastalert2-2.13.0
+     helm.sh/chart: elastalert2-2.13.1
      app.kubernetes.io/instance: elastalert
      app.kubernetes.io/managed-by: Helm
  data:
...

Affected releases are:
  elastalert (./helm/charts/elastalert2) UPDATED

Do you really want to apply?
  Helmfile will apply all your changes, as shown above.

 [y/n]: