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

{,x-pack}/packetbeat: add support for pipeline module uploads #37291

Merged
merged 6 commits into from
Jan 31, 2024

Conversation

efd6
Copy link
Contributor

@efd6 efd6 commented Dec 5, 2023

Proposed commit message

See title.

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

Use cases

Screenshots

Logs

@efd6 efd6 self-assigned this Dec 5, 2023
@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 Dec 5, 2023
@elasticmachine
Copy link
Collaborator

💚 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 preview

Expand to view the summary

Build stats

  • Duration: 50 min 33 sec

❕ Flaky test report

No test was executed to be analysed.

🤖 GitHub comments

Expand to view the 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!)

@elasticmachine
Copy link
Collaborator

💚 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 preview

Expand to view the summary

Build stats

  • Start Time: 2023-12-05T06:15:12.596+0000

  • Duration: 52 min 31 sec

Test stats 🧪

Test Results
Failed 0
Passed 2361
Skipped 25
Total 2386

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the 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!)

@elasticmachine
Copy link
Collaborator

❕ Build Aborted

Either there was a build timeout or someone aborted the build.

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

  • Duration: 7 min 39 sec

🤖 GitHub comments

Expand to view the 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!)

@elasticmachine
Copy link
Collaborator

💚 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 preview

Expand to view the summary

Build stats

  • Start Time: 2023-12-07T03:46:48.626+0000

  • Duration: 51 min 3 sec

Test stats 🧪

Test Results
Failed 0
Passed 2361
Skipped 25
Total 2386

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the 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!)

@efd6 efd6 force-pushed the packetbeat_modules branch 4 times, most recently from a1d759d to 561693e Compare December 8, 2023 06:32
@elasticmachine
Copy link
Collaborator

❕ Build Aborted

Either there was a build timeout or someone aborted the build.

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

  • Duration: 29 min 47 sec

🤖 GitHub comments

Expand to view the 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!)

@elasticmachine
Copy link
Collaborator

💚 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 preview

Expand to view the summary

Build stats

  • Start Time: 2023-12-08T06:33:12.630+0000

  • Duration: 55 min 55 sec

Test stats 🧪

Test Results
Failed 0
Passed 2361
Skipped 25
Total 2386

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the 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!)

@efd6 efd6 marked this pull request as ready for review December 8, 2023 08:14
@efd6 efd6 requested a review from a team as a code owner December 8, 2023 08:14
@elasticmachine
Copy link
Collaborator

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

@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: 2023-12-08T08:12:31.028+0000

  • Duration: 5 min 0 sec

Steps errors 1

Expand to view the steps failures

Error signal
  • Took 0 min 0 sec . View more details here
  • Description: githubApiCall: The REST API call https://api.github.com/repos/elastic/beats/pulls/37291 return the message : java.lang.Exception: httpRequest: Failure connecting to the service https://api.github.com/repos/elastic/beats/pulls/37291 : httpRequest: Failure connecting to the service https://api.github.com/repos/elastic/beats/pulls/37291 : Code: 504Error: {"message": "We couldn't respond to your request in time. Sorry about that. Please try resubmitting your request and contact us if the problem persists."}

❕ Flaky test report

No test was executed to be analysed.

🤖 GitHub comments

Expand to view the 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!)

@efd6
Copy link
Contributor Author

efd6 commented Dec 8, 2023

/test

@elasticmachine
Copy link
Collaborator

💚 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 preview

Expand to view the summary

Build stats

  • Start Time: 2023-12-08T20:07:17.222+0000

  • Duration: 51 min 18 sec

Test stats 🧪

Test Results
Failed 0
Passed 2361
Skipped 25
Total 2386

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the 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!)

Copy link
Contributor

mergify bot commented Jan 17, 2024

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 packetbeat_modules upstream/packetbeat_modules
git merge upstream/main
git push upstream packetbeat_modules

@efd6 efd6 force-pushed the packetbeat_modules branch from 41cf122 to 8935221 Compare January 17, 2024 19:55
@elasticmachine
Copy link
Collaborator

💚 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 preview

Expand to view the summary

Build stats

  • Duration: 54 min 54 sec

❕ Flaky test report

No test was executed to be analysed.

🤖 GitHub comments

Expand to view the 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!)

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.

This looks good to me, but I think we need some accompanying documentation additions to explain the purpose of the pipelines and why you would want to ensure they are loaded. We'll need some docs to explain how to load the pipelines manually for cases where a non-Elasticsearch output is used. And lastly the docs will need to reflect the additional privilege that is needed to install the pipelines (manage_pipeline). This can be a separate PR.

@@ -194,6 +194,8 @@ Setting environmental variable ELASTIC_NETINFO:false in Elastic Agent pod will d

*Packetbeat*

- Add metrics for TCP flags. {issue}36992[36992] {pull}36975[36975]
Copy link
Member

Choose a reason for hiding this comment

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

Is this changelog line intentional?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No it is not. Removed.

@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

  • Duration: 49 min 49 sec

Pipeline error 1

This error is likely related to the pipeline itself. Click here
and then you will see the error (either incorrect syntax or an invalid configuration).

❕ Flaky test report

No test was executed to be analysed.

🤖 GitHub comments

Expand to view the 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!)

@efd6 efd6 force-pushed the packetbeat_modules branch from b6282ed to 08a161e Compare January 25, 2024 03:17
@elasticmachine
Copy link
Collaborator

💚 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 preview

Expand to view the summary

Build stats

  • Duration: 49 min 21 sec

❕ Flaky test report

No test was executed to be analysed.

🤖 GitHub comments

Expand to view the 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!)

Copy link
Contributor

mergify bot commented Jan 25, 2024

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 packetbeat_modules upstream/packetbeat_modules
git merge upstream/main
git push upstream packetbeat_modules

efd6 added 6 commits January 26, 2024 07:05
[git-generate]
yoink -pkg ./winlogbeat/module -dir packetbeat -y UploadPipelines,PipelinesFS
gsed -r -i 's/Winlogbeat/Packetbeat/g' packetbeat/module/*.go
gsed -r -i 's/winlogbeat/packetbeat/g' packetbeat/module/*.go
goimports -w -local github.com/elastic ./packetbeat/module

yoink -pkg ./x-pack/winlogbeat/module -dir x-pack/packetbeat -y init
gsed -r -i 's/winlogbeat/packetbeat/g' x-pack/packetbeat/module/*.go
mkdir -p x-pack/packetbeat/module/null/ingest
touch x-pack/packetbeat/module/null/ingest/pin.yml
…ve placeholder

[git-generate]
data_stream_root=$(go env GOPATH)/src/github.com/elastic/integrations/packages/network_traffic/data_stream
parallel mkdir -p x-pack/packetbeat/module/{/}/ingest ::: $data_stream_root/*
parallel 'cp {}/elasticsearch/ingest_pipeline/* x-pack/packetbeat/module/{/}/ingest/' ::: $data_stream_root/*
rm -rf x-pack/packetbeat/module/null
@efd6 efd6 force-pushed the packetbeat_modules branch from 08a161e to a68497d Compare January 25, 2024 20:35
@efd6 efd6 requested a review from a team as a code owner January 25, 2024 20:35
@elasticmachine
Copy link
Collaborator

💚 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 preview

Expand to view the summary

Build stats

  • Start Time: 2024-01-25T20:35:38.380+0000

  • Duration: 49 min 20 sec

Test stats 🧪

Test Results
Failed 0
Passed 2361
Skipped 25
Total 2386

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the 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!)

@efd6 efd6 merged commit e900baf into elastic:main Jan 31, 2024
37 checks passed
Scholar-Li pushed a commit to Scholar-Li/beats that referenced this pull request Feb 5, 2024
…c#37291)

* packetbeat/module: new package for supporting modules

	[git-generate]
	yoink -pkg ./winlogbeat/module -dir packetbeat -y UploadPipelines,PipelinesFS
	gsed -r -i 's/Winlogbeat/Packetbeat/g' packetbeat/module/*.go
	gsed -r -i 's/winlogbeat/packetbeat/g' packetbeat/module/*.go
	goimports -w -local github.com/elastic ./packetbeat/module
	
	yoink -pkg ./x-pack/winlogbeat/module -dir x-pack/packetbeat -y init
	gsed -r -i 's/winlogbeat/packetbeat/g' x-pack/packetbeat/module/*.go
	mkdir -p x-pack/packetbeat/module/null/ingest
	touch x-pack/packetbeat/module/null/ingest/pin.yml

* packetbeat/module: adjust pipeline names

* packetbeat/beater: add support for pipeline uploads

* x-pack/packetbeat/module: import pipelines from integrations and remove placeholder

	[git-generate]
	data_stream_root=$(go env GOPATH)/src/github.com/elastic/integrations/packages/network_traffic/data_stream
	parallel mkdir -p x-pack/packetbeat/module/{/}/ingest ::: $data_stream_root/*
	parallel 'cp {}/elasticsearch/ingest_pipeline/* x-pack/packetbeat/module/{/}/ingest/' ::: $data_stream_root/*
	rm -rf x-pack/packetbeat/module/null

* x-pack/packetbeat/module: add routing
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
8.12-candidate backport-skip Skip notification from the automated backport with mergify enhancement Packetbeat
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants