diff --git a/plugins/logs/functions.go b/plugins/logs/functions.go index 85fcac236..f1d146fbd 100644 --- a/plugins/logs/functions.go +++ b/plugins/logs/functions.go @@ -128,23 +128,9 @@ func sinkValueToConfig(appName string, sinkValue string) (vectorSink, error) { u.Scheme = strings.ReplaceAll(u.Scheme, "-", "_") - t := fmt.Sprintf("type=%s", u.Scheme) - i := fmt.Sprintf("inputs[]=docker-source:%s", appName) - if appName == "--global" { - i = "inputs[]=docker-global-source" - } - if appName == "--null" { - i = "inputs[]=docker-null-source" - } - - initialQuery := fmt.Sprintf("%s&%s", t, i) query := u.RawQuery - if query == "" { - query = initialQuery - } else if strings.HasPrefix(query, "&") { - query = fmt.Sprintf("%s%s", initialQuery, query) - } else { - query = fmt.Sprintf("%s&%s", initialQuery, query) + if strings.HasPrefix(query, "&") { + query = strings.TrimPrefix(query, "&") } b, err := qson.ToJSON(query) @@ -156,6 +142,15 @@ func sinkValueToConfig(appName string, sinkValue string) (vectorSink, error) { return data, err } + data["type"] = u.Scheme + data["inputs"] = []string{"docker-source:" + appName} + if appName == "--global" { + data["inputs"] = []string{"docker-global-source"} + } + if appName == "--null" { + data["inputs"] = []string{"docker-null-source"} + } + return data, nil }