Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

fix(inputs.upsd): Move to new sample.conf style #11471

Merged
merged 1 commit into from
Jul 8, 2022

Conversation

srebhan
Copy link
Member

@srebhan srebhan commented Jul 7, 2022

This PR moves inputs.upsd's sample-configuration to a sample.conf file and embeds the data into both the code and the README. By doing so, we fix the missing [[inputs.upsd]] header when generating Telegraf's sample-configuration (see comment in #9890).

@telegraf-tiger telegraf-tiger bot added the fix pr to fix corresponding bug label Jul 7, 2022
@srebhan srebhan mentioned this pull request Jul 7, 2022
3 tasks
@telegraf-tiger
Copy link
Contributor

telegraf-tiger bot commented Jul 7, 2022

@ostueker
Copy link

ostueker commented Jul 7, 2022

The plugins/inputs/upsd/sample.conf looks correct.

However the respective lines in etc/telegraf.conf are still missing the header.
I haven't looked onto telegraf's build-automation, but this may be because the telegraf.conf and telegraf_windows.conf are updated periodically by the @telegraf-tiger bot, which would only run after this PR has been merged.

@ostueker
Copy link

ostueker commented Jul 7, 2022

Forgot to tag @srebhan ^^ .

@srebhan
Copy link
Member Author

srebhan commented Jul 7, 2022

The files will be auto-generated once this is merged IIRC. You can check by running telegraf config with this PR.

@ostueker
Copy link

ostueker commented Jul 7, 2022

Confirmed:

$ ./usr/bin/telegraf config | grep -A 6 "Network UPS Tools" 
# # Monitor UPSes connected via Network UPS Tools
# [[inputs.upsd]]
#   ## A running NUT server to connect to.
#   # server = "127.0.0.1"
#   # port = 3493
#   # username = "user"
#   # password = "password"

LGTM

(looking forward to the next release ;-) )

@srebhan srebhan 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 Jul 8, 2022
@sspaink sspaink merged commit bf0d261 into influxdata:master Jul 8, 2022
# for free to join this conversation on GitHub. Already have an account? # 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
Development

Successfully merging this pull request may close these issues.

4 participants