Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
0d9cb32
Using specific pass for each host in redis output
rvillablanca Feb 9, 2020
b88f2a7
Merge remote-tracking branch 'origin/master' into specific-password-r…
rvillablanca Feb 13, 2020
02fb2b1
Partials advances parsing redis scheme
rvillablanca Feb 13, 2020
abb0df4
Validate tls config when schema is 'rediss'
rvillablanca Feb 13, 2020
3f23756
Fix collition name with package url
rvillablanca Feb 13, 2020
9ce4c41
* fix bug with host
rvillablanca Feb 13, 2020
79ad5a2
More validations in url
rvillablanca Feb 14, 2020
a37d524
Merge remote-tracking branch 'origin/master' into specific-password-r…
rvillablanca Feb 14, 2020
b219e24
Merge remote-tracking branch 'origin/master' into specific-password-r…
rvillablanca Feb 16, 2020
56cfc0e
Add some corrections
rvillablanca Feb 16, 2020
f8d1161
Merge remote-tracking branch 'origin/master' into specific-password-r…
rvillablanca Feb 20, 2020
2d9e68b
Typo
rvillablanca Feb 20, 2020
7e53c61
unit test and integration tests
rvillablanca Feb 21, 2020
877f1fa
Merge remote-tracking branch 'origin/master' into specific-password-r…
rvillablanca Feb 21, 2020
ed763da
Fix redis output integration tests
rvillablanca Feb 21, 2020
2296621
Minor improvements when testing redis output
rvillablanca Feb 21, 2020
30a2bf0
Add license header
rvillablanca Feb 22, 2020
df66485
Add changes to changelog
rvillablanca Feb 22, 2020
87106f9
Fix license header
rvillablanca Feb 22, 2020
0bd9c96
Fix imports
rvillablanca Feb 22, 2020
831348c
Formatting using make fmt update
rvillablanca Feb 22, 2020
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
20 changes: 19 additions & 1 deletion libbeat/outputs/redis/redis.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ package redis

import (
"errors"
"fmt"
"net/url"
"strings"
"time"

"github.com/elastic/beats/libbeat/beat"
Expand Down Expand Up @@ -129,8 +132,23 @@ func makeRedis(
return outputs.Fail(err)
}
Comment thread
rvillablanca marked this conversation as resolved.

pass := config.Password
if parts := strings.SplitN(host, "://", 2); len(parts) != 2 {
// Add scheme.
host = fmt.Sprintf("redis://%s", host)
}
url, err := url.Parse(host)
if err != nil {
return outputs.Fail(err)
}

hostPass, passSet := url.User.Password()
if passSet {
pass = hostPass
}
Comment thread
urso marked this conversation as resolved.

client := newClient(conn, observer, config.Timeout,
config.Password, config.Db, key, dataType, config.Index, enc)
pass, config.Db, key, dataType, config.Index, enc)
clients[i] = newBackoffClient(client, config.Backoff.Init, config.Backoff.Max)
}

Expand Down