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(common.opcua): Add option to include OPC-UA DataType as a Field #14345

Merged
merged 19 commits into from
Dec 7, 2023
Merged

feat(common.opcua): Add option to include OPC-UA DataType as a Field #14345

merged 19 commits into from
Dec 7, 2023

Conversation

caallinson
Copy link
Contributor

@caallinson caallinson commented Nov 25, 2023 •
edited
Loading

resolves #8669

Adds a structure for optional fields to be included with metrics, and implements a method to add DataType as a field when OPC-UA tags are read

@telegraf-tiger telegraf-tiger bot added the feat Improvement on an existing feature such as adding a new setting/mode to an existing plugin label Nov 25, 2023
@caallinson caallinson changed the title feat(opcua): Structure for additional fields, option to include DataType as field feat(inputs.opcua): Structure for additional fields, option to include DataType as field Nov 25, 2023
@caallinson caallinson changed the title feat(inputs.opcua): Structure for additional fields, option to include DataType as field feat(inputs.opcua): Option to include OPC-UA DataType as a Field Nov 26, 2023
@caallinson caallinson changed the title feat(inputs.opcua): Option to include OPC-UA DataType as a Field feat(common.opcua): Option to include OPC-UA DataType as a Field Nov 26, 2023
@caallinson caallinson marked this pull request as ready for review November 26, 2023 18:42
Hipska
Hipska suggested changes Nov 27, 2023
View reviewed changes
plugins/inputs/opcua/opcua_test.go Outdated Show resolved Hide resolved
plugins/inputs/opcua_listener/opcua_listener_test.go Outdated Show resolved Hide resolved
plugins/common/opcua/input/input_client.go Outdated Show resolved Hide resolved
plugins/inputs/opcua/sample.conf Outdated Show resolved Hide resolved
plugins/inputs/opcua_listener/sample.conf Outdated Show resolved Hide resolved
plugins/common/opcua/client.go Outdated Show resolved Hide resolved
@srebhan srebhan added area/opcua plugin/input 1. Request for new input plugins 2. Issues/PRs that are related to input plugins labels Nov 28, 2023
@srebhan srebhan changed the title feat(common.opcua): Option to include OPC-UA DataType as a Field feat(common.opcua): Add option to include OPC-UA DataType as a Field Nov 28, 2023
@caallinson caallinson marked this pull request as draft December 4, 2023 03:02
@caallinson caallinson marked this pull request as ready for review December 4, 2023 03:26
Hipska
Hipska suggested changes Dec 4, 2023
View reviewed changes
Copy link
Contributor

@Hipska Hipska left a comment

Choose a reason for hiding this comment

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

Good improvements, some minor comments left

plugins/inputs/opcua/opcua_test.go Outdated Show resolved Hide resolved
plugins/inputs/opcua/opcua_test.go Outdated Show resolved Hide resolved
plugins/inputs/opcua_listener/opcua_listener_test.go Outdated Show resolved Hide resolved
plugins/inputs/opcua_listener/opcua_listener_test.go Outdated Show resolved Hide resolved
plugins/inputs/opcua_listener/opcua_listener_test.go Show resolved Hide resolved
caallinson and others added 5 commits December 4, 2023 20:04
@caallinson
Change OptionalFields from sub-struct to list
94c354f
@caallinson @Hipska
Update plugins/inputs/opcua_listener/opcua_listener_test.go
39babfd 
Co-authored-by: Thomas Casteleyn <thomas.casteleyn@me.com>
@caallinson @Hipska
Update plugins/inputs/opcua_listener/opcua_listener_test.go
8445703 
Co-authored-by: Thomas Casteleyn <thomas.casteleyn@me.com>
@caallinson @Hipska
Update plugins/inputs/opcua/opcua_test.go
451fc5f 
Co-authored-by: Thomas Casteleyn <thomas.casteleyn@me.com>
@caallinson @Hipska
Update plugins/inputs/opcua/opcua_test.go
e70d484 
Co-authored-by: Thomas Casteleyn <thomas.casteleyn@me.com>
Hipska
Hipska approved these changes Dec 5, 2023
View reviewed changes
plugins/inputs/opcua/opcua_test.go Outdated Show resolved Hide resolved
@Hipska Hipska 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 Dec 5, 2023
@srebhan @Hipska
Update plugins/inputs/opcua/opcua_test.go
f7beaef 
Co-authored-by: Thomas Casteleyn <thomas.casteleyn@me.com>
srebhan
srebhan reviewed Dec 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 the PR @caallinson! One comment from my side...

plugins/common/opcua/client.go Show resolved Hide resolved
@srebhan srebhan self-assigned this Dec 6, 2023
Hipska
Hipska suggested changes Dec 7, 2023
View reviewed changes
plugins/common/opcua/client.go Outdated Show resolved Hide resolved
plugins/common/opcua/client.go Outdated Show resolved Hide resolved
plugins/inputs/opcua_listener/opcua_listener_test.go Show resolved Hide resolved
powersj and others added 2 commits December 7, 2023 12:31
@powersj @Hipska
Update plugins/common/opcua/client.go
87e36dc 
Co-authored-by: Thomas Casteleyn <thomas.casteleyn@me.com>
@powersj @Hipska
Update plugins/common/opcua/client.go
31e582b 
Co-authored-by: Thomas Casteleyn <thomas.casteleyn@me.com>
srebhan
srebhan approved these changes Dec 7, 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.

Will commit the last two smaller things. Thanks for the PR @caallinson!

plugins/common/opcua/client.go Outdated Show resolved Hide resolved
plugins/common/opcua/client.go Outdated Show resolved Hide resolved
@srebhan srebhan assigned powersj and unassigned srebhan Dec 7, 2023
@telegraf-tiger
Copy link
Contributor

telegraf-tiger bot commented Dec 7, 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

@powersj powersj merged commit fbd2dcc into influxdata:master Dec 7, 2023
23 checks passed
@github-actions github-actions bot added this to the v1.29.0 milestone Dec 7, 2023
@caallinson caallinson deleted the 8669_opcua_include-datatype branch December 10, 2023 22:34
@Porkepix Porkepix mentioned this pull request Dec 11, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Hipska Hipska Hipska requested changes

@srebhan srebhan srebhan approved these changes

@powersj powersj powersj approved these changes

Assignees

@powersj powersj

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

inputs.opcua: Add metric for datatype
4 participants
@caallinson @Hipska @powersj @srebhan