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

helm: Support adding extra labels to ServiceMonitors #2830

Merged
merged 3 commits into from
Sep 2, 2024

Conversation

lambdanis
Copy link
Contributor

@lambdanis lambdanis commented Aug 21, 2024

Labels on both tetragon and tetragon-operator ServiceMonitors can be overridden
using tetragon[Operator].prometheus.ServiceMonitor.labelsOverride Helm values.
However, it's nice to be able to add custom labels without overriding all of
the default ones. Let's add such option via extraLabels Helm values.

While here, use only selector labels as selectors in ServiceMonitors.

Related: #1820

Labels on both tetragon and tetragon-operator ServiceMonitors can be overridden
using tetragon[Operator].prometheus.ServiceMonitor.labelsOverride Helm values.
However, it's nice to be able to add custom labels without overriding all of
the default ones. Let's add such option via extraLabels Helm values.

Signed-off-by: Anna Kapuscinska <[email protected]>
Signed-off-by: Anna Kapuscinska <[email protected]>
@lambdanis lambdanis added release-note/minor This PR introduces a minor user-visible change area/helm Related to the Helm chart labels Aug 21, 2024
@lambdanis lambdanis requested a review from a team as a code owner August 21, 2024 14:18
@lambdanis lambdanis requested a review from olsajiri August 21, 2024 14:18
Copy link

netlify bot commented Aug 21, 2024

Deploy Preview for tetragon ready!

Name Link
🔨 Latest commit ff73543
🔍 Latest deploy log https://app.netlify.com/sites/tetragon/deploys/66c5f72b6b840200084b37a7
😎 Deploy Preview https://deploy-preview-2830--tetragon.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

There is no need to use all labels as selectors in ServiceMonitors, and doing
so might cause metrics loss during an upgrade.

Signed-off-by: Anna Kapuscinska <[email protected]>
@kkourt
Copy link
Contributor

kkourt commented Sep 2, 2024

@lambdanis LGTM, but I will leave merging to you :)

@lambdanis lambdanis merged commit d042986 into main Sep 2, 2024
44 checks passed
@lambdanis lambdanis deleted the pr/lambdanis/seervicemonitorlabels branch September 2, 2024 10:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/helm Related to the Helm chart release-note/minor This PR introduces a minor user-visible change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants