From 5c84d9cfc5240cd8336be3d09ba11e43f736fb4c Mon Sep 17 00:00:00 2001 From: Blake Rouse Date: Mon, 26 Oct 2020 10:05:18 -0400 Subject: [PATCH 1/3] Fix issue on elastic-agent systemd unit. --- dev-tools/packaging/templates/linux/elastic-agent.unit.tmpl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dev-tools/packaging/templates/linux/elastic-agent.unit.tmpl b/dev-tools/packaging/templates/linux/elastic-agent.unit.tmpl index f7ffb886884..5f880f510f9 100644 --- a/dev-tools/packaging/templates/linux/elastic-agent.unit.tmpl +++ b/dev-tools/packaging/templates/linux/elastic-agent.unit.tmpl @@ -9,10 +9,9 @@ After=network-online.target User={{ .BeatUser }} Group={{ .BeatUser }} {{- end }} -Environment="BEAT_LOG_OPTS=" Environment="BEAT_CONFIG_OPTS=-c /etc/{{.BeatName}}/{{.BeatName}}.yml" -Environment="BEAT_PATH_OPTS=--path.home /var/lib/{{.BeatName}} --path.config /etc/{{.BeatName}} --path.data /var/lib/{{.BeatName}}/data --path.logs /var/log/{{.BeatName}}" -ExecStart=/usr/share/{{.BeatName}}/bin/{{.BeatName}} --environment systemd $BEAT_LOG_OPTS $BEAT_CONFIG_OPTS $BEAT_PATH_OPTS +Environment="BEAT_PATH_OPTS=--path.home /var/lib/{{.BeatName}} --path.config /etc/{{.BeatName}} --path.logs /var/log/{{.BeatName}}" +ExecStart=/usr/share/{{.BeatName}}/bin/{{.BeatName}} run --environment systemd $BEAT_CONFIG_OPTS $BEAT_PATH_OPTS Restart=always [Install] From 1d5b48b1688bc7072faa4022f351243dccbb059d Mon Sep 17 00:00:00 2001 From: Blake Rouse Date: Mon, 26 Oct 2020 10:35:11 -0400 Subject: [PATCH 2/3] Fix service file for fedora. --- dev-tools/packaging/templates/linux/elastic-agent.unit.tmpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dev-tools/packaging/templates/linux/elastic-agent.unit.tmpl b/dev-tools/packaging/templates/linux/elastic-agent.unit.tmpl index 5f880f510f9..5fa0b1436b0 100644 --- a/dev-tools/packaging/templates/linux/elastic-agent.unit.tmpl +++ b/dev-tools/packaging/templates/linux/elastic-agent.unit.tmpl @@ -10,8 +10,7 @@ User={{ .BeatUser }} Group={{ .BeatUser }} {{- end }} Environment="BEAT_CONFIG_OPTS=-c /etc/{{.BeatName}}/{{.BeatName}}.yml" -Environment="BEAT_PATH_OPTS=--path.home /var/lib/{{.BeatName}} --path.config /etc/{{.BeatName}} --path.logs /var/log/{{.BeatName}}" -ExecStart=/usr/share/{{.BeatName}}/bin/{{.BeatName}} run --environment systemd $BEAT_CONFIG_OPTS $BEAT_PATH_OPTS +ExecStart=/usr/bin/{{.BeatName}} run --environment systemd $BEAT_CONFIG_OPTS Restart=always [Install] From a73c7087a2fa0d3e80c31cf79dd45845c32614c7 Mon Sep 17 00:00:00 2001 From: Blake Rouse Date: Mon, 26 Oct 2020 11:00:47 -0400 Subject: [PATCH 3/3] Add changelog. --- x-pack/elastic-agent/CHANGELOG.next.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/x-pack/elastic-agent/CHANGELOG.next.asciidoc b/x-pack/elastic-agent/CHANGELOG.next.asciidoc index b6a870e0259..959df0cea74 100644 --- a/x-pack/elastic-agent/CHANGELOG.next.asciidoc +++ b/x-pack/elastic-agent/CHANGELOG.next.asciidoc @@ -23,6 +23,7 @@ - Rename monitoring index from `elastic.agent` to `elastic_agent` {pull}21932[21932] - Fix issue with named pipes on Windows 7 {pull}21931[21931] - Fix missing elastic_agent event data {pull}21994[21994] +- Fix deb/rpm packaging for Elastic Agent {pull}22153[22153] ==== New features