Skip to content

Commit

Permalink
Merge branch 'master' into bugfix/libbeat/omit-index-template-from-err
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewkroh authored Jun 14, 2021
2 parents 017d150 + 2ebf83e commit b1865f9
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Fix ILM alias creation when write alias exists and initial index does not exist {pull}26143[26143]
- Include date separator in the filename prefix of `dateRotator` to make sure nothing gets purged accidentally {pull}26176[26176]
- Omit full index template from errors that occur while loading the template. {pull}25743[25743]
- In the script processor, the `decode_xml` and `decode_xml_wineventlog` processors are now available as `DecodeXML` and `DecodeXMLWineventlog` respectively.

*Auditbeat*

Expand Down
2 changes: 1 addition & 1 deletion libbeat/processors/decode_xml/decode_xml.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ func init() {
"to_lower", "ignore_missing",
"ignore_failure",
)))
jsprocessor.RegisterPlugin(procName, New)
jsprocessor.RegisterPlugin("DecodeXML", New)
}

// New constructs a new decode_xml processor.
Expand Down
2 changes: 1 addition & 1 deletion libbeat/processors/decode_xml_wineventlog/processor.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func init() {
"overwrite_keys", "map_ecs_fields",
"ignore_missing", "ignore_failure",
)))
jsprocessor.RegisterPlugin(procName, New)
jsprocessor.RegisterPlugin("DecodeXMLWineventlog", New)
}

type processor struct {
Expand Down

0 comments on commit b1865f9

Please sign in to comment.