Commit Graph

27248 Commits

Author SHA1 Message Date
rafael.ameijeiras ad8f967b32 fixing oracle dependencies variable ref 2021-05-06 09:23:44 +02:00
artica 6c87f65367 Auto-updated build strings. 2021-05-06 01:00:44 +02:00
Calvo dec202ed78 Fixed agents/alerts view group change when public url foreced 2021-05-05 17:53:52 +02:00
alejandro.campos@artica.es aa4769d331 minor changes 2021-05-05 13:02:53 +02:00
José González 6570441fd2 Fixed issue with type 2021-05-05 12:05:06 +02:00
alejandro.campos@artica.es d358fd894d minor change in integria ims setup 2021-05-05 11:03:32 +02:00
alejandro.campos@artica.es e28c6377de remove log input 2021-05-05 10:35:00 +02:00
alejandro.campos@artica.es 256750bcb0 fixed bug in file attachment 2021-05-05 09:51:21 +02:00
José González 385366a9e1 Merge branch 'develop' into 'ent-7184-duplicate-web-server-module'
# Conflicts:
#   pandora_console/include/functions_modules.php
2021-05-05 07:37:02 +00:00
marcos 25867a0fd7 fixed visual error black theme 2021-05-05 09:36:16 +02:00
marcos 1f5e08a9fe fixed wrong string 2021-05-05 09:23:47 +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
Daniel Rodriguez 50c61b2f9f Merge branch 'ent-7426-fallo-de-reglas-de-eventos-en-metaconsola' into 'develop'
Migrate old rules

See merge request artica/pandorafms!4093
2021-04-30 13:35:56 +00:00
fbsanchez 34b02982e1 Ensure valid values (alert correlation) for compat mode for criticity, id_group and id_tag 2021-04-30 15:01:43 +02:00
fbsanchez e179475663 Repaired group selector in rules 2021-04-30 14:54:14 +02:00
fbsanchez 366e9a08d5 minor fix 2021-04-30 14:36:47 +02:00
fbsanchez 6b83deacdd Migrate old rules 2021-04-30 14:34:10 +02:00
vanessa gil 97e7e8c8cb Updated version. 2021-04-30 13:57:00 +02:00
Daniel Rodriguez 299842beda Merge branch 'ent-7265-cambios-minimos-en-css-black-them-sancho' into 'develop'
fixed visual error black theme 754 LTS

See merge request artica/pandorafms!4092
2021-04-30 10:43:22 +00:00
Marcos Alconada c5fe67ddb5 fixed visual error black theme 754 LTS 2021-04-30 10:43:22 +00:00
vanessa gil f51ad33554 Updated version. 2021-04-30 10:34:20 +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
Rafael Ameijeiras d87c9e0cc1 Merge branch 'ent-7463-adding-deploy-improves' into 'develop'
adding ipam dependencies, wmic new binary and lxc support

See merge request artica/pandorafms!4087
2021-04-29 09:13:00 +00:00
rafael.ameijeiras 70e64eb85f adding ipam dependencies, wmic new binary and lxc support 2021-04-29 11:09:06 +02: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 Maya a193234270 #7453 Fixed id alert_list 2021-04-28 16:46:27 +02: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
Daniel Rodriguez 599a38fbd1 Merge branch 'ent-7404-Respuestas-de-eventos-en-usuario-solo-lectura' into 'develop'
Ent 7404 respuestas de eventos en usuario solo lectura

See merge request artica/pandorafms!4077
2021-04-28 14:18:35 +00:00
Daniel Rodriguez e9956092d4 Merge branch 'ent-7399-Problemas-integracion-Ehorus-en-Pandora-FMS' into 'develop'
Fixed errors display tab ehorus

See merge request artica/pandorafms!4078
2021-04-28 11:24:45 +00:00
Daniel Rodriguez c71733385d Merge branch 'ent-7374-Actualizacion-cadenas-de-traduccion' into 'develop'
update translate strings

See merge request artica/pandorafms!4063
2021-04-28 10:53:05 +00:00
Daniel Rodriguez 7eb94fca42 Merge branch 'ent-7395-Filtro-de-eventos-en-Metaconsola-Server' into 'develop'
Ent 7395 filtro de eventos en metaconsola server

See merge request artica/pandorafms!4071
2021-04-28 10:50:04 +00:00
Daniel Maya 8ef21d9b15 Ent 7395 filtro de eventos en metaconsola server 2021-04-28 10:50:04 +00:00
Daniel Rodriguez 87eed29f1f Merge branch 'ent-7446-tamano-desplegable-module-component' into 'develop'
fixed size with select2 in module component

See merge request artica/pandorafms!4083
2021-04-28 10:48:32 +00:00
Marcos Alconada b00e7eff8b fixed size with select2 in module component 2021-04-28 10:48:32 +00:00
Daniel Rodriguez 9790be4f90 Merge branch '7248-11618-r-works-rendimiento-module_plugin-en-agente-windows' into 'develop'
Add support for module_wait_timeout.

See merge request artica/pandorafms!4073
2021-04-28 09:30:03 +00:00
Daniel Rodriguez e117fd8fd0 Merge branch 'ent-7411-Error-SQL-en-items-Module-event-report-y-Agent-event-report-metaconsola' into 'develop'
Fixed errors SQL metaconsole events

See merge request artica/pandorafms!4076
2021-04-28 08:44:26 +00:00
fbsanchez e1810cc36f Different way to fix public dashboard 2021-04-28 09:50:04 +02:00
Daniel Rodriguez 5857c0d231 Merge branch 'ent-7393-Filtro-de-eventos-en-Metaconsola-Severity' into 'develop'
Ent 7393 filtro de eventos en metaconsola severity

See merge request artica/pandorafms!4070
2021-04-28 06:51:25 +00:00
artica 778d126989 Auto-updated build strings. 2021-04-28 01:00:41 +02:00
fbsanchez 9f3ad33b28 Reference to base public_dashboard url 2021-04-27 18:44:06 +02:00
fbsanchez 24976c4860 Disable timezone offset while setting timestamp from server 2021-04-27 17:58:20 +02:00
Daniel Rodriguez 3d3e1acef4 Merge branch 'ent-7382-fallo-visualizacion-ha' into 'develop'
fixed visual error HA

See merge request artica/pandorafms!4067
2021-04-27 14:33:17 +00: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
Daniel Rodriguez 28984aa414 Merge branch 'ent-7384-bug-acl-en-usuario-con-permiso-rr-u-o-rw' into 'develop'
fixed error with rr and rw in report list - acls

See merge request artica/pandorafms!4068
2021-04-27 14:07:48 +00:00