From 2b661faf6c5afdf58eb6a502d860dc2459ef4e64 Mon Sep 17 00:00:00 2001 From: gysar1983 Date: Mon, 20 Mar 2023 17:32:28 +0800 Subject: [PATCH] test new remote gitea --- get-all-logs.sh | 85 +++++++++++++++++++++++++++++-------------------- req | 42 ++++++++++++++++++++++++ 2 files changed, 92 insertions(+), 35 deletions(-) create mode 100644 req diff --git a/get-all-logs.sh b/get-all-logs.sh index 0288ac9..90b8c93 100755 --- a/get-all-logs.sh +++ b/get-all-logs.sh @@ -84,7 +84,7 @@ plaform_logs(){ about_license(){ # информация о лицензии - curl -vvv -k "https://license6.ispsystem.com/lic6/check" -H "X-auth-token:$LicenseToken" > ${LOGDIR}/license_${PLATFORM}.log 2>&1 + curl -m 180 -vvv -k "https://license6.ispsystem.com/lic6/check" -H "X-auth-token:$LicenseToken" > ${LOGDIR}/license_${PLATFORM}.log 2>&1 echo -e "\n${PLATFORM} Version:$CurrentVersion\n" >>${LOGDIR}/license_${PLATFORM}.log; echo "${PLATFORM} LicenseToken:$LicenseToken" >>${LOGDIR}/license_${PLATFORM}.log; echo "${PLATFORM} Stage:$Stage" >>${LOGDIR}/license_${PLATFORM}.log; @@ -228,6 +228,8 @@ _lic() { _vm_host() { # планируется сбор логов о виртуальной машине +# так можно сделать проверку переданного параметра, либо id либо имя ВМ,если начинается с символа решетки значит id +# echo '#12444' | grep -Pq '^#[0-9]+$' && echo by-id || echo by-name echo "it's coming soon!"; vm_name=$1; vm_id=$2; @@ -238,45 +240,58 @@ _node() { node_ip=$1; node_port=$2; mysql_collect "${node_ip}_db.log" "'select id,name,comment,cluster,ram_mib,max_vcpu_number,cpu_number,ip_addr,ssh_port,host_max_num,state,connection_error,libvirt_error,gray_ips,disk_params,property,host_creation_blocked,mon_installed,mon_install_date,metrics_timestamp,os_version,kernel_version,uptime,libvirt_version,qemu_version,overselling,hostname,vnc_addr,selinux_enforcing,problems,hdd_overselling,ip_addr_v6,bird_error,lxd_error,lxd_version,host_limit,socket_number,ha_state,ha_disable_failed,ha_error,update_dc_networks_failed,network_settings_lock,network_error,frr_error,host_filter,vm5_data,additional_data,vcpu_limit,spice_error from vm_node where ip_addr=\\\"$node_ip\\\"\\G;'" - node_collect $node_ip $node_port "${node_ip}_hostnamectl.log" "hostnamectl"; - node_collect $node_ip $node_port "${node_ip}_release.log" "\"cat /etc/*release\""; - node_collect $node_ip $node_port "${node_ip}_dmesg.log" "\"dmesg | grep -i -E 'error|failed|critical|bug|panic'\""; - node_collect $node_ip $node_port "${node_ip}_services.log" "\"journalctl | grep -i -E 'error|failed|critical|bug|panic'\""; - node_collect $node_ip $node_port "${node_ip}_services.log" "\"systemctl status libvirtd -l\""; - node_collect $node_ip $node_port "${node_ip}_services.log" "\"systemctl show libvirtd\""; - node_collect $node_ip $node_port "${node_ip}_sshd_config" "\"cat /etc/ssh/sshd_config\""; +declare -A cmd +cmd["0 hostnamectl"]="hostnamectl"; +cmd["1 release"]="\"cat /etc/*release\""; +cmd["2 dmesg"]="\"dmesg | grep -i -E 'error|failed|critical|bug|panic'\""; +cmd["3 services"]="\"journalctl | grep -i -E 'error|failed|critical|bug|panic'\""; +cmd["4 services"]="\"systemctl status libvirtd -l\""; +cmd["5 services"]="\"systemctl status gomon -l\""; +cmd["6 services"]="\"systemctl show libvirtd\""; +cmd["7 sshd_config"]="\"cat /etc/ssh/sshd_config\""; +cmd["8 hwinfo"]="lscpu"; +cmd["9 hwinfo"]="lscpu | grep -i -E 'socket|core|thread'"; +cmd["10 hwinfo"]="dmidecode"; +cmd["11 time"]="timedatectl"; +cmd["12 time"]="uptime"; +cmd["13 time"]="\"last reboot | head -10\""; +cmd["14 virsh"]="\"virsh list --all\""; +cmd["15 virsh"]="\"virsh pool-list --all\""; +cmd["16 virsh"]="\"virt-host-validate\""; +cmd["17 mem"]="\"free -m\""; +cmd["18 network"]="\"ip -br a\""; +cmd["19 network"]="\"brctl show\""; +cmd["20 network"]="\"curl -v download.ispsystem.com\""; +cmd["21 firewall"]="\"systemctl status nftables\""; +cmd["22 firewall"]="\"systemctl status firewalld\""; +cmd["23 firewall"]="\"firewall-cmd --list-ports\""; +cmd["24 firewall"]="\"nft list ruleset\""; +cmd["25 firewall"]="\"ss -tulpn | grep 16514\""; +cmd["26 firewall"]="\"ss -tulpn '( sport >= 49152 and sport <= 49215 )'\""; +cmd["27 firewall"]="\"ss -tulpn '( sport >= 5900 and sport <= 6900 )'\""; +cmd["28 firewall"]="\"ss -tulpn '( sport = 179 or sport = 4789 )'\""; +cmd["29 firewall"]="\"ss -tulpn | grep 16514\""; +cmd["30 firewall"]="\"ss -tulpn | grep -E ':179|:4789'\""; +cmd["31 disks"]="\"df -h --exclude tmpfs --exclude devtmpfs --exclude squashfs --exclude overlay\""; +cmd["32 disks"]="\"df -i\""; +cmd["33 disks"]="lsblk"; +cmd["34 virsh"]="\"lvdisplay\""; +cmd["35 virsh"]="\"pvdisplay\""; +cmd["36 virsh"]="\"vgdisplay\""; +cmd["37 packages"]="\"yum repolist\""; +cmd["38 packages"]="\"yum history list\""; - node_collect $node_ip $node_port "${node_ip}_hwinfo.log" "lscpu"; - node_collect $node_ip $node_port "${node_ip}_hwinfo.log" "lscpu | grep -i -E 'socket|core|thread'"; - node_collect $node_ip $node_port "${node_ip}_hwinfo.log" "dmidecode"; - node_collect $node_ip $node_port "${node_ip}_time.log" "timedatectl"; - node_collect $node_ip $node_port "${node_ip}_time.log" "uptime"; - node_collect $node_ip $node_port "${node_ip}_time.log" "\"last reboot | head -10\""; - node_collect $node_ip $node_port "${node_ip}_virsh.log" "\"virsh list --all\""; - node_collect $node_ip $node_port "${node_ip}_virsh.log" "\"virsh pool-list --all\""; - node_collect $node_ip $node_port "${node_ip}_virsh.log" "\"virt-host-validate\""; - node_collect $node_ip $node_port "${node_ip}_mem.log" "\"free -m\""; - node_collect $node_ip $node_port "${node_ip}_network.log" "\"ip -br a\""; - node_collect $node_ip $node_port "${node_ip}_network.log" "\"brctl show\""; - node_collect $node_ip $node_port "${node_ip}_network.log" "\"curl -v download.ispsystem.com\""; +for k in "${!cmd[@]}";do +typelog=$(echo $k | cut -d ' ' -f2); + #echo $typelog; + #echo -e "$k=${cmd[$k]}"; + node_collect $node_ip $node_port "${node_ip}_${typelog}.log" "${cmd[$k]}"; +done - node_collect $node_ip $node_port "${node_ip}_firewall.log" "\"systemctl status nftables\""; - node_collect $node_ip $node_port "${node_ip}_firewall.log" "\"systemctl status firewalld\""; - node_collect $node_ip $node_port "${node_ip}_firewall.log" "\"firewall-cmd --list-ports\""; - node_collect $node_ip $node_port "${node_ip}_firewall.log" "\"nft list ruleset\""; - - node_collect $node_ip $node_port "${node_ip}_firewall.log" "\"ss -tulpn | grep 16514\""; - node_collect $node_ip $node_port "${node_ip}_firewall.log" "\"ss -tulpn '( sport >= 49152 and sport <= 49215 )'\""; - node_collect $node_ip $node_port "${node_ip}_firewall.log" "\"ss -tulpn '( sport >= 5900 and sport <= 6900 )'\""; - node_collect $node_ip $node_port "${node_ip}_firewall.log" "\"ss -tulpn '( sport = 179 or sport = 4789 )'\""; - node_collect $node_ip $node_port "${node_ip}_firewall.log" "\"ss -tulpn | grep 16514\""; - node_collect $node_ip $node_port "${node_ip}_firewall.log" "\"ss -tulpn | grep -E ':179|:4789'\""; - node_collect $node_ip $node_port "${node_ip}_disks.log" "\"df -h --exclude tmpfs --exclude devtmpfs --exclude squashfs --exclude overlay\""; - node_collect $node_ip $node_port "${node_ip}_disks.log" "\"df -i\""; - node_collect $node_ip $node_port "${node_ip}_disks.log" "lsblk"; echo "collected logs about node $node_ip $node_port"; finish; } + # обработка аргументов if [[ "$1" == "-logs" || "$1" == "1" ]]; then logtype="logs"; diff --git a/req b/req new file mode 100644 index 0000000..9509b1c --- /dev/null +++ b/req @@ -0,0 +1,42 @@ +grep -vP '^PRETTY_NAME=\"(Ubuntu 20.04.*|AlmaLinux 8.*|Centos 7 x64.*|Astra Linux 1.7.3)\"' /etc/os-release && echo 'ОС совместима' +lscpu +#количество памяти +free --mega | awk 'NR==2{print $2}' +#проверка sse4_2 +lscpu | grep -q sse4_2 && echo 'sse4_2 поддерживается' +#проверка размера диска +if [ $(df --block-size=1m /opt/ispsystem | awk 'NR==2 {print $4}') -ge 36800 ]; then echo 'равно';fi + +#проверка поддержки виртуализации +lscpu | grep -q AMD-V && echo 'виртуализация поддерживается' +#проверка количества ядер +num=$(lscpu --parse=CORE | tail -n 1);num=$((num+1));echo $num + +#vm6 список требований +#Процессор 2 ГГц #Количество ядер 2 шт. +#Оперативная память 4 Гб +#Дисковое пространство 150 Гб +#SSE4.2 +#Операционные системы: +#AlmaLinux 8; +#CentOS 7 x64; +#Ubuntu 20.04. +#Astra Linux 1.7.3. + +#dci6 +#сервер платформы — физический или виртуальный на основе виртуализации KVM, Hyper-V или VMware ESXi; +#Процессор 2.4 ГГц +#Количество ядер 4 шт +#Оперативная память 8 Гб +#Дисковое пространство 110 Гб +#Поддерживаемые операционные системы: +#AlmaLinux 8; +#CentOS 7 x64; +#Ubuntu 20.04. +#Дополнительно для лицензий Infrastructure: +# +#Astra Linux Special Edition 1.7.3 редакции "Орёл", "Воронеж". + +#если занято больше 90 процентов, выдать предупреждение +if [ $(df --block-size=1m /opt/ispsystem | awk 'NR==2 {print $5}' | sed 's/\%//g') -ge 90 ]; then echo 'занято больше 90 процентов места';else echo 'занято меньше 90% места';fi +#проверка занятого места