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

Jump to bottom

[Ingest Manager] Agent fetching DBus service PID fix #23496

Merged
merged 4 commits into from
Jan 15, 2021
Merged

[Ingest Manager] Agent fetching DBus service PID fix #23496

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1a7229f
try with service
michalpristas Jan 13, 2021
4ef4351
Merge branch 'master' of github.com:elastic/beats into agent-dbus-ser…
michalpristas Jan 14, 2021
7aee726
changelog'
michalpristas Jan 14, 2021
2f91bc9
Merge branch 'master' of github.com:elastic/beats into agent-dbus-ser…
michalpristas Jan 15, 2021
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.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
- Remove artifacts on transient download errors {pull}23235[23235]
- Skip top level files when unziping archive during upgrade {pull}23456[23456]
- Do not take ownership of Endpoint log path {pull}23444[23444]
- Fixed fetching DBus service PID {pull}23496[23496]

==== New features

Expand Down
7 changes: 6 additions & 1 deletion x-pack/elastic-agent/pkg/agent/application/upgrade/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,12 @@ func (p *dbusPidProvider) Close() {
}

func (p *dbusPidProvider) PID(ctx context.Context) (int, error) {
prop, err := p.dbusConn.GetServiceProperty(install.ServiceName, "MainPID")
sn := install.ServiceName
if !strings.HasSuffix(sn, ".service") {
sn += ".service"
}

prop, err := p.dbusConn.GetServiceProperty(sn, "MainPID")
if err != nil {
return 0, errors.New("failed to read service", err)
}
Expand Down