tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 

Conflicts:
	.gitlab-ci.yml
	pandora_console/pandoradb.sql
This commit is contained in:
fbsanchez 2022-02-15 17:32:10 +01:00
parent 4d912fbd34 d8d7e9e30f
commit 1da5534484
46 changed files with 56789 additions and 94102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_agents/unix/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-agent-unix
Version: 7.0NG.759-220211
Version: 7.0NG.759-220215
Architecture: all
Priority: optional
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
# GNU General Public License for more details.
pandora_version="7.0NG.759-220211"
pandora_version="7.0NG.759-220215"
echo "Test if you has the tools for to make the packages."
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

2
pandora_agents/unix/pandora_agent
View File

@ -1015,7 +1015,7 @@ my $Sem = undef;
my $ThreadSem = undef;
use constant AGENT_VERSION => '7.0NG.759';
use constant AGENT_BUILD => '220211';
use constant AGENT_BUILD => '220215';
# Agent log default file size maximum and instances
use constant DEFAULT_MAX_LOG_SIZE => 600000;

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

@ -3,7 +3,7 @@
#
%define name pandorafms_agent_unix
%define version 7.0NG.759
%define release 220211
%define release 220215
Summary: Pandora FMS Linux agent, PERL version
Name: %{name}

2
pandora_agents/unix/pandora_agent.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_agent_unix
%define version 7.0NG.759
%define release 220211
%define release 220215
Summary: Pandora FMS Linux agent, PERL version
Name: %{name}

2
pandora_agents/unix/pandora_agent_installer
View File

@ -10,7 +10,7 @@
# **********************************************************************
PI_VERSION="7.0NG.759"
PI_BUILD="220211"
PI_BUILD="220215"
OS_NAME=`uname -s`
FORCE=0

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

@ -186,7 +186,7 @@ UpgradeApplicationID
{}
Version
{220211}
{220215}
ViewReadme
{Yes}

2
pandora_agents/win32/pandora.cc
View File

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

2
pandora_agents/win32/versioninfo.rc
View File

@ -11,7 +11,7 @@ BEGIN
VALUE "LegalCopyright", "Artica ST"
VALUE "OriginalFilename", "PandoraAgent.exe"
VALUE "ProductName", "Pandora FMS Windows Agent"
VALUE "ProductVersion", "(7.0NG.759(Build 220211))"
VALUE "ProductVersion", "(7.0NG.759(Build 220215))"
VALUE "FileVersion", "1.0.0.0"
END
END

2
pandora_console/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-console
Version: 7.0NG.759-220211
Version: 7.0NG.759-220215
Architecture: all
Priority: optional
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
# GNU General Public License for more details.
pandora_version="7.0NG.759-220211"
pandora_version="7.0NG.759-220215"
package_pear=0
package_pandora=1

2
pandora_console/extensions/resource_registration.php
View File

@ -1120,7 +1120,7 @@ function resource_registration_extension_main()
}
echo '<div class=notify>';
echo __('This extension makes registering resource templates easier.').' '.__('Here you can upload a resource template in .ptr format.').' '.__('Please refer to our documentation for more information on how to obtain and use %s resources.', get_product_name()).' '.'<br> <br>'.__('You can get more resurces in our <a href="http://pandorafms.com/Library/Library/">Public Resource Library</a>');
echo __('This extension makes registering resource templates easier.').' '.__('Here you can upload a resource template in .ptr format.').' '.__('Please refer to our documentation for more information on how to obtain and use %s resources.', get_product_name()).' '.'<br> <br>'.__('You can get more resurces in our <a href="https://pandorafms.com/Library/Library/">Public Resource Library</a>');
echo '</div>';
echo '<br /><br />';

2
pandora_console/extras/mr/52.sql
View File

@ -14,4 +14,6 @@ SOURCE procedures/alertEvents.sql;
CALL `migrateEventRanges`();
DROP PROCEDURE `migrateEventRanges`;
ALTER TABLE `tautoconfig` ADD COLUMN `disabled` TINYINT DEFAULT 0;
COMMIT;

1
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
View File

@ -2187,6 +2187,7 @@ CREATE TABLE IF NOT EXISTS `tautoconfig` (
`name` varchar(100) NOT NULL,
`order` int(11) NOT NULL DEFAULT '0',
`description` text,
`disabled` TINYINT,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

4
pandora_console/godmode/agentes/module_manager.php
View File

@ -144,7 +144,7 @@ if ($prediction_available) {
$modules['predictionserver'] = __('Create a new prediction server module');
}
if (is_metaconsole() === true || $web_available === '1') {
if (is_metaconsole() === true || $web_available >= '1') {
$modules['webserver'] = __('Create a new web Server module');
}
@ -238,7 +238,7 @@ echo '</table>';
if (!$config['disable_help']) {
echo '<div class="disable_help">';
echo '<strong>';
echo "<a class='color-black-grey invert_filter' target='_blank' href='http://pandorafms.com/Library/Library/'>".__('Get more modules on Monitoring Library').'</a>';
echo "<a class='color-black-grey invert_filter' target='_blank' href='https://pandorafms.com/Library/Library/'>".__('Get more modules on Monitoring Library').'</a>';
echo '</strong>';
echo '</div>';
}

114
pandora_console/godmode/agentes/planned_downtime.editor.php
View File

@ -639,20 +639,20 @@ $table->data[5][1] = "
<tr><td>".ui_get_using_system_timezone_warning().'</td></tr>
<tr>
<td>'.__('Type Periodicity:').'&nbsp;'.html_print_select(
[
'weekly' => __('Weekly'),
'monthly' => __('Monthly'),
],
'type_periodicity',
$type_periodicity,
'change_type_periodicity();',
'',
0,
true,
false,
true,
'',
$disabled_in_execution
[
'weekly' => __('Weekly'),
'monthly' => __('Monthly'),
],
'type_periodicity',
$type_periodicity,
'change_type_periodicity();',
'',
0,
true,
false,
true,
'',
$disabled_in_execution
)."</td>
</tr>
<tr>
@ -672,31 +672,31 @@ $table->data[5][1] = "
<tr>
<td>".__('From day:').'</td>
<td>'.html_print_select(
$days,
'periodically_day_from',
$periodically_day_from,
'',
'',
0,
true,
false,
true,
'',
$disabled_in_execution
$days,
'periodically_day_from',
$periodically_day_from,
'',
'',
0,
true,
false,
true,
'',
$disabled_in_execution
).'</td>
<td>'.__('To day:').'</td>
<td>'.html_print_select(
$days,
'periodically_day_to',
$periodically_day_to,
'',
'',
0,
true,
false,
true,
'',
$disabled_in_execution
$days,
'periodically_day_to',
$periodically_day_to,
'',
'',
0,
true,
false,
true,
'',
$disabled_in_execution
).'</td>
<td>'.ui_print_help_tip(__('The end day must be higher than the start day'), true).'</td>
</tr>
@ -705,26 +705,26 @@ $table->data[5][1] = "
<tr>
<td>'.__('From hour:').'</td>
<td>'.html_print_input_text(
'periodically_time_from',
$periodically_time_from,
'',
7,
7,
true,
$disabled_in_execution
'periodically_time_from',
$periodically_time_from,
'',
7,
7,
true,
$disabled_in_execution
).ui_print_help_tip(
__('The end time must be higher than the start time'),
true
).'</td>
<td>'.__('To hour:').'</td>
<td>'.html_print_input_text(
'periodically_time_to',
$periodically_time_to,
'',
7,
7,
true,
$disabled_in_execution
'periodically_time_to',
$periodically_time_to,
'',
7,
7,
true,
$disabled_in_execution
).ui_print_help_tip(
__('The end time must be higher than the start time'),
true
@ -1008,13 +1008,13 @@ $table->data['module'][1] = "
<td class='cell_delete_button' style='text-align: right; width:10%;' id=''>".'<a class="link_delete"
onclick="if(!confirm(\''.__('Are you sure?').'\')) return false;"
href="">'.html_print_image(
'images/cross.png',
true,
[
'border' => '0',
'alt' => __('Delete'),
'class' => 'invert_filter',
]
'images/cross.png',
true,
[
'border' => '0',
'alt' => __('Delete'),
'class' => 'invert_filter',
]
).'</a>'."</td>
</tr>
<tr class='datos2' id='add_modules_row'>

893
pandora_console/godmode/gis_maps/configure_gis_map.php
View File

File diff suppressed because it is too large Load Diff

70
pandora_console/godmode/reporting/visual_console_builder.php
View File

@ -31,6 +31,7 @@
global $config;
global $statusProcessInDB;
use PandoraFMS\Agent;
use PandoraFMS\User;
check_login();
@ -630,44 +631,30 @@ switch ($activeTab) {
'message' => $message,
];
} else {
// One item per module
if (empty($name_modules)) {
$statusProcessInDB = [
'flag' => true,
'message' => ui_print_error_message(
__('No modules selected'),
'',
true
),
];
} else {
if (defined('METACONSOLE')) {
$agents_ids = [];
foreach ($id_agents as $id_agent_id) {
$server_and_agent = explode('|', $id_agent_id);
if (is_metaconsole() === true) {
$agents_ids = [];
foreach ($id_agents as $id_agent_id) {
$server_and_agent = explode('|', $id_agent_id);
$agents_ids[] = $server_and_agent[1];
}
$rows = db_get_all_rows_filter(
'tmetaconsole_agent',
['id_tagente' => $agents_ids]
);
$agents = [];
foreach ($rows as $row) {
$agents[$row['id_tmetaconsole_setup']][] = $row['id_tagente'];
}
} else {
$agents[0] = $id_agents;
$agents_ids[] = $server_and_agent[1];
}
$rows = db_get_all_rows_filter(
'tmetaconsole_agent',
['id_tagente' => $agents_ids]
);
$agents = [];
foreach ($rows as $row) {
$agents[$row['id_tmetaconsole_setup']][] = $row['id_tagente'];
}
} else {
$agents[0] = $id_agents;
}
foreach ($agents as $id_server => $id_agents) {
// Any module
if ($name_modules[0] == '0') {
// Any module.
if (empty($name_modules) === true || $name_modules[0] === '0') {
$message .= visual_map_process_wizard_add_agents(
$id_agents,
$image,
@ -705,19 +692,14 @@ switch ($activeTab) {
} else {
foreach ($name_modules as $mod) {
foreach ($id_agents as $ag) {
$id_module = agents_get_modules(
$ag,
['id_agente_modulo'],
['nombre' => $mod]
);
$agent = new Agent($ag);
$id_module = $agent->searchModules(
['nombre' => $mod],
1
)->toArray()['id_agente_modulo'];
if (empty($id_module)) {
if (empty($id_module) === true) {
continue;
} else {
$id_module = reset($id_module);
$id_module = $id_module['id_agente_modulo'];
}
$id_modules[] = $id_module;

2
pandora_console/godmode/reporting/visual_console_builder.wizard.php
View File

@ -533,7 +533,7 @@ echo '</div>';
echo '</form>';
// Trick for it have a traduct text for javascript.
echo '<span id="any_text" class="invisible">'.__('Any').'</span>';
echo '<span id="any_text" class="invisible">'.__('None').'</span>';
echo '<span id="none_text" class="invisible">'.__('None').'</span>';
echo '<span id="loading_text" class="invisible">'.__('Loading...').'</span>';
?>

2
pandora_console/godmode/servers/plugin_registration.php
View File

@ -101,7 +101,7 @@ $output .= '<p id="description_task">';
$output .= __($str);
$output .= '<br><br>';
$output .= __('You can get more plugins in our');
$output .= '<a href="http://pandorafms.com/Library/Library/">';
$output .= '<a href="https://pandorafms.com/Library/Library/">';
$output .= ' '.__('Public Resource Library');
$output .= '</a>';
$output .= '</p>';

2
pandora_console/include/ajax/tree.ajax.php
View File

@ -63,7 +63,7 @@ if (is_ajax() === true) {
'searchAgent' => '',
'statusAgent' => AGENT_STATUS_ALL,
'searchModule' => '',
'statusModule' => -1,
'statusModule' => AGENT_MODULE_STATUS_ALL,
'groupID' => 0,
'tagID' => 0,
];

4
pandora_console/include/class/Tree.class.php
View File

@ -932,7 +932,9 @@ class Tree
$agents_aux = [];
foreach ($agents as $iterator => $agent) {
$this->processAgent($agents[$iterator], $server);
if ($agents[$iterator]['counters']['total'] !== '0') {
if ($agents[$iterator]['counters']['total'] !== '0'
|| (bool) $this->filter['show_not_init_agents'] === true
) {
$agents_aux[] = $agents[$iterator];
}
}

2
pandora_console/include/config_process.php
View File

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

3
pandora_console/include/functions_agents.php
View File

@ -1430,6 +1430,9 @@ function agents_get_group_agents(
/**
* @deprecated use \PandoraFMS\Agent::searchModules
*
*
* Get all the modules in an agent. If an empty list is passed it will select all
*
* @param mixed Agent id to get modules. It can also be an array of agent id's, by default is null and this mean that use the ids of agents in user's groups.

15
pandora_console/include/javascript/module_library.js
View File

@ -14,6 +14,7 @@ Variables from PHP:
- error_search
*/
const REMOTE_MODULE_LIBRARY_URI = "https://pandorafms.com/library/";
$(document).ready(function() {
// Save categories in sessionStorage to avoid making the request to the API many times.
function set_local_categories() {
@ -100,8 +101,7 @@ $(document).ready(function() {
// Get all categories from Module library.
function get_all_categories() {
$.ajax({
url:
"https://pandorafms.com/library/wp-json/wp/v2/categories?per_page=100",
url: REMOTE_MODULE_LIBRARY_URI + "wp-json/wp/v2/categories?per_page=100",
type: "GET",
cache: false,
crossDomain: true,
@ -127,10 +127,9 @@ $(document).ready(function() {
var api_url = "";
if (selector == "search") {
api_url = "https://pandorafms.com/library/wp-json/wp/v2/posts?search=";
api_url = REMOTE_MODULE_LIBRARY_URI + "wp-json/wp/v2/posts?search=";
} else if (selector == "category") {
api_url =
"https://pandorafms.com/library/wp-json/wp/v2/posts/?categories=";
api_url = REMOTE_MODULE_LIBRARY_URI + "wp-json/wp/v2/posts/?categories=";
}
$.ajax({
@ -238,7 +237,7 @@ $(document).ready(function() {
/* Print main page */
function library_main() {
$.ajax({
url: "https://pandorafms.com/library/wp-json/wp/v2/pages/121",
url: REMOTE_MODULE_LIBRARY_URI + "wp-json/wp/v2/pages/121",
type: "GET",
cache: false,
crossDomain: true,
@ -286,6 +285,8 @@ function library_main() {
clean_page.splice(0, 1);
$.each(clean_page, function(i, v) {
// Clean et_pb_blurb WP tags.
v = v.replace(/([\[et_pb_blurb].*[\]](?=[A-z]))/g, "");
var main_category = $(
"#library_main_content div.library_main_category:nth-child(" + i + ")"
);
@ -314,7 +315,7 @@ function library_main() {
// Get all data from one category. This is necessary to get the category name.
function get_category(id) {
$.ajax({
url: "https://pandorafms.com/library/wp-json/wp/v2/categories/" + id,
url: REMOTE_MODULE_LIBRARY_URI + "wp-json/wp/v2/categories/" + id,
type: "GET",
cache: false,
contentType: "application/json",

BIN
pandora_console/include/languages/es.mo
View File

Binary file not shown.

54372
pandora_console/include/languages/es.po
View File

File diff suppressed because it is too large Load Diff

BIN
pandora_console/include/languages/fr.mo
View File

Binary file not shown.

54491
pandora_console/include/languages/fr.po
View File

File diff suppressed because it is too large Load Diff

40823
pandora_console/include/languages/index.pot
View File

File diff suppressed because it is too large Load Diff

8
pandora_console/include/lib/Agent.php
View File

@ -549,7 +549,8 @@ class Agent extends Entity
* @param array $filter Filters.
* @param integer $limit Limit search results.
*
* @return array Of PandoraFMS\Module Modules found.
* @return array|Module Of PandoraFMS\Module Modules
* found or Module found is limit 1.
*/
public function searchModules(array $filter, int $limit=0)
{
@ -577,7 +578,10 @@ class Agent extends Entity
} else {
// Search in db.
$return = Module::search($filter, $limit);
if (is_array($return) === false) {
if (is_array($return) === false
&& is_object($return) === false
) {
return [];
}

2
pandora_console/install.php
View File

@ -129,7 +129,7 @@
<div style='height: 10px'>
<?php
$version = '7.0NG.759';
$build = '220211';
$build = '220215';
$banner = "v$version Build $build";
error_reporting(0);

2
pandora_console/pandora_console.redhat.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0NG.759
%define release 220211
%define release 220215
# User and Group under which Apache is running
%define httpd_name httpd

2
pandora_console/pandora_console.rhel7.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0NG.759
%define release 220211
%define release 220215
# User and Group under which Apache is running
%define httpd_name httpd

2
pandora_console/pandora_console.spec
View File

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

1
pandora_console/pandoradb.sql
View File

@ -3670,6 +3670,7 @@ CREATE TABLE IF NOT EXISTS `tautoconfig` (
`name` VARCHAR(100) NOT NULL,
`order` INT NOT NULL DEFAULT 0,
`description` TEXT,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;

2
pandora_server/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-server
Version: 7.0NG.759-220211
Version: 7.0NG.759-220215
Architecture: all
Priority: optional
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
# GNU General Public License for more details.
pandora_version="7.0NG.759-220211"
pandora_version="7.0NG.759-220215"
package_cpan=0
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
my $pandora_version = "7.0NG.759";
my $pandora_build = "220211";
my $pandora_build = "220215";
our $VERSION = $pandora_version." ".$pandora_build;
# 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
my $pandora_version = "7.0NG.759";
my $pandora_build = "220211";
my $pandora_build = "220215";
our $VERSION = $pandora_version." ".$pandora_build;
our %EXPORT_TAGS = ( 'all' => [ qw() ] );

2
pandora_server/pandora_server.redhat.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_server
%define version 7.0NG.759
%define release 220211
%define release 220215
Summary: Pandora FMS Server
Name: %{name}

2
pandora_server/pandora_server.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_server
%define version 7.0NG.759
%define release 220211
%define release 220215
Summary: Pandora FMS Server
Name: %{name}

2
pandora_server/pandora_server_installer
View File

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

2
pandora_server/util/pandora_db.pl
View File

@ -35,7 +35,7 @@ use PandoraFMS::Config;
use PandoraFMS::DB;
# version: define current version
my $version = "7.0NG.759 Build 220211";
my $version = "7.0NG.759 Build 220215";
# Pandora server configuration
my %conf;

2
pandora_server/util/pandora_manage.pl
View File

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