-
Notifications
You must be signed in to change notification settings - Fork 5k
Feature/read metrics from unix socket npipe #14558
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.
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
ph
merged 14 commits into
elastic:master
from
ph:feature/read-metrics-from-unix-socket-npipe
Nov 22, 2019
Merged
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
7b471d2
Adjust the CURL doc for the unix socket.
ph 026507d
Allow to retrieve metrics from a unix domain socket
ph 4a23e97
WIP
ph ff43c65
Oh socket file is actually a pain.
ph bbf5930
remove uri
ph c04e8d5
fix fmt
ph 6764da0
OK will work under windows.
ph eee7a99
changelog.
ph 5ba3df9
Move stuff around to make the changes less of a hack.
ph db2e5e0
comment
ph 0836e6f
Windows fix
ph 2ff4985
working around the cycle dependencies
ph ae4c4fe
Reorganize into concrete type and interface mix.
ph ad4f773
move line
ph File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| // Licensed to Elasticsearch B.V. under one or more contributor | ||
| // license agreements. See the NOTICE file distributed with | ||
| // this work for additional information regarding copyright | ||
| // ownership. Elasticsearch B.V. licenses this file to you under | ||
| // the Apache License, Version 2.0 (the "License"); you may | ||
| // not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| package dialer | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "time" | ||
|
|
||
| "github.com/elastic/beats/libbeat/outputs/transport" | ||
| ) | ||
|
|
||
| // Builder is a dialer builder. | ||
| type Builder interface { | ||
| fmt.Stringer | ||
| Make(time.Duration) (transport.Dialer, error) | ||
| } | ||
|
|
||
| // DefaultDialerBuilder create a builder to dialer over TCP and UDP. | ||
| type DefaultDialerBuilder struct{} | ||
|
|
||
| // Make creates a dialer. | ||
| func (t *DefaultDialerBuilder) Make(timeout time.Duration) (transport.Dialer, error) { | ||
| return transport.NetDialer(timeout), nil | ||
| } | ||
|
|
||
| func (t *DefaultDialerBuilder) String() string { | ||
| return "TCP/UDP" | ||
| } | ||
|
|
||
| // NewDefaultDialerBuilder creates a DefaultDialerBuilder. | ||
| func NewDefaultDialerBuilder() *DefaultDialerBuilder { | ||
| return &DefaultDialerBuilder{} | ||
| } | ||
|
|
||
| // NewNpipeDialerBuilder creates a NpipeDialerBuilder. | ||
| func NewNpipeDialerBuilder(path string) *NpipeDialerBuilder { | ||
| return &NpipeDialerBuilder{Path: path} | ||
| } | ||
|
|
||
| // NewUnixDialerBuilder returns a new TransportUnix instance that will allow the HTTP client to communicate | ||
| // over a unix domain socket it require a valid path to the socket on the filesystem. | ||
| func NewUnixDialerBuilder(path string) *UnixDialerBuilder { | ||
| return &UnixDialerBuilder{Path: path} | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| // Licensed to Elasticsearch B.V. under one or more contributor | ||
| // license agreements. See the NOTICE file distributed with | ||
| // this work for additional information regarding copyright | ||
| // ownership. Elasticsearch B.V. licenses this file to you under | ||
| // the Apache License, Version 2.0 (the "License"); you may | ||
| // not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| //+build !windows | ||
|
|
||
| package dialer | ||
|
|
||
| import ( | ||
| "strings" | ||
| "time" | ||
|
|
||
| "github.com/pkg/errors" | ||
|
|
||
| "github.com/elastic/beats/libbeat/outputs/transport" | ||
| ) | ||
|
|
||
| // UnixDialerBuilder creates a builder to dial over unix domain socket. | ||
| type UnixDialerBuilder struct { | ||
| Path string | ||
| } | ||
|
|
||
| // Make creates a dialer. | ||
| func (t *UnixDialerBuilder) Make(timeout time.Duration) (transport.Dialer, error) { | ||
| return transport.UnixDialer(timeout, strings.TrimSuffix(t.Path, "/")), nil | ||
| } | ||
|
|
||
| func (t *UnixDialerBuilder) String() string { | ||
| return "Unix: " + t.Path | ||
| } | ||
|
|
||
| // NpipeDialerBuilder creates a builder to dial over a named pipe. | ||
| type NpipeDialerBuilder struct { | ||
| Path string | ||
| } | ||
|
|
||
| // Make creates a dialer. | ||
| func (t *NpipeDialerBuilder) Make(_ time.Duration) (transport.Dialer, error) { | ||
| return nil, errors.New("cannot the URI, named pipes are only supported on Windows") | ||
| } | ||
|
|
||
| func (t *NpipeDialerBuilder) String() string { | ||
| return "Npipe: " + t.Path | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| // Licensed to Elasticsearch B.V. under one or more contributor | ||
| // license agreements. See the NOTICE file distributed with | ||
| // this work for additional information regarding copyright | ||
| // ownership. Elasticsearch B.V. licenses this file to you under | ||
| // the Apache License, Version 2.0 (the "License"); you may | ||
| // not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| //+build windows | ||
|
|
||
| package dialer | ||
|
|
||
| import ( | ||
| "net" | ||
| "strings" | ||
| "time" | ||
|
|
||
| "github.com/pkg/errors" | ||
|
|
||
| winio "github.com/Microsoft/go-winio" | ||
|
|
||
| "github.com/elastic/beats/libbeat/api/npipe" | ||
| "github.com/elastic/beats/libbeat/outputs/transport" | ||
| ) | ||
|
|
||
| // UnixDialerBuilder creates a builder to dial over a unix domain socket. | ||
| type UnixDialerBuilder struct { | ||
| Path string | ||
| } | ||
|
|
||
| // Make creates a dialer. | ||
| func (t *UnixDialerBuilder) Make(_ time.Duration) (transport.Dialer, error) { | ||
| return nil, errors.New( | ||
| "cannot use the URI, unix sockets are not supported on Windows, use npipe instead", | ||
| ) | ||
| } | ||
|
|
||
| func (t *UnixDialerBuilder) String() string { | ||
| return "Unix: " + t.Path | ||
| } | ||
|
|
||
| // NpipeDialerBuilder creates a builder to dial over a named pipe. | ||
| type NpipeDialerBuilder struct { | ||
| Path string | ||
| } | ||
|
|
||
| func (t *NpipeDialerBuilder) String() string { | ||
| return "Npipe: " + t.Path | ||
| } | ||
|
|
||
| // Make creates a dialer. | ||
| func (t *NpipeDialerBuilder) Make(timeout time.Duration) (transport.Dialer, error) { | ||
| to := timeout | ||
| return transport.DialerFunc( | ||
| func(_, _ string) (net.Conn, error) { | ||
| return winio.DialPipe( | ||
| strings.TrimSuffix(npipe.TransformString(t.Path), "/"), | ||
| &to, | ||
| ) | ||
| }, | ||
| ), nil | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.