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.

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

Convert cloudfoundry input to v2 #19717

Merged
merged 5 commits into from
Jul 9, 2020

Conversation

urso
Copy link

@urso urso commented Jul 7, 2020

  • Refactoring

What does this PR do?

Move cloudfoundry input to v2 input API

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.

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

@urso urso added review refactoring Filebeat Filebeat needs_backport PR is waiting to be backported to other branches. Team:Integrations Label for the Integrations team labels Jul 7, 2020
@elasticmachine
Copy link
Collaborator

Pinging @elastic/integrations (Team: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 Jul 7, 2020
@elasticmachine
Copy link
Collaborator

elasticmachine commented Jul 7, 2020

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #19717 updated]

  • Start Time: 2020-07-09T12:10:36.926+0000

  • Duration: 71 min 17 sec

Test stats 🧪

Test Results
Failed 0
Passed 4038
Skipped 527
Total 4565

Steps errors

Expand to view the steps failures

  • Name: Report to Codecov
    • Description: curl -sSLo codecov https://codecov.io/bash for i in auditbeat filebeat heartbeat libbeat metricbeat packetbeat winlogbeat journalbeat do FILE="${i}/build/coverage/full.cov" if [ -f "${FILE}" ]; then bash codecov -f "${FILE}" fi done

    • Duration: 2 min 22 sec

    • Start Time: 2020-07-09T12:36:24.645+0000

    • log

@jsoriano jsoriano self-requested a review July 8, 2020 08:07
Copy link
Member

@jsoriano jsoriano 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 working on this refactor.

I have been trying these changes locally and I have found some issues, I have added some suggestions to address them.

x-pack/filebeat/input/cloudfoundry/v1.go Outdated Show resolved Hide resolved
x-pack/filebeat/input/cloudfoundry/input.go Show resolved Hide resolved
x-pack/filebeat/input/cloudfoundry/v1.go Show resolved Hide resolved
x-pack/filebeat/input/cloudfoundry/v2.go Show resolved Hide resolved
@jsoriano jsoriano self-assigned this Jul 8, 2020
@urso urso force-pushed the filebeat-cloudfoundr-input-v2 branch from 653e900 to dac4538 Compare July 8, 2020 15:22
Copy link
Member

@jsoriano jsoriano left a comment

Choose a reason for hiding this comment

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

I have been testing this locally and seems to work fine 👍


func (i *inputV2) Test(_ v2.TestContext) error {
// XXX: try to connect, but don't consume
return nil
Copy link
Member

Choose a reason for hiding this comment

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

We can do the same test here as with v1.

go func() {
c.wg.Add(1)
Copy link
Member

Choose a reason for hiding this comment

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

Good catch 👍

@jsoriano jsoriano added the v7.9.0 label Jul 9, 2020
@urso urso merged commit b9cb9e4 into elastic:master Jul 9, 2020
@urso urso deleted the filebeat-cloudfoundr-input-v2 branch July 9, 2020 13:29
urso pushed a commit to urso/beats that referenced this pull request Jul 9, 2020
@urso urso removed the needs_backport PR is waiting to be backported to other branches. label Jul 9, 2020
v1v added a commit to v1v/beats that referenced this pull request Jul 9, 2020
* upstream/master:
  Add `docker logs` support to the Elastic Log Driver (elastic#19531)
  [Elastic Agent] Fix saving of agent configuration on Windows to have proper ACLs (elastic#19793)
  Send the config revision down to the endpoint application. (elastic#19759)
  [Elastic Agent] Add support for multiple hosts in connection to kibana (elastic#19628)
  Remove the downloadConfig and retryConfig from plugin/process.Application and plugin/service.Application. (elastic#19603)
  Update go version to 1.14.4 (elastic#19753)
  ci: set builds as skipped when they do not match the trigger (elastic#19750)
  [Auditbeat] Fix up socket dataset runaway CPU usage (elastic#19764)
  Convert cloudfoundry input to v2 (elastic#19717)
urso pushed a commit that referenced this pull request Jul 9, 2020
@urso urso added the test-plan Add this PR to be manual test plan label Jul 14, 2020
@andresrc andresrc added the test-plan-added This PR has been added to the test plan label Jul 21, 2020
melchiormoulin pushed a commit to melchiormoulin/beats that referenced this pull request Oct 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Filebeat Filebeat refactoring review Team:Integrations Label for the Integrations team test-plan Add this PR to be manual test plan test-plan-added This PR has been added to the test plan v7.9.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants