mirror of
https://github.com/myvesta/vesta
synced 2025-08-20 21:34:12 -07:00
listing scripts refactoring + new format
This commit is contained in:
parent
b7e9f4b5b0
commit
6e0ef668bb
60 changed files with 3695 additions and 1991 deletions
|
@ -15,6 +15,100 @@ format=${1-shell}
|
|||
# Includes
|
||||
source $VESTA/func/main.sh
|
||||
|
||||
# JSON list function
|
||||
json_list() {
|
||||
IFS=$'\n'
|
||||
i=1
|
||||
objects=$(grep DATE $VESTA/data/users/admin/overall_stats.log |wc -l)
|
||||
echo "{"
|
||||
while read str; do
|
||||
eval $str
|
||||
echo -n ' "'$DATE'": {
|
||||
"TIME": "'$TIME'",
|
||||
"PACKAGE": "'$PACKAGE'",
|
||||
"IP_OWNED": "'$IP_OWNED'",
|
||||
"DISK_QUOTA": "'$DISK_QUOTA'",
|
||||
"U_DISK": "'$U_DISK'",
|
||||
"U_DISK_DIRS": "'$U_DISK_DIRS'",
|
||||
"U_DISK_WEB": "'$U_DISK_WEB'",
|
||||
"U_DISK_MAIL": "'$U_DISK_MAIL'",
|
||||
"U_DISK_DB": "'$U_DISK_DB'",
|
||||
"BANDWIDTH": "'$BANDWIDTH'",
|
||||
"U_BANDWIDTH": "'$U_BANDWIDTH'",
|
||||
"U_WEB_DOMAINS": "'$U_WEB_DOMAINS'",
|
||||
"U_WEB_SSL": "'$U_WEB_SSL'",
|
||||
"U_WEB_ALIASES": "'$U_WEB_ALIASES'",
|
||||
"U_DNS_DOMAINS": "'$U_DNS_DOMAINS'",
|
||||
"U_DNS_RECORDS": "'$U_DNS_RECORDS'",
|
||||
"U_MAIL_DOMAINS": "'$U_MAIL_DOMAINS'",
|
||||
"U_MAIL_DKIM": "'$U_MAIL_DKIM'",
|
||||
"U_MAIL_ACCOUNTS": "'$U_MAIL_ACCOUNTS'",
|
||||
"U_DATABASES": "'$U_DATABASES'",
|
||||
"U_CRON_JOBS": "'$U_CRON_JOBS'",
|
||||
"U_BACKUPS": "'$U_BACKUPS'",
|
||||
"U_USERS": "'$U_USERS'"
|
||||
}'
|
||||
if [ "$i" -lt "$objects" ]; then
|
||||
echo ','
|
||||
else
|
||||
echo
|
||||
fi
|
||||
((i++))
|
||||
done < <(cat $VESTA/data/users/admin/overall_stats.log)
|
||||
echo '}'
|
||||
}
|
||||
|
||||
# SHELL list function
|
||||
shell_list() {
|
||||
IFS=$'\n'
|
||||
echo "DATE USER WEB DNS MAIL DB BACKUPS IP DISK BW"
|
||||
echo "---- ---- --- --- ---- -- ------- -- ---- --"
|
||||
while read str; do
|
||||
eval $str
|
||||
if [ -z "$U_USERS" ]; then
|
||||
U_USERS=1
|
||||
fi
|
||||
echo -n "$DATE $U_USERS $U_WEB_DOMAINS $U_DNS_DOMAINS "
|
||||
echo -n "$U_MAIL_DOMAINS $U_DATABASES $U_BACKUPS $IP_OWNED "
|
||||
echo "$U_DISK $U_BANDWIDTH"
|
||||
done < <(cat $VESTA/data/users/admin/overall_stats.log)
|
||||
}
|
||||
|
||||
# PLAIN list function
|
||||
plain_list() {
|
||||
IFS=$'\n'
|
||||
while read str; do
|
||||
eval $str
|
||||
echo -ne "$DATE\t$TIME\t$PACKAGE\t$IP_OWNED\t$DISK_QUOTA\t$U_DISK\t"
|
||||
echo -ne "$U_DISK_DIRS\t$U_DISK_WEB\t$U_DISK_MAIL\t$U_DISK_DB\t"
|
||||
echo -ne "$BANDWIDTH\t$U_BANDWIDTH\t$U_WEB_DOMAINS\t$U_WEB_SSL\t"
|
||||
echo -ne "$U_WEB_ALIASES\t$U_DNS_DOMAINS\t$U_DNS_RECORDS\t"
|
||||
echo -ne "$U_MAIL_DOMAINS\t$U_MAIL_DKIM\t$U_MAIL_ACCOUNTS\t"
|
||||
echo -e "$U_DATABASES\t$U_CRON_JOBS\t$U_BACKUPS\t$U_USERS"
|
||||
done < <(cat $VESTA/data/users/admin/overall_stats.log)
|
||||
}
|
||||
|
||||
# CSV list function
|
||||
csv_list() {
|
||||
IFS=$'\n'
|
||||
echo -n "DATE,TIME,PACKAGE,IP_OWNED,DISK_QUOTA,U_DISK,"
|
||||
echo -n "U_DISK_DIRS,U_DISK_WEB,U_DISK_MAIL,U_DISK_DB,"
|
||||
echo -n "BANDWIDTH,U_BANDWIDTH,U_WEB_DOMAINS,U_WEB_SSL,"
|
||||
echo -n "U_WEB_ALIASES,U_DNS_DOMAINS,U_DNS_RECORDS,"
|
||||
echo -n "U_MAIL_DOMAINS,U_MAIL_DKIM,U_MAIL_ACCOUNTS,"
|
||||
echo "U_DATABASES,U_CRON_JOBS,U_BACKUPS,U_USERS"
|
||||
|
||||
while read str; do
|
||||
eval $str
|
||||
echo -n "$DATE,$TIME,$PACKAGE,$IP_OWNED,$DISK_QUOTA,$U_DISK,"
|
||||
echo -n "$U_DISK_DIRS,$U_DISK_WEB,$U_DISK_MAIL,$U_DISK_DB,"
|
||||
echo -n "$BANDWIDTH,$U_BANDWIDTH,$U_WEB_DOMAINS,$U_WEB_SSL,"
|
||||
echo -n "$U_WEB_ALIASES,$U_DNS_DOMAINS,$U_DNS_RECORDS,"
|
||||
echo -n "$U_MAIL_DOMAINS,$U_MAIL_DKIM,$U_MAIL_ACCOUNTS,"
|
||||
echo "$U_DATABASES,$U_CRON_JOBS,$U_BACKUPS,$U_USERS"
|
||||
done < <(cat $VESTA/data/users/admin/overall_stats.log)
|
||||
}
|
||||
|
||||
|
||||
#----------------------------------------------------------#
|
||||
# Verifications #
|
||||
|
@ -33,21 +127,12 @@ if [ ! -e "$conf" ]; then
|
|||
touch $conf
|
||||
fi
|
||||
|
||||
# Defining fileds to select
|
||||
fields="\$DATE \$TIME \$PACKAGE \$IP_OWNED \$DISK_QUOTA \$U_DISK \$U_DISK_DIRS"
|
||||
fields="$fields \$U_DISK_WEB \$U_DISK_MAIL \$U_DISK_DB \$BANDWIDTH"
|
||||
fields="$fields \$U_BANDWIDTH \$U_WEB_DOMAINS \$U_WEB_SSL \$U_WEB_ALIASES"
|
||||
fields="$fields \$U_DNS_DOMAINS \$U_DNS_RECORDS \$U_MAIL_DOMAINS \$U_MAIL_DKIM"
|
||||
fields="$fields \$U_MAIL_ACCOUNTS \$U_DATABASES \$U_CRON_JOBS \$U_BACKUPS"
|
||||
|
||||
# Listing domains
|
||||
case $format in
|
||||
# Listing data
|
||||
case $format in
|
||||
json) json_list ;;
|
||||
plain) nohead=1; shell_list ;;
|
||||
shell) fields='$DATE $U_DISK $U_BANDWIDTH $U_WEB_DOMAINS $U_DATABASES';
|
||||
fields="$fields \$U_DATABASES"
|
||||
shell_list | column -t ;;
|
||||
*) check_args '1' '0' '[FORMAT]'
|
||||
plain) plain_list ;;
|
||||
csv) csv_list ;;
|
||||
shell) shell_list |column -t ;;
|
||||
esac
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue