tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 16:24:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0

Browse Source
This commit is contained in:
daniel 2024-01-29 10:24:54 +01:00
commit daa2a09e82
40 changed files with 172 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_agents/pc/pandora_agent
View File

@ -585,7 +585,7 @@ sub write_broker_conf($){
# Change the agent name # Change the agent name
if ($line =~ m/^\s*#*\s*agent_name\s+/) { if ($line =~ m/^\s*#*\s*agent_name\s+/) {
$line = "agent_name $broker_agent\n"; $line = "agent_name $broker_agent\n#broker active\n";
} }
# Change the logfile # Change the logfile
elsif ($line =~ m/^\s*logfile\s+(.*)/) { elsif ($line =~ m/^\s*logfile\s+(.*)/) {

2
pandora_agents/unix/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-agent-unix package: pandorafms-agent-unix
Version: 7.0NG.775-240125 Version: 7.0NG.775-240126
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

2
pandora_agents/unix/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
pandora_version="7.0NG.775-240125" pandora_version="7.0NG.775-240126"
echo "Test if you has the tools for to make the packages." echo "Test if you has the tools for to make the packages."
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

4
pandora_agents/unix/pandora_agent
View File

@ -1039,7 +1039,7 @@ my $Sem = undef;
my $ThreadSem = undef; my $ThreadSem = undef;
use constant AGENT_VERSION => '7.0NG.775'; use constant AGENT_VERSION => '7.0NG.775';
use constant AGENT_BUILD => '240125'; use constant AGENT_BUILD => '240126';
# Agent log default file size maximum and instances # Agent log default file size maximum and instances
use constant DEFAULT_MAX_LOG_SIZE => 600000; use constant DEFAULT_MAX_LOG_SIZE => 600000;
@ -1860,7 +1860,7 @@ sub write_broker_conf($){
# Change the agent name # Change the agent name
if ($line =~ m/^\s*#*\s*agent_name\s+/) { if ($line =~ m/^\s*#*\s*agent_name\s+/) {
$line = "agent_name $broker_agent\n"; $line = "agent_name $broker_agent\n#broker active\n";
} }
# Change the logfile # Change the logfile
elsif ($line =~ m/^\s*logfile\s+(.*)/) { elsif ($line =~ m/^\s*logfile\s+(.*)/) {

2
pandora_agents/unix/pandora_agent.redhat.spec
View File

@ -4,7 +4,7 @@
%global __os_install_post %{nil} %global __os_install_post %{nil}
%define name pandorafms_agent_linux %define name pandorafms_agent_linux
%define version 7.0NG.775 %define version 7.0NG.775
%define release 240125 %define release 240126
Summary: Pandora FMS Linux agent, PERL version Summary: Pandora FMS Linux agent, PERL version
Name: %{name} Name: %{name}

2
pandora_agents/unix/pandora_agent.redhat_bin.el8.spec
View File

@ -5,7 +5,7 @@
%define name pandorafms_agent_linux_bin %define name pandorafms_agent_linux_bin
%define source_name pandorafms_agent_linux %define source_name pandorafms_agent_linux
%define version 7.0NG.775 %define version 7.0NG.775
%define release 240125 %define release 240126
%define debug_package %{nil} %define debug_package %{nil}
Summary: Pandora FMS Linux agent, binary version Summary: Pandora FMS Linux agent, binary version

2
pandora_agents/unix/pandora_agent.redhat_bin.el9.spec
View File

@ -5,7 +5,7 @@
%define name pandorafms_agent_linux_bin %define name pandorafms_agent_linux_bin
%define source_name pandorafms_agent_linux %define source_name pandorafms_agent_linux
%define version 7.0NG.775 %define version 7.0NG.775
%define release 240125 %define release 240126
%define debug_package %{nil} %define debug_package %{nil}
Summary: Pandora FMS Linux agent, binary version Summary: Pandora FMS Linux agent, binary version

2
pandora_agents/unix/pandora_agent.redhat_bin.spec
View File

@ -5,7 +5,7 @@
%define name pandorafms_agent_linux_bin %define name pandorafms_agent_linux_bin
%define source_name pandorafms_agent_linux %define source_name pandorafms_agent_linux
%define version 7.0NG.775 %define version 7.0NG.775
%define release 240125 %define release 240126
Summary: Pandora FMS Linux agent, binary version Summary: Pandora FMS Linux agent, binary version
Name: %{name} Name: %{name}

2
pandora_agents/unix/pandora_agent.spec
View File

@ -4,7 +4,7 @@
%global __os_install_post %{nil} %global __os_install_post %{nil}
%define name pandorafms_agent_linux %define name pandorafms_agent_linux
%define version 7.0NG.775 %define version 7.0NG.775
%define release 240125 %define release 240126
Summary: Pandora FMS Linux agent, PERL version Summary: Pandora FMS Linux agent, PERL version
Name: %{name} Name: %{name}

2
pandora_agents/unix/pandora_agent_installer
View File

@ -10,7 +10,7 @@
# ********************************************************************** # **********************************************************************
PI_VERSION="7.0NG.775" PI_VERSION="7.0NG.775"
PI_BUILD="240125" PI_BUILD="240126"
OS_NAME=`uname -s` OS_NAME=`uname -s`
FORCE=0 FORCE=0

2
pandora_agents/win32/installer/pandora.mpi
View File

@ -186,7 +186,7 @@ UpgradeApplicationID
{} {}
Version Version
{240125} {240126}
ViewReadme ViewReadme
{Yes} {Yes}

2
pandora_agents/win32/pandora.cc
View File

@ -30,7 +30,7 @@ using namespace Pandora;
using namespace Pandora_Strutils; using namespace Pandora_Strutils;
#define PATH_SIZE _MAX_PATH+1 #define PATH_SIZE _MAX_PATH+1
#define PANDORA_VERSION ("7.0NG.775 Build 240125") #define PANDORA_VERSION ("7.0NG.775 Build 240126")
string pandora_path; string pandora_path;
string pandora_dir; string pandora_dir;

2
pandora_agents/win32/versioninfo.rc
View File

@ -11,7 +11,7 @@ BEGIN
VALUE "LegalCopyright", "Pandora FMS" VALUE "LegalCopyright", "Pandora FMS"
VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "OriginalFilename", "PandoraAgent.exe"
VALUE "ProductName", "Pandora FMS Windows Agent" VALUE "ProductName", "Pandora FMS Windows Agent"
VALUE "ProductVersion", "(7.0NG.775(Build 240125))" VALUE "ProductVersion", "(7.0NG.775(Build 240126))"
VALUE "FileVersion", "1.0.0.0" VALUE "FileVersion", "1.0.0.0"
END END
END END

2
pandora_console/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-console package: pandorafms-console
Version: 7.0NG.775-240125 Version: 7.0NG.775-240126
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

2
pandora_console/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
pandora_version="7.0NG.775-240125" pandora_version="7.0NG.775-240126"
package_pear=0 package_pear=0
package_pandora=1 package_pandora=1

4
pandora_console/extensions/insert_data.php
View File

@ -223,7 +223,7 @@ function mainInsertData()
'', '',
empty($agent_id) empty($agent_id)
); );
$table->data[1][2] = html_print_input_text('data', ($save === true) ? date(DATE_FORMAT) : $data, __('Data'), 10, 60, true); $table->data[1][2] = html_print_input_text('date', ($save === true) ? date(DATE_FORMAT) : $data, __('Data'), 10, 60, true);
$table->data[1][2] .= ' '; $table->data[1][2] .= ' ';
$table->data[1][2] .= html_print_input_text('time', ($save === true) ? date(TIME_FORMAT) : $time, '', 10, 7, true); $table->data[1][2] .= html_print_input_text('time', ($save === true) ? date(TIME_FORMAT) : $time, '', 10, 7, true);
@ -284,7 +284,7 @@ function mainInsertData()
currentText: '<?php echo __('Now'); ?>', currentText: '<?php echo __('Now'); ?>',
closeText: '<?php echo __('Close'); ?>'}); closeText: '<?php echo __('Close'); ?>'});
$('#text-data').datepicker ({ $('#text-date').datepicker ({
dateFormat: '<?php echo DATE_FORMAT_JS; ?>', dateFormat: '<?php echo DATE_FORMAT_JS; ?>',
changeMonth: true, changeMonth: true,
changeYear: true, changeYear: true,

40
pandora_console/extras/mr/68.sql
View File

@ -1,5 +1,45 @@
START TRANSACTION; START TRANSACTION;
CREATE TABLE IF NOT EXISTS `tmerge_error` (
`id` int(10) NOT NULL auto_increment,
`id_node` int(10) default 0,
`phase` int(10) default 0,
`step` int(10) default 0,
`msg` LONGTEXT default "",
`action` text default "",
`utimestamp` int(20) unsigned NOT NULL default 0,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
ALTER TABLE `tmerge_error` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
CREATE TABLE IF NOT EXISTS `tmerge_steps` (
`id` int(10) NOT NULL auto_increment,
`id_node` int(10) default 0,
`phase` int(10) default 0,
`total` int(10) default 0,
`step` int(10) default 0,
`debug` varchar(1024) default "",
`action` varchar(100) default "",
`affected` varchar(100) default "",
`query` mediumtext default "",
`utimestamp` int(20) unsigned NOT NULL default 0,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
ALTER TABLE `tmerge_steps` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
CREATE TABLE IF NOT EXISTS `tmerge_queries` (
`steps` int(10) NOT NULL auto_increment,
`action` varchar(100) default "",
`affected` varchar(100) default "",
`utimestamp` int(20) unsigned NOT NULL default 0,
`query` LONGTEXT NOT NULL default "",
PRIMARY KEY (`steps`)
) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
ALTER TABLE `tmerge_queries` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
-- Update version for plugin oracle -- Update version for plugin oracle
UPDATE `tdiscovery_apps` SET `version` = '1.2' WHERE `short_name` = 'pandorafms.oracle'; UPDATE `tdiscovery_apps` SET `version` = '1.2' WHERE `short_name` = 'pandorafms.oracle';

49
pandora_console/godmode/agentes/agent_manager.php
View File

@ -500,21 +500,40 @@ $tableAgent->data['primary_group'][0] .= ui_print_group_icon(
); );
$tableAgent->data['primary_group'][0] .= '</span>'; $tableAgent->data['primary_group'][0] .= '</span>';
$tableAgent->data['caption_interval'][0] = __('Interval'); $broker = false;
// $tableAgent->rowstyle['interval'] = 'width: 260px'; if (enterprise_installed()) {
$tableAgent->rowclass['interval'] = 'w540px'; // CHECK BROKER FOR SHOW INTERVAL.
$tableAgent->data['interval'][0] = html_print_extended_select_for_time( enterprise_include('include/functions_config_agents.php');
'intervalo', // Read configuration file.
$intervalo, $files = config_agents_get_agent_config_filenames($id_agente);
'', $file_name = $files['conf'];
'', $agent_config = file_get_contents($file_name);
'0', $encoding = 'UTF-8';
10, $agent_config_utf8 = mb_convert_encoding($agent_config, 'UTF-8', $encoding);
true, if ($agent_config_utf8 !== false) {
false, $agent_config = $agent_config_utf8;
true, }
'w33p'
); $broker = str_contains($agent_config, '#broker active');
}
if ($broker === false) {
$tableAgent->data['caption_interval'][0] = __('Interval');
// $tableAgent->rowstyle['interval'] = 'width: 260px';
$tableAgent->rowclass['interval'] = 'w540px';
$tableAgent->data['interval'][0] = html_print_extended_select_for_time(
'intervalo',
$intervalo,
'',
'',
'0',
10,
true,
false,
true,
'w33p'
);
}
if ($intervalo < SECONDS_5MINUTES) { if ($intervalo < SECONDS_5MINUTES) {
$tableAgent->data['interval'][0] .= clippy_context_help('interval_agent_min'); $tableAgent->data['interval'][0] .= clippy_context_help('interval_agent_min');

2
pandora_console/include/config_process.php
View File

@ -20,7 +20,7 @@
/** /**
* Pandora build version and version * Pandora build version and version
*/ */
$build_version = 'PC240125'; $build_version = 'PC240126';
$pandora_version = 'v7.0NG.775'; $pandora_version = 'v7.0NG.775';
// Do not overwrite default timezone set if defined. // Do not overwrite default timezone set if defined.

8
pandora_console/include/functions.php
View File

@ -875,8 +875,6 @@ function get_parameterBetweenListValues($name, $values, $default)
* *
* @return mixed Whatever was in that parameter, cleaned however * @return mixed Whatever was in that parameter, cleaned however
*/ */
function get_parameter_checkbox($name, $default='') function get_parameter_checkbox($name, $default='')
{ {
$sent = get_parameter($name.'_sent', 0); $sent = get_parameter($name.'_sent', 0);
@ -2002,8 +2000,6 @@ function index_array($array, $index='id', $value='name')
* @param int Id of module type * @param int Id of module type
* @return string Graph type, as used in stat_win.php (Graphs launcher) * @return string Graph type, as used in stat_win.php (Graphs launcher)
*/ */
function return_graphtype($id_module_type) function return_graphtype($id_module_type)
{ {
switch ($id_module_type) { switch ($id_module_type) {
@ -2360,8 +2356,6 @@ function string2image(
* @param string SQL code * @param string SQL code
* @return string SQL code validated (it will return empty if SQL is not ok) * @return string SQL code validated (it will return empty if SQL is not ok)
**/ **/
function check_sql($sql) function check_sql($sql)
{ {
// We remove "*" to avoid things like SELECT * FROM tusuario // We remove "*" to avoid things like SELECT * FROM tusuario
@ -2383,8 +2377,6 @@ function check_sql($sql)
* *
* @return boolean 0 on success exit() on no success * @return boolean 0 on success exit() on no success
*/ */
function check_login($output=true) function check_login($output=true)
{ {
global $config; global $config;

38
pandora_console/include/functions_api.php
View File

@ -3258,8 +3258,6 @@ function api_get_group_agent_by_alias($thrash1, $thrash2, $other, $thrash3)
* *
* @param $thrash3 Don't use. * @param $thrash3 Don't use.
*/ */
function api_get_locate_agent($id, $thrash1, $thrash2, $thrash3) function api_get_locate_agent($id, $thrash1, $thrash2, $thrash3)
{ {
if (!is_metaconsole()) { if (!is_metaconsole()) {
@ -7273,8 +7271,6 @@ function api_set_tag($id, $thrash1, $other, $thrash3)
* *
* @param type of return json or csv. * @param type of return json or csv.
*/ */
function api_get_all_planned_downtimes($thrash1, $thrash2, $other, $returnType='json') function api_get_all_planned_downtimes($thrash1, $thrash2, $other, $returnType='json')
{ {
global $config; global $config;
@ -7337,8 +7333,6 @@ function api_get_all_planned_downtimes($thrash1, $thrash2, $other, $returnType='
* *
* @param type of return json or csv. * @param type of return json or csv.
*/ */
function api_get_planned_downtimes_items($thrash1, $thrash2, $other, $returnType='json') function api_get_planned_downtimes_items($thrash1, $thrash2, $other, $returnType='json')
{ {
global $config; global $config;
@ -7430,8 +7424,6 @@ function api_get_planned_downtimes_items($thrash1, $thrash2, $other, $returnType
* *
* @param type of return json or csv. * @param type of return json or csv.
*/ */
function api_set_planned_downtimes_deleted($id, $thrash1, $thrash2, $returnType) function api_set_planned_downtimes_deleted($id, $thrash1, $thrash2, $returnType)
{ {
global $config; global $config;
@ -12101,8 +12093,6 @@ function api_set_disable_module($agent_name, $module_name, $other, $thrash4)
* @param $thrash3 Don't use. * @param $thrash3 Don't use.
* @param $thrash4 Don't use. * @param $thrash4 Don't use.
*/ */
function api_set_enable_module($agent_name, $module_name, $other, $thrash4) function api_set_enable_module($agent_name, $module_name, $other, $thrash4)
{ {
if (defined('METACONSOLE')) { if (defined('METACONSOLE')) {
@ -12169,8 +12159,6 @@ function api_set_enable_module($agent_name, $module_name, $other, $thrash4)
// http://localhost/pandora_console/include/api.php?op=set&op2=disable_alert&id=c2cea5860613e363e25f4ba185b54fe28f869ff8a5e8bb46343288337c903531&id2=Status&other=Warning%20condition // http://localhost/pandora_console/include/api.php?op=set&op2=disable_alert&id=c2cea5860613e363e25f4ba185b54fe28f869ff8a5e8bb46343288337c903531&id2=Status&other=Warning%20condition
*/ */
function api_set_disable_alert($agent_name, $module_name, $template_name, $thrash4) function api_set_disable_alert($agent_name, $module_name, $template_name, $thrash4)
{ {
global $config; global $config;
@ -12216,8 +12204,6 @@ function api_set_disable_alert($agent_name, $module_name, $template_name, $thras
// http://localhost/pandora_console/include/api.php?op=set&op2=disable_alert_alias&id=garfio&id2=Status&other=Warning%20condition // http://localhost/pandora_console/include/api.php?op=set&op2=disable_alert_alias&id=garfio&id2=Status&other=Warning%20condition
*/ */
function api_set_disable_alert_alias($agent_alias, $module_name, $template_name, $thrash4) function api_set_disable_alert_alias($agent_alias, $module_name, $template_name, $thrash4)
{ {
global $config; global $config;
@ -12269,8 +12255,6 @@ function api_set_disable_alert_alias($agent_alias, $module_name, $template_name,
// http://localhost/pandora_console/include/api.php?op=set&op2=enable_alert&id=garfio&id2=Status&other=Warning%20condition // http://localhost/pandora_console/include/api.php?op=set&op2=enable_alert&id=garfio&id2=Status&other=Warning%20condition
*/ */
function api_set_enable_alert($agent_name, $module_name, $template_name, $thrash4) function api_set_enable_alert($agent_name, $module_name, $template_name, $thrash4)
{ {
global $config; global $config;
@ -12316,8 +12300,6 @@ function api_set_enable_alert($agent_name, $module_name, $template_name, $thrash
// http://localhost/pandora_console/include/api.php?op=set&op2=enable_alert_alias&id=garfio&id2=Status&other=Warning%20condition // http://localhost/pandora_console/include/api.php?op=set&op2=enable_alert_alias&id=garfio&id2=Status&other=Warning%20condition
*/ */
function api_set_enable_alert_alias($agent_alias, $module_name, $template_name, $thrash4) function api_set_enable_alert_alias($agent_alias, $module_name, $template_name, $thrash4)
{ {
global $config; global $config;
@ -12369,8 +12351,6 @@ function api_set_enable_alert_alias($agent_alias, $module_name, $template_name,
// http://localhost/pandora_console/include/api.php?op=set&op2=disable_module_alerts&id=garfio&id2=Status // http://localhost/pandora_console/include/api.php?op=set&op2=disable_module_alerts&id=garfio&id2=Status
*/ */
function api_set_disable_module_alerts($agent_name, $module_name, $other, $thrash4) function api_set_disable_module_alerts($agent_name, $module_name, $other, $thrash4)
{ {
global $config; global $config;
@ -12449,8 +12429,6 @@ function api_set_disable_module_alerts($agent_name, $module_name, $other, $thras
* @param $thrash4 Don't use. * @param $thrash4 Don't use.
* // http://localhost/pandora_console/include/api.php?op=set&op2=enable_module_alerts&id=garfio&id2=Status * // http://localhost/pandora_console/include/api.php?op=set&op2=enable_module_alerts&id=garfio&id2=Status
*/ */
function api_set_enable_module_alerts($agent_name, $module_name, $other, $thrash4) function api_set_enable_module_alerts($agent_name, $module_name, $other, $thrash4)
{ {
global $config; global $config;
@ -13184,7 +13162,7 @@ function api_set_create_event($id, $trash1, $other, $returnType)
if ($other['data'][21] != '') { if ($other['data'][21] != '') {
$values['event_custom_id'] = $other['data'][21]; $values['event_custom_id'] = $other['data'][21];
}else{ } else {
$values['event_custom_id'] = ''; $values['event_custom_id'] = '';
} }
@ -13613,8 +13591,6 @@ function api_get_pandora_servers($trash1, $trash2, $other, $returnType)
* *
* @param $thrash3 Don't use. * @param $thrash3 Don't use.
*/ */
function api_set_enable_disable_agent($id, $thrash2, $other, $thrash3) function api_set_enable_disable_agent($id, $thrash2, $other, $thrash3)
{ {
if (defined('METACONSOLE')) { if (defined('METACONSOLE')) {
@ -13699,8 +13675,6 @@ function api_set_enable_disable_agent($id, $thrash2, $other, $thrash3)
* *
* TODO: Add support to events. * TODO: Add support to events.
*/ */
function api_set_pagerduty_webhook($type, $matchup_path, $tresh2, $return_type) function api_set_pagerduty_webhook($type, $matchup_path, $tresh2, $return_type)
{ {
global $config; global $config;
@ -16808,8 +16782,6 @@ function api_set_reset_agent_counts($id, $thrash1, $thrash2, $thrash3)
* api.php?op=get&op2=list_all_user&return_type=json&apipass=1234&user=admin&pass=pandora * api.php?op=get&op2=list_all_user&return_type=json&apipass=1234&user=admin&pass=pandora
* @return * @return
*/ */
function api_get_list_all_user($thrash1, $thrash2, $other, $returnType) function api_get_list_all_user($thrash1, $thrash2, $other, $returnType)
{ {
global $config; global $config;
@ -16884,8 +16856,6 @@ function api_get_list_all_user($thrash1, $thrash2, $other, $returnType)
* *
* @return * @return
*/ */
function api_get_info_user_name($thrash1, $thrash2, $other, $returnType) function api_get_info_user_name($thrash1, $thrash2, $other, $returnType)
{ {
global $config; global $config;
@ -16960,8 +16930,6 @@ function api_get_info_user_name($thrash1, $thrash2, $other, $returnType)
* *
* @return * @return
*/ */
function api_get_filter_user_group($thrash1, $thrash2, $other, $returnType) function api_get_filter_user_group($thrash1, $thrash2, $other, $returnType)
{ {
global $config; global $config;
@ -17046,8 +17014,6 @@ function api_get_filter_user_group($thrash1, $thrash2, $other, $returnType)
* *
* @return void * @return void
*/ */
function api_set_delete_user_permission($thrash1, $thrash2, $other, $returnType) function api_set_delete_user_permission($thrash1, $thrash2, $other, $returnType)
{ {
global $config; global $config;
@ -17105,8 +17071,6 @@ function api_set_delete_user_permission($thrash1, $thrash2, $other, $returnType)
* *
* @return void * @return void
*/ */
function api_set_add_permission_user_to_group($thrash1, $thrash2, $other, $returnType) function api_set_add_permission_user_to_group($thrash1, $thrash2, $other, $returnType)
{ {
global $config; global $config;

4
pandora_console/include/functions_html.php
View File

@ -183,8 +183,6 @@ function html_f2str($function, $params)
* *
* @return string HTML code if return parameter is true. * @return string HTML code if return parameter is true.
*/ */
function html_print_side_layer($params) function html_print_side_layer($params)
{ {
global $config; global $config;
@ -4592,8 +4590,6 @@ function html_print_checkbox_switch_extended(
* *
* @return string HTML code if return parameter is true. * @return string HTML code if return parameter is true.
*/ */
function html_print_checkbox_switch($name, $value, $checked=false, $return=false, $disabled=false, $script='', $disabled_hidden=false, $class='') function html_print_checkbox_switch($name, $value, $checked=false, $return=false, $disabled=false, $script='', $disabled_hidden=false, $class='')
{ {
$output = html_print_checkbox_switch_extended($name, $value, (bool) $checked, $disabled, $script, '', true, '', $class); $output = html_print_checkbox_switch_extended($name, $value, (bool) $checked, $disabled, $script, '', true, '', $class);

1
pandora_console/include/rest-api/models/VisualConsole/View.php
View File

@ -637,6 +637,7 @@ class View extends \HTML
* Returns a popup for networkLink viewer. * Returns a popup for networkLink viewer.
* *
* @return void * @return void
*
* phpcs:disable Squiz.Commenting.FunctionCommentThrowTag.Missing * phpcs:disable Squiz.Commenting.FunctionCommentThrowTag.Missing
*/ */
public function networkLinkPopup() public function networkLinkPopup()

2
pandora_console/install.php
View File

@ -131,7 +131,7 @@
<div style='padding-bottom: 50px'> <div style='padding-bottom: 50px'>
<?php <?php
$version = '7.0NG.775'; $version = '7.0NG.775';
$build = '240125'; $build = '240126';
$banner = "v$version Build $build"; $banner = "v$version Build $build";
error_reporting(0); error_reporting(0);

2
pandora_console/pandora_console.redhat.spec
View File

@ -6,7 +6,7 @@
%define debug_package %{nil} %define debug_package %{nil}
%define name pandorafms_console %define name pandorafms_console
%define version 7.0NG.775 %define version 7.0NG.775
%define release 240125 %define release 240126
# User and Group under which Apache is running # User and Group under which Apache is running
%define httpd_name httpd %define httpd_name httpd

2
pandora_console/pandora_console.rhel7.spec
View File

@ -6,7 +6,7 @@
%define debug_package %{nil} %define debug_package %{nil}
%define name pandorafms_console %define name pandorafms_console
%define version 7.0NG.775 %define version 7.0NG.775
%define release 240125 %define release 240126
# User and Group under which Apache is running # User and Group under which Apache is running
%define httpd_name httpd %define httpd_name httpd

2
pandora_console/pandora_console.spec
View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_console %define name pandorafms_console
%define version 7.0NG.775 %define version 7.0NG.775
%define release 240125 %define release 240126
%define httpd_name httpd %define httpd_name httpd
# User and Group under which Apache is running # User and Group under which Apache is running
%define httpd_name apache2 %define httpd_name apache2

46
pandora_console/pandoradb.sql
View File

@ -4556,7 +4556,6 @@ PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4; ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
-- --------------------------------------------------------------------- -- ---------------------------------------------------------------------
-- Table `tdemo_data` -- Table `tdemo_data`
-- --------------------------------------------------------------------- -- ---------------------------------------------------------------------
CREATE TABLE IF NOT EXISTS `tdemo_data` ( CREATE TABLE IF NOT EXISTS `tdemo_data` (
@ -4566,6 +4565,7 @@ CREATE TABLE IF NOT EXISTS `tdemo_data` (
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4; ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
-- ---------------------------------------------------------------------
-- Table `tpandora_cve` -- Table `tpandora_cve`
-- --------------------------------------------------------------------- -- ---------------------------------------------------------------------
CREATE TABLE IF NOT EXISTS `tpandora_cve` ( CREATE TABLE IF NOT EXISTS `tpandora_cve` (
@ -4597,7 +4597,6 @@ CREATE TABLE IF NOT EXISTS `tfiles_repo_group` (
FOREIGN KEY (`id_file`) REFERENCES tfiles_repo(`id`) ON DELETE CASCADE FOREIGN KEY (`id_file`) REFERENCES tfiles_repo(`id`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8; ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- ----------------------------------------------------- -- -----------------------------------------------------
-- Table `tmodule_synth` -- Table `tmodule_synth`
-- ----------------------------------------------------- -- -----------------------------------------------------
@ -4612,3 +4611,46 @@ CREATE TABLE IF NOT EXISTS `tpolicy_modules_synth` (
ON DELETE CASCADE ON UPDATE CASCADE, ON DELETE CASCADE ON UPDATE CASCADE,
PRIMARY KEY (id) PRIMARY KEY (id)
) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4; ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
-- -----------------------------------------------------
-- Table `tmerge_error`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `tmerge_error` (
`id` int(10) NOT NULL auto_increment,
`id_node` int(10) default 0,
`phase` int(10) default 0,
`step` int(10) default 0,
`msg` LONGTEXT default "",
`action` text default "",
`utimestamp` int(20) unsigned NOT NULL default 0,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
-- ---------------------------------------------------------------------
-- Table `tmerge_steps`
-- ---------------------------------------------------------------------
CREATE TABLE IF NOT EXISTS `tmerge_steps` (
`id` int(10) NOT NULL auto_increment,
`id_node` int(10) default 0,
`phase` int(10) default 0,
`total` int(10) default 0,
`step` int(10) default 0,
`debug` varchar(1024) default "",
`action` varchar(100) default "",
`affected` varchar(100) default "",
`query` mediumtext default "",
`utimestamp` int(20) unsigned NOT NULL default 0,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
-- ---------------------------------------------------------------------
-- Table `tmerge_queries`
-- ---------------------------------------------------------------------
CREATE TABLE IF NOT EXISTS `tmerge_queries` (
`steps` int(10) NOT NULL auto_increment,
`action` varchar(100) default "",
`affected` varchar(100) default "",
`utimestamp` int(20) unsigned NOT NULL default 0,
`query` LONGTEXT NOT NULL default "",
PRIMARY KEY (`steps`)
) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;

11
pandora_console/update_manager_client/resources/images/info-warning.svg Normal file
View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 61.2 (89653) - https://sketch.com -->
<title>Dark / 14 / info@svg</title>
<desc>Created with Sketch.</desc>
<g id="Dark-/-14-/-info" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="Icons/Elements/Help-mini" fill="#f3b200">
<path d="M7,0 C10.8659932,0 14,3.13400675 14,7 C14,10.8659932 10.8659932,14 7,14 C3.13400675,14 0,10.8659932 0,7 C0,3.13400675 3.13400675,0 7,0 Z M7,6 C6.44771525,6 6,6.44771525 6,7 L6,7 L6,10 C6,10.5522847 6.44771525,11 7,11 C7.55228475,11 8,10.5522847 8,10 L8,10 L8,7 C8,6.44771525 7.55228475,6 7,6 Z M7,3 C6.44771525,3 6,3.44771525 6,4 C6,4.55228475 6.44771525,5 7,5 C7.55228475,5 8,4.55228475 8,4 C8,3.44771525 7.55228475,3 7,3 Z" id="Elements-/-Help-mini"></path>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 959 B

11
pandora_console/update_manager_client/resources/javascript/umc_offline.js
View File

@ -428,11 +428,14 @@ function install_package(url, auth, packageId, version, serverUpdate) {
var response = d.result; var response = d.result;
document.getElementById("log_zone").innerText = response.result; document.getElementById("log_zone").innerText = response.result;
$("#input-progress") if (response.error == undefined || response.error == "") {
.val(100) $("#input-progress")
.change(); .val(100)
.change();
$("#result li").removeClass("error");
}
$("#result li").removeClass("error");
$("#result li") $("#result li")
.find("p") .find("p")
.text(response.result); .text(response.result);

2
pandora_console/update_manager_client/resources/styles/um.css
View File

@ -438,7 +438,7 @@ div#upload span.browse {
span.warning { span.warning {
min-width: 10em; min-width: 10em;
min-height: 10em; min-height: 10em;
background: url(../images/icono_warning.png); background: url(../images/info-warning.svg);
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
background-size: 80%; background-size: 80%;

2
pandora_server/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-server package: pandorafms-server
Version: 7.0NG.775-240125 Version: 7.0NG.775-240126
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

2
pandora_server/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
pandora_version="7.0NG.775-240125" pandora_version="7.0NG.775-240126"
package_cpan=0 package_cpan=0
package_pandora=1 package_pandora=1

2
pandora_server/lib/PandoraFMS/Config.pm
View File

@ -46,7 +46,7 @@ our @EXPORT = qw(
# version: Defines actual version of Pandora Server for this module only # version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.775"; my $pandora_version = "7.0NG.775";
my $pandora_build = "240125"; my $pandora_build = "240126";
our $VERSION = $pandora_version." ".$pandora_build; our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash # Setup hash

2
pandora_server/lib/PandoraFMS/PluginTools.pm
View File

@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
# version: Defines actual version of Pandora Server for this module only # version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.775"; my $pandora_version = "7.0NG.775";
my $pandora_build = "240125"; my $pandora_build = "240126";
our $VERSION = $pandora_version." ".$pandora_build; our $VERSION = $pandora_version." ".$pandora_build;
our %EXPORT_TAGS = ( 'all' => [ qw() ] ); our %EXPORT_TAGS = ( 'all' => [ qw() ] );

2
pandora_server/pandora_server.redhat.spec
View File

@ -7,7 +7,7 @@
%define debug_package %{nil} %define debug_package %{nil}
%define name pandorafms_server %define name pandorafms_server
%define version 7.0NG.775 %define version 7.0NG.775
%define release 240125 %define release 240126
Summary: Pandora FMS Server Summary: Pandora FMS Server
Name: %{name} Name: %{name}

2
pandora_server/pandora_server.spec
View File

@ -4,7 +4,7 @@
%global __os_install_post %{nil} %global __os_install_post %{nil}
%define name pandorafms_server %define name pandorafms_server
%define version 7.0NG.775 %define version 7.0NG.775
%define release 240125 %define release 240126
Summary: Pandora FMS Server Summary: Pandora FMS Server
Name: %{name} Name: %{name}

2
pandora_server/pandora_server_installer
View File

@ -9,7 +9,7 @@
# ********************************************************************** # **********************************************************************
PI_VERSION="7.0NG.775" PI_VERSION="7.0NG.775"
PI_BUILD="240125" PI_BUILD="240126"
MODE=$1 MODE=$1
if [ $# -gt 1 ]; then if [ $# -gt 1 ]; then

2
pandora_server/util/pandora_db.pl
View File

@ -38,7 +38,7 @@ use PandoraFMS::Config;
use PandoraFMS::DB; use PandoraFMS::DB;
# version: define current version # version: define current version
my $version = "7.0NG.775 Build 240125"; my $version = "7.0NG.775 Build 240126";
# Pandora server configuration # Pandora server configuration
my %conf; my %conf;

2
pandora_server/util/pandora_manage.pl
View File

@ -36,7 +36,7 @@ use Encode::Locale;
Encode::Locale::decode_argv; Encode::Locale::decode_argv;
# version: define current version # version: define current version
my $version = "7.0NG.775 Build 240125"; my $version = "7.0NG.775 Build 240126";
# save program name for logging # save program name for logging
my $progname = basename($0); my $progname = basename($0);