Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat : falcosidekick service monitor update add aditionnal properties #670

Merged
merged 4 commits into from
May 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions charts/falcosidekick/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.7.19

- Enhanced the service Monitor to support additional Properties.
- Fix the promql query for prometheusRules: FalcoErrorOutputEventsRateHigh.

## 0.7.18

Expand Down
2 changes: 1 addition & 1 deletion charts/falcosidekick/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ appVersion: 2.28.0
description: Connect Falco to your ecosystem
icon: https://raw.githubusercontent.com/falcosecurity/falcosidekick/master/imgs/falcosidekick_color.png
name: falcosidekick
version: 0.7.18
version: 0.7.19
keywords:
- monitoring
- security
Expand Down
1 change: 1 addition & 0 deletions charts/falcosidekick/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -574,6 +574,7 @@ The following table lists the main configurable parameters of the Falcosidekick
| service.port | int | `2801` | Service port |
| service.type | string | `"ClusterIP"` | Service type |
| serviceMonitor.additionalLabels | object | `{}` | specify Additional labels to be added on the Service Monitor. |
| serviceMonitor.additionalProperties | object | `{}` | allows setting additional properties on the endpoint such as relabelings, metricRelabelings etc. |
| serviceMonitor.enabled | bool | `false` | enable the deployment of a Service Monitor for the Prometheus Operator. |
| serviceMonitor.interval | string | `""` | specify a user defined interval. When not specified Prometheus default interval is used. |
| serviceMonitor.scrapeTimeout | string | `""` | specify a user defined scrape timeout. When not specified Prometheus default scrape timeout is used. |
Expand Down
2 changes: 1 addition & 1 deletion charts/falcosidekick/templates/prometheusrule.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ spec:
annotations:
summary: Falcosidekick is experiencing high rate of errors for an output
description: A high rate of errors are being detecting for an output
expr: rate(falcosidekick_output{status="error"}[{{ .Values.prometheusRules.alerts.output.rate_interval }}]) by (destination) > {{ .Values.prometheusRules.alerts.output.threshold }}
expr: sum by (destination) (rate(falcosidekick_outputs{status="error"}[{{ .Values.prometheusRules.alerts.output.rate_interval }}])) > {{ .Values.prometheusRules.alerts.output.threshold }}
for: 1m
labels:
severity: warning
Expand Down
3 changes: 3 additions & 0 deletions charts/falcosidekick/templates/servicemonitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ spec:
{{- if .Values.serviceMonitor.scrapeTimeout }}
scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
{{- end }}
{{- with .Values.serviceMonitor.additionalProperties }}
{{- toYaml . | nindent 4 }}
{{- end }}
selector:
matchLabels:
{{- include "falcosidekick.labels" . | nindent 6 }}
Expand Down
2 changes: 2 additions & 0 deletions charts/falcosidekick/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ serviceMonitor:
interval: ""
# -- specify a user defined scrape timeout. When not specified Prometheus default scrape timeout is used.
scrapeTimeout: ""
# -- allows setting additional properties on the endpoint such as relabelings, metricRelabelings etc.
additionalProperties: {}

prometheusRules:
# -- enable the creation of PrometheusRules for alerting
Expand Down