6083 Commits

Author	SHA1	Message	Date
vgilc	3c7fc18abb	Merge branch 'ent-7288-correlacion-eventos-no-permite-crear-condiciones-complejas' into 'develop' ... reviewing correlated alerts See merge request artica/pandorafms!4024	2021-04-20 07:56:04 +00:00
artica	20fe99ef29	Auto-updated build strings.	2021-04-20 01:00:15 +02:00
fbsanchez	7275bdd061	Allow transfer_xml direct file paths in pluginTools	2021-04-19 18:11:34 +02:00
artica	3737d61793	Updated version and build strings.	2021-04-19 16:09:29 +02:00
fbsanchez	50f580c112	Merge remote-tracking branch 'origin/develop' into ent-7288-correlacion-eventos-no-permite-crear-condiciones-complejas	2021-04-19 14:35:59 +02:00
artica	08abb25fc4	Auto-updated build strings.	2021-04-19 01:00:13 +02:00
artica	1030ef052a	Auto-updated build strings.	2021-04-18 01:00:13 +02:00
artica	9ec945fa3c	Auto-updated build strings.	2021-04-17 01:00:15 +02:00
Calvo	256d4333c6	Fixed encoding ampersand on mail alerts	2021-04-16 15:36:12 +02:00
artica	f585e44692	Auto-updated build strings.	2021-04-16 01:00:41 +02:00
Ramon Novoa	4d1a0d9ef4	Merge remote-tracking branch 'origin/develop' into ent-5620-nuevo-compilador-para-backend	2021-04-15 18:16:41 +02:00
Ramon Novoa	8edaad4e5a	Push /usr/lib/perl5 to the back of the module search path. ... When /usr/lib/perl5 is added to the front of the module search path it takes precedence over libraries distributed with binary versions of Pandora FMS. This can be fixed by pushing it to the back instead.	2021-04-15 17:56:02 +02:00
fbsanchez	3bc8f6c4ac	Merge remote-tracking branch 'origin/develop' into ent-7288-correlacion-eventos-no-permite-crear-condiciones-complejas	2021-04-15 15:33:14 +02:00
artica	fe9109e585	Auto-updated build strings.	2021-04-15 01:00:43 +02:00
fbsanchez	114f23f474	Added event_server_cache_ttl	2021-04-14 22:36:56 +02:00
artica	46291eed66	Auto-updated build strings.	2021-04-14 01:00:15 +02:00
Daniel Rodriguez	fff13ad2ac	Merge branch 'ent-6377-proyectos-amazon-s3-en-el-discovery' into 'develop' ... Minor changes See merge request artica/pandorafms!3930	2021-04-13 14:31:37 +00:00
marcos	27df4348be	resolved error with mail graph	2021-04-13 10:29:42 +02:00
artica	c33f2182ff	Auto-updated build strings.	2021-04-13 01:00:16 +02:00
artica	4a071237b4	Auto-updated build strings.	2021-04-12 01:00:26 +02:00
artica	3627be1f85	Auto-updated build strings.	2021-04-11 01:00:32 +02:00
artica	ea81d04e5f	Auto-updated build strings.	2021-04-10 01:00:37 +02:00
artica	70c6e7196f	Auto-updated build strings.	2021-04-09 01:00:40 +02:00
artica	2e27cebad2	Auto-updated build strings.	2021-04-08 01:00:37 +02:00
artica	8734494b7f	Auto-updated build strings.	2021-04-07 01:00:38 +02:00
Daniel Rodriguez	0f5f41e97f	Merge branch 'ent-7011-nexcon-se-sigue-generando-el-evento-de-alerta-cesada-aunque-esten-deshabilitados-los-eventos-de-la-alera' into 'develop' ... Avoid events while ceasing alerts See merge request artica/pandorafms!3827	2021-04-06 17:25:21 +00:00
artica	247343c0b6	Auto-updated build strings.	2021-04-06 01:02:48 +02:00
artica	31a8fd6c55	Auto-updated build strings.	2021-04-05 01:00:42 +02:00
artica	4811e45bf2	Auto-updated build strings.	2021-04-04 01:00:37 +02:00
artica	95e437252b	Auto-updated build strings.	2021-04-03 01:00:36 +02:00
artica	2f4eaacb6a	Auto-updated build strings.	2021-04-02 01:00:33 +02:00
artica	10ea68f33f	Auto-updated build strings.	2021-04-01 01:00:11 +02:00
Jose Gonzalez	14b364baec	Fixed issue with execution without correct params	2021-03-31 12:37:02 +02:00
artica	321fc8aa05	Auto-updated build strings.	2021-03-31 01:00:44 +02:00
artica	8b92c0ffc1	Auto-updated build strings.	2021-03-30 01:00:51 +02:00
artica	96d63e2029	Updated version and build strings.	2021-03-29 14:57:41 +02:00
artica	3e8214850f	Auto-updated build strings.	2021-03-29 01:00:18 +02:00
artica	cf78261d0b	Auto-updated build strings.	2021-03-28 01:00:14 +01:00
artica	e46845e864	Auto-updated build strings.	2021-03-27 01:00:19 +01:00
artica	c10c1b09cf	Auto-updated build strings.	2021-03-26 01:00:18 +01:00
Daniel Rodriguez	c4b6f709c9	Merge branch 'ent-6979-fallo-discovery-contraseñas-caracteres-especiales' into 'develop' ... Fix issue Closes pandora_enterprise#6979 See merge request artica/pandorafms!3821	2021-03-25 11:54:45 +00:00
artica	1934c04388	Auto-updated build strings.	2021-03-25 01:00:21 +01:00
José González	9918e7c3cd	Merge branch 'develop' into 'ent-6858-Goliat-opensource' ... # Conflicts: # pandora_console/extras/delete_files/delete_files.txt	2021-03-24 15:50:12 +00:00
Daniel Rodriguez	9f22c061f5	Merge branch 'ent-5929-revision-general-logstash' into 'develop' ... Deleted logstash references Closes pandora_enterprise#5929 See merge request artica/pandorafms!3729	2021-03-24 11:57:47 +00:00
fbsanchez	9c693e309c	AWS.S3 monitoring RC1	2021-03-24 11:52:47 +01:00
artica	00375710c2	Auto-updated build strings.	2021-03-24 01:00:25 +01:00
José González	561060cdda	Reverted change over mysqldriver	2021-03-23 20:37:28 +00:00
Jose Gonzalez	910154389e	Fix	2021-03-23 16:15:57 +01:00
Jose Gonzalez	3cb504397f	Solve issues for compilation	2021-03-23 15:15:07 +01:00
José González	6fbd40ea74	Merge branch 'develop' into 'ent-5929-revision-general-logstash' ... # Conflicts: # pandora_server/lib/PandoraFMS/Config.pm	2021-03-23 12:00:45 +00:00