CL-Softwares
/
telegraf
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(inputs.cisco_telemetry_mdt): Handle NXOS DME subtree telemetry format (#15923)

This commit is contained in:
Yusuf Shalaby 2024-10-02 16:41:55 -04:00 committed by GitHub
parent f42104fa06
commit 22681758f1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 148 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/inputs/cisco_telemetry_mdt/cisco_telemetry_mdt.go
View File

@ -624,13 +624,19 @@ func (c *CiscoTelemetryMDT) parseClassAttributeField(grouper *metric.SeriesGroup
}
nxAttributes = field.Fields[0].Fields[0].Fields[0].Fields[0]
// Find dn tag among list of attributes
for _, subfield := range nxAttributes.Fields {
if subfield.Name == "dn" {
tags["dn"] = decodeTag(subfield)
} else {
c.parseContentField(grouper, subfield, "", encodingPath, tags, timestamp)
break
}
}
// Add attributes to grouper with consistent dn tag
for _, subfield := range nxAttributes.Fields {
c.parseContentField(grouper, subfield, "", encodingPath, tags, timestamp)
}
// Delete dn tag to prevent it from being added to the next node's attributes
delete(tags, "dn")
}
func (c *CiscoTelemetryMDT) getMeasurementName(encodingPath string) string {

140
plugins/inputs/cisco_telemetry_mdt/cisco_telemetry_mdt_test.go
View File

@ -820,6 +820,146 @@ func TestHandleNXDME(t *testing.T) {
fields1 := map[string]interface{}{"value": "foo"}
acc.AssertContainsTaggedFields(t, "dme", fields1, tags1)
}
func TestHandleNXDMESubtree(t *testing.T) {
c := &CiscoTelemetryMDT{
Transport: "dummy",
Aliases: map[string]string{"dme": "sys/dme"},
}
acc := &testutil.Accumulator{}
err := c.Start(acc)
// error is expected since we are passing in dummy transport
require.Error(t, err)
telemetry := &telemetryBis.Telemetry{
MsgTimestamp: 1543236572000,
EncodingPath: "sys/dme",
NodeId: &telemetryBis.Telemetry_NodeIdStr{NodeIdStr: "hostname"},
Subscription: &telemetryBis.Telemetry_SubscriptionIdStr{SubscriptionIdStr: "subscription"},
DataGpbkv: []*telemetryBis.TelemetryField{
{
Fields: []*telemetryBis.TelemetryField{
{
Name: "keys",
Fields: []*telemetryBis.TelemetryField{
{
Name: "sys/dme",
ValueByType: &telemetryBis.TelemetryField_StringValue{StringValue: "sys/dme"},
},
},
},
{
Name: "content",
Fields: []*telemetryBis.TelemetryField{
{
Fields: []*telemetryBis.TelemetryField{
{
Name: "children",
Fields: []*telemetryBis.TelemetryField{
{
Fields: []*telemetryBis.TelemetryField{
{
Name: "fooEntity",
Fields: []*telemetryBis.TelemetryField{
{
Fields: []*telemetryBis.TelemetryField{
{
Name: "attributes",
Fields: []*telemetryBis.TelemetryField{
{
Fields: []*telemetryBis.TelemetryField{
{
Name: "foo",
ValueByType: &telemetryBis.TelemetryField_StringValue{
StringValue: "bar1",
},
},
{
Name: "dn",
ValueByType: &telemetryBis.TelemetryField_StringValue{
StringValue: "eth1/1",
},
},
},
},
},
},
},
},
},
},
},
},
{
Fields: []*telemetryBis.TelemetryField{
{
Name: "fooEntity",
Fields: []*telemetryBis.TelemetryField{
{
Fields: []*telemetryBis.TelemetryField{
{
Name: "attributes",
Fields: []*telemetryBis.TelemetryField{
{
Fields: []*telemetryBis.TelemetryField{
{
Name: "foo",
ValueByType: &telemetryBis.TelemetryField_StringValue{
StringValue: "bar2",
},
},
{
Name: "dn",
ValueByType: &telemetryBis.TelemetryField_StringValue{
StringValue: "eth1/2",
},
},
},
},
},
},
},
},
},
},
},
},
},
},
},
},
},
},
},
},
}}
data, err := proto.Marshal(telemetry)
require.NoError(t, err)
c.handleTelemetry(data)
require.Empty(t, acc.Errors)
require.Len(t, acc.Metrics, 2)
tags1 := map[string]string{
"dn": "eth1/1",
"path": "sys/dme",
"source": "hostname",
"subscription": "subscription",
"sys/dme": "sys/dme",
}
fields1 := map[string]interface{}{"foo": "bar1", "dn": "eth1/1"}
acc.AssertContainsTaggedFields(t, "dme", fields1, tags1)
tags2 := map[string]string{
"dn": "eth1/2",
"path": "sys/dme",
"source": "hostname",
"subscription": "subscription",
"sys/dme": "sys/dme",
}
fields2 := map[string]interface{}{"foo": "bar2", "dn": "eth1/2"}
acc.AssertContainsTaggedFields(t, "dme", fields2, tags2)
}
func TestTCPDialoutOverflow(t *testing.T) {
c := &CiscoTelemetryMDT{