Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

x-pack/filebeat/input/{cel,websocket}: prevent addition of regexp extension when no patterns are provided #38181

Merged
merged 1 commit into from
Mar 6, 2024

Conversation

efd6
Copy link
Contributor

@efd6 efd6 commented Mar 4, 2024

Proposed commit message

In the case of cel, the extension was always being added, and then was conditionally added when a pattern was configured, resulting in a failed configuration. In the case of websocket the conditional addition was not being performed, so no failure occured, but additional look-up load was being added. So unify the approaches to the correct conditional addition.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs

@efd6 efd6 added Filebeat Filebeat bugfix Team:Security-Service Integrations Security Service Integrations Team 8.13-candidate backport-v8.13.0 Automated backport with mergify labels Mar 4, 2024
@efd6 efd6 self-assigned this Mar 4, 2024
@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Mar 4, 2024
…ention when no patterns are provided

In the case of cel, the extension was always being added, and then was
conditionally added when a pattern was configured, resulting in an
failed configuration. In the case of websocket the conditional addition
was not being performed, so no failure occured, but additional look-up
load was being added. So unify the approaches to the correct conditional
addition.
@elasticmachine
Copy link
Collaborator

💚 Build Succeeded

cc @efd6

@elasticmachine
Copy link
Collaborator

💚 Build Succeeded

cc @efd6

@elasticmachine
Copy link
Collaborator

💚 Build Succeeded

cc @efd6

@elasticmachine
Copy link
Collaborator

💚 Build Succeeded

cc @efd6

@elasticmachine
Copy link
Collaborator

💚 Build Succeeded

cc @efd6

@elasticmachine
Copy link
Collaborator

💚 Build Succeeded

cc @efd6

@elasticmachine
Copy link
Collaborator

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Duration: 136 min 46 sec

❕ Flaky test report

No test was executed to be analysed.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@efd6 efd6 marked this pull request as ready for review March 5, 2024 01:01
@efd6 efd6 requested a review from a team as a code owner March 5, 2024 01:01
@elasticmachine
Copy link
Collaborator

Pinging @elastic/security-service-integrations (Team:Security-Service Integrations)

@efd6 efd6 changed the title x-pack/filebeat/input/{cel,websocket}: prevent addition of regexp extention when no patterns are provided x-pack/filebeat/input/{cel,websocket}: prevent addition of regexp extension when no patterns are provided Mar 5, 2024
@efd6 efd6 merged commit 0797a64 into elastic:main Mar 6, 2024
34 of 39 checks passed
mergify bot pushed a commit that referenced this pull request Mar 6, 2024
…ension when no patterns are provided (#38181)

In the case of cel, the extension was always being added, and then was
conditionally added when a pattern was configured, resulting in a failed
configuration. In the case of websocket the conditional addition was not
being performed, so no failure occurred, but additional look-up load was
being added. So unify the approaches to the correct conditional addition.

(cherry picked from commit 0797a64)
efd6 added a commit that referenced this pull request Mar 6, 2024
…ension when no patterns are provided (#38181) (#38192)

In the case of cel, the extension was always being added, and then was
conditionally added when a pattern was configured, resulting in a failed
configuration. In the case of websocket the conditional addition was not
being performed, so no failure occurred, but additional look-up load was
being added. So unify the approaches to the correct conditional addition.

(cherry picked from commit 0797a64)

Co-authored-by: Dan Kortschak <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
8.13-candidate backport-v8.13.0 Automated backport with mergify bugfix Filebeat Filebeat Team:Security-Service Integrations Security Service Integrations Team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants