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

feat(xds): Add support nomad service discovery to the ScrapeConfig CRD #6485

Merged
merged 2 commits into from
Apr 23, 2024

Conversation

dongjiang1989
Copy link
Contributor

Description

Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request.
If it fixes a bug or resolves a feature request, be sure to link to that issue.

Add support nomad service discovery to 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.

feat(xds): Add support nomad service discovery to the ScrapeConfig CRD

Signed-off-by: dongjiang1989 <dongjiang1989@126.com>
@dongjiang1989 dongjiang1989 requested a review from a team as a code owner April 7, 2024 14:06
@dongjiang1989
Copy link
Contributor Author

@slashpai PTAL

@nicolastakashi
Copy link
Contributor

Thanks for handling that @dongjiang1989, LGTM 🥳
I'm going to approve but waiting for the last review from @slashpai since she's more aware of other implementations.

nicolastakashi
nicolastakashi previously approved these changes Apr 11, 2024
Copy link
Contributor

@slashpai slashpai left a comment

Choose a reason for hiding this comment

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

a few nits

pkg/apis/monitoring/v1alpha1/scrapeconfig_types.go Outdated Show resolved Hide resolved
pkg/apis/monitoring/v1alpha1/scrapeconfig_types.go Outdated Show resolved Hide resolved
pkg/apis/monitoring/v1alpha1/scrapeconfig_types.go Outdated Show resolved Hide resolved
pkg/apis/monitoring/v1alpha1/scrapeconfig_types.go Outdated Show resolved Hide resolved
pkg/apis/monitoring/v1alpha1/scrapeconfig_types.go Outdated Show resolved Hide resolved
pkg/apis/monitoring/v1alpha1/scrapeconfig_types.go Outdated Show resolved Hide resolved
pkg/prometheus/resource_selector.go Outdated Show resolved Hide resolved
pkg/prometheus/resource_selector.go Outdated Show resolved Hide resolved
pkg/prometheus/resource_selector_test.go Outdated Show resolved Hide resolved
Signed-off-by: dongjiang1989 <dongjiang1989@126.com>
@dongjiang1989
Copy link
Contributor Author

a few nits

Thanks. Fixed.

@slashpai slashpai merged commit 39af968 into prometheus-operator:main Apr 23, 2024
17 checks passed
@slashpai
Copy link
Contributor

slashpai commented Apr 23, 2024

@dongjiang1989 I have the merged the changes as CI didn't report any issues but looks like its complaining in generate action now https://github.com/prometheus-operator/prometheus-operator/actions/runs/8799810147/job/24149623425

can you do a follow-up PR?

Fixed #6545

@slashpai slashpai mentioned this pull request Apr 23, 2024
5 tasks
@dongjiang1989
Copy link
Contributor Author

@dongjiang1989 I have the merged the changes as CI didn't report any issues but looks like its complaining in generate action now https://github.com/prometheus-operator/prometheus-operator/actions/runs/8799810147/job/24149623425

can you do a follow-up PR?

Thanks. 👌 I'll add a follow-up PR

@dongjiang1989 dongjiang1989 deleted the add-nomad-sd branch April 23, 2024 12:54
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.

None yet

3 participants