upgrade falcosidekick to v2.31.0

Signed-off-by: Thomas Labarussias <[email protected]>

charts/falcosidekick/CHANGELOG.md

@@ -5,6 +5,10 @@ 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.9.6
+
+- Ugrade to Falcosidekick 2.36.0
+
 ## 0.9.5
 
 - Move the `prometheus.io/scrape` annotation to the default values, to allow overrides.

charts/falcosidekick/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v1
-appVersion: 2.30.0
+appVersion: 2.31.0
 description: Connect Falco to your ecosystem
 icon: https://raw.githubusercontent.com/falcosecurity/falcosidekick/master/imgs/falcosidekick_color.png
 name: falcosidekick
-version: 0.9.5
+version: 0.9.6
 keywords:
   - monitoring
   - security

charts/falcosidekick/README.md

@@ -358,6 +358,7 @@ The following table lists the main configurable parameters of the Falcosidekick
 | config.loki.customheaders | string | `""` | a list of comma separated custom headers to add, syntax is "key:value,key:value" |
 | config.loki.endpoint | string | `"/loki/api/v1/push"` | Loki endpoint URL path, more info: <https://grafana.com/docs/loki/latest/api/#post-apiprompush> |
 | config.loki.extralabels | string | `""` | comma separated list of fields to use as labels additionally to rule, source, priority, tags and custom_fields |
+| config.loki.format | string | `"text"` | Format for the log entry value: json, text (default) |
 | config.loki.grafanaDashboard | object | `{"configMap":{"folder":"","name":"falcosidekick-loki-dashboard-grafana","namespace":""},"enabled":true}` | dashboard for Grafana |
 | config.loki.grafanaDashboard.configMap | object | `{"folder":"","name":"falcosidekick-loki-dashboard-grafana","namespace":""}` | configmaps to be deployed that contain a grafana dashboard. |
 | config.loki.grafanaDashboard.configMap.folder | string | `""` | folder where the dashboard is stored by grafana. |
@@ -401,6 +402,7 @@ The following table lists the main configurable parameters of the Falcosidekick
 | config.nats.hostport | string | `""` | NATS "nats://host:port", if not `empty`, NATS is *enabled* |
 | config.nats.minimumpriority | string | `""` | minimum priority of event to use this output, order is `emergency\|alert\|critical\|error\|warning\|notice\|informational\|debug or ""` |
 | config.nats.mutualtls | bool | `false` | if true, checkcert flag will be ignored (server cert will always be checked) |
+| config.nats.subjecttemplate | string | `"falco.<priority>.<rule>"` | template for the subject, tokens <priority> and <rule> will be automatically replaced (default: falco.<priority>.<rule>) |
 | config.nodered.address | string | `""` | Node-RED address, if not empty, Node-RED output is enabled |
 | config.nodered.checkcert | bool | `true` | check if ssl certificate of the output is valid |
 | config.nodered.customheaders | string | `""` | Custom headers to add in POST, useful for Authentication, syntax is "key:value\,key:value" |
@@ -514,6 +516,7 @@ The following table lists the main configurable parameters of the Falcosidekick
 | config.stan.hostport | string | `""` | Stan nats://{domain or ip}:{port}, if not empty, STAN output is *enabled* |
 | config.stan.minimumpriority | string | `""` | minimum priority of event to use this output, order is `emergency\|alert\|critical\|error\|warning\|notice\|informational\|debug or ""` |
 | config.stan.mutualtls | bool | `false` | if true, checkcert flag will be ignored (server cert will always be checked) |
+| config.stan.subjecttemplate | string | `"falco.<priority>.<rule>"` | template for the subject, tokens <priority> and <rule> will be automatically replaced (default: falco.<priority>.<rule>) |
 | config.statsd.forwarder | string | `""` | The address for the StatsD forwarder, in the form <http://host:port>, if not empty StatsD is *enabled* |
 | config.statsd.namespace | string | `"falcosidekick."` | A prefix for all metrics |
 | config.sumologic.checkcert | bool | `true` | check if ssl certificate of the output is valid (default: true) |

charts/falcosidekick/templates/secrets.yaml

@@ -210,6 +210,7 @@ data:
   LOKI_USER: "{{ .Values.config.loki.user | b64enc }}"
   LOKI_APIKEY: "{{ .Values.config.loki.apikey | b64enc }}"
   LOKI_TENANT: "{{ .Values.config.loki.tenant | b64enc }}"
+  LOKI_FORMAT: "{{ .Values.config.loki.format | b64enc }}"
   LOKI_EXTRALABELS: "{{ .Values.config.loki.extralabels | b64enc }}"
   LOKI_CUSTOMHEADERS: "{{ .Values.config.loki.customheaders | b64enc }}"
   LOKI_MINIMUMPRIORITY: "{{ .Values.config.loki.minimumpriority | b64enc }}"
@@ -221,6 +222,7 @@ data:
 
   # Nats Output
   NATS_HOSTPORT: "{{ .Values.config.nats.hostport | b64enc }}"
+  NATS_SUBJECTTEMPLATE: "{{ .Values.config.nats.subjecttemplate | b64enc }}"
   NATS_MINIMUMPRIORITY: "{{ .Values.config.nats.minimumpriority | b64enc }}"
   NATS_MUTUALTLS: "{{ .Values.config.nats.mutualtls | printf "%t" | b64enc }}"
   NATS_CHECKCERT: "{{ .Values.config.nats.checkcert | printf "%t" | b64enc }}"
@@ -229,6 +231,7 @@ data:
   STAN_HOSTPORT: "{{ .Values.config.stan.hostport | b64enc }}"
   STAN_CLUSTERID: "{{ .Values.config.stan.clusterid | b64enc }}"
   STAN_CLIENTID: "{{ .Values.config.stan.clientid | b64enc }}"
+  STAN_SUBJECTTEMPLATE: "{{ .Values.config.stan.subjecttemplate | b64enc }}"
   STAN_MINIMUMPRIORITY: "{{ .Values.config.stan.minimumpriority | b64enc }}"
   STAN_MUTUALTLS: "{{ .Values.config.stan.mutualtls | printf "%t" | b64enc }}"
   STAN_CHECKCERT: "{{ .Values.config.stan.checkcert | printf "%t" | b64enc }}"

charts/falcosidekick/values.yaml

@@ -375,6 +375,8 @@ config:
     endpoint: "/loki/api/v1/push"
     # -- Loki tenant, if not `empty`, Loki tenant is *enabled*
     tenant: ""
+    # -- Format for the log entry value: json, text (default)
+    format: "text"
     # -- comma separated list of fields to use as labels additionally to rule, source, priority, tags and custom_fields
     extralabels: ""
     # -- a list of comma separated custom headers to add, syntax is "key:value,key:value"
@@ -405,6 +407,8 @@ config:
   nats:
     # -- NATS "nats://host:port", if not `empty`, NATS is *enabled*
     hostport: ""
+    # -- template for the subject, tokens <priority> and <rule> will be automatically replaced (default: falco.<priority>.<rule>)
+    subjecttemplate: "falco.<priority>.<rule>"
     # -- minimum priority of event to use this output, order is `emergency\|alert\|critical\|error\|warning\|notice\|informational\|debug or ""`
     minimumpriority: ""
     # -- if true, checkcert flag will be ignored (server cert will always be checked)
@@ -419,6 +423,8 @@ config:
     clusterid: ""
     # -- Client ID, if not empty, STAN output is *enabled*
     clientid: ""
+    # -- template for the subject, tokens <priority> and <rule> will be automatically replaced (default: falco.<priority>.<rule>)
+    subjecttemplate: "falco.<priority>.<rule>"
     # -- minimum priority of event to use this output, order is `emergency\|alert\|critical\|error\|warning\|notice\|informational\|debug or ""`
     minimumpriority: ""
     # -- if true, checkcert flag will be ignored (server cert will always be checked)