Fixes all the command line options for conferences, participants and time period.
parent
d5a9a74879
commit
5f4b3dc467
339
jilo-cli
339
jilo-cli
|
@ -7,8 +7,8 @@
|
||||||
# Command line interface (jilo-cli)
|
# Command line interface (jilo-cli)
|
||||||
###
|
###
|
||||||
|
|
||||||
VERSION="0.1"
|
VERSION="0.1.1-dev"
|
||||||
RELEASE_DATE="2024-06-12"
|
RELEASE_DATE="unreleased"
|
||||||
|
|
||||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" #"
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" #"
|
||||||
|
|
||||||
|
@ -73,9 +73,7 @@ JOIN
|
||||||
WHERE (ce.time >= '%s' AND ce.time <= '%s')
|
WHERE (ce.time >= '%s' AND ce.time <= '%s')
|
||||||
ORDER BY
|
ORDER BY
|
||||||
c.id;"
|
c.id;"
|
||||||
db_conferences_id_template="SELECT * FROM conferences WHERE conference_id='%s';"
|
|
||||||
db_conferences_name_template="SELECT * FROM conferences WHERE conference_name='%s';"
|
|
||||||
db_conference_events_template="SELECT * FROM conference_events WHERE conference_id='%s';"
|
|
||||||
db_conference_by_id_template="
|
db_conference_by_id_template="
|
||||||
SELECT
|
SELECT
|
||||||
pe.time,
|
pe.time,
|
||||||
|
@ -119,6 +117,7 @@ AND (event_time >= '%s' AND event_time <= '%s')
|
||||||
|
|
||||||
ORDER BY
|
ORDER BY
|
||||||
pe.time;"
|
pe.time;"
|
||||||
|
|
||||||
db_conference_by_name_template="
|
db_conference_by_name_template="
|
||||||
SELECT
|
SELECT
|
||||||
pe.time,
|
pe.time,
|
||||||
|
@ -165,14 +164,16 @@ ORDER BY
|
||||||
|
|
||||||
## participant related
|
## participant related
|
||||||
|
|
||||||
db_participants_all_template="SELECT jitsi_component, endpoint_id, conference_id FROM participants ORDER BY id;"
|
db_participants_all_template="
|
||||||
db_participants_id_template="SELECT * FROM participants WHERE endpoint_id='%s';"
|
SELECT DISTINCT
|
||||||
db_participant_events_template="SELECT * FROM participant_events WHERE participant_id='%s';"
|
p.jitsi_component, p.endpoint_id, p.conference_id
|
||||||
|
FROM
|
||||||
db_participants_endpoint_template="SELECT * FROM participants WHERE endpoint_id='%s';"
|
participants p
|
||||||
db_participants_conference_template="SELECT * FROM participants WHERE conference_id='%s';"
|
JOIN
|
||||||
db_participants_statsid_template="SELECT * FROM participant_events WHERE event_type = 'stats_id' AND event_param LIKE '%%%s%%';"
|
participant_events pe ON p.endpoint_id = pe.participant_id
|
||||||
db_participants_ip_template="SELECT * FROM participant_events WHERE event_type = 'pair selected' AND event_param='%s';"
|
WHERE
|
||||||
|
pe.time >= '%s' AND pe.time <= '%s'
|
||||||
|
ORDER BY p.id;"
|
||||||
|
|
||||||
db_conference_by_participant_id_template="
|
db_conference_by_participant_id_template="
|
||||||
SELECT
|
SELECT
|
||||||
|
@ -194,6 +195,7 @@ LEFT JOIN
|
||||||
participant_events pe ON p.endpoint_id = pe.participant_id
|
participant_events pe ON p.endpoint_id = pe.participant_id
|
||||||
WHERE
|
WHERE
|
||||||
p.endpoint_id = '%s'
|
p.endpoint_id = '%s'
|
||||||
|
AND (pe.time >= '%s' AND pe.time <= '%s')
|
||||||
|
|
||||||
UNION
|
UNION
|
||||||
|
|
||||||
|
@ -212,6 +214,7 @@ LEFT JOIN
|
||||||
conference_events ce ON c.conference_id = ce.conference_id
|
conference_events ce ON c.conference_id = ce.conference_id
|
||||||
WHERE
|
WHERE
|
||||||
participant_id = '%s'
|
participant_id = '%s'
|
||||||
|
AND (event_time >= '%s' AND event_time <= '%s')
|
||||||
|
|
||||||
ORDER BY
|
ORDER BY
|
||||||
pe.time;"
|
pe.time;"
|
||||||
|
@ -235,7 +238,8 @@ LEFT JOIN
|
||||||
LEFT JOIN
|
LEFT JOIN
|
||||||
participant_events pe ON p.endpoint_id = pe.participant_id
|
participant_events pe ON p.endpoint_id = pe.participant_id
|
||||||
WHERE
|
WHERE
|
||||||
pe.event_param = '%s'
|
c.conference_id = '%s'
|
||||||
|
AND (pe.time >= '%s' AND pe.time <= '%s')
|
||||||
|
|
||||||
UNION
|
UNION
|
||||||
|
|
||||||
|
@ -253,7 +257,51 @@ FROM
|
||||||
LEFT JOIN
|
LEFT JOIN
|
||||||
conference_events ce ON c.conference_id = ce.conference_id
|
conference_events ce ON c.conference_id = ce.conference_id
|
||||||
WHERE
|
WHERE
|
||||||
event_param = '%s'
|
ce.conference_id = '%s'
|
||||||
|
AND (event_time >= '%s' AND event_time <= '%s')
|
||||||
|
|
||||||
|
ORDER BY
|
||||||
|
pe.time;"
|
||||||
|
|
||||||
|
db_participant_by_conference_name_template="
|
||||||
|
SELECT
|
||||||
|
pe.time,
|
||||||
|
c.conference_id,
|
||||||
|
c.conference_name,
|
||||||
|
c.conference_host,
|
||||||
|
pe.loglevel,
|
||||||
|
pe.event_type,
|
||||||
|
p.endpoint_id AS participant_id,
|
||||||
|
pe.event_param
|
||||||
|
FROM
|
||||||
|
conferences c
|
||||||
|
LEFT JOIN
|
||||||
|
conference_events ce ON c.conference_id = ce.conference_id
|
||||||
|
LEFT JOIN
|
||||||
|
participants p ON c.conference_id = p.conference_id
|
||||||
|
LEFT JOIN
|
||||||
|
participant_events pe ON p.endpoint_id = pe.participant_id
|
||||||
|
WHERE
|
||||||
|
c.conference_name LIKE '%%%s%%'
|
||||||
|
AND (pe.time >= '%s' AND pe.time <= '%s')
|
||||||
|
|
||||||
|
UNION
|
||||||
|
|
||||||
|
SELECT
|
||||||
|
ce.time AS event_time,
|
||||||
|
c.conference_id,
|
||||||
|
c.conference_name,
|
||||||
|
c.conference_host,
|
||||||
|
ce.loglevel,
|
||||||
|
ce.conference_event AS event_type,
|
||||||
|
NULL AS participant_id,
|
||||||
|
ce.conference_param AS event_param
|
||||||
|
FROM
|
||||||
|
conferences c
|
||||||
|
LEFT JOIN
|
||||||
|
conference_events ce ON c.conference_id = ce.conference_id
|
||||||
|
WHERE c.conference_name LIKE '%%%s%%'
|
||||||
|
AND (event_time >= '%s' AND event_time <= '%s')
|
||||||
|
|
||||||
ORDER BY
|
ORDER BY
|
||||||
pe.time;"
|
pe.time;"
|
||||||
|
@ -278,6 +326,7 @@ LEFT JOIN
|
||||||
participant_events pe ON p.endpoint_id = pe.participant_id
|
participant_events pe ON p.endpoint_id = pe.participant_id
|
||||||
WHERE
|
WHERE
|
||||||
pe.event_type = 'stats_id' AND pe.event_param LIKE '%%%s%%'
|
pe.event_type = 'stats_id' AND pe.event_param LIKE '%%%s%%'
|
||||||
|
AND (pe.time >= '%s' AND pe.time <= '%s')
|
||||||
|
|
||||||
UNION
|
UNION
|
||||||
|
|
||||||
|
@ -296,6 +345,7 @@ LEFT JOIN
|
||||||
conference_events ce ON c.conference_id = ce.conference_id
|
conference_events ce ON c.conference_id = ce.conference_id
|
||||||
WHERE
|
WHERE
|
||||||
event_type = 'stats_id' AND event_param LIKE '%%%s%%'
|
event_type = 'stats_id' AND event_param LIKE '%%%s%%'
|
||||||
|
AND (event_time >= '%s' AND event_time <= '%s')
|
||||||
|
|
||||||
ORDER BY
|
ORDER BY
|
||||||
pe.time;"
|
pe.time;"
|
||||||
|
@ -320,6 +370,7 @@ LEFT JOIN
|
||||||
participant_events pe ON p.endpoint_id = pe.participant_id
|
participant_events pe ON p.endpoint_id = pe.participant_id
|
||||||
WHERE
|
WHERE
|
||||||
pe.event_type = 'pair selected' AND pe.event_param = '%s'
|
pe.event_type = 'pair selected' AND pe.event_param = '%s'
|
||||||
|
AND (pe.time >= '%s' AND pe.time <= '%s')
|
||||||
|
|
||||||
UNION
|
UNION
|
||||||
|
|
||||||
|
@ -338,6 +389,7 @@ LEFT JOIN
|
||||||
conference_events ce ON c.conference_id = ce.conference_id
|
conference_events ce ON c.conference_id = ce.conference_id
|
||||||
WHERE
|
WHERE
|
||||||
event_type = 'pair selected' AND event_param = '%s'
|
event_type = 'pair selected' AND event_param = '%s'
|
||||||
|
AND (event_time >= '%s' AND event_time <= '%s')
|
||||||
|
|
||||||
ORDER BY
|
ORDER BY
|
||||||
pe.time;"
|
pe.time;"
|
||||||
|
@ -387,13 +439,14 @@ ORDER BY
|
||||||
pe.time;"
|
pe.time;"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
help="Usage:
|
help="Usage:
|
||||||
$0 [OPTION]
|
$0 [OPTION]
|
||||||
Options:
|
Options:
|
||||||
--conference|-c [conference ID or name] - show specific conference(s), all of empty
|
--conference|-c [conference ID or name] - show specific conference(s), all of empty
|
||||||
--participant|-p [participant endpoint ID, conference ID, participant IP, or participant stats ID] - show specific participant(s), all if empty
|
--participant|-p [participant endpoint ID, conference ID, conference name, participant IP, or participant stats ID] - show specific participant(s), all if empty
|
||||||
--time|-t - show stats for a time interval
|
--time|-t - show stats for a time interval; can be use separately ot together with -c or -p
|
||||||
|
--verbose|-v - show more details, when available
|
||||||
|
--silent|-s - show less details, more suitable for scripting
|
||||||
--help|-h - show this help message
|
--help|-h - show this help message
|
||||||
--version|-V - show version"
|
--version|-V - show version"
|
||||||
|
|
||||||
|
@ -402,6 +455,16 @@ version="JILO Jitsi Logs Observer command line client
|
||||||
version $VERSION
|
version $VERSION
|
||||||
released on $RELEASE_DATE"
|
released on $RELEASE_DATE"
|
||||||
|
|
||||||
|
time_formats="Expected formats:
|
||||||
|
- exact times
|
||||||
|
YYYY-MM-DD, YYYY-MM, YYYY
|
||||||
|
- exact periods
|
||||||
|
YYYY-MM-DD:YYYY-MM-DD, YYYY-MM:YYYY-MM, YYYY:YYYY
|
||||||
|
- from begining to given time
|
||||||
|
:YYYY-MM-DD, :YYYY-MM, :YYYY
|
||||||
|
- from given time until end
|
||||||
|
YYYY-MM-DD:, YYYY-MM:, YYYY:"
|
||||||
|
|
||||||
|
|
||||||
###
|
###
|
||||||
|
|
||||||
|
@ -504,15 +567,7 @@ parse_time_range() {
|
||||||
until_time="9999-12-31"
|
until_time="9999-12-31"
|
||||||
|
|
||||||
else
|
else
|
||||||
echo -e "Invalid time range. Expected formats:
|
echo -e "Invalid time range. $time_formats" >&2
|
||||||
- exact times
|
|
||||||
YYYY-MM-DD, YYYY-MM, YYYY
|
|
||||||
- exact periods
|
|
||||||
YYYY-MM-DD:YYYY-MM-DD, YYYY-MM:YYYY-MM, YYYY:YYYY
|
|
||||||
- from begining to given time
|
|
||||||
:YYYY-MM-DD, :YYYY-MM, :YYYY
|
|
||||||
- from given time until end
|
|
||||||
YYYY-MM-DD:, YYYY-MM:, YYYY:" >&2
|
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -521,7 +576,6 @@ parse_time_range() {
|
||||||
|
|
||||||
### commandline options
|
### commandline options
|
||||||
|
|
||||||
cmd=""
|
|
||||||
conference_arg=""
|
conference_arg=""
|
||||||
conference_option=false
|
conference_option=false
|
||||||
participant_arg=""
|
participant_arg=""
|
||||||
|
@ -531,10 +585,16 @@ until_time="9999-12-31"
|
||||||
time_option=false
|
time_option=false
|
||||||
time_range_specified=false
|
time_range_specified=false
|
||||||
|
|
||||||
|
# display help if no arguments
|
||||||
|
if [[ $# -eq 0 ]]; then
|
||||||
|
echo -e "$help"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
# then check all the options
|
||||||
while [[ $# -gt 0 ]]; do
|
while [[ $# -gt 0 ]]; do
|
||||||
case "$1" in
|
case "$1" in
|
||||||
-c | --conference )
|
-c | --conference )
|
||||||
cmd="--conference"
|
|
||||||
conference_option=true
|
conference_option=true
|
||||||
if [[ -n "$2" && "$2" != -* ]]; then
|
if [[ -n "$2" && "$2" != -* ]]; then
|
||||||
conference_arg="$2"
|
conference_arg="$2"
|
||||||
|
@ -544,7 +604,6 @@ while [[ $# -gt 0 ]]; do
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
-p | --participant)
|
-p | --participant)
|
||||||
cmd="--participant"
|
|
||||||
participant_option=true
|
participant_option=true
|
||||||
if [[ -n "$2" && "$2" != -* ]]; then
|
if [[ -n "$2" && "$2" != -* ]]; then
|
||||||
participant_arg="$2"
|
participant_arg="$2"
|
||||||
|
@ -554,14 +613,12 @@ while [[ $# -gt 0 ]]; do
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
-t | --time)
|
-t | --time)
|
||||||
cmd="--time"
|
|
||||||
time_option=true
|
time_option=true
|
||||||
if [[ -n "$2" && "$2" != -* ]]; then
|
if [[ -n "$2" && "$2" != -* ]]; then
|
||||||
time_arg="$2"
|
|
||||||
parse_time_range "$2"
|
parse_time_range "$2"
|
||||||
shift 2
|
shift 2
|
||||||
else
|
else
|
||||||
echo "Option -t needs time range argument in format 'from-time - until-time', YYYY-MM-DD - YYYY-MM-DD" >&2
|
echo "Option -t needs a time range argument. $time_formats" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
@ -569,6 +626,10 @@ while [[ $# -gt 0 ]]; do
|
||||||
verbose=true
|
verbose=true
|
||||||
shift
|
shift
|
||||||
;;
|
;;
|
||||||
|
-s | --silent)
|
||||||
|
silent=true
|
||||||
|
shift
|
||||||
|
;;
|
||||||
-h | --help)
|
-h | --help)
|
||||||
echo -e "$help"
|
echo -e "$help"
|
||||||
exit 0
|
exit 0
|
||||||
|
@ -599,8 +660,18 @@ if [[ "$conference_option" == true ]]; then
|
||||||
# we check if the argument to "--conference" is a conference ID
|
# we check if the argument to "--conference" is a conference ID
|
||||||
# conference ID is unique, so we show that conference
|
# conference ID is unique, so we show that conference
|
||||||
if [[ "${#conferences_id[@]}" -gt 0 ]]; then
|
if [[ "${#conferences_id[@]}" -gt 0 ]]; then
|
||||||
|
|
||||||
|
output=""
|
||||||
# prepare the header
|
# prepare the header
|
||||||
|
if [[ "$silent" != true ]]; then
|
||||||
|
header="\nConferences with ID matching \"$IMPORTANT_TEXT$conference_arg$NORMAL_TEXT\""
|
||||||
|
if [[ "$time_range_specified" == true ]]; then
|
||||||
|
header+=" for the time period \"$from_time - $until_time\""
|
||||||
|
fi
|
||||||
|
header+="\n"
|
||||||
|
echo -e "$header"
|
||||||
output="time\tconference ID\tconference name\tconference host\tloglevel\tparticipant ID\tevent\tparameter\n"
|
output="time\tconference ID\tconference name\tconference host\tloglevel\tparticipant ID\tevent\tparameter\n"
|
||||||
|
fi
|
||||||
# prepare the formatted rows
|
# prepare the formatted rows
|
||||||
for row in "${conferences_id[@]}"; do
|
for row in "${conferences_id[@]}"; do
|
||||||
IFS='|' read -r time conference_id conference_name conference_host loglevel event_type participant_id event_param <<< "$row"
|
IFS='|' read -r time conference_id conference_name conference_host loglevel event_type participant_id event_param <<< "$row"
|
||||||
|
@ -612,8 +683,18 @@ if [[ "$conference_option" == true ]]; then
|
||||||
# then we check if the argument to "--conference" is a conference name
|
# then we check if the argument to "--conference" is a conference name
|
||||||
# if so, we show all matching conferences (conference names are not unique)
|
# if so, we show all matching conferences (conference names are not unique)
|
||||||
elif [[ "${#conferences_name[@]}" -gt 0 ]]; then
|
elif [[ "${#conferences_name[@]}" -gt 0 ]]; then
|
||||||
|
|
||||||
|
output=""
|
||||||
# prepare the header
|
# prepare the header
|
||||||
|
if [[ "$silent" != true ]]; then
|
||||||
|
header="\nConferences with names matching \"$IMPORTANT_TEXT$conference_arg$NORMAL_TEXT\""
|
||||||
|
if [[ "$time_range_specified" == true ]]; then
|
||||||
|
header+=" for the time period \"$from_time - $until_time\""
|
||||||
|
fi
|
||||||
|
header+="\n"
|
||||||
|
echo -e "$header"
|
||||||
output="time\tconf ID\tconf name\tconf host\tloglevel\tparticipant ID\tevent\tparameter\n"
|
output="time\tconf ID\tconf name\tconf host\tloglevel\tparticipant ID\tevent\tparameter\n"
|
||||||
|
fi
|
||||||
# prepare the formatted rows
|
# prepare the formatted rows
|
||||||
for row in "${conferences_name[@]}"; do
|
for row in "${conferences_name[@]}"; do
|
||||||
IFS='|' read -r time conference_id conference_name conference_host loglevel event_type participant_id event_param <<< "$row"
|
IFS='|' read -r time conference_id conference_name conference_host loglevel event_type participant_id event_param <<< "$row"
|
||||||
|
@ -624,11 +705,13 @@ if [[ "$conference_option" == true ]]; then
|
||||||
|
|
||||||
# nothing found for neither conference ID or name
|
# nothing found for neither conference ID or name
|
||||||
else
|
else
|
||||||
|
if [[ "$silent" != true ]]; then
|
||||||
echo "No match found for \"$conference_arg\""
|
echo "No match found for \"$conference_arg\""
|
||||||
if [[ "$time_range_specified" == true ]]; then
|
if [[ "$time_range_specified" == true ]]; then
|
||||||
echo "and time period $from_time - $until_time"
|
echo "and time period $from_time - $until_time"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
exit 0
|
exit 0
|
||||||
else
|
else
|
||||||
# if no argument is given, we show all the conferences
|
# if no argument is given, we show all the conferences
|
||||||
|
@ -647,49 +730,56 @@ if [[ "$conference_option" == true ]]; then
|
||||||
# output
|
# output
|
||||||
echo -e "$output" | column -t -s $'\t'
|
echo -e "$output" | column -t -s $'\t'
|
||||||
else
|
else
|
||||||
|
if [[ "$silent" != true ]]; then
|
||||||
echo -n "No conferences found"
|
echo -n "No conferences found"
|
||||||
if [[ "$time_range_specified" == true ]]; then
|
if [[ "$time_range_specified" == true ]]; then
|
||||||
echo -n " for the time period \"$from_time - $until_time\""
|
echo -n " for the time period \"$from_time - $until_time\""
|
||||||
fi
|
fi
|
||||||
echo "."
|
echo "."
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
elif [[ "$participant_option" == true ]]; then
|
elif [[ "$participant_option" == true ]]; then
|
||||||
echo 'hi'
|
|
||||||
elif [[ "$time_option" == true ]]; then
|
|
||||||
echo 'hi'
|
|
||||||
fi
|
|
||||||
|
|
||||||
case "$cmd" in
|
# the argument to "--participant" can be endpointID, conferenceID, conference name, startsID, IP address
|
||||||
|
# check for participants match within a time period (or all if period not given)
|
||||||
--conference)
|
|
||||||
;;
|
|
||||||
|
|
||||||
--participant)
|
|
||||||
# the argument to "--participant" can be endpointID, conferenceID, startsID, IP address
|
|
||||||
# we check for all ot them and show the matches
|
# we check for all ot them and show the matches
|
||||||
|
## FIXME - we don't catch the case with no results found at all, no message is displayed if no results ## FIXME
|
||||||
if [[ -n "$participant_arg" ]]; then
|
if [[ -n "$participant_arg" ]]; then
|
||||||
db_participants_endpoint=$(printf "$db_participants_endpoint_template" "$participant_arg")
|
|
||||||
participants_endpoint=$(db_query "$db_participants_endpoint")
|
|
||||||
|
|
||||||
db_participants_conference=$(printf "$db_participants_conference_template" "$participant_arg")
|
db_participants_endpoint=$(printf "$db_conference_by_participant_id_template" "$participant_arg" "$from_time" "$until_time" "$participant_arg" "$from_time" "$until_time")
|
||||||
participants_conference=$(db_query "$db_participants_conference")
|
mapfile -t participants_endpoint < <(db_query "$db_participants_endpoint")
|
||||||
|
|
||||||
db_participants_statsid=$(printf "$db_participants_statsid_template" "$participant_arg")
|
db_participants_conference=$(printf "$db_participant_by_conference_id_template" "$participant_arg" "$from_time" "$until_time" "$participant_arg" "$from_time" "$until_time")
|
||||||
participants_statsid=$(db_query "$db_participants_statsid")
|
mapfile -t participants_conference < <(db_query "$db_participants_conference")
|
||||||
|
|
||||||
db_participants_ip=$(printf "$db_participants_ip_template" "$participant_arg")
|
db_participants_conference_name=$(printf "$db_participant_by_conference_name_template" "$participant_arg" "$from_time" "$until_time" "$participant_arg" "$from_time" "$until_time")
|
||||||
participants_ip=$(db_query "$db_participants_ip")
|
mapfile -t participants_conference_name < <(db_query "$db_participants_conference_name")
|
||||||
|
|
||||||
if [[ -n $participants_endpoint ]]; then
|
db_participants_statsid=$(printf "$db_participant_by_stats_id_template" "$participant_arg" "$from_time" "$until_time" "$participant_arg" "$from_time" "$until_time")
|
||||||
db_participant=$(printf "$db_conference_by_participant_id_template" "$participant_arg" "$participant_arg")
|
mapfile -t participants_statsid < <(db_query "$db_participants_statsid")
|
||||||
mapfile -t conference_array < <(db_query "$db_participant")
|
|
||||||
|
db_participants_ip=$(printf "$db_participant_by_ip_template" "$participant_arg" "$from_time" "$until_time" "$participant_arg" "$from_time" "$until_time")
|
||||||
|
mapfile -t participants_ip < <(db_query "$db_participants_ip")
|
||||||
|
|
||||||
|
# match for participant endpoint_id
|
||||||
|
if [[ "${#participants_endpoint[@]}" -gt 0 ]]; then
|
||||||
|
|
||||||
|
output=""
|
||||||
# prepare the header
|
# prepare the header
|
||||||
|
if [[ "$silent" != true ]]; then
|
||||||
|
header="\nParticipants with ID matching \"$IMPORTANT_TEXT$participant_arg$NORMAL_TEXT\""
|
||||||
|
if [[ "$time_range_specified" == true ]]; then
|
||||||
|
header+=" for the time period \"$from_time - $until_time\""
|
||||||
|
fi
|
||||||
|
header+="\n"
|
||||||
|
echo -e "$header"
|
||||||
output="time\tconference ID\tconference name\tconference host\tloglevel\tparticipant ID\tevent\tparameter\n"
|
output="time\tconference ID\tconference name\tconference host\tloglevel\tparticipant ID\tevent\tparameter\n"
|
||||||
|
fi
|
||||||
# prepare the formatted rows
|
# prepare the formatted rows
|
||||||
for row in "${conference_array[@]}"; do
|
for row in "${participants_endpoint[@]}"; do
|
||||||
IFS='|' read -r time conference_id conference_name conference_host loglevel event_type participant_id event_param <<< "$row"
|
IFS='|' read -r time conference_id conference_name conference_host loglevel event_type participant_id event_param <<< "$row"
|
||||||
output+="$time\t$conference_id\t$conference_name\t$conference_host\t$loglevel\t$IMPORTANT_TEXT$participant_id$NORMAL_TEXT\t$event_type\t$event_param\n"
|
output+="$time\t$conference_id\t$conference_name\t$conference_host\t$loglevel\t$IMPORTANT_TEXT$participant_id$NORMAL_TEXT\t$event_type\t$event_param\n"
|
||||||
done
|
done
|
||||||
|
@ -697,13 +787,22 @@ case "$cmd" in
|
||||||
echo -e "$output" | column -t -s $'\t'
|
echo -e "$output" | column -t -s $'\t'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -n $participants_conference ]]; then
|
# match for conference_id the participant was in
|
||||||
db_participant=$(printf "$db_participant_by_conference_id_template" "$participant_arg" "$participant_arg")
|
if [[ "${#participants_conference[@]}" -gt 0 ]]; then
|
||||||
mapfile -t conference_array < <(db_query "$db_participant")
|
|
||||||
|
output=""
|
||||||
# prepare the header
|
# prepare the header
|
||||||
output="time\tconference ID\tconference name\tconference host\tloglevel\tparticipant ID\tevent\tparameter\n"
|
if [[ "$silent" != true ]]; then
|
||||||
|
header="\nParticipants in conferences with ID matching \"$IMPORTANT_TEXT$participant_arg$NORMAL_TEXT\""
|
||||||
|
if [[ "$time_range_specified" == true ]]; then
|
||||||
|
header+=" for the time period \"$from_time - $until_time\""
|
||||||
|
fi
|
||||||
|
header+="\n"
|
||||||
|
echo -e "$header"
|
||||||
|
output+="time\tconference ID\tconference name\tconference host\tloglevel\tparticipant ID\tevent\tparameter\n"
|
||||||
|
fi
|
||||||
# prepare the formatted rows
|
# prepare the formatted rows
|
||||||
for row in "${conference_array[@]}"; do
|
for row in "${participants_conference[@]}"; do
|
||||||
IFS='|' read -r time conference_id conference_name conference_host loglevel event_type participant_id event_param <<< "$row"
|
IFS='|' read -r time conference_id conference_name conference_host loglevel event_type participant_id event_param <<< "$row"
|
||||||
output+="$time\t$IMPORTANT_TEXT$conference_id$NORMAL_TEXT\t$conference_name\t$conference_host\t$loglevel\t$participant_id\t$event_type\t$event_param\n"
|
output+="$time\t$IMPORTANT_TEXT$conference_id$NORMAL_TEXT\t$conference_name\t$conference_host\t$loglevel\t$participant_id\t$event_type\t$event_param\n"
|
||||||
done
|
done
|
||||||
|
@ -711,13 +810,45 @@ case "$cmd" in
|
||||||
echo -e "$output" | column -t -s $'\t'
|
echo -e "$output" | column -t -s $'\t'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -n $participants_statsid ]]; then
|
# match for conference_name the participant was in
|
||||||
db_participant=$(printf "$db_participant_by_stats_id_template" "$participant_arg" "$participant_arg")
|
if [[ "${#participants_conference_name[@]}" -gt 0 ]]; then
|
||||||
mapfile -t conference_array < <(db_query "$db_participant")
|
|
||||||
|
output=""
|
||||||
# prepare the header
|
# prepare the header
|
||||||
output="time\tconference ID\tconference name\tconference host\tloglevel\tparticipant ID\tevent\tparameter\n"
|
if [[ "$silent" != true ]]; then
|
||||||
|
header="\nParticipants in conferences with name that include the string \"$IMPORTANT_TEXT$participant_arg$NORMAL_TEXT\""
|
||||||
|
if [[ "$time_range_specified" == true ]]; then
|
||||||
|
header+=" for the time period \"$from_time - $until_time\""
|
||||||
|
fi
|
||||||
|
header+="\n"
|
||||||
|
echo -e "$header"
|
||||||
|
output+="time\tconference ID\tconference name\tconference host\tloglevel\tparticipant ID\tevent\tparameter\n"
|
||||||
|
fi
|
||||||
# prepare the formatted rows
|
# prepare the formatted rows
|
||||||
for row in "${conference_array[@]}"; do
|
for row in "${participants_conference_name[@]}"; do
|
||||||
|
IFS='|' read -r time conference_id conference_name conference_host loglevel event_type participant_id event_param <<< "$row"
|
||||||
|
output+="$time\t$conference_id\t$IMPORTANT_TEXT$conference_name$NORMAL_TEXT\t$conference_host\t$loglevel\t$participant_id\t$event_type\t$event_param\n"
|
||||||
|
done
|
||||||
|
# output
|
||||||
|
echo -e "$output" | column -t -s $'\t'
|
||||||
|
fi
|
||||||
|
|
||||||
|
# match for participant stats_id
|
||||||
|
if [[ "${#participants_statsid[@]}" -gt 0 ]]; then
|
||||||
|
|
||||||
|
output=""
|
||||||
|
# prepare the header
|
||||||
|
if [[ "$silent" != true ]]; then
|
||||||
|
header="\nParticipants with stats ID that include the string \"$IMPORTANT_TEXT$participant_arg$NORMAL_TEXT\""
|
||||||
|
if [[ "$time_range_specified" == true ]]; then
|
||||||
|
header+=" for the time period \"$from_time - $until_time\""
|
||||||
|
fi
|
||||||
|
header+="\n"
|
||||||
|
echo -e "$header"
|
||||||
|
output+="time\tconference ID\tconference name\tconference host\tloglevel\tparticipant ID\tevent\tparameter\n"
|
||||||
|
fi
|
||||||
|
# prepare the formatted rows
|
||||||
|
for row in "${participants_statsid[@]}"; do
|
||||||
IFS='|' read -r time conference_id conference_name conference_host loglevel event_type participant_id event_param <<< "$row"
|
IFS='|' read -r time conference_id conference_name conference_host loglevel event_type participant_id event_param <<< "$row"
|
||||||
output+="$time\t$conference_id\t$conference_name\t$conference_host\t$loglevel\t$participant_id\t$event_type\t$IMPORTANT_TEXT$event_param$NORMAL_TEXT\n"
|
output+="$time\t$conference_id\t$conference_name\t$conference_host\t$loglevel\t$participant_id\t$event_type\t$IMPORTANT_TEXT$event_param$NORMAL_TEXT\n"
|
||||||
done
|
done
|
||||||
|
@ -725,13 +856,22 @@ case "$cmd" in
|
||||||
echo -e "$output" | column -t -s $'\t'
|
echo -e "$output" | column -t -s $'\t'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -n $participants_ip ]]; then
|
# match for participant IP
|
||||||
db_participant=$(printf "$db_participant_by_ip_template" "$participant_arg" "$participant_arg")
|
if [[ "${#participants_ip[@]}" -gt 0 ]]; then
|
||||||
mapfile -t conference_array < <(db_query "$db_participant")
|
|
||||||
|
output=""
|
||||||
# prepare the header
|
# prepare the header
|
||||||
output="time\tconference ID\tconference name\tconference host\tloglevel\tparticipant ID\tevent\tparameter\n"
|
if [[ "$silent" != true ]]; then
|
||||||
|
header="\nParticipants with IP address matching \"$IMPORTANT_TEXT$participant_arg$NORMAL_TEXT\""
|
||||||
|
if [[ "$time_range_specified" == true ]]; then
|
||||||
|
header+=" for the time period \"$from_time - $until_time\""
|
||||||
|
fi
|
||||||
|
header+="\n"
|
||||||
|
echo -e "$header"
|
||||||
|
output+="time\tconference ID\tconference name\tconference host\tloglevel\tparticipant ID\tevent\tparameter\n"
|
||||||
|
fi
|
||||||
# prepare the formatted rows
|
# prepare the formatted rows
|
||||||
for row in "${conference_array[@]}"; do
|
for row in "${participants_ip[@]}"; do
|
||||||
IFS='|' read -r time conference_id conference_name conference_host loglevel event_type participant_id event_param <<< "$row"
|
IFS='|' read -r time conference_id conference_name conference_host loglevel event_type participant_id event_param <<< "$row"
|
||||||
output+="$time\t$conference_id\t$conference_name\t$conference_host\t$loglevel\t$participant_id\t$event_type\t$IMPORTANT_TEXT$event_param$NORMAL_TEXT\n"
|
output+="$time\t$conference_id\t$conference_name\t$conference_host\t$loglevel\t$participant_id\t$event_type\t$IMPORTANT_TEXT$event_param$NORMAL_TEXT\n"
|
||||||
done
|
done
|
||||||
|
@ -741,10 +881,24 @@ case "$cmd" in
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
else
|
else
|
||||||
db_participants_all=$(printf "$db_participants_all_template" )
|
|
||||||
|
# if no argument is given, we show all the participants
|
||||||
|
db_participants_all=$(printf "$db_participants_all_template" "$from_time" "$until_time")
|
||||||
mapfile -t participant_array < <(db_query "$db_participants_all")
|
mapfile -t participant_array < <(db_query "$db_participants_all")
|
||||||
|
|
||||||
|
# we only format the outrput if there are conferences to show
|
||||||
|
if [[ "${#participant_array[@]}" -gt 0 ]]; then
|
||||||
|
output=""
|
||||||
# prepare the header
|
# prepare the header
|
||||||
output="component\tparticipant ID\tconference ID\n"
|
if [[ "$silent" != true ]]; then
|
||||||
|
header="\nAll participants"
|
||||||
|
if [[ "$time_range_specified" == true ]]; then
|
||||||
|
header+=" for the time period \"$IMPORTANT_TEXT$from_time - $until_time$NORMAL_TEXT\""
|
||||||
|
fi
|
||||||
|
header+="\n"
|
||||||
|
echo -e "$header"
|
||||||
|
output+="component\tparticipant ID\tconference ID\n"
|
||||||
|
fi
|
||||||
# prepare the formatted rows
|
# prepare the formatted rows
|
||||||
for row in "${participant_array[@]}"; do
|
for row in "${participant_array[@]}"; do
|
||||||
IFS='|' read -r jitsi_component endpoint_id conference_id <<< "$row"
|
IFS='|' read -r jitsi_component endpoint_id conference_id <<< "$row"
|
||||||
|
@ -752,30 +906,49 @@ case "$cmd" in
|
||||||
done
|
done
|
||||||
# output
|
# output
|
||||||
echo -e "$output" | column -t -s $'\t'
|
echo -e "$output" | column -t -s $'\t'
|
||||||
|
else
|
||||||
|
if [[ "$silent" != true ]]; then
|
||||||
|
echo -n "No participants found"
|
||||||
|
if [[ "$time_range_specified" == true ]]; then
|
||||||
|
echo -n " for the time period \"$from_time - $until_time\""
|
||||||
|
fi
|
||||||
|
echo "."
|
||||||
|
fi
|
||||||
|
fi
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
;;
|
|
||||||
|
|
||||||
--time)
|
elif [[ "$time_option" == true ]]; then
|
||||||
|
|
||||||
if [[ "$time_range_specified" == true ]]; then
|
if [[ "$time_range_specified" == true ]]; then
|
||||||
echo "Events in the period $from_time - $until_time"
|
|
||||||
db_events_time=$(printf "$db_events_by_period_template" "$from_time" "$until_time" "$from_time" "$until_time")
|
db_events_time=$(printf "$db_events_by_period_template" "$from_time" "$until_time" "$from_time" "$until_time")
|
||||||
mapfile -t events_array < <(db_query "$db_events_time")
|
mapfile -t events_array < <(db_query "$db_events_time")
|
||||||
|
|
||||||
|
if [[ "${#events_array[@]}" -gt 0 ]]; then
|
||||||
|
output=""
|
||||||
# prepare the header
|
# prepare the header
|
||||||
|
if [[ "$silent" != true ]]; then
|
||||||
|
header="\nEvents in the period \"$IMPORTANT_TEXT$from_time - $until_time$NORMAL_TEXT\"\n"
|
||||||
output="time\tconference ID\tconference name\tconference host\tloglevel\tparticipant ID\tevent\tparameter\n"
|
output="time\tconference ID\tconference name\tconference host\tloglevel\tparticipant ID\tevent\tparameter\n"
|
||||||
|
echo -e "$header"
|
||||||
|
fi
|
||||||
# prepare the formatted rows
|
# prepare the formatted rows
|
||||||
for row in "${events_array[@]}"; do
|
for row in "${events_array[@]}"; do
|
||||||
IFS='|' read -r time conference_id conference_name conference_host loglevel event_type participant_id event_param <<< "$row"
|
IFS='|' read -r time conference_id conference_name conference_host loglevel event_type participant_id event_param <<< "$row"
|
||||||
output+="$time\t$conference_id\t$conference_name\t$conference_host\t$loglevel\t$event_type\t$participant_id\t$event_param\n"
|
output+="$IMPORTANT_TEXT$time$NORMAL_TEXT\t$conference_id\t$conference_name\t$conference_host\t$loglevel\t$event_type\t$participant_id\t$event_param\n"
|
||||||
done
|
done
|
||||||
# output
|
# output
|
||||||
echo -e "$output" | column -t -s $'\t'
|
echo -e "$output" | column -t -s $'\t'
|
||||||
|
else
|
||||||
|
if [[ "$silent" != true ]]; then
|
||||||
|
echo -n "No events found"
|
||||||
|
if [[ "$time_range_specified" == true ]]; then
|
||||||
|
echo -n " for the time period \"$from_time - $until_time\""
|
||||||
|
fi
|
||||||
|
echo "."
|
||||||
|
fi
|
||||||
|
fi
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
;;
|
|
||||||
|
|
||||||
*)
|
fi
|
||||||
echo -e "$help"
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
Loading…
Reference in New Issue