diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 15a3c8aa3a..11a313b32f 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.773.3-230918 +Version: 7.0NG.773.3-230919 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 19d297d948..7d00d115c0 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.773.3-230918" +pandora_version="7.0NG.773.3-230919" 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 5037570912..73f6c3aafd 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1031,7 +1031,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.773.3'; -use constant AGENT_BUILD => '230918'; +use constant AGENT_BUILD => '230919'; # 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 6677779661..4f08389b5b 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.773.3 -%define release 230918 +%define release 230919 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.spec b/pandora_agents/unix/pandora_agent.redhat_bin.spec index a75d35cfb9..771d5bd3c3 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.773.3 -%define release 230918 +%define release 230919 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 e707ff8128..250127e822 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.773.3 -%define release 230918 +%define release 230919 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 b271ec08e6..791ab189d0 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.773.3" -PI_BUILD="230918" +PI_BUILD="230919" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index ab92079beb..d6e1cf4f85 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{230918} +{230919} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index ef38786179..2fc2b2e1c3 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.773.3 Build 230918") +#define PANDORA_VERSION ("7.0NG.773.3 Build 230919") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 4aef0d0f2a..696afe1baf 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.773.3(Build 230918))" + VALUE "ProductVersion", "(7.0NG.773.3(Build 230919))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 929a9d30a6..5976825390 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.773.3-230918 +Version: 7.0NG.773.3-230919 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 9326b45e98..5c0625e968 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.773.3-230918" +pandora_version="7.0NG.773.3-230919" package_pear=0 package_pandora=1 diff --git a/pandora_console/extras/mr/66.sql b/pandora_console/extras/mr/66.sql index cc37eafd1a..bd970d70c4 100644 --- a/pandora_console/extras/mr/66.sql +++ b/pandora_console/extras/mr/66.sql @@ -47,6 +47,21 @@ ADD COLUMN `time_end` VARCHAR(45) NULL AFTER `date_end`; UPDATE `tdiscovery_apps` SET `version` = '1.1' WHERE `short_name` = 'pandorafms.vmware'; +-- Insert new Proxmox APP +SET @short_name = 'pandorafms.proxmox'; +SET @name = 'Proxmox'; +SET @section = 'app'; +SET @description = 'Monitor Proxmox VMs, LXC, backups and nodes from a specific host'; +SET @version = '1.0'; +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; + +-- Insert into tdiscovery_apps_scripts +INSERT IGNORE INTO `tdiscovery_apps_scripts` (`id_app`, `macro`, `value`) VALUES (@id_app, '_exec1_', 'bin/pandora_proxmox'); + +-- Insert into tdiscovery_apps_executions +INSERT IGNORE INTO `tdiscovery_apps_executions` (`id`, `id_app`, `execution`) VALUES (1, @id_app, ''_exec1_' -g '__taskGroup__' --host '_host_' --port '_port_' --user '_user_' --password '_password_' --vm '_scanVM_' --lxc '_scanLXC_' --backups '_scanBackups_' --nodes '_scanNodes_' --transfer_mode tentacle --tentacle_address '_tentacleIP_' --tentacle_port '_tentaclePort_' --as_discovery_plugin 1'); + ALTER TABLE `treport_content` ADD COLUMN `cat_security_hardening` INT NOT NULL DEFAULT 0; ALTER TABLE `treport_content` ADD COLUMN `ignore_skipped` INT NOT NULL DEFAULT 0; ALTER TABLE `treport_content` ADD COLUMN `status_of_check` TINYTEXT; diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index f8bbcad9ec..958654113b 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC230918'; +$build_version = 'PC230919'; $pandora_version = 'v7.0NG.773.3'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/include/functions_db.php b/pandora_console/include/functions_db.php index e2091cc2c1..637257e764 100644 --- a/pandora_console/include/functions_db.php +++ b/pandora_console/include/functions_db.php @@ -2567,6 +2567,10 @@ function db_get_column_type(string $table, string $column='') */ function db_validate_sql(string $sql, $server=false) { + if ($server == 0) { + $server = false; + } + if ($server !== false && is_metaconsole() === true) { $setup = metaconsole_get_connection($server); if (metaconsole_connect($setup) !== NOERR) { diff --git a/pandora_console/include/lib/Dashboard/Widgets/inventory.php b/pandora_console/include/lib/Dashboard/Widgets/inventory.php index 67e527dcf0..fe0d5fe308 100644 --- a/pandora_console/include/lib/Dashboard/Widgets/inventory.php +++ b/pandora_console/include/lib/Dashboard/Widgets/inventory.php @@ -256,7 +256,7 @@ class InventoryWidget extends Widget 'arguments' => [ 'name' => 'free_search', 'type' => 'text', - 'class' => 'w100p', + 'class' => 'w96p', 'input_class' => 'flex-row', 'value' => $values['freeSearch'], 'return' => true, @@ -612,7 +612,7 @@ class InventoryWidget extends Widget $table = ui_print_datatable( [ 'id' => $id_table, - 'class' => 'info_table w100p', + 'class' => 'info_table w96p', 'style' => 'width: 100%', 'columns' => $columns, 'column_names' => $columns, @@ -642,8 +642,8 @@ class InventoryWidget extends Widget true, true, '', - 'white-box-content w100p', - 'box-shadow white_table_graph w100p', + 'white-box-content w96p', + 'box-shadow white_table_graph w96p', 'images/arrow_down_green.png', 'images/arrow_right_green.png', false, @@ -666,8 +666,8 @@ class InventoryWidget extends Widget true, true, '', - 'white-box-content w100p', - 'box-shadow white_table_graph w100p', + 'white-box-content w96p', + 'box-shadow white_table_graph w96p', ); } @@ -682,7 +682,10 @@ class InventoryWidget extends Widget '', '', false, - false + false, + '', + 'white-box-content', + 'box-flat white_table_graph w96p' ); } } else { @@ -729,7 +732,7 @@ class InventoryWidget extends Widget $table = ui_print_datatable( [ 'id' => $id_table, - 'class' => 'info_table w100p', + 'class' => 'info_table w96p', 'style' => 'width: 100%', 'columns' => $columns, 'column_names' => $columns, @@ -759,8 +762,8 @@ class InventoryWidget extends Widget true, true, '', - 'white-box-content w100p', - 'box-shadow white_table_graph w100p', + 'white-box-content w96p', + 'box-shadow white_table_graph w96p', 'images/arrow_down_green.png', 'images/arrow_right_green.png', false, @@ -782,8 +785,8 @@ class InventoryWidget extends Widget true, true, '', - 'white-box-content w100p', - 'box-shadow white_table_graph w100p', + 'white-box-content w96p', + 'box-shadow white_table_graph w96p', ); } @@ -895,7 +898,7 @@ class InventoryWidget extends Widget $table = ui_print_datatable( [ 'id' => $id_table, - 'class' => 'info_table w100p', + 'class' => 'info_table w96p', 'style' => 'width: 100%', 'columns' => $columns, 'column_names' => $columns, @@ -925,8 +928,8 @@ class InventoryWidget extends Widget true, true, '', - 'white-box-content w100p', - 'box-shadow white_table_graph w100p', + 'white-box-content w96p', + 'box-shadow white_table_graph w96p', 'images/arrow_down_green.png', 'images/arrow_right_green.png', false, @@ -947,7 +950,10 @@ class InventoryWidget extends Widget '', '', false, - false + false, + '', + 'white-box-content', + 'box-flat white_table_graph w96p' ); } } else { @@ -986,7 +992,7 @@ class InventoryWidget extends Widget $table = ui_print_datatable( [ 'id' => $id_table, - 'class' => 'info_table w100p', + 'class' => 'info_table w96p', 'style' => 'width: 100%', 'columns' => $columns, 'column_names' => $columns, @@ -1022,7 +1028,7 @@ class InventoryWidget extends Widget $table = ui_print_datatable( [ 'id' => $id_table, - 'class' => 'info_table w100p', + 'class' => 'info_table w96p', 'style' => 'width: 100%', 'columns' => $columns, 'column_names' => $columns, @@ -1049,7 +1055,7 @@ class InventoryWidget extends Widget $id_agente = $inventory_id_agent; $agentes = []; $data = []; - $class = 'info_table w100p'; + $class = 'info_table w96p'; $style = 'width: 100%; font-size: 100px !important;'; $ordering = true; $searching = false; diff --git a/pandora_console/install.php b/pandora_console/install.php index 19c37a7d7e..a5395109bb 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -131,7 +131,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 4ae90a8296..6a26b534ce 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_server %define version 7.0NG.773.3 -%define release 230918 +%define release 230919 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 5c1910854b..5e2ced5edd 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.773.3 -%define release 230918 +%define release 230919 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 21e1e1b47d..cb4871df03 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.773.3" -PI_BUILD="230918" +PI_BUILD="230919" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 4f087de961..08a0226706 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.773.3 Build 230918"; +my $version = "7.0NG.773.3 Build 230919"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index b841bc79ae..0793c5297f 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.773.3 Build 230918"; +my $version = "7.0NG.773.3 Build 230919"; # save program name for logging my $progname = basename($0);