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

[8.1](backport #29816) [Filebeat][httpjson] httpjson chain calls #31040

Closed
wants to merge 2 commits into from
Closed

[8.1](backport #29816) [Filebeat][httpjson] httpjson chain calls #31040

wants to merge 2 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 29, 2022 •
edited by zube bot
Loading

This is an automatic backport of pull request #29816 done by Mergify.
Cherry-pick of 2ec07f5 has failed:

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

You are currently cherry-picking commit 2ec07f5eca.
  (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
	new file:   x-pack/filebeat/docs/inputs/images/input-httpjson-chain-lifecycle.png
	modified:   x-pack/filebeat/docs/inputs/images/input-httpjson-lifecycle.png
	modified:   x-pack/filebeat/docs/inputs/input-httpjson.asciidoc
	new file:   x-pack/filebeat/input/httpjson/chain.go
	modified:   x-pack/filebeat/input/httpjson/config.go
	modified:   x-pack/filebeat/input/httpjson/input.go
	modified:   x-pack/filebeat/input/httpjson/input_test.go
	modified:   x-pack/filebeat/input/httpjson/request_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x-pack/filebeat/input/httpjson/pagination.go
	both modified:   x-pack/filebeat/input/httpjson/request.go
	both modified:   x-pack/filebeat/input/httpjson/response.go

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

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@kush-elastic
[Filebeat][httpjson] httpjson chain calls (#29816)
e61eb4d 
* [filebeat][httpjson] Extend filebeat httpjson input for chained calls

* Updates based on comments

* Update on httpjson and nits

* Resolve comments from Tiago

* address comments and improved json_parser

* Add entry to CHANGELOG.next.asciidoc

* mage update and mage check for ci linting

* address comments

* Addressed comments

* remove else as we have continue, close resp.Body in id collection mechanism and update json_parser to convert any type values to string

* nits

* mage check

* Changes requested from elastic team

* requested changes on logging level

* requested changes for ids collection

* Requested changes on input-httpjson.asciidoc and added tests for chain in input_test.go

* Added regular tests with chain

* Changes based on CI

* Add New diagram for chain feature and updates based on CI changes

* CI linter problem

* removed unnecessary ci changes

* golangci eventsCh->events

* ignore few CI errors

* update GET to http.MethodGet

* Review changes- GET->http.MethodGet and nits

(cherry picked from commit 2ec07f5)

# Conflicts:
#	x-pack/filebeat/input/httpjson/pagination.go
#	x-pack/filebeat/input/httpjson/request.go
#	x-pack/filebeat/input/httpjson/response.go
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Mar 29, 2022
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Mar 29, 2022
@elasticmachine
Copy link
Collaborator

elasticmachine commented Mar 29, 2022 •
edited by jenkins-beats-ci bot
Loading

❕ Build Aborted

There is a new build on-going so the previous on-going builds have been aborted.

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

Expand to view the summary

Build stats

  • Start Time: 2022-03-29T13:27:26.006+0000

  • Duration: 5 min 5 sec

🤖 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!)

@mtojek mtojek added the Team:Integrations Label for the Integrations team label Mar 29, 2022
@elasticmachine
Copy link
Collaborator

Pinging @elastic/integrations (Team:Integrations)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Mar 29, 2022
@mtojek mtojek force-pushed the mergify/bp/8.1/pr-29816 branch from e40f5d9 to 09ca651 Compare March 29, 2022 13:30
@mtojek mtojek closed this Mar 29, 2022
@mergify mergify bot deleted the mergify/bp/8.1/pr-29816 branch March 29, 2022 13:33
@elasticmachine
Copy link
Collaborator

💔 Build Failed

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

  • Start Time: 2022-03-29T13:30:24.210+0000

  • Duration: 4 min 8 sec

Steps errors 1

Expand to view the steps failures

Shell Script
  • Took 0 min 0 sec . View more details here
  • Description: git diff --name-only origin/8.1...09ca6518a0b53d7917bf8698b2a79ff59a08a393 > git-diff.txt

❕ Flaky test report

No test was executed to be analysed.

🤖 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!)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@kush-elastic kush-elastic

Labels
backport conflicts There is a conflict in the backported pull request Team:Integrations Label for the Integrations team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@elasticmachine @mtojek @kush-elastic