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

Support for NS records to discovery.dns #5905

Closed
wants to merge 6 commits into from
Closed

Conversation

djcode
Copy link
Contributor

@djcode djcode commented Dec 1, 2023

PR Description

I added support for NS records to DNS discovery in Prometheus. prometheus/prometheus#13219
This PR adds that support to the discovery.dns component.

Notes to the Reviewer

PR Checklist

  • CHANGELOG.md updated
  • Documentation added
  • Tests updated
  • Config converters updated

@djcode djcode changed the title Added support for NS records to discovery.dns Support for NS records to discovery.dns Dec 1, 2023
@clayton-cornell clayton-cornell requested a review from a team December 1, 2023 17:08
@clayton-cornell clayton-cornell added the type/docs Docs Squad label across all Grafana Labs repos label Dec 1, 2023
@clayton-cornell
Copy link
Contributor

Docs look ok

Someone from @grafana/grafana-agent-maintainers shoudl take a quick look at this before we merge.

Copy link
Contributor

@ptodev ptodev left a comment

Choose a reason for hiding this comment

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

The change looks good, but I think we need to update our Prometheus dependency before merging it. Do you know when the next version of Prometheus with this change will be released?

@ptodev ptodev self-assigned this Dec 4, 2023
@djcode
Copy link
Contributor Author

djcode commented Dec 5, 2023

The change looks good, but I think we need to update our Prometheus dependency before merging it. Do you know when the next version of Prometheus with this change will be released?

That's a good point. I'm not sure when the next release will be nor if it will include my change. I'm happy to keep an eye on when the Prometheus change is properly released and update here when it happens.

@djcode
Copy link
Contributor Author

djcode commented Jan 18, 2024

My upstream change was merged in 2.49.0.
I looked at how to update the Prometheus library inside Grafana Agent and it seems a bit more involved than I'd like for my little change.

https://github.com/grafana/agent/blob/main/go.mod#L690 has been updated regularly since the beginning of my PR, so I'm happy to wait until that is version based off a Prometheus 2.49.0+ build and my change is the only thing that needs to be changed.

@rfratto rfratto added variant/static Related to Grafana Agent Static. variant/flow Relatd to Grafana Agent Flow. labels Apr 9, 2024
@ptodev
Copy link
Contributor

ptodev commented May 28, 2024

Hi, @djcode! I opened a PR to add this feature to Alloy. Thank you for contributing it. The Alloy PR is exactly the same as yours.

I am going to close this Agent PR because it might take a while for us to upgrade the Prometheus dependency in Grafana Agent. Even if we do, we are mostly focused on bugfixes with Agent releases now, and the NS DNS support won't take much priority unless someone mentioned that it's an issue for them. Please let me know if this is indeed a big issue for you and I'd be happy to reopen the Agent PR.

@ptodev ptodev closed this May 28, 2024
@djcode
Copy link
Contributor Author

djcode commented May 28, 2024

@ptodev Perfect! Thank you!

@github-actions github-actions bot added the frozen-due-to-age Locked due to a period of inactivity. Please open new issues or PRs if more discussion is needed. label Jun 30, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 30, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
frozen-due-to-age Locked due to a period of inactivity. Please open new issues or PRs if more discussion is needed. type/docs Docs Squad label across all Grafana Labs repos variant/flow Relatd to Grafana Agent Flow. variant/static Related to Grafana Agent Static.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants