diff --git a/README.md b/README.md index 4d00713cd4..7c5aaebd0a 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Pandora FMS has a "commercial" solution, with different features, oriented to co ### How to install Pandora FMS -Installing Pandora FMS from sources is a complex task. Please visit our wiki and follow all the steps described for a proper installation. https://pandorafms.com/manual/ +Installing Pandora FMS from sources is a complex task. Please read the **extras/deploy/INSTALL.md** file follow all the steps described for a proper installation. ### What is Pandora FMS? @@ -44,15 +44,3 @@ Pandora FMS is a monitoring tool that not only measures if a parameter is right - Very high capacity (Thousands of devices) - Multitenant, several levels of ACL management. -### Screenshots - -![screenshot 1](http://wolf359.artica.es/public_images/captura-pantalla-pandora3.png) -
-
-![screenshot 2](http://wolf359.artica.es/public_images/pandora6.0sp3-monitor-view.png) -
-
-![screenshot 3](http://wolf359.artica.es/public_images/pandora6.0sp3-agentview.png) -
-
-![screenshot 4](http://wolf359.artica.es/public_images/pandora6.0sp3-sample-visual-console.png) diff --git a/extras/deploy-scripts/INSTALL.md b/extras/deploy-scripts/INSTALL.md new file mode 100644 index 0000000000..227e2e3fbb --- /dev/null +++ b/extras/deploy-scripts/INSTALL.md @@ -0,0 +1,83 @@ +![logo Pandora-FMS](https://user-images.githubusercontent.com/8567291/151817953-dc9c4c88-5f3c-459b-98a7-da0534930a2c.png) + +### Installation from installation scrip + +To install a new Pandora FMS instance, the easy and recommended way to do it is using the online installation tool. +Just download the correct script for your OS in extras/deploy-scripts/ + +The nomenclature for the corresponding OS scripts are: + + - **pandora_deploy_community_gh.sh**: centos7 (to be deprecated) + - **pandora_deploy_community_el8_gh.sh**: rockylinux8, almalinux 8, RHEL8 + - **pandora_deploy_community_el9_gh.sh**: rockylinux9, almalinux 9, RHEL9 + - **pandora_deploy_community_ubuntu_2204_gh.sh**: Ubuntu Server 22.04 + +Once you download and copy the script to the home directory of your server, give it the correct permission to execute. + +``` +chmod +x pandora_deploy_community_el8_gh.sh +``` + +Then just run the script to start the installation process. + +``` +./pandora_deploy_community_el8_gh.sh +``` + +### Install Agent online scrip + +To install a new Pandora FMS instance, the easy and recommended way to do it is using the online installation tool. +Just download the correct script for your OS in extras/deploy-scripts/ + +it will handle all the dependencies and configurations for you. + +``` +chmod +x pandora_agent_deploy_gh.sh +./pandora_agent_deploy_gh.sh +``` + +### Update Pandora FMS + +The easiest and recommend way to update the environment is to use the update manager integrated in the Pandora FMS web console, just clicking in online update. + +To update it manually, is possible to do it from the release packages + +#### Update from RPM packages + +For RHEL and RHEL compatible systems such as rockylinux or almalinux just download the rpms packages from release section and install it with the proper package manager such as yum or dnf. + +For example. + +``` +dnf install ./pandorafms_agent_linux-7.0NG.772.noarch.rpm +dnf install ./pandorafms_console-7.0NG.772.noarch.rpm +dnf install ./pandorafms_server-7.0NG.772.x86_64.rpm +``` + +#### Update from Tarball packages +For Ubuntu Server systems the only path to update outside the update manager is the Tarball source code packages, it also compatible with RHEL compatible systems if you prefer to do it in such way. + +##### Console +To update the condos you should download the tarball package, decompress it and then copy the pandora_console format to your Apache folder. + +``` +tar xvzf pandorafms_console-7.0NG.772.tar.gz +cp -R pandora_console /var/www/html/ +``` +##### Server + +To update the server is similar just download the tarball package from release section, decompress it, move it to the pandora_server folder and execute the installation script. + +``` +tar xvfz pandorafms_server-7.0NG.772.tar.gz +cd pandora_server +./pandora_server_installer --install +``` +##### Agent + +To update the agent, similar just download the tarball package from release section, decompress it, move it to the pandora_server folder and execute the installation script. +``` +tar xvzf pandorafms_agent_linux-7.0NG.tar.gz +cd unix +./pandora_agent_installer --install +``` \ No newline at end of file diff --git a/extras/deploy-scripts/deploy_ext_database_el8.sh b/extras/deploy-scripts/deploy_ext_database_el8.sh deleted file mode 100644 index 4417265599..0000000000 --- a/extras/deploy-scripts/deploy_ext_database_el8.sh +++ /dev/null @@ -1,374 +0,0 @@ -#!/bin/bash -####################################################### -# PandoraFMS Community online installation script -####################################################### -## Tested versions ## -# Centos 8.4, 8.5 -# Rocky 8.4, 8.5, 8.6, 8.7 -# Almalinuz 8.4, 8.5 -# RedHat 8.5 - -#Constants -S_VERSION='202302201' -LOGFILE="/tmp/deploy-ext-db-$(date +%F).log" - - -# define default variables -[ "$TZ" ] || TZ="Europe/Madrid" -[ "$MYVER" ] || MYVER=80 -[ "$DBHOST" ] || DBHOST=127.0.0.1 -[ "$DBNAME" ] || DBNAME=pandora -[ "$DBUSER" ] || DBUSER=pandora -[ "$DBPASS" ] || DBPASS='Pandor4!' -[ "$DBPORT" ] || DBPORT=3306 -[ "$DBROOTUSER" ] || DBROOTUSER=root -[ "$DBROOTPASS" ] || DBROOTPASS='Pandor4!' -[ "$SKIP_DATABASE_INSTALL" ] || SKIP_DATABASE_INSTALL=0 -[ "$SKIP_KERNEL_OPTIMIZATIONS" ] || SKIP_KERNEL_OPTIMIZATIONS=0 -[ "$POOL_SIZE" ] || POOL_SIZE=$(grep -i total /proc/meminfo | head -1 | awk '{printf "%.2f \n", $(NF-1)*0.4/1024}' | sed "s/\\..*$/M/g") - - -# Ansi color code variables -red="\e[0;91m" -green="\e[0;92m" -cyan="\e[0;36m" -reset="\e[0m" - -# Functions -execute_cmd () { - local cmd="$1" - local msg="$2" - - echo -e "${cyan}$msg...${reset}" - $cmd &>> "$LOGFILE" - if [ $? -ne 0 ]; then - echo -e "${red}Fail${reset}" - [ "$3" ] && echo "$3" - echo "Error installing Pandora FMS for detailed error please check log: $LOGFILE" - rm -rf "$HOME"/pandora_deploy_tmp &>> "$LOGFILE" - exit 1 - else - echo -e "\e[1A\e ${cyan}$msg...${reset} ${green}OK${reset}" - return 0 - fi -} - -check_cmd_status () { - if [ $? -ne 0 ]; then - echo -e "${red}Fail${reset}" - [ "$1" ] && echo "$1" - echo "Error installing Pandora FMS for detailed error please check log: $LOGFILE" - rm -rf "$HOME"/pandora_deploy_tmp/*.rpm* &>> "$LOGFILE" - exit 1 - else - echo -e "${green}OK${reset}" - return 0 - fi -} - -check_root_permissions () { - echo -en "${cyan}Checking root account... ${reset}" - if [ "$(whoami)" != "root" ]; then - echo -e "${red}Fail${reset}" - echo "Please use a root account or sudo for installing Pandora FMS" - echo "Error installing Pandora FMS for detailed error please check log: $LOGFILE" - exit 1 - - else - echo -e "${green}OK${reset}" - fi -} - -# Function to check if a password meets the MySQL secure password requirements -is_mysql_secure_password() { - local password=$1 - - # Check password length (at least 8 characters) - if [[ ${#password} -lt 8 ]]; then - echo "Password length should be at least 8 characters." - return 1 - fi - - # Check if password contains at least one uppercase letter - if [[ $password == ${password,,} ]]; then - echo "Password should contain at least one uppercase letter." - return 1 - fi - - # Check if password contains at least one lowercase letter - if [[ $password == ${password^^} ]]; then - echo "Password should contain at least one lowercase letter." - return 1 - fi - - # Check if password contains at least one digit - if ! [[ $password =~ [0-9] ]]; then - echo "Password should contain at least one digit." - return 1 - fi - - # Check if password contains at least one special character - if ! [[ $password =~ [[:punct:]] ]]; then - echo "Password should contain at least one special character." - return 1 - fi - - # Check if password is not a common pattern (e.g., "password", "123456") - local common_patterns=("password" "123456" "qwerty") - for pattern in "${common_patterns[@]}"; do - if [[ $password == *"$pattern"* ]]; then - echo "Password should not contain common patterns." - return 1 - fi - done - - # If all checks pass, the password is MySQL secure compliant - return 0 -} - -## Main -echo "Starting PandoraFMS External DB deployment EL8 ver. $S_VERSION" - -if ! grep --version &>> $LOGFILE ; then echo 'Error grep is not detected on the system, grep tool is needed for installation.'; exit -1 ;fi -if ! sed --version &>> $LOGFILE ; then echo 'Error grep is not detected on the system, grep tool is needed for installation.'; exit -1 ;fi - - -# Centos Version -if [ ! "$(grep -Ei 'centos|rocky|Almalinux|Red Hat Enterprise' /etc/redhat-release)" ]; then - printf "\n ${red}Error this is not a Centos/Rocky/Almalinux Base system, this installer is compatible with RHEL/Almalinux/Centos/Rockylinux systems only${reset}\n" - exit 1 -fi - - -echo -en "${cyan}Check Centos Version...${reset}" -[ $(sed -nr 's/VERSION_ID+=\s*"([0-9]).*"$/\1/p' /etc/os-release) -eq '8' ] -check_cmd_status 'Error OS version, RHEL/Almalinux/Centos/Rockylinux 8+ is expected' - -#Detect OS -os_name=$(grep ^PRETTY_NAME= /etc/os-release | cut -d '=' -f2 | tr -d '"') -execute_cmd "echo $os_name" "OS detected: ${os_name}" - -# initialice logfile -execute_cmd "echo 'Starting community deployment' > $LOGFILE" "All installer activity is logged on $LOGFILE" -echo "Community installer version: $S_VERSION" >> "$LOGFILE" - -# Pre checks -# Root permisions -check_root_permissions - -# Systemd -execute_cmd "systemctl status" "Checking SystemD" 'This is not a SystemD enable system, if tryng to use in a docker env please check: https://github.com/pandorafms/pandorafms/tree/develop/extras/docker/centos8' - -# Check memomry greather or equal to 2G -execute_cmd "[ $(grep MemTotal /proc/meminfo | awk '{print $2}') -ge 1700000 ]" 'Checking memory (required: 2 GB)' - -# Check disk size at least 10 Gb free space -execute_cmd "[ $(df -BM / | tail -1 | awk '{print $4}' | tr -d M) -gt 10000 ]" 'Checking Disk (required: 10 GB free min)' - -# Setting timezone -rm -rf /etc/localtime &>> "$LOGFILE" -execute_cmd "timedatectl set-timezone $TZ" "Setting Timezone $TZ" - -# Execute tools check -execute_cmd "awk --version" 'Checking needed tools: awk' -execute_cmd "grep --version" 'Checking needed tools: grep' -execute_cmd "sed --version" 'Checking needed tools: sed' -execute_cmd "dnf --version" 'Checking needed tools: dnf' - -#Check mysql pass -execute_cmd "is_mysql_secure_password $DBROOTPASS" "Checking DBROOTPASS password match policy" 'This password do not match minimum MySQL policy requirements, more info in: https://dev.mysql.com/doc/refman/8.0/en/validate-password.html' -execute_cmd "is_mysql_secure_password $DBPASS" "Checking DBPASS password match policy" 'This password do not match minimum MySQL policy requirements, more info in: https://dev.mysql.com/doc/refman/8.0/en/validate-password.html' - -# Creating working directory -rm -rf "$HOME"/pandora_deploy_tmp/*.rpm* &>> "$LOGFILE" -mkdir "$HOME"/pandora_deploy_tmp &>> "$LOGFILE" -execute_cmd "cd $HOME/pandora_deploy_tmp" "Moving to workspace: $HOME/pandora_deploy_tmp" - -## Extra steps on redhat envs -if [ "$(grep -Ei 'Red Hat Enterprise' /etc/redhat-release)" ]; then - ## In case REDHAT - # Check susbscription manager status: - echo -en "${cyan}Checking Red Hat Enterprise subscription... ${reset}" - subscription-manager list &>> "$LOGFILE" - subscription-manager status &>> "$LOGFILE" - check_cmd_status 'Error checking subscription status, make sure your server is activated and suscribed to Red Hat Enterprise repositories' - - # Ckeck repolist - dnf repolist &>> "$LOGFILE" - echo -en "${cyan}Checking Red Hat Enterprise repolist... ${reset}" - dnf repolist | grep 'rhel-8-for-x86_64-baseos-rpms' &>> "$LOGFILE" - check_cmd_status 'Error checking repositories status, could try a subscription-manager attach command or contact sysadmin' - - #install extra repos - extra_repos=" \ - tar \ - dnf-utils \ - https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm \ - https://repo.percona.com/yum/percona-release-latest.noarch.rpm" - - execute_cmd "dnf install -y $extra_repos" "Installing extra repositories" - execute_cmd "subscription-manager repos --enable codeready-builder-for-rhel-8-x86_64-rpms" "Enabling subscription to codeready-builder" -else - # For alma/rocky/centos - extra_repos=" \ - tar \ - dnf-utils \ - epel-release \ - https://repo.percona.com/yum/percona-release-latest.noarch.rpm" - - execute_cmd "dnf install -y $extra_repos" "Installing extra repositories" - execute_cmd "dnf config-manager --set-enabled powertools" "Configuring Powertools" -fi - - -#Installing wget -execute_cmd "dnf install -y wget" "Installing wget" - - -# Install percona Database -execute_cmd "dnf module disable -y mysql" "Disabiling mysql module" - -if [ "$MYVER" -eq '80' ] ; then - execute_cmd "percona-release setup ps80 -y" "Enabling mysql80 module" - execute_cmd "dnf install -y percona-server-server percona-xtrabackup-80" "Installing Percona Server 80" -fi - -if [ "$MYVER" -ne '80' ] ; then - execute_cmd "dnf install -y Percona-Server-server-57 percona-xtrabackup-24" "Installing Percona Server 57" -fi - -# Disabling SELINUX and firewalld -setenforce 0 &>> "$LOGFILE" -sed -i -e "s/^SELINUX=.*/SELINUX=disabled/g" /etc/selinux/config &>> "$LOGFILE" -systemctl disable firewalld --now &>> "$LOGFILE" - -# Adding standar cnf for initial setup. -cat > /etc/my.cnf << EO_CONFIG_TMP -[mysqld] -datadir=/var/lib/mysql -socket=/var/lib/mysql/mysql.sock -symbolic-links=0 -log-error=/var/log/mysqld.log -pid-file=/var/run/mysqld/mysqld.pid -EO_CONFIG_TMP - -#Configuring Database -if [ "$SKIP_DATABASE_INSTALL" -eq '0' ] ; then - execute_cmd "systemctl start mysqld" "Starting database engine" - export MYSQL_PWD=$(grep "temporary password" /var/log/mysqld.log | rev | cut -d' ' -f1 | rev) - if [ "$MYVER" -eq '80' ] ; then - echo """ - SET PASSWORD FOR '$DBROOTUSER'@'localhost' = '$DBROOTPASS'; - """ | mysql --connect-expired-password -u$DBROOTUSER &>> "$LOGFILE" - fi - - if [ "$MYVER" -ne '80' ] ; then - echo """ - SET PASSWORD FOR '$DBROOTUSER'@'localhost' = PASSWORD('$DBROOTPASS'); - """ | mysql --connect-expired-password -u$DBROOTUSER &>> "$LOGFILE"fi - fi - - export MYSQL_PWD=$DBROOTPASS - echo -en "${cyan}Creating Pandora FMS database...${reset}" - echo "create database $DBNAME" | mysql -u$DBROOTUSER -P$DBPORT -h$DBHOST - check_cmd_status "Error creating database $DBNAME, is this an empty node? if you have a previus installation please contact with support." - - echo "CREATE USER \"$DBUSER\"@'%' IDENTIFIED BY \"$DBPASS\";" | mysql -u$DBROOTUSER -P$DBPORT -h$DBHOST - echo "ALTER USER \"$DBUSER\"@'%' IDENTIFIED WITH mysql_native_password BY \"$DBPASS\"" | mysql -u$DBROOTUSER -P$DBPORT -h$DBHOST - echo "GRANT ALL PRIVILEGES ON $DBNAME.* TO \"$DBUSER\"@'%'" | mysql -u$DBROOTUSER -P$DBPORT -h$DBHOST - -#Generating my.cnf -cat > /etc/my.cnf << EO_CONFIG_F -[mysqld] -datadir=/var/lib/mysql -socket=/var/lib/mysql/mysql.sock -user=mysql -character-set-server=utf8 -skip-character-set-client-handshake -# Disabling symbolic-links is recommended to prevent assorted security risks -symbolic-links=0 -# Mysql optimizations for Pandora FMS -# Please check the documentation in http://pandorafms.com for better results - -max_allowed_packet = 64M -innodb_buffer_pool_size = $POOL_SIZE -innodb_lock_wait_timeout = 90 -innodb_file_per_table -innodb_flush_log_at_trx_commit = 0 -innodb_flush_method = O_DIRECT -innodb_log_file_size = 64M -innodb_log_buffer_size = 16M -innodb_io_capacity = 100 -thread_cache_size = 8 -thread_stack = 256K -max_connections = 100 - -key_buffer_size=4M -read_buffer_size=128K -read_rnd_buffer_size=128K -sort_buffer_size=128K -join_buffer_size=4M - -query_cache_type = 1 -query_cache_size = 64M -query_cache_min_res_unit = 2k -query_cache_limit = 256K - -#skip-log-bin - -sql_mode="" - -[mysqld_safe] -log-error=/var/log/mysqld.log -pid-file=/var/run/mysqld/mysqld.pid - -EO_CONFIG_F - - if [ "$MYVER" -eq '80' ] ; then - sed -i -e "/query_cache.*/ s/^#*/#/g" /etc/my.cnf - sed -i -e "s/#skip-log-bin/skip-log-bin/g" /etc/my.cnf - sed -i -e "s/character-set-server=utf8/character-set-server=utf8mb4/g" /etc/my.cnf - - fi - - execute_cmd "systemctl restart mysqld" "Configuring database engine" - execute_cmd "systemctl enable mysqld --now" "Enabling Database service" -fi -export MYSQL_PWD=$DBPASS - - -# Kernel optimization - -if [ "$SKIP_KERNEL_OPTIMIZATIONS" -eq '0' ] ; then -cat >> /etc/sysctl.conf < /dev/null # remove last log before start - -# define default variables -[ "$TZ" ] || TZ="Europe/Madrid" -[ "$DBHOST" ] || DBHOST=127.0.0.1 -[ "$DBNAME" ] || DBNAME=pandora -[ "$DBUSER" ] || DBUSER=pandora -[ "$DBPASS" ] || DBPASS='Pandor4!' -[ "$DBPORT" ] || DBPORT=3306 -[ "$DBROOTPASS" ] || DBROOTPASS='Pandor4!' -[ "$SKIP_DATABASE_INSTALL" ] || SKIP_DATABASE_INSTALL=0 -[ "$SKIP_KERNEL_OPTIMIZATIONS" ] || SKIP_KERNEL_OPTIMIZATIONS=0 -[ "$POOL_SIZE" ] || POOL_SIZE=$(grep -i total /proc/meminfo | head -1 | awk '{printf "%.2f \n", $(NF-1)*0.4/1024}' | sed "s/\\..*$/M/g") - - -# Ansi color code variables -red="\e[0;91m" -green="\e[0;92m" -cyan="\e[0;36m" -reset="\e[0m" - -# Functions - -execute_cmd () { - local cmd="$1" - local msg="$2" - - echo -e "${cyan}$msg...${reset}" - $cmd &>> "$LOGFILE" - if [ $? -ne 0 ]; then - echo -e "${red}Fail${reset}" - [ "$3" ] && echo "$3" - echo "Error installing Pandora FMS for detailed error please check log: $LOGFILE" - rm -rf "$WORKDIR" &>> "$LOGFILE" - exit 1 - else - echo -e "\e[1A\e ${cyan}$msg...${reset} ${green}OK${reset}" - return 0 - fi -} - -check_cmd_status () { - if [ $? -ne 0 ]; then - echo -e "${red}Fail${reset}" - [ "$1" ] && echo "$1" - echo "Error installing Pandora FMS for detailed error please check log: $LOGFILE" - rm -rf "$WORKDIR" &>> "$LOGFILE" - exit 1 - else - echo -e "${green}OK${reset}" - return 0 - fi -} - -check_root_permissions () { - echo -en "${cyan}Checking root account... ${reset}" - if [ "$(whoami)" != "root" ]; then - echo -e "${red}Fail${reset}" - echo "Please use a root account or sudo for installing Pandora FMS" - echo "Error installing Pandora FMS for detailed error please check log: $LOGFILE" - exit 1 - - else - echo -e "${green}OK${reset}" - fi -} - -# Function to check if a password meets the MySQL secure password requirements -is_mysql_secure_password() { - local password=$1 - - # Check password length (at least 8 characters) - if [[ ${#password} -lt 8 ]]; then - echo "Password length should be at least 8 characters." - return 1 - fi - - # Check if password contains at least one uppercase letter - if [[ $password == ${password,,} ]]; then - echo "Password should contain at least one uppercase letter." - return 1 - fi - - # Check if password contains at least one lowercase letter - if [[ $password == ${password^^} ]]; then - echo "Password should contain at least one lowercase letter." - return 1 - fi - - # Check if password contains at least one digit - if ! [[ $password =~ [0-9] ]]; then - echo "Password should contain at least one digit." - return 1 - fi - - # Check if password contains at least one special character - if ! [[ $password =~ [[:punct:]] ]]; then - echo "Password should contain at least one special character." - return 1 - fi - - # Check if password is not a common pattern (e.g., "password", "123456") - local common_patterns=("password" "123456" "qwerty") - for pattern in "${common_patterns[@]}"; do - if [[ $password == *"$pattern"* ]]; then - echo "Password should not contain common patterns." - return 1 - fi - done - - # If all checks pass, the password is MySQL secure compliant - return 0 -} - -## Main -echo "Starting PandoraFMS External DB deployment Ubuntu 22.04 ver. $S_VERSION" - -if ! grep --version &>> $LOGFILE ; then echo 'Error grep is not detected on the system, grep tool is needed for installation.'; exit -1 ;fi -if ! sed --version &>> $LOGFILE ; then echo 'Error grep is not detected on the system, grep tool is needed for installation.'; exit -1 ;fi - -# Ubuntu Version -if [ ! "$(grep -Ei 'Ubuntu' /etc/lsb-release)" ]; then - printf "\n ${red}Error this is not a Ubuntu system, this installer is compatible with Ubuntu systems only${reset}\n" - exit 1 -fi - - -echo -en "${cyan}Check Ubuntu Version...${reset}" -[ $(sed -nr 's/VERSION_ID+=\s*"([0-9][0-9].[0-9][0-9])"$/\1/p' /etc/os-release) == "22.04" ] -check_cmd_status 'Error OS version, Ubuntu 22.04 is expected' - -#Detect OS -os_name=$(grep ^PRETTY_NAME= /etc/os-release | cut -d '=' -f2 | tr -d '"') -execute_cmd "echo $os_name" "OS detected: ${os_name}" - -# initialice logfile -execute_cmd "echo 'Starting community deployment' > $LOGFILE" "All installer activity is logged on $LOGFILE" -echo "Community installer version: $S_VERSION" >> "$LOGFILE" - -# Pre checks -# Root permisions -check_root_permissions - -#Install awk, sed, grep if not present -execute_cmd "apt install -y gawk sed grep" 'Installing needed tools' - -# Systemd -execute_cmd "systemctl --version" "Checking SystemD" 'This is not a SystemD enable system, if tryng to use in a docker env please check: https://github.com/pandorafms/pandorafms/tree/develop/extras/docker/centos8' - -# Check memomry greather or equal to 2G -execute_cmd "[ $(grep MemTotal /proc/meminfo | awk '{print $2}') -ge 1700000 ]" 'Checking memory (required: 2 GB)' - -# Check disk size at least 10 Gb free space -execute_cmd "[ $(df -BM / | tail -1 | awk '{print $4}' | tr -d M) -gt 10000 ]" 'Checking Disk (required: 10 GB free min)' - -# Setting timezone -rm -rf /etc/localtime &>> "$LOGFILE" -execute_cmd "timedatectl set-timezone $TZ" "Setting Timezone $TZ" - -# Execute tools check -execute_cmd "awk --version" 'Checking needed tools: awk' -execute_cmd "grep --version" 'Checking needed tools: grep' -execute_cmd "sed --version" 'Checking needed tools: sed' -execute_cmd "apt --version" 'Checking needed tools: apt' - -#Check mysql pass -execute_cmd "is_mysql_secure_password $DBROOTPASS" "Checking DBROOTPASS password match policy" 'This password do not match minimum MySQL policy requirements, more info in: https://dev.mysql.com/doc/refman/8.0/en/validate-password.html' -execute_cmd "is_mysql_secure_password $DBPASS" "Checking DBPASS password match policy" 'This password do not match minimum MySQL policy requirements, more info in: https://dev.mysql.com/doc/refman/8.0/en/validate-password.html' - -# Creating working directory -rm -rf "$WORKDIR" &>> "$LOGFILE" -mkdir -p "$WORKDIR" &>> "$LOGFILE" -execute_cmd "cd $WORKDIR" "Moving to workdir: $WORKDIR" - -## Install utils -execute_cmd "apt update" "Updating repos" -execute_cmd "apt install -y net-tools vim curl wget software-properties-common apt-transport-https" "Installing utils" - -# Disabling apparmor and ufw -systemctl stop ufw.service &>> "$LOGFILE" -systemctl disable ufw &>> "$LOGFILE" -systemctl stop apparmor &>> "$LOGFILE" -systemctl disable apparmor &>> "$LOGFILE" - -#install mysql -execute_cmd "curl -O https://repo.percona.com/apt/percona-release_latest.generic_all.deb" "Downloading Percona repository for MySQL8" -execute_cmd "apt install -y gnupg2 lsb-release ./percona-release_latest.generic_all.deb" "Installing Percona repository for MySQL8" -execute_cmd "percona-release setup ps80" "Configuring Percona repository for MySQL8" - -echo -en "${cyan}Installing Percona Server for MySQL8...${reset}" - env DEBIAN_FRONTEND=noninteractive apt install -y percona-server-server percona-xtrabackup-80 &>> "$LOGFILE" -check_cmd_status "Error Installing MySql Server" - -#Configuring Database -if [ "$SKIP_DATABASE_INSTALL" -eq '0' ] ; then - execute_cmd "systemctl start mysql" "Starting database engine" - - echo """ - ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY '$DBROOTPASS'; - """ | mysql -uroot &>> "$LOGFILE" - - export MYSQL_PWD=$DBROOTPASS - echo "INSTALL COMPONENT 'file://component_validate_password';" | mysql -uroot -P$DBPORT -h$DBHOST &>> "$LOGFILE" - echo -en "${cyan}Creating Pandora FMS database...${reset}" - echo "create database $DBNAME" | mysql -uroot -P$DBPORT -h$DBHOST - check_cmd_status "Error creating database $DBNAME, is this an empty node? if you have a previus installation please contact with support." - - echo "CREATE USER \"$DBUSER\"@'%' IDENTIFIED BY \"$DBPASS\";" | mysql -uroot -P$DBPORT -h$DBHOST - echo "ALTER USER \"$DBUSER\"@'%' IDENTIFIED WITH mysql_native_password BY \"$DBPASS\"" | mysql -uroot -P$DBPORT -h$DBHOST - echo "GRANT ALL PRIVILEGES ON $DBNAME.* TO \"$DBUSER\"@'%'" | mysql -uroot -P$DBPORT -h$DBHOST -fi -export MYSQL_PWD=$DBPASS - -#Generating my.cnf -cat > /etc/mysql/my.cnf << EOF_DB -[mysqld] -datadir=/var/lib/mysql -user=mysql -character-set-server=utf8mb4 -skip-character-set-client-handshake -# Disabling symbolic-links is recommended to prevent assorted security risks -symbolic-links=0 -# Mysql optimizations for Pandora FMS -# Please check the documentation in http://pandorafms.com for better results - -max_allowed_packet = 64M -innodb_buffer_pool_size = $POOL_SIZE -innodb_lock_wait_timeout = 90 -innodb_file_per_table -innodb_flush_log_at_trx_commit = 0 -innodb_flush_method = O_DIRECT -innodb_log_file_size = 64M -innodb_log_buffer_size = 16M -innodb_io_capacity = 300 -thread_cache_size = 8 -thread_stack = 256K -max_connections = 100 - -key_buffer_size=4M -read_buffer_size=128K -read_rnd_buffer_size=128K -sort_buffer_size=128K -join_buffer_size=4M - -skip-log-bin - -sql_mode="" - -log-error=/var/log/mysql/error.log -[mysqld_safe] -log-error=/var/log/mysqld.log -pid-file=/var/run/mysqld/mysqld.pid - -EOF_DB - -execute_cmd "systemctl restart mysql" "Configuring and restarting database engine" - -# Kernel optimization -if [ "$SKIP_KERNEL_OPTIMIZATIONS" -eq '0' ] ; then -cat >> /etc/sysctl.conf <> "$LOGFILE" -#dnf config-manager --set-disable packages-microsoft-com-prod + libnsl " + execute_cmd "dnf install -y $server_dependencies" "Installing Pandora FMS Server dependencies" # Disabling SELINUX and firewalld setenforce 0 &>> "$LOGFILE" @@ -568,23 +520,12 @@ EO_CONFIG_F fi export MYSQL_PWD=$DBPASS -#Define packages -if [ "$PANDORA_LTS" -eq '1' ] ; then - [ "$PANDORA_SERVER_PACKAGE" ] || PANDORA_SERVER_PACKAGE="https://firefly.pandorafms.com/pandorafms/latest/RHEL_CentOS/LTS/pandorafms_server-7.0NG.noarch.rpm" - [ "$PANDORA_CONSOLE_PACKAGE" ] || PANDORA_CONSOLE_PACKAGE="https://firefly.pandorafms.com/pandorafms/latest/RHEL_CentOS/LTS/pandorafms_console-7.0NG.noarch.rpm" - [ "$PANDORA_AGENT_PACKAGE" ] || PANDORA_AGENT_PACKAGE="https://firefly.pandorafms.com/pandorafms/latest/RHEL_CentOS/pandorafms_agent_linux_bin-7.0NG.x86_64.rpm" -elif [ "$PANDORA_LTS" -ne '1' ] ; then - [ "$PANDORA_SERVER_PACKAGE" ] || PANDORA_SERVER_PACKAGE="https://firefly.pandorafms.com/pandorafms/latest/RHEL_CentOS/pandorafms_server-7.0NG.x86_64.rpm" - [ "$PANDORA_CONSOLE_PACKAGE" ] || PANDORA_CONSOLE_PACKAGE="https://firefly.pandorafms.com/pandorafms/latest/RHEL_CentOS/pandorafms_console-7.0NG.x86_64.rpm" - [ "$PANDORA_AGENT_PACKAGE" ] || PANDORA_AGENT_PACKAGE="https://firefly.pandorafms.com/pandorafms/latest/RHEL_CentOS/pandorafms_agent_linux_bin-7.0NG.x86_64.rpm" -fi +# packages + +[ "$PANDORA_SERVER_PACKAGE" ] || PANDORA_SERVER_PACKAGE="https://github.com/pandorafms/pandorafms/releases/download/v772-LTS/pandorafms_server-7.0NG.772.x86_64.rpm" +[ "$PANDORA_CONSOLE_PACKAGE" ] || PANDORA_CONSOLE_PACKAGE="https://github.com/pandorafms/pandorafms/releases/download/v772-LTS/pandorafms_console-7.0NG.772.noarch.rpm" +[ "$PANDORA_AGENT_PACKAGE" ] || PANDORA_AGENT_PACKAGE="https://github.com/pandorafms/pandorafms/releases/download/v772-LTS/pandorafms_agent_linux-7.0NG.772.noarch.rpm" -# if beta is enable -if [ "$PANDORA_BETA" -eq '1' ] ; then - PANDORA_SERVER_PACKAGE="https://firefly.pandorafms.com/pandora_enterprise_nightlies/pandorafms_server-latest.x86_64.rpm" - PANDORA_CONSOLE_PACKAGE="https://firefly.pandorafms.com/pandora_enterprise_nightlies/pandorafms_console-latest.x86_64.rpm" - PANDORA_AGENT_PACKAGE="https://firefly.pandorafms.com/pandorafms/latest/RHEL_CentOS/pandorafms_agent_linux_bin-7.0NG.x86_64.rpm" -fi # Downloading Pandora Packages execute_cmd "curl -LSs --output pandorafms_server-7.0NG.noarch.rpm ${PANDORA_SERVER_PACKAGE}" "Downloading Pandora FMS Server community" @@ -594,11 +535,6 @@ execute_cmd "curl -LSs --output pandorafms_agent_linux-7.0NG.noarch.rpm ${PANDOR # Install Pandora execute_cmd "dnf install -y $HOME/pandora_deploy_tmp/pandorafms*.rpm" "Installing Pandora FMS packages" -# Copy gotty utility -execute_cmd "wget https://firefly.pandorafms.com/pandorafms/utils/gotty_linux_amd64.tar.gz" 'Dowloading gotty util' -tar xvzf gotty_linux_amd64.tar.gz &>> $LOGFILE -execute_cmd "mv gotty /usr/bin/" 'Installing gotty util' - # Enable Services execute_cmd "systemctl enable httpd --now" "Enabling HTTPD service" execute_cmd "systemctl enable php-fpm --now" "Enabling PHP-FPM service" diff --git a/extras/deploy-scripts/pandora_deploy_community_el9.sh b/extras/deploy-scripts/pandora_deploy_community_el9_gh.sh similarity index 90% rename from extras/deploy-scripts/pandora_deploy_community_el9.sh rename to extras/deploy-scripts/pandora_deploy_community_el9_gh.sh index 738833d774..6cc4a6531c 100644 --- a/extras/deploy-scripts/pandora_deploy_community_el9.sh +++ b/extras/deploy-scripts/pandora_deploy_community_el9_gh.sh @@ -30,8 +30,6 @@ LOGFILE="/tmp/pandora-deploy-community-$(date +%F).log" [ "$SKIP_DATABASE_INSTALL" ] || SKIP_DATABASE_INSTALL=0 [ "$SKIP_KERNEL_OPTIMIZATIONS" ] || SKIP_KERNEL_OPTIMIZATIONS=0 [ "$POOL_SIZE" ] || POOL_SIZE=$(grep -i total /proc/meminfo | head -1 | awk '{printf "%.2f \n", $(NF-1)*0.4/1024}' | sed "s/\\..*$/M/g") -[ "$PANDORA_LTS" ] || PANDORA_LTS=1 -[ "$PANDORA_BETA" ] || PANDORA_BETA=0 [ "$RHEL_CHECK_SUBSCRIPTION" ] || RHEL_CHECK_SUBSCRIPTION=1 #Check if possible to get os version @@ -97,8 +95,7 @@ check_pre_pandora () { } check_repo_connection () { - execute_cmd "ping -c 2 firefly.pandorafms.com" "Checking Community repo" - execute_cmd "ping -c 2 support.pandorafms.com" "Checking Enterprise repo" + execute_cmd "ping -c 2 github.com" "Checking Community repo" } check_root_permissions () { @@ -207,9 +204,7 @@ check_root_permissions [ "$SKIP_PRECHECK" == 1 ] || check_pre_pandora #advicing BETA PROGRAM -INSTALLING_VER="${green}RRR version enable using RRR PandoraFMS packages${reset}" -[ "$PANDORA_LTS" -ne '0' ] && INSTALLING_VER="${green}LTS version enable using LTS PandoraFMS packages${reset}" -[ "$PANDORA_BETA" -ne '0' ] && INSTALLING_VER="${red}BETA version enable using nightly PandoraFMS packages${reset}" +INSTALLING_VER="${green}LTS version enable ${reset}" echo -e $INSTALLING_VER # Connectivity @@ -386,10 +381,8 @@ console_dependencies=" \ mod_ssl \ libzstd \ openldap-clients \ - https://firefly.pandorafms.com/centos8/chromium-122.0.6261.128-1.el8.x86_64.rpm \ - https://firefly.pandorafms.com/centos8/chromium-common-122.0.6261.128-1.el8.x86_64.rpm \ - https://firefly.pandorafms.com/centos8/pandora_gotty-1.0-1.el8.x86_64.rpm \ - https://firefly.pandorafms.com/centos8/pandorafms_made-0.1.0-1.el8.x86_64.rpm " + https://github.com/pandorafms/pandorafms/releases/download/tools/pandora_gotty-1.1-1.el8.x86_64.rpm \ + chromium " execute_cmd "dnf install -y $console_dependencies" "Installing Pandora FMS Console dependencies" # Server dependencies @@ -416,9 +409,7 @@ server_dependencies=" \ bind-utils \ whois \ libnsl \ - libxcrypt-compat \ - https://firefly.pandorafms.com/pandorafms-el9/perl-Geo-IP-1.51-1.el9.x86_64.rpm \ - https://firefly.pandorafms.com/centos8/pandorawmic-1.0.0-1.x86_64.rpm" + libxcrypt-compat " execute_cmd "dnf install -y $server_dependencies" "Installing Pandora FMS Server dependencies" #ipam dependencies @@ -521,23 +512,12 @@ EO_CONFIG_F fi export MYSQL_PWD=$DBPASS -#Define packages -if [ "$PANDORA_LTS" -eq '1' ] ; then - [ "$PANDORA_SERVER_PACKAGE" ] || PANDORA_SERVER_PACKAGE="https://firefly.pandorafms.com/pandorafms/latest/RHEL_CentOS/LTS/pandorafms_server-7.0NG.noarch.rpm" - [ "$PANDORA_CONSOLE_PACKAGE" ] || PANDORA_CONSOLE_PACKAGE="https://firefly.pandorafms.com/pandorafms/latest/RHEL_CentOS/LTS/pandorafms_console-7.0NG.noarch.rpm" - [ "$PANDORA_AGENT_PACKAGE" ] || PANDORA_AGENT_PACKAGE="https://firefly.pandorafms.com/pandorafms/latest/RHEL_CentOS/pandorafms_agent_linux_bin-7.0NG.x86_64.rpm" -elif [ "$PANDORA_LTS" -ne '1' ] ; then - [ "$PANDORA_SERVER_PACKAGE" ] || PANDORA_SERVER_PACKAGE="https://firefly.pandorafms.com/pandorafms/latest/RHEL_CentOS/pandorafms_server-7.0NG.x86_64.rpm" - [ "$PANDORA_CONSOLE_PACKAGE" ] || PANDORA_CONSOLE_PACKAGE="https://firefly.pandorafms.com/pandorafms/latest/RHEL_CentOS/pandorafms_console-7.0NG.x86_64.rpm" - [ "$PANDORA_AGENT_PACKAGE" ] || PANDORA_AGENT_PACKAGE="https://firefly.pandorafms.com/pandorafms/latest/RHEL_CentOS/pandorafms_agent_linux_bin-7.0NG.x86_64.rpm" -fi +# packages + +[ "$PANDORA_SERVER_PACKAGE" ] || PANDORA_SERVER_PACKAGE="https://github.com/pandorafms/pandorafms/releases/download/v772-LTS/pandorafms_server-7.0NG.772.x86_64.rpm" +[ "$PANDORA_CONSOLE_PACKAGE" ] || PANDORA_CONSOLE_PACKAGE="https://github.com/pandorafms/pandorafms/releases/download/v772-LTS/pandorafms_console-7.0NG.772.noarch.rpm" +[ "$PANDORA_AGENT_PACKAGE" ] || PANDORA_AGENT_PACKAGE="https://github.com/pandorafms/pandorafms/releases/download/v772-LTS/pandorafms_agent_linux-7.0NG.772.noarch.rpm" -# if beta is enable -if [ "$PANDORA_BETA" -eq '1' ] ; then - PANDORA_SERVER_PACKAGE="https://firefly.pandorafms.com/pandora_enterprise_nightlies/pandorafms_server-latest.x86_64.rpm" - PANDORA_CONSOLE_PACKAGE="https://firefly.pandorafms.com/pandora_enterprise_nightlies/pandorafms_console-latest.x86_64.rpm" - PANDORA_AGENT_PACKAGE="https://firefly.pandorafms.com/pandorafms/latest/RHEL_CentOS/pandorafms_agent_linux_bin-7.0NG.x86_64.rpm" -fi # Downloading Pandora Packages execute_cmd "curl -LSs --output pandorafms_server-7.0NG.noarch.rpm ${PANDORA_SERVER_PACKAGE}" "Downloading Pandora FMS Server community" diff --git a/extras/deploy-scripts/pandora_deploy_community.sh b/extras/deploy-scripts/pandora_deploy_community_gh.sh similarity index 84% rename from extras/deploy-scripts/pandora_deploy_community.sh rename to extras/deploy-scripts/pandora_deploy_community_gh.sh index 6433324056..56fb76ac51 100644 --- a/extras/deploy-scripts/pandora_deploy_community.sh +++ b/extras/deploy-scripts/pandora_deploy_community_gh.sh @@ -3,7 +3,7 @@ # PandoraFMS Community online installation script ####################################################### ## Tested versions ## -# Centos 7.9 +# CentOS 7.9 #Constants PANDORA_CONSOLE=/var/www/html/pandora_console @@ -28,8 +28,6 @@ LOGFILE="/tmp/pandora-deploy-community-$(date +%F).log" [ "$SKIP_DATABASE_INSTALL" ] || SKIP_DATABASE_INSTALL=0 [ "$SKIP_KERNEL_OPTIMIZATIONS" ] || SKIP_KERNEL_OPTIMIZATIONS=0 [ "$POOL_SIZE" ] || POOL_SIZE=$(grep -i total /proc/meminfo | head -1 | awk '{printf "%.2f \n", $(NF-1)*0.4/1024}' | sed "s/\\..*$/M/g") -[ "$PANDORA_BETA" ] || PANDORA_BETA=0 -[ "$PANDORA_LTS" ] || PANDORA_LTS=1 #Check if possible to get os version if [ ! -e /etc/os-release ]; then @@ -92,8 +90,7 @@ check_pre_pandora () { } check_repo_connection () { - execute_cmd "ping -c 2 firefly.pandorafms.com" "Checking Community repo" - execute_cmd "ping -c 2 support.pandorafms.com" "Checking Enterprise repo" + execute_cmd "ping -c 2 github.com" "Checking Community repo" } check_root_permissions () { @@ -146,9 +143,7 @@ check_root_permissions [ "$SKIP_PRECHECK" == 1 ] || check_pre_pandora #advicing BETA PROGRAM -INSTALLING_VER="${green}RRR version enable using RRR PandoraFMS packages${reset}" -[ "$PANDORA_LTS" -ne '0' ] && INSTALLING_VER="${green}LTS version enable using LTS PandoraFMS packages${reset}" -[ "$PANDORA_BETA" -ne '0' ] && INSTALLING_VER="${red}BETA version enable using nightly PandoraFMS packages${reset}" +INSTALLING_VER="${green}LTS version enable ${reset}" echo -e $INSTALLING_VER # Connectivity @@ -285,7 +280,7 @@ console_dependencies=" \ mod_ssl \ libzstd \ openldap-clients \ - https://firefly.pandorafms.com/centos8/pandora_gotty-1.0-1.el8.x86_64.rpm \ + https://github.com/pandorafms/pandorafms/releases/download/tools/pandora_gotty-1.1-1.el8.x86_64.rpm \ chromium" execute_cmd "yum install -y $console_dependencies" "Installing Pandora FMS Console dependencies" @@ -311,33 +306,12 @@ server_dependencies=" \ java \ bind-utils \ whois \ - cpanminus \ - https://firefly.pandorafms.com/centos7/wmic-1.4-1.el7.x86_64.rpm \ - https://firefly.pandorafms.com/centos7/pandorawmic-1.0.0-1.x86_64.rpm" + cpanminus" execute_cmd "yum install -y $server_dependencies" "Installing Pandora FMS Server dependencies" # install cpan dependencies execute_cmd "cpanm -i Thread::Semaphore" "Installing Thread::Semaphore" - -# SDK VMware perl dependencies -vmware_dependencies=" \ - https://firefly.pandorafms.com/centos8/VMware-vSphere-Perl-SDK-6.5.0-4566394.x86_64.rpm \ - perl-JSON \ - perl-Archive-Zip \ - openssl-devel \ - perl-Crypt-CBC \ - perl-Digest-SHA \ - https://firefly.pandorafms.com/centos7/perl-Crypt-OpenSSL-AES-0.02-1.el7.x86_64.rpm" -execute_cmd "yum install -y $vmware_dependencies" "Installing SDK VMware perl dependencies" - -# Instant client Oracle -oracle_dependencies=" \ - https://download.oracle.com/otn_software/linux/instantclient/19800/oracle-instantclient19.8-basic-19.8.0.0.0-1.x86_64.rpm \ - https://download.oracle.com/otn_software/linux/instantclient/19800/oracle-instantclient19.8-sqlplus-19.8.0.0.0-1.x86_64.rpm" -execute_cmd "yum install -y $oracle_dependencies || yum reinstall -y $oracle_dependencies" "Installing Oracle Instant client" - -#ipam dependencies ipam_dependencies=" \ perl(NetAddr::IP) \ perl(Sys::Syslog) \ @@ -347,12 +321,6 @@ ipam_dependencies=" \ perl(XML::Twig)" execute_cmd "yum install -y $ipam_dependencies" "Installing IPAM Instant client" -# MSSQL dependencies el7 -execute_cmd "curl https://packages.microsoft.com/config/rhel/7/prod.repo -o /etc/yum.repos.d/mssql-release.repo" "Configuring Microsoft repositories" -execute_cmd "yum remove unixODBC-utf16 unixODBC-utf16-devel" "Removing default unixODBC packages" -execute_cmd "env ACCEPT_EULA=Y yum install -y msodbcsql17" "Installing ODBC Driver for Microsoft(R) SQL Server(R)" -MS_ID=$(head -1 /etc/odbcinst.ini | tr -d '[]') &>> "$LOGFILE" -#yum config-manager --set-disable packages-microsoft-com-prod # Disabling SELINUX and firewalld setenforce 0 @@ -458,23 +426,10 @@ fi export MYSQL_PWD=$DBPASS #Define packages -#Define packages -if [ "$PANDORA_LTS" -eq '1' ] ; then - [ "$PANDORA_SERVER_PACKAGE" ] || PANDORA_SERVER_PACKAGE="https://firefly.pandorafms.com/pandorafms/latest/RHEL_CentOS/LTS/pandorafms_server-7.0NG.noarch.rpm" - [ "$PANDORA_CONSOLE_PACKAGE" ] || PANDORA_CONSOLE_PACKAGE="https://firefly.pandorafms.com/pandorafms/latest/RHEL_CentOS/LTS/pandorafms_console-7.0NG.noarch.rpm" - [ "$PANDORA_AGENT_PACKAGE" ] || PANDORA_AGENT_PACKAGE="https://firefly.pandorafms.com/pandorafms/latest/RHEL_CentOS/LTS/pandorafms_agent_linux-7.0NG.noarch.rpm" -elif [ "$PANDORA_LTS" -ne '1' ] ; then - [ "$PANDORA_SERVER_PACKAGE" ] || PANDORA_SERVER_PACKAGE="https://firefly.pandorafms.com/pandorafms/latest/RHEL_CentOS/pandorafms_server-7.0NG.x86_64.rpm" - [ "$PANDORA_CONSOLE_PACKAGE" ] || PANDORA_CONSOLE_PACKAGE="https://firefly.pandorafms.com/pandorafms/latest/RHEL_CentOS/pandorafms_console-7.0NG.x86_64.rpm" - [ "$PANDORA_AGENT_PACKAGE" ] || PANDORA_AGENT_PACKAGE="https://firefly.pandorafms.com/pandorafms/latest/RHEL_CentOS/pandorafms_agent_linux-7.0NG.noarch.rpm" -fi +[ "$PANDORA_SERVER_PACKAGE" ] || PANDORA_SERVER_PACKAGE="https://github.com/pandorafms/pandorafms/releases/download/v772-LTS/pandorafms_server-7.0NG.772.x86_64.rpm" +[ "$PANDORA_CONSOLE_PACKAGE" ] || PANDORA_CONSOLE_PACKAGE="https://github.com/pandorafms/pandorafms/releases/download/v772-LTS/pandorafms_console-7.0NG.772.noarch.rpm" +[ "$PANDORA_AGENT_PACKAGE" ] || PANDORA_AGENT_PACKAGE="https://github.com/pandorafms/pandorafms/releases/download/v772-LTS/pandorafms_agent_linux-7.0NG.772.noarch.rpm" -# if beta is enable -if [ "$PANDORA_BETA" -eq '1' ] ; then - PANDORA_SERVER_PACKAGE="https://firefly.pandorafms.com/pandora_enterprise_nightlies/pandorafms_server-latest.x86_64.rpm" - PANDORA_CONSOLE_PACKAGE="https://firefly.pandorafms.com/pandora_enterprise_nightlies/pandorafms_console-latest.x86_64.rpm" - PANDORA_AGENT_PACKAGE="https://firefly.pandorafms.com/pandorafms/latest/RHEL_CentOS/pandorafms_agent_linux-7.0NG.noarch.rpm" -fi # Downloading Pandora Packages execute_cmd "curl -LSs --output pandorafms_server-7.0NG.noarch.rpm ${PANDORA_SERVER_PACKAGE}" "Downloading Pandora FMS Server community" @@ -484,11 +439,6 @@ execute_cmd "curl -LSs --output pandorafms_agent_linux-7.0NG.noarch.rpm ${PANDOR # Install Pandora execute_cmd "yum install -y $HOME/pandora_deploy_tmp/pandorafms*.rpm" "installing PandoraFMS packages" -# Copy gotty utility -execute_cmd "wget https://firefly.pandorafms.com/pandorafms/utils/gotty_linux_amd64.tar.gz" 'Dowloading gotty util' -tar xvzf gotty_linux_amd64.tar.gz &>> $LOGFILE -execute_cmd "mv gotty /usr/bin/" 'Installing gotty util' - # Enable Services execute_cmd "systemctl enable mysqld --now" "Enabling Database service" execute_cmd "systemctl enable httpd --now" "Enabling HTTPD service" diff --git a/extras/deploy-scripts/pandora_deploy_community_ubuntu_2204.sh b/extras/deploy-scripts/pandora_deploy_community_ubuntu_2204_gh.sh similarity index 84% rename from extras/deploy-scripts/pandora_deploy_community_ubuntu_2204.sh rename to extras/deploy-scripts/pandora_deploy_community_ubuntu_2204_gh.sh index 64beb74eb2..f5c6ff3a58 100644 --- a/extras/deploy-scripts/pandora_deploy_community_ubuntu_2204.sh +++ b/extras/deploy-scripts/pandora_deploy_community_ubuntu_2204_gh.sh @@ -34,8 +34,6 @@ rm -f $LOGFILE &> /dev/null # remove last log before start [ "$SKIP_DATABASE_INSTALL" ] || SKIP_DATABASE_INSTALL=0 [ "$SKIP_KERNEL_OPTIMIZATIONS" ] || SKIP_KERNEL_OPTIMIZATIONS=0 [ "$POOL_SIZE" ] || POOL_SIZE=$(grep -i total /proc/meminfo | head -1 | awk '{printf "%.2f \n", $(NF-1)*0.4/1024}' | sed "s/\\..*$/M/g") -[ "$PANDORA_BETA" ] || PANDORA_BETA=0 -[ "$PANDORA_LTS" ] || PANDORA_LTS=1 #Check if possible to get os version if [ ! -e /etc/os-release ]; then @@ -100,8 +98,7 @@ check_pre_pandora () { } check_repo_connection () { - execute_cmd "ping -c 2 firefly.pandorafms.com" "Checking Community repo" - execute_cmd "ping -c 2 support.pandorafms.com" "Checking Enterprise repo" + execute_cmd "ping -c 2 github.com" "Checking Community repo" } check_root_permissions () { @@ -215,9 +212,7 @@ check_root_permissions [ "$SKIP_PRECHECK" == 1 ] || check_pre_pandora #advicing BETA PROGRAM -INSTALLING_VER="${green}RRR version enable using RRR PandoraFMS packages${reset}" -[ "$PANDORA_LTS" -ne '0' ] && INSTALLING_VER="${green}LTS version enable using LTS PandoraFMS packages${reset}" -[ "$PANDORA_BETA" -ne '0' ] && INSTALLING_VER="${red}BETA version enable using nightly PandoraFMS packages${reset}" +INSTALLING_VER="${green}LTS version enable ${reset}" echo -e $INSTALLING_VER # Connectivity @@ -343,28 +338,16 @@ server_dependencies=" \ snmp-mibs-downloader \ snmptrapd \ libnsl2 \ + make \ openjdk-8-jdk " execute_cmd "apt install -y $server_dependencies" "Installing Pandora FMS Server dependencies" execute_cmd "installing_docker" "Installing Docker for debug" # Installing pandora_gotty -execute_cmd "curl --output pandora_gotty.deb https://firefly.pandorafms.com/ubuntu/pandora_gotty_1.0.0.deb" "Downloading pandora_gotty" +execute_cmd "curl --output pandora_gotty.deb https://github.com/pandorafms/pandorafms/releases/download/tools/pandora_gotty_1.1.0.deb" "Downloading pandora_gotty" execute_cmd "apt install -y ./pandora_gotty.deb" "Intalling pandora_gotty" -# Installing MADE -execute_cmd "curl --output pandora_made.deb https://firefly.pandorafms.com/ubuntu/pandorafms-made_0.1.0-2_amd64.deb" "Downloading pandora MADE" -execute_cmd "apt install -y ./pandora_made.deb" "Intalling pandora MADE" - -# wmic and pandorawmic -execute_cmd "curl -O https://firefly.pandorafms.com/pandorafms/utils/bin/wmic" "Downloading wmic" -execute_cmd "curl -O https://firefly.pandorafms.com/pandorafms/utils/bin/pandorawmic" "Downloading pandorawmic" -echo -en "${cyan}Installing wmic and pandorawmic...${reset}" - chmod +x pandorawmic wmic &>> "$LOGFILE" && \ - cp -a wmic /usr/bin/ &>> "$LOGFILE" && \ - cp -a pandorawmic /usr/bin/ &>> "$LOGFILE" -check_cmd_status "Error Installing pandorawmic/wmic" - # create symlink for fping rm -f /usr/sbin/fping &>> "$LOGFILE" ln -s /usr/bin/fping /usr/sbin/fping &>> "$LOGFILE" @@ -376,40 +359,6 @@ execute_cmd "wget https://dl.google.com/linux/deb/pool/main/g/google-chrome-stab execute_cmd "apt install -y ./${CHROME_VERSION}" "Intalling google chrome" execute_cmd "ln -s /usr/bin/google-chrome /usr/bin/chromium-browser" "Creating /usr/bin/chromium-browser Symlink" -# SDK VMware perl dependencies -vmware_dependencies="\ - lib32z1 \ - lib32z1 \ - build-essential \ - uuid uuid-dev \ - libssl-dev \ - perl-doc \ - libxml-libxml-perl \ - libcrypt-ssleay-perl \ - libsoap-lite-perl \ - libmodule-build-perl" -execute_cmd "apt install -y $vmware_dependencies" "Installing VMware SDK dependencies" -execute_cmd "wget https://firefly.pandorafms.com/pandorafms/utils/VMware-vSphere-Perl-SDK-7.0.0-16453907.x86_64.tar.gz" "Downloading VMware SDK" -echo -en "${cyan}Installing VMware SDK...${reset}" - tar xvzf VMware-vSphere-Perl-SDK-7.0.0-16453907.x86_64.tar.gz &>> "$LOGFILE" - cd vmware-vsphere-cli-distrib/ &>> "$LOGFILE" - sed --follow-symlinks -i -e "s/[^#].*show_EULA().*/ #show_EULA();/g" vmware-install.pl &>> "$LOGFILE" - ./vmware-install.pl --default &>> "$LOGFILE" -check_cmd_status "Error Installing VMware SDK" -execute_cmd "cpan Crypt::OpenSSL::AES" "Installing extra vmware dependencie" -cd $WORKDIR &>> "$LOGFILE" - - - -# Instant client Oracle -execute_cmd "mkdir -p /opt/oracle" "Creating Oracle instant client directory /opt/oracle" -execute_cmd "wget https://download.oracle.com/otn_software/linux/instantclient/19800/instantclient-basic-linux.x64-19.8.0.0.0dbru.zip" "Downloading Oracle instant client" -execute_cmd "wget https://download.oracle.com/otn_software/linux/instantclient/19800/instantclient-sqlplus-linux.x64-19.8.0.0.0dbru.zip" "Downloading Oracle sqlplus" -echo -en "${cyan}Installing Oracle instant client...${reset}" - rm -fr /opt/oracle/* &>> "$LOGFILE" - unzip instantclient-basic-linux.x64-19.8.0.0.0dbru.zip -d /opt/oracle/ &>> "$LOGFILE" - unzip instantclient-sqlplus-linux.x64-19.8.0.0.0dbru.zip -d /opt/oracle/ &>> "$LOGFILE" -check_cmd_status "Error Installing Oracle instant client" #Configuring env variables cat >> /root/.profile << 'EOF_ENV' @@ -434,13 +383,6 @@ ipam_dependencies=" \ libnetaddr-ip-perl" execute_cmd "apt install -y $ipam_dependencies" "Installing IPAM Dependencies" -# MSSQL dependencies el8 -curl -sSL https://packages.microsoft.com/keys/microsoft.asc | tee /etc/apt/trusted.gpg.d/microsoft.asc &>> "$LOGFILE" -curl -sSL https://packages.microsoft.com/config/ubuntu/20.04/prod.list | tee /etc/apt/sources.list.d/microsoft-prod.list &>> "$LOGFILE" -apt update &>> "$LOGFILE" -execute_cmd "env ACCEPT_EULA=Y apt install -y msodbcsql17" "Installing ODBC Driver for Microsoft(R) SQL Server(R)" -MS_ID=$(head -1 /etc/odbcinst.ini | tr -d '[]') &>> "$LOGFILE" - # Disabling apparmor and ufw systemctl stop ufw.service &>> "$LOGFILE" systemctl disable ufw &>> "$LOGFILE" @@ -523,21 +465,11 @@ execute_cmd "systemctl restart mysql" "Configuring and restarting database engin #Define packages -if [ "$PANDORA_LTS" -eq '1' ] ; then - [ "$PANDORA_SERVER_PACKAGE" ] || PANDORA_SERVER_PACKAGE="https://firefly.pandorafms.com/pandorafms/latest/Tarball/LTS/pandorafms_server-7.0NG.tar.gz" - [ "$PANDORA_CONSOLE_PACKAGE" ] || PANDORA_CONSOLE_PACKAGE="https://firefly.pandorafms.com/pandorafms/latest/Tarball/LTS/pandorafms_console-7.0NG.tar.gz" - [ "$PANDORA_AGENT_PACKAGE" ] || PANDORA_AGENT_PACKAGE="https://firefly.pandorafms.com/pandorafms/latest/Tarball/pandorafms_agent_linux-7.0NG.x86_64.tar.gz" -elif [ "$PANDORA_LTS" -ne '1' ] ; then - [ "$PANDORA_SERVER_PACKAGE" ] || PANDORA_SERVER_PACKAGE="https://firefly.pandorafms.com/pandorafms/latest/Tarball/pandorafms_server-7.0NG.tar.gz" - [ "$PANDORA_CONSOLE_PACKAGE" ] || PANDORA_CONSOLE_PACKAGE="https://firefly.pandorafms.com/pandorafms/latest/Tarball/pandorafms_console-7.0NG.tar.gz" - [ "$PANDORA_AGENT_PACKAGE" ] || PANDORA_AGENT_PACKAGE="https://firefly.pandorafms.com/pandorafms/latest/Tarball/pandorafms_agent_linux-7.0NG.x86_64.tar.gz" -fi -if [ "$PANDORA_BETA" -eq '1' ] ; then - PANDORA_SERVER_PACKAGE="https://firefly.pandorafms.com/pandora_enterprise_nightlies/pandorafms_server-latest.tar.gz" - PANDORA_CONSOLE_PACKAGE="https://firefly.pandorafms.com/pandora_enterprise_nightlies/pandorafms_console-latest.tar.gz" - PANDORA_AGENT_PACKAGE="https://firefly.pandorafms.com/pandorafms/latest/Tarball/pandorafms_agent_linux-7.0NG.x86_64.tar.gz" -fi +PANDORA_SERVER_PACKAGE="https://github.com/pandorafms/pandorafms/releases/download/v772-LTS/pandorafms_server-7.0NG.772_x86_64.tar.gz" +PANDORA_CONSOLE_PACKAGE="https://github.com/pandorafms/pandorafms/releases/download/v772-LTS/pandorafms_console-7.0NG.772.tar.gz" +PANDORA_AGENT_PACKAGE="https://github.com/pandorafms/pandorafms/releases/download/v772-LTS/pandorafms_agent_linux-7.0NG.772.tar.gz" + # Downloading Pandora Packages cd $WORKDIR &>> "$LOGFILE" diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 5a5789151f..f1a17b110e 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.776-240514 +Version: 7.0NG.776-240520 Architecture: all Priority: optional Section: admin diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh index 870f852623..ab1b46650a 100644 --- a/pandora_agents/unix/DEBIAN/make_deb_package.sh +++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="7.0NG.776-240514" +pandora_version="7.0NG.776-240520" echo "Test if you has the tools for to make the packages." whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index f2c85f1b90..b703564fdf 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1039,7 +1039,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.776'; -use constant AGENT_BUILD => '240514'; +use constant AGENT_BUILD => '240520'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index 07f6850200..f93b8238f6 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240514 +%define release 240520 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec index bbc443fa42..5f2f445751 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240514 +%define release 240520 %define debug_package %{nil} Summary: Pandora FMS Linux agent, binary version diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec index 0eafc0edbe..106b38020f 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240514 +%define release 240520 %define debug_package %{nil} Summary: Pandora FMS Linux agent, binary version diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.spec b/pandora_agents/unix/pandora_agent.redhat_bin.spec index e87bade361..8695f9408e 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240514 +%define release 240520 Summary: Pandora FMS Linux agent, binary version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index 53dec7907d..d32fc34425 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240514 +%define release 240520 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index 6f73ca3b2e..68077e50a3 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.776" -PI_BUILD="240514" +PI_BUILD="240520" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 43f04b764f..40bdac71f0 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{240514} +{240520} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 207aa1ea20..c586eb01de 100644 --- a/pandora_agents/win32/pandora.cc +++ b/pandora_agents/win32/pandora.cc @@ -30,7 +30,7 @@ using namespace Pandora; using namespace Pandora_Strutils; #define PATH_SIZE _MAX_PATH+1 -#define PANDORA_VERSION ("7.0NG.776 Build 240514") +#define PANDORA_VERSION ("7.0NG.776 Build 240520") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 35e3c3b1e8..2a09b5da26 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Pandora FMS" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(7.0NG.776(Build 240514))" + VALUE "ProductVersion", "(7.0NG.776(Build 240520))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 10e2e0eb44..f5179f5c85 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.776-240514 +Version: 7.0NG.776-240520 Architecture: all Priority: optional Section: admin diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh index d4100adf10..4ab6bd288c 100644 --- a/pandora_console/DEBIAN/make_deb_package.sh +++ b/pandora_console/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="7.0NG.776-240514" +pandora_version="7.0NG.776-240520" package_pear=0 package_pandora=1 diff --git a/pandora_console/extras/discovery/DiscoveryApplicationsMigrateCodes.ini b/pandora_console/extras/discovery/DiscoveryApplicationsMigrateCodes.ini index 5cbd75d0de..6f8423aafb 100644 --- a/pandora_console/extras/discovery/DiscoveryApplicationsMigrateCodes.ini +++ b/pandora_console/extras/discovery/DiscoveryApplicationsMigrateCodes.ini @@ -9,5 +9,5 @@ pandorafms.sap.deset=9bb72b7f7497a8b543f25cd71f96878f pandorafms.gcp.ce=6743d39452f8e1ad85d0d56a30843973 pandorafms.aws.ec2=07416081f11d92a7d5d9441dabb5c5cb pandorafms.aws.s3=eff053a212ea112e2a37efd9debbe6a0 -pandorafms.aws.rds=47d7b02019329e1698f96db4959f9516 +pandorafms.aws.rds=4627391054f118c65387280cb8c4e520 pandorafms.azure.mc=04a1072d1ece8583645ad88204fbeed3 \ No newline at end of file diff --git a/pandora_console/extras/mr/68.sql b/pandora_console/extras/mr/68.sql index fc08eb8b12..5cfb0e51ba 100644 --- a/pandora_console/extras/mr/68.sql +++ b/pandora_console/extras/mr/68.sql @@ -126,7 +126,8 @@ UPDATE `tncm_agent_data_template` SET `vendors` = CONCAT('["', TRIM(BOTH '"' FRO UPDATE `tdiscovery_apps` SET `version` = '1.2' WHERE `short_name` = 'pandorafms.oracle'; -- Update version for plugin mysql UPDATE `tdiscovery_apps` SET `version` = '1.2' WHERE `short_name` = 'pandorafms.mysql'; - +-- Update version for plugin rds +UPDATE `tdiscovery_apps` SET `version` = '1.1' WHERE `short_name` = 'pandorafms.aws.rds'; SET @widget_id = NULL; SELECT @widget_id := `id` FROM `twidget` WHERE `unique_name` = 'GisMap'; @@ -177,4 +178,4 @@ ALTER TABLE `tuser_task_scheduled` ADD COLUMN `id_report` INT NULL AFTER `id_use ALTER TABLE `tuser_task_scheduled` ADD COLUMN `name` VARCHAR(255) NULL AFTER `id_user_task`; -COMMIT; \ No newline at end of file +COMMIT; diff --git a/pandora_console/extras/mr/69.sql b/pandora_console/extras/mr/69.sql index 3252223c15..17eb91fa1c 100644 --- a/pandora_console/extras/mr/69.sql +++ b/pandora_console/extras/mr/69.sql @@ -7771,5 +7771,13 @@ UPDATE `tdiscovery_apps` SET `version` = '1.5' WHERE `short_name` = 'pandorafms. DELETE FROM tevent_response WHERE name = 'Create incident from event'; UPDATE tconfig_os SET `name` = 'Web Server' WHERE `id_os` = 12; +UPDATE `tncm_script` SET `content` ='set cli pager off \n capture:show system info | match app-version:\n sleep:1 exit \n' +WHERE `content`='set cli pager off \n capture:show system info | match app-version:\n sleep:1 expect:app-version:\s* exit \n'; + +UPDATE `tncm_script` SET `content` ='expect:root@% cli\n expect:root> capture:show version|match Junos:\n quit\n expect:root@% exit\n' +WHERE `content`= 'expect:root@% cli\n expect:root> capture:show version|match Junos:\n capture: \n quit\n expect:root@% exit\n'; + +UPDATE `tncm_script` SET `content` ='expect:root@% cli\n expect:root> capture:show version|match Junos:\n quit\n expect:root@% exit\n' +WHERE `content`='expect:root@% cli\n expect:root> capture:show version|match Junos:\n capture: \n quit\n expect:root@% exit\n'; COMMIT; \ No newline at end of file diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php index bbc499661f..a5d8d8bb90 100755 --- a/pandora_console/general/login_page.php +++ b/pandora_console/general/login_page.php @@ -712,6 +712,29 @@ if ($login_screen === 'disabled_access_node') { echo ''; } +if (empty($process_error_message) === true + && isset($config['pending_sync_process_message']) === true + && $login_screen === 'login' +) { + echo '
'; + echo '
'; + echo '
'; + echo html_print_image('images/icono_logo_pandora.png', true, ['alt' => __('Pending synchronization process'), 'border' => 0]); + echo '
'; + echo '
'; + echo '
'; + echo '

'.__('Access granted').'

'; + echo '

'.$config['pending_sync_process_message'].'

'; + echo '
'; + echo '
'; + echo '
'; + html_print_submit_button('Ok', 'hide-sync-process', false, ['class' => 'mini float-right']); + echo '
'; + echo '
'; + echo '
'; + echo '
'; +} + switch ($login_screen) { case 'error_dbconfig': case 'error_authconfig': @@ -966,6 +989,24 @@ html_print_div(['id' => 'forced_title_layer', 'class' => 'forced_title_layer', ' $("#login_failed" ).dialog('close'); $("#login_correct_pass").dialog('close'); }); + + if ($('#pending_sync_process').length > 0) { + $('#pending_sync_process').dialog({ + resizable: true, + draggable: true, + modal: true, + height: 230, + width: 530, + overlay: { + opacity: 0.5, + background: "black" + } + }); + } + + $('#button-hide-sync-process').click(function() { + $('#pending_sync_process').dialog('close') + }) }); $('#nick').focus(); break; diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php index 0df61ee1c2..a4b14d5930 100644 --- a/pandora_console/godmode/alerts/alert_list.list.php +++ b/pandora_console/godmode/alerts/alert_list.list.php @@ -143,7 +143,7 @@ $form_filter .= ''.html_print_label_input_block( ).''; $form_filter .= ''.html_print_label_input_block( - __('Priority'), + __('Severity'), html_print_select( get_priorities(), 'priority', diff --git a/pandora_console/godmode/alerts/alert_view.php b/pandora_console/godmode/alerts/alert_view.php index 13ae972233..010dbe9f17 100644 --- a/pandora_console/godmode/alerts/alert_view.php +++ b/pandora_console/godmode/alerts/alert_view.php @@ -127,7 +127,7 @@ $table_details->data[] = $data; $priorities = get_priorities(); -$data[0] = __('Priority'); +$data[0] = __('Severity'); $data[1] = ' '.$priorities[$template['priority']]; $table_details->data[] = $data; diff --git a/pandora_console/godmode/alerts/configure_alert_template.php b/pandora_console/godmode/alerts/configure_alert_template.php index 33ed7b6dca..fea4d987be 100644 --- a/pandora_console/godmode/alerts/configure_alert_template.php +++ b/pandora_console/godmode/alerts/configure_alert_template.php @@ -1235,9 +1235,9 @@ if ($step == 2) { ); $table->data[2][0] = html_print_label_input_block( - __('Priority'), + __('Severity'), html_print_select( - get_priorities(), + get_priorities(false, true), 'priority', $priority, '', diff --git a/pandora_console/godmode/snmpconsole/snmp_alert.php b/pandora_console/godmode/snmpconsole/snmp_alert.php index c0fef7bec0..9c84addf4d 100755 --- a/pandora_console/godmode/snmpconsole/snmp_alert.php +++ b/pandora_console/godmode/snmpconsole/snmp_alert.php @@ -1614,9 +1614,9 @@ if ($create_alert || $update_alert) { echo ''; echo ''; echo html_print_label_input_block( - __('Priority'), + __('Severity'), html_print_select( - get_priorities(), + get_priorities(false, true), 'priority', $priority, '', @@ -1776,7 +1776,7 @@ if ($create_alert || $update_alert) { ); $table_filter->data[0][2] = html_print_label_input_block( - __('Priority'), + __('Severity'), html_print_select( get_priorities(), 'priority_filter', diff --git a/pandora_console/images/ehorus/ad/background-dark.svg b/pandora_console/images/ehorus/ad/background-dark.svg new file mode 100644 index 0000000000..3057ca4955 --- /dev/null +++ b/pandora_console/images/ehorus/ad/background-dark.svg @@ -0,0 +1,15 @@ + + + 422806FF-0687-4B43-A3C3-3B62DFA40B66 + + + + + + + + + + + + \ No newline at end of file diff --git a/pandora_console/images/ehorus/ad/background.svg b/pandora_console/images/ehorus/ad/background.svg new file mode 100644 index 0000000000..d04e0a3b43 --- /dev/null +++ b/pandora_console/images/ehorus/ad/background.svg @@ -0,0 +1,30 @@ + + + BB0CC5B6-76D4-4142-933D-B9E12CF76BA1 + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pandora_console/images/ehorus/ad/cli.svg b/pandora_console/images/ehorus/ad/cli.svg new file mode 100644 index 0000000000..1deb0e137f --- /dev/null +++ b/pandora_console/images/ehorus/ad/cli.svg @@ -0,0 +1,80 @@ + + + C8EE1DE3-04CA-4E20-BD50-5B141F36DDF6 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pandora_console/images/ehorus/ad/desktop.svg b/pandora_console/images/ehorus/ad/desktop.svg new file mode 100644 index 0000000000..7d525c1d2a --- /dev/null +++ b/pandora_console/images/ehorus/ad/desktop.svg @@ -0,0 +1,96 @@ + + + 52547496-009D-46AC-AB17-3C93094C7BBA + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pandora_console/images/ehorus/ad/files.svg b/pandora_console/images/ehorus/ad/files.svg new file mode 100644 index 0000000000..854ebdf78d --- /dev/null +++ b/pandora_console/images/ehorus/ad/files.svg @@ -0,0 +1,96 @@ + + + E100CE6F-680B-4C89-99F8-1A1E05713ACD + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pandora_console/images/ehorus/ad/multiplatform.svg b/pandora_console/images/ehorus/ad/multiplatform.svg new file mode 100644 index 0000000000..4f5c0668c3 --- /dev/null +++ b/pandora_console/images/ehorus/ad/multiplatform.svg @@ -0,0 +1,78 @@ + + + 0092E94F-D2F7-4474-84D1-25A07223CAB4 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pandora_console/images/ehorus/ad/process-services.svg b/pandora_console/images/ehorus/ad/process-services.svg new file mode 100644 index 0000000000..3ce7d267e0 --- /dev/null +++ b/pandora_console/images/ehorus/ad/process-services.svg @@ -0,0 +1,96 @@ + + + 104E62BF-DC98-457F-91CB-8B761243C6B7 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pandora_console/images/ehorus/ad/sample.svg b/pandora_console/images/ehorus/ad/sample.svg new file mode 100644 index 0000000000..0cba0f5271 --- /dev/null +++ b/pandora_console/images/ehorus/ad/sample.svg @@ -0,0 +1,356 @@ + + + A0AB2D76-3858-4CD0-B643-408098221FFA + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php index 92aebb457f..43b6dabdf0 100644 --- a/pandora_console/include/ajax/events.php +++ b/pandora_console/include/ajax/events.php @@ -1550,7 +1550,7 @@ if ($add_comment === true) { if ($change_status === true) { $event_ids = get_parameter('event_ids'); $new_status = get_parameter('new_status'); - $group_rep = (int) get_parameter('group_rep', 0); + $filter = get_parameter('filter', []); $server_id = 0; if (is_metaconsole() === true) { $server_id = (int) get_parameter('server_id'); @@ -1564,19 +1564,11 @@ if ($change_status === true) { $node->connect(); } - if ($group_rep !== 3) { - $return = events_change_status( - explode(',', $event_ids), - $new_status - ); - } else { - // Update all elements with same extraid. - $return = events_update_status( - $event_ids, - (int) $new_status, - ['group_rep' => $group_rep] - ); - } + $return = events_update_status( + $event_ids, + (int) $new_status, + $filter + ); } catch (\Exception $e) { // Unexistent agent. if (is_metaconsole() === true @@ -1962,7 +1954,7 @@ if ($get_extended_event) { metaconsole_restore_db(); } - $general = events_page_general($event); + $general = events_page_general($event, $filter); $comments = '
'; diff --git a/pandora_console/include/auth/mysql.php b/pandora_console/include/auth/mysql.php index 8068d664cc..37164a111c 100644 --- a/pandora_console/include/auth/mysql.php +++ b/pandora_console/include/auth/mysql.php @@ -72,6 +72,7 @@ if (isset($config) === false) { } require_once $config['homedir'].'/include/functions_profile.php'; +require_once $config['homedir'].'/include/functions_token.php'; enterprise_include('include/auth/mysql.php'); $config['user_can_update_info'] = true; @@ -220,14 +221,31 @@ function process_user_login_remote($login, $pass, $api=false) { global $config, $mysql_cache; + $create_by_remote_api = false; + if (is_metaconsole() === false && is_management_allowed() === false) { + $create_by_remote_api = true; + } + // Remote authentication. switch ($config['auth']) { // LDAP. case 'ldap': - $sr = ldap_process_user_login($login, $pass); - // Try with secondary server if not login. - if ($sr === false && (bool) $config['secondary_ldap_enabled'] === true) { - $sr = ldap_process_user_login($login, $pass, true); + if ($create_by_remote_api === true) { + $sr = ldap_process_user_login_by_api($login, $pass); + if ($sr !== false && isset($sr['uid']) === true && is_array($sr['uid']) === true) { + $already_user = db_get_value('id_user', 'tusuario', 'id_user', $sr['uid'][0]); + // If the node is centralized, LDAP login is delegated to the metaconsole via the API. + // Since the user is not yet on the nodes, they are asked to try again in a few minutes. + if ($already_user === false && is_metaconsole() === false) { + $config['pending_sync_process_message'] = __('Successful login, please wait a few minutes for the metaconsole to synchronize with the nodes and then log in again with the same credentials.'); + } + } + } else { + $sr = ldap_process_user_login($login, $pass); + // Try with secondary server if not login. + if ($sr === false && (bool) $config['secondary_ldap_enabled'] === true) { + $sr = ldap_process_user_login($login, $pass, true); + } } if (!$sr) { @@ -237,10 +255,22 @@ function process_user_login_remote($login, $pass, $api=false) // Active Directory. case 'ad': - $sr = enterprise_hook('ad_process_user_login', [$login, $pass]); - // Try with secondary server. - if ($sr === false && (bool) $config['secondary_active_directory'] === true) { - $sr = enterprise_hook('ad_process_user_login', [$login, $pass, true]); + if ($create_by_remote_api === true) { + $sr = ldap_process_user_login_by_api($login, $pass); + if ($sr !== false && isset($sr['uid']) === true && is_array($sr['uid']) === true) { + $already_user = db_get_value('id_user', 'tusuario', 'id_user', $sr['uid'][0]); + // If the node is centralized, AD login is delegated to the metaconsole via the API. + // Since the user is not yet on the nodes, they are asked to try again in a few minutes. + if ($already_user === false && is_metaconsole() === false) { + $config['pending_sync_process_message'] = __('Successful login, please wait a few minutes for the metaconsole to synchronize with the nodes and then log in again with the same credentials.'); + } + } + } else { + $sr = enterprise_hook('ad_process_user_login', [$login, $pass]); + // Try with secondary server. + if ($sr === false && (bool) $config['secondary_active_directory'] === true) { + $sr = enterprise_hook('ad_process_user_login', [$login, $pass, true]); + } } if ($sr === false) { @@ -278,7 +308,7 @@ function process_user_login_remote($login, $pass, $api=false) if (($config['auth'] === 'ad')) { // Check if autocreate remote users is active. - if ($config['autocreate_remote_users'] == 1) { + if ($create_by_remote_api === false && $config['autocreate_remote_users'] == 1) { if ($config['ad_save_password']) { $update_credentials = change_local_user_pass_ldap($login, $pass); } else { @@ -286,7 +316,7 @@ function process_user_login_remote($login, $pass, $api=false) } } - if (isset($config['ad_advanced_config']) && $config['ad_advanced_config']) { + if ($create_by_remote_api === false && isset($config['ad_advanced_config']) && $config['ad_advanced_config']) { $return = enterprise_hook( 'prepare_permissions_groups_of_user_ad', [ @@ -305,7 +335,7 @@ function process_user_login_remote($login, $pass, $api=false) } } else if ($config['auth'] === 'ldap') { // Check if autocreate remote users is active. - if ($config['autocreate_remote_users'] == 1) { + if ($create_by_remote_api === false && $config['autocreate_remote_users'] == 1) { if ($config['ldap_save_password']) { $update_credentials = change_local_user_pass_ldap($login, $pass); } else { @@ -351,11 +381,6 @@ function process_user_login_remote($login, $pass, $api=false) && (isset($config['ad_advanced_config']) && $config['ad_advanced_config']) ) { - if (is_management_allowed() === false) { - $config['auth_error'] = __('Please, login into metaconsole first'); - return false; - } - $user_info = [ 'fullname' => db_escape_string_sql($login), 'comments' => 'Imported from '.$config['auth'], @@ -365,27 +390,24 @@ function process_user_login_remote($login, $pass, $api=false) $user_info['metaconsole_access_node'] = $config['ad_adv_user_node']; } - // Create the user. - if (enterprise_hook( - 'prepare_permissions_groups_of_user_ad', - [ - $login, - $pass, - $user_info, - false, - defined('METACONSOLE') && is_centralized() === false, - ] - ) === false - ) { - $config['auth_error'] = __('User not found in database or incorrect password'); - return false; + if ($create_by_remote_api === false) { + // Create the user. + if (enterprise_hook( + 'prepare_permissions_groups_of_user_ad', + [ + $login, + $pass, + $user_info, + false, + defined('METACONSOLE') && is_centralized() === false, + ] + ) === false + ) { + $config['auth_error'] = __('User not found in database or incorrect password'); + return false; + } } } else if ($config['auth'] === 'ldap') { - if (is_management_allowed() === false) { - $config['auth_error'] = __('Please, login into metaconsole first'); - return false; - } - if (is_metaconsole() === true) { $user_info['metaconsole_access_node'] = $config['ldap_adv_user_node']; } @@ -401,15 +423,16 @@ function process_user_login_remote($login, $pass, $api=false) } else { $user_info['fullname'] = db_escape_string_sql(io_safe_input($sr['cn'][0])); $user_info['email'] = io_safe_input($sr['mail'][0]); - - // Create the user. - $create_user = create_user_and_permisions_ldap( - $login, - $pass, - $user_info, - $permissions, - is_metaconsole() && is_centralized() === false - ); + if ($create_by_remote_api === false) { + // Create the user. + $create_user = create_user_and_permisions_ldap( + $login, + $pass, + $user_info, + $permissions, + is_metaconsole() && is_centralized() === false + ); + } } } else { $user_info = [ @@ -420,24 +443,26 @@ function process_user_login_remote($login, $pass, $api=false) $user_info['metaconsole_access_node'] = $config['ad_adv_user_node']; } - if (is_management_allowed() === false) { + if ($create_by_remote_api === false && is_management_allowed() === false) { $config['auth_error'] = __('Please, login into metaconsole first'); return false; } // Create the user in the local database. - if (create_user($login, $pass, $user_info) === false) { + if ($create_by_remote_api === false && create_user($login, $pass, $user_info) === false) { $config['auth_error'] = __('User not found in database or incorrect password'); return false; } - profile_create_user_profile( - $login, - $config['default_remote_profile'], - $config['default_remote_group'], - false, - $config['default_assign_tags'] - ); + if ($create_by_remote_api === false) { + profile_create_user_profile( + $login, + $config['default_remote_profile'], + $config['default_remote_group'], + false, + $config['default_assign_tags'] + ); + } } return $login; @@ -988,6 +1013,7 @@ function ldap_process_user_login($login, $password, $secondary_server=false) if ($memberof['count'] == 0 && !isset($memberof[0]['memberof'])) { @ldap_close($ds); + $config['auth_error'] = 'User not found in database or incorrect password'; return false; } else { $memberof = $memberof[0]; @@ -1644,5 +1670,79 @@ function local_ldap_search( } +/** + * Performs the LDAP login process by delegating it to the metaconsole via the API. + * It will return the user's ID and email if successful in LDAP format. USE ONLY ON NODE. + * + * @param string $user User to login. + * @param string $pass Password of user. + * + * @return false|array + */ +function ldap_process_user_login_by_api($user, $pass) +{ + global $config; + if (is_metaconsole() === true) { + return false; + } + + metaconsole_load_external_db( + [ + 'dbhost' => $config['replication_dbhost'], + 'dbuser' => $config['replication_dbuser'], + 'dbpass' => io_output_password($config['replication_dbpass']), + 'dbname' => $config['replication_dbname'], + ] + ); + $serverUniqueIdentifier = db_get_value('value', 'tconfig', 'token', 'server_unique_identifier'); + $apiPassword = db_get_value('value', 'tconfig', 'token', 'api_password'); + $token = generate_token_for_system($serverUniqueIdentifier, $apiPassword); + metaconsole_restore_db(); + + $url = $config['metaconsole_base_url']; + $url .= (substr($config['metaconsole_base_url'], -1) === '/') ? '' : '/'; + $curl = curl_init(); + curl_setopt_array( + $curl, + [ + CURLOPT_URL => $url.'api/v2/user/'.urlencode($user).'/login?password='.urlencode($pass), + CURLOPT_RETURNTRANSFER => true, + CURLOPT_FOLLOWLOCATION => true, + CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1, + CURLOPT_CUSTOMREQUEST => 'GET', + CURLOPT_HTTPHEADER => [ + 'Accept: application/json', + 'Authorization: Bearer '.$token, + ], + CURLOPT_RETURNTRANSFER => true, + ] + ); + + $response = json_decode(curl_exec($curl), true); + $code = curl_getinfo($curl, CURLINFO_HTTP_CODE); + curl_close($curl); + if ($code === 200) { + if (isset($response['idUser']) === true) { + $ldap_format = [ + 'mail' => [$response['email']], + 'uid' => [$response['idUser']], + ]; + + return $ldap_format; + } else { + return false; + } + } else { + if (isset($response['error']) === true) { + $config['auth_error'] = $response['error']; + } else { + $config['auth_error'] = __('Unexpected error'); + } + + return false; + } +} + + // Reference the global use authorization error to last auth error. $config['auth_error'] = &$mysql_cache['auth_error']; diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 172f89da9a..c52f190a41 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ use DI\ContainerBuilder; /* * Pandora build version and version */ -$build_version = 'PC240514'; +$build_version = 'PC240520'; $pandora_version = 'v7.0NG.776'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php index 083fda60d8..3541335fad 100644 --- a/pandora_console/include/functions.php +++ b/pandora_console/include/functions.php @@ -1404,7 +1404,7 @@ function get_event_types($id_type=false) * * @return array An array with all the priorities. */ -function get_priorities($priority_param=false) +function get_priorities($priority_param=false, $creation=false) { global $config; @@ -1416,9 +1416,12 @@ function get_priorities($priority_param=false) $priorities[EVENT_CRIT_WARNING] = __('Warning'); $priorities[EVENT_CRIT_MAJOR] = __('Major'); $priorities[EVENT_CRIT_CRITICAL] = __('Critical'); - $priorities[EVENT_CRIT_WARNING_OR_CRITICAL] = __('Warning').'/'.__('Critical'); $priorities[EVENT_CRIT_NOT_NORMAL] = __('Not normal'); - $priorities[EVENT_CRIT_OR_NORMAL] = __('Critical').'/'.__('Normal'); + + if ($creation === false) { + $priorities[EVENT_CRIT_WARNING_OR_CRITICAL] = __('Warning').'/'.__('Critical'); + $priorities[EVENT_CRIT_OR_NORMAL] = __('Critical').'/'.__('Normal'); + } foreach ($priorities as $key => $priority) { $priorities[$key] = ui_print_truncate_text($priority, GENERIC_SIZE_TEXT, false, true, false); diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php index d4c71597fc..7d6f952bae 100644 --- a/pandora_console/include/functions_config.php +++ b/pandora_console/include/functions_config.php @@ -513,6 +513,10 @@ function config_update_config() if (config_update_value('ipam_ocuppied_warning_treshold', get_parameter('ipam_ocuppied_warning_treshold'), true) === false) { $error_update[] = __('Ipam Ocuppied Manager Warning'); } + + if (config_update_value('metaconsole_base_url', get_parameter('metaconsole_base_url'), true) === false) { + $error_update[] = __('Metaconsole base url'); + } } break; diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index 9d43b05c2f..898229a927 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -585,25 +585,30 @@ function events_update_status($id_evento, $status, $filter=null) if ((int) $filter['group_rep'] === EVENT_GROUP_REP_EXTRAIDS) { $sql = sprintf( - 'SELECT tu.id_evento FROM tevento tu INNER JOIN ( %s ) tf - ON tu.id_extra = tf.id_extra + 'SELECT te.id_evento FROM tevento te INNER JOIN ( %s ) tf + ON te.id_extra = tf.id_extra AND tf.max_id_evento = %d', $sql, $id_evento ); } else { $sql = sprintf( - 'SELECT tu.id_evento FROM tevento tu INNER JOIN ( %s ) tf - ON tu.estado = tf.estado - AND tu.evento = tf.evento - AND tu.id_agente = tf.id_agente - AND tu.id_agentmodule = tf.id_agentmodule + 'SELECT te.id_evento FROM tevento te INNER JOIN ( %s ) tf + ON te.estado = tf.estado + AND te.evento = tf.evento + AND te.id_agente = tf.id_agente + AND te.id_agentmodule = tf.id_agentmodule AND tf.max_id_evento = %d', $sql, $id_evento ); } + $filter_date = get_filter_date($filter); + if (is_array($filter_date) === true && count($filter_date) > 0) { + $sql .= implode(' ', $filter_date); + } + $target_ids = db_get_all_rows_sql($sql); // Try to avoid deadlock while updating full set. @@ -1158,17 +1163,6 @@ function events_get_all( // Free search. if (empty($filter['search']) === false) { - if (isset($config['dbconnection']->server_version) === true - && $config['dbconnection']->server_version > 50600 - ) { - // Use "from_base64" requires mysql 5.6 or greater. - $custom_data_search = 'from_base64(te.custom_data)'; - } else { - // Custom data is JSON encoded base64, if 5.6 or lower, - // user is condemned to use plain search. - $custom_data_search = 'te.custom_data'; - } - $not_search = ''; $nexo = 'OR'; $array_search = [ @@ -1176,7 +1170,7 @@ function events_get_all( 'lower(te.evento)', 'lower(te.id_extra)', 'lower(te.source)', - 'lower('.$custom_data_search.')', + 'lower(te.custom_data)', ]; if (isset($filter['not_search']) === true && empty($filter['not_search']) === false @@ -4989,7 +4983,7 @@ function events_display_instructions($event_type='', $inst=[], $italic=true, $ev * * @return string HTML. */ -function events_page_general($event) +function events_page_general($event, $filter=[]) { global $img_sev; global $config; @@ -5092,14 +5086,23 @@ function events_page_general($event) $data = []; $data[0] = __('Repeated'); - if ($group_rep != 0) { - if ($event['event_rep'] <= 1) { - $data[1] = ''.__('No').''; - } else { - $data[1] = sprintf('%d Times', $event['event_rep']); + + // Ticket 13013 This was done on purpose. + if ((int) $event['group_rep'] === EVENT_GROUP_REP_EXTRAIDS) { + $counter_extra_id = event_get_counter_extraId($event, $filter); + if (empty($counter_extra_id) === false && $counter_extra_id > 1) { + $data[1] = sprintf('%d Times', $counter_extra_id); } } else { - $data[1] = ''.__('No').''; + if ($group_rep != 0) { + if ($event['event_rep'] <= 1) { + $data[1] = ''.__('No').''; + } else { + $data[1] = sprintf('%d Times', $event['event_rep']); + } + } else { + $data[1] = ''.__('No').''; + } } $table_general->data[] = $data; diff --git a/pandora_console/include/functions_inventory.php b/pandora_console/include/functions_inventory.php index 5e5726d96f..e4db5c5b1f 100644 --- a/pandora_console/include/functions_inventory.php +++ b/pandora_console/include/functions_inventory.php @@ -1148,11 +1148,13 @@ function get_inventory_basic_info_sql($params, $count=false) } if ($count !== true) { - $limit_condition = sprintf( - 'LIMIT %d, %d', - $params['start'], - $params['length'] - ); + if ((int) $params['length'] > -1) { + $limit_condition = sprintf( + 'LIMIT %d, %d', + $params['start'], + $params['length'] + ); + } $order_condition = sprintf('ORDER BY %s', $params['order']); } else { diff --git a/pandora_console/include/functions_netflow.php b/pandora_console/include/functions_netflow.php index 247b81a816..f2cc1973bb 100644 --- a/pandora_console/include/functions_netflow.php +++ b/pandora_console/include/functions_netflow.php @@ -804,8 +804,9 @@ function netflow_get_stats( return json_decode($data, true); } + $aggregate = escapeshellarg($aggregate.'/bytes'); // Get the command to call nfdump. - $options = "-o csv -q -n $max -s $aggregate/bytes -t ".date($nfdump_date_format, $start_date).'-'.date($nfdump_date_format, $end_date); + $options = "-o csv -q -n $max -s $aggregate -t ".date($nfdump_date_format, $start_date).'-'.date($nfdump_date_format, $end_date); $command = netflow_get_command($options, $filter, $start_date_fixed, $end_date_fixed); // Execute nfdump. exec($command, $string); @@ -1147,6 +1148,7 @@ function netflow_get_command($options, $filter, $date_init=0, $date_end=0) // Filter options. $command .= ' '.netflow_get_filter_arguments($filter); + return $command; } @@ -2186,9 +2188,9 @@ function netflow_get_top_data( // Get the command to call nfdump. $options = sprintf( - '-q -o csv -n %s -s %s/bytes -t %s-%s', + '-q -o csv -n %s -s %s -t %s-%s', $max, - $aggregate, + escapeshellarg($aggregate.'/bytes'), date($nfdump_date_format, $start_date), date($nfdump_date_format, $end_date) ); diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index ca186e8899..5b48b0af5b 100755 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -4142,6 +4142,13 @@ function reporting_exception( ); break; + case 'sum': + $min = reporting_get_agentmodule_data_sum( + $exceptions[$i]['id_agent_module'], + $content['period'] + ); + break; + default: // Default. break; @@ -4193,6 +4200,10 @@ function reporting_exception( case 'min': $value = reporting_get_agentmodule_data_min($exc['id_agent_module'], $content['period']); break; + + case 'sum': + $value = reporting_get_agentmodule_data_sum($exc['id_agent_module'], $content['period']); + break; } } diff --git a/pandora_console/include/functions_token.php b/pandora_console/include/functions_token.php index 41d1107943..0914da5612 100644 --- a/pandora_console/include/functions_token.php +++ b/pandora_console/include/functions_token.php @@ -155,3 +155,23 @@ function delete_user_token(int $idToken): bool return $result; } + + +/** + * Generate token for use ONLY in pandora. + * + * @param string $serverUniqueIdentifier Value server_unique_identifier from tconfig. + * @param string $apiPassword Value api_password from tconfig. + * + * @return string + */ +function generate_token_for_system(string $serverUniqueIdentifier='', string $apiPassword=''):string +{ + if (empty($serverUniqueIdentifier) === true + || empty($apiPassword) === true + ) { + return ''; + } + + return md5($serverUniqueIdentifier).md5($apiPassword); +} diff --git a/pandora_console/include/graphs/pandora.d3.js b/pandora_console/include/graphs/pandora.d3.js index 881899a1df..b6a7c4f0ce 100644 --- a/pandora_console/include/graphs/pandora.d3.js +++ b/pandora_console/include/graphs/pandora.d3.js @@ -985,19 +985,31 @@ function sunburst(recipient, data, width, height, tooltip = true) { .attr("x", function(d) { if (typeof d.show_name != "undefined" && d.show_name) { if (calculate_angle(d) < 20) { - return (d.name.length + 15) * -1; + return (d.name.length + 10) * -1; } else { - return (d.name.length + 25) * -1; + return (d.name.length + 20) * -1; } } }) - .attr("dx", "6") // margin + // margin + .attr("dx", function(d) { + if (d.type === "central_service") { + return ""; + } + return "6"; + }) .attr("dy", function(d) { if (d.type === "central_service") { - return "-7em"; + return ""; } return ".35em"; }) // vertical-align + .attr("y", function(d) { + if (d.type === "central_service") { + return "-11.75%"; + } + return ""; + }) // vertical-align .attr("opacity", function(d) { if (typeof d.show_name != "undefined" && d.show_name) { return 1; @@ -1007,7 +1019,7 @@ function sunburst(recipient, data, width, height, tooltip = true) { }) .text(function(d) { if (d.name.length > 20) { - var resta = d.name.length - 12; + var resta = d.name.length - 17; var string = d.name.slice( d.name.length / 2 - resta / 2, d.name.length / 2 + resta / 2 diff --git a/pandora_console/include/javascript/pandora_events.js b/pandora_console/include/javascript/pandora_events.js index 2d7f5b0fca..eeae307db3 100644 --- a/pandora_console/include/javascript/pandora_events.js +++ b/pandora_console/include/javascript/pandora_events.js @@ -323,6 +323,12 @@ function perform_response(response, response_id, index = "") { // Change the status of an event to new, in process or validated. function event_change_status(event_ids, server_id, group_rep) { + var inputs = $("#events_form :input"); + var values = {}; + inputs.each(function() { + values[this.name] = $(this).val(); + }); + var new_status = $("#estado").val(); $("#button-status_button").attr("disabled", "disabled"); @@ -335,7 +341,8 @@ function event_change_status(event_ids, server_id, group_rep) { event_ids: event_ids, new_status: new_status, server_id: server_id, - group_rep: group_rep + group_rep: group_rep, + filter: values }, type: "POST", url: getUrlAjax(), diff --git a/pandora_console/include/lib/Modules/Shared/Middlewares/UserTokenMiddleware.php b/pandora_console/include/lib/Modules/Shared/Middlewares/UserTokenMiddleware.php index 8c1ecc1ee7..cd10e0d1f0 100644 --- a/pandora_console/include/lib/Modules/Shared/Middlewares/UserTokenMiddleware.php +++ b/pandora_console/include/lib/Modules/Shared/Middlewares/UserTokenMiddleware.php @@ -2,7 +2,6 @@ namespace PandoraFMS\Modules\Shared\Middlewares; -use PandoraFMS\Modules\Shared\Services\Config; use PandoraFMS\Modules\Authentication\Services\GetUserTokenService; use PandoraFMS\Modules\Authentication\Services\UpdateTokenService; use PandoraFMS\Modules\Authentication\Services\ValidateServerIdentifierTokenService; @@ -20,14 +19,20 @@ final class UserTokenMiddleware private readonly ValidateUserTokenService $validateUserTokenService, private readonly GetUserTokenService $getUserTokenService, private readonly UpdateTokenService $updateTokenService, - private readonly Timestamp $timestamp, - private readonly Config $config + private readonly Timestamp $timestamp ) { } public function check(Request $request): bool { + global $config; + + // DO NOT REMOVE THIS LINE. + // In case a JSON error occurs outside of the API, it will be reset to handle + // formatting errors in the parameters. + json_encode([]); + $authorization = ($request->getHeader('Authorization')[0] ?? ''); $token = null; @@ -50,7 +55,7 @@ final class UserTokenMiddleware $validToken = $this->validateUserTokenService->__invoke($uuid, $strToken); $token = $this->getUserTokenService->__invoke($uuid); if ($token !== null && $validToken) { - $this->config->set('id_user', $token->getIdUser()); + $config['id_user'] = $token->getIdUser(); $oldToken = clone $token; $token->setLastUsage($this->timestamp->getMysqlCurrentTimestamp(0)); $this->updateTokenService->__invoke($token, $oldToken); @@ -70,10 +75,10 @@ final class UserTokenMiddleware if ($validTokenUiniqueServerIdentifier === true) { $_SESSION['id_usuario'] = 'admin'; - $this->config->set('id_user', 'admin'); + $config['id_user'] = 'admin'; } else { $_SESSION['id_usuario'] = $token->getIdUser(); - $this->config->set('id_user', $token->getIdUser()); + $config['id_user'] = $token->getIdUser(); } if (session_status() === PHP_SESSION_ACTIVE) { diff --git a/pandora_console/include/styles/pandora-rc.css b/pandora_console/include/styles/pandora-rc.css new file mode 100644 index 0000000000..d5098ca702 --- /dev/null +++ b/pandora_console/include/styles/pandora-rc.css @@ -0,0 +1,130 @@ +/** + * + * Name: Pandora RC styles + * + * @category Stylesheet + * @package Pandora FMS + * @subpackage Community + * @version 1.0.0 + * @license See below + * + * ______ ___ _______ _______ ________ + * | __ \.-----.--.--.--| |.-----.----.-----. | ___| | | __| + * | __/| _ | | _ || _ | _| _ | | ___| |__ | + * |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______| + * + * ============================================================================ + * Copyright (c) 2005-2023 Pandora FMS + * Please see https://pandorafms.com for full contribution list + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation for version 2. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * ============================================================================ + */ + +div#main { + margin-bottom: 25px; +} + +.rc-ad-view-main { + width: 100%; + /* height: calc(100vh - 158px); */ + box-sizing: border-box; + padding: 63px 125px; + border: 1px solid var(--border-color-4); + border-radius: 25px; + background-color: var(--secondary-color); + background-image: url(../../images/ehorus/ad/background.svg); + background-repeat: no-repeat; + background-size: contain; + background-position-x: center; +} + +.rc-ad-view-first-row { + width: 100%; + height: 255px; + display: flex; + flex-direction: row; + flex-wrap: nowrap; + justify-content: space-between; + align-items: center; + gap: 60px; +} + +.rc-ad-view-first-row > div { + width: 450px; + height: 100%; + color: var(--text-color-2); + font-family: "lato-bold"; + font-size: 40px; + line-height: 48px; + display: flex; + flex-direction: column; + flex-wrap: nowrap; + justify-content: space-between; +} + +.rc-ad-view-first-row > div * { + background-color: var(--pandora-rc-color); + width: 221px; + height: 42px; + border: 0; + border-radius: 8px; + font-family: "lato-bold"; + font-size: 15px; + line-height: 20px; + text-align: center; + cursor: pointer; +} + +.rc-ad-view-first-row > div button:hover { + opacity: 0.9; +} + +.rc-ad-view-first-row > img { + width: calc(100% - 480px); + max-height: 255px; +} + +.rc-ad-view-main > p { + margin-top: 60px; + color: var(--text-color-3); + font-size: 18px; + line-height: 22px; +} + +.rc-ad-view-second-row { + display: flex; + flex-direction: row; + flex-wrap: nowrap; + align-items: flex-start; + gap: 20px; +} + +.rc-ad-view-second-row > div { + display: flex; + flex-direction: column; + flex-wrap: nowrap; + align-items: center; + border: 1px solid var(--border-color-4); + border-radius: 10px; + padding: 20px; + width: calc((100% - 100px) / 5); +} + +.rc-ad-view-second-row > div > img { + max-width: 100%; +} + +.rc-ad-view-second-row > div > span { + margin-top: 20px; + color: var(--text-color-2); + font-family: "lato-bold"; + font-size: 20px; + line-height: 24px; + text-align: center; +} diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index a7d2c2be13..5e2dbb6755 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -31,6 +31,7 @@ --primary-color: #14524f; --primary-color-hover: #318280; --secondary-color: #ffffff; + --pandora-rc-color: #34cc9d; --text-color: #333; --text-color-2: #161628; diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css index f02ae5283b..4e8b65a988 100644 --- a/pandora_console/include/styles/pandora_black.css +++ b/pandora_console/include/styles/pandora_black.css @@ -2154,3 +2154,14 @@ select option:checked { .content-widget .flot-base { background-color: unset; } + +div.rc-ad-view-main { + background-image: url(../../images/ehorus/ad/background-dark.svg); + background-size: cover; + border: 0; +} + +div.rc-ad-view-second-row > div { + border: 0; + background-color: #525282; +} diff --git a/pandora_console/index.php b/pandora_console/index.php index cb09883501..addea2babb 100755 --- a/pandora_console/index.php +++ b/pandora_console/index.php @@ -578,6 +578,15 @@ if (isset($config['id_user']) === false) { exit(''); } + if (isset($config['pending_sync_process_message']) === true) { + include_once 'general/login_page.php'; + while (ob_get_length() > 0) { + ob_end_flush(); + } + + exit(''); + } + // Login ok and password has not expired. $process_login = true; diff --git a/pandora_console/install.php b/pandora_console/install.php index c9c29e2987..fb0827db05 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -131,7 +131,7 @@
+
+
+ '.$title.'
'.$title2.' + +
+ '.html_print_image('images/ehorus/ad/sample.svg', true).' +
+ +

'.__('Pandora RC is not currently enabled, here’s what your missing out').':

+ +
+
+ '.html_print_image('images/ehorus/ad/desktop.svg', true).' + '.__('Remote access to the server’s Desktop').'. +
+ +
+ '.html_print_image('images/ehorus/ad/cli.svg', true).' + '.__('Run commands directly with native CLI').'. +
+ +
+ '.html_print_image('images/ehorus/ad/files.svg', true).' + '.__('Upload and manage your files').'. +
+ +
+ '.html_print_image('images/ehorus/ad/multiplatform.svg', true).' + '.__('Compatible with all major OS platforms').'. +
+ +
+ '.html_print_image('images/ehorus/ad/process-services.svg', true).' + '.__('Manage all your processes and services').'. +
+
+
+ '; + + return $output; +} + + ?> diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec index 972c4af5eb..d21ab6024e 100644 --- a/pandora_console/pandora_console.redhat.spec +++ b/pandora_console/pandora_console.redhat.spec @@ -6,7 +6,7 @@ %define debug_package %{nil} %define name pandorafms_console %define version 7.0NG.776 -%define release 240514 +%define release 240520 # User and Group under which Apache is running %define httpd_name httpd diff --git a/pandora_console/pandora_console.rhel7.spec b/pandora_console/pandora_console.rhel7.spec index 43213974b0..ad5486e0a8 100644 --- a/pandora_console/pandora_console.rhel7.spec +++ b/pandora_console/pandora_console.rhel7.spec @@ -6,7 +6,7 @@ %define debug_package %{nil} %define name pandorafms_console %define version 7.0NG.776 -%define release 240514 +%define release 240520 # User and Group under which Apache is running %define httpd_name httpd diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec index 48338c94bd..b4371ffb2d 100644 --- a/pandora_console/pandora_console.spec +++ b/pandora_console/pandora_console.spec @@ -3,7 +3,7 @@ # %define name pandorafms_console %define version 7.0NG.776 -%define release 240514 +%define release 240520 %define httpd_name httpd # User and Group under which Apache is running %define httpd_name apache2 diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index 8a1135b4b2..905d4264d3 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -2545,12 +2545,12 @@ INSERT INTO `tncm_template` VALUES (8,'Mikrotik-Generic','[\"3\"]','[\"8\"]'); INSERT INTO `tncm_script` VALUES - (1,0,'enable expect:Password:\s* _enablepass_ exit'), - (2,1,'enable expect:Password:\s* _enablepass_ term length 0 capture:show running-config exit '), - (3,2,'enable expect:Password:\s* _enablepass_ term length 0 config terminal _applyconfigbackup_ exit '), - (4,3,'enable expect:Password:\s* _enablepass_ term length 0 capture:show version | i IOS Software exit '), - (5,5,'enable expect:Password:\s* _enablepass_ term length 0 config term end end exit '), - (6,4,'copy tftp flash expect:\]\? _TFTP_SERVER_IP_ expect:\]\? _SOURCE_FILE_NAME_ expect:\]\? firmware.bin show flash reload expect:confirm y config terminal boot system firmware.bin'), + (1,0,'enable\n expect:Password:\s* _enablepass_\n exit\n'), + (2,1,'enable\n expect:Password:\s* _enablepass_\n term length 0\n capture:show running-config\n exit\n'), + (3,2,'enable\n expect:Password:\s* _enablepass_\n term length 0\n config terminal\n _applyconfigbackup_\n exit\n'), + (4,3,'enable\n expect:Password:\s* _enablepass_\n term length 0\n capture:show version | i IOS Software\n exit\n'), + (5,5,'enable\n expect:Password:\s* _enablepass_\n term length 0\n config term\n end\n end\n exit\n'), + (6,4,'copy tftp flash\n expect:\]\? _TFTP_SERVER_IP_\n expect:\]\? _SOURCE_FILE_NAME_\n expect:\]\? firmware.bin\n show flash\n reload\n expect:confirm y\n config terminal\n boot system firmware.bin\n'), (7,0,'enable\n expect:Password:\s* _enablepass_\n exit\n'), (8,1,'enable\n expect:Password:\s* _enablepass_\n term length 0\n capture:show running-config\n exit\n'), (9,2,'enable\n expect:Password:\s* _enablepass_\n term length 0\n config terminal\n _applyconfigbackup_\n exit\n'), @@ -2561,14 +2561,14 @@ INSERT INTO `tncm_script` VALUES (14,0,'expect:root@% cli\n exit\n'), (15,1,'expect:root@% cli\n expect:root> capture:show configuration | no-more\n capture:\n quit\n expect:root@% exit\n'), (16,2,'expect:root@% cli\n expect:root> configure\n load override terminal\n _applyconfigbackup_\n commit\n exit\n'), - (17,3,'expect:root@% cli\n expect:root> capture:show version|match Junos:\n capture: \n quit\n expect:root@% exit\n'), + (17,3,'expect:root@% cli\n expect:root> capture:show version|match Junos:\n quit\n expect:root@% exit\n'), (18,4,'expect:root@% cli\n expect:root> save software from tftp _TFTP_SERVER_IP_ _FIRMWARE_NAME_ to flash\n reset\n exit\n'), (19,5,''), - (20,7,'expect:root@% cli\n expect:root> capture:show version|match Junos:\n capture: \n quit\n expect:root@% exit\n'), + (20,7,'expect:root@% cli\n expect:root> capture:show version|match Junos:\n quit\n expect:root@% exit\n'), (21,0,'sleep:1 exit\n'), (22,1,'set cli pager off \n capture:show config running\n exit\n'), (23,2,'set cli terminal width 500\n set cli scripting-mode on\n configure\n _applyconfigbackup_\n commit\n'), - (24,3,'set cli pager off \n capture:show system info | match app-version:\n sleep:1 expect:app-version:\s* exit \n'), + (24,3,'set cli pager off \n capture:show system info | match app-version:\n sleep:1 exit \n'), (25,4,'tftp import software from _TFTP_SERVER_IP_ file _FIRMWARE_NAME_\n request system software install version\n reboot\n exit\n'), (26,5,''), (27,7,'set cli pager off \n capture:show system info | match app-version:\n sleep:1 expect:app-version:\s* exit \n'), @@ -2986,7 +2986,7 @@ SET @short_name = 'pandorafms.aws.rds'; SET @name = 'Amazon RDS'; SET @section = 'cloud'; SET @description = 'Monitor AWS RDS instances'; -SET @version = '1.0'; +SET @version = '1.1'; INSERT IGNORE INTO `tdiscovery_apps` (`id_app`, `short_name`, `name`, `section`, `description`, `version`) VALUES ('', @short_name, @name, @section, @description, @version); SELECT @id_app := `id_app` FROM `tdiscovery_apps` WHERE `short_name` = @short_name; diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control index 61db3aa20f..e85ea445d3 100644 --- a/pandora_server/DEBIAN/control +++ b/pandora_server/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-server -Version: 7.0NG.776-240514 +Version: 7.0NG.776-240520 Architecture: all Priority: optional Section: admin diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh index a99255d70e..d811b62b8d 100644 --- a/pandora_server/DEBIAN/make_deb_package.sh +++ b/pandora_server/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="7.0NG.776-240514" +pandora_version="7.0NG.776-240520" package_cpan=0 package_pandora=1 diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm index e883814d54..a44ecc3666 100644 --- a/pandora_server/lib/PandoraFMS/Config.pm +++ b/pandora_server/lib/PandoraFMS/Config.pm @@ -46,7 +46,7 @@ our @EXPORT = qw( # version: Defines actual version of Pandora Server for this module only my $pandora_version = "7.0NG.776"; -my $pandora_build = "240514"; +my $pandora_build = "240520"; our $VERSION = $pandora_version." ".$pandora_build; # Setup hash diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm index 44faae9512..278b35ea38 100644 --- a/pandora_server/lib/PandoraFMS/PluginTools.pm +++ b/pandora_server/lib/PandoraFMS/PluginTools.pm @@ -34,7 +34,7 @@ our @ISA = qw(Exporter); # version: Defines actual version of Pandora Server for this module only my $pandora_version = "7.0NG.776"; -my $pandora_build = "240514"; +my $pandora_build = "240520"; our $VERSION = $pandora_version." ".$pandora_build; our %EXPORT_TAGS = ( 'all' => [ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 0550366001..2daf3b679e 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -7,7 +7,7 @@ %define debug_package %{nil} %define name pandorafms_server %define version 7.0NG.776 -%define release 240514 +%define release 240520 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index ce9e16ff58..c947c0e3ad 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_server %define version 7.0NG.776 -%define release 240514 +%define release 240520 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 258a39d5f2..ed95279b23 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.776" -PI_BUILD="240514" +PI_BUILD="240520" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index b11e5d5d1a..1bfdfb5728 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -38,7 +38,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.776 Build 240514"; +my $version = "7.0NG.776 Build 240520"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 57b9fb8c10..d520741283 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.776 Build 240514"; +my $version = "7.0NG.776 Build 240520"; # save program name for logging my $progname = basename($0);