diff --git a/Vagrantfile b/Vagrantfile index d944ada..5d2c526 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -85,53 +85,53 @@ Vagrant.configure("2") do |config| /usr/local/bin/docker-compose up -d 2> /dev/null # Wait 120 seconds for Graylog to come online - SECONDS=0 - while true - do - GRAYLOG_STATE=$( - docker inspect vagrant_graylog_1 \ - | jq --raw-output '.[] | .State.Health.Status') + SECONDS=0 + while true + do + GRAYLOG_STATE=$( + docker inspect vagrant_graylog_1 \ + | jq --raw-output '.[] | .State.Health.Status') - if [[ "$GRAYLOG_STATE" == "healthy" ]]; then - echo "Graylog is available." - sleep 5 - break - elif [[ "$GRAYLOG_STATE" != "starting" ]]; then - echo "Something is wrong with Graylog. Aborting." - exit 1 - elif [[ $SECONDS -le 120 ]]; then - echo "Waiting for Graylog ($SECONDS/120 seconds)" - sleep 10 - else - echo "Waiting on Graylog timed out. Aborting." - exit 1 - fi - done + if [[ "$GRAYLOG_STATE" == "healthy" ]]; then + echo "Graylog is available." + sleep 5 + break + elif [[ "$GRAYLOG_STATE" != "starting" ]]; then + echo "Something is wrong with Graylog. Aborting." + exit 1 + elif [[ $SECONDS -le 120 ]]; then + echo "Waiting for Graylog ($SECONDS/120 seconds)" + sleep 10 + else + echo "Waiting on Graylog timed out. Aborting." + exit 1 + fi + done - # Check for existing GELF TCP Input - INPUTSTATE=$( - curl -s -X GET \ - -H "Content-Type: application/json" \ - -H "X-Requested-By: cli" \ - -u admin:admin \ - "http://graylog.172.28.128.30.xip.io:8080/api/system/inputstates") + # Check for existing GELF TCP Input + INPUTSTATE=$( + curl -s -X GET \ + -H "Content-Type: application/json" \ + -H "X-Requested-By: cli" \ + -u admin:admin \ + "http://graylog.172.28.128.30.xip.io:8080/api/system/inputstates") - INPUT_TYPES=$(echo $INPUTSTATE | jq --raw-output '.states | .[] | .message_input.type') + INPUT_TYPES=$(echo $INPUTSTATE | jq --raw-output '.states | .[] | .message_input.type') - for TYPE in $INPUT_TYPES; do - if [[ "$TYPE" == "org.graylog2.inputs.gelf.tcp.GELFTCPInput" ]]; then - echo "Found GELF TCP input in Graylog, aborting input installation." - exit - fi - done + for TYPE in $INPUT_TYPES; do + if [[ "$TYPE" == "org.graylog2.inputs.gelf.tcp.GELFTCPInput" ]]; then + echo "Found GELF TCP input in Graylog, aborting input installation." + exit + fi + done - # Install GELF TCP Input - curl -i -s -X POST \ - -H "Content-Type: application/json" \ - -H "X-Requested-By: cli" \ - -u admin:admin \ - "http://graylog.172.28.128.30.xip.io:8080/api/system/inputs" \ - -d @GELFTCPInput.json + # Install GELF TCP Input + curl -i -s -X POST \ + -H "Content-Type: application/json" \ + -H "X-Requested-By: cli" \ + -u admin:admin \ + "http://graylog.172.28.128.30.xip.io:8080/api/system/inputs" \ + -d @GELFTCPInput.json SHELL