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

[filebeat][threatintel] MISP pagination fixes #37898

Merged

Conversation

chrisberkhout
Copy link
Contributor

@chrisberkhout chrisberkhout commented Feb 7, 2024

Update the Filebeat Threat Intel module's misp fileset with fixes from the MISP integration.

Proposed commit message

[filebeat][threatintel] MISP pagination fixes (#)

Update the HTTP JSON input configuration for the Threat Intel module's
misp fileset with pagination fixes that were done earlier in the
Agent-based MISP integration, in these PRs:

- Fix timestamp format sent to API
  https://github.com/elastic/integrations/pull/6482

- Fix duplicate requests for page 1
  https://github.com/elastic/integrations/pull/6495

- Keep the same timestamp for later pages
  https://github.com/elastic/integrations/pull/6649

- Pagination fixes
  https://github.com/elastic/integrations/pull/9073

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.

How to test this PR locally

To run existing tests for the Threat Intel module:

cd x-pack/filebeat
mage pythonIntegTest

For a guide to running against a local instance of MISP, please refer to the "How to test this PR locally" section of elastic/integrations#9073.

Related issues

This issue has discussion of these bugs (and links to a user report specific to the Threat Intel module):

PRs with the corresponding changes in the Agent-based integration:

@chrisberkhout chrisberkhout self-assigned this Feb 7, 2024
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Feb 7, 2024
@chrisberkhout chrisberkhout added the Team:Service-Integrations Label for the Service Integrations team label Feb 7, 2024
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Feb 7, 2024
Copy link
Contributor

mergify bot commented Feb 7, 2024

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @chrisberkhout? 🙏.
For such, you'll need to label your PR with:

  • The upcoming major version of the Elastic Stack
  • The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-v8./d.0 is the label to automatically backport to the 8./d branch. /d is the digit

@chrisberkhout chrisberkhout added backport-v7.17.0 Automated backport with mergify backport-v8.12.0 Automated backport with mergify 8.13-candidate labels Feb 7, 2024
@elasticmachine
Copy link
Collaborator

elasticmachine commented Feb 7, 2024

💚 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: 135 min 23 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!)

@chrisberkhout chrisberkhout marked this pull request as ready for review February 7, 2024 10:49
@chrisberkhout chrisberkhout requested a review from a team as a code owner February 7, 2024 10:49
@elasticmachine
Copy link
Collaborator

elasticmachine commented Feb 7, 2024

💔 Build Failed

Failed CI Steps

History

cc @chrisberkhout

Copy link
Contributor

@efd6 efd6 left a comment

Choose a reason for hiding this comment

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

The buildkite failure looks to be unrelated. Do you know the cause?

@chrisberkhout
Copy link
Contributor Author

The buildkite failure looks to be unrelated. Do you know the cause?

Seems to be a problem with build scripting for generating pipelines. I guess these aren't run for all builds. I tried to run it locally but was missing some buildkite agent dependency and stopped there.

@chrisberkhout chrisberkhout merged commit b7fc69a into elastic:main Feb 8, 2024
32 of 36 checks passed
@chrisberkhout chrisberkhout deleted the threatintel-misp-pagination branch February 8, 2024 09:08
mergify bot pushed a commit that referenced this pull request Feb 8, 2024
Update the HTTP JSON input configuration for the Threat Intel module's
misp fileset with pagination fixes that were done earlier in the
Agent-based MISP integration, in these PRs:

- Fix timestamp format sent to API
  elastic/integrations#6482

- Fix duplicate requests for page 1
  elastic/integrations#6495

- Keep the same timestamp for later pages
  elastic/integrations#6649

- Pagination fixes
  elastic/integrations#9073

(cherry picked from commit b7fc69a)
mergify bot pushed a commit that referenced this pull request Feb 8, 2024
Update the HTTP JSON input configuration for the Threat Intel module's
misp fileset with pagination fixes that were done earlier in the
Agent-based MISP integration, in these PRs:

- Fix timestamp format sent to API
  elastic/integrations#6482

- Fix duplicate requests for page 1
  elastic/integrations#6495

- Keep the same timestamp for later pages
  elastic/integrations#6649

- Pagination fixes
  elastic/integrations#9073

(cherry picked from commit b7fc69a)
chrisberkhout pushed a commit that referenced this pull request Feb 9, 2024
…#37923)

[filebeat][threatintel] MISP pagination fixes (#37898)

Update the HTTP JSON input configuration for the Threat Intel module's
misp fileset with pagination fixes that were done earlier in the
Agent-based MISP integration, in these PRs:

- Fix timestamp format sent to API
  elastic/integrations#6482

- Fix duplicate requests for page 1
  elastic/integrations#6495

- Keep the same timestamp for later pages
  elastic/integrations#6649

- Pagination fixes
  elastic/integrations#9073
chrisberkhout pushed a commit that referenced this pull request Feb 9, 2024
…#37924)

[filebeat][threatintel] MISP pagination fixes (#37898)

Update the HTTP JSON input configuration for the Threat Intel module's
misp fileset with pagination fixes that were done earlier in the
Agent-based MISP integration, in these PRs:

- Fix timestamp format sent to API
  elastic/integrations#6482

- Fix duplicate requests for page 1
  elastic/integrations#6495

- Keep the same timestamp for later pages
  elastic/integrations#6649

- Pagination fixes
  elastic/integrations#9073
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
8.13-candidate backport-v7.17.0 Automated backport with mergify backport-v8.12.0 Automated backport with mergify bugfix Team:Service-Integrations Label for the Service Integrations team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants