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

Logstash Improvements. #1637

Merged
merged 1 commit into from
Jan 25, 2024
Merged

Conversation

mashhurs
Copy link
Contributor

Description

  1. Logstash team is aiming to create an E2E test using integration packages. During the tests, we would need a verification task which Logstash stats API will be helpful. We are introducing the port add to the docker network so that we can access stats API.
  2. We are packaging elastic_integration plugin with Logstash and from LS 8.13 (planned) Logstash carries specific versions of the plugin. If we always install the plugin when LS container starts, we may lose the compatibility issue since it always installs the recent one. Introducing a logic to check if plugin is not bundled yet and install if so.

How to test

  • Run make build
  • ./elastic-package stack up -d
  • Go to the LS docker and check for following logs
Missing plugin logstash-filter-elastic_integration, installing now
Using bundled JDK: /usr/share/logstash/jdk
Validating logstash-filter-elastic_integration
Resolving mixin dependencies
Installing logstash-filter-elastic_integration
  • to check the exposed port, run curl localhost:9600/_node/stats?pretty. It should show current LS node stats.

@mashhurs mashhurs requested a review from bhapas January 22, 2024 16:20
@mashhurs mashhurs self-assigned this Jan 22, 2024
@mashhurs mashhurs requested a review from a team January 22, 2024 16:21
@mashhurs
Copy link
Contributor Author

@bhapas, I need your (or any of team member's) help for followings:

  • check if BK failures are due to this change, at the glance fails don't seems so;
  • I have no idea about version bump; It seems Makefile dynamically resolving the version considering commit hash, please advise a suggestion if I need to change commit/PR info.

Thanks.

@bhapas
Copy link
Contributor

bhapas commented Jan 23, 2024

/test

@jsoriano
Copy link
Member

  1. Logstash team is aiming to create an E2E test using integration packages.

Do you have more details about this? Is this going to be to test logstash or to test packages?

check if BK failures are due to this change, at the glance fails don't seems so;

There seems to be a regression in the docker pre-installation in the image used in CI. We are trying to downgrade it in #1639, once merged try to update the branch.

@mashhurs
Copy link
Contributor Author

  1. Logstash team is aiming to create an E2E test using integration packages.

Do you have more details about this? Is this going to be to test logstash or to test packages?

elastic-package has a ready infrastructure (ES, LS, KB, Fleet, deploy packages to create Ingest Pipelines) and the goal is to test Logstash to run Ingest Pipelines. For this reason, I opened this PR to get the statistics about Logstash.

check if BK failures are due to this change, at the glance fails don't seems so;

There seems to be a regression in the docker pre-installation in the image used in CI. We are trying to downgrade it in #1639, once merged try to update the branch.

Thanks for heads up. I highly appreciate If you can please review this change and let us know the release plan. We will use the release distro.

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.

Looks good, could you please try to update the branch to have a green CI?

@@ -170,13 +170,14 @@ services:
interval: 60s
timeout: 50s
retries: 5
command: bash -c "bin/logstash-plugin install logstash-filter-elastic_integration && logstash -f /usr/share/logstash/pipeline/logstash.conf"
command: bash -c 'if [[ ! $(bin/logstash-plugin list) == *"logstash-filter-elastic_integration"* ]]; then echo "Missing plugin logstash-filter-elastic_integration, installing now" && bin/logstash-plugin install logstash-filter-elastic_integration; fi && bin/logstash -f /usr/share/logstash/pipeline/logstash.conf'
Copy link
Member

Choose a reason for hiding this comment

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

We will need to move this to a script if we continue adding things here :)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

One we package the plugin (soon with this PR), we can actually remove this script, no need.

@mrodm
Copy link
Contributor

mrodm commented Jan 24, 2024

buildkite test this

@elasticmachine
Copy link
Collaborator

💚 Build Succeeded

History

cc @mashhurs

@mashhurs mashhurs merged commit 5cd6111 into elastic:main Jan 25, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants