feat(alertmanager-extra-fields): Updates values and secrets for Alert…

…Manager extra labels and annotations. In prevision of sidekick version bump. falcosecurity/falcosidekick#347 Signed-off-by: Lyonel Martinez <[email protected]>
Lowaiz · Jul 26, 2022 · 06bf6d6 · 06bf6d6
1 parent 71dce9e
commit 06bf6d6
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/falcosidekick/CHANGELOG.md b/falcosidekick/CHANGELOG.md
@@ -5,6 +5,11 @@ numbering uses [semantic versioning](http://semver.org).
 
 Before release 0.1.20, the helm chart can be found in `falcosidekick` [repository](https://github.com/falcosecurity/falcosidekick/tree/master/deploy/helm/falcosidekick).
 
+## 0.5.7
+
+* Add `alertmanager.extralabels` and `alertmanager.extraannotations` to the values,
+as a list of comma separated labels and annotations to add to the AlertManager trigger.
+
 ## 0.5.6
 
 * Fixing Syslog's port import in `secrets.yaml`

diff --git a/falcosidekick/Chart.yaml b/falcosidekick/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
-appVersion: 2.26.0
+appVersion: 2.27.0
 description: Connect Falco to your ecosystem
 icon: https://raw.githubusercontent.com/falcosecurity/falcosidekick/master/imgs/falcosidekick_color.png
 name: falcosidekick
-version: 0.5.6
+version: 0.5.7
 keywords:
   - monitoring
   - security

diff --git a/falcosidekick/README.md b/falcosidekick/README.md
@@ -153,6 +153,8 @@ The following table lists the main configurable parameters of the Falcosidekick
 | `config.alertmanager.expiresafter`          | if set to a non-zero value, alert expires after that time in seconds (default: 0)                                                                                                      | `"0"`                                                                                                      |
 | `config.alertmanager.minimumpriority`       | minimum priority of event for using use this output, order is `emergency\|alert\|critical\|error\|warning\|notice\|informational\|debug or ""`                                         | `debug`                                                                                                    |
 | `config.alertmanager.mutualtls`             | if true, checkcert flag will be ignored (server cert will always be checked)                                                                                                           | `false`                                                                                                    |
+| `config.alertmanager.extralabels`           | list of comma separated custom labels to add to AlertManager trigger. Syntax is "label:value,label:value"                                                                              | `""`                                                                                                       |
+| `config.alertmanager.extraannotations`      | list of comma separated custom annotations to add to AlertManager trigger. Syntax is "label:value,label:value"                                                                         | `""`                                                                                                       |
 | `config.aws.cloudwatchlogs.loggroup`        | AWS CloudWatch Logs Group name, if not empty, CloudWatch Logs output is *enabled*                                                                                                      | `""`                                                                                                       |
 | `config.aws.cloudwatchlogs.logstream`       | AWS CloudWatch Logs Stream name, if empty, Falcosidekick will try to create a log stream                                                                                               | `debug`                                                                                                    |
 | `config.aws.cloudwatchlogs.minimumpriority` | minimum priority of event for using use this output, order is `emergency\|alert\|critical\|error\|warning\|notice\|informational\|debug or ""`                                         | `debug`                                                                                                    |

diff --git a/falcosidekick/templates/secrets.yaml b/falcosidekick/templates/secrets.yaml
@@ -61,6 +61,8 @@ data:
   ALERTMANAGER_MINIMUMPRIORITY: "{{ .Values.config.alertmanager.minimumpriority | b64enc }}"
   ALERTMANAGER_MUTUALTLS: "{{ .Values.config.alertmanager.mutualtls | printf "%t" | b64enc }}"
   ALERTMANAGER_CHECKCERT: "{{ .Values.config.alertmanager.checkcert | printf "%t" | b64enc }}"
+  ALERTMANAGER_EXTRALABELS: "{{ .Values.config.alertmanager.extralabels | b64enc }}"
+  ALERTMANAGER_EXTRAANNOTATIONS: "{{ .Values.config.alertmanager.extraannotations | b64enc }}"
 
   # InfluxDB Output
   INFLUXDB_USER: "{{ .Values.config.influxdb.user | b64enc }}"

diff --git a/falcosidekick/values.yaml b/falcosidekick/values.yaml
@@ -7,7 +7,7 @@ replicaCount: 2
 image:
   registry: docker.io
   repository: falcosecurity/falcosidekick
-  tag: 2.26.0
+  tag: 2.27.0
   pullPolicy: IfNotPresent
 
 podSecurityContext:
@@ -88,6 +88,8 @@ config:
     expireafter: ""
     mutualtls: false
     checkcert: true
+    extralabels: "" # list of comma separated custom labels to add to AlertManager trigger. Syntax is "label:value,label:value"
+    extraannotations: "" # list of comma separated custom annotations to add to AlertManager trigger. Syntax is "label:value,label:value"
 
   elasticsearch:
     hostport: ""