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

[Filebeat] Add Proxy config to httpjson v2 #24662

Merged
merged 4 commits into from
Mar 24, 2021
Merged

[Filebeat] Add Proxy config to httpjson v2 #24662

merged 4 commits into from
Mar 24, 2021

Conversation

legoguy1000
Copy link
Contributor

@legoguy1000 legoguy1000 commented Mar 21, 2021 •
edited by andrewkroh
Loading

What does this PR do?

Adds a proxy_url config option to the httpjson v2 input. Potentially resolves 24615.

Why is it important?

No way to specify a proxy to use for the httpjson v2 input.

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.

Related issues

Resolves #24615

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Mar 21, 2021
@legoguy1000 legoguy1000 mentioned this pull request Mar 21, 2021
Closed
@elasticmachine
Copy link
Collaborator

elasticmachine commented Mar 21, 2021 •
edited by jenkins-beats-ci bot
Loading

💚 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

Expand to view the summary

Build stats

  • Build Cause: andrewkroh commented: run tests

  • Start Time: 2021-03-24T17:38:43.698+0000

  • Duration: 68 min 35 sec

  • Commit: 45a7391

Test stats 🧪

Test Results
Failed 0
Passed 6847
Skipped 1169
Total 8016

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 6847
Skipped 1169
Total 8016

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Mar 22, 2021
marc-gr
marc-gr requested changes Mar 22, 2021
View reviewed changes
Copy link
Contributor

@marc-gr marc-gr left a comment

Choose a reason for hiding this comment

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

Thanks for the PR! On top of the suggested changes, an entry in the CHANGELOG.next.asciidoc is required, under the Bugfixes -> Filebeat section.

Let us know if you need any help to move forward.

x-pack/filebeat/input/httpjson/internal/v2/config_request.go Outdated Show resolved Hide resolved
x-pack/filebeat/input/httpjson/internal/v2/config_request.go Outdated Show resolved Hide resolved
x-pack/filebeat/module/okta/system/config/input.yml Outdated Show resolved Hide resolved
@legoguy1000 legoguy1000 force-pushed the httpjson-input-proxy branch from 83c95b1 to 5c88312 Compare March 22, 2021 15:42
@legoguy1000
Copy link
Contributor Author

Should I add the proxy_url config option to all the other modules using the httpjsn v2 input?? I didn't want to right away until i got a thumbs up on the Golang code.

@legoguy1000 legoguy1000 force-pushed the httpjson-input-proxy branch 3 times, most recently from 96f1bec to 4a90fa3 Compare March 23, 2021 02:13
@legoguy1000 legoguy1000 marked this pull request as ready for review March 23, 2021 02:38
@elasticmachine
Copy link
Collaborator

Pinging @elastic/security-external-integrations (Team:Security-External Integrations)

andrewkroh
andrewkroh approved these changes Mar 23, 2021
View reviewed changes
Copy link
Member

@andrewkroh andrewkroh left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Awesome, LGTM. Thanks!

@marc-gr Can you check this too please.

@andrewkroh
Copy link
Member

jenkins, test this

@legoguy1000 legoguy1000 force-pushed the httpjson-input-proxy branch from dba9626 to 3b35ea4 Compare March 23, 2021 23:58
@legoguy1000 legoguy1000 requested a review from marc-gr March 24, 2021 13:47
marc-gr
marc-gr requested changes Mar 24, 2021
View reviewed changes
Copy link
Contributor

@marc-gr marc-gr left a comment

Choose a reason for hiding this comment

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

Thanks for addressing the changes! It LGTM except for the changelog line, LMK if you need any help with that 👍

CHANGELOG.next.asciidoc Outdated Show resolved Hide resolved
@andrewkroh
Copy link
Member

run tests

@andrewkroh
Copy link
Member

jenkins, run tests

@andrewkroh
Copy link
Member

run tests

@andrewkroh andrewkroh merged commit 9a5f5d0 into elastic:master Mar 24, 2021
andrewkroh pushed a commit to andrewkroh/beats that referenced this pull request Mar 24, 2021
@legoguy1000 @andrewkroh
[Filebeat] Add Proxy config to httpjson v2 (elastic#24662)
8e783a3 
Adds a `proxy_url` config option to the httpjson v2 input. Updates all httpjson based modules to support proxy_url.

Fixes elastic#24615.

Co-authored-by: Andrew Kroh <[email protected]>
(cherry picked from commit 9a5f5d0)
@andrewkroh andrewkroh mentioned this pull request Mar 24, 2021
Merged
6 tasks
@legoguy1000 legoguy1000 deleted the httpjson-input-proxy branch March 24, 2021 18:52
andrewkroh added a commit that referenced this pull request Mar 24, 2021
@andrewkroh @legoguy1000
[Filebeat] Add Proxy config to httpjson v2 (#24662) (#24749)
9d546a2 
Adds a `proxy_url` config option to the httpjson v2 input. Updates all httpjson based modules to support proxy_url.

Fixes #24615.

Co-authored-by: Andrew Kroh <[email protected]>
(cherry picked from commit 9a5f5d0)

Co-authored-by: Alex Resnick <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@marc-gr marc-gr marc-gr approved these changes

@andrewkroh andrewkroh andrewkroh approved these changes

Assignees
No one assigned
Labels
enhancement Filebeat Filebeat v7.13.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Connect to Okta module of Filebeat via proxy
5 participants
@legoguy1000 @elasticmachine @andrewkroh @marc-gr @ChrsMark