github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #5225 from dokku/5221-inflected-app-name

Browse Source 
Use original app name when setting include_labels for vector source
This commit is contained in:
Jose Diaz-Gonzalez
2022-06-27 10:46:25 -04:00
committed by GitHub
parent 9da3b4e155 51cd7fd85e
commit 3f28c24b57
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/logs/functions.go
View File

@@ -168,18 +168,18 @@ func writeVectorConfig() error {
continue
}
appName = strings.ReplaceAll(appName, ".", "-")
sink, err := sinkValueToConfig(appName, value)
inflectedAppName := strings.ReplaceAll(appName, ".", "-")
sink, err := sinkValueToConfig(inflectedAppName, value)
if err != nil {
return err
}
data.Sources[fmt.Sprintf("docker-source:%s", appName)] = vectorSource{
data.Sources[fmt.Sprintf("docker-source:%s", inflectedAppName)] = vectorSource{
Type: "docker_logs",
IncludeLabels: []string{fmt.Sprintf("com.dokku.app-name=%s", appName)},
}
data.Sinks[fmt.Sprintf("docker-sink:%s", appName)] = sink
data.Sinks[fmt.Sprintf("docker-sink:%s", inflectedAppName)] = sink
}
value := common.PropertyGet("logs", "--global", "vector-sink")