Skip to content

Conversation

RayyanSeliya
Copy link
Contributor

This PR updates the Monitoring & Metrics documentation to clarify that Prometheus annotations (prometheus.io/scrape, prometheus.io/port) are only present when hubble.metrics.serviceMonitor.enabled is set to false. If ServiceMonitor is enabled, these annotations are omitted and Prometheus discovers metrics via the ServiceMonitor resource.

Closes: #21958

  • Updated the explanation before the annotation code block.
  • Built and checked the documentation locally.

See the screenshot here how it looks

Screenshot 2025-07-15 171748

Clarifies that Prometheus annotations are only present when ServiceMonitor is disabled. If enabled, Prometheus discovers metrics via the ServiceMonitor resource.

Closes: cilium#21958

Signed-off-by: Rayyan Seliya <rayyanseliya786@gmail.com>
@RayyanSeliya RayyanSeliya requested review from a team as code owners July 15, 2025 12:03
@RayyanSeliya RayyanSeliya requested a review from derailed July 15, 2025 12:03
@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 Jul 15, 2025
@github-actions github-actions bot added the kind/community-contribution This was a contribution made by a community member. label Jul 15, 2025
@joestringer joestringer added the release-note/misc This PR makes changes that have no direct user impact. label Jul 17, 2025
@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 Jul 17, 2025
Copy link
Contributor

@derailed derailed left a comment

Choose a reason for hiding this comment

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

@RayyanSeliya
Copy link
Contributor Author

@RayyanSeliya LGTM
Thx @derailed for approving , anything lacking for merging ? Or we should proceed for merge !

@RayyanSeliya
Copy link
Contributor Author

Hey @hemanthmalla @derailed can u please move forward for merging this pr I think it's ready !

@xmulligan
Copy link
Member

/test

@RayyanSeliya
Copy link
Contributor Author

hey @xmulligan thx for test and do i need to update the branch also ?? and yeah just wanted to have some guidance on my proposal any suggestions as i am now very much familiar with cilium with 2 prs merged and 1 pr pending and contributing more !!

@joestringer joestringer added this pull request to the merge queue Aug 6, 2025
@joestringer
Copy link
Member

LGTM, merging thanks.

Merged via the queue into cilium:main with commit b40ba7f Aug 6, 2025
79 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/community-contribution This was a contribution made by a community member. release-note/misc This PR makes changes that have no direct user impact.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[DOC] Monitoring & Metrics page has incomplete/inaccurate data
5 participants