[Enhancement] extract the correct body if s3 notify via SNS->SQS #25492
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
botelastic
bot
added
the
needs_team
christianherweg0807
changed the title
💔 Build Failed
Expand to view the summary
Build stats
Trends 🧪Steps errors
Expand to view the steps failures
|
|
Pinging @elastic/integrations (Team:Integrations) |
botelastic
bot
removed
the
needs_team
6 tasks
test(x-pack/filebeat): add unit test for s3-sns-sqs
christianherweg0807
changed the title
|
Now we´ve added the tests. Ready for review. Sorry for the delay. |
kaiyan-sheng
reviewed
Jun 8, 2021
kaiyan-sheng
added
the
needs_backport
|
Added a simple line to the changelog. Any other documentation needed? |
|
Anything, I could do here? @kaiyan-sheng |
| } | ||
| if err := json.Unmarshal([]byte(*m.Body), &bodyJSON); err == nil && bodyJSON.TopicArn != "" { | ||
| err := json.Unmarshal([]byte(bodyJSON.Message), &msg) | ||
| if err != nil { |
There was a problem hiding this comment.
Seems like these two error checks have duplicate code, could you simplify this part please?
There was a problem hiding this comment.
Deduplicated this. You are right...
|
@christianherweg0807 Sorry for the delay on this!! Thank you for your contribution. With this change, does that mean users can setup S3 bucket to create and subscribe to an SNS topic? |
|
Before this change filebeat only supports this setup: regards |
|
Thank you @christianherweg0807 so much for the information! I think this is a great addition to s3 input, maybe we should also add more in the documentation? |
|
This pull request is now in conflicts. Could you fix it? 🙏 |
kaiyan-sheng
added
needs_integration_sync
|
/test |
|
seems like CI is not happy, maybe you need |
|
Sorry, i missed a variable scope... |
|
/test |
|
@christianherweg0807 Hmm seems like CI is not happy with go.sum? |
|
This pull request is now in conflicts. Could you fix it? 🙏 |
|
@christianherweg0807 Hi sorry you have to deal with the conflict because there were two big prs got merged for s3 input. |
|
Love the work, Any traction on this PR by chance? For me it seems like converting msg to |
6 tasks
|
@christianherweg0807 Thank you so much for your initiative on this!! I'm closing this PR and will use #28800 to continue to work. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
This PR parses the SQS Message Body and tries to match to a SNS Message Structure. If BodyJSON.TopicArn is not empty, it delivers the bodyJSON.Message as body instead of m.Body.
Use cases
Configless detections of S3 notifications delivered via SNS to a SQS Queue.