Skip to content

Correct syntax error in checkstate not caught by unit tests #438

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

Merged
merged 4 commits into from
Dec 4, 2020
Merged

Correct syntax error in checkstate not caught by unit tests #438

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
89f5105
fix: checkstate script to honor SPLUNKD_SSL_ENABLE
ryanfaircloth Nov 30, 2020
723384f
Update checkstate.sh
ryanfaircloth Dec 2, 2020
127f978
Merge branch 'rfaircloth-splunk-patch-1' of https://github.com/splunk…
ryanfaircloth Dec 2, 2020
2dc7dab
Update checkstate.sh
ryanfaircloth Dec 2, 2020
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
11 changes: 7 additions & 4 deletions splunk/common-files/checkstate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,19 @@
#NOTE: If you plan on running the splunk container while keeping Splunk
# inactive for long periods of time, this script may give misleading
# health results

if [[ "" == "$NO_HEALTHCHECK" ]]; then
if [[ "false" == "$SPLUNKD_SSL_ENABLE" ]]; then
SCHEME="http"
else
SCHEME="https"
fi
#If NO_HEALTHCHECK is NOT defined, then we want the healthcheck
state="$(< $CONTAINER_ARTIFACT_DIR/splunk-container.state)"

case "$state" in
running|started)
if [[ "false" != "$SPLUNKD_SSL_ENABLE" ]]; then
curl -m 30 -f -k https://localhost:8089/
else
curl -m 30 -f -k http://localhost:8089/
curl -m 30 -f -k $SCHEME://localhost:8089/
exit $?
;;
*)
Expand Down