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

ChrsMark · ChrsMark · commit 55fc2315435e · 2021-02-01T10:09:11.000+02:00
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -981,6 +981,10 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Provide more ways to set AWS credentials. {issue}12464[12464] {pull}23344[23344]
 - Add support for multiple regions {pull}21065[21065]
 
+*Heartbeat*
+
+- Add support for script processor. {pull}23229[23229]
+
 *Winlogbeat*
 
 - Add more DNS error codes to the Sysmon module. {issue}15685[15685]
diff --git a/heartbeat/beater/heartbeat.go b/heartbeat/beater/heartbeat.go
@@ -36,6 +36,8 @@ import (
 	"github.com/elastic/beats/v7/libbeat/common/reload"
 	"github.com/elastic/beats/v7/libbeat/logp"
 	"github.com/elastic/beats/v7/libbeat/management"
+
+	_ "github.com/elastic/beats/v7/libbeat/processors/script"
 )
 
 // Heartbeat represents the root datastructure of this beat.
diff --git a/heartbeat/docs/index.asciidoc b/heartbeat/docs/index.asciidoc
@@ -24,7 +24,6 @@ include::{asciidoc-dir}/../../shared/attributes.asciidoc[]
 :no_dashboards:
 :no_decode_cef_processor:
 :no_decode_csv_fields_processor:
-:no_script_processor:
 :no_timestamp_processor:
 
 include::{libbeat-dir}/shared-beats-attributes.asciidoc[]

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,8 @@ import (`
`36`	`36`	`"github.com/elastic/beats/v7/libbeat/common/reload"`
`37`	`37`	`"github.com/elastic/beats/v7/libbeat/logp"`
`38`	`38`	`"github.com/elastic/beats/v7/libbeat/management"`
	`39`	`+`
	`40`	`+ _ "github.com/elastic/beats/v7/libbeat/processors/script"`
`39`	`41`	`)`
`40`	`42`
`41`	`43`	`// Heartbeat represents the root datastructure of this beat.`