From 24ef8f9bbb06d33072e5e9932c04166af8b27b46 Mon Sep 17 00:00:00 2001
From: Marcin Tojek <marcin.tojek@elastic.co>
Date: Wed, 4 Mar 2020 14:35:47 +0100
Subject: [PATCH 1/6] Write manifest files only

---
 dev/import-beats/main.go     | 51 +++++++++++++++++++++++++
 dev/import-beats/packages.go | 73 ++++++++++++++++++++++++++++++++++++
 dev/import-beats/sources.go  | 15 ++++++++
 go.mod                       |  2 +-
 go.sum                       |  2 +
 util/package.go              | 19 +++++-----
 6 files changed, 152 insertions(+), 10 deletions(-)
 create mode 100644 dev/import-beats/main.go
 create mode 100644 dev/import-beats/packages.go
 create mode 100644 dev/import-beats/sources.go

diff --git a/dev/import-beats/main.go b/dev/import-beats/main.go
new file mode 100644
index 000000000..47bd94bc4
--- /dev/null
+++ b/dev/import-beats/main.go
@@ -0,0 +1,51 @@
+// 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 (
+	"flag"
+	"log"
+
+	"github.com/pkg/errors"
+)
+
+func main() {
+	// Beats repository directory
+	var beatsDir string
+	// Target public directory where the generated packages should end up in
+	var publicDir string
+
+	flag.StringVar(&beatsDir, "beatsDir", "", "Path to the beats repository")
+	flag.StringVar(&publicDir, "publicDir", "", "Path to the public directory ")
+	flag.Parse()
+
+	if beatsDir == "" || publicDir == "" {
+		log.Fatal("beatsDir and publicDir must be set")
+	}
+
+	if err := build(beatsDir, publicDir); err != nil {
+		log.Fatal(err)
+	}
+}
+
+func build(beatsDir, publicDir string) error {
+	packages := packageMap{}
+
+	for _, beatName := range logSources {
+		err := packages.loadFromSource(beatsDir, beatName, "logs")
+		if err != nil {
+			return errors.Wrap(err, "loading logs source failed")
+		}
+	}
+
+	for _, beatName := range metricSources {
+		err := packages.loadFromSource(beatsDir, beatName, "metrics")
+		if err != nil {
+			return errors.Wrap(err, "loading metrics source failed")
+		}
+	}
+
+	return packages.writePackages(publicDir)
+}
diff --git a/dev/import-beats/packages.go b/dev/import-beats/packages.go
new file mode 100644
index 000000000..6d8d4048c
--- /dev/null
+++ b/dev/import-beats/packages.go
@@ -0,0 +1,73 @@
+// 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 (
+	"io/ioutil"
+	"log"
+	"os"
+	"path/filepath"
+
+	"github.com/pkg/errors"
+	"gopkg.in/yaml.v2"
+
+	"github.com/elastic/package-registry/util"
+)
+
+type packageMap map[string]*util.Package
+
+func (p packageMap) loadFromSource(beatsDir, beatName, packageType string) error {
+	path := filepath.Join(beatsDir, beatName, "module")
+	moduleDirs, err := ioutil.ReadDir(path)
+	if err != nil {
+		return errors.Wrapf(err, "cannot read directory '%s'", path)
+	}
+
+	for _, moduleDir := range moduleDirs {
+		if !moduleDir.IsDir() {
+			continue
+		}
+
+		log.Printf("Visit '%s:%s'\n", beatName, moduleDir.Name())
+
+		_, ok := p[moduleDir.Name()]
+		if !ok {
+			p[moduleDir.Name()] = &util.Package{
+				FormatVersion: "1.0.0",
+				Name:          moduleDir.Name(),
+				Version:       "0.0.1", // TODO
+				Type:          "integration",
+				Categories:    []string{},
+			}
+		}
+
+		p[moduleDir.Name()].Categories = append(p[moduleDir.Name()].Categories, packageType)
+	}
+	return nil
+}
+
+func (p packageMap) writePackages(publicDir string) error {
+	for name, content := range p {
+		log.Printf("Writing package '%s' (version: %s)\n", name, content.Version)
+
+		path := filepath.Join(publicDir, name+"-"+content.Version)
+		err := os.MkdirAll(path, 0755)
+		if err != nil {
+			return errors.Wrapf(err, "cannot make directory '%s'", path)
+		}
+
+		m, err := yaml.Marshal(content)
+		if err != nil {
+			return errors.Wrapf(err, "marshaling package content failed (package name: %s)", name)
+		}
+
+		manifestFilePath := filepath.Join(path, "manifest.yml")
+		err = ioutil.WriteFile(manifestFilePath, m, 0644)
+		if err != nil {
+			return errors.Wrapf(err, "writing manifest file failed (path: %s)", manifestFilePath)
+		}
+	}
+	return nil
+}
diff --git a/dev/import-beats/sources.go b/dev/import-beats/sources.go
new file mode 100644
index 000000000..ab38cc78c
--- /dev/null
+++ b/dev/import-beats/sources.go
@@ -0,0 +1,15 @@
+// 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
+
+var metricSources = []string{
+	"metricbeat",
+	"x-pack/metricbeat",
+}
+
+var logSources = []string{
+	"filebeat",
+	"x-pack/filebeat",
+}
diff --git a/go.mod b/go.mod
index 1d20d732d..e0340363d 100644
--- a/go.mod
+++ b/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/elastic/go-ucfg v0.7.0
 	github.com/gorilla/mux v1.7.2
 	github.com/jstemmer/go-junit-report v0.9.1 // indirect
-	github.com/magefile/mage v1.8.0
+	github.com/magefile/mage v1.9.0
 	github.com/pkg/errors v0.8.1
 	github.com/stretchr/testify v1.4.0
 	gopkg.in/yaml.v2 v2.2.2
diff --git a/go.sum b/go.sum
index 7b9e3bb2c..4f65ad81d 100644
--- a/go.sum
+++ b/go.sum
@@ -10,6 +10,8 @@ github.com/jstemmer/go-junit-report v0.9.1 h1:6QPYqodiu3GuPL+7mfx+NwDdp2eTkp9IfE
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/magefile/mage v1.8.0 h1:mzL+xIopvPURVBwHG9A50JcjBO+xV3b5iZ7khFRI+5E=
 github.com/magefile/mage v1.8.0/go.mod h1:IUDi13rsHje59lecXokTfGX0QIzO45uVPlXnJYsXepA=
+github.com/magefile/mage v1.9.0 h1:t3AU2wNwehMCW97vuqQLtw6puppWXHO+O2MHo5a50XE=
+github.com/magefile/mage v1.9.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
diff --git a/util/package.go b/util/package.go
index 7ccca2518..b6ddb3839 100644
--- a/util/package.go
+++ b/util/package.go
@@ -26,22 +26,23 @@ var CategoryTitles = map[string]string{
 }
 
 type Package struct {
+	FormatVersion string `config:"format_version" json:"format_version" yaml:"format_version"`
+
 	Name          string  `config:"name" json:"name"`
-	Title         *string `config:"title,omitempty" json:"title,omitempty"`
+	Title         *string `config:"title,omitempty" json:"title,omitempty" yaml:"title,omitempty"`
 	Version       string  `config:"version" json:"version"`
-	Readme        *string `config:"readme,omitempty" json:"readme,omitempty"`
+	Readme        *string `config:"readme,omitempty" json:"readme,omitempty" yaml:"readme,omitempty"`
 	versionSemVer semver.Version
 	Description   string       `config:"description" json:"description"`
 	Type          string       `config:"type" json:"type"`
 	Categories    []string     `config:"categories" json:"categories"`
 	Requirement   Requirement  `config:"requirement" json:"requirement"`
-	Screenshots   []Image      `config:"screenshots,omitempty" json:"screenshots,omitempty"`
-	Icons         []Image      `config:"icons,omitempty" json:"icons,omitempty"`
-	Assets        []string     `config:"assets,omitempty" json:"assets,omitempty"`
-	Internal      bool         `config:"internal,omitempty" json:"internal,omitempty"`
-	FormatVersion string       `config:"format_version" json:"format_version"`
-	DataSets      []*DataSet   `config:"datasets,omitempty" json:"datasets,omitempty"`
-	Datasources   []Datasource `config:"datasources,omitempty" json:"datasources,omitempty"`
+	Screenshots   []Image      `config:"screenshots,omitempty" json:"screenshots,omitempty" yaml:"screenshots,omitempty"`
+	Icons         []Image      `config:"icons,omitempty" json:"icons,omitempty" yaml:"icons,omitempty"`
+	Assets        []string     `config:"assets,omitempty" json:"assets,omitempty" yaml:"assets,omitempty"`
+	Internal      bool         `config:"internal,omitempty" json:"internal,omitempty" yaml:"internal,omitempty"`
+	DataSets      []*DataSet   `config:"datasets,omitempty" json:"datasets,omitempty" yaml:"datasets,omitempty"`
+	Datasources   []Datasource `config:"datasources,omitempty" json:"datasources,omitempty" yaml:"datasources,omitempty"`
 	Download      string       `json:"download"`
 	Path          string       `json:"path"`
 }

From 2db7bbfd2c7c68fa2c1586fdec6f741cb2a98be9 Mon Sep 17 00:00:00 2001
From: Marcin Tojek <marcin.tojek@elastic.co>
Date: Wed, 4 Mar 2020 14:36:15 +0100
Subject: [PATCH 2/6] Move format_version to the top

---
 testdata/public/package/datasources-1.0.0/index.json      | 2 +-
 testdata/public/package/default-pipeline-0.0.2/index.json | 2 +-
 testdata/public/package/example-0.0.2/index.json          | 2 +-
 testdata/public/package/example-1.0.0/index.json          | 2 +-
 testdata/public/package/foo-1.0.0/index.json              | 2 +-
 testdata/public/package/internal-1.2.0/index.json         | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/testdata/public/package/datasources-1.0.0/index.json b/testdata/public/package/datasources-1.0.0/index.json
index 30f638c03..ca6700da3 100644
--- a/testdata/public/package/datasources-1.0.0/index.json
+++ b/testdata/public/package/datasources-1.0.0/index.json
@@ -1,4 +1,5 @@
 {
+  "format_version": "1.0.0",
   "name": "datasources",
   "title": "Default datasource Integration",
   "version": "1.0.0",
@@ -14,7 +15,6 @@
     "/package/datasources-1.0.0/manifest.yml",
     "/package/datasources-1.0.0/dataset/example/manifest.yml"
   ],
-  "format_version": "1.0.0",
   "datasets": [
     {
       "title": "Example dataset with inputs",
diff --git a/testdata/public/package/default-pipeline-0.0.2/index.json b/testdata/public/package/default-pipeline-0.0.2/index.json
index 6fa5bca28..a99f83157 100644
--- a/testdata/public/package/default-pipeline-0.0.2/index.json
+++ b/testdata/public/package/default-pipeline-0.0.2/index.json
@@ -1,4 +1,5 @@
 {
+  "format_version": "1.0.0",
   "name": "default-pipeline",
   "title": "Default pipeline Integration",
   "version": "0.0.2",
@@ -15,7 +16,6 @@
     "/package/default-pipeline-0.0.2/dataset/foo/manifest.yml",
     "/package/default-pipeline-0.0.2/dataset/foo/elasticsearch/ingest-pipeline/default.json"
   ],
-  "format_version": "1.0.0",
   "datasets": [
     {
       "title": "Foo",
diff --git a/testdata/public/package/example-0.0.2/index.json b/testdata/public/package/example-0.0.2/index.json
index 601641682..bb20143ba 100644
--- a/testdata/public/package/example-0.0.2/index.json
+++ b/testdata/public/package/example-0.0.2/index.json
@@ -1,4 +1,5 @@
 {
+  "format_version": "1.0.0",
   "name": "example",
   "title": "Example",
   "version": "0.0.2",
@@ -31,7 +32,6 @@
     "/package/example-0.0.2/kibana/visualization/80844540-5c97-11e9-8477-077ec9664dbd.json",
     "/package/example-0.0.2/kibana/visualization/ab48c3f0-5ca6-11e9-8477-077ec9664dbd.json"
   ],
-  "format_version": "1.0.0",
   "download": "/epr/example/example-0.0.2.tar.gz",
   "path": "/package/example-0.0.2"
 }
\ No newline at end of file
diff --git a/testdata/public/package/example-1.0.0/index.json b/testdata/public/package/example-1.0.0/index.json
index 4f7741dcc..f74c31736 100644
--- a/testdata/public/package/example-1.0.0/index.json
+++ b/testdata/public/package/example-1.0.0/index.json
@@ -1,4 +1,5 @@
 {
+  "format_version": "1.0.0",
   "name": "example",
   "title": "Example Integration",
   "version": "1.0.0",
@@ -47,7 +48,6 @@
     "/package/example-1.0.0/dataset/foo/elasticsearch/ingest-pipeline/pipeline-plaintext.json",
     "/package/example-1.0.0/dataset/foo/elasticsearch/ingest-pipeline/pipeline-tcp.json"
   ],
-  "format_version": "1.0.0",
   "datasets": [
     {
       "title": "Foo",
diff --git a/testdata/public/package/foo-1.0.0/index.json b/testdata/public/package/foo-1.0.0/index.json
index 6330c8b45..28a5bff8f 100644
--- a/testdata/public/package/foo-1.0.0/index.json
+++ b/testdata/public/package/foo-1.0.0/index.json
@@ -1,4 +1,5 @@
 {
+  "format_version": "1.0.0",
   "name": "foo",
   "title": "Foo",
   "version": "1.0.0",
@@ -15,7 +16,6 @@
   "assets": [
     "/package/foo-1.0.0/manifest.yml"
   ],
-  "format_version": "1.0.0",
   "download": "/epr/foo/foo-1.0.0.tar.gz",
   "path": "/package/foo-1.0.0"
 }
\ No newline at end of file
diff --git a/testdata/public/package/internal-1.2.0/index.json b/testdata/public/package/internal-1.2.0/index.json
index 42a0aeeae..65badcbb2 100644
--- a/testdata/public/package/internal-1.2.0/index.json
+++ b/testdata/public/package/internal-1.2.0/index.json
@@ -1,4 +1,5 @@
 {
+  "format_version": "1.0.0",
   "name": "internal",
   "title": "Internal",
   "version": "1.2.0",
@@ -12,7 +13,6 @@
     "/package/internal-1.2.0/manifest.yml"
   ],
   "internal": true,
-  "format_version": "1.0.0",
   "download": "/epr/internal/internal-1.2.0.tar.gz",
   "path": "/package/internal-1.2.0"
 }
\ No newline at end of file

From 3c94d03b5af6245dc2c3ec901f839126d66257cc Mon Sep 17 00:00:00 2001
From: Marcin Tojek <marcin.tojek@elastic.co>
Date: Wed, 4 Mar 2020 14:38:02 +0100
Subject: [PATCH 3/6] Rename publicDir to outputDir

---
 dev/import-beats/main.go     | 14 +++++++-------
 dev/import-beats/packages.go |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dev/import-beats/main.go b/dev/import-beats/main.go
index 47bd94bc4..ed7d0ef3c 100644
--- a/dev/import-beats/main.go
+++ b/dev/import-beats/main.go
@@ -15,22 +15,22 @@ func main() {
 	// Beats repository directory
 	var beatsDir string
 	// Target public directory where the generated packages should end up in
-	var publicDir string
+	var outputDir string
 
 	flag.StringVar(&beatsDir, "beatsDir", "", "Path to the beats repository")
-	flag.StringVar(&publicDir, "publicDir", "", "Path to the public directory ")
+	flag.StringVar(&outputDir, "outputDir", "", "Path to the output directory ")
 	flag.Parse()
 
-	if beatsDir == "" || publicDir == "" {
-		log.Fatal("beatsDir and publicDir must be set")
+	if beatsDir == "" || outputDir == "" {
+		log.Fatal("beatsDir and outputDir must be set")
 	}
 
-	if err := build(beatsDir, publicDir); err != nil {
+	if err := build(beatsDir, outputDir); err != nil {
 		log.Fatal(err)
 	}
 }
 
-func build(beatsDir, publicDir string) error {
+func build(beatsDir, outputDir string) error {
 	packages := packageMap{}
 
 	for _, beatName := range logSources {
@@ -47,5 +47,5 @@ func build(beatsDir, publicDir string) error {
 		}
 	}
 
-	return packages.writePackages(publicDir)
+	return packages.writePackages(outputDir)
 }
diff --git a/dev/import-beats/packages.go b/dev/import-beats/packages.go
index 6d8d4048c..b30aa6223 100644
--- a/dev/import-beats/packages.go
+++ b/dev/import-beats/packages.go
@@ -48,11 +48,11 @@ func (p packageMap) loadFromSource(beatsDir, beatName, packageType string) error
 	return nil
 }
 
-func (p packageMap) writePackages(publicDir string) error {
+func (p packageMap) writePackages(outputDir string) error {
 	for name, content := range p {
 		log.Printf("Writing package '%s' (version: %s)\n", name, content.Version)
 
-		path := filepath.Join(publicDir, name+"-"+content.Version)
+		path := filepath.Join(outputDir, name+"-"+content.Version)
 		err := os.MkdirAll(path, 0755)
 		if err != nil {
 			return errors.Wrapf(err, "cannot make directory '%s'", path)

From ac7d7db1a2e97ac20f31b6d9b3a759318330a354 Mon Sep 17 00:00:00 2001
From: Marcin Tojek <marcin.tojek@elastic.co>
Date: Wed, 4 Mar 2020 14:40:02 +0100
Subject: [PATCH 4/6] Add generated packages

---
 dev/package-beats/activemq-0.0.1/manifest.yml       | 13 +++++++++++++
 dev/package-beats/aerospike-0.0.1/manifest.yml      | 12 ++++++++++++
 dev/package-beats/apache-0.0.1/manifest.yml         | 13 +++++++++++++
 dev/package-beats/apache2-0.0.1/manifest.yml        | 12 ++++++++++++
 dev/package-beats/appsearch-0.0.1/manifest.yml      | 12 ++++++++++++
 dev/package-beats/auditd-0.0.1/manifest.yml         | 12 ++++++++++++
 dev/package-beats/aws-0.0.1/manifest.yml            | 13 +++++++++++++
 dev/package-beats/azure-0.0.1/manifest.yml          | 13 +++++++++++++
 dev/package-beats/beat-0.0.1/manifest.yml           | 12 ++++++++++++
 dev/package-beats/cef-0.0.1/manifest.yml            | 12 ++++++++++++
 dev/package-beats/ceph-0.0.1/manifest.yml           | 12 ++++++++++++
 dev/package-beats/cisco-0.0.1/manifest.yml          | 12 ++++++++++++
 dev/package-beats/cloudfoundry-0.0.1/manifest.yml   | 12 ++++++++++++
 dev/package-beats/cockroachdb-0.0.1/manifest.yml    | 12 ++++++++++++
 dev/package-beats/consul-0.0.1/manifest.yml         | 12 ++++++++++++
 dev/package-beats/coredns-0.0.1/manifest.yml        | 13 +++++++++++++
 dev/package-beats/couchbase-0.0.1/manifest.yml      | 12 ++++++++++++
 dev/package-beats/couchdb-0.0.1/manifest.yml        | 12 ++++++++++++
 dev/package-beats/docker-0.0.1/manifest.yml         | 12 ++++++++++++
 dev/package-beats/dropwizard-0.0.1/manifest.yml     | 12 ++++++++++++
 dev/package-beats/elasticsearch-0.0.1/manifest.yml  | 13 +++++++++++++
 dev/package-beats/envoyproxy-0.0.1/manifest.yml     | 13 +++++++++++++
 dev/package-beats/etcd-0.0.1/manifest.yml           | 12 ++++++++++++
 dev/package-beats/golang-0.0.1/manifest.yml         | 12 ++++++++++++
 dev/package-beats/googlecloud-0.0.1/manifest.yml    | 13 +++++++++++++
 dev/package-beats/graphite-0.0.1/manifest.yml       | 12 ++++++++++++
 dev/package-beats/haproxy-0.0.1/manifest.yml        | 13 +++++++++++++
 dev/package-beats/http-0.0.1/manifest.yml           | 12 ++++++++++++
 dev/package-beats/ibmmq-0.0.1/manifest.yml          | 13 +++++++++++++
 dev/package-beats/icinga-0.0.1/manifest.yml         | 12 ++++++++++++
 dev/package-beats/iis-0.0.1/manifest.yml            | 13 +++++++++++++
 dev/package-beats/iptables-0.0.1/manifest.yml       | 12 ++++++++++++
 dev/package-beats/istio-0.0.1/manifest.yml          | 12 ++++++++++++
 dev/package-beats/jolokia-0.0.1/manifest.yml        | 12 ++++++++++++
 dev/package-beats/kafka-0.0.1/manifest.yml          | 13 +++++++++++++
 dev/package-beats/kibana-0.0.1/manifest.yml         | 13 +++++++++++++
 dev/package-beats/kubernetes-0.0.1/manifest.yml     | 12 ++++++++++++
 dev/package-beats/kvm-0.0.1/manifest.yml            | 12 ++++++++++++
 dev/package-beats/logstash-0.0.1/manifest.yml       | 13 +++++++++++++
 dev/package-beats/memcached-0.0.1/manifest.yml      | 12 ++++++++++++
 dev/package-beats/misp-0.0.1/manifest.yml           | 12 ++++++++++++
 dev/package-beats/mongodb-0.0.1/manifest.yml        | 13 +++++++++++++
 dev/package-beats/mssql-0.0.1/manifest.yml          | 13 +++++++++++++
 dev/package-beats/munin-0.0.1/manifest.yml          | 12 ++++++++++++
 dev/package-beats/mysql-0.0.1/manifest.yml          | 13 +++++++++++++
 dev/package-beats/nats-0.0.1/manifest.yml           | 13 +++++++++++++
 dev/package-beats/netflow-0.0.1/manifest.yml        | 12 ++++++++++++
 dev/package-beats/nginx-0.0.1/manifest.yml          | 13 +++++++++++++
 dev/package-beats/oracle-0.0.1/manifest.yml         | 12 ++++++++++++
 dev/package-beats/osquery-0.0.1/manifest.yml        | 12 ++++++++++++
 dev/package-beats/panw-0.0.1/manifest.yml           | 12 ++++++++++++
 dev/package-beats/php_fpm-0.0.1/manifest.yml        | 12 ++++++++++++
 dev/package-beats/postgresql-0.0.1/manifest.yml     | 13 +++++++++++++
 dev/package-beats/prometheus-0.0.1/manifest.yml     | 12 ++++++++++++
 dev/package-beats/rabbitmq-0.0.1/manifest.yml       | 13 +++++++++++++
 dev/package-beats/redis-0.0.1/manifest.yml          | 13 +++++++++++++
 .../redisenterprise-0.0.1/manifest.yml              | 12 ++++++++++++
 dev/package-beats/santa-0.0.1/manifest.yml          | 12 ++++++++++++
 dev/package-beats/sql-0.0.1/manifest.yml            | 12 ++++++++++++
 dev/package-beats/stan-0.0.1/manifest.yml           | 12 ++++++++++++
 dev/package-beats/statsd-0.0.1/manifest.yml         | 12 ++++++++++++
 dev/package-beats/suricata-0.0.1/manifest.yml       | 12 ++++++++++++
 dev/package-beats/system-0.0.1/manifest.yml         | 13 +++++++++++++
 dev/package-beats/tomcat-0.0.1/manifest.yml         | 12 ++++++++++++
 dev/package-beats/traefik-0.0.1/manifest.yml        | 13 +++++++++++++
 dev/package-beats/uwsgi-0.0.1/manifest.yml          | 12 ++++++++++++
 dev/package-beats/vsphere-0.0.1/manifest.yml        | 12 ++++++++++++
 dev/package-beats/windows-0.0.1/manifest.yml        | 12 ++++++++++++
 dev/package-beats/zeek-0.0.1/manifest.yml           | 12 ++++++++++++
 dev/package-beats/zookeeper-0.0.1/manifest.yml      | 12 ++++++++++++
 70 files changed, 864 insertions(+)
 create mode 100644 dev/package-beats/activemq-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/aerospike-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/apache-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/apache2-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/appsearch-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/auditd-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/aws-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/azure-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/beat-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/cef-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/ceph-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/cisco-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/cloudfoundry-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/cockroachdb-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/consul-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/coredns-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/couchbase-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/couchdb-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/docker-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/dropwizard-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/elasticsearch-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/envoyproxy-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/etcd-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/golang-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/googlecloud-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/graphite-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/haproxy-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/http-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/ibmmq-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/icinga-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/iis-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/iptables-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/istio-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/jolokia-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/kafka-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/kibana-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/kubernetes-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/kvm-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/logstash-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/memcached-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/misp-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/mongodb-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/mssql-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/munin-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/mysql-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/nats-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/netflow-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/nginx-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/oracle-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/osquery-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/panw-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/php_fpm-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/postgresql-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/prometheus-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/rabbitmq-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/redis-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/redisenterprise-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/santa-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/sql-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/stan-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/statsd-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/suricata-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/system-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/tomcat-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/traefik-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/uwsgi-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/vsphere-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/windows-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/zeek-0.0.1/manifest.yml
 create mode 100644 dev/package-beats/zookeeper-0.0.1/manifest.yml

diff --git a/dev/package-beats/activemq-0.0.1/manifest.yml b/dev/package-beats/activemq-0.0.1/manifest.yml
new file mode 100644
index 000000000..b1d74330a
--- /dev/null
+++ b/dev/package-beats/activemq-0.0.1/manifest.yml
@@ -0,0 +1,13 @@
+format_version: 1.0.0
+name: activemq
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- logs
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/aerospike-0.0.1/manifest.yml b/dev/package-beats/aerospike-0.0.1/manifest.yml
new file mode 100644
index 000000000..a6bd3673c
--- /dev/null
+++ b/dev/package-beats/aerospike-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: aerospike
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/apache-0.0.1/manifest.yml b/dev/package-beats/apache-0.0.1/manifest.yml
new file mode 100644
index 000000000..8066ac73f
--- /dev/null
+++ b/dev/package-beats/apache-0.0.1/manifest.yml
@@ -0,0 +1,13 @@
+format_version: 1.0.0
+name: apache
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- logs
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/apache2-0.0.1/manifest.yml b/dev/package-beats/apache2-0.0.1/manifest.yml
new file mode 100644
index 000000000..7aa11c35d
--- /dev/null
+++ b/dev/package-beats/apache2-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: apache2
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- logs
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/appsearch-0.0.1/manifest.yml b/dev/package-beats/appsearch-0.0.1/manifest.yml
new file mode 100644
index 000000000..be524a145
--- /dev/null
+++ b/dev/package-beats/appsearch-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: appsearch
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/auditd-0.0.1/manifest.yml b/dev/package-beats/auditd-0.0.1/manifest.yml
new file mode 100644
index 000000000..a6f098c92
--- /dev/null
+++ b/dev/package-beats/auditd-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: auditd
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- logs
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/aws-0.0.1/manifest.yml b/dev/package-beats/aws-0.0.1/manifest.yml
new file mode 100644
index 000000000..f88c0e6be
--- /dev/null
+++ b/dev/package-beats/aws-0.0.1/manifest.yml
@@ -0,0 +1,13 @@
+format_version: 1.0.0
+name: aws
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- logs
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/azure-0.0.1/manifest.yml b/dev/package-beats/azure-0.0.1/manifest.yml
new file mode 100644
index 000000000..daa9d55ec
--- /dev/null
+++ b/dev/package-beats/azure-0.0.1/manifest.yml
@@ -0,0 +1,13 @@
+format_version: 1.0.0
+name: azure
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- logs
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/beat-0.0.1/manifest.yml b/dev/package-beats/beat-0.0.1/manifest.yml
new file mode 100644
index 000000000..bc9a6cc5c
--- /dev/null
+++ b/dev/package-beats/beat-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: beat
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/cef-0.0.1/manifest.yml b/dev/package-beats/cef-0.0.1/manifest.yml
new file mode 100644
index 000000000..29c92cdba
--- /dev/null
+++ b/dev/package-beats/cef-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: cef
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- logs
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/ceph-0.0.1/manifest.yml b/dev/package-beats/ceph-0.0.1/manifest.yml
new file mode 100644
index 000000000..352300a5f
--- /dev/null
+++ b/dev/package-beats/ceph-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: ceph
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/cisco-0.0.1/manifest.yml b/dev/package-beats/cisco-0.0.1/manifest.yml
new file mode 100644
index 000000000..f969ef159
--- /dev/null
+++ b/dev/package-beats/cisco-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: cisco
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- logs
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/cloudfoundry-0.0.1/manifest.yml b/dev/package-beats/cloudfoundry-0.0.1/manifest.yml
new file mode 100644
index 000000000..7de9a8d51
--- /dev/null
+++ b/dev/package-beats/cloudfoundry-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: cloudfoundry
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/cockroachdb-0.0.1/manifest.yml b/dev/package-beats/cockroachdb-0.0.1/manifest.yml
new file mode 100644
index 000000000..3022e20a1
--- /dev/null
+++ b/dev/package-beats/cockroachdb-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: cockroachdb
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/consul-0.0.1/manifest.yml b/dev/package-beats/consul-0.0.1/manifest.yml
new file mode 100644
index 000000000..751e900b1
--- /dev/null
+++ b/dev/package-beats/consul-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: consul
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/coredns-0.0.1/manifest.yml b/dev/package-beats/coredns-0.0.1/manifest.yml
new file mode 100644
index 000000000..815197054
--- /dev/null
+++ b/dev/package-beats/coredns-0.0.1/manifest.yml
@@ -0,0 +1,13 @@
+format_version: 1.0.0
+name: coredns
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- logs
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/couchbase-0.0.1/manifest.yml b/dev/package-beats/couchbase-0.0.1/manifest.yml
new file mode 100644
index 000000000..878720d3d
--- /dev/null
+++ b/dev/package-beats/couchbase-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: couchbase
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/couchdb-0.0.1/manifest.yml b/dev/package-beats/couchdb-0.0.1/manifest.yml
new file mode 100644
index 000000000..fbdebecad
--- /dev/null
+++ b/dev/package-beats/couchdb-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: couchdb
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/docker-0.0.1/manifest.yml b/dev/package-beats/docker-0.0.1/manifest.yml
new file mode 100644
index 000000000..4aff5ff46
--- /dev/null
+++ b/dev/package-beats/docker-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: docker
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/dropwizard-0.0.1/manifest.yml b/dev/package-beats/dropwizard-0.0.1/manifest.yml
new file mode 100644
index 000000000..bacc4ec90
--- /dev/null
+++ b/dev/package-beats/dropwizard-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: dropwizard
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/elasticsearch-0.0.1/manifest.yml b/dev/package-beats/elasticsearch-0.0.1/manifest.yml
new file mode 100644
index 000000000..31c1cf7a2
--- /dev/null
+++ b/dev/package-beats/elasticsearch-0.0.1/manifest.yml
@@ -0,0 +1,13 @@
+format_version: 1.0.0
+name: elasticsearch
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- logs
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/envoyproxy-0.0.1/manifest.yml b/dev/package-beats/envoyproxy-0.0.1/manifest.yml
new file mode 100644
index 000000000..46e616518
--- /dev/null
+++ b/dev/package-beats/envoyproxy-0.0.1/manifest.yml
@@ -0,0 +1,13 @@
+format_version: 1.0.0
+name: envoyproxy
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- logs
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/etcd-0.0.1/manifest.yml b/dev/package-beats/etcd-0.0.1/manifest.yml
new file mode 100644
index 000000000..34b727d8d
--- /dev/null
+++ b/dev/package-beats/etcd-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: etcd
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/golang-0.0.1/manifest.yml b/dev/package-beats/golang-0.0.1/manifest.yml
new file mode 100644
index 000000000..b3e0521d9
--- /dev/null
+++ b/dev/package-beats/golang-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: golang
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/googlecloud-0.0.1/manifest.yml b/dev/package-beats/googlecloud-0.0.1/manifest.yml
new file mode 100644
index 000000000..154066812
--- /dev/null
+++ b/dev/package-beats/googlecloud-0.0.1/manifest.yml
@@ -0,0 +1,13 @@
+format_version: 1.0.0
+name: googlecloud
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- logs
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/graphite-0.0.1/manifest.yml b/dev/package-beats/graphite-0.0.1/manifest.yml
new file mode 100644
index 000000000..6d13baf46
--- /dev/null
+++ b/dev/package-beats/graphite-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: graphite
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/haproxy-0.0.1/manifest.yml b/dev/package-beats/haproxy-0.0.1/manifest.yml
new file mode 100644
index 000000000..28d67b210
--- /dev/null
+++ b/dev/package-beats/haproxy-0.0.1/manifest.yml
@@ -0,0 +1,13 @@
+format_version: 1.0.0
+name: haproxy
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- logs
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/http-0.0.1/manifest.yml b/dev/package-beats/http-0.0.1/manifest.yml
new file mode 100644
index 000000000..5df9d6a10
--- /dev/null
+++ b/dev/package-beats/http-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: http
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/ibmmq-0.0.1/manifest.yml b/dev/package-beats/ibmmq-0.0.1/manifest.yml
new file mode 100644
index 000000000..8358edf63
--- /dev/null
+++ b/dev/package-beats/ibmmq-0.0.1/manifest.yml
@@ -0,0 +1,13 @@
+format_version: 1.0.0
+name: ibmmq
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- logs
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/icinga-0.0.1/manifest.yml b/dev/package-beats/icinga-0.0.1/manifest.yml
new file mode 100644
index 000000000..2ef080a0e
--- /dev/null
+++ b/dev/package-beats/icinga-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: icinga
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- logs
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/iis-0.0.1/manifest.yml b/dev/package-beats/iis-0.0.1/manifest.yml
new file mode 100644
index 000000000..03c0c9591
--- /dev/null
+++ b/dev/package-beats/iis-0.0.1/manifest.yml
@@ -0,0 +1,13 @@
+format_version: 1.0.0
+name: iis
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- logs
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/iptables-0.0.1/manifest.yml b/dev/package-beats/iptables-0.0.1/manifest.yml
new file mode 100644
index 000000000..f863ad3dd
--- /dev/null
+++ b/dev/package-beats/iptables-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: iptables
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- logs
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/istio-0.0.1/manifest.yml b/dev/package-beats/istio-0.0.1/manifest.yml
new file mode 100644
index 000000000..02e56fe16
--- /dev/null
+++ b/dev/package-beats/istio-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: istio
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/jolokia-0.0.1/manifest.yml b/dev/package-beats/jolokia-0.0.1/manifest.yml
new file mode 100644
index 000000000..42a4086fd
--- /dev/null
+++ b/dev/package-beats/jolokia-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: jolokia
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/kafka-0.0.1/manifest.yml b/dev/package-beats/kafka-0.0.1/manifest.yml
new file mode 100644
index 000000000..cbd6b8075
--- /dev/null
+++ b/dev/package-beats/kafka-0.0.1/manifest.yml
@@ -0,0 +1,13 @@
+format_version: 1.0.0
+name: kafka
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- logs
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/kibana-0.0.1/manifest.yml b/dev/package-beats/kibana-0.0.1/manifest.yml
new file mode 100644
index 000000000..84b5ca474
--- /dev/null
+++ b/dev/package-beats/kibana-0.0.1/manifest.yml
@@ -0,0 +1,13 @@
+format_version: 1.0.0
+name: kibana
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- logs
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/kubernetes-0.0.1/manifest.yml b/dev/package-beats/kubernetes-0.0.1/manifest.yml
new file mode 100644
index 000000000..27e4a8a2d
--- /dev/null
+++ b/dev/package-beats/kubernetes-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: kubernetes
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/kvm-0.0.1/manifest.yml b/dev/package-beats/kvm-0.0.1/manifest.yml
new file mode 100644
index 000000000..5a9c4f586
--- /dev/null
+++ b/dev/package-beats/kvm-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: kvm
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/logstash-0.0.1/manifest.yml b/dev/package-beats/logstash-0.0.1/manifest.yml
new file mode 100644
index 000000000..787280ecb
--- /dev/null
+++ b/dev/package-beats/logstash-0.0.1/manifest.yml
@@ -0,0 +1,13 @@
+format_version: 1.0.0
+name: logstash
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- logs
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/memcached-0.0.1/manifest.yml b/dev/package-beats/memcached-0.0.1/manifest.yml
new file mode 100644
index 000000000..fc9a49473
--- /dev/null
+++ b/dev/package-beats/memcached-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: memcached
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/misp-0.0.1/manifest.yml b/dev/package-beats/misp-0.0.1/manifest.yml
new file mode 100644
index 000000000..bb67c0b98
--- /dev/null
+++ b/dev/package-beats/misp-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: misp
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- logs
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/mongodb-0.0.1/manifest.yml b/dev/package-beats/mongodb-0.0.1/manifest.yml
new file mode 100644
index 000000000..f0d50c483
--- /dev/null
+++ b/dev/package-beats/mongodb-0.0.1/manifest.yml
@@ -0,0 +1,13 @@
+format_version: 1.0.0
+name: mongodb
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- logs
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/mssql-0.0.1/manifest.yml b/dev/package-beats/mssql-0.0.1/manifest.yml
new file mode 100644
index 000000000..c761a5ae3
--- /dev/null
+++ b/dev/package-beats/mssql-0.0.1/manifest.yml
@@ -0,0 +1,13 @@
+format_version: 1.0.0
+name: mssql
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- logs
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/munin-0.0.1/manifest.yml b/dev/package-beats/munin-0.0.1/manifest.yml
new file mode 100644
index 000000000..c501a2fec
--- /dev/null
+++ b/dev/package-beats/munin-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: munin
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/mysql-0.0.1/manifest.yml b/dev/package-beats/mysql-0.0.1/manifest.yml
new file mode 100644
index 000000000..b903bcc89
--- /dev/null
+++ b/dev/package-beats/mysql-0.0.1/manifest.yml
@@ -0,0 +1,13 @@
+format_version: 1.0.0
+name: mysql
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- logs
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/nats-0.0.1/manifest.yml b/dev/package-beats/nats-0.0.1/manifest.yml
new file mode 100644
index 000000000..bdc61264b
--- /dev/null
+++ b/dev/package-beats/nats-0.0.1/manifest.yml
@@ -0,0 +1,13 @@
+format_version: 1.0.0
+name: nats
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- logs
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/netflow-0.0.1/manifest.yml b/dev/package-beats/netflow-0.0.1/manifest.yml
new file mode 100644
index 000000000..bd9cebbed
--- /dev/null
+++ b/dev/package-beats/netflow-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: netflow
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- logs
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/nginx-0.0.1/manifest.yml b/dev/package-beats/nginx-0.0.1/manifest.yml
new file mode 100644
index 000000000..05cf8dce3
--- /dev/null
+++ b/dev/package-beats/nginx-0.0.1/manifest.yml
@@ -0,0 +1,13 @@
+format_version: 1.0.0
+name: nginx
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- logs
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/oracle-0.0.1/manifest.yml b/dev/package-beats/oracle-0.0.1/manifest.yml
new file mode 100644
index 000000000..c1aa8e94e
--- /dev/null
+++ b/dev/package-beats/oracle-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: oracle
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/osquery-0.0.1/manifest.yml b/dev/package-beats/osquery-0.0.1/manifest.yml
new file mode 100644
index 000000000..9aef1decb
--- /dev/null
+++ b/dev/package-beats/osquery-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: osquery
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- logs
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/panw-0.0.1/manifest.yml b/dev/package-beats/panw-0.0.1/manifest.yml
new file mode 100644
index 000000000..921b27895
--- /dev/null
+++ b/dev/package-beats/panw-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: panw
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- logs
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/php_fpm-0.0.1/manifest.yml b/dev/package-beats/php_fpm-0.0.1/manifest.yml
new file mode 100644
index 000000000..2d70c21a0
--- /dev/null
+++ b/dev/package-beats/php_fpm-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: php_fpm
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/postgresql-0.0.1/manifest.yml b/dev/package-beats/postgresql-0.0.1/manifest.yml
new file mode 100644
index 000000000..048fdd84f
--- /dev/null
+++ b/dev/package-beats/postgresql-0.0.1/manifest.yml
@@ -0,0 +1,13 @@
+format_version: 1.0.0
+name: postgresql
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- logs
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/prometheus-0.0.1/manifest.yml b/dev/package-beats/prometheus-0.0.1/manifest.yml
new file mode 100644
index 000000000..aa43acbdf
--- /dev/null
+++ b/dev/package-beats/prometheus-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: prometheus
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/rabbitmq-0.0.1/manifest.yml b/dev/package-beats/rabbitmq-0.0.1/manifest.yml
new file mode 100644
index 000000000..5f3c4fefa
--- /dev/null
+++ b/dev/package-beats/rabbitmq-0.0.1/manifest.yml
@@ -0,0 +1,13 @@
+format_version: 1.0.0
+name: rabbitmq
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- logs
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/redis-0.0.1/manifest.yml b/dev/package-beats/redis-0.0.1/manifest.yml
new file mode 100644
index 000000000..dd1cdf2ae
--- /dev/null
+++ b/dev/package-beats/redis-0.0.1/manifest.yml
@@ -0,0 +1,13 @@
+format_version: 1.0.0
+name: redis
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- logs
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/redisenterprise-0.0.1/manifest.yml b/dev/package-beats/redisenterprise-0.0.1/manifest.yml
new file mode 100644
index 000000000..c66629b0d
--- /dev/null
+++ b/dev/package-beats/redisenterprise-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: redisenterprise
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/santa-0.0.1/manifest.yml b/dev/package-beats/santa-0.0.1/manifest.yml
new file mode 100644
index 000000000..4b3fc2ace
--- /dev/null
+++ b/dev/package-beats/santa-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: santa
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- logs
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/sql-0.0.1/manifest.yml b/dev/package-beats/sql-0.0.1/manifest.yml
new file mode 100644
index 000000000..7e659f852
--- /dev/null
+++ b/dev/package-beats/sql-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: sql
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/stan-0.0.1/manifest.yml b/dev/package-beats/stan-0.0.1/manifest.yml
new file mode 100644
index 000000000..6021cbeb8
--- /dev/null
+++ b/dev/package-beats/stan-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: stan
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/statsd-0.0.1/manifest.yml b/dev/package-beats/statsd-0.0.1/manifest.yml
new file mode 100644
index 000000000..6c0e51603
--- /dev/null
+++ b/dev/package-beats/statsd-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: statsd
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/suricata-0.0.1/manifest.yml b/dev/package-beats/suricata-0.0.1/manifest.yml
new file mode 100644
index 000000000..150a3204c
--- /dev/null
+++ b/dev/package-beats/suricata-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: suricata
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- logs
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/system-0.0.1/manifest.yml b/dev/package-beats/system-0.0.1/manifest.yml
new file mode 100644
index 000000000..03d59bfdf
--- /dev/null
+++ b/dev/package-beats/system-0.0.1/manifest.yml
@@ -0,0 +1,13 @@
+format_version: 1.0.0
+name: system
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- logs
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/tomcat-0.0.1/manifest.yml b/dev/package-beats/tomcat-0.0.1/manifest.yml
new file mode 100644
index 000000000..034005e79
--- /dev/null
+++ b/dev/package-beats/tomcat-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: tomcat
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/traefik-0.0.1/manifest.yml b/dev/package-beats/traefik-0.0.1/manifest.yml
new file mode 100644
index 000000000..9a2839dd7
--- /dev/null
+++ b/dev/package-beats/traefik-0.0.1/manifest.yml
@@ -0,0 +1,13 @@
+format_version: 1.0.0
+name: traefik
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- logs
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/uwsgi-0.0.1/manifest.yml b/dev/package-beats/uwsgi-0.0.1/manifest.yml
new file mode 100644
index 000000000..fdd03756b
--- /dev/null
+++ b/dev/package-beats/uwsgi-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: uwsgi
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/vsphere-0.0.1/manifest.yml b/dev/package-beats/vsphere-0.0.1/manifest.yml
new file mode 100644
index 000000000..0d1d86b9b
--- /dev/null
+++ b/dev/package-beats/vsphere-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: vsphere
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/windows-0.0.1/manifest.yml b/dev/package-beats/windows-0.0.1/manifest.yml
new file mode 100644
index 000000000..944a9ecea
--- /dev/null
+++ b/dev/package-beats/windows-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: windows
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/zeek-0.0.1/manifest.yml b/dev/package-beats/zeek-0.0.1/manifest.yml
new file mode 100644
index 000000000..e9e268333
--- /dev/null
+++ b/dev/package-beats/zeek-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: zeek
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- logs
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""
diff --git a/dev/package-beats/zookeeper-0.0.1/manifest.yml b/dev/package-beats/zookeeper-0.0.1/manifest.yml
new file mode 100644
index 000000000..581b2adea
--- /dev/null
+++ b/dev/package-beats/zookeeper-0.0.1/manifest.yml
@@ -0,0 +1,12 @@
+format_version: 1.0.0
+name: zookeeper
+version: 0.0.1
+description: ""
+type: integration
+categories:
+- metrics
+requirement:
+  kibana:
+    versions: ""
+download: ""
+path: ""

From 39421d329b222815e03a66dfa549d75bea8967ee Mon Sep 17 00:00:00 2001
From: Marcin Tojek <marcin.tojek@elastic.co>
Date: Wed, 4 Mar 2020 14:53:18 +0100
Subject: [PATCH 5/6] Fix: tests

---
 docs/api/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api/package.json b/docs/api/package.json
index 4f7741dcc..f74c31736 100644
--- a/docs/api/package.json
+++ b/docs/api/package.json
@@ -1,4 +1,5 @@
 {
+  "format_version": "1.0.0",
   "name": "example",
   "title": "Example Integration",
   "version": "1.0.0",
@@ -47,7 +48,6 @@
     "/package/example-1.0.0/dataset/foo/elasticsearch/ingest-pipeline/pipeline-plaintext.json",
     "/package/example-1.0.0/dataset/foo/elasticsearch/ingest-pipeline/pipeline-tcp.json"
   ],
-  "format_version": "1.0.0",
   "datasets": [
     {
       "title": "Foo",

From bf4a5975d786ff98121529adb53457bf596b5caf Mon Sep 17 00:00:00 2001
From: Marcin Tojek <marcin.tojek@elastic.co>
Date: Thu, 5 Mar 2020 09:53:51 +0100
Subject: [PATCH 6/6] Address review comments

---
 dev/import-beats/main.go                             | 4 ++++
 dev/package-beats/activemq-0.0.1/manifest.yml        | 2 --
 dev/package-beats/aerospike-0.0.1/manifest.yml       | 2 --
 dev/package-beats/apache-0.0.1/manifest.yml          | 2 --
 dev/package-beats/apache2-0.0.1/manifest.yml         | 2 --
 dev/package-beats/appsearch-0.0.1/manifest.yml       | 2 --
 dev/package-beats/auditd-0.0.1/manifest.yml          | 2 --
 dev/package-beats/aws-0.0.1/manifest.yml             | 2 --
 dev/package-beats/azure-0.0.1/manifest.yml           | 2 --
 dev/package-beats/beat-0.0.1/manifest.yml            | 2 --
 dev/package-beats/cef-0.0.1/manifest.yml             | 2 --
 dev/package-beats/ceph-0.0.1/manifest.yml            | 2 --
 dev/package-beats/cisco-0.0.1/manifest.yml           | 2 --
 dev/package-beats/cloudfoundry-0.0.1/manifest.yml    | 2 --
 dev/package-beats/cockroachdb-0.0.1/manifest.yml     | 2 --
 dev/package-beats/consul-0.0.1/manifest.yml          | 2 --
 dev/package-beats/coredns-0.0.1/manifest.yml         | 2 --
 dev/package-beats/couchbase-0.0.1/manifest.yml       | 2 --
 dev/package-beats/couchdb-0.0.1/manifest.yml         | 2 --
 dev/package-beats/docker-0.0.1/manifest.yml          | 2 --
 dev/package-beats/dropwizard-0.0.1/manifest.yml      | 2 --
 dev/package-beats/elasticsearch-0.0.1/manifest.yml   | 2 --
 dev/package-beats/envoyproxy-0.0.1/manifest.yml      | 2 --
 dev/package-beats/etcd-0.0.1/manifest.yml            | 2 --
 dev/package-beats/golang-0.0.1/manifest.yml          | 2 --
 dev/package-beats/googlecloud-0.0.1/manifest.yml     | 2 --
 dev/package-beats/graphite-0.0.1/manifest.yml        | 2 --
 dev/package-beats/haproxy-0.0.1/manifest.yml         | 2 --
 dev/package-beats/http-0.0.1/manifest.yml            | 2 --
 dev/package-beats/ibmmq-0.0.1/manifest.yml           | 2 --
 dev/package-beats/icinga-0.0.1/manifest.yml          | 2 --
 dev/package-beats/iis-0.0.1/manifest.yml             | 2 --
 dev/package-beats/iptables-0.0.1/manifest.yml        | 2 --
 dev/package-beats/istio-0.0.1/manifest.yml           | 2 --
 dev/package-beats/jolokia-0.0.1/manifest.yml         | 2 --
 dev/package-beats/kafka-0.0.1/manifest.yml           | 2 --
 dev/package-beats/kibana-0.0.1/manifest.yml          | 2 --
 dev/package-beats/kubernetes-0.0.1/manifest.yml      | 2 --
 dev/package-beats/kvm-0.0.1/manifest.yml             | 2 --
 dev/package-beats/logstash-0.0.1/manifest.yml        | 2 --
 dev/package-beats/memcached-0.0.1/manifest.yml       | 2 --
 dev/package-beats/misp-0.0.1/manifest.yml            | 2 --
 dev/package-beats/mongodb-0.0.1/manifest.yml         | 2 --
 dev/package-beats/mssql-0.0.1/manifest.yml           | 2 --
 dev/package-beats/munin-0.0.1/manifest.yml           | 2 --
 dev/package-beats/mysql-0.0.1/manifest.yml           | 2 --
 dev/package-beats/nats-0.0.1/manifest.yml            | 2 --
 dev/package-beats/netflow-0.0.1/manifest.yml         | 2 --
 dev/package-beats/nginx-0.0.1/manifest.yml           | 2 --
 dev/package-beats/oracle-0.0.1/manifest.yml          | 2 --
 dev/package-beats/osquery-0.0.1/manifest.yml         | 2 --
 dev/package-beats/panw-0.0.1/manifest.yml            | 2 --
 dev/package-beats/php_fpm-0.0.1/manifest.yml         | 2 --
 dev/package-beats/postgresql-0.0.1/manifest.yml      | 2 --
 dev/package-beats/prometheus-0.0.1/manifest.yml      | 2 --
 dev/package-beats/rabbitmq-0.0.1/manifest.yml        | 2 --
 dev/package-beats/redis-0.0.1/manifest.yml           | 2 --
 dev/package-beats/redisenterprise-0.0.1/manifest.yml | 2 --
 dev/package-beats/santa-0.0.1/manifest.yml           | 2 --
 dev/package-beats/sql-0.0.1/manifest.yml             | 2 --
 dev/package-beats/stan-0.0.1/manifest.yml            | 2 --
 dev/package-beats/statsd-0.0.1/manifest.yml          | 2 --
 dev/package-beats/suricata-0.0.1/manifest.yml        | 2 --
 dev/package-beats/system-0.0.1/manifest.yml          | 2 --
 dev/package-beats/tomcat-0.0.1/manifest.yml          | 2 --
 dev/package-beats/traefik-0.0.1/manifest.yml         | 2 --
 dev/package-beats/uwsgi-0.0.1/manifest.yml           | 2 --
 dev/package-beats/vsphere-0.0.1/manifest.yml         | 2 --
 dev/package-beats/windows-0.0.1/manifest.yml         | 2 --
 dev/package-beats/zeek-0.0.1/manifest.yml            | 2 --
 dev/package-beats/zookeeper-0.0.1/manifest.yml       | 2 --
 util/package.go                                      | 4 ++--
 72 files changed, 6 insertions(+), 142 deletions(-)

diff --git a/dev/import-beats/main.go b/dev/import-beats/main.go
index ed7d0ef3c..7fa7a96ac 100644
--- a/dev/import-beats/main.go
+++ b/dev/import-beats/main.go
@@ -30,6 +30,10 @@ func main() {
 	}
 }
 
+// build method visits all beats in beatsDir to collect configuration data for modules.
+// The package-registry groups integrations per target product not per module type. It's opposite to the beats project,
+// where logs and metrics are distributed with different beats (oriented either on logs or metrics - metricbeat,
+// filebeat, etc.).
 func build(beatsDir, outputDir string) error {
 	packages := packageMap{}
 
diff --git a/dev/package-beats/activemq-0.0.1/manifest.yml b/dev/package-beats/activemq-0.0.1/manifest.yml
index b1d74330a..7477cf098 100644
--- a/dev/package-beats/activemq-0.0.1/manifest.yml
+++ b/dev/package-beats/activemq-0.0.1/manifest.yml
@@ -9,5 +9,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/aerospike-0.0.1/manifest.yml b/dev/package-beats/aerospike-0.0.1/manifest.yml
index a6bd3673c..400acbebf 100644
--- a/dev/package-beats/aerospike-0.0.1/manifest.yml
+++ b/dev/package-beats/aerospike-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/apache-0.0.1/manifest.yml b/dev/package-beats/apache-0.0.1/manifest.yml
index 8066ac73f..9739bb628 100644
--- a/dev/package-beats/apache-0.0.1/manifest.yml
+++ b/dev/package-beats/apache-0.0.1/manifest.yml
@@ -9,5 +9,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/apache2-0.0.1/manifest.yml b/dev/package-beats/apache2-0.0.1/manifest.yml
index 7aa11c35d..62635362a 100644
--- a/dev/package-beats/apache2-0.0.1/manifest.yml
+++ b/dev/package-beats/apache2-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/appsearch-0.0.1/manifest.yml b/dev/package-beats/appsearch-0.0.1/manifest.yml
index be524a145..9f17e766a 100644
--- a/dev/package-beats/appsearch-0.0.1/manifest.yml
+++ b/dev/package-beats/appsearch-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/auditd-0.0.1/manifest.yml b/dev/package-beats/auditd-0.0.1/manifest.yml
index a6f098c92..142e45928 100644
--- a/dev/package-beats/auditd-0.0.1/manifest.yml
+++ b/dev/package-beats/auditd-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/aws-0.0.1/manifest.yml b/dev/package-beats/aws-0.0.1/manifest.yml
index f88c0e6be..bde26a115 100644
--- a/dev/package-beats/aws-0.0.1/manifest.yml
+++ b/dev/package-beats/aws-0.0.1/manifest.yml
@@ -9,5 +9,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/azure-0.0.1/manifest.yml b/dev/package-beats/azure-0.0.1/manifest.yml
index daa9d55ec..34aa42af6 100644
--- a/dev/package-beats/azure-0.0.1/manifest.yml
+++ b/dev/package-beats/azure-0.0.1/manifest.yml
@@ -9,5 +9,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/beat-0.0.1/manifest.yml b/dev/package-beats/beat-0.0.1/manifest.yml
index bc9a6cc5c..fce94c1f4 100644
--- a/dev/package-beats/beat-0.0.1/manifest.yml
+++ b/dev/package-beats/beat-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/cef-0.0.1/manifest.yml b/dev/package-beats/cef-0.0.1/manifest.yml
index 29c92cdba..f37474f73 100644
--- a/dev/package-beats/cef-0.0.1/manifest.yml
+++ b/dev/package-beats/cef-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/ceph-0.0.1/manifest.yml b/dev/package-beats/ceph-0.0.1/manifest.yml
index 352300a5f..f990c5f77 100644
--- a/dev/package-beats/ceph-0.0.1/manifest.yml
+++ b/dev/package-beats/ceph-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/cisco-0.0.1/manifest.yml b/dev/package-beats/cisco-0.0.1/manifest.yml
index f969ef159..2e7522040 100644
--- a/dev/package-beats/cisco-0.0.1/manifest.yml
+++ b/dev/package-beats/cisco-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/cloudfoundry-0.0.1/manifest.yml b/dev/package-beats/cloudfoundry-0.0.1/manifest.yml
index 7de9a8d51..279751bc7 100644
--- a/dev/package-beats/cloudfoundry-0.0.1/manifest.yml
+++ b/dev/package-beats/cloudfoundry-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/cockroachdb-0.0.1/manifest.yml b/dev/package-beats/cockroachdb-0.0.1/manifest.yml
index 3022e20a1..21ca25e50 100644
--- a/dev/package-beats/cockroachdb-0.0.1/manifest.yml
+++ b/dev/package-beats/cockroachdb-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/consul-0.0.1/manifest.yml b/dev/package-beats/consul-0.0.1/manifest.yml
index 751e900b1..6a2fc9625 100644
--- a/dev/package-beats/consul-0.0.1/manifest.yml
+++ b/dev/package-beats/consul-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/coredns-0.0.1/manifest.yml b/dev/package-beats/coredns-0.0.1/manifest.yml
index 815197054..0cd98feba 100644
--- a/dev/package-beats/coredns-0.0.1/manifest.yml
+++ b/dev/package-beats/coredns-0.0.1/manifest.yml
@@ -9,5 +9,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/couchbase-0.0.1/manifest.yml b/dev/package-beats/couchbase-0.0.1/manifest.yml
index 878720d3d..b459f9083 100644
--- a/dev/package-beats/couchbase-0.0.1/manifest.yml
+++ b/dev/package-beats/couchbase-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/couchdb-0.0.1/manifest.yml b/dev/package-beats/couchdb-0.0.1/manifest.yml
index fbdebecad..47bdbf929 100644
--- a/dev/package-beats/couchdb-0.0.1/manifest.yml
+++ b/dev/package-beats/couchdb-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/docker-0.0.1/manifest.yml b/dev/package-beats/docker-0.0.1/manifest.yml
index 4aff5ff46..df8ffa1e1 100644
--- a/dev/package-beats/docker-0.0.1/manifest.yml
+++ b/dev/package-beats/docker-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/dropwizard-0.0.1/manifest.yml b/dev/package-beats/dropwizard-0.0.1/manifest.yml
index bacc4ec90..8630c1d7e 100644
--- a/dev/package-beats/dropwizard-0.0.1/manifest.yml
+++ b/dev/package-beats/dropwizard-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/elasticsearch-0.0.1/manifest.yml b/dev/package-beats/elasticsearch-0.0.1/manifest.yml
index 31c1cf7a2..df0f21e82 100644
--- a/dev/package-beats/elasticsearch-0.0.1/manifest.yml
+++ b/dev/package-beats/elasticsearch-0.0.1/manifest.yml
@@ -9,5 +9,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/envoyproxy-0.0.1/manifest.yml b/dev/package-beats/envoyproxy-0.0.1/manifest.yml
index 46e616518..8e3baa7db 100644
--- a/dev/package-beats/envoyproxy-0.0.1/manifest.yml
+++ b/dev/package-beats/envoyproxy-0.0.1/manifest.yml
@@ -9,5 +9,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/etcd-0.0.1/manifest.yml b/dev/package-beats/etcd-0.0.1/manifest.yml
index 34b727d8d..fb53872cc 100644
--- a/dev/package-beats/etcd-0.0.1/manifest.yml
+++ b/dev/package-beats/etcd-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/golang-0.0.1/manifest.yml b/dev/package-beats/golang-0.0.1/manifest.yml
index b3e0521d9..faf745881 100644
--- a/dev/package-beats/golang-0.0.1/manifest.yml
+++ b/dev/package-beats/golang-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/googlecloud-0.0.1/manifest.yml b/dev/package-beats/googlecloud-0.0.1/manifest.yml
index 154066812..2f80c397b 100644
--- a/dev/package-beats/googlecloud-0.0.1/manifest.yml
+++ b/dev/package-beats/googlecloud-0.0.1/manifest.yml
@@ -9,5 +9,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/graphite-0.0.1/manifest.yml b/dev/package-beats/graphite-0.0.1/manifest.yml
index 6d13baf46..d5ef51da3 100644
--- a/dev/package-beats/graphite-0.0.1/manifest.yml
+++ b/dev/package-beats/graphite-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/haproxy-0.0.1/manifest.yml b/dev/package-beats/haproxy-0.0.1/manifest.yml
index 28d67b210..f441b9b15 100644
--- a/dev/package-beats/haproxy-0.0.1/manifest.yml
+++ b/dev/package-beats/haproxy-0.0.1/manifest.yml
@@ -9,5 +9,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/http-0.0.1/manifest.yml b/dev/package-beats/http-0.0.1/manifest.yml
index 5df9d6a10..70067d2f9 100644
--- a/dev/package-beats/http-0.0.1/manifest.yml
+++ b/dev/package-beats/http-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/ibmmq-0.0.1/manifest.yml b/dev/package-beats/ibmmq-0.0.1/manifest.yml
index 8358edf63..a917d044a 100644
--- a/dev/package-beats/ibmmq-0.0.1/manifest.yml
+++ b/dev/package-beats/ibmmq-0.0.1/manifest.yml
@@ -9,5 +9,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/icinga-0.0.1/manifest.yml b/dev/package-beats/icinga-0.0.1/manifest.yml
index 2ef080a0e..26bb0caa9 100644
--- a/dev/package-beats/icinga-0.0.1/manifest.yml
+++ b/dev/package-beats/icinga-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/iis-0.0.1/manifest.yml b/dev/package-beats/iis-0.0.1/manifest.yml
index 03c0c9591..b650c1c86 100644
--- a/dev/package-beats/iis-0.0.1/manifest.yml
+++ b/dev/package-beats/iis-0.0.1/manifest.yml
@@ -9,5 +9,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/iptables-0.0.1/manifest.yml b/dev/package-beats/iptables-0.0.1/manifest.yml
index f863ad3dd..f16e6f06c 100644
--- a/dev/package-beats/iptables-0.0.1/manifest.yml
+++ b/dev/package-beats/iptables-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/istio-0.0.1/manifest.yml b/dev/package-beats/istio-0.0.1/manifest.yml
index 02e56fe16..c829fad26 100644
--- a/dev/package-beats/istio-0.0.1/manifest.yml
+++ b/dev/package-beats/istio-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/jolokia-0.0.1/manifest.yml b/dev/package-beats/jolokia-0.0.1/manifest.yml
index 42a4086fd..aa87855e8 100644
--- a/dev/package-beats/jolokia-0.0.1/manifest.yml
+++ b/dev/package-beats/jolokia-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/kafka-0.0.1/manifest.yml b/dev/package-beats/kafka-0.0.1/manifest.yml
index cbd6b8075..3881a9fde 100644
--- a/dev/package-beats/kafka-0.0.1/manifest.yml
+++ b/dev/package-beats/kafka-0.0.1/manifest.yml
@@ -9,5 +9,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/kibana-0.0.1/manifest.yml b/dev/package-beats/kibana-0.0.1/manifest.yml
index 84b5ca474..7cbdb1364 100644
--- a/dev/package-beats/kibana-0.0.1/manifest.yml
+++ b/dev/package-beats/kibana-0.0.1/manifest.yml
@@ -9,5 +9,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/kubernetes-0.0.1/manifest.yml b/dev/package-beats/kubernetes-0.0.1/manifest.yml
index 27e4a8a2d..f4706b0e2 100644
--- a/dev/package-beats/kubernetes-0.0.1/manifest.yml
+++ b/dev/package-beats/kubernetes-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/kvm-0.0.1/manifest.yml b/dev/package-beats/kvm-0.0.1/manifest.yml
index 5a9c4f586..aede62cad 100644
--- a/dev/package-beats/kvm-0.0.1/manifest.yml
+++ b/dev/package-beats/kvm-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/logstash-0.0.1/manifest.yml b/dev/package-beats/logstash-0.0.1/manifest.yml
index 787280ecb..3ca1b6f80 100644
--- a/dev/package-beats/logstash-0.0.1/manifest.yml
+++ b/dev/package-beats/logstash-0.0.1/manifest.yml
@@ -9,5 +9,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/memcached-0.0.1/manifest.yml b/dev/package-beats/memcached-0.0.1/manifest.yml
index fc9a49473..6310516e4 100644
--- a/dev/package-beats/memcached-0.0.1/manifest.yml
+++ b/dev/package-beats/memcached-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/misp-0.0.1/manifest.yml b/dev/package-beats/misp-0.0.1/manifest.yml
index bb67c0b98..967141cb9 100644
--- a/dev/package-beats/misp-0.0.1/manifest.yml
+++ b/dev/package-beats/misp-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/mongodb-0.0.1/manifest.yml b/dev/package-beats/mongodb-0.0.1/manifest.yml
index f0d50c483..169011989 100644
--- a/dev/package-beats/mongodb-0.0.1/manifest.yml
+++ b/dev/package-beats/mongodb-0.0.1/manifest.yml
@@ -9,5 +9,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/mssql-0.0.1/manifest.yml b/dev/package-beats/mssql-0.0.1/manifest.yml
index c761a5ae3..bd68b32db 100644
--- a/dev/package-beats/mssql-0.0.1/manifest.yml
+++ b/dev/package-beats/mssql-0.0.1/manifest.yml
@@ -9,5 +9,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/munin-0.0.1/manifest.yml b/dev/package-beats/munin-0.0.1/manifest.yml
index c501a2fec..f547a3dd9 100644
--- a/dev/package-beats/munin-0.0.1/manifest.yml
+++ b/dev/package-beats/munin-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/mysql-0.0.1/manifest.yml b/dev/package-beats/mysql-0.0.1/manifest.yml
index b903bcc89..40240c255 100644
--- a/dev/package-beats/mysql-0.0.1/manifest.yml
+++ b/dev/package-beats/mysql-0.0.1/manifest.yml
@@ -9,5 +9,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/nats-0.0.1/manifest.yml b/dev/package-beats/nats-0.0.1/manifest.yml
index bdc61264b..7e2384fb2 100644
--- a/dev/package-beats/nats-0.0.1/manifest.yml
+++ b/dev/package-beats/nats-0.0.1/manifest.yml
@@ -9,5 +9,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/netflow-0.0.1/manifest.yml b/dev/package-beats/netflow-0.0.1/manifest.yml
index bd9cebbed..053362ab1 100644
--- a/dev/package-beats/netflow-0.0.1/manifest.yml
+++ b/dev/package-beats/netflow-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/nginx-0.0.1/manifest.yml b/dev/package-beats/nginx-0.0.1/manifest.yml
index 05cf8dce3..f6ec2d911 100644
--- a/dev/package-beats/nginx-0.0.1/manifest.yml
+++ b/dev/package-beats/nginx-0.0.1/manifest.yml
@@ -9,5 +9,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/oracle-0.0.1/manifest.yml b/dev/package-beats/oracle-0.0.1/manifest.yml
index c1aa8e94e..bb81ce306 100644
--- a/dev/package-beats/oracle-0.0.1/manifest.yml
+++ b/dev/package-beats/oracle-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/osquery-0.0.1/manifest.yml b/dev/package-beats/osquery-0.0.1/manifest.yml
index 9aef1decb..813ab8761 100644
--- a/dev/package-beats/osquery-0.0.1/manifest.yml
+++ b/dev/package-beats/osquery-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/panw-0.0.1/manifest.yml b/dev/package-beats/panw-0.0.1/manifest.yml
index 921b27895..26bcd5c39 100644
--- a/dev/package-beats/panw-0.0.1/manifest.yml
+++ b/dev/package-beats/panw-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/php_fpm-0.0.1/manifest.yml b/dev/package-beats/php_fpm-0.0.1/manifest.yml
index 2d70c21a0..787c66039 100644
--- a/dev/package-beats/php_fpm-0.0.1/manifest.yml
+++ b/dev/package-beats/php_fpm-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/postgresql-0.0.1/manifest.yml b/dev/package-beats/postgresql-0.0.1/manifest.yml
index 048fdd84f..2830af560 100644
--- a/dev/package-beats/postgresql-0.0.1/manifest.yml
+++ b/dev/package-beats/postgresql-0.0.1/manifest.yml
@@ -9,5 +9,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/prometheus-0.0.1/manifest.yml b/dev/package-beats/prometheus-0.0.1/manifest.yml
index aa43acbdf..910cbe8e8 100644
--- a/dev/package-beats/prometheus-0.0.1/manifest.yml
+++ b/dev/package-beats/prometheus-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/rabbitmq-0.0.1/manifest.yml b/dev/package-beats/rabbitmq-0.0.1/manifest.yml
index 5f3c4fefa..e3d1f7be8 100644
--- a/dev/package-beats/rabbitmq-0.0.1/manifest.yml
+++ b/dev/package-beats/rabbitmq-0.0.1/manifest.yml
@@ -9,5 +9,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/redis-0.0.1/manifest.yml b/dev/package-beats/redis-0.0.1/manifest.yml
index dd1cdf2ae..316ccde86 100644
--- a/dev/package-beats/redis-0.0.1/manifest.yml
+++ b/dev/package-beats/redis-0.0.1/manifest.yml
@@ -9,5 +9,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/redisenterprise-0.0.1/manifest.yml b/dev/package-beats/redisenterprise-0.0.1/manifest.yml
index c66629b0d..75205e83d 100644
--- a/dev/package-beats/redisenterprise-0.0.1/manifest.yml
+++ b/dev/package-beats/redisenterprise-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/santa-0.0.1/manifest.yml b/dev/package-beats/santa-0.0.1/manifest.yml
index 4b3fc2ace..c795aa004 100644
--- a/dev/package-beats/santa-0.0.1/manifest.yml
+++ b/dev/package-beats/santa-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/sql-0.0.1/manifest.yml b/dev/package-beats/sql-0.0.1/manifest.yml
index 7e659f852..cdaf303f6 100644
--- a/dev/package-beats/sql-0.0.1/manifest.yml
+++ b/dev/package-beats/sql-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/stan-0.0.1/manifest.yml b/dev/package-beats/stan-0.0.1/manifest.yml
index 6021cbeb8..58f8fdc2b 100644
--- a/dev/package-beats/stan-0.0.1/manifest.yml
+++ b/dev/package-beats/stan-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/statsd-0.0.1/manifest.yml b/dev/package-beats/statsd-0.0.1/manifest.yml
index 6c0e51603..dc2101c13 100644
--- a/dev/package-beats/statsd-0.0.1/manifest.yml
+++ b/dev/package-beats/statsd-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/suricata-0.0.1/manifest.yml b/dev/package-beats/suricata-0.0.1/manifest.yml
index 150a3204c..ed4b28f6d 100644
--- a/dev/package-beats/suricata-0.0.1/manifest.yml
+++ b/dev/package-beats/suricata-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/system-0.0.1/manifest.yml b/dev/package-beats/system-0.0.1/manifest.yml
index 03d59bfdf..b69f7cf3b 100644
--- a/dev/package-beats/system-0.0.1/manifest.yml
+++ b/dev/package-beats/system-0.0.1/manifest.yml
@@ -9,5 +9,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/tomcat-0.0.1/manifest.yml b/dev/package-beats/tomcat-0.0.1/manifest.yml
index 034005e79..3a12cbeb6 100644
--- a/dev/package-beats/tomcat-0.0.1/manifest.yml
+++ b/dev/package-beats/tomcat-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/traefik-0.0.1/manifest.yml b/dev/package-beats/traefik-0.0.1/manifest.yml
index 9a2839dd7..0d7ae6f26 100644
--- a/dev/package-beats/traefik-0.0.1/manifest.yml
+++ b/dev/package-beats/traefik-0.0.1/manifest.yml
@@ -9,5 +9,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/uwsgi-0.0.1/manifest.yml b/dev/package-beats/uwsgi-0.0.1/manifest.yml
index fdd03756b..3d72eb89a 100644
--- a/dev/package-beats/uwsgi-0.0.1/manifest.yml
+++ b/dev/package-beats/uwsgi-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/vsphere-0.0.1/manifest.yml b/dev/package-beats/vsphere-0.0.1/manifest.yml
index 0d1d86b9b..9dfe27e8b 100644
--- a/dev/package-beats/vsphere-0.0.1/manifest.yml
+++ b/dev/package-beats/vsphere-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/windows-0.0.1/manifest.yml b/dev/package-beats/windows-0.0.1/manifest.yml
index 944a9ecea..b8d7156ac 100644
--- a/dev/package-beats/windows-0.0.1/manifest.yml
+++ b/dev/package-beats/windows-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/zeek-0.0.1/manifest.yml b/dev/package-beats/zeek-0.0.1/manifest.yml
index e9e268333..c319bd111 100644
--- a/dev/package-beats/zeek-0.0.1/manifest.yml
+++ b/dev/package-beats/zeek-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/dev/package-beats/zookeeper-0.0.1/manifest.yml b/dev/package-beats/zookeeper-0.0.1/manifest.yml
index 581b2adea..44b89a576 100644
--- a/dev/package-beats/zookeeper-0.0.1/manifest.yml
+++ b/dev/package-beats/zookeeper-0.0.1/manifest.yml
@@ -8,5 +8,3 @@ categories:
 requirement:
   kibana:
     versions: ""
-download: ""
-path: ""
diff --git a/util/package.go b/util/package.go
index b6ddb3839..6ff909b62 100644
--- a/util/package.go
+++ b/util/package.go
@@ -43,8 +43,8 @@ type Package struct {
 	Internal      bool         `config:"internal,omitempty" json:"internal,omitempty" yaml:"internal,omitempty"`
 	DataSets      []*DataSet   `config:"datasets,omitempty" json:"datasets,omitempty" yaml:"datasets,omitempty"`
 	Datasources   []Datasource `config:"datasources,omitempty" json:"datasources,omitempty" yaml:"datasources,omitempty"`
-	Download      string       `json:"download"`
-	Path          string       `json:"path"`
+	Download      string       `json:"download" yaml:"download,omitempty"`
+	Path          string       `json:"path" yaml:"path,omitempty"`
 }
 
 type Datasource struct {