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

minor fix

This commit is contained in:
fbsanchez 2020-04-08 16:06:39 +02:00
parent 8a0215dcc9
commit a75964fcba
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@ START TRANSACTION;
ALTER TABLE trecon_task MODIFY COLUMN `id_network_profile` TEXT; ALTER TABLE trecon_task MODIFY COLUMN `id_network_profile` TEXT;
ALTER TABLE `trecon_task` CHANGE COLUMN `create_incident` `review_mode` TINYINT(1) UNSIGNED DEFAULT 0; ALTER TABLE `trecon_task` CHANGE COLUMN `create_incident` `review_mode` TINYINT(1) UNSIGNED DEFAULT 0;
ALTER TABLE `trecon_task` ADD COLUMN `subnet_csv` TINYINT(1) UNSIGNED DEFAULT 0; ALTER TABLE `trecon_task` ADD COLUMN `subnet_csv` TINYINT(1) UNSIGNED DEFAULT 1;
UPDATE `trecon_task` SET `review_mode` = 1; UPDATE `trecon_task` SET `review_mode` = 1;
ALTER TABLE trecon_task add column `auto_monitor` TINYINT(1) UNSIGNED DEFAULT 1 AFTER `auth_strings`; ALTER TABLE trecon_task add column `auto_monitor` TINYINT(1) UNSIGNED DEFAULT 1 AFTER `auth_strings`;

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

@ -1685,7 +1685,7 @@ ALTER TABLE `trecon_task` ADD COLUMN `type` int(11) NOT NULL DEFAULT '0',
MODIFY COLUMN `autoconfiguration_enabled` tinyint(1) unsigned NULL DEFAULT '0', MODIFY COLUMN `autoconfiguration_enabled` tinyint(1) unsigned NULL DEFAULT '0',
MODIFY COLUMN `summary` text NULL, MODIFY COLUMN `summary` text NULL,
MODIFY COLUMN `id_network_profile` text, MODIFY COLUMN `id_network_profile` text,
CHANGE COLUMN `create_incident` `review_mode` TINYINT(1) UNSIGNED DEFAULT 0, CHANGE COLUMN `create_incident` `review_mode` TINYINT(1) UNSIGNED DEFAULT 1,
ADD COLUMN `subnet_csv` TINYINT(1) UNSIGNED DEFAULT 0; ADD COLUMN `subnet_csv` TINYINT(1) UNSIGNED DEFAULT 0;
-- Old recon always report. -- Old recon always report.

2
pandora_console/pandoradb.sql
View File

@ -774,7 +774,7 @@ CREATE TABLE IF NOT EXISTS `trecon_task` (
`description` varchar(250) NOT NULL default '', `description` varchar(250) NOT NULL default '',
`subnet` text NOT NULL, `subnet` text NOT NULL,
`id_network_profile` text, `id_network_profile` text,
`review_mode` tinyint(1) unsigned NOT NULL default 0, `review_mode` tinyint(1) unsigned NOT NULL default 1,
`id_group` int(10) unsigned NOT NULL default 1, `id_group` int(10) unsigned NOT NULL default 1,
`utimestamp` bigint(20) unsigned NOT NULL default 0, `utimestamp` bigint(20) unsigned NOT NULL default 0,
`status` tinyint(4) NOT NULL default 0, `status` tinyint(4) NOT NULL default 0,

5
pandora_server/lib/PandoraFMS/Recon/Base.pm
View File

@ -1342,6 +1342,9 @@ sub prepare_agent($$) {
sub add_agent($$) { sub add_agent($$) {
my ($self, $addr) = @_; my ($self, $addr) = @_;
# Avoid create empty agents.
return if is_empty($addr);
$self->prepare_agent($addr); $self->prepare_agent($addr);
} }
@ -2141,7 +2144,7 @@ sub traceroute_connectivity($$) {
# Look for parents. # Look for parents.
my $device = $host; my $device = $host;
for (my $i = 0; $i < $self->{'parent_recursion'}; $i++) { for (my $i = 0; $i < $self->{'parent_recursion'}; $i++) {
next unless defined($hops[$i]); next if is_empty($hops[$i]);
my $parent = $hops[$i]->ipaddr(); my $parent = $hops[$i]->ipaddr();
# Create an agent for the parent. # Create an agent for the parent.