Skip to content
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

[Elastic-Agent] Use /tmp for default monitoring endpoint location for libbeat #18131

Merged
merged 3 commits into from
Apr 30, 2020
Merged

[Elastic-Agent] Use /tmp for default monitoring endpoint location for libbeat #18131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6dc35e4
default tmp socket
michalpristas Apr 30, 2020
3d4e998
changelog
michalpristas Apr 30, 2020
f2ffaa3
Update x-pack/elastic-agent/CHANGELOG.asciidoc
michalpristas Apr 30, 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
1 change: 1 addition & 0 deletions x-pack/elastic-agent/CHANGELOG.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
- Moved stream.* fields to top of event {pull}17858[17858]
- Fix an issue where the checkin_frequency, jitter, and backoff options where not configurable. {pull}17843[17843]
- Use default output by default {pull}18091[18091]
- Use /tmp for default monitoring endpoint location for libbeat {pull}18131[18131]

==== New features

Expand Down
4 changes: 2 additions & 2 deletions x-pack/elastic-agent/pkg/core/plugin/app/monitoring/beats/monitoring.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const (
logFileFormatWin = "%s\\logs\\%s\\%s"

// args: pipeline name, application name
mbEndpointFileFormat = "unix://%s/run/%s/%s/%s.sock"
mbEndpointFileFormat = "unix:///tmp/elastic-agent/%s/%s/%s.sock"
// args: pipeline name, application name
mbEndpointFileFormatWin = `npipe:///%s-%s`
)
Expand All @@ -27,7 +27,7 @@ func getMonitoringEndpoint(program, operatingSystem, pipelineID string) string {
return fmt.Sprintf(mbEndpointFileFormatWin, pipelineID, program)
}

return fmt.Sprintf(mbEndpointFileFormat, paths.Data(), pipelineID, program, program)
return fmt.Sprintf(mbEndpointFileFormat, pipelineID, program, program)
}

func getLoggingFile(program, operatingSystem, installPath, pipelineID string) string {
Expand Down