diff --git a/bin/ADMIN_backup.pl b/bin/ADMIN_backup.pl index d87fa783..a4955adc 100644 --- a/bin/ADMIN_backup.pl +++ b/bin/ADMIN_backup.pl @@ -5,7 +5,7 @@ # DESCRIPTION: # Backs-up the asterisk database, conf/agi/sounds/bin files # -# Copyright (C) 2023 Matt Florell LICENSE: AGPLv2 +# Copyright (C) 2026 Matt Florell LICENSE: AGPLv2 # # CHANGELOG # @@ -28,6 +28,7 @@ # 191119-1658 - Added --db-remote option to specify '--host' parameter for mysqldumpdump # 210817-1956 - Added --db-leads-only option to dump only the vicidial_list table # 230215-1456 - update of table categories +# 260901-1012 - Added check for mariadb-dump and mariadb first # $secT = time(); @@ -345,30 +346,38 @@ if ( ($without_db < 1) && ($conf_only < 1) ) ### find mysqldump binary to do the database dump print "\n----- Mysql dump -----\n\n"; $mysqldumpbin = ''; - if ( -e ('/usr/bin/mysqldump')) {$mysqldumpbin = '/usr/bin/mysqldump';} + if ( -e ('/usr/bin/mariadb-dump')) {$mysqldumpbin = '/usr/bin/mariadb-dump';} else { - if ( -e ('/usr/local/mysql/bin/mysqldump')) {$mysqldumpbin = '/usr/local/mysql/bin/mysqldump';} - else + if ( -e ('/usr/bin/mysqldump')) {$mysqldumpbin = '/usr/bin/mysqldump';} + else { - if ( -e ('/bin/mysqldump')) {$mysqldumpbin = '/bin/mysqldump';} + if ( -e ('/usr/local/mysql/bin/mysqldump')) {$mysqldumpbin = '/usr/local/mysql/bin/mysqldump';} else { - print "Can't find mysqldump binary! MySQL backups will not work...\n"; + if ( -e ('/bin/mysqldump')) {$mysqldumpbin = '/bin/mysqldump';} + else + { + print "Can't find mysqldump binary! MySQL backups will not work...\n"; + } } } } $mysqlbin = ''; - if ( -e ('/usr/bin/mysql')) {$mysqlbin = '/usr/bin/mysql';} + if ( -e ('/usr/bin/mariadb')) {$mysqlbin = '/usr/bin/mariadb';} else { - if ( -e ('/usr/local/mysql/bin/mysql')) {$mysqlbin = '/usr/local/mysql/bin/mysql';} - else + if ( -e ('/usr/bin/mysql')) {$mysqlbin = '/usr/bin/mysql';} + else { - if ( -e ('/bin/mysql')) {$mysqlbin = '/bin/mysql';} + if ( -e ('/usr/local/mysql/bin/mysql')) {$mysqlbin = '/usr/local/mysql/bin/mysql';} else { - print "Can't find mysql binary! MySQL lead-only backups will not work...\n"; + if ( -e ('/bin/mysql')) {$mysqlbin = '/bin/mysql';} + else + { + print "Can't find mysql binary! MySQL lead-only backups will not work...\n"; + } } } } @@ -455,14 +464,14 @@ if ( ($without_db < 1) && ($conf_only < 1) ) { $archive_tables .= " $aryA[0]"; } - elsif ($aryA[0] =~ /_log|server_performance|vicidial_ivr|vicidial_hopper|vicidial_manager|web_client_sessions|imm_outcomes|_counts|_sip$|_recent|_queue$|_urls$/) + elsif ($aryA[0] =~ /_log|server_performance|vicidial_ivr|vicidial_hopper|vicidial_manager|web_client_sessions|imm_outcomes|_counts|_sip$|_recent|_queue$|_urls$|_overrides|_messages|_drops|_auth|_calls|_caller_codes|_daily|_extensions|_gaps|_reserve/) { $log_tables .= " $aryA[0]"; } elsif ($aryA[0] =~ /server|^phones|conferences|stats|vicidial_list$|^custom|_email_list|_email_attachments|_notes$/) { $regular_tables .= " $aryA[0]"; - } + } else { $conf_tables .= " $aryA[0]"; diff --git a/bin/SERVER_stats.pl b/bin/SERVER_stats.pl index fe2cf7e0..647802fb 100644 --- a/bin/SERVER_stats.pl +++ b/bin/SERVER_stats.pl @@ -4,10 +4,11 @@ # # This script gathers several system metrics and stores them in the MySQL database # -# Copyright (C) 2024 Matt Florell LICENSE: AGPLv2 +# Copyright (C) 2026 Matt Florell LICENSE: AGPLv2 # # CHANGES # 240217-2226 - First build +# 260901-1011 - Look for mariadb-admin first, replacement for mysqladmin # $start_epoch = time(); @@ -173,18 +174,26 @@ else } } -### find mysqladmin binary (database admin) +### find mysqladmin (or mariadb-admin) binary (database admin) $mysqladminbin = ''; -if ( -e ('/bin/mysqladmin')) {$mysqladminbin = '/bin/mysqladmin';} +if ( -e ('/usr/bin/mariadb-admin')) {$mysqladminbin = '/usr/bin/mariadb-admin';} else { - if ( -e ('/usr/bin/mysqladmin')) {$mysqladminbin = '/usr/bin/mysqladmin';} + if ( -e ('/bin/mariadb-admin')) {$mysqladminbin = '/bin/mariadb-admin';} else { - if ( -e ('/usr/local/bin/mysqladmin')) {$mysqladminbin = '/usr/local/bin/mysqladmin';} + if ( -e ('/bin/mysqladmin')) {$mysqladminbin = '/bin/mysqladmin';} else { - if ($DB > 0) {print "Can't find mysqladmin binary, not going to gather database info.\n";} + if ( -e ('/usr/bin/mysqladmin')) {$mysqladminbin = '/usr/bin/mysqladmin';} + else + { + if ( -e ('/usr/local/bin/mysqladmin')) {$mysqladminbin = '/usr/local/bin/mysqladmin';} + else + { + if ($DB > 0) {print "Can't find mysqladmin binary, not going to gather database info.\n";} + } + } } } }