这是indexloc提供的服务，不要输入任何密码
Skip to content

Allow underscores in vector schemes #4355

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

Merged
merged 2 commits into from
Jan 24, 2021
Merged

Allow underscores in vector schemes #4355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfc98ec
fix: allow underscores in vector schemes
josegonzalez Jan 24, 2021
bf5fbf4
fix: add logs-get-property to gitignore
josegonzalez Jan 24, 2021
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
1 change: 1 addition & 0 deletions plugins/logs/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
/triggers/*
/triggers
/docker-args-process-deploy
/logs-get-property
/install
/post-*
/report
17 changes: 12 additions & 5 deletions plugins/logs/functions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,14 @@ func stopVectorContainer() error {
})
}

func valueToConfig(appName string, value string) (vectorSink, error) {
func sinkValueToConfig(appName string, sinkValue string) (vectorSink, error) {
var data vectorSink
u, err := url.Parse(value)
if strings.Contains(sinkValue, "://") {
parts := strings.SplitN(sinkValue, "://", 2)
parts[0] = strings.ReplaceAll(parts[0], "_", "-")
sinkValue = strings.Join(parts, "://")
}
u, err := url.Parse(sinkValue)
if err != nil {
return data, err
}
Expand All @@ -120,6 +125,8 @@ func valueToConfig(appName string, value string) (vectorSink, error) {
return data, errors.New("Invalid option sinks")
}

u.Scheme = strings.ReplaceAll(u.Scheme, "-", "_")

t := fmt.Sprintf("type=%s", u.Scheme)
i := fmt.Sprintf("inputs[]=docker-source:%s", appName)
if appName == "--global" {
Expand Down Expand Up @@ -163,7 +170,7 @@ func writeVectorConfig() error {
continue
}

sink, err := valueToConfig(appName, value)
sink, err := sinkValueToConfig(appName, value)
if err != nil {
return err
}
Expand All @@ -178,7 +185,7 @@ func writeVectorConfig() error {

value := common.PropertyGet("logs", "--global", "vector-sink")
if value != "" {
sink, err := valueToConfig("--global", value)
sink, err := sinkValueToConfig("--global", value)
if err != nil {
return err
}
Expand All @@ -201,7 +208,7 @@ func writeVectorConfig() error {

if len(data.Sinks) == 0 {
// write logs to a blackhole
sink, err := valueToConfig("--null", "blackhole://?print_amount=1")
sink, err := sinkValueToConfig("--null", "blackhole://?print_amount=1")
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion plugins/logs/set.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func validateVectorSink(appName string, value string) error {
return nil
}

_, err := valueToConfig(appName, value)
_, err := sinkValueToConfig(appName, value)
if err != nil {
return err
}
Expand Down
87 changes: 87 additions & 0 deletions tests/unit/logs.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,44 @@ teardown() {
assert_success
assert_output "console://?encoding[codec]=json"

run /bin/bash -c "dokku logs:set $TEST_APP vector-sink datadog_logs://?api_key=abc123" 2>&1
echo "output: $output"
echo "status: $status"
assert_success
assert_output_contains "Setting vector-sink"
assert_output_contains "Writing updated vector config to /var/lib/dokku/data/logs/vector.json"

run /bin/bash -c "dokku logs:report $TEST_APP --logs-vector-sink 2>&1"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "datadog_logs://?api_key=abc123"

run /bin/bash -c "dokku logs:set $TEST_APP vector-sink" 2>&1
echo "output: $output"
echo "status: $status"
assert_success
assert_output_contains "Unsetting vector-sink"
assert_output_contains "Writing updated vector config to /var/lib/dokku/data/logs/vector.json"

run /bin/bash -c "dokku logs:report $TEST_APP --logs-vector-sink 2>&1"
echo "output: $output"
echo "status: $status"
assert_success
assert_output_not_exists

run /bin/bash -c "dokku logs:set $TEST_APP vector-sink" 2>&1
echo "output: $output"
echo "status: $status"
assert_success
assert_output_contains "Unsetting vector-sink"

run /bin/bash -c "dokku logs:report $TEST_APP --logs-vector-sink 2>&1"
echo "output: $output"
echo "status: $status"
assert_success
assert_output ""

run /bin/bash -c "dokku logs:report $TEST_APP --logs-max-size 2>&1"
echo "output: $output"
echo "status: $status"
Expand Down Expand Up @@ -186,6 +224,18 @@ teardown() {
echo "status: $status"
assert_success
assert_output "unlimited"

run /bin/bash -c "dokku logs:set "$TEST_APP" max-size" 2>&1
echo "output: $output"
echo "status: $status"
assert_success
assert_output_contains "Unsetting max-size"

run /bin/bash -c "dokku logs:report $TEST_APP --logs-max-size 2>&1"
echo "output: $output"
echo "status: $status"
assert_success
assert_output ""
}

@test "(logs) logs:set global" {
Expand Down Expand Up @@ -226,6 +276,19 @@ teardown() {
assert_success
assert_output "console://?encoding[codec]=json"

run /bin/bash -c "dokku logs:set --global vector-sink datadog_logs://?api_key=abc123" 2>&1
echo "output: $output"
echo "status: $status"
assert_success
assert_output_contains "Setting vector-sink"
assert_output_contains "Writing updated vector config to /var/lib/dokku/data/logs/vector.json"

run /bin/bash -c "dokku logs:report $TEST_APP --logs-global-vector-sink 2>&1"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "datadog_logs://?api_key=abc123"

run /bin/bash -c "dokku logs:set --global vector-sink" 2>&1
echo "output: $output"
echo "status: $status"
Expand All @@ -239,6 +302,24 @@ teardown() {
assert_success
assert_output_not_exists

run /bin/bash -c "dokku logs:set --global vector-sink" 2>&1
echo "output: $output"
echo "status: $status"
assert_success
assert_output_contains "Unsetting vector-sink"

run /bin/bash -c "dokku logs:report $TEST_APP --logs-global-vector-sink 2>&1"
echo "output: $output"
echo "status: $status"
assert_success
assert_output_not_exists

run /bin/bash -c "dokku logs:report $TEST_APP --logs-global-max-size 2>&1"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "10m"

run /bin/bash -c "dokku logs:set --global max-size" 2>&1
echo "output: $output"
echo "status: $status"
Expand Down Expand Up @@ -280,6 +361,12 @@ teardown() {
echo "status: $status"
assert_success
assert_output_contains "Unsetting max-size"

run /bin/bash -c "dokku logs:report $TEST_APP --logs-global-max-size 2>&1"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "10m"
}

@test "(logs) logs:vector" {
Expand Down