Generate fields for APM package

Makefile

@@ -7,6 +7,7 @@ export GO111MODULE=on
 
 GOOSBUILD=./build/$(shell go env GOOS)
 APPROVALS=$(GOOSBUILD)/approvals
+GENPACKAGE=$(GOOSBUILD)/genpackage
 GOIMPORTS=$(GOOSBUILD)/goimports
 GOLICENSER=$(GOOSBUILD)/go-licenser
 GOLINT=$(GOOSBUILD)/golint
@@ -75,6 +76,10 @@ check-approvals: $(APPROVALS)
 check: $(MAGE) check-headers
 	@$(MAGE) check
 
+.PHONY: gen-package
+gen-package: $(GENPACKAGE)
+	@$(GENPACKAGE)
+
 .PHONY: bench
 bench:
 	@go test -benchmem -run=XXX -benchtime=100ms -bench='.*' ./...
@@ -105,7 +110,7 @@ docker-compose.override.yml:
 # Rules for updating config files, fields.yml, etc.
 ##############################################################################
 
-update: fields go-generate add-headers copy-docs notice $(MAGE)
+update: fields gen-package go-generate add-headers copy-docs notice $(MAGE)
 	@$(MAGE) update
 
 fields_sources=\
@@ -247,6 +252,11 @@ $(MAGE): magefile.go $(BIN_MAGE)
 $(STATICCHECK): go.mod
 	go build -o $@ honnef.co/go/tools/cmd/staticcheck
 
+.PHONY: $(GENPACKAGE)
+$(GENPACKAGE):
+	@go build -o $@ github.com/elastic/apm-server/apmpackage/cmd/gen-package
+
+
 $(GOLINT): go.mod
 	go build -o $@ golang.org/x/lint/golint
 

NOTICE.txt

@@ -639,7 +639,7 @@ Contents of "LICENSE":
 --------------------------------------------------------------------
 Dependency: github.com/elastic/beats/v7
 Version: v7.0.0
-Revision: 0fda3061815d
+Revision: 633285e75a03
 License type (autodetected): Apache-2.0
 
 --------------------------------------------------------------------
@@ -976,7 +976,8 @@ License type (autodetected): Apache-2.0
 
 --------------------------------------------------------------------
 Dependency: github.com/elastic/go-ucfg
-Version: v0.8.3
+Version: v0.8.4
+Revision: 1232bd4774a6
 License type (autodetected): Apache-2.0
 
 --------------------------------------------------------------------
@@ -993,7 +994,8 @@ Contents of "NOTICE.txt":
 
 --------------------------------------------------------------------
 Dependency: github.com/elastic/gosigar
-Version: v0.12.0
+Version: v0.10.6
+Revision: f115143bb233
 License type (autodetected): Apache-2.0
 Contents of "NOTICE":
 
@@ -1009,7 +1011,7 @@ Contents of "NOTICE":
 
 --------------------------------------------------------------------
 Dependency: github.com/fatih/color
-Version: v1.10.0
+Version: v1.9.0
 License type (autodetected): MIT
 Contents of "LICENSE.md":
 
@@ -3571,7 +3573,8 @@ License type (autodetected): Apache-2.0
 
 --------------------------------------------------------------------
 Dependency: go.elastic.co/apm
-Version: v1.9.0
+Version: v1.8.1
+Revision: 2aef45b9cf4b
 License type (autodetected): Apache-2.0
 Contents of "NOTICE":
 
@@ -3902,7 +3905,7 @@ Contents of "LICENSE":
 
 --------------------------------------------------------------------
 Dependency: golang.org/x/net
-Revision: 69a78807bb2b
+Revision: 942e2f445f3c
 License type (autodetected): BSD-3-Clause
 Contents of "LICENSE":
 
@@ -4004,7 +4007,7 @@ Contents of "LICENSE":
 
 --------------------------------------------------------------------
 Dependency: golang.org/x/sys
-Revision: 5cba982894dd
+Revision: 201ba4db2418
 License type (autodetected): BSD-3-Clause
 Contents of "LICENSE":
 

README.md

@@ -75,6 +75,21 @@ To generate required configuration files and templates run:
 make update
 ```
 
+### Generate package
+
+APM-Server includes a script to generate an integration package to run with Fleet.
+To Generate a package run:
+
+```
+make fields gen-package
+```
+
+That command takes the existing `fields.yml` files and split them into `ecs.yml` and `fields.yml` files for each data stream type.
+It also generates a `README.md` with a field reference that will be shown in the integration package.
+
+After generating a package, `apmpackage/apm` should be manually copied to `elastic/integrations`.
+Then follow instructions in https://github.com/elastic/integrations/blob/master/CONTRIBUTING.md.
+
 ### Cleanup
 
 To clean APM Server source code, run the following commands:

apmpackage/apm/0.1.0/data_stream/logs/fields/base-fields.yml

@@ -0,0 +1,12 @@
+- name: '@timestamp'
+  type: date
+  description: Event timestamp.
+- name: data_stream.type
+  type: constant_keyword
+  description: Data stream type.
+- name: data_stream.dataset
+  type: constant_keyword
+  description: Data stream dataset.
+- name: data_stream.namespace
+  type: constant_keyword
+  description: Data stream namespace.