2828NS=$( jq -r ' .ns // .namespace' " $ZOMBIE_JSON " )
2929# test start time in milliseconds
3030FROM=$( jq -r ' .start_time_ts' " $ZOMBIE_JSON " )
31- # current time in milliseconds
32- TO=$( date +%s%3N)
31+ # current time in milliseconds + 60 secs to allow loki to ingest logs
32+ TO=$(( $( date +% s% 3 N) + 60000 ) )
3333
3434make_url () {
3535 local name=" $1 "
36+ local to=" $2 "
3637 local url=" ${LOKI_URL_FOR_NODE// \{\{ namespace\}\} / $NS } "
3738 url=" ${url// \{\{ podName\}\} / $name } "
3839 url=" ${url// \{\{ from\}\} / $FROM } "
39- url=" ${url// \{\{ to\}\} / $TO } "
40+ url=" ${url// \{\{ to\}\} / $to } "
4041 echo " $url "
4142}
4243
@@ -54,6 +55,7 @@ if [[ $(echo "$NS" | grep -E "zombie-[A-Fa-f0-9]+-") ]]; then
5455fi ;
5556
5657jq -r $JQ_QUERY_RELAY " $ZOMBIE_JSON " | while read -r name; do
58+ local_to=$TO
5759 if [[ " $ZOMBIE_PROVIDER " == " k8s" ]]; then
5860 # Fetching logs from k8s
5961 if ! kubectl logs " $name " -c " $name " -n " $NS " > " $TARGET_DIR /$name .log" ; then
@@ -68,23 +70,19 @@ jq -r $JQ_QUERY_RELAY "$ZOMBIE_JSON" | while read -r name; do
6870
6971 # send logs to loki
7072 if [ -d " $LOKI_DIR_FOR_NATIVE_LOGS " ]; then
71- echo " send logs to loki for node: $name " ;
7273 awk -v NS=" $NS " -v NAME=" $name " ' {print NS" "NAME" " $0}' $TARGET_DIR /$name .log >> $LOKI_DIR_FOR_NATIVE_LOGS /to-loki.log
74+ local_to=$(( $(date +% s% 3 N) + 60000 ))
7375 fi
7476 fi
75- echo -e " \t$name : $( make_url " $name " ) "
77+ echo -e " \t$name : $( make_url " $name " " $local_to " ) "
7678done
7779echo " "
7880
79- # Debug
80- echo " \n"
81- cat $ZOMBIE_JSON
82- echo " \n"
83-
8481# Handle parachains grouped by paraId
8582jq -r ' .paras // .parachains | to_entries[] | "\(.key)"' " $ZOMBIE_JSON " | while read -r para_id; do
8683 echo " ParaId: $para_id "
87- jq -r --arg pid " $para_id " " '$JQ_QUERY_PARA_NODES '" " $ZOMBIE_JSON " | while read -r name; do
84+ jq -r --arg pid " $para_id " " $JQ_QUERY_PARA_NODES " " $ZOMBIE_JSON " | while read -r name; do
85+ local_to=$TO
8886 if [[ " $ZOMBIE_PROVIDER " == " k8s" ]]; then
8987 # Fetching logs from k8s
9088 if ! kubectl logs " $name " -c " $name " -n " $NS " > " $TARGET_DIR /$name .log" ; then
@@ -99,11 +97,11 @@ jq -r '.paras // .parachains | to_entries[] | "\(.key)"' "$ZOMBIE_JSON" | while
9997
10098 # send logs to loki
10199 if [ -d " $LOKI_DIR_FOR_NATIVE_LOGS " ]; then
102- echo " send logs to loki for node: $name " ;
103100 awk -v NS=" $NS " -v NAME=" $name " ' {print NS" "NAME" " $0}' $TARGET_DIR /$name .log >> $LOKI_DIR_FOR_NATIVE_LOGS /to-loki.log
101+ local_to=$(( $(date +% s% 3 N) + 60000 ))
104102 fi
105103 fi
106- echo -e " \t$name : $( make_url " $name " ) "
104+ echo -e " \t$name : $( make_url " $name " " $local_to " ) "
107105 done
108106 echo " "
109107done
0 commit comments