From bab068e34f54362b0c61fdb71ff6a9aff0a11d82 Mon Sep 17 00:00:00 2001 From: Arnaud CHATELAIN Date: Wed, 24 Apr 2024 22:41:02 +0200 Subject: [PATCH] CHART : falco-exporter service monitor update add aditionnal properties Signed-off-by: Arnaud CHATELAIN --- charts/falco-exporter/CHANGELOG.md | 4 ++++ charts/falco-exporter/Chart.yaml | 2 +- charts/falco-exporter/README.md | 5 +++-- charts/falco-exporter/templates/servicemonitor.yaml | 3 +++ charts/falco-exporter/values.yaml | 3 ++- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/charts/falco-exporter/CHANGELOG.md b/charts/falco-exporter/CHANGELOG.md index 803eaf4fb..001b029d4 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.10.1 + +* Enhanced the service Monitor to support additional Properties. + ## v0.10.0 * added ability to set the grafana folder annotation name diff --git a/charts/falco-exporter/Chart.yaml b/charts/falco-exporter/Chart.yaml index a27165a40..aa24668b3 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.10.0 +version: 0.10.1 # 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 5641cd6e2..173106481 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.10.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.10.1 and their default values. Please, refer to [values.yaml](./values.yaml) for the full list of configurable parameters. ## Values @@ -146,8 +146,9 @@ The following table lists the main configurable parameters of the falco-exporter | service.type | string | `"ClusterIP"` | type denotes the service type. Setting it to "ClusterIP" we ensure that are accessible from within the cluster. | | serviceAccount | object | `{"annotations":{},"create":true,"name":""}` | serviceAccount is the configuration for the service account. | | serviceAccount.name | string | `""` | name is the name of the service account to use. If not set and create is true, a name is generated using the fullname template. If set and create is false, an already existing serviceAccount must be provided. | -| serviceMonitor | object | `{"additionalLabels":{},"enabled":false,"interval":"","scrapeTimeout":""}` | serviceMonitor holds the configuration for the ServiceMonitor CRD. A ServiceMonitor is a custom resource definition (CRD) used to configure how Prometheus should discover and scrape metrics from the exporter service. | +| serviceMonitor | object | `{"additionalLabels":{},"additionalProperties":{},"enabled":false,"interval":"","scrapeTimeout":""}` | serviceMonitor holds the configuration for the ServiceMonitor CRD. A ServiceMonitor is a custom resource definition (CRD) used to configure how Prometheus should discover and scrape metrics from the exporter service. | | serviceMonitor.additionalLabels | object | `{}` | additionalLabels specifies labels to be added on the Service Monitor. | +| serviceMonitor.additionalProperties | object | `{}` | aditionalProperties 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 | `""` | interval specifies the time interval at which Prometheus should scrape metrics from the service. | | serviceMonitor.scrapeTimeout | string | `""` | scrapeTimeout determines the maximum time Prometheus should wait for a target to respond to a scrape request. If the target does not respond within the specified timeout, Prometheus considers the scrape as failed for that target. | diff --git a/charts/falco-exporter/templates/servicemonitor.yaml b/charts/falco-exporter/templates/servicemonitor.yaml index f74de4fd2..1856b4774 100644 --- a/charts/falco-exporter/templates/servicemonitor.yaml +++ b/charts/falco-exporter/templates/servicemonitor.yaml @@ -18,6 +18,9 @@ spec: {{- if .Values.serviceMonitor.scrapeTimeout }} scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }} {{- end }} + {{- with .Values.serviceMonitor.additionalProperties }} + {{- toYaml . | nindent 4 }} + {{- end }} selector: matchLabels: {{- include "falco-exporter.selectorLabels" . | nindent 6 }} diff --git a/charts/falco-exporter/values.yaml b/charts/falco-exporter/values.yaml index 287f6e81e..2015a2aff 100644 --- a/charts/falco-exporter/values.yaml +++ b/charts/falco-exporter/values.yaml @@ -170,7 +170,8 @@ serviceMonitor: # If the target does not respond within the specified timeout, Prometheus considers the scrape as failed for # that target. scrapeTimeout: "" - + # -- aditionalProperties allows setting additional properties on the endpoint such as relabelings, metricRelabelings etc. + additionalProperties: {} # -- grafanaDashboard contains the configuration related to grafana dashboards. grafanaDashboard: # -- enabled specifies whether the dashboard should be deployed.