Commit Graph

5710 Commits

Author SHA1 Message Date
fbsanchez a5c5a30bde avoid warnings in old perl versions 2021-05-07 14:01:42 +02:00
artica 454e6120e4 Auto-updated build strings. 2021-05-07 01:00:44 +02:00
artica 6c87f65367 Auto-updated build strings. 2021-05-06 01:00:44 +02:00
artica 20466ec0d1 Auto-updated build strings. 2021-05-05 01:00:40 +02:00
artica f0f7244d84 Auto-updated build strings. 2021-05-04 01:00:33 +02:00
artica 5461a4391c Auto-updated build strings. 2021-05-03 01:00:36 +02:00
artica 2494aad730 Auto-updated build strings. 2021-05-02 01:00:30 +02:00
artica 13483e6952 Auto-updated build strings. 2021-05-01 01:00:31 +02:00
artica c95b629776 Auto-updated build strings. 2021-04-30 01:00:41 +02:00
Daniel Rodriguez 4951552d1d Merge branch 'ent-7413-filtro-log-agent-alertas-correladas-logs-no-funciona-correctamente' into 'develop'
Fix locating agent while correlating logs

See merge request artica/pandorafms!4074
2021-04-29 12:05:10 +00:00
artica 8407c5353f Auto-updated build strings. 2021-04-29 01:00:46 +02:00
Daniel Rodriguez 2930306767 Merge branch 'ent-7381-comportamiento-extraño-cron-modulos' into 'develop'
Improved business logic for cron

See merge request artica/pandorafms!4080
2021-04-28 15:24:47 +00:00
Daniel Rodriguez 9b90039fe2 Merge branch 'ent-7414-rear-eventos-por-cli-metaconsola' into 'develop'
fixed error with meta create vent cli

See merge request artica/pandorafms!4079
2021-04-28 14:19:21 +00:00
artica 778d126989 Auto-updated build strings. 2021-04-28 01:00:41 +02:00
fbsanchez 24976c4860 Disable timezone offset while setting timestamp from server 2021-04-27 17:58:20 +02:00
Daniel Rodriguez 2787a1f64c Merge branch 'ent-7385-no-se-actualizan-los-hilos-del-servidor-transaccional' into 'develop'
Removed token trasnsactional_threads as manager only runs 1 thread

See merge request artica/pandorafms!4075
2021-04-27 14:25:36 +00:00
fbsanchez 2ef9743d5b Added elastic_query_size 2021-04-27 14:59:59 +02:00
Daniel Rodriguez dedd578fe1 Merge branch 'ent-7329-Fallo-de-conteos-en-tactical-view' into 'develop'
fixed count in several views

See merge request artica/pandorafms!4052
2021-04-27 11:47:43 +00:00
Daniel Rodriguez 5aea0d17f0 Merge branch 'ent-7347-no-funciona-envio-de-mails-desde-servidor-con-sendgrid' into 'develop'
Make sure encode_base64 does not break auth strings.

See merge request artica/pandorafms!4059
2021-04-27 11:43:06 +00:00
José González d0c3174d8c Improved business logic for cron 2021-04-27 12:19:20 +02:00
marcos 9edfe43cb7 fixed error with meta create vent cli 2021-04-27 12:14:32 +02:00
artica 8a5f5992ac Auto-updated build strings. 2021-04-27 01:00:39 +02:00
fbsanchez 5bfd86d944 Removed token trasnsactional_threads as manager only runs 1 thread 2021-04-26 21:21:01 +02:00
fbsanchez 00acc46eca Fix locating agent while correlating logs 2021-04-26 19:49:43 +02:00
artica 72b9748be9 Auto-updated build strings. 2021-04-26 01:00:14 +02:00
artica fa2748ac5d Auto-updated build strings. 2021-04-25 01:00:22 +02:00
artica 351570213f Auto-updated build strings. 2021-04-24 01:00:38 +02:00
artica f3f44ebbdd Auto-updated build strings. 2021-04-23 01:00:18 +02:00
Ramon Novoa d423979426 Make sure encode_base64 does not break auth strings.
The way Mail::Sendmail called encode_base64 could break auth strings
into multiple lines, resulting in authentication errors.

Ref pandora_enterprise#7347
2021-04-22 15:03:27 +02:00
artica c7521d27fa Auto-updated build strings. 2021-04-22 01:00:16 +02:00
alejandro.campos@artica.es 1c8e73df9d fixed count in several views 2021-04-21 17:11:32 +02:00
artica d4d7494e27 Auto-updated build strings. 2021-04-21 01:00:16 +02:00
fbsanchez fc21a1234d PluginTools transfer_xml, Rename filename if it contains symbols (only parsed ones) 2021-04-20 14:05:15 +02:00
fbsanchez d3dc3044aa Allow sending file_path with symbols 2021-04-20 13:22:13 +02:00
vgilc d380e2cd45 Merge branch 'ent-7320-11651-creacion-masiva-de-xml-incorrectos-con-servidor-develop' into 'develop'
Ent 7320 11651 creacion masiva de xml incorrectos con servidor develop

See merge request artica/pandorafms!4038
2021-04-20 08:55:21 +00:00
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
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
Daniel Rodriguez daf44e6a42 Merge branch 'ent-fix-improve-cli-profile' into 'develop'
Fixed and improved profile related CLIs.

See merge request artica/pandorafms!4029
2021-04-14 09:56:07 +00:00
Daniel Rodriguez 1d6c7c6eed Merge branch 'ent-6782-revision-general-de-la-consola-movil' into 'develop'
SAML login in mobile console

See merge request artica/pandorafms!3733
2021-04-14 07:39:29 +00:00
Junichi Satoh 56ff245675 Fixed the order of arguments in 'create_profile' as the same as comment in pandora_manage.pl and documentation, and fixed 'profile_name' was not encoded.
Plus, added new cli, 'update_profile'.
2021-04-14 11:07:13 +09: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
Daniel Rodriguez dd41c1c0f7 Merge branch 'ent-2177-lead-error-en-plugin-de-servidor-snmp_remote-pl-catrian' into 'develop'
hrStorageAllocationUnits fixed ref. snmp_remote.pl

See merge request artica/pandorafms!3913
2021-04-13 13:24:03 +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
Daniel Rodriguez 34aeb4ddd8 Merge branch 'ent-6883-11170-pandora_server_installer-pandora_server-spec-borra-configuracion-de-logrotate' into 'develop'
Prevent logrotate file to be overwritten

See merge request artica/pandorafms!3992
2021-04-12 08:32:49 +00: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
fbsanchez 6e4212129b Merge remote-tracking branch 'origin/develop' into ent-6782-revision-general-de-la-consola-movil
Conflicts:
	pandora_console/include/styles/dashboards.css
	pandora_console/mobile/operation/visualmap.php
	pandora_console/mobile/operation/visualmaps.php
2021-04-07 10:28:44 +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
Daniel Rodriguez 3ae93da065 Merge branch 'ent-4475-validar-alertas-api-cli' into 'develop'
Ent 4475 validar alertas api cli

See merge request artica/pandorafms!3820
2021-04-06 17:21:56 +00:00
Luis 6dac9039d4 Ent 4475 validar alertas api cli 2021-04-06 17:21:56 +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
Kevin a935278b5d Prevent RPMs from overwriting logrotate 2021-03-31 18:38:14 +02:00
Kevin 89a7eb7a20 Prevent logrotate file to overwrite in tarball 2021-03-31 17:24:18 +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 6413f6d551 Merge branch 'ent-4755-base-de-datos-historico-revision' into 'develop'
DBMainainer, fixed Websockets library placement

See merge request artica/pandorafms!3797
2021-03-25 14:33:31 +00: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
fbsanchez fdc4133eaa Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 2021-03-25 10:20:02 +01: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
fbsanchez 0179e89740 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 2021-03-24 13:16:54 +01: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
artica b1bfd70feb Auto-updated build strings. 2021-03-23 01:00:17 +01:00
Jose Gonzalez 4b7c0fc7ee WIP: Backup upload 2021-03-22 17:39:24 +01:00
Daniel Rodriguez a7b19bd347 Merge branch 'ent-6865-uniway-funcionalidad-password-en-grupos-no-compatible-con-discovery-plugins-xml' into 'develop'
Ent 6865 uniway funcionalidad password en grupos no compatible con discovery plugins xml

See merge request artica/pandorafms!3761
2021-03-22 12:39:59 +00:00
fbsanchez e0aa1bfc68 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/include/styles/pandora.css
2021-03-22 09:59:07 +01:00