Cherry-pick #23496 to 7.x: Agent fetching DBus service PID fix (#23525)

* [Ingest Manager] Agent fetching DBus service PID fix (#23496) [Ingest Manager] Agent fetching DBus service PID fix (#23496) * Update CHANGELOG.next.asciidoc
elastic · Jan 17, 2021 · 1f24f1a · 1f24f1a
1 parent 424b34b
commit 1f24f1a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/x-pack/elastic-agent/CHANGELOG.next.asciidoc b/x-pack/elastic-agent/CHANGELOG.next.asciidoc
@@ -33,6 +33,7 @@
 - Support for linux/arm64 {pull}23479[23479]
 - 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]
 - Fix issue of missing log messages from filebeat monitor {pull}23514[23514]
 
 ==== New features

diff --git a/x-pack/elastic-agent/pkg/agent/application/upgrade/service.go b/x-pack/elastic-agent/pkg/agent/application/upgrade/service.go
@@ -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)
 	}