153 Commits

Author SHA1 Message Date
fbsanchez
712079c30e RC1 #4755 2021-02-01 15:00:54 +01:00
fbsanchez
96c218f21e Some updates and minor fixes DBMaintainer 2021-02-01 13:31:42 +01:00
fbsanchez
04be237b7a minor method added 2021-01-29 14:30:16 +01:00
fbsanchez
dbc48852aa Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
2021-01-28 16:12:47 +01:00
fbsanchez
9fc3856f83 WIP historical database automaintenance + minor fixes 2021-01-28 13:20:36 +01:00
fbsanchez
dd4849f7c3 WIP Scheduled install & update of history database processes 2021-01-27 19:23:31 +01:00
fbsanchez
25b15182e3 DBH auto-updater 2021-01-27 15:48:00 +01:00
fbsanchez
d24bcd700d Merge remote-tracking branch 'origin/develop' into ent-6158-mejoras-a-servicios-dinamicos-expresiones-regulares-y-varios-custom-field 2021-01-27 14:08:41 +01:00
fbsanchez
bbab6d9fe1 WIP update process 2021-01-27 14:06:22 +01:00
fbsanchez
c7706a6bfa WIP Historical database manager (setup) 2021-01-27 12:35:37 +01:00
fbsanchez
192a635599 WIP setup.hdb 2021-01-25 19:29:22 +01:00
fbsanchez
d9428ce215 WIP DBMainainer, fixed Websockets library placement 2021-01-25 13:33:02 +01:00
Daniel Rodriguez
e88ca95a8d Merge branch 'ent-6631-Bug-en-dashboard-de-usuario-sin-permiso' into 'develop'
Ent 6631 bug en dashboard de usuario sin permiso

See merge request artica/pandorafms!3781
2021-01-25 10:07:53 +01:00
alejandro-campos
983d58260d changes in dashboard permissions 2021-01-21 14:42:43 +01:00
fbsanchez
012ad2fb55 Merge remote-tracking branch 'origin/develop' into ent-2561-llamadas-api-para-modulos-de-politicas 2021-01-21 10:47:49 +01:00
fbsanchez
16029f7faf Significant fixes 2021-01-20 20:08:34 +01:00
fbsanchez
6ea19ac5fa External changes from #6158 2021-01-19 18:00:28 +01:00
alejandro-campos
535486a429 Merge branch 'develop' into ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-3 2021-01-18 11:48:51 +01:00
Alejandro Campos
5b9d7bcb81 Merge branch 'develop' into 'ent-6631-Bug-en-dashboard-de-usuario-sin-permiso-2'
# Conflicts:
#   pandora_console/include/lib/Dashboard/Widgets/agent_module.php
2021-01-15 14:52:26 +01:00
alejandro-campos
05c39db0cc changes in dashboard permissions 2021-01-15 13:57:25 +01:00
alejandro-campos
a0931d7ada changes in dashboard permissions 2021-01-15 13:52:31 +01:00
Daniel Rodriguez
fc9eb947c8 Merge branch 'ent-6355-Cambio-de-mensaje-de-Widget-dashboard-sin-permisos' into 'develop'
fix remove acl widget agent/module

See merge request artica/pandorafms!3637
2021-01-14 14:46:52 +01:00
alejandro-campos
366d02f203 Merge remote-tracking branch 'origin/ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-2' into ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-3 2021-01-14 09:22:06 +01:00
fbsanchez
96a8dbd0c8 added name method alias of nombre to Group class 2021-01-07 18:25:59 +01:00
fbsanchez
32d09a2353 added name method alias of nombre to Group class 2021-01-07 18:24:51 +01:00
José González
02475d25b6 Merge branch 'develop' into 'ent-1175-copyright-actualizados'
# Conflicts:
#   pandora_console/general/header.php
#   pandora_console/general/sap_view.php
2020-12-23 06:48:22 +01:00
Daniel Rodriguez
4b0fb7e762 Merge branch 'ent-6404-Bug-en-widget-Consolas-visuales-en-dashboard' into 'develop'
fix dashboard VC

See merge request artica/pandorafms!3650
2020-12-22 16:05:21 +01:00
Daniel Rodriguez
efb4dabd18 Merge branch 'ent-6632-Bug-dashboard-favorito-cuando-no-lo-es' into 'develop'
fixed query

See merge request artica/pandorafms!3602
2020-12-21 12:02:47 +01:00
José González
623b729001 Merge branch 'develop' into 'ent-1175-copyright-actualizados'
# Conflicts:
#   pandora_agents/pc/Win32/pandora_agent.conf
#   pandora_agents/win32/bin/pandora_agent.conf
#   pandora_console/extensions/realtime_graphs.php
#   pandora_console/godmode/snmpconsole/snmp_alert.php
#   pandora_console/include/functions_ui.php
#   pandora_console/install.php
#   pandora_console/operation/agentes/realtime_win.php
2020-12-14 11:10:35 +01:00
fbsanchez
6461f029ee Added macros to event response 2020-12-10 17:53:49 +01:00
Daniel Barbero Martin
aa52ab01df Fix loading charts modules and interfaces 2020-12-09 14:05:40 +01:00
Daniel Rodriguez
64509df179 Merge branch 'ent-6536-servicios-item-tipo-agente-desconocido-en-mapa-de-servicio' into 'develop'
Ent 6536 servicios item tipo agente desconocido en mapa de servicio

See merge request artica/pandorafms!3574
2020-11-30 14:29:43 +01:00
Jose Gonzalez
649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Daniel Barbero Martin
2e950af548 fix dashboard VC 2020-11-25 11:33:36 +01:00
fbsanchez
e9fb346ecd Definition matching Entity 2020-11-24 18:10:39 +01:00
Daniel Barbero Martin
1ad1671612 fix remove acl widget agent/module 2020-11-23 09:29:11 +01:00
fbsanchez
4e73d8045a Minor fixes 2020-11-17 11:07:59 +01:00
fbsanchez
916537ea11 Net Interfaces methods in Agent/Module updates in NetworkLink 2020-11-13 16:07:59 +01:00
alejandro-campos
c6cf4ab9ee fixed query 2020-11-11 16:25:58 +01:00
fbsanchez
d85c1ace3c WIP network links VC 2020-11-03 16:35:11 +01:00
fbsanchez
1c14fa4bcb Added -force- option to Agent::lastStatus 2020-10-26 17:12:55 +01:00
fbsanchez
633116a793 Added -force- option to Agent::lastStatus 2020-10-26 17:12:27 +01:00
alejandro-campos
def59508ae changed behavior of all group acl check and fixed acl vulnerabilities 2020-10-22 12:00:44 +02:00
fbsanchez
25295f7b0b fixes 2020-10-20 18:06:05 +02:00
Daniel Rodriguez
5ad265cbc8 Merge branch 'ent-6456-error-critico-operaciones-masivas-grupo-0' into 'develop'
Fix unhandled extra-options in group selector inclusions

See merge request artica/pandorafms!3518
2020-10-09 10:23:18 +02:00
fbsanchez
a4b2e38ffc Fix unhandled extra-options in group selector inclusions 2020-10-08 16:41:26 +02:00
fbsanchez
ff8aaf18fe Group event reports (with secondary groups) 2020-10-06 15:48:12 +02:00
fbsanchez
95f58776c8 fixes group selection 2020-09-30 17:47:44 +02:00
fbsanchez
5f4893ef1a Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos 2020-09-29 12:47:11 +02:00
fbsanchez
12314d33c3 fixed direct html responses with sl2 2020-09-28 16:02:54 +02:00