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.

Sign up for GitHub

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

Addresses changes made to security demo config install tool #233

Merged
merged 3 commits into from
Apr 16, 2024
Merged

Addresses changes made to security demo config install tool #233

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
74328f2
Addresses changes made to security demo config install tool
DarshitChanpura Dec 15, 2023
9d9c14f
Merge remote-tracking branch 'upstream/main'
DarshitChanpura Feb 28, 2024
81fff85
Fixes remainder admin occurences, adds version check for admin passwo…
DarshitChanpura Feb 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion scripts/docker.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
# - `-Xregexp.interruptible=true -Xcompile.invokedynamic=true -Xjit.threshold=0` LS base-line
# - `-XX:+UseParallelGC` do not use G1 (default) on Java 11
# - `-v -W1` print JRuby version but do not go verbose
JRUBY_OPTS=-Xregexp.interruptible=true -Xcompile.invokedynamic=true -Xjit.threshold=0 -J-XX:+UseParallelGC -J-XX:+PrintCommandLineFlags -v -W1
JRUBY_OPTS=-Xregexp.interruptible=true -Xcompile.invokedynamic=true -Xjit.threshold=0 -J-XX:+UseParallelGC -J-XX:+PrintCommandLineFlags -v -W1
Copy link
Member

Choose a reason for hiding this comment

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

If we change this to admin, then we can use admin below and it should work for older versions of OpenSearch. Can we make that change?

Copy link
Member Author

Choose a reason for hiding this comment

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

Would it work for 2.12 and later? If not and you think this PR is not required until 2.12 we can mark it as draft

Copy link
Member Author

Choose a reason for hiding this comment

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

Also, admin is recognized as weak password and so the setup would fail. Hence we defined a new password with relatively strong value myStrongPassword123!

OPENSEARCH_INITIAL_ADMIN_PASSWORD=myStrongPassword123!
2 changes: 1 addition & 1 deletion scripts/logstash-run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export PATH=$BUILD_DIR/gradle/bin:$PATH
SERVICE_URL="http://integration:9200"

if [[ "$SECURE_INTEGRATION" == "true" ]]; then
SERVICE_URL="https://integration:9200 -k -u admin:admin"
SERVICE_URL="https://integration:9200 -k -u admin:myStrongPassword123!"
Copy link
Member

Choose a reason for hiding this comment

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

You could set this to admin to help the build pass.

Copy link
Member Author

Choose a reason for hiding this comment

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

i don't think that is the root-cause of failures but I maybe wrong here.
In the latest CI run, the test run with logstash 7.17.1 with OpenSearch 2.1.0 seem to have passed[1] but the same failed[2] for 1.3.4, when neither of these versions contain admin changes.
[1] - https://github.com/opensearch-project/logstash-output-opensearch/actions/runs/7227042889/job/19693902342?pr=233
[2] - https://github.com/opensearch-project/logstash-output-opensearch/actions/runs/7227042889/job/19693901900?pr=233

fi

wait_for_es() {
Expand Down
Loading