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.

Sign up for GitHub

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

Jump to bottom

x-pack/filebeat/input/httpjson: add metrics for number of events and pages published #42442

Merged
merged 1 commit into from
Feb 4, 2025
Merged

x-pack/filebeat/input/httpjson: add metrics for number of events and pages published #42442

merged 1 commit into from
Feb 4, 2025

Conversation

efd6
Copy link
Contributor

@efd6 efd6 commented Jan 28, 2025

Proposed commit message

This is intended to match the events and batches published by the CEL input, but there is no concept of batches in HTTPJSON, the nearest being paging.

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

@efd6 efd6 added enhancement Filebeat Filebeat backport-7.17 Automated backport to the 7.17 branch with mergify Team:Security-Service Integrations Security Service Integrations Team backport-8.x Automated backport to the 8.x branch with mergify backport-8.16 Automated backport with mergify labels Jan 28, 2025
@efd6 efd6 self-assigned this Jan 28, 2025
@efd6 efd6 requested a review from a team as a code owner January 28, 2025 02:31
@elasticmachine
Copy link
Collaborator

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

@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 Jan 28, 2025
@efd6 efd6 marked this pull request as draft January 28, 2025 02:32
@efd6 efd6 marked this pull request as ready for review January 28, 2025 04:38
andrewkroh
andrewkroh reviewed Jan 31, 2025
View reviewed changes
Copy link
Member

@andrewkroh andrewkroh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Can you please add the two new metrics to the asciidoc file for httpjson.

@mergify Mergify
Copy link
Contributor

mergify bot commented Jan 31, 2025

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b 42340-httpjson upstream/42340-httpjson
git merge upstream/main
git push upstream 42340-httpjson

@efd6
Copy link
Contributor Author

efd6 commented Feb 2, 2025

Can you please add the two new metrics to the asciidoc file for httpjson.

? Here: 1eae9ce#diff-531162d76f10990e57691d2298a46f2aa2a4e576a8ec0d17dd1a37c35303983fR1625-R1626

@efd6 efd6 force-pushed the 42340-httpjson branch 2 times, most recently from 0aa3fc5 to 2842029 Compare February 3, 2025 19:53
@efd6 efd6 requested a review from andrewkroh February 3, 2025 21:50
@mergify Mergify
Copy link
Contributor

mergify bot commented Feb 4, 2025

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b 42340-httpjson upstream/42340-httpjson
git merge upstream/main
git push upstream 42340-httpjson

@andrewkroh
Copy link
Member

I even know how I missed that. 🫤

@efd6
x-pack/filebeat/input/httpjson: add metrics for number of events and …
9fb79f9 
…pages published

This is intended to match the events and batches published by the CEL
input, but there is no concept of batches in HTTPJSON, the nearest being
paging.
@efd6 efd6 enabled auto-merge (squash) February 4, 2025 05:06
@efd6 efd6 merged commit 71900c4 into elastic:main Feb 4, 2025
19 of 22 checks passed
mergify bot pushed a commit that referenced this pull request Feb 4, 2025
@efd6 @mergify
x-pack/filebeat/input/httpjson: add metrics for number of events and …
df090fb 
…pages published (#42442)

This is intended to match the events and batches published by the CEL
input, but there is no concept of batches in HTTPJSON, the nearest being
paging.

(cherry picked from commit 71900c4)

# Conflicts:
#	x-pack/filebeat/docs/inputs/input-httpjson.asciidoc
#	x-pack/filebeat/input/httpjson/input.go
#	x-pack/filebeat/input/httpjson/metrics.go
#	x-pack/filebeat/input/httpjson/request.go
#	x-pack/filebeat/input/httpjson/request_test.go
@mergify mergify bot mentioned this pull request Feb 4, 2025
Closed
6 tasks
mergify bot pushed a commit that referenced this pull request Feb 4, 2025
@efd6 @mergify
x-pack/filebeat/input/httpjson: add metrics for number of events and …
110f72f 
…pages published (#42442)

This is intended to match the events and batches published by the CEL
input, but there is no concept of batches in HTTPJSON, the nearest being
paging.

(cherry picked from commit 71900c4)
@mergify mergify bot mentioned this pull request Feb 4, 2025
Merged
6 tasks
mergify bot pushed a commit that referenced this pull request Feb 4, 2025
@efd6 @mergify
x-pack/filebeat/input/httpjson: add metrics for number of events and …
23c0796 
…pages published (#42442)

This is intended to match the events and batches published by the CEL
input, but there is no concept of batches in HTTPJSON, the nearest being
paging.

(cherry picked from commit 71900c4)
@mergify mergify bot mentioned this pull request Feb 4, 2025
Merged
6 tasks
efd6 added a commit that referenced this pull request Feb 4, 2025
@mergify @efd6
[8.16](backport #42442) x-pack/filebeat/input/httpjson: add metrics f…
9e4c666 
…or number of events and pages published (#42588)

* x-pack/filebeat/input/httpjson: add metrics for number of events and pages published (#42442)

This is intended to match the events and batches published by the CEL
input, but there is no concept of batches in HTTPJSON, the nearest being
paging.

(cherry picked from commit 71900c4)

* remove irrelevant changelog entries

---------

Co-authored-by: Dan Kortschak <dan.kortschak@elastic.co>
efd6 added a commit that referenced this pull request Feb 4, 2025
@efd6
x-pack/filebeat/input/httpjson: add metrics for number of events and …
ee1180e 
…pages published (#42442)

This is intended to match the events and batches published by the CEL
input, but there is no concept of batches in HTTPJSON, the nearest being
paging.

(cherry picked from commit 71900c4)
efd6 added a commit that referenced this pull request Feb 4, 2025
@mergify @efd6
x-pack/filebeat/input/httpjson: add metrics for number of events and …
e145643 
…pages published (#42442) (#42589)

This is intended to match the events and batches published by the CEL
input, but there is no concept of batches in HTTPJSON, the nearest being
paging.

(cherry picked from commit 71900c4)

Co-authored-by: Dan Kortschak <dan.kortschak@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andrewkroh andrewkroh andrewkroh approved these changes

Assignees

@efd6 efd6

Labels
backport-7.17 Automated backport to the 7.17 branch with mergify backport-8.x Automated backport to the 8.x branch with mergify backport-8.16 Automated backport with mergify enhancement Filebeat Filebeat Team:Security-Service Integrations Security Service Integrations Team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

httpjson: add event publishing metrics
3 participants
@efd6 @elasticmachine @andrewkroh