evolinux-base: dump-server-state upstream release 23.11
This commit is contained in:
parent
a5e4359d0e
commit
642fbb1ea4
|
@ -19,13 +19,14 @@ The **patch** part changes is incremented if multiple releases happen the same m
|
|||
|
||||
### Changed
|
||||
|
||||
* evolinux-base: use separate default config file for rsyslog
|
||||
* evocheck: upstream release 23.10
|
||||
* add-vm.sh: allow VM name max length > 20
|
||||
* nagios: rename var `nagios_nrpe_process_processes` into `nagios_nrpe_processes` and check systemd-timesyncd instead of ntpd in Debian 12
|
||||
* ProFTPd: in SFTP vhost, enable SSH keys login, enable ed25549 host key for Debian >= 11
|
||||
* apache : fix goaway pattern for bad bots
|
||||
* apache : rename MaxRequestsPerChild to MaxConnectionsPerChild (new name)
|
||||
* evocheck: upstream release 23.10
|
||||
* evolinux-base: dump-server-state upstream release 23.11
|
||||
* evolinux-base: use separate default config file for rsyslog
|
||||
* nagios: rename var `nagios_nrpe_process_processes` into `nagios_nrpe_processes` and check systemd-timesyncd instead of ntpd in Debian 12
|
||||
* proftpd: in SFTP vhost, enable SSH keys login, enable ed25549 host key for Debian >= 11
|
||||
|
||||
### Fixed
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
PROGNAME="dump-server-state"
|
||||
REPOSITORY="https://gitea.evolix.org/evolix/dump-server-state"
|
||||
|
||||
VERSION="23.08"
|
||||
VERSION="23.11"
|
||||
readonly VERSION
|
||||
|
||||
dump_dir=
|
||||
|
@ -64,14 +64,15 @@ Tasks options
|
|||
--[no-]mount copy of mount points (default: yes)
|
||||
--[no-]df copy of disk usage (default: yes)
|
||||
--[no-]dmesg copy of dmesg (default: yes)
|
||||
--[no-]mysql copy of mysql processes (default: yes)
|
||||
--[no-]mysql-processes copy of mysql processes (default: yes)
|
||||
--[no-]mysql-summary copy of mysql summary (default: yes)
|
||||
--[no-]systemctl copy of systemd services states (default: yes)
|
||||
|
||||
Tasks options order matters. They are evaluated from left to right.
|
||||
Examples :
|
||||
* "[…] --none --uname" will do only the uname task
|
||||
* "[…] --all --no-etc" will do everything but the etc task
|
||||
* "[…] --etc --none --mysql" will do only the mysql task
|
||||
* "[…] --etc --none --mysql-summary" will do only the mysql task
|
||||
END
|
||||
}
|
||||
debug() {
|
||||
|
@ -741,6 +742,41 @@ task_mysql_processes() {
|
|||
fi
|
||||
}
|
||||
|
||||
task_mysql_summary() {
|
||||
debug "Task: MySQL summary"
|
||||
|
||||
mysqladmin_bin=$(command -v mysqladmin)
|
||||
pt_mysql_summary_bin=$(command -v pt-mysql-summary)
|
||||
|
||||
if [ -n "${mysqladmin_bin}" ] && [ -n "${pt_mysql_summary_bin}" ]; then
|
||||
# Look for local MySQL or MariaDB process
|
||||
if pgrep mysqld > /dev/null || pgrep mariadbd > /dev/null; then
|
||||
if ${mysqladmin_bin} ping > /dev/null 2>&1; then
|
||||
# important to set sleep to 0
|
||||
# because we don't want to block
|
||||
# even if we lose some insight.
|
||||
${pt_mysql_summary_bin} --sleep 0 > "${dump_dir}/mysql-summary.txt" 2> "${dump_dir}/mysql-summary.err"
|
||||
last_rc=$?
|
||||
|
||||
if [ ${last_rc} -eq 0 ]; then
|
||||
debug "* pt-mysql-summary OK"
|
||||
else
|
||||
debug "* pt-mysql-summary ERROR"
|
||||
debug < "${dump_dir}/mysql-summary.err"
|
||||
rm "${dump_dir}/mysql-summary.err"
|
||||
rc=10
|
||||
fi
|
||||
else
|
||||
debug "* unable to ping with mysqladmin"
|
||||
fi
|
||||
else
|
||||
debug "* no mysqld or mariadbd process is running"
|
||||
fi
|
||||
else
|
||||
debug "* pt-mysql-summary not found"
|
||||
fi
|
||||
}
|
||||
|
||||
task_systemctl() {
|
||||
debug "Task: Systemd services"
|
||||
|
||||
|
@ -841,6 +877,9 @@ main() {
|
|||
if [ "${TASK_MYSQL_PROCESSES}" -eq 1 ]; then
|
||||
task_mysql_processes
|
||||
fi
|
||||
if [ "${TASK_MYSQL_SUMMARY}" -eq 1 ]; then
|
||||
task_mysql_summary
|
||||
fi
|
||||
if [ "${TASK_SYSTEMCTL}" -eq 1 ]; then
|
||||
task_systemctl
|
||||
fi
|
||||
|
@ -950,6 +989,7 @@ while :; do
|
|||
TASK_DF \
|
||||
TASK_DMESG \
|
||||
TASK_MYSQL_PROCESSES \
|
||||
TASK_MYSQL_SUMMARY \
|
||||
TASK_SYSTEMCTL
|
||||
do
|
||||
eval "${option}=1"
|
||||
|
@ -978,6 +1018,7 @@ while :; do
|
|||
TASK_DF \
|
||||
TASK_DMESG \
|
||||
TASK_MYSQL_PROCESSES \
|
||||
TASK_MYSQL_SUMMARY \
|
||||
TASK_SYSTEMCTL
|
||||
do
|
||||
eval "${option}=0"
|
||||
|
@ -1124,6 +1165,13 @@ while :; do
|
|||
TASK_MYSQL_PROCESSES=0
|
||||
;;
|
||||
|
||||
--mysql-summary)
|
||||
TASK_MYSQL_SUMMARY=1
|
||||
;;
|
||||
--no-mysql-summary)
|
||||
TASK_MYSQL_SUMMARY=0
|
||||
;;
|
||||
|
||||
--systemctl)
|
||||
TASK_SYSTEMCTL=1
|
||||
;;
|
||||
|
@ -1173,6 +1221,7 @@ done
|
|||
: "${TASK_DF:=1}"
|
||||
: "${TASK_DMESG:=1}"
|
||||
: "${TASK_MYSQL_PROCESSES:=1}"
|
||||
: "${TASK_MYSQL_SUMMARY:=1}"
|
||||
: "${TASK_SYSTEMCTL:=1}"
|
||||
|
||||
export LC_ALL=C
|
||||
|
|
Loading…
Reference in a new issue