app 057

Author: michaelkedey

.github/actions/app/action.yaml

@@ -112,11 +112,8 @@ runs:
 
           echo "${LOGS_SEPARATOR}"
           echo "Stopping any existing Gunicorn processes on port ${APP_PORT}"
-          PID=\$(sudo lsof -ti tcp:${APP_PORT})
-          if [ -n "$PID" ]; then
-            echo "Killing process $PID"
-            sudo kill -9 $PID
-          fi
+          PID=\$(sudo lsof -i :${APP_PORT})
+          sudo kill -9 \$PID
 
           echo "Starting Gunicorn"
           nohup gunicorn -w 4 -b 127.0.0.1:${APP_PORT} app:app \

.github/actions/elk/action.yaml

@@ -142,21 +142,20 @@ runs:
             MAX_RETRIES=12
             RETRY_COUNT=0
 
-            until sudo curl -s -u elastic:$ELASTIC_PASSWORD https://localhost:9200/_cluster/health \
+            until sudo curl -s -u elastic:\$ELASTIC_PASSWORD https://localhost:9200/_cluster/health \
               --cacert /etc/elasticsearch/certs/http_ca.crt | grep -E -q '"status":"green"|"status":"yellow"'; do
-              if [ $RETRY_COUNT -ge $MAX_RETRIES ]; then
-                echo "Elasticsearch cluster failed to become healthy after $((MAX_RETRIES * 5)) seconds."
+              if [ \$RETRY_COUNT -ge \$MAX_RETRIES ]; then
+                echo "Elasticsearch cluster failed to become healthy after \$((MAX_RETRIES * 5)) seconds."
                 echo "Attempting to restart Elasticsearch..."
                 sudo systemctl restart elasticsearch
 
-                # Optional: wait and re-check after restart
-                sleep 10
+                sleep 30
                 RETRY_COUNT=0  # Reset count to re-check after restart
                 MAX_RETRIES=6  # Give fewer retries after restart
               else
-                echo "Waiting for Elasticsearch to become healthy... (${RETRY_COUNT}/${MAX_RETRIES})"
+                echo "Waiting for Elasticsearch to become healthy... (\${RETRY_COUNT}/\${MAX_RETRIES})"
                 sleep 5
-                RETRY_COUNT=$((RETRY_COUNT + 1))
+                RETRY_COUNT=\$((RETRY_COUNT + 1))
               fi
             done
             rm elastic_password.txt
@@ -225,21 +224,20 @@ runs:
             MAX_RETRIES=12
             RETRY_COUNT=0
 
-            until sudo curl -s -u elastic:$ELASTIC_PASSWORD https://localhost:9200/_cluster/health \
+            until sudo curl -s -u elastic:\$ELASTIC_PASSWORD https://localhost:9200/_cluster/health \
               --cacert /etc/elasticsearch/certs/http_ca.crt | grep -E -q '"status":"green"|"status":"yellow"'; do
-              if [ $RETRY_COUNT -ge $MAX_RETRIES ]; then
-                echo "Elasticsearch cluster failed to become healthy after $((MAX_RETRIES * 5)) seconds."
+              if [ \$RETRY_COUNT -ge \$MAX_RETRIES ]; then
+                echo "Elasticsearch cluster failed to become healthy after \$((MAX_RETRIES * 5)) seconds."
                 echo "Attempting to restart Elasticsearch..."
                 sudo systemctl restart elasticsearch
 
-                # Optional: wait and re-check after restart
-                sleep 10
+                sleep 30
                 RETRY_COUNT=0  # Reset count to re-check after restart
                 MAX_RETRIES=6  # Give fewer retries after restart
               else
-                echo "Waiting for Elasticsearch to become healthy... (${RETRY_COUNT}/${MAX_RETRIES})"
+                echo "Waiting for Elasticsearch to become healthy... (\${RETRY_COUNT}/\${MAX_RETRIES})"
                 sleep 5
-                RETRY_COUNT=$((RETRY_COUNT + 1))
+                RETRY_COUNT=\$((RETRY_COUNT + 1))
               fi
             done
 
@@ -268,6 +266,7 @@ runs:
             echo "\$LOGSTASH_API_KEY_JSON" > logstash_api_key.json
             gpg --batch --yes --passphrase "$GPG_PASSPHRASE" --symmetric --cipher-algo AES256 logstash_api_key.json
             rm logstash_api_key.json
+            rm elastic_password.txt
 
             echo "restarting logstash"
             sudo systemctl restart logstash
@@ -289,7 +288,7 @@ runs:
             # echo "$API_KEY_ID" | sudo /usr/share/logstash/bin/logstash-keystore --path.settings /etc/logstash add ES_API_KEY_ID --stdin
             # echo "$API_KEY_SECRET" | sudo /usr/share/logstash/bin/logstash-keystore --path.settings /etc/logstash add ES_API_KEY_SECRET --stdin
             
-            rm elastic_password.txt
+            #rm elastic_password.txt
           else
             echo "Logstash already installed."
             echo "restarting logstash"
@@ -352,29 +351,38 @@ runs:
 
           #checks
           sleep 20
+          echo "${LOGS_SEPARATOR}"
+          echo "checking cluster health to check elasticsearch status"
+          echo "decrypting elastic password"
+          gpg --batch --yes --passphrase "$GPG_PASSPHRASE" --decrypt elastic_password.txt.gpg > elastic_password.txt
+          ELASTIC_PASSWORD=\$(< elastic_password.txt)
+          echo "checkinh health"
           MAX_RETRIES=12
           RETRY_COUNT=0
 
-          until sudo curl -s -u elastic:$ELASTIC_PASSWORD https://localhost:9200/_cluster/health \
+          until sudo curl -s -u elastic:\$ELASTIC_PASSWORD https://localhost:9200/_cluster/health \
             --cacert /etc/elasticsearch/certs/http_ca.crt | grep -E -q '"status":"green"|"status":"yellow"'; do
-            if [ $RETRY_COUNT -ge $MAX_RETRIES ]; then
-              echo "Elasticsearch cluster failed to become healthy after $((MAX_RETRIES * 5)) seconds."
+            if [ \$RETRY_COUNT -ge \$MAX_RETRIES ]; then
+              echo "Elasticsearch cluster failed to become healthy after \$((MAX_RETRIES * 5)) seconds."
               echo "Attempting to restart Elasticsearch..."
               sudo systemctl restart elasticsearch
 
-              # Optional: wait and re-check after restart
-              sleep 10
+              sleep 30
               RETRY_COUNT=0  # Reset count to re-check after restart
               MAX_RETRIES=6  # Give fewer retries after restart
             else
-              echo "Waiting for Elasticsearch to become healthy... (${RETRY_COUNT}/${MAX_RETRIES})"
+              echo "Waiting for Elasticsearch to become healthy... (\${RETRY_COUNT}/\${MAX_RETRIES})"
               sleep 5
-              RETRY_COUNT=$((RETRY_COUNT + 1))
+              RETRY_COUNT=\$((RETRY_COUNT + 1))
             fi
           done
-
+          rm elastic_password.txt
+          echo "cluster healthy"
           sudo systemctl restart logstash
           sudo systemctl restart kibana
+
+          echo "${LOGS_SEPARATOR}"
+          echo "service status checks"
           sudo systemctl status elasticsearch
           sudo systemctl status logstash
           sudo systemctl status kibana