tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
28,617 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

28617 Commits

Author SHA1 Message Date
Daniel Rodriguez e2ae42dd89 Merge branch 'ent-7060-gestion-basica-de-configuracion-de-equipos-de-red' into 'develop' 
NCM

See merge request artica/pandorafms!4434
 2021-10-26 08:21:01 +00:00
artica 24404d5078 Auto-updated build strings. 2021-10-26 01:01:06 +02:00
Daniel Rodriguez 3436d80d09 Merge branch 'ent-8132-Bug-in-supernet-tree-view-IPAM' into 'develop' 
fixed ipam supernet tree view when there is no data show

See merge request artica/pandorafms!4499
 2021-10-25 15:15:13 +00:00
fbsanchez 05a2db88a3 menu fix 2021-10-25 17:01:26 +02:00
fbsanchez dabd7f53fe minor fixes 2021-10-25 14:05:11 +02:00
alejandro.campos@artica.es aa24bf545c fixed ipam supernet tree view when there is no data show 2021-10-25 12:14:21 +02:00
fbsanchez 5ae3bbc4fe Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 2021-10-25 10:28:31 +02:00
artica 56ca01112d Auto-updated build strings. 2021-10-25 01:00:48 +02:00
artica ef41522899 Auto-updated build strings. 2021-10-24 01:00:45 +02:00
artica 134f6ea2a5 Auto-updated build strings. 2021-10-23 01:00:54 +02:00
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
fbsanchez 796a7125e1 Errata fix 2021-10-21 14:33:44 +02:00
Calvo a03e46ecea Fix parameters in cron_task_generate_report_by_template 2021-10-21 12:25:39 +02:00
fbsanchez df863c6057 minor fix NCM test script 2021-10-21 12:20:12 +02:00
fbsanchez 303d6632e1 NCM 2021-10-21 11:28:14 +02:00
fbsanchez bb8dbc9332 NCM 2021-10-21 02:17:17 +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
fbsanchez 98c43ea1e7 WIP NCM 2021-10-19 21:11:09 +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
fbsanchez 6c0e2d23de updates 2021-10-15 13:39:23 +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
fbsanchez 75949691f3 fix mr 2021-10-14 21:22:21 +02:00
fbsanchez 6a537e58f4 Fix 2021-10-14 21:09:14 +02:00
fbsanchez 79174d512d Added tncm_vendor and model to manage targetrs 2021-10-14 20:44:05 +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
fbsanchez 96250dcfa0 WIP NCM 2021-10-13 22:47:31 +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