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

fix(outputs.mqtt): Preserve leading slash in topic (#14582)

This commit is contained in:
Yuan Zhang 2024-01-19 01:30:23 +08:00 committed by GitHub
parent 9aee2681bb
commit 7cafdaf2ce
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/outputs/mqtt/mqtt_test.go
View File

@ -908,6 +908,11 @@ func TestGenerateTopicName(t *testing.T) {
pattern: "double//slashes//are//ignored", pattern: "double//slashes//are//ignored",
want: "double/slashes/are/ignored", want: "double/slashes/are/ignored",
}, },
{
name: "preserve leading forward slash",
pattern: "/this/is/a/topic",
want: "/this/is/a/topic",
},
} }
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {

3
plugins/outputs/mqtt/topic_name_generator.go
View File

@ -54,5 +54,8 @@ func (t *TopicNameGenerator) Generate(hostname string, m telegraf.Metric) (strin
if topic == "" { if topic == "" {
return m.Name(), nil return m.Name(), nil
} }
if strings.HasPrefix(b.String(), "/") {
topic = "/" + topic
}
return topic, nil return topic, nil
} }