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

fix(inputs.opcua): Auto fan out array nodes into individual fields #16359

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+34 −7
Open

fix(inputs.opcua): Auto fan out array nodes into individual fields #16359

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48dc41c
fix(inputs.opcua): Auto fan out array nodes into individual fields
Dec 20, 2024
81bd9b4
Merge branch 'influxdata:master' into master
inhinias Dec 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 34 additions & 7 deletions plugins/common/opcua/input/input_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"errors"
"fmt"
"reflect"
"sort"
"strconv"
"strings"
Expand Down Expand Up @@ -187,12 +188,13 @@ func NewNodeMetricMapping(metricName string, node NodeSettings, groupTags map[st

// NodeValue The received value for a node
type NodeValue struct {
TagName string
Value interface{}
Quality ua.StatusCode
ServerTime time.Time
SourceTime time.Time
DataType ua.TypeID
TagName string
Value interface{}
Quality ua.StatusCode
ServerTime time.Time
SourceTime time.Time
DataType ua.TypeID
ArrayLength int32
}

// OpcUAInputClient can receive data from an OPC UA server and map it to Metrics. This type does not contain
Expand Down Expand Up @@ -403,6 +405,7 @@ func (o *OpcUAInputClient) UpdateNodeValue(nodeIdx int, d *ua.DataValue) {

if d.Value != nil {
o.LastReceivedData[nodeIdx].DataType = d.Value.Type()
o.LastReceivedData[nodeIdx].ArrayLength = d.Value.ArrayLength()

o.LastReceivedData[nodeIdx].Value = d.Value.Value()
if o.LastReceivedData[nodeIdx].DataType == ua.TypeIDDateTime {
Expand All @@ -425,7 +428,22 @@ func (o *OpcUAInputClient) MetricForNode(nodeIdx int) telegraf.Metric {
tags[k] = v
}

fields[nmm.Tag.FieldName] = o.LastReceivedData[nodeIdx].Value
// If the read UA node contains array elements, fan out the elements
// Otherwise creating a field with an array would fail, as the Type is not known to the convertField() function
if o.LastReceivedData[nodeIdx].ArrayLength > 0 {
valueArray := unpackArray(o.LastReceivedData[nodeIdx].Value)
if len(valueArray) == int(o.LastReceivedData[nodeIdx].ArrayLength) {
for index, value := range valueArray {
var sb strings.Builder
sb.WriteString(nmm.Tag.FieldName)
sb.WriteString(strconv.Itoa(int(index)))
fields[sb.String()] = value
}
}
} else {
fields[nmm.Tag.FieldName] = o.LastReceivedData[nodeIdx].Value
}

fields["Quality"] = strings.TrimSpace(o.LastReceivedData[nodeIdx].Quality.Error())
if choice.Contains("DataType", o.Config.OptionalFields) {
fields["DataType"] = strings.Replace(o.LastReceivedData[nodeIdx].DataType.String(), "TypeID", "", 1)
Expand All @@ -448,3 +466,12 @@ func (o *OpcUAInputClient) MetricForNode(nodeIdx int) telegraf.Metric {

return metric.New(nmm.metricName, tags, fields, t)
}

func unpackArray(s any) []any {
v := reflect.ValueOf(s)
r := make([]any, v.Len())
for i := 0; i < v.Len(); i++ {
r[i] = v.Index(i).Interface()
}
return r
}
Loading