Merge remote-tracking branch 'upstream/master' into rds_dashboard

Author: kaiyan-sheng

go.mod

@@ -4,8 +4,8 @@ go 1.16
 
 require (
 github.com/blang/semver v3.5.1+incompatible
-github.com/elastic/elastic-package v0.14.3
-github.com/elastic/package-registry v0.20.0
+github.com/elastic/elastic-package v0.16.0
+github.com/elastic/package-registry v1.0.0
 github.com/magefile/mage v1.11.0
 github.com/pkg/errors v0.9.1
 github.com/stretchr/testify v1.7.0

go.sum

@@ -0,0 +1,3 @@
+dependencies:
+ ecs:
+ reference: git@1.11

packages/apache/_dev/build/build.yml

@@ -1,4 +1,9 @@
 # newer versions go on top
+- version: "0.9.2"
+ changes:
+ - description: Convert to generated ECS fields
+ type: enhancement
+ link: https://github.com/elastic/integrations/pull/1463
 - version: '0.9.1'
  changes:
  - description: update to ECS 1.11.0

packages/apache/changelog.yml

@@ -196,3 +196,9 @@
  description: >
  OS codename, if any.
 
+- name: input.type
+ type: keyword
+ description: Input type
+- name: log.offset
+ type: long
+ description: Log offset