diff --git a/cmd/loki-canary/main.go b/cmd/loki-canary/main.go index 67903e8951..a54a335be0 100644 --- a/cmd/loki-canary/main.go +++ b/cmd/loki-canary/main.go @@ -157,6 +157,7 @@ func main() { config.DefaultHTTPClientConfig, *lName, *lVal, *sName, *sValue, + *useTLS, tlsConfig, *caFile, *user, *pass, diff --git a/pkg/canary/writer/push.go b/pkg/canary/writer/push.go index 73c4067443..6c3ebbc6ac 100644 --- a/pkg/canary/writer/push.go +++ b/pkg/canary/writer/push.go @@ -63,6 +63,7 @@ func NewPush( cfg config.HTTPClientConfig, labelName, labelValue string, streamName, streamValue string, + useTLS bool, tlsCfg *tls.Config, caFile string, username, password string, @@ -90,6 +91,10 @@ func NewPush( scheme = "https" } + if useTLS { + scheme = "https" + } + u := url.URL{ Scheme: scheme, Host: lokiAddr, diff --git a/pkg/canary/writer/push_test.go b/pkg/canary/writer/push_test.go index ad98484982..0351a20723 100644 --- a/pkg/canary/writer/push_test.go +++ b/pkg/canary/writer/push_test.go @@ -42,7 +42,7 @@ func Test_Push(t *testing.T) { defer mock.Close() // without TLS - push, err := NewPush(mock.Listener.Addr().String(), "test1", 2*time.Second, config.DefaultHTTPClientConfig, "name", "loki-canary", "stream", "stdout", nil, "", "", "", &backoff, log.NewNopLogger()) + push, err := NewPush(mock.Listener.Addr().String(), "test1", 2*time.Second, config.DefaultHTTPClientConfig, "name", "loki-canary", "stream", "stdout", false, nil, "", "", "", &backoff, log.NewNopLogger()) require.NoError(t, err) ts, payload := testPayload() n, err := push.Write([]byte(payload)) @@ -52,7 +52,7 @@ func Test_Push(t *testing.T) { assertResponse(t, resp, false, labelSet("name", "loki-canary", "stream", "stdout"), ts, payload) // with basic Auth - push, err = NewPush(mock.Listener.Addr().String(), "test1", 2*time.Second, config.DefaultHTTPClientConfig, "name", "loki-canary", "stream", "stdout", nil, "", testUsername, testPassword, &backoff, log.NewNopLogger()) + push, err = NewPush(mock.Listener.Addr().String(), "test1", 2*time.Second, config.DefaultHTTPClientConfig, "name", "loki-canary", "stream", "stdout", false, nil, "", testUsername, testPassword, &backoff, log.NewNopLogger()) require.NoError(t, err) ts, payload = testPayload() n, err = push.Write([]byte(payload)) @@ -62,7 +62,7 @@ func Test_Push(t *testing.T) { assertResponse(t, resp, true, labelSet("name", "loki-canary", "stream", "stdout"), ts, payload) // with custom labels - push, err = NewPush(mock.Listener.Addr().String(), "test1", 2*time.Second, config.DefaultHTTPClientConfig, "name", "loki-canary", "pod", "abc", nil, "", testUsername, testPassword, &backoff, log.NewNopLogger()) + push, err = NewPush(mock.Listener.Addr().String(), "test1", 2*time.Second, config.DefaultHTTPClientConfig, "name", "loki-canary", "pod", "abc", false, nil, "", testUsername, testPassword, &backoff, log.NewNopLogger()) require.NoError(t, err) ts, payload = testPayload() n, err = push.Write([]byte(payload)) @@ -133,7 +133,6 @@ func createServerHandler(responses chan response) http.HandlerFunc { rw.WriteHeader(500) return } - fmt.Println("decoded", decoded) toks := strings.FieldsFunc(string(decoded), func(r rune) bool { return r == ':' })