Skip to content

Conversation

@AshwinSriram11
Copy link
Member

@AshwinSriram11 AshwinSriram11 commented Jun 27, 2025

Description

Related issue: #7638

Previously, ServiceMonitor only supported the proxyUrl field. This PR enhances the ServiceMonitor CRD by adding support for all proxy configuration options, similar to what is already available in the ScrapeConfig CRD.

Type of change

What type of changes does your code introduce to the Prometheus operator? Put an x in the box that apply.

  • CHANGE (fix or feature that would cause existing functionality to not work as expected)
  • FEATURE (non-breaking change which adds functionality)
  • BUGFIX (non-breaking change which fixes an issue)
  • ENHANCEMENT (non-breaking change which improves existing functionality)
  • NONE (if none of the other choices apply. Example, tooling, build system, CI, docs, etc.)

Verification

Please check the Prometheus-Operator testing guidelines for recommendations about automated tests.

Changelog entry

Please put a one-line changelog entry below. This will be copied to the changelog file during the release process.


@AshwinSriram11 AshwinSriram11 marked this pull request as ready for review June 27, 2025 10:44
@AshwinSriram11 AshwinSriram11 requested a review from a team as a code owner June 27, 2025 10:44
Copy link
Contributor

@simonpasquier simonpasquier left a comment

Choose a reason for hiding this comment

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

Thanks!

@simonpasquier
Copy link
Contributor

Note that we're technically introducing a breaking change because the proxyURL field now has validation on the value (should start with "http", "https" or "sock5") but I think that it's fine (as long as advertised in the changelog) because invalid values would be rejected today.

@simonpasquier simonpasquier merged commit 370a2ea into prometheus-operator:main Jun 27, 2025
23 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants