fix: escape runtime vars in unquoted heredoc, eliminate sed dependency #48
@@ -41,70 +41,62 @@ echo "[1/3] Creating directory..."
|
||||
mkdir -p "$(dirname "$AGENT_BIN")"
|
||||
|
||||
echo "[2/3] Installing agent binary..."
|
||||
cat > "$AGENT_BIN" << 'AGENTSCRIPT'
|
||||
cat > "$AGENT_BIN" << EOF
|
||||
#!/bin/bash
|
||||
|
||||
SERVER_URL="@SERVER_URL@"
|
||||
AGENT_KEY="@AGENT_KEY@"
|
||||
INTERVAL=@INTERVAL@
|
||||
SERVER_URL="$SERVER_URL"
|
||||
AGENT_KEY="$AGENT_KEY"
|
||||
INTERVAL=$INTERVAL
|
||||
|
||||
collect_metrics() {
|
||||
CPU=$(top -bn1 2>/dev/null | grep 'Cpu(s)' | awk '{print $2}' | cut -d'%' -f1 || true)
|
||||
[ -z "$CPU" ] && CPU=0
|
||||
RAM=$(free 2>/dev/null | grep Mem | awk '{printf "%.1f", $3/$2 * 100}' || true)
|
||||
[ -z "$RAM" ] && RAM=0
|
||||
DISK=$(df / 2>/dev/null | tail -1 | awk '{print $5}' | sed 's/%//' || true)
|
||||
[ -z "$DISK" ] && DISK=0
|
||||
LOAD=$(cat /proc/loadavg 2>/dev/null | awk '{print $1}' || true)
|
||||
[ -z "$LOAD" ] && LOAD=0
|
||||
UPTIME=$(uptime -p 2>/dev/null | sed 's/^up //' || true)
|
||||
[ -z "$UPTIME" ] && UPTIME=""
|
||||
CPU=\$(top -bn1 2>/dev/null | grep 'Cpu(s)' | awk '{print \$2}' | cut -d'%' -f1 || true)
|
||||
[ -z "\$CPU" ] && CPU=0
|
||||
RAM=\$(free 2>/dev/null | grep Mem | awk '{printf "%.1f", \$3/\$2 * 100}' || true)
|
||||
[ -z "\$RAM" ] && RAM=0
|
||||
DISK=\$(df / 2>/dev/null | tail -1 | awk '{print \$5}' | sed 's/%//' || true)
|
||||
[ -z "\$DISK" ] && DISK=0
|
||||
LOAD=\$(cat /proc/loadavg 2>/dev/null | awk '{print \$1}' || true)
|
||||
[ -z "\$LOAD" ] && LOAD=0
|
||||
UPTIME=\$(uptime -p 2>/dev/null | sed 's/^up //' || true)
|
||||
[ -z "\$UPTIME" ] && UPTIME=""
|
||||
}
|
||||
|
||||
push_metrics() {
|
||||
payload=$(cat <<EOF
|
||||
payload=\$(cat << 'PAYLOAD'
|
||||
{
|
||||
"agent_key": "$AGENT_KEY",
|
||||
"cpu": $CPU,
|
||||
"ram": $RAM,
|
||||
"disk": $DISK,
|
||||
"load": $LOAD,
|
||||
"uptime": "$UPTIME"
|
||||
"agent_key": "\$AGENT_KEY",
|
||||
"cpu": \$CPU,
|
||||
"ram": \$RAM,
|
||||
"disk": \$DISK,
|
||||
"load": \$LOAD,
|
||||
"uptime": "\$UPTIME"
|
||||
}
|
||||
EOF
|
||||
PAYLOAD
|
||||
)
|
||||
local code
|
||||
code=$(curl -s -X POST "$SERVER_URL/api/metrics/push" \
|
||||
code=\$(curl -s -X POST "$SERVER_URL/api/metrics/push" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d "$payload" \
|
||||
-d "\$payload" \
|
||||
--connect-timeout 10 --max-time 30 \
|
||||
-o /dev/null -w "%{http_code}" 2>/dev/null) || code=0
|
||||
echo "$code"
|
||||
echo "\$code"
|
||||
}
|
||||
|
||||
echo "ServerManager Agent started"
|
||||
echo " Server: $SERVER_URL/api/metrics/push"
|
||||
echo " Interval: ${INTERVAL}s"
|
||||
echo " Host: $(hostname)"
|
||||
echo " Interval: \${INTERVAL}s"
|
||||
echo " Host: \$(hostname)"
|
||||
sleep 2
|
||||
while true; do
|
||||
collect_metrics
|
||||
http_code=$(push_metrics)
|
||||
echo "[$(date)] HTTP $http_code"
|
||||
if [ "$http_code" = "200" ]; then
|
||||
true
|
||||
elif [ "$http_code" = "0" ]; then
|
||||
http_code=\$(push_metrics)
|
||||
echo "[\$(date)] HTTP \$http_code"
|
||||
if [ "\$http_code" = "0" ]; then
|
||||
echo " curl failed — check SERVER_URL=$SERVER_URL"
|
||||
fi
|
||||
sleep "$INTERVAL"
|
||||
sleep "\$INTERVAL"
|
||||
done
|
||||
AGENTSCRIPT
|
||||
|
||||
sed -i \
|
||||
"s|@SERVER_URL@|$SERVER_URL|g" \
|
||||
-e "s|@AGENT_KEY@|$AGENT_KEY|g" \
|
||||
-e "s|@INTERVAL@|$INTERVAL|g" \
|
||||
"$AGENT_BIN"
|
||||
EOF
|
||||
|
||||
chmod +x "$AGENT_BIN"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user