Skip to content

Commit

Permalink
Relase 3.0.0
Browse files Browse the repository at this point in the history 
enhance: Updated os detection and output
enhance(mysqltunerpl): Updated mysqltuner.pl to 2.1.3
docs(proxmox): How to fix locale issue on proxmox
fix(proxmox): Fixed proxmox command after refactor
fix(proxmox): Used ~ instead of $HOME which broke proxmox script
docs(apt): Added skip recommends when installing package with apt
feat(proxmox): Created _proxmox_vendorci for creating vendor.yaml file
feat(git): Create command gtd for deleting local and remote git tags
refactor(git): Changed gtp to gtpush and created gtpull
feat(git): Created gtlist to list local and remote tags
fix(proxmox): Fixed typo in proxmox function
fix(slack): Commands for slack file was incorrect, fixed.
fix(domain-info): Fixed domain-info to include the right file for zshbop
enhance(os): Enhancing OS flavour and version detection
feat(git): Added gcapf "Git commit ammend push force" and gprh "Git pull reset hard origin current branch"
docs(microsoft365): Updated KB for microsoft 365 with steps to enable email forwarding
misc(nodjs): Created nodejs.md KB
docs(typescript): Created typescript.md KB
docs(nodjs): Documented nvm
enhance(zshbop): Improved zb command
enhance(zsh): Added lukechilds/zsh-nvm to antidote and antigen
docs(antidote): Created antidote.md KB
enhance(zsh): Lazy load nvm
docs(cloudflare): Added testing cloudflare waf rules using firewalker
enhance(docker): Updated dops to 1.8
docs(wasabi): Updated wasabi.md
docs(grep): Updated grep.md
docs(ahrefs): Created KB file ahrefs.md
docs(redis): Updated redis.md
enhance(repos): Added repos dir command to change to repos directory
fix(curl-vh): Fixed curl-vh
enhance(ssl-check): Updated ssl-checkt to better provide details and formatting
fix(help): Small fixes to help
enhance(wordpres): Created wp-find and wp-find2 functions
docs(mail): Linux mail command documentation
fix(glint): Removed glint function if glint not installed
fix(dops): Fixed permission on dops_linux-amd64-static
enhance(colors): Enhanced color printing via newly created formatting command
enhance(zshbop): Added previous md5sum for .zshrc
enhance(remove-ansi): Created remove-ansi command to remove ansi colors from output
feat(wp-find-check): Created wp-find-check function to search for wp sites and check if core files are modified
enhance(wp-find-check): Added check for wp-cli/find-command package
docs(cyberpanel): Updated cyberpanel.md
docs(microsoft365): Added Microsoft 365 Teams powershell information
docs(azure): Created Microsoft Azure kb file azure.md
feat(powershell): Added AddUserstoAllTeamsasOwner.ps1 to scripts/powershell
docs(bookstack): Created bookstack.md
docs(microsoft365): Added how to give a user full access to all mailboxes.
feat(docker): Created dcrca for docker
enhance(repos): Added docker-autocompose to repos command
enhance(powershell): Added MailboxSizeReport.ps1
docs(redis): Updated redis.md
fix(powershell): Updated powershell_download for macos using brew
docs(aws): Added command to generate ssh fingerprint
enhance(p10k): Add in private network IP
docs(proxmox): Updated ipables rule for 8006 redirect to include
destination.
  • Loading branch information
@jordantrizz
jordantrizz committed Jul 7, 2023
1 parent a4ff017 commit ff7ef24
Show file tree
Hide file tree
Showing 43 changed files with 1,350 additions and 455 deletions.
2 changes: 2 additions & 0 deletions .antigenrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ antigen bundle zsh-users/zsh-syntax-highlighting
antigen bundle command-not-found
antigen bundle desyncr/auto-ls
antigen bundle zsh-users/zsh-autosuggestions
export NVM_COMPLETION=true
antigen bundle lukechilds/zsh-nvm

#antigen bundle djui/alias-tips # Disabled for now, requires python
#antigen bundle viasite-ansible/zsh-ansible-server
Expand Down
7 changes: 7 additions & 0 deletions .p10k.zsh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,18 @@
# =========================[ Line #2 ]=========================
newline
public_ip # public IP address
ip # LAN IP
vpn_ip # VPN IP
wifi # Wifi
# proxy # system-wide http/https/ftp proxy
battery # internal battery
# example # example user-defined segment (see prompt_example function below)
)

# Set IP interface
#typeset -g POWERLEVEL9K_IP_INTERFACE='eth0'
typeset -g POWERLEVEL9K_IP_INTERFACE=$(ip -o route get to 8.8.8.8 | awk {' print $5 '})

# To disable default icons for all segments, set POWERLEVEL9K_VISUAL_IDENTIFIER_EXPANSION=''.
#
# To enable default icons for all segments, don't define POWERLEVEL9K_VISUAL_IDENTIFIER_EXPANSION
Expand Down
1 change: 1 addition & 0 deletions .zsh_plugins.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ zpm-zsh/mysql-colorize
zsh-users/zsh-syntax-highlighting
# marlonrichert/zsh-autocomplete
zsh-users/zsh-autosuggestions
lukechilds/zsh-nvm
2 changes: 1 addition & 1 deletion VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.8.8
3.0.0
83 changes: 54 additions & 29 deletions bin/MySQLTuner-perl/mysqltuner.pl
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env perl
# mysqltuner.pl - Version 2.1.1
# mysqltuner.pl - Version 2.1.3
# High Performance MySQL Tuning Script
# Copyright (C) 2006-2023 Major Hayden - major@mhtx.net
# Copyright (C) 2015-2023 Jean-Marie Renouard - jmrenouard@gmail.com
Expand Down Expand Up @@ -57,7 +57,7 @@ package main;
#use Env;

# Set up a few variables for use in the script
my $tunerversion = "2.1.1";
my $tunerversion = "2.1.3";
my ( @adjvars, @generalrec );

# Set defaults
Expand Down Expand Up @@ -111,6 +111,7 @@ package main;
"defaults-extra-file" => '',
"protocol" => '',
"dumpdir" => '',
"stop" => 0,
);

# Gather the options from the command line
Expand Down Expand Up @@ -143,6 +144,7 @@ package main;
'idxstat', 'noidxstat',
'server-log=s', 'protocol=s',
'defaults-extra-file=s', 'dumpdir=s',
'stop'
)
or pod2usage(
-exitval => 1,
Expand Down Expand Up @@ -245,8 +247,6 @@ package main;
# Setting up the colors for the print styles
my $me = `whoami`;
$me =~ s/\n//g;

# Setting up the colors for the print styles
my $good = ( $opt{nocolor} == 0 ) ? "[\e[0;32mOK\e[0m]" : "[OK]";
my $bad = ( $opt{nocolor} == 0 ) ? "[\e[0;31m!!\e[0m]" : "[!!]";
my $info = ( $opt{nocolor} == 0 ) ? "[\e[0;34m--\e[0m]" : "[--]";
Expand Down Expand Up @@ -1037,18 +1037,37 @@ sub select_array {
return @result;
}

# MySQL Request Array
sub select_array_with_headers {
my $req = shift;
debugprint "PERFORM: $req ";
my @result = `$mysqlcmd $mysqllogin -Bre "\\w$req" 2>>/dev/null`;
if ( $? != 0 ) {
badprint "Failed to execute: $req";
badprint "FAIL Execute SQL / return code: $?";
debugprint "CMD : $mysqlcmd";
debugprint "OPTIONS: $mysqllogin";
debugprint `$mysqlcmd $mysqllogin -Bse "$req" 2>&1`;

#exit $?;
}
debugprint "select_array_with_headers: return code : $?";
chomp(@result);
return @result;
}
# MySQL Request Array
sub select_csv_file {
my $tfile = shift;
my $req = shift;
debugprint "PERFORM: $req CSV into $tfile";
my @result = select_array($req);
my @result = select_array_with_headers($req);
open( my $fh, '>', $tfile ) or die "Could not open file '$tfile' $!";
for my $l (@result) {
$l =~ s/\t/","/g;
$l =~ s/^/"/;
$l =~ s/$/"/;
$l =~ s/$/"\n/;
print $fh $l;
print $l if $opt{debug};
}
close $fh;
}
Expand Down Expand Up @@ -1420,13 +1439,13 @@ sub log_file_recommendations {
if ( $size > 0 ) {
goodprint "Log file $myvar{'log_error'} is not empty";
if ( $size < 32 * 1024 * 1024 ) {
goodprint "Log file $myvar{'log_error'} is smaller than 32 Mb";
goodprint "Log file $myvar{'log_error'} is smaller than 32 MB";
}
else {
badprint "Log file $myvar{'log_error'} is bigger than 32 Mb";
badprint "Log file $myvar{'log_error'} is bigger than 32 MB";
push @generalrec,
$myvar{'log_error'}
. " is > 32Mb, you should analyze why or implement a rotation log strategy such as logrotate!";
. " is > 32MB, you should analyze why or implement a rotation log strategy such as logrotate!";
}
}
else {
Expand Down Expand Up @@ -1850,14 +1869,14 @@ sub get_system_info {
infoprint "External IP : " . $ext_ip;
$result{'Network'}{'External Ip'} = $ext_ip;
badprint
"External IP : Can't check because of Internet connectivity"
"External IP : Can't check, no Internet connectivity"
unless defined($httpcli);
infoprint "Name Servers : "
. infocmd_one "grep 'nameserver' /etc/resolv.conf \| awk '{print \$2}'";
infoprint "Logged In users : ";
infocmd_tab "who";
$result{'OS'}{'Logged users'} = `who`;
infoprint "Ram Usages in Mb : ";
infoprint "Ram Usages in MB : ";
infocmd_tab "free -m | grep -v +";
$result{'OS'}{'Free Memory RAM'} = `free -m | grep -v +`;
infoprint "Load Average : ";
Expand Down Expand Up @@ -1917,7 +1936,7 @@ sub system_recommendations {
. $opt{'maxportallowed'}
. "allowed.";
push( @generalrec,
"Consider dedicating a server for your database installation with less services running on !"
"Consider dedicating a server for your database installation with fewer services running on it!"
);
}
else {
Expand All @@ -1931,7 +1950,7 @@ sub system_recommendations {
if ( is_open_port($banport) ) {
badprint "Banned port: $banport is opened..";
push( @generalrec,
"Port $banport is opened. Consider stopping program handling this port."
"Port $banport is opened. Consider stopping the program over this port."
);
}
else {
Expand All @@ -1949,7 +1968,7 @@ sub security_recommendations {
subheaderprint "Security Recommendations";

if ( mysql_version_eq(8) ) {
infoprint "Skipped due to unsupported feature for MySQL 8";
infoprint "Skipped due to unsupported feature for MySQL 8.0+";
return;
}

Expand Down Expand Up @@ -2011,7 +2030,7 @@ sub security_recommendations {
#exit 0;
if (@mysqlstatlist) {
push( @generalrec,
"Remove Anonymous User accounts - there are "
"Remove Anonymous User accounts: there are "
. scalar(@mysqlstatlist)
. " anonymous accounts." );
foreach my $line ( sort @mysqlstatlist ) {
Expand Down Expand Up @@ -2254,6 +2273,8 @@ sub validate_mysql_version {
$mysqlverminor ||= 0;
$mysqlvermicro ||= 0;

prettyprint " ";

if ( mysql_version_eq(8)
or mysql_version_eq( 5, 7 )
or mysql_version_eq( 10, 3 )
Expand Down Expand Up @@ -2406,7 +2427,7 @@ sub check_storage_engines {
}
elsif ( mysql_version_ge( 5, 1, 5 ) ) {
my @engineresults = select_array
"SELECT ENGINE,SUPPORT FROM information_schema.ENGINES WHERE ENGINE NOT IN ('performance_schema','MyISAM','MERGE','MEMORY') ORDER BY ENGINE ASC";
"SELECT ENGINE, SUPPORT FROM information_schema.ENGINES WHERE ENGINE NOT IN ('MyISAM', 'MERGE', 'MEMORY') ORDER BY ENGINE";
foreach my $line (@engineresults) {
my ( $engine, $engineenabled );
( $engine, $engineenabled ) = $line =~ /([a-zA-Z_]*)\s+([a-zA-Z]+)/;
Expand Down Expand Up @@ -2547,23 +2568,23 @@ sub check_storage_engines {
&& defined $myvar{'have_innodb'}
&& $myvar{'have_innodb'} eq "YES" )
{
badprint "InnoDB is enabled but isn't being used";
badprint "InnoDB is enabled, but isn't being used";
push( @generalrec,
"Add skip-innodb to MySQL configuration to disable InnoDB" );
}
if ( !defined $enginestats{'BerkeleyDB'}
&& defined $myvar{'have_bdb'}
&& $myvar{'have_bdb'} eq "YES" )
{
badprint "BDB is enabled but isn't being used";
badprint "BDB is enabled, but isn't being used";
push( @generalrec,
"Add skip-bdb to MySQL configuration to disable BDB" );
}
if ( !defined $enginestats{'ISAM'}
&& defined $myvar{'have_isam'}
&& $myvar{'have_isam'} eq "YES" )
{
badprint "MyISAM is enabled but isn't being used";
badprint "MyISAM is enabled, but isn't being used";
push( @generalrec,
"Add skip-isam to MySQL configuration to disable MyISAM (MySQL > 4.1.0)"
);
Expand Down Expand Up @@ -2592,7 +2613,7 @@ sub check_storage_engines {
push @generalrec, $generalrec;
}
push @generalrec,
"Total freed space after defragmentation : $total_free MiB";
"Total freed space after defragmentation: $total_free MiB";
}
else {
goodprint "Total fragmented tables: $fragtables";
Expand Down Expand Up @@ -2653,6 +2674,7 @@ sub calculations {
exit 2;
}

# Per-thread memory
# Per-thread memory
if ( mysql_version_ge(4) ) {
$mycalc{'per_thread_buffers'} =
Expand Down Expand Up @@ -3253,13 +3275,13 @@ sub mysql_stats {
push( @adjvars, "skip-name-resolve=0" );
}
}
elsif ( $result{'Variables'}{'skip_name_resolve'} eq 'OFF' ) {
elsif ( $result{'Variables'}{'skip_name_resolve'} ne 'OFF' and $result{'Variables'}{'skip_name_resolve'} ne '0' ) {
badprint
"Name resolution is active: a reverse name resolution is made for each new connection which can reduce performance";
push( @generalrec,
"Configure your accounts with ip or subnets only, then update your configuration with skip-name-resolve=1"
"Configure your accounts with ip or subnets only, then update your configuration with skip-name-resolve=OFF"
);
push( @adjvars, "skip-name-resolve=1" );
push( @adjvars, "skip-name-resolve=OFF" );
}

# Query cache
Expand Down Expand Up @@ -3943,13 +3965,14 @@ sub mysqsl_pfs {
# Store all sys schema in dumpdir if defined
if ( defined $opt{dumpdir} and -d "$opt{dumpdir}" ) {
for my $pfs_view ( select_array('use sys;show tables;') ) {
infoprint "Dumping $pfs_view into $opt{dumpdir}";
for my $sys_view ( select_array('use sys;show tables;') ) {
infoprint "Dumping $sys_view into $opt{dumpdir}";
select_csv_file(
"$opt{dumpdir}/pfs_$pfs_view.csv",
"select * from sys.$pfs_view"
"$opt{dumpdir}/sys_$sys_view.csv",
"select * from sys.\`$sys_view\`"
);
}
exit 0 if ( $opt{stop} == 1 );
}
# Top user per connection
Expand Down Expand Up @@ -6170,7 +6193,7 @@ sub mysql_innodb {
$mystat{'Innodb_log_waits_computed'} = 0;
if ( defined( $mystat{'Innodb_log_waits'} )
and defined( $mystat{'Innodb_log_writes'} ) )
and defined( $mystat{'Innodb_log_writes'} ) and $mystat{'Innodb_log_writes'} > 0.000001 )
{
$mystat{'Innodb_log_waits_computed'} =
$mystat{'Innodb_log_waits'} / $mystat{'Innodb_log_writes'};
Expand Down Expand Up @@ -6475,6 +6498,7 @@ sub mysql_tables {
}
infoprint("Dumpdir: $opt{dumpdir}");
# Store all information schema in dumpdir if defined
if ( defined $opt{dumpdir} and -d "$opt{dumpdir}" ) {
for my $info_s_table (
Expand All @@ -6486,6 +6510,7 @@ sub mysql_tables {
"select * from information_schema.$info_s_table"
);
}
exit 0 if ( $opt{stop} == 1 );
}
foreach ( select_user_dbs() ) {
my $dbname = $_;
Expand Down Expand Up @@ -6957,7 +6982,7 @@ sub which {
=head1 NAME
MySQLTuner 2.1.1 - MySQL High Performance Tuning Script
MySQLTuner 2.1.3 - MySQL High Performance Tuning Script
=head1 IMPORTANT USAGE GUIDELINES
Expand Down
Loading

0 comments on commit ff7ef24

Please sign in to comment.