Packaging of journalbeat

.travis.yml

@@ -152,12 +152,10 @@ addons:
   apt:
     update: true
     packages:
-      - libc6-dev-i386
-      - libpcap-dev
-      - libsystemd-journal-dev
-      - libxml2-utils
       - python-virtualenv
+      - libpcap-dev
       - xsltproc
+      - libxml2-utils
 
 before_install:
   - python --version

dev-tools/mage/crossbuild.go

@@ -149,7 +149,7 @@ func buildMage() error {
 	return sh.RunWith(env, "mage", "-f", "-compile", filepath.Join("build", "mage-linux-amd64"))
 }
 
-func crossBuildImage(platform string) (string, error) {
+func crossBuildImage(platform, beatName string) (string, error) {
 	tagSuffix := "main"
 
 	switch {
@@ -167,6 +167,10 @@ func crossBuildImage(platform string) (string, error) {
 		// Use an older version of libc to gain greater OS compatibility.
 		// Debian 7 uses glibc 2.13.
 		tagSuffix = "main-debian7"
+		// journalbeat requires Debian 8 due to systemd support.
+		if beatName == "journalbeat" {
+			tagSuffix = "main-debian8"
+		}
 	}
 
 	goVersion, err := GoVersion()
@@ -208,7 +212,8 @@ func (b GolangCrossBuilder) Build() error {
 	}
 
 	dockerRun := sh.RunCmd("docker", "run")
-	image, err := crossBuildImage(b.Platform)
+	beatName := filepath.Base(repoInfo.RootDir)
+	image, err := crossBuildImage(b.Platform, beatName)
 	if err != nil {
 		return errors.Wrap(err, "failed to determine golang-crossbuild image tag")
 	}

journalbeat/Makefile

@@ -3,8 +3,6 @@ BEAT_TITLE=Journalbeat
 SYSTEM_TESTS=false
 TEST_ENVIRONMENT=false
 ES_BEATS?=..
-GOX_FLAGS=-cgo
-GOX_OS=linux
 
 # Path to the libbeat Makefile
 -include $(ES_BEATS)/libbeat/scripts/Makefile

journalbeat/journalbeat.yml

@@ -142,6 +142,14 @@ output.elasticsearch:
   # Client Certificate Key
   #ssl.key: "/etc/pki/client/cert.key"
 
+#================================ Procesors =====================================
+
+# Configure processors to enhance or manipulate events generated by the beat.
+
+processors:
+  - add_host_metadata: ~
+  - add_cloud_metadata: ~
+
 #================================ Logging =====================================
 
 # Sets log level. The default log level is info.

journalbeat/magefile.go

@@ -33,7 +33,7 @@ import (
 func init() {
 	mage.BeatDescription = "Journalbeat ships systemd journal entries to Elasticsearch or Logstash."
 
-	// TODO filter platforms
+	mage.Platforms = mage.Platforms.Filter("linux")
 }
 
 // Build builds the Beat binary.
@@ -44,9 +44,18 @@ func Build() error {
 // GolangCrossBuild build the Beat binary inside of the golang-builder.
 // Do not use directly, use crossBuild instead.
 func GolangCrossBuild() error {
+	mg.Deps(installDependencies)
 	return mage.GolangCrossBuild(mage.DefaultGolangCrossBuildArgs())
 }
 
+func installDependencies() error {
+	if err := sh.Run("apt-get", "update"); err != nil {
+		return err
+	}
+
+	return sh.Run("apt-get", "install", "-y", "--no-install-recommends", "libsystemd-dev")
+}
+
 // BuildGoDaemon builds the go-daemon binary (use crossBuildGoDaemon).
 func BuildGoDaemon() error {
 	return mage.BuildGoDaemon()

libbeat/scripts/Makefile

@@ -106,9 +106,11 @@ ${BEAT_NAME}.test: $(GOFILES_ALL)
 .PHONY: crosscompile
 crosscompile: ## @build Cross-compile beat for the OS'es specified in GOX_OS variable. The binaries are placed in the build/bin directory.
 crosscompile: $(GOFILES)
+ifneq ($(shell [[ $(BEAT_NAME) == journalbeat ]] && echo true ),true)
 	go get github.com/mitchellh/gox
 	mkdir -p ${BUILD_DIR}/bin
 	gox -output="${BUILD_DIR}/bin/{{.Dir}}-{{.OS}}-{{.Arch}}" -os="$(strip $(GOX_OS))" -osarch="$(strip $(GOX_OSARCH))" ${GOX_FLAGS}
+endif
 
 .PHONY: check
 check: check-headers python-env prepare-tests ## @build Checks project and source code if everything is according to standard

x-pack/journalbeat/cmd/root.go

@@ -0,0 +1,17 @@
+// Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+// or more contributor license agreements. Licensed under the Elastic License;
+// you may not use this file except in compliance with the Elastic License.
+
+package cmd
+
+import (
+	"github.com/elastic/beats/journalbeat/cmd"
+	xpackcmd "github.com/elastic/beats/x-pack/libbeat/cmd"
+)
+
+// RootCmd to handle beats cli
+var RootCmd = cmd.RootCmd
+
+func init() {
+	xpackcmd.AddXPack(RootCmd, cmd.Name)
+}

x-pack/journalbeat/main.go

@@ -0,0 +1,19 @@
+// Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+// or more contributor license agreements. Licensed under the Elastic License;
+// you may not use this file except in compliance with the Elastic License.
+
+package main
+
+import (
+	"os"
+
+	"github.com/elastic/beats/x-pack/journalbeat/cmd"
+
+	_ "github.com/elastic/beats/journalbeat/include"
+)
+
+func main() {
+	if err := cmd.RootCmd.Execute(); err != nil {
+		os.Exit(1)
+	}
+}