28580 Commits

Author SHA1 Message Date
Daniel Rodriguez
6e12e5363e Merge branch 'ent-8055-tareas-programadas-almacenadas-en-disco-rotas-fix-mr-48' into 'develop'
Fix mr 48 breaking tasks

See merge request artica/pandorafms!4478
2021-10-22 09:58:57 +00:00
Daniel Rodriguez
bcf8e8d647 Merge branch 'ent-8113-12552-error-al-actualizar-mediante-update-manager-online-con-base-de-datos-de-historico' into 'develop'
Errata fix

See merge request artica/pandorafms!4494
2021-10-22 08:57:22 +00:00
fbsanchez
925fa8b819 Errata fix 2021-10-22 10:54:41 +02:00
artica
1218932b05 Auto-updated build strings. 2021-10-22 01:00:20 +02:00
Calvo
a03e46ecea Fix parameters in cron_task_generate_report_by_template 2021-10-21 12:25:39 +02:00
artica
80c7f106ad Auto-updated build strings. 2021-10-21 01:00:55 +02:00
artica
6ccf3a9ee9 Updated version and build strings. 2021-10-20 15:31:02 +02:00
artica
b70ca89af2 Auto-updated build strings. 2021-10-20 01:01:06 +02:00
artica
65b0d839f9 Auto-updated build strings. 2021-10-19 01:00:50 +02:00
Calvo
9f71a9ba81 Fix mr 48 breaking tasks 2021-10-18 16:05:37 +02:00
Daniel Rodriguez
704403fd52 Merge branch 'ent-7972-funcionalidad-historico-de-alertas-lanzadas' into 'develop'
Ent 7972 funcionalidad historico de alertas lanzadas

See merge request artica/pandorafms!4465
2021-10-18 11:36:19 +00:00
Daniel Rodriguez
e0acd008e2 Merge branch 'ent-8087-agente-757-crea-badxml-en-modo-debug-windows' into 'develop'
Do not execute omnishell commands in debug mode.

Closes pandora_enterprise#8087

See merge request artica/pandorafms!4475
2021-10-18 11:34:46 +00:00
Ramon Novoa
f19fd978ac Do not execute omnishell commands in debug mode.
Fixes pandora_enterprise#8087.
2021-10-18 12:29:45 +02:00
Daniel Rodriguez
aa2eb08edb Merge branch 'ent-fix-snmp-interfaces-wizard' into 'develop'
Fixed SNMP interfaces wizard against 32bit counter devices.

See merge request artica/pandorafms!4348
2021-10-18 08:33:17 +00:00
Daniel Rodriguez
cd73f534f9 Merge branch 'ent-8104-bug-delete-files-update-manager' into 'develop'
Fix delete files issue

See merge request artica/pandorafms!4472
2021-10-18 08:18:31 +00:00
Daniel Rodriguez
0c777c2925 Merge branch 'ent-8090-Bug-al-crear-template-en-Consolas-Visuales' into 'develop'
Ent 8090 bug al crear template en consolas visuales

See merge request artica/pandorafms!4469
2021-10-18 06:49:36 +00:00
artica
c043c3d023 Auto-updated build strings. 2021-10-18 01:00:18 +02:00
artica
6da17b11aa Auto-updated build strings. 2021-10-17 01:00:18 +02:00
artica
0e9f37a090 Auto-updated build strings. 2021-10-16 01:00:22 +02:00
Jose Gonzalez
5b4043d9ea Fix delete files issue 2021-10-15 13:31:19 +02:00
Daniel Rodriguez
691b23c442 Merge branch 'ent-7722-cambio-en-el-comportamiento-de-modulos-al-editar-un-servicio' into 'develop'
Recreate service modules

See merge request artica/pandorafms!4456
2021-10-15 09:52:03 +00:00
Jose Gonzalez
33a3cd6e99 Merge branch 'ent-7972-funcionalidad-historico-de-alertas-lanzadas' of brutus.artica.es:artica/pandorafms into ent-7972-funcionalidad-historico-de-alertas-lanzadas 2021-10-15 09:37:02 +02:00
Jose Gonzalez
304a4b5687 Fix size of event detail tabs 2021-10-15 09:36:22 +02:00
artica
af9711ec3d Auto-updated build strings. 2021-10-15 01:00:20 +02:00
Daniel Rodriguez
92740cd86b Merge branch 'ent-8096-arreglos-black-theme' into 'develop'
fixed visual black theme error

See merge request artica/pandorafms!4457
2021-10-14 09:59:16 +00:00
Ramon Novoa
118b0c3ff0 Alias the action name when executing an alert.
When executing an alert, the name of the action retrieved by the Pandora
FMS Server was overwritten by the name of the command, since the names
of the columns are the same. Now the name of the action is aliased to
preserve it.
2021-10-14 11:02:48 +02:00
artica
20448faa35 Auto-updated build strings. 2021-10-14 01:00:21 +02:00
Daniel Rodriguez
8d47abeeed Merge branch 'ent-8093-eliminar-data-dumper-de-plugin-de-inventario' into 'develop'
removing data:dumper not needed dependencie

See merge request artica/pandorafms!4466
2021-10-13 16:34:48 +00:00
Daniel Maya
e986005cc0 #8090 Added auto_adjust in tlayout_template 2021-10-13 17:23:34 +02:00
artica
9d813b729e Auto-updated build strings. 2021-10-13 01:00:13 +02:00
artica
4fd071cf60 Auto-updated build strings. 2021-10-12 01:00:19 +02:00
Rafael Ameijeiras
54dab66ab1 removing data:dumper not needed dependencie 2021-10-11 11:17:55 +02:00
Ramon Novoa
1344dee2c4 Add action information to alert events. 2021-10-11 10:43:41 +02:00
artica
a8937abb65 Auto-updated build strings. 2021-10-11 01:00:15 +02:00
artica
2b419b826d Auto-updated build strings. 2021-10-10 01:00:16 +02:00
artica
9867024d2e Auto-updated build strings. 2021-10-09 01:00:19 +02:00
Jose Gonzalez
eaaab1e250 Added visual tab Custom data in events 2021-10-08 14:59:18 +02:00
Jose Gonzalez
0414b9991a Merge branch 'develop' of brutus.artica.es:artica/pandorafms into ent-7972-funcionalidad-historico-de-alertas-lanzadas 2021-10-08 14:03:25 +02:00
Daniel Rodriguez
16f2c776f2 Merge branch 'ent-8035-12446-fallos-filtros-personalizados-eventos' into 'develop'
show only events filter in acl groups

See merge request artica/pandorafms!4451
2021-10-08 08:09:19 +00:00
artica
eb5b34b99e Auto-updated build strings. 2021-10-08 01:00:19 +02:00
marcos
96638189f2 new integriaims logo 2021-10-07 16:46:49 +02:00
marcos
85037693b2 fixed visual black theme error 2021-10-07 16:45:56 +02:00
Daniel Rodriguez
c69f418093 Merge branch 'ent-8084-elementos-deshabilitados-irreconocibles-con-black-theme' into 'develop'
merge conflict

See merge request artica/pandorafms!4452
2021-10-07 14:11:43 +00:00
marcos
d4108c4e8b show only events fetch with user groups 2021-10-07 16:11:23 +02:00
Marcos Alconada
4378c3d6f5 Merge branch 'develop' into 'ent-8084-elementos-deshabilitados-irreconocibles-con-black-theme'
# Conflicts:
#   pandora_console/include/styles/pandora_black.css
2021-10-07 13:42:14 +00:00
Daniel Rodriguez
f25035db58 Merge branch 'ent-8086-iconos-de-tree-view-metaconsola-rotos' into 'develop'
Some ui_get_full_url improvements

See merge request artica/pandorafms!4449
2021-10-07 13:36:30 +00:00
Daniel Rodriguez
e1a55e78ac Merge branch 'ent-8094-iconos-de-politicas-en-blanco-black-theme' into 'develop'
set bg transparent on images black theme

See merge request artica/pandorafms!4454
2021-10-07 13:34:57 +00:00
marcos
f55a6685bd show only events filter in acl groups 2021-10-07 14:09:02 +02:00
marcos
34350c92a0 fixed visual black theme error 2021-10-07 13:43:46 +02:00
fbsanchez
d4ceaa4643 Recreate service modules 2021-10-07 13:21:04 +02:00