Update script
This commit is contained in:
parent
1c481ca4f2
commit
b584db73cc
|
@ -429,7 +429,7 @@
|
||||||
|
|
||||||
const dateButtons = dates.map(date => {
|
const dateButtons = dates.map(date => {
|
||||||
const button = document.createElement("button")
|
const button = document.createElement("button")
|
||||||
button.textContent = date
|
button.textContent = `${date.slice(0, 4)}-${date.slice(4, 6)}-${date.slice(6, 8)}`
|
||||||
if (curDate === date) button.className = "active"
|
if (curDate === date) button.className = "active"
|
||||||
return { date, button }
|
return { date, button }
|
||||||
})
|
})
|
||||||
|
|
35
zmap.sh
35
zmap.sh
|
@ -1,11 +1,7 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
DATE=$(date +"%Y-%m-%d")
|
|
||||||
|
|
||||||
# change these variables
|
# change these variables
|
||||||
DATA_FILENAME=full-scan
|
|
||||||
LOCAL_DATA_PATH=/data
|
LOCAL_DATA_PATH=/data
|
||||||
LOCAL_IPMAP_PATH=/scripts/ipmap.py
|
|
||||||
REMOTE_USER=root
|
REMOTE_USER=root
|
||||||
REMOTE_HOST=localhost
|
REMOTE_HOST=localhost
|
||||||
REMOTE_DATA_PATH=/data
|
REMOTE_DATA_PATH=/data
|
||||||
|
@ -13,22 +9,33 @@ REMOTE_TILES_PATH=/tiles
|
||||||
REMOTE_IPMAP_PATH=/scripts/ipmap.py
|
REMOTE_IPMAP_PATH=/scripts/ipmap.py
|
||||||
COLORMAPS=jet,fake_parula,viridis,plasma,thermal,batlow
|
COLORMAPS=jet,fake_parula,viridis,plasma,thermal,batlow
|
||||||
VARIANTS=density,rtt
|
VARIANTS=density,rtt
|
||||||
|
DAYS_KEPT=14
|
||||||
|
|
||||||
# do not change these variables
|
# do not change these variables
|
||||||
CSV_FILENAME="$DATA_FILENAME.csv"
|
DATE=$(date -u +"%Y%m%d")
|
||||||
PARQUET_FILENAME="$DATA_FILENAME.parquet"
|
KEEP_DATE=$(date -d "$DAYS_KEPT days ago" -u +"%Y%m%d")
|
||||||
|
CSV_FILENAME="full-scan.csv"
|
||||||
|
PARQUET_FILENAME="full-scan.parquet"
|
||||||
|
JSON_FILENAME="tiles.json"
|
||||||
CURRENT_LOCAL_DATA_PATH="$LOCAL_DATA_PATH/$DATE"
|
CURRENT_LOCAL_DATA_PATH="$LOCAL_DATA_PATH/$DATE"
|
||||||
LOCAL_CSV_PATH="$CURRENT_LOCAL_DATA_PATH/$CSV_FILENAME"
|
LOCAL_CSV_PATH="$CURRENT_LOCAL_DATA_PATH/$CSV_FILENAME"
|
||||||
LOCAL_PARQUET_PATH="$CURRENT_LOCAL_DATA_PATH/$PARQUET_FILENAME"
|
|
||||||
REMOTE="$REMOTE_USER@$REMOTE_HOST"
|
REMOTE="$REMOTE_USER@$REMOTE_HOST"
|
||||||
CURRENT_REMOTE_DATA_PATH="$REMOTE_DATA_PATH/$DATE"
|
CURRENT_REMOTE_DATA_PATH="$REMOTE_DATA_PATH/$DATE"
|
||||||
|
REMOTE_CSV_PATH="$CURRENT_REMOTE_DATA_PATH/$CSV_FILENAME"
|
||||||
REMOTE_PARQUET_PATH="$CURRENT_REMOTE_DATA_PATH/$PARQUET_FILENAME"
|
REMOTE_PARQUET_PATH="$CURRENT_REMOTE_DATA_PATH/$PARQUET_FILENAME"
|
||||||
|
REMOTE_JSON_PATH="$REMOTE_TILES_PATH/$JSON_FILENAME"
|
||||||
CURRENT_REMOTE_TILES_PATH="$REMOTE_TILES_PATH/$DATE"
|
CURRENT_REMOTE_TILES_PATH="$REMOTE_TILES_PATH/$DATE"
|
||||||
|
|
||||||
mkdir -p "$CURRENT_LOCAL_DATA_PATH" && \
|
mkdir -p "$CURRENT_LOCAL_DATA_PATH" &&
|
||||||
zmap -B '100M' -M icmp_echo_time '0.0.0.0/0' -f 'saddr,rtt_us,success' -o "$LOCAL_CSV_PATH" && \
|
zmap -B '100M' -M icmp_echo_time '0.0.0.0/0' -f 'saddr,rtt_us,success' -o "$LOCAL_CSV_PATH" &&
|
||||||
"$LOCAL_IPMAP_PATH" convert "$LOCAL_CSV_PATH" "$LOCAL_PARQUET_PATH" && \
|
ssh "$REMOTE" "mkdir -p '$CURRENT_REMOTE_DATA_PATH'" &&
|
||||||
ssh "$REMOTE" "'"mkdir -p "$CURRENT_REMOTE_DATA_PATH""'" && \
|
scp "$LOCAL_CSV_PATH" "'$REMOTE':'$REMOTE_CSV_PATH'" &&
|
||||||
scp "$LOCAL_PARQUET_PATH" "$REMOTE":"$REMOTE_PARQUET_PATH" && \
|
rm "$LOCAL_CSV_PATH" &&
|
||||||
ssh "$REMOTE" "'"mkdir -p "$CURRENT_REMOTE_TILES_PATH""'" && \
|
ssh "$REMOTE" "
|
||||||
ssh "$REMOTE" "'""$REMOTE_IPMAP_PATH" generate -a -c "$COLORMAPS" -v "$VARIANTS" "$REMOTE_PARQUET_PATH" "$CURRENT_REMOTE_TILES_PATH""'"
|
'$REMOTE_IPMAP_PATH' convert '$REMOTE_CSV_PATH' '$REMOTE_PARQUET_PATH' &&
|
||||||
|
rm '$REMOTE_CSV_PATH' &&
|
||||||
|
mkdir -p '$CURRENT_REMOTE_TILES_PATH' &&
|
||||||
|
'$REMOTE_IPMAP_PATH' generate -a -c '$COLORMAPS' -v '$VARIANTS' -j '$REMOTE_JSON_PATH' '$REMOTE_PARQUET_PATH' '$CURRENT_REMOTE_TILES_PATH'
|
||||||
|
cd '$REMOTE_DATA_PATH' && for f in *; do (( \$f < $date )) && rm \"\$f\"; done
|
||||||
|
cd '$REMOTE_TILES_PATH' && for f in *; do (( \$f < $date )) && '$REMOTE_IPMAP_PATH' remove -j '$REMOTE_JSON_PATH' \"\$f\"; done
|
||||||
|
"
|
||||||
|
|
Loading…
Reference in New Issue