From ebf1ff84b3d0503e72296c8859eb8c487b676600 Mon Sep 17 00:00:00 2001 From: Jochem Date: Tue, 9 Jul 2024 17:20:27 +0200 Subject: [PATCH] Make 'for' configurable for falco exporter prometheus rules Signed-off-by: Jochem Bump chart version and run helm docs Signed-off-by: Jochem Update changelog Signed-off-by: Jochem Update charts/falco-exporter/CHANGELOG.md Co-authored-by: Thomas Labarussias Signed-off-by: Jochem <33828672+TheChef23@users.noreply.github.com> --- charts/falco-exporter/CHANGELOG.md | 4 ++++ charts/falco-exporter/Chart.yaml | 2 +- charts/falco-exporter/README.md | 7 ++++++- charts/falco-exporter/templates/prometheusrule.yaml | 10 +++++----- charts/falco-exporter/values.yaml | 5 +++++ 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/charts/falco-exporter/CHANGELOG.md b/charts/falco-exporter/CHANGELOG.md index c36efa4f..cf029704 100644 --- a/charts/falco-exporter/CHANGELOG.md +++ b/charts/falco-exporter/CHANGELOG.md @@ -3,6 +3,10 @@ This file documents all notable changes to `falco-exporter` Helm Chart. The release numbering uses [semantic versioning](http://semver.org). +## v0.12.0 + +* make 'for' configurable for falco exporter prometheus rules + ## v0.11.0 * updated grafana dashboard diff --git a/charts/falco-exporter/Chart.yaml b/charts/falco-exporter/Chart.yaml index 037ed8ca..d771a4d4 100644 --- a/charts/falco-exporter/Chart.yaml +++ b/charts/falco-exporter/Chart.yaml @@ -14,7 +14,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 0.11.0 +version: 0.12.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. diff --git a/charts/falco-exporter/README.md b/charts/falco-exporter/README.md index ca95dfc6..a0599eb0 100644 --- a/charts/falco-exporter/README.md +++ b/charts/falco-exporter/README.md @@ -70,7 +70,7 @@ helm install falco-exporter \ ## Configuration -The following table lists the main configurable parameters of the falco-exporter chart v0.11.0 and their default values. Please, refer to [values.yaml](./values.yaml) for the full list of configurable parameters. +The following table lists the main configurable parameters of the falco-exporter chart v0.12.0 and their default values. Please, refer to [values.yaml](./values.yaml) for the full list of configurable parameters. ## Values @@ -116,18 +116,23 @@ The following table lists the main configurable parameters of the falco-exporter | priorityClassName | string | `""` | priorityClassName specifies the name of the PriorityClass for the pods. | | prometheusRules.alerts.additionalAlerts | object | `{}` | | | prometheusRules.alerts.alert.enabled | bool | `true` | | +| prometheusRules.alerts.alert.for | string | `"5m"` | | | prometheusRules.alerts.alert.rate_interval | string | `"5m"` | | | prometheusRules.alerts.alert.threshold | int | `0` | | | prometheusRules.alerts.critical.enabled | bool | `true` | | +| prometheusRules.alerts.critical.for | string | `"15m"` | | | prometheusRules.alerts.critical.rate_interval | string | `"5m"` | | | prometheusRules.alerts.critical.threshold | int | `0` | | | prometheusRules.alerts.emergency.enabled | bool | `true` | | +| prometheusRules.alerts.emergency.for | string | `"1m"` | | | prometheusRules.alerts.emergency.rate_interval | string | `"1m"` | | | prometheusRules.alerts.emergency.threshold | int | `0` | | | prometheusRules.alerts.error.enabled | bool | `true` | | +| prometheusRules.alerts.error.for | string | `"15m"` | | | prometheusRules.alerts.error.rate_interval | string | `"5m"` | | | prometheusRules.alerts.error.threshold | int | `0` | | | prometheusRules.alerts.warning.enabled | bool | `true` | | +| prometheusRules.alerts.warning.for | string | `"15m"` | | | prometheusRules.alerts.warning.rate_interval | string | `"5m"` | | | prometheusRules.alerts.warning.threshold | int | `0` | | | prometheusRules.enabled | bool | `false` | enabled specifies whether the prometheus rules should be deployed. | diff --git a/charts/falco-exporter/templates/prometheusrule.yaml b/charts/falco-exporter/templates/prometheusrule.yaml index d495d70f..c50f185f 100644 --- a/charts/falco-exporter/templates/prometheusrule.yaml +++ b/charts/falco-exporter/templates/prometheusrule.yaml @@ -31,7 +31,7 @@ spec: summary: Falco is experiencing high rate of warning events description: A high rate of warning events are being detected by Falco expr: rate(falco_events{priority="4"}[{{ .Values.prometheusRules.alerts.warning.rate_interval }}]) > {{ .Values.prometheusRules.alerts.warning.threshold }} - for: 15m + for: {{ .Values.prometheusRules.alerts.warning.for }} labels: severity: warning {{- end }} @@ -41,7 +41,7 @@ spec: summary: Falco is experiencing high rate of error events description: A high rate of error events are being detected by Falco expr: rate(falco_events{priority="3"}[{{ .Values.prometheusRules.alerts.error.rate_interval }}]) > {{ .Values.prometheusRules.alerts.error.threshold }} - for: 15m + for: {{ .Values.prometheusRules.alerts.error.for }} labels: severity: warning {{- end }} @@ -51,7 +51,7 @@ spec: summary: Falco is experiencing high rate of critical events description: A high rate of critical events are being detected by Falco expr: rate(falco_events{priority="2"}[{{ .Values.prometheusRules.alerts.critical.rate_interval }}]) > {{ .Values.prometheusRules.alerts.critical.threshold }} - for: 15m + {{ .Values.prometheusRules.alerts.critical.for }} labels: severity: critical {{- end }} @@ -61,7 +61,7 @@ spec: summary: Falco is experiencing high rate of alert events description: A high rate of alert events are being detected by Falco expr: rate(falco_events{priority="1"}[{{ .Values.prometheusRules.alerts.alert.rate_interval }}]) > {{ .Values.prometheusRules.alerts.alert.threshold }} - for: 5m + for: {{ .Values.prometheusRules.alerts.alert.for }} labels: severity: critical {{- end }} @@ -71,7 +71,7 @@ spec: summary: Falco is experiencing high rate of emergency events description: A high rate of emergency events are being detected by Falco expr: rate(falco_events{priority="0"}[{{ .Values.prometheusRules.alerts.emergency.rate_interval }}]) > {{ .Values.prometheusRules.alerts.emergency.threshold }} - for: 1m + for: {{ .Values.prometheusRules.alerts.emergency.for }} labels: severity: critical {{- end }} diff --git a/charts/falco-exporter/values.yaml b/charts/falco-exporter/values.yaml index 2015a2af..3c6d12fb 100644 --- a/charts/falco-exporter/values.yaml +++ b/charts/falco-exporter/values.yaml @@ -198,20 +198,25 @@ prometheusRules: enabled: true rate_interval: "5m" threshold: 0 + for: "15m" error: enabled: true rate_interval: "5m" threshold: 0 + for: "15m" critical: enabled: true rate_interval: "5m" threshold: 0 + for: "15m" alert: enabled: true rate_interval: "5m" threshold: 0 + for: "5m" emergency: enabled: true rate_interval: "1m" threshold: 0 + for: "1m" additionalAlerts: {}