Skip to content

[9.0](backport #46332) x-pack/filebeat/input/httpjson: improve/fix logic for health status updates#46400

Merged
efd6 merged 3 commits into9.0from
mergify/bp/9.0/pr-46332
Sep 5, 2025
Merged

[9.0](backport #46332) x-pack/filebeat/input/httpjson: improve/fix logic for health status updates#46400
efd6 merged 3 commits into9.0from
mergify/bp/9.0/pr-46332

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Sep 5, 2025

Proposed commit message

x-pack/filebeat/input/httpjson: improve/fix logic for health status updates

There was no way to ask the input to not report degraded health in the
case that a template error was required to signal that some aspect of
the input's operation should terminate, outside of the template itself.
This change fixes that.

Also fix buggy cursor template tests that were identified by this
improvement.

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 #46332 done by [Mergify](https://mergify.com).
…pdates (#46332)

There was no way to ask the input to not report degraded health in the
case that a template error was required to signal that some aspect of
the input's operation should terminate, outside of the template itself.
This change fixes that.

Also fix buggy cursor template tests that were identified by this
improvement.

(cherry picked from commit 64617f5)

# Conflicts:
#	x-pack/filebeat/input/httpjson/transform_set_test.go
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Sep 5, 2025
@mergify mergify bot requested review from a team as code owners September 5, 2025 03:33
@mergify mergify bot assigned efd6 Sep 5, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Sep 5, 2025

Cherry-pick of 64617f5 has failed:

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

You are currently cherry-picking commit 64617f5fe.
  (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:   docs/reference/filebeat/filebeat-input-httpjson.md
	modified:   x-pack/filebeat/input/httpjson/config.go
	modified:   x-pack/filebeat/input/httpjson/cursor.go
	modified:   x-pack/filebeat/input/httpjson/cursor_test.go
	modified:   x-pack/filebeat/input/httpjson/transform_append.go
	modified:   x-pack/filebeat/input/httpjson/transform_append_test.go
	modified:   x-pack/filebeat/input/httpjson/transform_set.go
	modified:   x-pack/filebeat/input/httpjson/transform_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x-pack/filebeat/input/httpjson/transform_set_test.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

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Sep 5, 2025
@elasticmachine
Copy link
Contributor

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

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Sep 5, 2025
@github-actions
Copy link
Contributor

github-actions bot commented Sep 5, 2025

🔍 Preview links for changed docs

@efd6 efd6 enabled auto-merge (squash) September 5, 2025 03:58
@efd6 efd6 merged commit 3cecc52 into 9.0 Sep 5, 2025
27 of 30 checks passed
@efd6 efd6 deleted the mergify/bp/9.0/pr-46332 branch September 5, 2025 05:40
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

2 participants