Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Aug 13, 2025

Proposed commit message

x-pack/filebeat/input/httpjson: allow template termination without logging error

This adds a terminate helper that can be used to signal that a template
should terminate without an error. The termination can (should) be used
to report the reason for the termination which will be logged at DEBUG
level, but otherwise ignored.

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.

Disruptive User Impact

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs


This is an automatic backport of pull request #45810 done by [Mergify](https://mergify.com).

…gging error (#45810)

This adds a terminate helper that can be used to signal that a template
should terminate without an error. The termination can (should) be used
to report the reason for the termination which will be logged at DEBUG
level, but otherwise ignored.

(cherry picked from commit f324f29)

# Conflicts:
#	docs/reference/filebeat/filebeat-input-httpjson.md
#	x-pack/filebeat/input/httpjson/value_tpl.go
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Aug 13, 2025
@mergify mergify bot requested review from a team as code owners August 13, 2025 20:58
@mergify mergify bot assigned efd6 Aug 13, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Aug 13, 2025

Cherry-pick of f324f29 has failed:

On branch mergify/bp/8.18/pr-45810
Your branch is up to date with 'origin/8.18'.

You are currently cherry-picking commit f324f295a.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   CHANGELOG.next.asciidoc
	modified:   x-pack/filebeat/input/httpjson/request.go
	modified:   x-pack/filebeat/input/httpjson/value_tpl_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   docs/reference/filebeat/filebeat-input-httpjson.md
	both modified:   x-pack/filebeat/input/httpjson/value_tpl.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot requested review from leehinman and rdner and removed request for a team August 13, 2025 20:58
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Aug 13, 2025
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Aug 13, 2025
@elasticmachine
Copy link
Collaborator

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

@leehinman
Copy link
Contributor

@efd6 FYI looks like the backport needs some help

@mergify
Copy link
Contributor Author

mergify bot commented Aug 18, 2025

This pull request has not been merged yet. Could you please review and merge it @efd6? 🙏

@efd6 efd6 enabled auto-merge (squash) August 19, 2025 07:29
@efd6 efd6 disabled auto-merge August 19, 2025 07:29
@efd6 efd6 enabled auto-merge (squash) August 19, 2025 07:29
@efd6 efd6 merged commit 84da73d into 8.18 Aug 19, 2025
22 of 25 checks passed
@efd6 efd6 deleted the mergify/bp/8.18/pr-45810 branch August 19, 2025 09:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport bugfix conflicts There is a conflict in the backported pull request enhancement Filebeat Filebeat Team:Security-Service Integrations Security Service Integrations Team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants