Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 12, 2025

Release notes

[rn:skip]

What does this PR do?

In addition to setting LS_JAVA_OPTS we now include the fips config java options in the /usr/share/logstash/config/jvm.options file. This ensures that if consumers of the image overwrite LS_JAVA_OPTS the fips config is still respected from jvm.options.

Related Issues

* Add fips config to jvm.options for observabilitySRE

In addition to setting `LS_JAVA_OPTS` we now include the fips config java
options in the `/usr/share/logstash/config/jvm.options` file. This ensures that
if consumers of the image overwrite `LS_JAVA_OPTS` the fips config is still
respected from `jvm.options`.

* *only* set jvm opts via jvm.options

Stop setting LS_JAVA_OPTS in favor of jvm.options.

* Use subshell to clean up file concat

Codereview suggestion

(cherry picked from commit 64e6462)
@mergify mergify bot added the backport label Aug 12, 2025
@elastic-sonarqube
Copy link

Quality Gate passed Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarQube

Copy link
Member

@donoghuc donoghuc left a comment

Choose a reason for hiding this comment

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

Clean backport.

@elasticmachine
Copy link
Collaborator

💚 Build Succeeded

cc @donoghuc

@donoghuc donoghuc merged commit 134e97d into 8.19 Aug 12, 2025
7 checks passed
@donoghuc donoghuc deleted the mergify/bp/8.19/pr-17958 branch August 12, 2025 16:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants