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

Add labels to scrape cilium agent and operator metrics #14747

Merged
merged 1 commit into from
Jan 30, 2021

Conversation

lyveng
Copy link
Contributor

@lyveng lyveng commented Jan 27, 2021

The prometheus queries in dashboards provided as part of the cilium examples use the labels k8s_app(in cilium agent) and io_cilium_app(in cilium operator) as metric labels. But the service monitor manifests provided as part of the helm chart don't add these labels as part of scraping the metrics. As part of this PR I've added these labels to the targetLabels of the serviceMonitor manifests. Ref slack conversation

…rics of cilium agent and cilium operator respectively

Signed-off-by: Livingstone S E <[email protected]>
@lyveng lyveng requested review from a team as code owners January 27, 2021 09:33
@lyveng lyveng requested review from a team, qmonnet and kaworu January 27, 2021 09:33
@maintainer-s-little-helper maintainer-s-little-helper bot added the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Jan 27, 2021
@lyveng lyveng requested a review from nathanjsweet January 27, 2021 09:34
Copy link
Member

@qmonnet qmonnet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, thank you!

@qmonnet
Copy link
Member

qmonnet commented Jan 27, 2021

test-me-please

@qmonnet qmonnet changed the title Adding labels to scraped cilium agent and operator metrics Add labels to scrape cilium agent and operator metrics Jan 27, 2021
@qmonnet qmonnet added the release-note/minor This PR changes functionality that users may find relevant to operating Cilium. label Jan 27, 2021
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Jan 27, 2021
@qmonnet qmonnet removed their assignment Jan 27, 2021
@nebril
Copy link
Member

nebril commented Jan 28, 2021

retest-runtime

@nebril
Copy link
Member

nebril commented Jan 28, 2021

retest-net-next

Copy link
Member

@kaworu kaworu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank @lyveng for the contribution, LGTM!

@kaworu kaworu removed their assignment Jan 28, 2021
@qmonnet
Copy link
Member

qmonnet commented Jan 28, 2021

retest-netnext
Hit #14608 (Jenkins logs)

@pchaigno
Copy link
Member

Should this be backported to Cilium v1.9?

@aanm aanm removed the release-note/minor This PR changes functionality that users may find relevant to operating Cilium. label Mar 31, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note/bug This PR fixes an issue in a previous release of Cilium.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants