Remove jq usage

Pasindu Rupasinghe 6 months ago
parent 7734be4321
commit 545bd511d0

@ -3,9 +3,6 @@ FROM docker.elastic.co/beats/filebeat:8.2.0
# Switch to root user # Switch to root user
USER root USER root
#install jq to the container
RUN apt-get update && apt-get install -y jq
COPY entrypoint.sh /usr/local/bin/entrypoint.sh COPY entrypoint.sh /usr/local/bin/entrypoint.sh
RUN chmod +x /usr/local/bin/entrypoint.sh RUN chmod +x /usr/local/bin/entrypoint.sh

@ -1,15 +1,16 @@
#!/bin/bash #!/bin/bash
set -e set -e
# Path to the ECS metadata file # Check if ECS_CONTAINER_METADATA_FILE is set
METADATA_FILE=$(cat "$ECS_CONTAINER_METADATA_FILE") if [ -z "$ECS_CONTAINER_METADATA_FILE" ]; then
echo "ECS_CONTAINER_METADATA_FILE is not set or the server is running in local deployment environment"
fi
# Extract HostPrivateIPv4Address from the metadata file
HOST_PRIVATE_IP=$(cat $ECS_CONTAINER_METADATA_FILE | grep -oP '(?<=HostPrivateIPv4Address": ")[^"]+')
if [ -f "$METADATA_FILE" ]; then if [ "$HOST_PRIVATE_IP" != "null" ]; then
# Extract HostPrivateIPv4Address from the metadata file
HOST_PRIVATE_IP=$(jq -r '.HostPrivateIPv4Address' < "$METADATA_FILE")
if [ "$HOST_PRIVATE_IP" != "null" ]; then
echo "Host Private IP: $HOST_PRIVATE_IP" echo "Host Private IP: $HOST_PRIVATE_IP"
export HOST_PRIVATE_IP
# Define the input template file and output file # Define the input template file and output file
TEMPLATE_FILE="filebeat.template.yml" TEMPLATE_FILE="filebeat.template.yml"
@ -25,11 +26,8 @@ if [ -f "$METADATA_FILE" ]; then
rm -rf /usr/share/filebeat/elk rm -rf /usr/share/filebeat/elk
ln -sf "/opt/logs/${HOST_PRIVATE_IP}/elk" /usr/share/filebeat/elk ln -sf "/opt/logs/${HOST_PRIVATE_IP}/elk" /usr/share/filebeat/elk
ln -sf "/opt/filebeat-configs/${HOST_PRIVATE_IP}/filebeat.yml" /usr/share/filebeat/filebeat.yml ln -sf "/opt/filebeat-configs/${HOST_PRIVATE_IP}/filebeat.yml" /usr/share/filebeat/filebeat.yml
else
echo "HostPrivateIPv4Address not found in metadata file"
fi
else else
echo "Metadata file does not exist" echo "HostPrivateIPv4Address not found"
fi fi
# Run the original filebeat entrypoint # Run the original filebeat entrypoint

Loading…
Cancel
Save