From 050cbf5a16819c9a06d2e743f4b9a42b230ea60d Mon Sep 17 00:00:00 2001 From: ShourieG <105607378+ShourieG@users.noreply.github.com> Date: Mon, 2 Oct 2023 16:05:59 +0530 Subject: [PATCH] [filebeat][azure-blob-storage] - Cleaned up documentation errors & fixed a minor bug. (#36714) * fixed a logical bug, updated docs * updated changelog --- CHANGELOG-developer.next.asciidoc | 1 + x-pack/filebeat/docs/inputs/input-azure-blob-storage.asciidoc | 2 +- x-pack/filebeat/input/azureblobstorage/job.go | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG-developer.next.asciidoc b/CHANGELOG-developer.next.asciidoc index cc84570d5d7..f5814e700d6 100644 --- a/CHANGELOG-developer.next.asciidoc +++ b/CHANGELOG-developer.next.asciidoc @@ -89,6 +89,7 @@ The list below covers the major changes between 7.0.0-rc2 and main only. - Fixed some race conditions in tests {pull}36185[36185] - Re-enable HTTPJSON fixed flakey test. {issue}34929[34929] {pull}36525[36525] - Make winlogbeat/sys/wineventlog follow the unsafe.Pointer rules. {pull}36650[36650] +- Cleaned up documentation errors & fixed a minor bug in Filebeat Azure blob storage input. {pull}36714[36714] ==== Added diff --git a/x-pack/filebeat/docs/inputs/input-azure-blob-storage.asciidoc b/x-pack/filebeat/docs/inputs/input-azure-blob-storage.asciidoc index 9208a1ce611..91d21c6c4ff 100644 --- a/x-pack/filebeat/docs/inputs/input-azure-blob-storage.asciidoc +++ b/x-pack/filebeat/docs/inputs/input-azure-blob-storage.asciidoc @@ -237,7 +237,7 @@ filebeat.inputs: containers: - name: container_1 file_selectors: - - regex: '/CloudTrail/' + - regex: '/Monitoring/' - regex: 'docs/' - regex: '/Security-Logs/' ---- diff --git a/x-pack/filebeat/input/azureblobstorage/job.go b/x-pack/filebeat/input/azureblobstorage/job.go index 77dbe1ed882..ae1c2c1e617 100644 --- a/x-pack/filebeat/input/azureblobstorage/job.go +++ b/x-pack/filebeat/input/azureblobstorage/job.go @@ -175,6 +175,7 @@ func (j *job) readJsonAndPublish(ctx context.Context, r io.Reader, id string) er if err := j.splitEventList(j.src.ExpandEventListFromField, item, offset, j.hash, id); err != nil { return err } + continue } data, err := item.MarshalJSON()