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.

Sign up for GitHub

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

Jump to bottom

feat(outputs.prometheus_client): Support vsock listen #6382 #14108

Merged
merged 1 commit into from
Nov 6, 2023
Merged

feat(outputs.prometheus_client): Support vsock listen #6382 #14108

merged 1 commit into from
Nov 6, 2023

Conversation

jeffrey4l
Copy link
Contributor

This is particial resolved the issue #6382

@telegraf-tiger
Copy link
Contributor

Thanks so much for the pull request!
🤝 ✒️ Just a reminder that the CLA has not yet been signed, and we'll need it before merging. Please sign the CLA when you get a chance, then post a comment here saying !signed-cla

@telegraf-tiger telegraf-tiger bot added feat Improvement on an existing feature such as adding a new setting/mode to an existing plugin plugin/output 1. Request for new output plugins 2. Issues/PRs that are related to out plugins labels Oct 15, 2023
@jeffrey4l jeffrey4l force-pushed the master branch 2 times, most recently from e0929ce to cf7fc7b Compare October 15, 2023 13:57
@jeffrey4l jeffrey4l mentioned this pull request Oct 16, 2023
Closed
3 tasks
srebhan
srebhan reviewed Oct 17, 2023
View reviewed changes
Copy link
Member

@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.

Thank you very much for tackling this old issue @jeffrey4l! Just one minor comment... Furthermore, I wanted to ask if you can also provide a unit-test for the vsock case!?

plugins/outputs/prometheus_client/prometheus_client.go Outdated
}
return net.Listen("tcp", p.Listen)
return nil, errors.New("Unknow scheme")
Copy link
Member

Choose a reason for hiding this comment

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

Error messages should start with a lower-case letter... (+typo fix)

Suggested change
return nil, errors.New("Unknow scheme")
return nil, errors.New("unknown scheme")

@srebhan srebhan self-assigned this Oct 17, 2023
@powersj
Copy link
Contributor

powersj commented Oct 24, 2023

@jeffrey4l,

Thanks for the PR. Sven left a comment above. In addition to that, would you be willing to write a unit test?

Thanks!

@powersj powersj added the waiting for response waiting for response from contributor label Oct 24, 2023
@jeffrey4l
Copy link
Contributor Author

sure. will do later

@telegraf-tiger telegraf-tiger bot removed the waiting for response waiting for response from contributor label Oct 26, 2023
@powersj powersj added the waiting for response waiting for response from contributor label Nov 3, 2023
@jeffrey4l
Copy link
Contributor Author

do yo have any idea how to test this? for the vsock, when listen on the host, it only can be connected from guest (qemu virtual machine). So i can listen on the vsock, but there is no way test it through real connect.

@telegraf-tiger telegraf-tiger bot removed the waiting for response waiting for response from contributor label Nov 4, 2023
@srebhan
Copy link
Member

srebhan commented Nov 6, 2023

@jeffrey4l does that somehow work with a container? If so, check using testcontainers-go (see e.g. the NTPQ plugin)...

@jeffrey4l
Copy link
Contributor Author

@srebhan no, it only works between host and qemu guest vm. ie listen on the host and connect from the qemu guest vm. or vice versa

@srebhan
Copy link
Member

srebhan commented Nov 6, 2023

@jeffrey4l then I think we are out of luck for a unit-test. Thanks for clarifying! Can you please fix the merge conflicts and fix the two lines I commented on above!? After that I'm fine with the PR...

@jeffrey4l jeffrey4l force-pushed the master branch 2 times, most recently from 69f1611 to d8f0a9d Compare November 6, 2023 08:54
@telegraf-tiger
Copy link
Contributor

telegraf-tiger bot commented Nov 6, 2023

Download PR build artifacts for linux_amd64.tar.gz, darwin_amd64.tar.gz, and windows_amd64.zip.
Downloads for additional architectures and packages are available below.

☺️ This pull request doesn't significantly change the Telegraf binary size (less than 1%)

📦 Click here to get additional PR build artifacts

Artifact URLs

DEB RPM TAR GZ ZIP
amd64.deb aarch64.rpm darwin_amd64.tar.gz windows_amd64.zip
arm64.deb armel.rpm darwin_arm64.tar.gz windows_arm64.zip
armel.deb armv6hl.rpm freebsd_amd64.tar.gz windows_i386.zip
armhf.deb i386.rpm freebsd_armv7.tar.gz
i386.deb ppc64le.rpm freebsd_i386.tar.gz
mips.deb riscv64.rpm linux_amd64.tar.gz
mipsel.deb s390x.rpm linux_arm64.tar.gz
ppc64el.deb x86_64.rpm linux_armel.tar.gz
riscv64.deb linux_armhf.tar.gz
s390x.deb linux_i386.tar.gz
linux_mips.tar.gz
linux_mipsel.tar.gz
linux_ppc64le.tar.gz
linux_riscv64.tar.gz
linux_s390x.tar.gz

@jeffrey4l
Copy link
Contributor Author

@srebhan pr is ready for review.

srebhan
srebhan approved these changes Nov 6, 2023
View reviewed changes
Copy link
Member

@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 @jeffrey4l!

@srebhan srebhan changed the title feat(outputs.prometheus_client): support vsock listen #6382 feat(outputs.prometheus_client): Support vsock listen #6382 Nov 6, 2023
@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 Nov 6, 2023
@srebhan srebhan assigned powersj and unassigned srebhan Nov 6, 2023
powersj
powersj approved these changes Nov 6, 2023
View reviewed changes
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.

Thank you!

@powersj powersj merged commit ac171a0 into influxdata:master Nov 6, 2023
5 checks passed
@github-actions github-actions bot added this to the v1.29.0 milestone Nov 6, 2023
Hipska added a commit to Super-Visions/telegraf that referenced this pull request Nov 7, 2023
@Hipska
Merge branch 'master' into feat/processors/snmp_lookup
6d415cb 
* master:
  fix(inputs.win_perf_counter): Do not rely on returned buffer size (influxdata#14241)
  feat(inputs.modbus): Add support for string-fields (influxdata#14145)
  chore(deps): Bump cloud.google.com/go/storage from 1.30.1 to 1.34.1 (influxdata#14253)
  chore(deps): Bump github.com/rabbitmq/amqp091-go from 1.8.1 to 1.9.0 (influxdata#14252)
  chore(deps): Bump github.com/hashicorp/consul/api from 1.25.1 to 1.26.1 (influxdata#14251)
  chore(deps): Bump github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs from 1.23.5 to 1.26.0 (influxdata#14249)
  fix(config): Fix comment removal in TOML files (influxdata#14240)
  feat(outputs.prometheus_client): Support listen on vsock (influxdata#14108)
  fix(inputs.mqtt_consumer): Resolve could not mark message delivered (influxdata#14243)
  chore(linters): Fix findings found by testifylint for Windows and enable it. (influxdata#14238)
  feat(migrations): Add option migration for inputs.nats_consumer (influxdata#14234)
  feat(migrations): Add option migration for inputs.mqtt_consumer (influxdata#14233)
  test(inputs.jolokia2_agent): Sort metrics as order is not consistent (influxdata#14227)
@Porkepix Porkepix mentioned this pull request Dec 11, 2023
Merged
@powersj powersj mentioned this pull request Dec 18, 2023
Merged
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@srebhan srebhan srebhan approved these changes

@powersj powersj powersj approved these changes

Assignees

@powersj powersj

Labels
area/prometheus feat Improvement on an existing feature such as adding a new setting/mode to an existing plugin plugin/output 1. Request for new output plugins 2. Issues/PRs that are related to out plugins 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
Milestone
v1.29.0
Development

Successfully merging this pull request may close these issues.
3 participants
@jeffrey4l @powersj @srebhan