diff --git a/charts/falco-exporter/CHANGELOG.md b/charts/falco-exporter/CHANGELOG.md index c5ad7d54b..803eaf4fb 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.0 + +* added ability to set the grafana folder annotation name + ## v0.9.11 * fix dead links in README.md diff --git a/charts/falco-exporter/Chart.yaml b/charts/falco-exporter/Chart.yaml index 7f2224352..a27165a40 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.9.11 +version: 0.10.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 7af53b036..5641cd6e2 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.9.11 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.0 and their default values. Please, refer to [values.yaml](./values.yaml) for the full list of configurable parameters. ## Values @@ -84,9 +84,10 @@ The following table lists the main configurable parameters of the falco-exporter | falco.grpcTimeout | string | `"2m"` | grpcTimeout timout value for grpc connection. | | falco.grpcUnixSocketPath | string | `"unix:///run/falco/falco.sock"` | grpcUnixSocketPath path to the falco's grpc unix socket. | | fullnameOverride | string | `""` | fullNameOverride same as nameOverride but for the full name. | -| grafanaDashboard | object | `{"enabled":false,"folder":"","namespace":"default","prometheusDatasourceName":"Prometheus"}` | grafanaDashboard contains the configuration related to grafana dashboards. | +| grafanaDashboard | object | `{"enabled":false,"folder":"","folderAnnotation":"grafana_dashboard_folder","namespace":"default","prometheusDatasourceName":"Prometheus"}` | grafanaDashboard contains the configuration related to grafana dashboards. | | grafanaDashboard.enabled | bool | `false` | enabled specifies whether the dashboard should be deployed. | -| grafanaDashboard.folder | string | `""` | folder where the dashboard is stored by grafana. | +| grafanaDashboard.folder | string | `""` | folder creates and set folderAnnotation to specify where the dashboard is stored in grafana. | +| grafanaDashboard.folderAnnotation | string | `"grafana_dashboard_folder"` | folderAnnotation sets the annotation's name used by folderAnnotation in grafana's helm-chart. | | grafanaDashboard.namespace | string | `"default"` | namespace specifies the namespace for the configmap. | | grafanaDashboard.prometheusDatasourceName | string | `"Prometheus"` | prometheusDatasourceName name of the data source. | | healthChecks | object | `{"livenessProbe":{"initialDelaySeconds":60,"periodSeconds":15,"probesPort":19376,"timeoutSeconds":5},"readinessProbe":{"initialDelaySeconds":30,"periodSeconds":15,"probesPort":19376,"timeoutSeconds":5}}` | healthChecks contains the configuration for liveness and readiness probes. | diff --git a/charts/falco-exporter/templates/grafana-dashboard.yaml b/charts/falco-exporter/templates/grafana-dashboard.yaml index 661299b82..ce8aa4060 100644 --- a/charts/falco-exporter/templates/grafana-dashboard.yaml +++ b/charts/falco-exporter/templates/grafana-dashboard.yaml @@ -305,7 +305,7 @@ metadata: {{- if .Values.grafanaDashboard.folder }} annotations: k8s-sidecar-target-directory: /tmp/dashboards/{{ .Values.grafanaDashboard.folder }} - grafana_dashboard_folder: {{ .Values.grafanaDashboard.folder }} + {{ .Values.grafanaDashboard.folderAnnotation }}: {{ .Values.grafanaDashboard.folder }} {{- end }} name: grafana-falco {{- if .Values.grafanaDashboard.namespace }} diff --git a/charts/falco-exporter/values.yaml b/charts/falco-exporter/values.yaml index 6b8e612c3..287f6e81e 100644 --- a/charts/falco-exporter/values.yaml +++ b/charts/falco-exporter/values.yaml @@ -175,8 +175,10 @@ serviceMonitor: grafanaDashboard: # -- enabled specifies whether the dashboard should be deployed. enabled: false - # -- folder where the dashboard is stored by grafana. + # -- folder creates and set folderAnnotation to specify where the dashboard is stored in grafana. folder: "" + # -- folderAnnotation sets the annotation's name used by folderAnnotation in grafana's helm-chart. + folderAnnotation: "grafana_dashboard_folder" # -- namespace specifies the namespace for the configmap. namespace: default # -- prometheusDatasourceName name of the data source.