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.

Sign up for GitHub

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

fix(falcosidekick): Allow overriding the Prometheus scrape Service annotation #779

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −4
Open

fix(falcosidekick): Allow overriding the Prometheus scrape Service annotation #779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
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.9.5

- Move the `prometheus.io/scrape` annotation to the default values, to allow overrides.

## 0.9.4

- Fix Prometheus metrics names in Prometheus Rule
Expand Down
2 changes: 1 addition & 1 deletion charts/falcosidekick/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ appVersion: 2.30.0
description: Connect Falco to your ecosystem
icon: https://raw.githubusercontent.com/falcosecurity/falcosidekick/master/imgs/falcosidekick_color.png
name: falcosidekick
version: 0.9.4
version: 0.9.5
keywords:
- monitoring
- security
Expand Down
2 changes: 1 addition & 1 deletion charts/falcosidekick/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,7 +649,7 @@ The following table lists the main configurable parameters of the Falcosidekick
| replicaCount | int | `2` | number of running pods |
| resources | object | `{}` | The resources for falcosdekick pods |
| securityContext | object | `{}` | Sidekick container securityContext |
| service.annotations | object | `{}` | Service annotations |
| service.annotations | object | `{"prometheus.io/scrape":"true"}` | Service annotations |
| 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. |
Expand Down
1 change: 0 additions & 1 deletion charts/falcosidekick/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ metadata:
{{- with .Values.service.annotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
prometheus.io/scrape: "true"
spec:
type: {{ .Values.service.type }}
ports:
Expand Down
3 changes: 2 additions & 1 deletion charts/falcosidekick/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1118,7 +1118,8 @@ service:
# -- Service port
port: 2801
# -- Service annotations
annotations: {}
annotations:
prometheus.io/scrape: "true"
# networking.gke.io/load-balancer-type: Internal

ingress:
Expand Down