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

fix: Rename the Prometheus Input Plugin Timeout variable #12626

Merged
merged 4 commits into from
Feb 10, 2023

Conversation

ZPascal
Copy link
Contributor

@ZPascal ZPascal commented Feb 6, 2023

Rename the Timeout Prometheus Input Plugin variable inside the configuration and the code to parse the corresponding value directly

Be aware it's a breaking change for older versions and should be merged into the next major version.

resolves #12565

Fix the corresponding case and renames the variable as already discussed inside #12565

@telegraf-tiger telegraf-tiger bot added the fix pr to fix corresponding bug label Feb 6, 2023
Copy link
Contributor

@powersj powersj left a comment

Choose a reason for hiding this comment

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

Thanks for taking the time to quickly put a PR.

I am happy to see the new option, but instead of outright removing the old option, we want to deprecate the option. This way users get a warning before we outright remove.

@powersj powersj added the waiting for response waiting for response from contributor label Feb 6, 2023
@ZPascal
Copy link
Contributor Author

ZPascal commented Feb 6, 2023

@powersj You're right. That makes sense. I'll handle it later.

@telegraf-tiger telegraf-tiger bot removed the waiting for response waiting for response from contributor label Feb 6, 2023
Copy link
Contributor

@powersj powersj left a comment

Choose a reason for hiding this comment

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

Thanks for the update and tests! Just two suggestions to make the new option show up first in the config.

plugins/inputs/prometheus/README.md Outdated Show resolved Hide resolved
plugins/inputs/prometheus/sample.conf Outdated Show resolved Hide resolved
ZPascal and others added 2 commits February 7, 2023 15:36
Co-authored-by: Joshua Powers <powersj@fastmail.com>
Co-authored-by: Joshua Powers <powersj@fastmail.com>
@ZPascal
Copy link
Contributor Author

ZPascal commented Feb 7, 2023

@powersj Sure, it's done.

Copy link
Contributor

@powersj powersj left a comment

Choose a reason for hiding this comment

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

Thanks again!

@powersj powersj added the ready for final review This pull request has been reviewed and/or tested by multiple users and is ready for a final review. label Feb 7, 2023
Copy link
Contributor

@srebhan srebhan left a comment

Choose a reason for hiding this comment

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

Thanks for the fix @ZPascal. I do have two small comments...

plugins/inputs/prometheus/sample.conf Show resolved Hide resolved
plugins/inputs/prometheus/prometheus_test.go Outdated Show resolved Hide resolved
Co-authored-by: Sven Rebhan <36194019+srebhan@users.noreply.github.com>
@telegraf-tiger
Copy link
Contributor

telegraf-tiger bot commented Feb 9, 2023

Copy link
Contributor

@srebhan srebhan left a comment

Choose a reason for hiding this comment

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

Thanks for your contribution @ZPascal!

@srebhan srebhan merged commit aa0b9d7 into influxdata:master Feb 10, 2023
@ZPascal ZPascal deleted the ISSUE-12565 branch February 10, 2023 10:54
powersj pushed a commit that referenced this pull request Feb 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
fix pr to fix corresponding bug ready for final review This pull request has been reviewed and/or tested by multiple users and is ready for a final review.
Projects
None yet
3 participants