Skip to content

Commit 46e0bc2

Browse files
serghey-rodinserghey-rodin
committed
mysql bugfix + updated rrd functions
1 parent 2fe720f commit 46e0bc2

14 files changed

+159
-108
lines changed

‎bin/v_backup_user‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ echo
9292

9393
# PAM
9494
echo "-- PAM --"
95-
pam='yes'
9695
mkdir $tmpdir/pam
9796
echo -e "$(date "+%F %T") passwd / shadow /group"
9897
grep "^$user:" /etc/passwd > $tmpdir/pam/passwd
@@ -451,15 +450,15 @@ for backup_record in $deprecated; do
451450
done
452451

453452
# Concatenating string
454-
backup_str="DATE='$DATE' TIME='$TIME' RUNTIME='$run_time'"
453+
backup_str="BACKUP='$user.$DATE.tar'"
455454
backup_str="$backup_str TYPE='$BACKUP_SYSTEM' SIZE='$size'"
456455
backup_str="$backup_str VESTA='$vst'"
457-
backup_str="$backup_str PAM='$pam'"
458456
backup_str="$backup_str WEB='${web_list// /,}'"
459457
backup_str="$backup_str DNS='${dns_list// /,}'"
460458
backup_str="$backup_str MAIL='${mail_list// /,}'"
461459
backup_str="$backup_str DB='${db_list// /,}'"
462460
backup_str="$backup_str CRON='$cron_list'"
461+
backup_str="$backup_str RUNTIME='$run_time' TIME='$TIME' DATE='$DATE'"
463462
echo "$backup_str" >> $USER_DATA/backup.conf
464463
chmod 660 $USER_DATA/backup.conf
465464

‎bin/v_list_user_backups‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,15 @@ if [ ! -e "$conf" ]; then
3636
fi
3737

3838
# Defining fileds to select
39-
fields="\$DATE \$TIME \$RUNTIME \$TYPE \$SIZE \$VESTA \$PAM \$WEB \$DNS \$DB"
40-
fields="$fields \$MAIL \$CRON"
39+
fields="\$BACKUP \$TYPE \$SIZE \$VESTA \$PAM \$WEB \$DNS \$DB"
40+
fields="$fields \$MAIL \$CRON \$RUNTIME \$TIME \$DATE"
4141

4242
# Listing domains
4343
case $format in
4444
json) json_list ;;
4545
plain) nohead=1; shell_list ;;
46-
shell) fields='$DATE $TIME $RUNTIME $TYPE $SIZE'; shell_list |column -t;;
46+
shell) fields='$BACKUP $TYPE $SIZE $RUNTIME $TIME $DATE';
47+
shell_list |column -t;;
4748
*) check_args '1' '0' '[format]' ;;
4849
esac
4950

‎bin/v_update_sys_rrd‎

Lines changed: 87 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
# info: update system rrd charts
3-
# options: period
3+
# options: none
44
#
55
# The script is wrapper for all rrd functions. It updates all
66
# v_update_sys_rrd_* at once.
@@ -22,9 +22,6 @@ source $VESTA/func/shared.sh
2222
PATH="$PATH:$BIN"
2323
export PATH
2424

25-
# Argument defenition
26-
period=$1
27-
2825
# Checking rrddir
2926
if [ ! -d "$RRD" ]; then
3027
mkdir -p $RRD
@@ -35,38 +32,101 @@ fi
3532
# Action #
3633
#----------------------------------------------------------#
3734

38-
# Updateing system stats
39-
$BIN/v_update_sys_rrd_la $period
40-
$BIN/v_update_sys_rrd_net $period
41-
$BIN/v_update_sys_rrd_mem $period
42-
$BIN/v_update_sys_rrd_ssh $period
43-
44-
# Updating web stats
45-
if [ "$WEB_SYSTEM" = 'apache' ]; then
46-
$BIN/v_update_sys_rrd_httpd $period
35+
# Checking daily period
36+
if [ -e "$RRD/daily.rrd" ]; then
37+
mtime=$(stat -c "%Y" $RRD/daily.rrd)
38+
ctime=$(date +%s)
39+
dtime=$((ctime - mtime))
40+
# Update every 5 minute
41+
if [ "$dtime" -gt '290' ]; then
42+
touch $RRD/daily.rrd
43+
periods="$periods daily"
44+
fi
45+
else
46+
touch $RRD/daily.rrd
47+
periods="$periods daily"
4748
fi
4849

49-
if [ "$PROXY_SYSTEM" = 'nginx' ]; then
50-
$BIN/v_update_sys_rrd_nginx $period
50+
# Checking weekly period
51+
if [ -e "$RRD/weekly.rrd" ]; then
52+
mtime=$(stat -c "%Y" $RRD/weekly.rrd)
53+
ctime=$(date +%s)
54+
dtime=$((ctime - mtime))
55+
# Update every hour
56+
if [ "$dtime" -gt '3590' ]; then
57+
touch $RRD/weekly.rrd
58+
periods="$periods weekly"
59+
fi
60+
else
61+
touch $RRD/weekly.rrd
62+
periods="$periods weekly"
5163
fi
5264

53-
# Updating ftp stats
54-
if [ ! -z "$FTP_SYSTEM" ] && [ "$FTP_SYSTEM" != 'no' ]; then
55-
$BIN/v_update_sys_rrd_ftp $period
65+
# Checking monthly period
66+
if [ -e "$RRD/monthly.rrd" ]; then
67+
mtime=$(stat -c "%Y" $RRD/monthly.rrd)
68+
ctime=$(date +%s)
69+
dtime=$((ctime - mtime))
70+
# Update every 6 hours
71+
if [ "$dtime" -gt '21590' ]; then
72+
touch $RRD/monthly.rrd
73+
periods="$periods monthly"
74+
fi
75+
else
76+
touch $RRD/monthly.rrd
77+
periods="$periods monthly"
5678
fi
5779

58-
# Updating db stats
59-
if [ ! -z "$DB_SYSTEM" ] && [ "$DB_SYSTEM" != 'no' ]; then
60-
for type in ${DB_SYSTEM//,/ }; do
61-
# Switching on db type
62-
case $type in
63-
mysql) $BIN/v_update_sys_rrd_mysql $period ;;
64-
pgsql) $BIN/v_update_sys_rrd_pgsql $period ;;
65-
esac
66-
done
80+
# Checking yearly period
81+
if [ -e "$RRD/yearly.rrd" ]; then
82+
mtime=$(stat -c "%Y" $RRD/yearly.rrd)
83+
ctime=$(date +%s)
84+
dtime=$((ctime - mtime))
85+
# Update every 12 hours
86+
if [ "$dtime" -gt '43190' ]; then
87+
touch $RRD/yearly.rrd
88+
periods="$periods yearly"
89+
fi
90+
else
91+
touch $RRD/yearly.rrd
92+
periods="$periods yearly"
6793
fi
6894

6995

96+
# Updateing system stats
97+
for period in $periods; do
98+
99+
$BIN/v_update_sys_rrd_la $period
100+
$BIN/v_update_sys_rrd_net $period
101+
$BIN/v_update_sys_rrd_mem $period
102+
$BIN/v_update_sys_rrd_ssh $period
103+
104+
# Updating web stats
105+
if [ "$WEB_SYSTEM" = 'apache' ]; then
106+
$BIN/v_update_sys_rrd_httpd $period
107+
fi
108+
109+
if [ "$PROXY_SYSTEM" = 'nginx' ]; then
110+
$BIN/v_update_sys_rrd_nginx $period
111+
fi
112+
113+
# Updating ftp stats
114+
if [ ! -z "$FTP_SYSTEM" ] && [ "$FTP_SYSTEM" != 'no' ]; then
115+
$BIN/v_update_sys_rrd_ftp $period
116+
fi
117+
118+
# Updating db stats
119+
if [ ! -z "$DB_SYSTEM" ] && [ "$DB_SYSTEM" != 'no' ]; then
120+
for type in ${DB_SYSTEM//,/ }; do
121+
# Switching on db type
122+
case $type in
123+
mysql) $BIN/v_update_sys_rrd_mysql $period ;;
124+
pgsql) $BIN/v_update_sys_rrd_pgsql $period ;;
125+
esac
126+
done
127+
fi
128+
done
129+
70130
#----------------------------------------------------------#
71131
# Vesta #
72132
#----------------------------------------------------------#

‎bin/v_update_sys_rrd_ftp‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#----------------------------------------------------------#
1111

1212
# Argument defenition
13-
update=$1
1413
period=${1-daily}
1514

1615
# Includes
@@ -52,7 +51,7 @@ if [ ! -e "$RRD/ftp/ftp.rrd" ]; then
5251
fi
5352

5453
# Parsing data
55-
if [ -z "$update" ]; then
54+
if [ "$period" = 'daily' ]; then
5655
a=0
5756
a=$(ps aux |grep $FTP_SYSTEM |grep -v grep| grep -v nobody|\
5857
grep -v root|wc -l)
@@ -70,14 +69,14 @@ rrdtool graph $RRD/ftp/$period-ftp.png \
7069
--end "$end" \
7170
--vertical-label "Connections" \
7271
--x-grid "$grid" \
73-
-c "BACK#484439" \
74-
-c "SHADEA#484439" \
75-
-c "SHADEB#484439" \
76-
-c "FONT#DDDDDD" \
77-
-c "CANVAS#202020" \
72+
-c "BACK#7a766d" \
73+
-c "SHADEA#7a766d" \
74+
-c "SHADEB#7a766d" \
75+
-c "FONT#FFFFFF" \
76+
-c "CANVAS#302c2d" \
7877
-c "GRID#666666" \
7978
-c "MGRID#AAAAAA" \
80-
-c "FRAME#202020" \
79+
-c "FRAME#302c2d" \
8180
-c "ARROW#FFFFFF" \
8281
DEF:a=$RRD/ftp/ftp.rrd:A:AVERAGE \
8382
COMMENT:'\r' \

‎bin/v_update_sys_rrd_httpd‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#----------------------------------------------------------#
1111

1212
# Argument defenition
13-
update=$1
1413
period=${1-daily}
1514

1615
# Includes
@@ -53,7 +52,7 @@ if [ ! -e "$RRD/web/httpd.rrd" ]; then
5352
fi
5453

5554
# Parsing data
56-
if [ -z "$update" ]; then
55+
if [ "$period" = 'daily' ]; then
5756
server_status=$(wget -qO- http://localhost:8081/server-status |\
5857
grep 'currently being processed'| \
5958
cut -f 2 -d '>' |\
@@ -76,14 +75,14 @@ rrdtool graph $RRD/web/$period-httpd.png \
7675
--end "$end" \
7776
--vertical-label "Connections" \
7877
--x-grid "$grid" \
79-
-c "BACK#484439" \
80-
-c "SHADEA#484439" \
81-
-c "SHADEB#484439" \
82-
-c "FONT#DDDDDD" \
83-
-c "CANVAS#202020" \
78+
-c "BACK#7a766d" \
79+
-c "SHADEA#7a766d" \
80+
-c "SHADEB#7a766d" \
81+
-c "FONT#FFFFFF" \
82+
-c "CANVAS#302c2d" \
8483
-c "GRID#666666" \
8584
-c "MGRID#AAAAAA" \
86-
-c "FRAME#202020" \
85+
-c "FRAME#302c2d" \
8786
-c "ARROW#FFFFFF" \
8887
DEF:a=$RRD/web/httpd.rrd:A:AVERAGE \
8988
COMMENT:'\r' \

‎bin/v_update_sys_rrd_la‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#----------------------------------------------------------#
1111

1212
# Argument defenition
13-
update=$1
1413
period=${1-daily}
1514

1615
# Includes
@@ -53,7 +52,7 @@ if [ ! -e "$RRD/la/la.rrd" ]; then
5352
fi
5453

5554
# Parsing data
56-
if [ -z "$update" ]; then
55+
if [ "$period" = 'daily' ]; then
5756
loadavg=$(cat /proc/loadavg )
5857
la=$(echo "$loadavg"|cut -f 2 -d ' ')
5958
pr=$(echo "$loadavg"|cut -f 4 -d ' '|cut -f 2 -d /)
@@ -71,14 +70,14 @@ rrdtool graph $RRD/la/$period-la.png \
7170
--end "$end" \
7271
--vertical-label "Points" \
7372
--x-grid "$grid" \
74-
-c "BACK#484439" \
75-
-c "SHADEA#484439" \
76-
-c "SHADEB#484439" \
77-
-c "FONT#DDDDDD" \
78-
-c "CANVAS#202020" \
73+
-c "BACK#7a766d" \
74+
-c "SHADEA#7a766d" \
75+
-c "SHADEB#7a766d" \
76+
-c "FONT#FFFFFF" \
77+
-c "CANVAS#302c2d" \
7978
-c "GRID#666666" \
8079
-c "MGRID#AAAAAA" \
81-
-c "FRAME#202020" \
80+
-c "FRAME#484243" \
8281
-c "ARROW#FFFFFF" \
8382
DEF:la=$RRD/la/la.rrd:LA:AVERAGE \
8483
DEF:pr=$RRD/la/la.rrd:PR:AVERAGE \

‎bin/v_update_sys_rrd_mem‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#----------------------------------------------------------#
1111

1212
# Argument defenition
13-
update=$1
1413
period=${1-daily}
1514

1615
# Includes
@@ -53,7 +52,7 @@ if [ ! -e "$RRD/mem/mem.rrd" ]; then
5352
fi
5453

5554
# Parsing data
56-
if [ -z "$update" ]; then
55+
if [ "$period" = 'daily' ]; then
5756
mem=$(free -m)
5857
ram=$(echo "$mem" |awk '{print $3}'|head -n2 |tail -n1)
5958
swap=$(echo "$mem" |awk '{print $3}'|tail -n1)
@@ -71,14 +70,14 @@ rrdtool graph $RRD/mem/$period-mem.png \
7170
--end "$end" \
7271
--vertical-label "Mbytes" \
7372
--x-grid "$grid" \
74-
-c "BACK#484439" \
75-
-c "SHADEA#484439" \
76-
-c "SHADEB#484439" \
77-
-c "FONT#DDDDDD" \
78-
-c "CANVAS#202020" \
73+
-c "BACK#7a766d" \
74+
-c "SHADEA#7a766d" \
75+
-c "SHADEB#7a766d" \
76+
-c "FONT#FFFFFF" \
77+
-c "CANVAS#302c2d" \
7978
-c "GRID#666666" \
8079
-c "MGRID#AAAAAA" \
81-
-c "FRAME#202020" \
80+
-c "FRAME#302c2d" \
8281
-c "ARROW#FFFFFF" \
8382
DEF:ram=$RRD/mem/mem.rrd:RAM:AVERAGE \
8483
DEF:swap=$RRD/mem/mem.rrd:SWAP:AVERAGE \

‎bin/v_update_sys_rrd_mysql‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#----------------------------------------------------------#
1111

1212
# Argument defenition
13-
update=$1
1413
period=${1-daily}
1514

1615
# Includes
@@ -68,7 +67,7 @@ for host in $hosts; do
6867
RRA:MAX:0.5:288:797
6968
fi
7069

71-
if [ -z "$update" ]; then
70+
if [ "$period" = 'daily' ]; then
7271
# Defining host credentials
7372
host_str=$(grep "HOST='$host'" $conf)
7473
for key in $host_str; do
@@ -107,14 +106,14 @@ for host in $hosts; do
107106
--end "$end" \
108107
--vertical-label "Queries" \
109108
--x-grid "$grid" \
110-
-c "BACK#484439" \
111-
-c "SHADEA#484439" \
112-
-c "SHADEB#484439" \
113-
-c "FONT#DDDDDD" \
114-
-c "CANVAS#202020" \
109+
-c "BACK#7a766d" \
110+
-c "SHADEA#7a766d" \
111+
-c "SHADEB#7a766d" \
112+
-c "FONT#FFFFFF" \
113+
-c "CANVAS#302c2d" \
115114
-c "GRID#666666" \
116115
-c "MGRID#AAAAAA" \
117-
-c "FRAME#202020" \
116+
-c "FRAME#302c2d" \
118117
-c "ARROW#FFFFFF" \
119118
DEF:a=$RRD/db/mysql_$host.rrd:A:AVERAGE \
120119
DEF:s=$RRD/db/mysql_$host.rrd:S:AVERAGE \

0 commit comments

Comments
 (0)