Opening X-Pack

This adds the x-pack directory and associated license files. It updates the packaging to produce two sets of binaries. And it updates the integration tests to be able to consume both the default artifacts and the OSS artifacts of other Elastic Stack products. There are some Makefile target changes for packaging. - `make package-all` - Creates two sets of artifacts -- ones with and without x-pack content. The dev-tools/deploy script will use this target. - `make package-oss` - Creates packages without Elastic X-Pack content. - `make package-elastic` - Creates packages with Elastic X-Pack content. - `make package` - Left unchanged in order to not affect libbeat users of this target. The code generators were updated to remove the x-pack folder upon initial creation. In the deb packages the license metadata has changed from "ASL 2.0" to "ASL-2.0" in compliance with https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/#license-syntax. Update Docker testing environment to support oss and non-oss - For the ES/LS/Kibana images, download either the OSS package or the X-Pack package based on the IMAGE_FLAVOR variable (previously it was XPACK=1 or 0). - Must explicitly enable a X-Pack trial license in the ES image for testing with ML and Alerting. - Refactor the LS image to be closer to the elastic/logstash-docker repo. It now honors the IMAGE_FLAVOR variable.
elastic · Apr 24, 2018 · 017f955 · 017f955
1 parent 7db33f2
commit 017f955
Show file tree

Hide file tree

Showing 39 changed files with 706 additions and 192 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,13 +1,13 @@
-Copyright (c) 2012–2017 Elastic <http://www.elastic.co>
+Source code in this repository is variously licensed under the Apache License
+Version 2.0, an Apache compatible license, or the Elastic License. Outside of
+the "x-pack" folder, source code in a given file is licensed under the Apache
+License Version 2.0, unless otherwise noted at the beginning of the file or a
+LICENSE file present in the directory subtree declares a separate license.
+Within the "x-pack" folder, source code in a given file is licensed under the
+Elastic License, unless otherwise noted at the beginning of the file or a
+LICENSE file present in the directory subtree declares a separate license.
 
-Licensed 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.
+The build produces two sets of binaries - one set that falls under the Elastic
+License and another set that falls under Apache License Version 2.0. The
+binaries that contain `-oss` in the artifact name are licensed under the Apache
+License Version 2.0.
diff --git a/Makefile b/Makefile
@@ -110,13 +110,13 @@ docs:
 	@$(foreach var,$(PROJECTS),BUILD_DIR=${BUILD_DIR} $(MAKE) -C $(var) docs || exit 1;)
 	sh ./script/build_docs.sh dev-guide github.com/elastic/beats/docs/devguide ${BUILD_DIR}
 
-.PHONY: package
-package: update beats-dashboards
-	@$(foreach var,$(BEATS),SNAPSHOT=$(SNAPSHOT) $(MAKE) -C $(var) package || exit 1;)
+.PHONY: package-all
+package-all: update beats-dashboards
+	@$(foreach var,$(BEATS),SNAPSHOT=$(SNAPSHOT) $(MAKE) -C $(var) package-all || exit 1;)
 
 	@echo "Start building the dashboards package"
 	@mkdir -p build/upload/
-	@BUILD_DIR=${BUILD_DIR} SNAPSHOT=$(SNAPSHOT) $(MAKE) -C dev-tools/packer package-dashboards ${BUILD_DIR}/upload/build_id.txt
+	@BUILD_DIR=${BUILD_DIR} UPLOAD_DIR=${BUILD_DIR}/upload SNAPSHOT=$(SNAPSHOT) $(MAKE) -C dev-tools/packer package-dashboards ${BUILD_DIR}/upload/build_id.txt
 	@mv build/upload build/dashboards-upload
 
 	@# Copy build files over to top build directory

diff --git a/README.md b/README.md
@@ -19,16 +19,17 @@ framework for creating Beats, and all the officially supported Beats:
 
 Beat  | Description
 --- | ---
+[Auditbeat](https://github.com/elastic/beats/tree/master/auditbeat) | Collect your Linux audit framework data and monitor the integrity of your files.
 [Filebeat](https://github.com/elastic/beats/tree/master/filebeat) | Tails and ships log files
 [Heartbeat](https://github.com/elastic/beats/tree/master/heartbeat) | Ping remote services for availability
 [Metricbeat](https://github.com/elastic/beats/tree/master/metricbeat) | Fetches sets of metrics from the operating system and services
 [Packetbeat](https://github.com/elastic/beats/tree/master/packetbeat) | Monitors the network and applications by sniffing packets
 [Winlogbeat](https://github.com/elastic/beats/tree/master/winlogbeat) | Fetches and ships Windows Event logs
 
 In addition to the above Beats, which are officially supported by
-[Elastic](https://elastic.co), the
-community has created a set of other Beats that make use of libbeat but live
-outside of this Github repository. We maintain a list of community Beats
+[Elastic](https://elastic.co), the community has created a set of other Beats
+that make use of libbeat but live outside of this Github repository. We maintain
+a list of community Beats
 [here](https://www.elastic.co/guide/en/beats/libbeat/master/community-beats.html).
 
 ## Documentation and Getting Started
@@ -37,6 +38,7 @@ You can find the documentation and getting started guides for each of the Beats
 on the [elastic.co site](https://www.elastic.co/guide/):
 
 * [Beats platform](https://www.elastic.co/guide/en/beats/libbeat/current/index.html)
+* [Auditbeat](https://www.elastic.co/guide/en/beats/auditbeat/current/index.html)
 * [Filebeat](https://www.elastic.co/guide/en/beats/filebeat/current/index.html)
 * [Heartbeat](https://www.elastic.co/guide/en/beats/heartbeat/current/index.html)
 * [Metricbeat](https://www.elastic.co/guide/en/beats/metricbeat/current/index.html)
@@ -64,14 +66,14 @@ create your own Beat.
 Please start by reading our [CONTRIBUTING](CONTRIBUTING.md) file.
 
 If you are creating a new Beat, you don't need to submit the code to this
-repository. You can simply start working in a new repository and make use of
-the libbeat packages, by following our [developer
+repository. You can simply start working in a new repository and make use of the
+libbeat packages, by following our [developer
 guide](https://www.elastic.co/guide/en/beats/libbeat/current/new-beat.html).
 After you have a working prototype, open a pull request to add your Beat to the
 list of [community
 Beats](https://github.com/elastic/beats/blob/master/libbeat/docs/communitybeats.asciidoc).
 
 ## Building Beats from the Source
 
-See our [CONTRIBUTING](CONTRIBUTING.md) file for information about setting up your dev
-environment to build Beats from the source.
+See our [CONTRIBUTING](CONTRIBUTING.md) file for information about setting up
+your dev environment to build Beats from the source.
diff --git a/dev-tools/deploy b/dev-tools/deploy
@@ -16,9 +16,9 @@ def main():
     check_call("make clean", shell=True)
     print("Done building Docker images.")
     if args.no_snapshot:
-        check_call("make SNAPSHOT=no package", shell=True)
+        check_call("make SNAPSHOT=no package-all", shell=True)
     else:
-        check_call("make SNAPSHOT=yes package", shell=True)
+        check_call("make SNAPSHOT=yes package-all", shell=True)
     print("All done")
 
 if __name__ == "__main__":

diff --git a/dev-tools/packer/Makefile b/dev-tools/packer/Makefile
@@ -12,32 +12,32 @@ beat_abspath=${BEATS_GOPATH}/src/${BEAT_PATH}
 
 %/deb: ${BUILD_DIR}/god-linux-386 ${BUILD_DIR}/god-linux-amd64 fpm-image
 	echo Creating DEB packages for $(@D)
-	ARCH=386 BEAT=$(@D) BUILD_DIR=${BUILD_DIR} BEAT_PATH=$(beat_abspath) BUILDID=$(BUILDID) SNAPSHOT=$(SNAPSHOT) $(packer_absdir)/platforms/debian/build.sh
-	ARCH=amd64 BEAT=$(@D) BUILD_DIR=${BUILD_DIR} BEAT_PATH=$(beat_abspath) BUILDID=$(BUILDID) SNAPSHOT=$(SNAPSHOT) $(packer_absdir)/platforms/debian/build.sh
+	ARCH=386 BEAT=$(@D) BUILD_DIR=${BUILD_DIR} UPLOAD_DIR=${UPLOAD_DIR} BEAT_PATH=$(beat_abspath) BUILDID=$(BUILDID) SNAPSHOT=$(SNAPSHOT) $(packer_absdir)/platforms/debian/build.sh
+	ARCH=amd64 BEAT=$(@D) BUILD_DIR=${BUILD_DIR} UPLOAD_DIR=${UPLOAD_DIR} BEAT_PATH=$(beat_abspath) BUILDID=$(BUILDID) SNAPSHOT=$(SNAPSHOT) $(packer_absdir)/platforms/debian/build.sh
 
 %/rpm: ${BUILD_DIR}/god-linux-386 ${BUILD_DIR}/god-linux-amd64 fpm-image
 	echo Creating RPM packages for $(@D)
-	ARCH=386 BEAT=$(@D) BUILD_DIR=${BUILD_DIR} BEAT_PATH=$(beat_abspath) BUILDID=$(BUILDID) SNAPSHOT=$(SNAPSHOT) $(packer_absdir)/platforms/centos/build.sh
-	ARCH=amd64 BEAT=$(@D) BUILD_DIR=${BUILD_DIR} BEAT_PATH=$(beat_abspath) BUILDID=$(BUILDID) SNAPSHOT=$(SNAPSHOT) $(packer_absdir)/platforms/centos/build.sh
+	ARCH=386 BEAT=$(@D) BUILD_DIR=${BUILD_DIR} UPLOAD_DIR=${UPLOAD_DIR} BEAT_PATH=$(beat_abspath) BUILDID=$(BUILDID) SNAPSHOT=$(SNAPSHOT) $(packer_absdir)/platforms/centos/build.sh
+	ARCH=amd64 BEAT=$(@D) BUILD_DIR=${BUILD_DIR} UPLOAD_DIR=${UPLOAD_DIR} BEAT_PATH=$(beat_abspath) BUILDID=$(BUILDID) SNAPSHOT=$(SNAPSHOT) $(packer_absdir)/platforms/centos/build.sh
 
 %/darwin:
 	echo Creating Darwin packages for $(@D)
-	ARCH=amd64 BEAT=$(@D) BUILD_DIR=${BUILD_DIR} BEAT_PATH=$(beat_abspath) BUILDID=$(BUILDID) SNAPSHOT=$(SNAPSHOT) $(packer_absdir)/platforms/darwin/build.sh
+	ARCH=amd64 BEAT=$(@D) BUILD_DIR=${BUILD_DIR} UPLOAD_DIR=${UPLOAD_DIR} BEAT_PATH=$(beat_abspath) BUILDID=$(BUILDID) SNAPSHOT=$(SNAPSHOT) $(packer_absdir)/platforms/darwin/build.sh
 
 %/win:
 	echo Creating Darwin packages for $(@D)
-	ARCH=386 BEAT=$(@D) BUILD_DIR=${BUILD_DIR} BEAT_PATH=$(beat_abspath) BUILDID=$(BUILDID) SNAPSHOT=$(SNAPSHOT) $(packer_absdir)/platforms/windows/build.sh
-	ARCH=amd64 BEAT=$(@D) BUILD_DIR=${BUILD_DIR} BEAT_PATH=$(beat_abspath) BUILDID=$(BUILDID) SNAPSHOT=$(SNAPSHOT) $(packer_absdir)/platforms/windows/build.sh
+	ARCH=386 BEAT=$(@D) BUILD_DIR=${BUILD_DIR} UPLOAD_DIR=${UPLOAD_DIR} BEAT_PATH=$(beat_abspath) BUILDID=$(BUILDID) SNAPSHOT=$(SNAPSHOT) $(packer_absdir)/platforms/windows/build.sh
+	ARCH=amd64 BEAT=$(@D) BUILD_DIR=${BUILD_DIR} UPLOAD_DIR=${UPLOAD_DIR} BEAT_PATH=$(beat_abspath) BUILDID=$(BUILDID) SNAPSHOT=$(SNAPSHOT) $(packer_absdir)/platforms/windows/build.sh
 
 %/bin:
 	echo Creating Linux packages for $(@D)
-	ARCH=386 BEAT=$(@D) BUILD_DIR=${BUILD_DIR} BEAT_PATH=$(beat_abspath) BUILDID=$(BUILDID) SNAPSHOT=$(SNAPSHOT) $(packer_absdir)/platforms/binary/build.sh
-	ARCH=amd64 BEAT=$(@D) BUILD_DIR=${BUILD_DIR} BEAT_PATH=$(beat_abspath) BUILDID=$(BUILDID) SNAPSHOT=$(SNAPSHOT) $(packer_absdir)/platforms/binary/build.sh
+	ARCH=386 BEAT=$(@D) BUILD_DIR=${BUILD_DIR} UPLOAD_DIR=${UPLOAD_DIR} BEAT_PATH=$(beat_abspath) BUILDID=$(BUILDID) SNAPSHOT=$(SNAPSHOT) $(packer_absdir)/platforms/binary/build.sh
+	ARCH=amd64 BEAT=$(@D) BUILD_DIR=${BUILD_DIR} UPLOAD_DIR=${UPLOAD_DIR} BEAT_PATH=$(beat_abspath) BUILDID=$(BUILDID) SNAPSHOT=$(SNAPSHOT) $(packer_absdir)/platforms/binary/build.sh
 
 .PHONY: package-dashboards
 package-dashboards:
 	echo Creating the Dashboards package
-	BUILDID=$(BUILDID) SNAPSHOT=$(SNAPSHOT) $(packer_absdir)/platforms/dashboards/build.sh
+	UPLOAD_DIR=${UPLOAD_DIR} BUILDID=$(BUILDID) SNAPSHOT=$(SNAPSHOT) $(packer_absdir)/platforms/dashboards/build.sh
 
 .PHONY: deps
 deps:
@@ -61,11 +61,11 @@ go-daemon-image:
 ${BUILD_DIR}/god-linux-386 ${BUILD_DIR}/god-linux-amd64:
 	docker run --rm -v ${BUILD_DIR}:/build tudorg/go-daemon
 
-${BUILD_DIR}/upload:
-	mkdir -p ${BUILD_DIR}/upload
+${UPLOAD_DIR}:
+	mkdir -p ${UPLOAD_DIR}
 
-${BUILD_DIR}/upload/build_id.txt:
-	echo $(BUILDID) > ${BUILD_DIR}/upload/build_id.txt
+${UPLOAD_DIR}/build_id.txt:
+	echo $(BUILDID) > ${UPLOAD_DIR}/build_id.txt
 
 # Build the image required for package-upload.
 .PHONY: deb-rpm-s3

diff --git a/dev-tools/packer/platforms/binary/build.sh b/dev-tools/packer/platforms/binary/build.sh
@@ -12,7 +12,7 @@ cat ${BUILD_DIR}/package.yml ${ARCHDIR}/archs/$ARCH.yml > ${BUILD_DIR}/settings-
 gotpl ${BASEDIR}/run.sh.j2 < ${BUILD_DIR}/settings-$runid.yml > ${BUILD_DIR}/run-$runid.sh
 chmod +x ${BUILD_DIR}/run-$runid.sh
 
-docker run --rm -v ${BUILD_DIR}:/build \
+docker run --rm -v ${BUILD_DIR}:/build -v ${UPLOAD_DIR}:/upload \
     -e BUILDID=$BUILDID -e SNAPSHOT=$SNAPSHOT -e RUNID=$runid \
     tudorg/fpm /build/run-$runid.sh
 

diff --git a/dev-tools/packer/platforms/binary/run.sh.j2 b/dev-tools/packer/platforms/binary/run.sh.j2
@@ -21,10 +21,9 @@ cp ${BEATS_YML_NAME}.reference.yml /{{.beat_name}}-${VERSION}-linux-{{.bin_arch}
 cp fields.yml /{{.beat_name}}-${VERSION}-linux-{{.bin_arch}}/
 cp -a modules.d-linux/ /{{.beat_name}}-${VERSION}-linux-{{.bin_arch}}/modules.d || true
 
-mkdir -p upload
-tar czvf upload/{{.beat_name}}-${VERSION}-linux-{{.bin_arch}}.tar.gz /{{.beat_name}}-${VERSION}-linux-{{.bin_arch}}
-echo "Created upload/{{.beat_name}}-${VERSION}-linux-{{.bin_arch}}.tar.gz"
+tar czvf /upload/{{.beat_name}}{{.beat_pkg_suffix}}-${VERSION}-linux-{{.bin_arch}}.tar.gz /{{.beat_name}}-${VERSION}-linux-{{.bin_arch}}
+echo "Created /upload/{{.beat_name}}{{.beat_pkg_suffix}}--${VERSION}-linux-{{.bin_arch}}.tar.gz"
 
-cd upload
-sha512sum {{.beat_name}}-${VERSION}-linux-{{.bin_arch}}.tar.gz > {{.beat_name}}-${VERSION}-linux-{{.bin_arch}}.tar.gz.sha512
-echo "Created upload/{{.beat_name}}-${VERSION}-linux-{{.bin_arch}}.tar.gz.sha512"
+cd /upload
+sha512sum {{.beat_name}}{{.beat_pkg_suffix}}-${VERSION}-linux-{{.bin_arch}}.tar.gz > {{.beat_name}}{{.beat_pkg_suffix}}-${VERSION}-linux-{{.bin_arch}}.tar.gz.sha512
+echo "Created /upload/{{.beat_name}}{{.beat_pkg_suffix}}-${VERSION}-linux-{{.bin_arch}}.tar.gz.sha512"
diff --git a/dev-tools/packer/platforms/centos/build.sh b/dev-tools/packer/platforms/centos/build.sh
@@ -16,7 +16,7 @@ gotpl ${BASEDIR}/systemd.j2 < ${BUILD_DIR}/settings-$runid.yml > ${BUILD_DIR}/$r
 gotpl ${BASEDIR}/beatname.sh.j2 < ${BUILD_DIR}/settings-$runid.yml > ${BUILD_DIR}/beatname-$runid.sh
 chmod +x ${BUILD_DIR}/beatname-$runid.sh
 
-docker run --rm -v ${BUILD_DIR}:/build \
+docker run --rm -v ${BUILD_DIR}:/build -v ${UPLOAD_DIR}:/upload \
     -e BUILDID=$BUILDID -e SNAPSHOT=$SNAPSHOT -e RUNID=$runid \
     tudorg/fpm /build/run-$runid.sh
 

diff --git a/dev-tools/packer/platforms/centos/run.sh.j2 b/dev-tools/packer/platforms/centos/run.sh.j2
@@ -26,7 +26,7 @@ RPM_VERSION=`echo ${VERSION} | sed 's/-/_/g'`
 # create rpm
 FPM_ARGS=(
         --force -s dir -t rpm
-        -n {{.beat_pkg_name}} -v ${RPM_VERSION}
+        -n {{.beat_pkg_name}}{{.beat_pkg_suffix}} -v ${RPM_VERSION}
         --architecture {{.rpm_arch}}
         --vendor "{{.beat_vendor}}"
         --license "{{.beat_license}}"
@@ -52,11 +52,10 @@ fi
 fpm "${FPM_ARGS[@]}"
 
 # rename so that the filename respects semver rules
-mkdir -p upload
-mv {{.beat_pkg_name}}-${RPM_VERSION}-1.{{.rpm_arch}}.rpm upload/{{.beat_name}}-${VERSION}-{{.rpm_arch}}.rpm
-echo "Created upload/{{.beat_name}}-${VERSION}-{{.rpm_arch}}.rpm"
+mv {{.beat_pkg_name}}{{.beat_pkg_suffix}}-${RPM_VERSION}-1.{{.rpm_arch}}.rpm /upload/{{.beat_name}}{{.beat_pkg_suffix}}-${VERSION}-{{.rpm_arch}}.rpm
+echo "Created /upload/{{.beat_name}}{{.beat_pkg_suffix}}-${VERSION}-{{.rpm_arch}}.rpm"
 
 # create sha512 file
-cd upload
-sha512sum {{.beat_name}}-${VERSION}-{{.rpm_arch}}.rpm > {{.beat_name}}-${VERSION}-{{.rpm_arch}}.rpm.sha512
-echo "Created upload/{{.beat_name}}-${VERSION}-{{.rpm_arch}}.rpm.sha512"
+cd /upload
+sha512sum {{.beat_name}}{{.beat_pkg_suffix}}-${VERSION}-{{.rpm_arch}}.rpm > {{.beat_name}}{{.beat_pkg_suffix}}-${VERSION}-{{.rpm_arch}}.rpm.sha512
+echo "Created /upload/{{.beat_name}}{{.beat_pkg_suffix}}-${VERSION}-{{.rpm_arch}}.rpm.sha512"
diff --git a/dev-tools/packer/platforms/darwin/build.sh b/dev-tools/packer/platforms/darwin/build.sh
@@ -12,7 +12,7 @@ cat ${BUILD_DIR}/package.yml ${ARCHDIR}/archs/$ARCH.yml > ${BUILD_DIR}/settings-
 gotpl ${BASEDIR}/run.sh.j2 < ${BUILD_DIR}/settings-$runid.yml > ${BUILD_DIR}/run-$runid.sh
 chmod +x ${BUILD_DIR}/run-$runid.sh
 
-docker run --rm -v ${BUILD_DIR}:/build \
+docker run --rm -v ${BUILD_DIR}:/build -v ${UPLOAD_DIR}:/upload \
     -e BUILDID=$BUILDID -e SNAPSHOT=$SNAPSHOT -e RUNID=$runid \
     tudorg/fpm /build/run-$runid.sh
 

diff --git a/dev-tools/packer/platforms/darwin/run.sh.j2 b/dev-tools/packer/platforms/darwin/run.sh.j2
@@ -18,10 +18,9 @@ cp {{.beat_name}}-darwin.reference.yml /{{.beat_name}}-${VERSION}-darwin-x86_64/
 cp fields.yml /{{.beat_name}}-${VERSION}-darwin-x86_64/
 cp -a modules.d-darwin/ /{{.beat_name}}-${VERSION}-darwin-x86_64/modules.d || true
 
-mkdir -p upload
-tar czvf upload/{{.beat_name}}-${VERSION}-darwin-x86_64.tar.gz /{{.beat_name}}-${VERSION}-darwin-x86_64
-echo "Created upload/{{.beat_name}}-${VERSION}-darwin-x86_64.tar.gz"
+tar czvf /upload/{{.beat_name}}{{.beat_pkg_suffix}}-${VERSION}-darwin-x86_64.tar.gz /{{.beat_name}}-${VERSION}-darwin-x86_64
+echo "Created /upload/{{.beat_name}}-${VERSION}-darwin-x86_64.tar.gz"
 
-cd upload
-sha512sum {{.beat_name}}-${VERSION}-darwin-x86_64.tar.gz > {{.beat_name}}-${VERSION}-darwin-x86_64.tar.gz.sha512
-echo "Created upload/{{.beat_name}}-${VERSION}-darwin-x86_64.tar.gz.sha512"
+cd /upload
+sha512sum {{.beat_name}}{{.beat_pkg_suffix}}-${VERSION}-darwin-x86_64.tar.gz > {{.beat_name}}{{.beat_pkg_suffix}}-${VERSION}-darwin-x86_64.tar.gz.sha512
+echo "Created /upload/{{.beat_name}}{{.beat_pkg_suffix}}-${VERSION}-darwin-x86_64.tar.gz.sha512"
diff --git a/dev-tools/packer/platforms/dashboards/build.sh b/dev-tools/packer/platforms/dashboards/build.sh
@@ -11,7 +11,7 @@ cat ${ARCHDIR}/version.yml > ${BUILD_DIR}/settings-$runid.yml
 gotpl ${BASEDIR}/run.sh.j2 < ${BUILD_DIR}/settings-$runid.yml > ${BUILD_DIR}/run-$runid.sh
 chmod +x ${BUILD_DIR}/run-$runid.sh
 
-docker run --rm -v ${BUILD_DIR}:/build \
+docker run --rm -v ${BUILD_DIR}:/build -v ${UPLOAD_DIR}:/upload \
     -e BUILDID=$BUILDID -e SNAPSHOT=$SNAPSHOT -e RUNID=$runid -e BEAT_NAME=$BEAT_NAME \
     tudorg/fpm /build/run-$runid.sh
 

diff --git a/dev-tools/packer/platforms/dashboards/run.sh.j2 b/dev-tools/packer/platforms/dashboards/run.sh.j2
@@ -14,10 +14,9 @@ mkdir /${BEAT_NAME:-beats}-dashboards-${VERSION}
 cp -a dashboards/. /${BEAT_NAME:-beats}-dashboards-${VERSION}/
 echo "$BUILDID" > /${BEAT_NAME:-beats}-dashboards-${VERSION}/.build_hash.txt
 
-mkdir -p upload
-zip -r upload/${BEAT_NAME:-beats}-dashboards-${VERSION}.zip /${BEAT_NAME:-beats}-dashboards-${VERSION}
-echo "Created upload/${BEAT_NAME:-beats}-dashboards-${VERSION}.zip"
+zip -r /upload/${BEAT_NAME:-beats}-dashboards-${VERSION}.zip /${BEAT_NAME:-beats}-dashboards-${VERSION}
+echo "Created /upload/${BEAT_NAME:-beats}-dashboards-${VERSION}.zip"
 
-cd upload
+cd /upload
 sha512sum ${BEAT_NAME:-beats}-dashboards-${VERSION}.zip > ${BEAT_NAME:-beats}-dashboards-${VERSION}.zip.sha512
-echo "Created upload/${BEAT_NAME:-beats}-dashboards-${VERSION}.zip.sha512"
+echo "Created /upload/${BEAT_NAME:-beats}-dashboards-${VERSION}.zip.sha512"
diff --git a/dev-tools/packer/platforms/debian/build.sh b/dev-tools/packer/platforms/debian/build.sh
@@ -16,7 +16,7 @@ gotpl ${BASEDIR}/systemd.j2 < ${BUILD_DIR}/settings-$runid.yml > ${BUILD_DIR}/$r
 gotpl ${BASEDIR}/beatname.sh.j2 < ${BUILD_DIR}/settings-$runid.yml > ${BUILD_DIR}/beatname-$runid.sh
 chmod +x ${BUILD_DIR}/beatname-$runid.sh
 
-docker run --rm -v ${BUILD_DIR}:/build \
+docker run --rm -v ${BUILD_DIR}:/build -v ${UPLOAD_DIR}:/upload \
     -e BUILDID=$BUILDID -e SNAPSHOT=$SNAPSHOT -e RUNID=$runid \
     tudorg/fpm /build/run-$runid.sh
 

diff --git a/dev-tools/packer/platforms/debian/run.sh.j2 b/dev-tools/packer/platforms/debian/run.sh.j2
@@ -23,9 +23,9 @@ BEATS_YML_NAME="{{.beat_name}}-linux-{{.arch}}"
 # create deb
 FPM_ARGS=(
         --force -s dir -t deb
-        -n {{.beat_pkg_name}} -v ${VERSION}
+        -n {{.beat_pkg_name}}{{.beat_pkg_suffix}} -v ${VERSION}
         --vendor "{{.beat_vendor}}"
-        --license "{{.beat_license}}"
+        --license $(echo {{.beat_license}} | tr " " "-")
         --architecture {{.deb_arch}}
         --description "{{.beat_description}}"
         --url {{.beat_url}}
@@ -49,11 +49,10 @@ fi
 fpm "${FPM_ARGS[@]}"
 
 # move and rename to use the elastic conventions
-mkdir -p upload
-mv {{.beat_pkg_name}}_${VERSION}_{{.deb_arch}}.deb upload/{{.beat_name}}-${VERSION}-{{.deb_arch}}.deb
-echo "Created upload/{{.beat_name}}-${VERSION}-{{.deb_arch}}.deb"
+mv {{.beat_pkg_name}}{{.beat_pkg_suffix}}_${VERSION}_{{.deb_arch}}.deb /upload/{{.beat_name}}{{.beat_pkg_suffix}}-${VERSION}-{{.deb_arch}}.deb
+echo "Created /upload/{{.beat_name}}{{.beat_pkg_suffix}}-${VERSION}-{{.deb_arch}}.deb"
 
 # create sha512 file
-cd upload
-sha512sum {{.beat_name}}-${VERSION}-{{.deb_arch}}.deb > {{.beat_name}}-${VERSION}-{{.deb_arch}}.deb.sha512
-echo "Created upload/{{.beat_name}}-${VERSION}-{{.deb_arch}}.deb.sha512"
+cd /upload
+sha512sum {{.beat_name}}{{.beat_pkg_suffix}}-${VERSION}-{{.deb_arch}}.deb > {{.beat_name}}{{.beat_pkg_suffix}}-${VERSION}-{{.deb_arch}}.deb.sha512
+echo "Created /upload/{{.beat_name}}{{.beat_pkg_suffix}}-${VERSION}-{{.deb_arch}}.deb.sha512"
diff --git a/dev-tools/packer/platforms/windows/build.sh b/dev-tools/packer/platforms/windows/build.sh
@@ -14,7 +14,7 @@ gotpl ${BASEDIR}/install-service.ps1.j2 < ${BUILD_DIR}/settings-$runid.yml > ${B
 gotpl ${BASEDIR}/uninstall-service.ps1.j2 < ${BUILD_DIR}/settings-$runid.yml > ${BUILD_DIR}/uninstall-service-$BEAT.ps1
 chmod +x ${BUILD_DIR}/run-$runid.sh
 
-docker run --rm -v ${BUILD_DIR}:/build \
+docker run --rm -v ${BUILD_DIR}:/build -v ${UPLOAD_DIR}:/upload \
     -e BUILDID=$BUILDID -e SNAPSHOT=$SNAPSHOT -e RUNID=$runid \
     tudorg/fpm /build/run-$runid.sh
 

diff --git a/dev-tools/packer/platforms/windows/run.sh.j2 b/dev-tools/packer/platforms/windows/run.sh.j2
@@ -21,10 +21,9 @@ cp -a modules.d-win/ /{{.beat_name}}-${VERSION}-windows-{{.win_arch}}/modules.d
 cp install-service-{{.beat_name}}.ps1 /{{.beat_name}}-${VERSION}-windows-{{.win_arch}}/
 cp uninstall-service-{{.beat_name}}.ps1 /{{.beat_name}}-${VERSION}-windows-{{.win_arch}}/
 
-mkdir -p upload
-zip -r upload/{{.beat_name}}-${VERSION}-windows-{{.win_arch}}.zip /{{.beat_name}}-${VERSION}-windows-{{.win_arch}}
-echo "Created upload/{{.beat_name}}-${VERSION}-windows-{{.win_arch}}.zip"
+zip -r /upload/{{.beat_name}}{{.beat_pkg_suffix}}-${VERSION}-windows-{{.win_arch}}.zip /{{.beat_name}}-${VERSION}-windows-{{.win_arch}}
+echo "Created /upload/{{.beat_name}}{{.beat_pkg_suffix}}-${VERSION}-windows-{{.win_arch}}.zip"
 
-cd upload
-sha512sum {{.beat_name}}-${VERSION}-windows-{{.win_arch}}.zip > {{.beat_name}}-${VERSION}-windows-{{.win_arch}}.zip.sha512
-echo "Created upload/{{.beat_name}}-${VERSION}-windows-{{.win_arch}}.zip.sha512"
+cd /upload
+sha512sum {{.beat_name}}{{.beat_pkg_suffix}}-${VERSION}-windows-{{.win_arch}}.zip > {{.beat_name}}{{.beat_pkg_suffix}}-${VERSION}-windows-{{.win_arch}}.zip.sha512
+echo "Created /upload/{{.beat_name}}{{.beat_pkg_suffix}}-${VERSION}-windows-{{.win_arch}}.zip.sha512"
diff --git a/dev-tools/packer/xgo-scripts/before_build.sh b/dev-tools/packer/xgo-scripts/before_build.sh
@@ -45,7 +45,7 @@ PREFIX=$PREFIX make before-build
 
 # Add data to the home directory
 mkdir -p $PREFIX/homedir
-make install-home HOME_PREFIX=$PREFIX/homedir
+make install-home HOME_PREFIX=$PREFIX/homedir LICENSE_FILE=${LICENSE_FILE}
 
 if [ -n "BUILDID" ]; then
     echo "$BUILDID" > $PREFIX/homedir/.build_hash.txt