mirror of
https://github.com/serghey-rodin/vesta.git
synced 2025-08-19 21:04:06 -07:00
mysql bugfix + updated rrd functions
This commit is contained in:
parent
2fe720fd06
commit
46e0bc239b
14 changed files with 161 additions and 110 deletions
|
@ -92,7 +92,6 @@ echo
|
||||||
|
|
||||||
# PAM
|
# PAM
|
||||||
echo "-- PAM --"
|
echo "-- PAM --"
|
||||||
pam='yes'
|
|
||||||
mkdir $tmpdir/pam
|
mkdir $tmpdir/pam
|
||||||
echo -e "$(date "+%F %T") passwd / shadow /group"
|
echo -e "$(date "+%F %T") passwd / shadow /group"
|
||||||
grep "^$user:" /etc/passwd > $tmpdir/pam/passwd
|
grep "^$user:" /etc/passwd > $tmpdir/pam/passwd
|
||||||
|
@ -451,15 +450,15 @@ for backup_record in $deprecated; do
|
||||||
done
|
done
|
||||||
|
|
||||||
# Concatenating string
|
# Concatenating string
|
||||||
backup_str="DATE='$DATE' TIME='$TIME' RUNTIME='$run_time'"
|
backup_str="BACKUP='$user.$DATE.tar'"
|
||||||
backup_str="$backup_str TYPE='$BACKUP_SYSTEM' SIZE='$size'"
|
backup_str="$backup_str TYPE='$BACKUP_SYSTEM' SIZE='$size'"
|
||||||
backup_str="$backup_str VESTA='$vst'"
|
backup_str="$backup_str VESTA='$vst'"
|
||||||
backup_str="$backup_str PAM='$pam'"
|
|
||||||
backup_str="$backup_str WEB='${web_list// /,}'"
|
backup_str="$backup_str WEB='${web_list// /,}'"
|
||||||
backup_str="$backup_str DNS='${dns_list// /,}'"
|
backup_str="$backup_str DNS='${dns_list// /,}'"
|
||||||
backup_str="$backup_str MAIL='${mail_list// /,}'"
|
backup_str="$backup_str MAIL='${mail_list// /,}'"
|
||||||
backup_str="$backup_str DB='${db_list// /,}'"
|
backup_str="$backup_str DB='${db_list// /,}'"
|
||||||
backup_str="$backup_str CRON='$cron_list'"
|
backup_str="$backup_str CRON='$cron_list'"
|
||||||
|
backup_str="$backup_str RUNTIME='$run_time' TIME='$TIME' DATE='$DATE'"
|
||||||
echo "$backup_str" >> $USER_DATA/backup.conf
|
echo "$backup_str" >> $USER_DATA/backup.conf
|
||||||
chmod 660 $USER_DATA/backup.conf
|
chmod 660 $USER_DATA/backup.conf
|
||||||
|
|
||||||
|
|
|
@ -36,14 +36,15 @@ if [ ! -e "$conf" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Defining fileds to select
|
# Defining fileds to select
|
||||||
fields="\$DATE \$TIME \$RUNTIME \$TYPE \$SIZE \$VESTA \$PAM \$WEB \$DNS \$DB"
|
fields="\$BACKUP \$TYPE \$SIZE \$VESTA \$PAM \$WEB \$DNS \$DB"
|
||||||
fields="$fields \$MAIL \$CRON"
|
fields="$fields \$MAIL \$CRON \$RUNTIME \$TIME \$DATE"
|
||||||
|
|
||||||
# Listing domains
|
# Listing domains
|
||||||
case $format in
|
case $format in
|
||||||
json) json_list ;;
|
json) json_list ;;
|
||||||
plain) nohead=1; shell_list ;;
|
plain) nohead=1; shell_list ;;
|
||||||
shell) fields='$DATE $TIME $RUNTIME $TYPE $SIZE'; shell_list |column -t;;
|
shell) fields='$BACKUP $TYPE $SIZE $RUNTIME $TIME $DATE';
|
||||||
|
shell_list |column -t;;
|
||||||
*) check_args '1' '0' '[format]' ;;
|
*) check_args '1' '0' '[format]' ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
# info: update system rrd charts
|
# info: update system rrd charts
|
||||||
# options: period
|
# options: none
|
||||||
#
|
#
|
||||||
# The script is wrapper for all rrd functions. It updates all
|
# The script is wrapper for all rrd functions. It updates all
|
||||||
# v_update_sys_rrd_* at once.
|
# v_update_sys_rrd_* at once.
|
||||||
|
@ -22,9 +22,6 @@ source $VESTA/func/shared.sh
|
||||||
PATH="$PATH:$BIN"
|
PATH="$PATH:$BIN"
|
||||||
export PATH
|
export PATH
|
||||||
|
|
||||||
# Argument defenition
|
|
||||||
period=$1
|
|
||||||
|
|
||||||
# Checking rrddir
|
# Checking rrddir
|
||||||
if [ ! -d "$RRD" ]; then
|
if [ ! -d "$RRD" ]; then
|
||||||
mkdir -p $RRD
|
mkdir -p $RRD
|
||||||
|
@ -35,37 +32,100 @@ fi
|
||||||
# Action #
|
# Action #
|
||||||
#----------------------------------------------------------#
|
#----------------------------------------------------------#
|
||||||
|
|
||||||
|
# Checking daily period
|
||||||
|
if [ -e "$RRD/daily.rrd" ]; then
|
||||||
|
mtime=$(stat -c "%Y" $RRD/daily.rrd)
|
||||||
|
ctime=$(date +%s)
|
||||||
|
dtime=$((ctime - mtime))
|
||||||
|
# Update every 5 minute
|
||||||
|
if [ "$dtime" -gt '290' ]; then
|
||||||
|
touch $RRD/daily.rrd
|
||||||
|
periods="$periods daily"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
touch $RRD/daily.rrd
|
||||||
|
periods="$periods daily"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Checking weekly period
|
||||||
|
if [ -e "$RRD/weekly.rrd" ]; then
|
||||||
|
mtime=$(stat -c "%Y" $RRD/weekly.rrd)
|
||||||
|
ctime=$(date +%s)
|
||||||
|
dtime=$((ctime - mtime))
|
||||||
|
# Update every hour
|
||||||
|
if [ "$dtime" -gt '3590' ]; then
|
||||||
|
touch $RRD/weekly.rrd
|
||||||
|
periods="$periods weekly"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
touch $RRD/weekly.rrd
|
||||||
|
periods="$periods weekly"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Checking monthly period
|
||||||
|
if [ -e "$RRD/monthly.rrd" ]; then
|
||||||
|
mtime=$(stat -c "%Y" $RRD/monthly.rrd)
|
||||||
|
ctime=$(date +%s)
|
||||||
|
dtime=$((ctime - mtime))
|
||||||
|
# Update every 6 hours
|
||||||
|
if [ "$dtime" -gt '21590' ]; then
|
||||||
|
touch $RRD/monthly.rrd
|
||||||
|
periods="$periods monthly"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
touch $RRD/monthly.rrd
|
||||||
|
periods="$periods monthly"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Checking yearly period
|
||||||
|
if [ -e "$RRD/yearly.rrd" ]; then
|
||||||
|
mtime=$(stat -c "%Y" $RRD/yearly.rrd)
|
||||||
|
ctime=$(date +%s)
|
||||||
|
dtime=$((ctime - mtime))
|
||||||
|
# Update every 12 hours
|
||||||
|
if [ "$dtime" -gt '43190' ]; then
|
||||||
|
touch $RRD/yearly.rrd
|
||||||
|
periods="$periods yearly"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
touch $RRD/yearly.rrd
|
||||||
|
periods="$periods yearly"
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
# Updateing system stats
|
# Updateing system stats
|
||||||
$BIN/v_update_sys_rrd_la $period
|
for period in $periods; do
|
||||||
$BIN/v_update_sys_rrd_net $period
|
|
||||||
$BIN/v_update_sys_rrd_mem $period
|
|
||||||
$BIN/v_update_sys_rrd_ssh $period
|
|
||||||
|
|
||||||
# Updating web stats
|
$BIN/v_update_sys_rrd_la $period
|
||||||
if [ "$WEB_SYSTEM" = 'apache' ]; then
|
$BIN/v_update_sys_rrd_net $period
|
||||||
$BIN/v_update_sys_rrd_httpd $period
|
$BIN/v_update_sys_rrd_mem $period
|
||||||
fi
|
$BIN/v_update_sys_rrd_ssh $period
|
||||||
|
|
||||||
if [ "$PROXY_SYSTEM" = 'nginx' ]; then
|
# Updating web stats
|
||||||
$BIN/v_update_sys_rrd_nginx $period
|
if [ "$WEB_SYSTEM" = 'apache' ]; then
|
||||||
fi
|
$BIN/v_update_sys_rrd_httpd $period
|
||||||
|
fi
|
||||||
|
|
||||||
# Updating ftp stats
|
if [ "$PROXY_SYSTEM" = 'nginx' ]; then
|
||||||
if [ ! -z "$FTP_SYSTEM" ] && [ "$FTP_SYSTEM" != 'no' ]; then
|
$BIN/v_update_sys_rrd_nginx $period
|
||||||
$BIN/v_update_sys_rrd_ftp $period
|
fi
|
||||||
fi
|
|
||||||
|
|
||||||
# Updating db stats
|
# Updating ftp stats
|
||||||
if [ ! -z "$DB_SYSTEM" ] && [ "$DB_SYSTEM" != 'no' ]; then
|
if [ ! -z "$FTP_SYSTEM" ] && [ "$FTP_SYSTEM" != 'no' ]; then
|
||||||
for type in ${DB_SYSTEM//,/ }; do
|
$BIN/v_update_sys_rrd_ftp $period
|
||||||
# Switching on db type
|
fi
|
||||||
case $type in
|
|
||||||
mysql) $BIN/v_update_sys_rrd_mysql $period ;;
|
|
||||||
pgsql) $BIN/v_update_sys_rrd_pgsql $period ;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
# Updating db stats
|
||||||
|
if [ ! -z "$DB_SYSTEM" ] && [ "$DB_SYSTEM" != 'no' ]; then
|
||||||
|
for type in ${DB_SYSTEM//,/ }; do
|
||||||
|
# Switching on db type
|
||||||
|
case $type in
|
||||||
|
mysql) $BIN/v_update_sys_rrd_mysql $period ;;
|
||||||
|
pgsql) $BIN/v_update_sys_rrd_pgsql $period ;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
#----------------------------------------------------------#
|
#----------------------------------------------------------#
|
||||||
# Vesta #
|
# Vesta #
|
||||||
|
|
|
@ -10,7 +10,6 @@
|
||||||
#----------------------------------------------------------#
|
#----------------------------------------------------------#
|
||||||
|
|
||||||
# Argument defenition
|
# Argument defenition
|
||||||
update=$1
|
|
||||||
period=${1-daily}
|
period=${1-daily}
|
||||||
|
|
||||||
# Includes
|
# Includes
|
||||||
|
@ -52,7 +51,7 @@ if [ ! -e "$RRD/ftp/ftp.rrd" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Parsing data
|
# Parsing data
|
||||||
if [ -z "$update" ]; then
|
if [ "$period" = 'daily' ]; then
|
||||||
a=0
|
a=0
|
||||||
a=$(ps aux |grep $FTP_SYSTEM |grep -v grep| grep -v nobody|\
|
a=$(ps aux |grep $FTP_SYSTEM |grep -v grep| grep -v nobody|\
|
||||||
grep -v root|wc -l)
|
grep -v root|wc -l)
|
||||||
|
@ -70,14 +69,14 @@ rrdtool graph $RRD/ftp/$period-ftp.png \
|
||||||
--end "$end" \
|
--end "$end" \
|
||||||
--vertical-label "Connections" \
|
--vertical-label "Connections" \
|
||||||
--x-grid "$grid" \
|
--x-grid "$grid" \
|
||||||
-c "BACK#484439" \
|
-c "BACK#7a766d" \
|
||||||
-c "SHADEA#484439" \
|
-c "SHADEA#7a766d" \
|
||||||
-c "SHADEB#484439" \
|
-c "SHADEB#7a766d" \
|
||||||
-c "FONT#DDDDDD" \
|
-c "FONT#FFFFFF" \
|
||||||
-c "CANVAS#202020" \
|
-c "CANVAS#302c2d" \
|
||||||
-c "GRID#666666" \
|
-c "GRID#666666" \
|
||||||
-c "MGRID#AAAAAA" \
|
-c "MGRID#AAAAAA" \
|
||||||
-c "FRAME#202020" \
|
-c "FRAME#302c2d" \
|
||||||
-c "ARROW#FFFFFF" \
|
-c "ARROW#FFFFFF" \
|
||||||
DEF:a=$RRD/ftp/ftp.rrd:A:AVERAGE \
|
DEF:a=$RRD/ftp/ftp.rrd:A:AVERAGE \
|
||||||
COMMENT:'\r' \
|
COMMENT:'\r' \
|
||||||
|
|
|
@ -10,7 +10,6 @@
|
||||||
#----------------------------------------------------------#
|
#----------------------------------------------------------#
|
||||||
|
|
||||||
# Argument defenition
|
# Argument defenition
|
||||||
update=$1
|
|
||||||
period=${1-daily}
|
period=${1-daily}
|
||||||
|
|
||||||
# Includes
|
# Includes
|
||||||
|
@ -53,7 +52,7 @@ if [ ! -e "$RRD/web/httpd.rrd" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Parsing data
|
# Parsing data
|
||||||
if [ -z "$update" ]; then
|
if [ "$period" = 'daily' ]; then
|
||||||
server_status=$(wget -qO- http://localhost:8081/server-status |\
|
server_status=$(wget -qO- http://localhost:8081/server-status |\
|
||||||
grep 'currently being processed'| \
|
grep 'currently being processed'| \
|
||||||
cut -f 2 -d '>' |\
|
cut -f 2 -d '>' |\
|
||||||
|
@ -76,14 +75,14 @@ rrdtool graph $RRD/web/$period-httpd.png \
|
||||||
--end "$end" \
|
--end "$end" \
|
||||||
--vertical-label "Connections" \
|
--vertical-label "Connections" \
|
||||||
--x-grid "$grid" \
|
--x-grid "$grid" \
|
||||||
-c "BACK#484439" \
|
-c "BACK#7a766d" \
|
||||||
-c "SHADEA#484439" \
|
-c "SHADEA#7a766d" \
|
||||||
-c "SHADEB#484439" \
|
-c "SHADEB#7a766d" \
|
||||||
-c "FONT#DDDDDD" \
|
-c "FONT#FFFFFF" \
|
||||||
-c "CANVAS#202020" \
|
-c "CANVAS#302c2d" \
|
||||||
-c "GRID#666666" \
|
-c "GRID#666666" \
|
||||||
-c "MGRID#AAAAAA" \
|
-c "MGRID#AAAAAA" \
|
||||||
-c "FRAME#202020" \
|
-c "FRAME#302c2d" \
|
||||||
-c "ARROW#FFFFFF" \
|
-c "ARROW#FFFFFF" \
|
||||||
DEF:a=$RRD/web/httpd.rrd:A:AVERAGE \
|
DEF:a=$RRD/web/httpd.rrd:A:AVERAGE \
|
||||||
COMMENT:'\r' \
|
COMMENT:'\r' \
|
||||||
|
|
|
@ -10,7 +10,6 @@
|
||||||
#----------------------------------------------------------#
|
#----------------------------------------------------------#
|
||||||
|
|
||||||
# Argument defenition
|
# Argument defenition
|
||||||
update=$1
|
|
||||||
period=${1-daily}
|
period=${1-daily}
|
||||||
|
|
||||||
# Includes
|
# Includes
|
||||||
|
@ -53,7 +52,7 @@ if [ ! -e "$RRD/la/la.rrd" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Parsing data
|
# Parsing data
|
||||||
if [ -z "$update" ]; then
|
if [ "$period" = 'daily' ]; then
|
||||||
loadavg=$(cat /proc/loadavg )
|
loadavg=$(cat /proc/loadavg )
|
||||||
la=$(echo "$loadavg"|cut -f 2 -d ' ')
|
la=$(echo "$loadavg"|cut -f 2 -d ' ')
|
||||||
pr=$(echo "$loadavg"|cut -f 4 -d ' '|cut -f 2 -d /)
|
pr=$(echo "$loadavg"|cut -f 4 -d ' '|cut -f 2 -d /)
|
||||||
|
@ -71,14 +70,14 @@ rrdtool graph $RRD/la/$period-la.png \
|
||||||
--end "$end" \
|
--end "$end" \
|
||||||
--vertical-label "Points" \
|
--vertical-label "Points" \
|
||||||
--x-grid "$grid" \
|
--x-grid "$grid" \
|
||||||
-c "BACK#484439" \
|
-c "BACK#7a766d" \
|
||||||
-c "SHADEA#484439" \
|
-c "SHADEA#7a766d" \
|
||||||
-c "SHADEB#484439" \
|
-c "SHADEB#7a766d" \
|
||||||
-c "FONT#DDDDDD" \
|
-c "FONT#FFFFFF" \
|
||||||
-c "CANVAS#202020" \
|
-c "CANVAS#302c2d" \
|
||||||
-c "GRID#666666" \
|
-c "GRID#666666" \
|
||||||
-c "MGRID#AAAAAA" \
|
-c "MGRID#AAAAAA" \
|
||||||
-c "FRAME#202020" \
|
-c "FRAME#484243" \
|
||||||
-c "ARROW#FFFFFF" \
|
-c "ARROW#FFFFFF" \
|
||||||
DEF:la=$RRD/la/la.rrd:LA:AVERAGE \
|
DEF:la=$RRD/la/la.rrd:LA:AVERAGE \
|
||||||
DEF:pr=$RRD/la/la.rrd:PR:AVERAGE \
|
DEF:pr=$RRD/la/la.rrd:PR:AVERAGE \
|
||||||
|
|
|
@ -10,7 +10,6 @@
|
||||||
#----------------------------------------------------------#
|
#----------------------------------------------------------#
|
||||||
|
|
||||||
# Argument defenition
|
# Argument defenition
|
||||||
update=$1
|
|
||||||
period=${1-daily}
|
period=${1-daily}
|
||||||
|
|
||||||
# Includes
|
# Includes
|
||||||
|
@ -53,7 +52,7 @@ if [ ! -e "$RRD/mem/mem.rrd" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Parsing data
|
# Parsing data
|
||||||
if [ -z "$update" ]; then
|
if [ "$period" = 'daily' ]; then
|
||||||
mem=$(free -m)
|
mem=$(free -m)
|
||||||
ram=$(echo "$mem" |awk '{print $3}'|head -n2 |tail -n1)
|
ram=$(echo "$mem" |awk '{print $3}'|head -n2 |tail -n1)
|
||||||
swap=$(echo "$mem" |awk '{print $3}'|tail -n1)
|
swap=$(echo "$mem" |awk '{print $3}'|tail -n1)
|
||||||
|
@ -71,14 +70,14 @@ rrdtool graph $RRD/mem/$period-mem.png \
|
||||||
--end "$end" \
|
--end "$end" \
|
||||||
--vertical-label "Mbytes" \
|
--vertical-label "Mbytes" \
|
||||||
--x-grid "$grid" \
|
--x-grid "$grid" \
|
||||||
-c "BACK#484439" \
|
-c "BACK#7a766d" \
|
||||||
-c "SHADEA#484439" \
|
-c "SHADEA#7a766d" \
|
||||||
-c "SHADEB#484439" \
|
-c "SHADEB#7a766d" \
|
||||||
-c "FONT#DDDDDD" \
|
-c "FONT#FFFFFF" \
|
||||||
-c "CANVAS#202020" \
|
-c "CANVAS#302c2d" \
|
||||||
-c "GRID#666666" \
|
-c "GRID#666666" \
|
||||||
-c "MGRID#AAAAAA" \
|
-c "MGRID#AAAAAA" \
|
||||||
-c "FRAME#202020" \
|
-c "FRAME#302c2d" \
|
||||||
-c "ARROW#FFFFFF" \
|
-c "ARROW#FFFFFF" \
|
||||||
DEF:ram=$RRD/mem/mem.rrd:RAM:AVERAGE \
|
DEF:ram=$RRD/mem/mem.rrd:RAM:AVERAGE \
|
||||||
DEF:swap=$RRD/mem/mem.rrd:SWAP:AVERAGE \
|
DEF:swap=$RRD/mem/mem.rrd:SWAP:AVERAGE \
|
||||||
|
|
|
@ -10,7 +10,6 @@
|
||||||
#----------------------------------------------------------#
|
#----------------------------------------------------------#
|
||||||
|
|
||||||
# Argument defenition
|
# Argument defenition
|
||||||
update=$1
|
|
||||||
period=${1-daily}
|
period=${1-daily}
|
||||||
|
|
||||||
# Includes
|
# Includes
|
||||||
|
@ -68,7 +67,7 @@ for host in $hosts; do
|
||||||
RRA:MAX:0.5:288:797
|
RRA:MAX:0.5:288:797
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -z "$update" ]; then
|
if [ "$period" = 'daily' ]; then
|
||||||
# Defining host credentials
|
# Defining host credentials
|
||||||
host_str=$(grep "HOST='$host'" $conf)
|
host_str=$(grep "HOST='$host'" $conf)
|
||||||
for key in $host_str; do
|
for key in $host_str; do
|
||||||
|
@ -107,14 +106,14 @@ for host in $hosts; do
|
||||||
--end "$end" \
|
--end "$end" \
|
||||||
--vertical-label "Queries" \
|
--vertical-label "Queries" \
|
||||||
--x-grid "$grid" \
|
--x-grid "$grid" \
|
||||||
-c "BACK#484439" \
|
-c "BACK#7a766d" \
|
||||||
-c "SHADEA#484439" \
|
-c "SHADEA#7a766d" \
|
||||||
-c "SHADEB#484439" \
|
-c "SHADEB#7a766d" \
|
||||||
-c "FONT#DDDDDD" \
|
-c "FONT#FFFFFF" \
|
||||||
-c "CANVAS#202020" \
|
-c "CANVAS#302c2d" \
|
||||||
-c "GRID#666666" \
|
-c "GRID#666666" \
|
||||||
-c "MGRID#AAAAAA" \
|
-c "MGRID#AAAAAA" \
|
||||||
-c "FRAME#202020" \
|
-c "FRAME#302c2d" \
|
||||||
-c "ARROW#FFFFFF" \
|
-c "ARROW#FFFFFF" \
|
||||||
DEF:a=$RRD/db/mysql_$host.rrd:A:AVERAGE \
|
DEF:a=$RRD/db/mysql_$host.rrd:A:AVERAGE \
|
||||||
DEF:s=$RRD/db/mysql_$host.rrd:S:AVERAGE \
|
DEF:s=$RRD/db/mysql_$host.rrd:S:AVERAGE \
|
||||||
|
|
|
@ -10,7 +10,6 @@
|
||||||
#----------------------------------------------------------#
|
#----------------------------------------------------------#
|
||||||
|
|
||||||
# Argument defenition
|
# Argument defenition
|
||||||
update=$1
|
|
||||||
period=${1-daily}
|
period=${1-daily}
|
||||||
|
|
||||||
# Includes
|
# Includes
|
||||||
|
@ -62,7 +61,7 @@ for iface in $ifaces; do
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Parsing device stats
|
# Parsing device stats
|
||||||
if [ -z "$update" ]; then
|
if [ "$period" = 'daily' ]; then
|
||||||
raw_iface=$(grep "$iface:" /proc/net/dev |sed -e "s/:/ /")
|
raw_iface=$(grep "$iface:" /proc/net/dev |sed -e "s/:/ /")
|
||||||
rx=$(echo "$raw_iface" |awk '{print $2}')
|
rx=$(echo "$raw_iface" |awk '{print $2}')
|
||||||
tx=$(echo "$raw_iface" |awk '{print $10}')
|
tx=$(echo "$raw_iface" |awk '{print $10}')
|
||||||
|
@ -80,14 +79,14 @@ for iface in $ifaces; do
|
||||||
--end "$end" \
|
--end "$end" \
|
||||||
--vertical-label "KBytes" \
|
--vertical-label "KBytes" \
|
||||||
--x-grid "$grid" \
|
--x-grid "$grid" \
|
||||||
-c "BACK#484439" \
|
-c "BACK#7a766d" \
|
||||||
-c "SHADEA#484439" \
|
-c "SHADEA#7a766d" \
|
||||||
-c "SHADEB#484439" \
|
-c "SHADEB#7a766d" \
|
||||||
-c "FONT#DDDDDD" \
|
-c "FONT#FFFFFF" \
|
||||||
-c "CANVAS#202020" \
|
-c "CANVAS#302c2d" \
|
||||||
-c "GRID#666666" \
|
-c "GRID#666666" \
|
||||||
-c "MGRID#AAAAAA" \
|
-c "MGRID#AAAAAA" \
|
||||||
-c "FRAME#202020" \
|
-c "FRAME#302c2d" \
|
||||||
-c "ARROW#FFFFFF" \
|
-c "ARROW#FFFFFF" \
|
||||||
DEF:inoctets=$RRD/net/$iface.rrd:RX:AVERAGE \
|
DEF:inoctets=$RRD/net/$iface.rrd:RX:AVERAGE \
|
||||||
DEF:outoctets=$RRD/net/$iface.rrd:TX:AVERAGE \
|
DEF:outoctets=$RRD/net/$iface.rrd:TX:AVERAGE \
|
||||||
|
|
|
@ -10,7 +10,6 @@
|
||||||
#----------------------------------------------------------#
|
#----------------------------------------------------------#
|
||||||
|
|
||||||
# Argument defenition
|
# Argument defenition
|
||||||
update=$1
|
|
||||||
period=${1-daily}
|
period=${1-daily}
|
||||||
|
|
||||||
# Includes
|
# Includes
|
||||||
|
@ -52,7 +51,7 @@ if [ ! -e "$RRD/web/nginx.rrd" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Parsing data
|
# Parsing data
|
||||||
if [ -z "$update" ]; then
|
if [ "$period" = 'daily' ]; then
|
||||||
a=$(wget -qO- http://localhost:8084/|head -n1|cut -f 3 -d ' ')
|
a=$(wget -qO- http://localhost:8084/|head -n1|cut -f 3 -d ' ')
|
||||||
|
|
||||||
# Updating rrd database
|
# Updating rrd database
|
||||||
|
@ -68,14 +67,14 @@ rrdtool graph $RRD/web/$period-nginx.png \
|
||||||
--end "$end" \
|
--end "$end" \
|
||||||
--vertical-label "Connections" \
|
--vertical-label "Connections" \
|
||||||
--x-grid "$grid" \
|
--x-grid "$grid" \
|
||||||
-c "BACK#484439" \
|
-c "BACK#7a766d" \
|
||||||
-c "SHADEA#484439" \
|
-c "SHADEA#7a766d" \
|
||||||
-c "SHADEB#484439" \
|
-c "SHADEB#7a766d" \
|
||||||
-c "FONT#DDDDDD" \
|
-c "FONT#FFFFFF" \
|
||||||
-c "CANVAS#202020" \
|
-c "CANVAS#302c2d" \
|
||||||
-c "GRID#666666" \
|
-c "GRID#666666" \
|
||||||
-c "MGRID#AAAAAA" \
|
-c "MGRID#AAAAAA" \
|
||||||
-c "FRAME#202020" \
|
-c "FRAME#302c2d" \
|
||||||
-c "ARROW#FFFFFF" \
|
-c "ARROW#FFFFFF" \
|
||||||
DEF:a=$RRD/web/nginx.rrd:A:AVERAGE \
|
DEF:a=$RRD/web/nginx.rrd:A:AVERAGE \
|
||||||
COMMENT:'\r' \
|
COMMENT:'\r' \
|
||||||
|
|
|
@ -10,7 +10,6 @@
|
||||||
#----------------------------------------------------------#
|
#----------------------------------------------------------#
|
||||||
|
|
||||||
# Argument defenition
|
# Argument defenition
|
||||||
update=$1
|
|
||||||
period=${1-daily}
|
period=${1-daily}
|
||||||
|
|
||||||
# Includes
|
# Includes
|
||||||
|
@ -68,7 +67,7 @@ for host in $hosts; do
|
||||||
RRA:MAX:0.5:288:797
|
RRA:MAX:0.5:288:797
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -z "$update" ]; then
|
if [ "$period" = 'daily' ]; then
|
||||||
# Defining host credentials
|
# Defining host credentials
|
||||||
host_str=$(grep "HOST='$host'" $conf)
|
host_str=$(grep "HOST='$host'" $conf)
|
||||||
for key in $host_str; do
|
for key in $host_str; do
|
||||||
|
@ -112,14 +111,14 @@ for host in $hosts; do
|
||||||
--end "$end" \
|
--end "$end" \
|
||||||
--vertical-label "Queries" \
|
--vertical-label "Queries" \
|
||||||
--x-grid "$grid" \
|
--x-grid "$grid" \
|
||||||
-c "BACK#484439" \
|
-c "BACK#7a766d" \
|
||||||
-c "SHADEA#484439" \
|
-c "SHADEA#7a766d" \
|
||||||
-c "SHADEB#484439" \
|
-c "SHADEB#7a766d" \
|
||||||
-c "FONT#DDDDDD" \
|
-c "FONT#FFFFFF" \
|
||||||
-c "CANVAS#202020" \
|
-c "CANVAS#302c2d" \
|
||||||
-c "GRID#666666" \
|
-c "GRID#666666" \
|
||||||
-c "MGRID#AAAAAA" \
|
-c "MGRID#AAAAAA" \
|
||||||
-c "FRAME#202020" \
|
-c "FRAME#302c2d" \
|
||||||
-c "ARROW#FFFFFF" \
|
-c "ARROW#FFFFFF" \
|
||||||
DEF:a=$RRD/db/pgsql_$host.rrd:A:AVERAGE \
|
DEF:a=$RRD/db/pgsql_$host.rrd:A:AVERAGE \
|
||||||
DEF:t=$RRD/db/pgsql_$host.rrd:T:AVERAGE \
|
DEF:t=$RRD/db/pgsql_$host.rrd:T:AVERAGE \
|
||||||
|
|
|
@ -10,7 +10,6 @@
|
||||||
#----------------------------------------------------------#
|
#----------------------------------------------------------#
|
||||||
|
|
||||||
# Argument defenition
|
# Argument defenition
|
||||||
update=$1
|
|
||||||
period=${1-daily}
|
period=${1-daily}
|
||||||
|
|
||||||
# Includes
|
# Includes
|
||||||
|
@ -52,7 +51,7 @@ if [ ! -e "$RRD/ssh/ssh.rrd" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Parsing data
|
# Parsing data
|
||||||
if [ -z "$update" ]; then
|
if [ "$period" = 'daily' ]; then
|
||||||
a=0
|
a=0
|
||||||
a=$(ps auxf|grep sshd |grep -v grep |grep -v '/usr/sbin/'| wc -l)
|
a=$(ps auxf|grep sshd |grep -v grep |grep -v '/usr/sbin/'| wc -l)
|
||||||
|
|
||||||
|
@ -69,14 +68,14 @@ rrdtool graph $RRD/ssh/$period-ssh.png \
|
||||||
--end "$end" \
|
--end "$end" \
|
||||||
--vertical-label "Connections" \
|
--vertical-label "Connections" \
|
||||||
--x-grid "$grid" \
|
--x-grid "$grid" \
|
||||||
-c "BACK#484439" \
|
-c "BACK#7a766d" \
|
||||||
-c "SHADEA#484439" \
|
-c "SHADEA#7a766d" \
|
||||||
-c "SHADEB#484439" \
|
-c "SHADEB#7a766d" \
|
||||||
-c "FONT#DDDDDD" \
|
-c "FONT#FFFFFF" \
|
||||||
-c "CANVAS#202020" \
|
-c "CANVAS#302c2d" \
|
||||||
-c "GRID#666666" \
|
-c "GRID#666666" \
|
||||||
-c "MGRID#AAAAAA" \
|
-c "MGRID#AAAAAA" \
|
||||||
-c "FRAME#202020" \
|
-c "FRAME#302c2d" \
|
||||||
-c "ARROW#FFFFFF" \
|
-c "ARROW#FFFFFF" \
|
||||||
DEF:a=$RRD/ssh/ssh.rrd:A:AVERAGE \
|
DEF:a=$RRD/ssh/ssh.rrd:A:AVERAGE \
|
||||||
COMMENT:'\r' \
|
COMMENT:'\r' \
|
||||||
|
|
|
@ -568,7 +568,7 @@ rebuild_mysql_database() {
|
||||||
query="CREATE DATABASE $database CHARACTER SET $CHARSET"
|
query="CREATE DATABASE $database CHARACTER SET $CHARSET"
|
||||||
mysql -h $HOST -u $USER -p$PASSWORD -P $PORT -e "$query" &> /dev/null
|
mysql -h $HOST -u $USER -p$PASSWORD -P $PORT -e "$query" &> /dev/null
|
||||||
|
|
||||||
query="GRANT ALL ON $database.* TO '$DBUSER'@'*'"
|
query="GRANT ALL ON $database.* TO '$DBUSER'@'%'"
|
||||||
mysql -h $HOST -u $USER -p$PASSWORD -P $PORT -e "$query" &> /dev/null
|
mysql -h $HOST -u $USER -p$PASSWORD -P $PORT -e "$query" &> /dev/null
|
||||||
|
|
||||||
query="GRANT ALL ON $database.* TO '$DBUSER'@'localhost'"
|
query="GRANT ALL ON $database.* TO '$DBUSER'@'localhost'"
|
||||||
|
|
|
@ -431,8 +431,8 @@ sync_cron_jobs() {
|
||||||
eval $line
|
eval $line
|
||||||
if [ "$SUSPENDED" = 'no' ]; then
|
if [ "$SUSPENDED" = 'no' ]; then
|
||||||
echo "$MIN $HOUR $DAY $MONTH $WDAY $CMD" |\
|
echo "$MIN $HOUR $DAY $MONTH $WDAY $CMD" |\
|
||||||
sed -e "s/%quote%/'/g" -e "s/%dots%/:/g" |\
|
sed -e "s/%quote%/'/g" -e "s/%dots%/:/g" \
|
||||||
>> /var/spool/cron/$user
|
>> /var/spool/cron/$user
|
||||||
fi
|
fi
|
||||||
done < $USER_DATA/cron.conf
|
done < $USER_DATA/cron.conf
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue