Skip to content

Support a proxy in splunk log driver #36220

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
Feb 8, 2018
Merged

Support a proxy in splunk log driver #36220

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
7d29652
update vendor
dnephin Feb 7, 2018
3c4537d
Support a proxy in splunk log driver
dnephin Feb 6, 2018
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 daemon/logger/splunk/splunk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@ func New(info logger.Info) (logger.Logger, error) {

transport := &http.Transport{
TLSClientConfig: tlsConfig,
Proxy: http.ProxyFromEnvironment,
}
client := &http.Client{
Transport: transport,
Expand Down
32 changes: 32 additions & 0 deletions daemon/logger/splunk/splunk_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@ import (
"compress/gzip"
"context"
"fmt"
"net/http"
"os"
"runtime"
"testing"
"time"

"github.com/docker/docker/daemon/logger"
"github.com/gotestyourself/gotestyourself/env"
"github.com/stretchr/testify/require"
)

Expand Down Expand Up @@ -82,6 +84,36 @@ func TestNewMissedToken(t *testing.T) {
}
}

func TestNewWithProxy(t *testing.T) {
proxy := "http://proxy.testing:8888"
reset := env.Patch(t, "HTTP_PROXY", proxy)
defer reset()

// must not be localhost
splunkURL := "http://example.com:12345"
logger, err := New(logger.Info{
Config: map[string]string{
splunkURLKey: splunkURL,
splunkTokenKey: "token",
splunkVerifyConnectionKey: "false",
},
ContainerID: "containeriid",
})
require.NoError(t, err)
splunkLogger := logger.(*splunkLoggerInline)

proxyFunc := splunkLogger.transport.Proxy
require.NotNil(t, proxyFunc)

req, err := http.NewRequest("GET", splunkURL, nil)
require.NoError(t, err)

proxyURL, err := proxyFunc(req)
require.NoError(t, err)
require.NotNil(t, proxyURL)
require.Equal(t, proxy, proxyURL.String())
}

// Test default settings
func TestDefault(t *testing.T) {
hec := NewHTTPEventCollectorMock(t)
Expand Down
92 changes: 92 additions & 0 deletions vendor/github.com/gotestyourself/gotestyourself/env/env.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.