From 04a45e84a87cccf2e47fcd975efbfc68c5cbff09 Mon Sep 17 00:00:00 2001 From: miguel angel rasteu Date: Wed, 19 Jul 2023 12:50:39 +0200 Subject: [PATCH 1/8] #11547 Show a different 'about' depending on whether the user is admin --- pandora_console/include/functions_menu.php | 441 +++++++++++---------- 1 file changed, 223 insertions(+), 218 deletions(-) diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php index ff18544586..1912bd1190 100644 --- a/pandora_console/include/functions_menu.php +++ b/pandora_console/include/functions_menu.php @@ -950,11 +950,14 @@ if (is_ajax()) { $dialog = ' -
- - - - - - - - - - - - - - - - - + '; + if ($config['is_admin']['admin'] === true) { + $dialog .= '
+
-

- '.__('Database health status').'

-
-

'.$db_health->data->unknownAgents->name.'

- 		-

'.$db_health->data->unknownAgents->value.'

-
-

'.$db_health->data->notInitAgents->name.'

- 		-

'.$db_health->data->notInitAgents->value.'

-
-

'.$db_health->data->pandoraDbLastRun->name.'

- 		-

'.$db_health->data->pandoraDbLastRun->value.'

-
+ + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - -
+

- '.__('Database health status').'

+
+

'.$db_health->data->unknownAgents->name.'

+ 		+

'.$db_health->data->unknownAgents->value.'

+
+

'.$db_health->data->notInitAgents->name.'

+ 		+

'.$db_health->data->notInitAgents->value.'

+
+

'.$db_health->data->pandoraDbLastRun->name.'

+ 		+

'.$db_health->data->pandoraDbLastRun->value.'

+
-

- '.__('Database status info').'

-
-

'.$db_info->data->dbSchemeFirstVersion->name.'

- 		-

'.$db_info->data->dbSchemeFirstVersion->value.'

-
-

'.$db_info->data->dbSchemeVersion->name.'

- 		-

'.$db_info->data->dbSchemeVersion->value.'

-
-

'.$db_info->data->dbSchemeBuild->name.'

- 		-

'.$db_info->data->dbSchemeBuild->value.'

-
-

'.$db_info->data->dbSize->name.'

- 		-

'.$db_info->data->dbSize->value.'

-
+

- '.__('Database status info').'

+
+

'.$db_info->data->dbSchemeFirstVersion->name.'

+ 		+

'.$db_info->data->dbSchemeFirstVersion->value.'

+
+

'.$db_info->data->dbSchemeVersion->name.'

+ 		+

'.$db_info->data->dbSchemeVersion->value.'

+
+

'.$db_info->data->dbSchemeBuild->name.'

+ 		+

'.$db_info->data->dbSchemeBuild->value.'

+
+

'.$db_info->data->dbSize->name.'

+ 		+

'.$db_info->data->dbSize->value.'

+
-

- '.__('Tables fragmentation in the %s database', $product_name).'

-
-

'.$db_fragmentation->data->tablesFragmentationMax->name.'

- 		-

'.$db_fragmentation->data->tablesFragmentationMax->value.'

-
-

'.$db_fragmentation->data->tablesFragmentationValue->name.'

- 		-

'.$db_fragmentation->data->tablesFragmentationValue->value.'

-
-

'.$db_fragmentation->data->tablesFragmentationStatus->name.'

- 		-

'.$fragmentation_status.'

-
+ + +

- '.__('Tables fragmentation in the %s database', $product_name).'

+ + + + +

'.$db_fragmentation->data->tablesFragmentationMax->name.'

+ + +

'.$db_fragmentation->data->tablesFragmentationMax->value.'

+ + + + +

'.$db_fragmentation->data->tablesFragmentationValue->name.'

+ + +

'.$db_fragmentation->data->tablesFragmentationValue->value.'

+ + + + +

'.$db_fragmentation->data->tablesFragmentationStatus->name.'

+ + +

'.$fragmentation_status.'

+ + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

- '.__('System Info').'

+
+

'.$sys_info->data->cpuInfo->name.'

+ 		+

'.$sys_info->data->cpuInfo->value.'

+
+

'.$sys_info->data->ramInfo->name.'

+ 		+

'.$sys_info->data->ramInfo->value.'

+
+

'.$sys_info->data->osInfo->name.'

+ 		+

'.$sys_info->data->osInfo->value.'

+
+

'.$sys_info->data->hostnameInfo->name.'

+ 		+

'.$sys_info->data->hostnameInfo->value.'

+
+

'.$sys_info->data->ipInfo->name.'

+ 		+

'.$sys_info->data->ipInfo->value.'

+
+

'.$system_date->data->date->name.'

+ 		+

'.$system_date->data->date->value.'

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+

- '.__('PHP system').'

+
+

'.$php_sys->data->phpVersion->name.'

+ 		+

'.$php_sys->data->phpVersion->value.'

+
+

'.$php_sys->data->maxExecutionTime->name.'

+ 		+

'.$php_sys->data->maxExecutionTime->value.'

+
+

'.$php_sys->data->maxInputTime->name.'

+ 		+

'.$php_sys->data->maxInputTime->value.'

+
+

'.$php_sys->data->memoryLimit->name.'

+ 		+

'.$php_sys->data->memoryLimit->value.'

+
+

'.$php_sys->data->sessionLifetime->name.'

+ 		+

'.$php_sys->data->sessionLifetime->value.'

+
+
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

- '.__('System Info').'

-
-

'.$sys_info->data->cpuInfo->name.'

- 		-

'.$sys_info->data->cpuInfo->value.'

-
-

'.$sys_info->data->ramInfo->name.'

- 		-

'.$sys_info->data->ramInfo->value.'

-
-

'.$sys_info->data->osInfo->name.'

- 		-

'.$sys_info->data->osInfo->value.'

-
-

'.$sys_info->data->hostnameInfo->name.'

- 		-

'.$sys_info->data->hostnameInfo->value.'

-
-

'.$sys_info->data->ipInfo->name.'

- 		-

'.$sys_info->data->ipInfo->value.'

-
-

'.$system_date->data->date->name.'

- 		-

'.$system_date->data->date->value.'

-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - -
-

- '.__('PHP system').'

-
-

'.$php_sys->data->phpVersion->name.'

- 		-

'.$php_sys->data->phpVersion->value.'

-
-

'.$php_sys->data->maxExecutionTime->name.'

- 		-

'.$php_sys->data->maxExecutionTime->value.'

-
-

'.$php_sys->data->maxInputTime->name.'

- 		-

'.$php_sys->data->maxInputTime->value.'

-
-

'.$php_sys->data->memoryLimit->name.'

- 		-

'.$php_sys->data->memoryLimit->value.'

-
-

'.$php_sys->data->sessionLifetime->name.'

- 		-

'.$php_sys->data->sessionLifetime->value.'

-
-
- - '; + '; + } echo $dialog; } From 72bd992a982e9c71142be8cd126841c2d2d7e02c Mon Sep 17 00:00:00 2001 From: Ramon Novoa Date: Tue, 22 Aug 2023 17:17:34 +0200 Subject: [PATCH 2/8] Add pandora_sca.exe to the repo. Ref. pandora_enterprise#11324. --- pandora_agents/win32/bin/util/pandora_sca.exe | 3 +++ 1 file changed, 3 insertions(+) create mode 100755 pandora_agents/win32/bin/util/pandora_sca.exe diff --git a/pandora_agents/win32/bin/util/pandora_sca.exe b/pandora_agents/win32/bin/util/pandora_sca.exe new file mode 100755 index 0000000000..be447566e1 --- /dev/null +++ b/pandora_agents/win32/bin/util/pandora_sca.exe @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d93bd9d56c938063045fa2093198d324746f84df2b74567648f3baebd635657 +size 5248006 From 1b4212ee532b4f3c7e728e4a4fdf92041dd8690b Mon Sep 17 00:00:00 2001 From: Ramon Novoa Date: Tue, 22 Aug 2023 18:03:44 +0200 Subject: [PATCH 3/8] Add the security compliance plug-in to pandora_agent.conf. --- pandora_agents/win32/bin/pandora_agent.conf | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pandora_agents/win32/bin/pandora_agent.conf b/pandora_agents/win32/bin/pandora_agent.conf index 1a44a8048e..4f77777f08 100644 --- a/pandora_agents/win32/bin/pandora_agent.conf +++ b/pandora_agents/win32/bin/pandora_agent.conf @@ -522,4 +522,11 @@ module_plugin "%PROGRAMFILES%\Pandora_Agent\util\autodiscover.exe" --default #module_type generic_data_string #module_exec echo Bordón #module_native_encoding OEM -#module_end \ No newline at end of file +#module_end + +# Hardening plugin for security compliance analysis. +#module_begin +#module_plugin "%PROGRAMFILES%\Pandora_Agent\util\pandora_sca.exe" +#module_absoluteinterval 7d +#module_end + From 3a39670faf93c45c547838d13d72ab8d966d0925 Mon Sep 17 00:00:00 2001 From: miguel angel rasteu Date: Wed, 23 Aug 2023 10:08:45 +0200 Subject: [PATCH 4/8] #11547 fix profile admin --- pandora_console/include/functions_menu.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php index d250643cde..614c0df43e 100644 --- a/pandora_console/include/functions_menu.php +++ b/pandora_console/include/functions_menu.php @@ -951,7 +951,7 @@ if (is_ajax()) { '; - if ($config['is_admin']['admin'] === true) { + if ((bool) check_acl($config['id_user'], 0, 'PM') === true || $config['is_admin']['admin'] === true) { $dialog .= '
From 120298e6a3ecdd25af0923d33059e64d048f7aba Mon Sep 17 00:00:00 2001 From: Pablo Aragon Date: Wed, 23 Aug 2023 14:00:35 +0200 Subject: [PATCH 5/8] 11930-Remove in pandora_db.pl integrity & functions_agents.php --- pandora_console/include/functions_agents.php | 28 --------------- pandora_server/util/pandora_db.pl | 37 -------------------- 2 files changed, 65 deletions(-) diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php index bb5b19a27e..3009671216 100644 --- a/pandora_console/include/functions_agents.php +++ b/pandora_console/include/functions_agents.php @@ -2766,13 +2766,6 @@ function agents_delete_agent($id_agents, $disableACL=false) ['id_agent' => $id_agent] ); - // Delete agent from visual dashboards. - db_process_sql( - 'UPDATE twidget_dashboard - SET options = NULL - WHERE options LIKE ("%\"agentid\":\"'.$id_agent.'\"%")' - ); - // Delete agent from treport. db_process_sql_delete( 'treport_content', @@ -2796,33 +2789,12 @@ function agents_delete_agent($id_agents, $disableACL=false) ] ); - // Delete from gis maps history - db_process_sql_delete( - 'tgis_data_history', - ['tagente_id_agente' => $id_agent] - ); - // Delete from policies. db_process_sql_delete( 'tpolicy_agents', ['id_agent' => $id_agent] ); - // Delete from tnetwork maps - db_process_sql_delete( - 'titem', - ['source_data' => $id_agent] - ); - - db_process_sql_delete( - 'trel_item', - [ - 'id_parent_source_data' => $id_agent, - 'id_child_source_data' => $id_agent, - ], - 'OR' - ); - // Delete agent from fav menu. db_process_sql_delete( 'tfavmenu_user', diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index d6ef5c4334..ce476d7154 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -772,47 +772,10 @@ sub pandora_checkdb_integrity { db_do ($dbh, 'DELETE FROM tlayout_data WHERE id_agent <> 0 AND id_agent NOT IN (SELECT id_agente FROM tagente)'); db_do ($dbh, 'DELETE FROM tlayout_data WHERE id_agente_modulo <> 0 AND id_agente_modulo NOT IN (SELECT id_agente_modulo FROM tagente_modulo)'); - # Delete orphan data form deleted agents. - # Clearl orphan data from dashboards - log_message ('INTEGRITY', "Deleting orphan dahsboard items."); - my @agents_ids = get_db_rows($dbh, 'SELECT id_agente FROM tagente'); - my $where_condition; - foreach my $agent_id (@agents_ids) { - $where_condition .= 'options NOT LIKE ("%\\"agentid\\":\\"'.$agent_id->{'id_agente'}.'\\"%")'; - if($agent_id == $agents_ids[-1]) { - last; - } - $where_condition .= ' AND '; - } - - db_do ($dbh, 'UPDATE twidget_dashboard set options = NULL WHERE '.$where_condition); - - $where_condition = ''; - my @modules = get_db_rows($dbh, 'SELECT id_agente_modulo FROM tagente_modulo'); - foreach my $id_agente_modulo (@modules) { - $where_condition .= 'options NOT LIKE ("%\\"moduleId\\":\\"'.$id_agente_modulo->{'id_agente_modulo'}.'\\"%")'; - if($id_agente_modulo == $modules[-1]) { - last; - } - $where_condition .= ' AND '; - } - - db_do ($dbh, 'UPDATE twidget_dashboard set options = NULL WHERE '.$where_condition); - # Delete orphan data from favorite agents log_message ('INTEGRITY', "Deleting orphan favories items."); db_do ($dbh, 'DELETE FROM tfavmenu_user WHERE section = "Agents" AND id_element NOT IN (SELECT id_agente FROM tagente)'); - # Delete orphan data from gis maps - log_message ('INTEGRITY', "Deleting orphan GIS data."); - db_do ($dbh, 'DELETE FROM tgis_data_history WHERE tagente_id_agente NOT IN (SELECT id_agente FROM tagente)'); - - # Delete orphan tnetwork maps data - log_message ('INTEGRITY', "Deleting orphan networkmaps data."); - db_do ($dbh, 'DELETE FROM titem WHERE source_data NOT IN (SELECT id_agente FROM tagente)'); - db_do ($dbh, 'DELETE FROM trel_item WHERE id_parent_source_data NOT IN (SELECT id_agente FROM tagente) OR id_child_source_data NOT IN (SELECT id_agente FROM tagente)'); - - # Check enterprise tables enterprise_hook ('pandora_checkdb_integrity_enterprise', [$conf, $dbh]); } From 45c15acf8e39ec1afbee99d5ec775f48337cad3e Mon Sep 17 00:00:00 2001 From: Pablo Aragon Date: Wed, 23 Aug 2023 14:46:55 +0200 Subject: [PATCH 6/8] 11930-Remove in pandora_db.pl integrity & functions_agents.php --- pandora_console/include/functions_agents.php | 45 -------------------- pandora_server/util/pandora_db.pl | 9 ---- 2 files changed, 54 deletions(-) diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php index 3009671216..a199fa2b6b 100644 --- a/pandora_console/include/functions_agents.php +++ b/pandora_console/include/functions_agents.php @@ -2760,51 +2760,6 @@ function agents_delete_agent($id_agents, $disableACL=false) enterprise_include_once('include/functions_agents.php'); enterprise_hook('agent_delete_from_cache', [$id_agent]); - // Delete agent from visual console. - db_process_sql_delete( - 'tlayout_data', - ['id_agent' => $id_agent] - ); - - // Delete agent from treport. - db_process_sql_delete( - 'treport_content', - ['id_agent' => $id_agent] - ); - - // Delete rules from tevent alerts (correlative alerts) - db_process_sql_delete( - 'tevent_rule', - [ - 'agent' => $id_agent, - 'operator_agent' => '==', - ] - ); - - db_process_sql_delete( - 'tevent_rule', - [ - 'log_agent' => $id_agent, - 'operator_log_agent' => '==', - ] - ); - - // Delete from policies. - db_process_sql_delete( - 'tpolicy_agents', - ['id_agent' => $id_agent] - ); - - // Delete agent from fav menu. - db_process_sql_delete( - 'tfavmenu_user', - [ - 'id_element' => $id_agent, - 'section' => 'Agents', - 'id_user' => $config['id_user'], - ] - ); - // Break the loop on error. if ((bool) $error === true) { break; diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index ce476d7154..5567ab5227 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -767,15 +767,6 @@ sub pandora_checkdb_integrity { # Delete orphan data_inc reference records db_do ($dbh, 'DELETE FROM tagente_datos_inc WHERE id_agente_modulo NOT IN (SELECT id_agente_modulo FROM tagente_modulo)'); - # Delete orphan data from visual console. - log_message ('INTEGRITY', "Deleting orphan visual console items."); - db_do ($dbh, 'DELETE FROM tlayout_data WHERE id_agent <> 0 AND id_agent NOT IN (SELECT id_agente FROM tagente)'); - db_do ($dbh, 'DELETE FROM tlayout_data WHERE id_agente_modulo <> 0 AND id_agente_modulo NOT IN (SELECT id_agente_modulo FROM tagente_modulo)'); - - # Delete orphan data from favorite agents - log_message ('INTEGRITY', "Deleting orphan favories items."); - db_do ($dbh, 'DELETE FROM tfavmenu_user WHERE section = "Agents" AND id_element NOT IN (SELECT id_agente FROM tagente)'); - # Check enterprise tables enterprise_hook ('pandora_checkdb_integrity_enterprise', [$conf, $dbh]); } From 4830cf21e67a948843cc5c5af748d950669599ea Mon Sep 17 00:00:00 2001 From: artica Date: Wed, 23 Aug 2023 15:49:36 +0200 Subject: [PATCH 7/8] Updated version and build strings. --- pandora_agents/pc/AIX/pandora_agent.conf | 2 +- pandora_agents/pc/FreeBSD/pandora_agent.conf | 2 +- pandora_agents/pc/HP-UX/pandora_agent.conf | 2 +- pandora_agents/pc/Linux/pandora_agent.conf | 2 +- pandora_agents/pc/NT4/pandora_agent.conf | 2 +- pandora_agents/pc/SunOS/pandora_agent.conf | 2 +- pandora_agents/pc/Win32/pandora_agent.conf | 2 +- pandora_agents/shellscript/aix/pandora_agent.conf | 2 +- pandora_agents/shellscript/bsd-ipso/pandora_agent.conf | 2 +- pandora_agents/shellscript/hp-ux/pandora_agent.conf | 2 +- pandora_agents/shellscript/linux/pandora_agent.conf | 2 +- pandora_agents/shellscript/mac_osx/pandora_agent.conf | 2 +- pandora_agents/shellscript/openWRT/pandora_agent.conf | 2 +- pandora_agents/shellscript/solaris/pandora_agent.conf | 2 +- pandora_agents/unix/AIX/pandora_agent.conf | 2 +- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/Darwin/dmg/build_darwin_dmg.sh | 2 +- pandora_agents/unix/Darwin/dmg/extras/distribution.xml | 4 ++-- .../PandoraFMS agent uninstaller.app/Contents/Info.plist | 6 +++--- pandora_agents/unix/Darwin/pandora_agent.conf | 2 +- pandora_agents/unix/FreeBSD/pandora_agent.conf | 2 +- pandora_agents/unix/HP-UX/pandora_agent.conf | 2 +- pandora_agents/unix/Linux/pandora_agent.conf | 2 +- pandora_agents/unix/NT4/pandora_agent.conf | 2 +- pandora_agents/unix/NetBSD/pandora_agent.conf | 2 +- pandora_agents/unix/SunOS/pandora_agent.conf | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 4 ++-- pandora_agents/unix/pandora_agent.spec | 4 ++-- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/bin/pandora_agent.conf | 2 +- pandora_agents/win32/installer/pandora.mpi | 4 ++-- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 4 ++-- pandora_console/pandora_console.rhel7.spec | 4 ++-- pandora_console/pandora_console.spec | 4 ++-- pandora_console/pandora_console_install | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/conf/pandora_server.conf.new | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.spec | 4 ++-- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 52 files changed, 62 insertions(+), 62 deletions(-) diff --git a/pandora_agents/pc/AIX/pandora_agent.conf b/pandora_agents/pc/AIX/pandora_agent.conf index bf46603c0f..3a2a1bfbf0 100644 --- a/pandora_agents/pc/AIX/pandora_agent.conf +++ b/pandora_agents/pc/AIX/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.773.1, AIX version +# Version 7.0NG.773.2, AIX version # Licensed under GPL license v2, # Copyright (c) 2003-2023 Pandora FMS # http://www.pandorafms.com diff --git a/pandora_agents/pc/FreeBSD/pandora_agent.conf b/pandora_agents/pc/FreeBSD/pandora_agent.conf index 77a602713c..ec35083cd3 100644 --- a/pandora_agents/pc/FreeBSD/pandora_agent.conf +++ b/pandora_agents/pc/FreeBSD/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.773.1, FreeBSD Version +# Version 7.0NG.773.2, FreeBSD Version # Licensed under GPL license v2, # Copyright (c) 2003-2023 Pandora FMS # http://www.pandorafms.com diff --git a/pandora_agents/pc/HP-UX/pandora_agent.conf b/pandora_agents/pc/HP-UX/pandora_agent.conf index 1b54a696d3..2e88f0f376 100644 --- a/pandora_agents/pc/HP-UX/pandora_agent.conf +++ b/pandora_agents/pc/HP-UX/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.773.1, HP-UX Version +# Version 7.0NG.773.2, HP-UX Version # Licensed under GPL license v2, # Copyright (c) 2003-2023 Pandora FMS # http://www.pandorafms.com diff --git a/pandora_agents/pc/Linux/pandora_agent.conf b/pandora_agents/pc/Linux/pandora_agent.conf index 6fc3a3e48e..2a5b0d24b4 100644 --- a/pandora_agents/pc/Linux/pandora_agent.conf +++ b/pandora_agents/pc/Linux/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.773.1, GNU/Linux +# Version 7.0NG.773.2, GNU/Linux # Licensed under GPL license v2, # Copyright (c) 2003-2023 Pandora FMS # http://www.pandorafms.com diff --git a/pandora_agents/pc/NT4/pandora_agent.conf b/pandora_agents/pc/NT4/pandora_agent.conf index c68ae6f7ea..07bb852d55 100644 --- a/pandora_agents/pc/NT4/pandora_agent.conf +++ b/pandora_agents/pc/NT4/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.773.1, GNU/Linux +# Version 7.0NG.773.2, GNU/Linux # Licensed under GPL license v2, # Copyright (c) 2003-2023 Pandora FMS # http://www.pandorafms.com diff --git a/pandora_agents/pc/SunOS/pandora_agent.conf b/pandora_agents/pc/SunOS/pandora_agent.conf index 60ecdf748a..bfdf81ba25 100644 --- a/pandora_agents/pc/SunOS/pandora_agent.conf +++ b/pandora_agents/pc/SunOS/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.773.1, Solaris Version +# Version 7.0NG.773.2, Solaris Version # Licensed under GPL license v2, # Copyright (c) 2003-2023 Pandora FMS # http://www.pandorafms.com diff --git a/pandora_agents/pc/Win32/pandora_agent.conf b/pandora_agents/pc/Win32/pandora_agent.conf index 49f55782b6..bb90bbc54c 100644 --- a/pandora_agents/pc/Win32/pandora_agent.conf +++ b/pandora_agents/pc/Win32/pandora_agent.conf @@ -1,6 +1,6 @@ # Base config file for Pandora FMS Windows Agent # (c) 2006-2023 Pandora FMS -# Version 7.0NG.773.1 +# Version 7.0NG.773.2 # This program is Free Software, you can redistribute it and/or modify it # under the terms of the GNU General Public Licence as published by the Free Software # Foundation; either version 2 of the Licence or any later version diff --git a/pandora_agents/shellscript/aix/pandora_agent.conf b/pandora_agents/shellscript/aix/pandora_agent.conf index a3ec6a1081..cfd3ad7755 100644 --- a/pandora_agents/shellscript/aix/pandora_agent.conf +++ b/pandora_agents/shellscript/aix/pandora_agent.conf @@ -1,6 +1,6 @@ # Fichero de configuracion base de agentes de Pandora # Base config file for Pandora agents -# Version 7.0NG.773.1, AIX version +# Version 7.0NG.773.2, AIX version # General Parameters # ================== diff --git a/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf b/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf index 49a1e220aa..28f89ae7af 100644 --- a/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf +++ b/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf @@ -1,6 +1,6 @@ # Fichero de configuracion base de agentes de Pandora # Base config file for Pandora agents -# Version 7.0NG.773.1 +# Version 7.0NG.773.2 # FreeBSD/IPSO version # Licenced under GPL licence, 2003-2007 Sancho Lerena diff --git a/pandora_agents/shellscript/hp-ux/pandora_agent.conf b/pandora_agents/shellscript/hp-ux/pandora_agent.conf index 3a75628bd3..9576e28cbe 100644 --- a/pandora_agents/shellscript/hp-ux/pandora_agent.conf +++ b/pandora_agents/shellscript/hp-ux/pandora_agent.conf @@ -1,6 +1,6 @@ # Fichero de configuracion base de agentes de Pandora # Base config file for Pandora agents -# Version 7.0NG.773.1, HPUX Version +# Version 7.0NG.773.2, HPUX Version # General Parameters # ================== diff --git a/pandora_agents/shellscript/linux/pandora_agent.conf b/pandora_agents/shellscript/linux/pandora_agent.conf index ed1af5662f..911eedebc7 100644 --- a/pandora_agents/shellscript/linux/pandora_agent.conf +++ b/pandora_agents/shellscript/linux/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.773.1 +# Version 7.0NG.773.2 # Licensed under GPL license v2, # (c) 2003-2023 Pandora FMS # please visit http://pandora.sourceforge.net diff --git a/pandora_agents/shellscript/mac_osx/pandora_agent.conf b/pandora_agents/shellscript/mac_osx/pandora_agent.conf index 89fdf1325d..9b265e9adf 100644 --- a/pandora_agents/shellscript/mac_osx/pandora_agent.conf +++ b/pandora_agents/shellscript/mac_osx/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.773.1 +# Version 7.0NG.773.2 # Licensed under GPL license v2, # (c) 2003-2023 Pandora FMS # please visit http://pandora.sourceforge.net diff --git a/pandora_agents/shellscript/openWRT/pandora_agent.conf b/pandora_agents/shellscript/openWRT/pandora_agent.conf index 14b40b0b0b..1d9ea69ef5 100644 --- a/pandora_agents/shellscript/openWRT/pandora_agent.conf +++ b/pandora_agents/shellscript/openWRT/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.773.1 +# Version 7.0NG.773.2 # Licensed under GPL license v2, # please visit http://pandora.sourceforge.net diff --git a/pandora_agents/shellscript/solaris/pandora_agent.conf b/pandora_agents/shellscript/solaris/pandora_agent.conf index d9e8f7f5a8..99069653a2 100644 --- a/pandora_agents/shellscript/solaris/pandora_agent.conf +++ b/pandora_agents/shellscript/solaris/pandora_agent.conf @@ -1,6 +1,6 @@ # Fichero de configuracion base de agentes de Pandora # Base config file for Pandora agents -# Version 7.0NG.773.1, Solaris version +# Version 7.0NG.773.2, Solaris version # General Parameters # ================== diff --git a/pandora_agents/unix/AIX/pandora_agent.conf b/pandora_agents/unix/AIX/pandora_agent.conf index ece393dd79..8af939a5e4 100644 --- a/pandora_agents/unix/AIX/pandora_agent.conf +++ b/pandora_agents/unix/AIX/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.773.1, AIX version +# Version 7.0NG.773.2, AIX version # Licensed under GPL license v2, # Copyright (c) 2003-2023 Pandora FMS # http://www.pandorafms.com diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 27b6eccfe0..6ecda6849e 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.1-230823 +Version: 7.0NG.773.2 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 4afa5d54b1..24dbd7bd2c 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.1-230823" +pandora_version="7.0NG.773.2" 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/Darwin/dmg/build_darwin_dmg.sh b/pandora_agents/unix/Darwin/dmg/build_darwin_dmg.sh index cac873c9ea..a498498938 100644 --- a/pandora_agents/unix/Darwin/dmg/build_darwin_dmg.sh +++ b/pandora_agents/unix/Darwin/dmg/build_darwin_dmg.sh @@ -31,7 +31,7 @@ fi if [ "$#" -ge 2 ]; then VERSION="$2" else - VERSION="7.0NG.773.1" + VERSION="7.0NG.773.2" fi # Path for the generated DMG file diff --git a/pandora_agents/unix/Darwin/dmg/extras/distribution.xml b/pandora_agents/unix/Darwin/dmg/extras/distribution.xml index 0b11dd8905..0ca54a29e6 100644 --- a/pandora_agents/unix/Darwin/dmg/extras/distribution.xml +++ b/pandora_agents/unix/Darwin/dmg/extras/distribution.xml @@ -19,11 +19,11 @@ - pandorafms_src.pdk + pandorafms_src.pdk - pandorafms_uninstall.pdk + pandorafms_uninstall.pdk