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

29987 Commits

Author SHA1 Message Date
fbsanchez 4d912fbd34 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-11 09:55:34 +01:00
Daniel Barbero Martin aa2dac1373 new item report agent/modules status pandora_enterprise#7653 2022-02-11 09:28:28 +01:00
Daniel Barbero Martin e8d5c77f3c Merge remote-tracking branch 'origin/develop' into ent-7653-Nuevo-informe-de-estados-de-modulos-de-agentes 2022-02-11 08:20:49 +01:00
artica a39232f227 Auto-updated build strings. 2022-02-11 01:00:23 +01:00
Daniel Rodriguez 0fe50cf938 Merge branch 'ent-8568-error-sql-cargar-filtro-eventos' into 'develop' 
Fix issue with filters in SQL query

Closes pandora_enterprise#8568

See merge request artica/pandorafms!4690
 2022-02-10 18:41:24 +00:00
fbsanchez 9ba2eb0c74 Merge remote-tracking branch 'origin/develop' into ent-8161-deshabilitar-reglas-de-autoconfiguracion-en-nodos-a-demanda 
Conflicts:
	pandora_console/extras/mr/52.sql
	pandora_console/pandoradb.sql
 2022-02-10 18:52:51 +01:00
Rafael Ameijeiras 68bbea6cdc adding beta package option to online installer 2022-02-10 18:03:49 +01:00
Daniel Rodriguez 6ac74c7a3a Merge branch 'ent-8526-dar-soporte-a-rocky-y-alma-en-el-instalador-online-del-agente' into 'develop' 
adding pandora agent deploy support to alma and rocky

See merge request artica/pandorafms!4681
 2022-02-10 16:06:38 +00:00
Daniel Barbero Martin 2a37503f2e new item report agent/modules status pandora_enterprise#7653 2022-02-10 16:33:58 +01:00
Jose Gonzalez 034329d96d Fix issue with filters in SQL query 2022-02-10 16:09:53 +01:00
Daniel Rodriguez af400e0043 Merge branch 'ent-8461-13016-bloqueo-discovery-con-tarea-oracle' into 'develop' 
Added signal control in eval (discovery)

See merge request artica/pandorafms!4650
 2022-02-10 14:57:20 +00:00
Daniel Rodriguez f771e2bf9e Merge branch 'ent-8422-Revision-completa-audit-logs' into 'develop' 
Ent 8422 revision completa audit logs

Closes pandora_enterprise#8422

See merge request artica/pandorafms!4669
 2022-02-10 14:20:42 +00:00
Daniel Rodriguez 3f5b9a21f9 Merge branch 'ent-8552-fallo-subida-pspz-y-pspz2' into 'develop' 
Ent 8552 fallo subida pspz y pspz2

See merge request artica/pandorafms!4684
 2022-02-10 14:10:36 +00:00
Daniel Rodriguez 8f59f4158f Merge branch 'ent-8435-11626-Vulnerabilidad-JQuery' into 'develop' 
Ent 8435 11626 vulnerabilidad j query

See merge request artica/pandorafms!4683
 2022-02-10 11:05:53 +00:00
Jose Gonzalez 1e1ae95635 Fix issue with collapse icon 2022-02-10 10:28:43 +01:00
artica 1d86c1ea48 Auto-updated build strings. 2022-02-10 01:00:21 +01:00
Daniel Barbero Martin b56c9e6529 new modal planned_downtime resume agents/modules pandora_enterprise#5886 2022-02-09 14:57:36 +01:00
Jose Gonzalez b13b2b144b Added some fixes 2022-02-09 12:30:48 +01:00
Daniel Barbero Martin 625438c1c3 clean file planned_downtime pandora_enterprise#5886 2022-02-09 10:51:18 +01:00
artica 98fc41c385 Auto-updated build strings. 2022-02-09 01:00:22 +01:00
fbsanchez 4a61efd7b6 added tpolicy_group_agents 2022-02-08 22:52:54 +01:00
fbsanchez e26aca338a Merge remote-tracking branch 'origin/develop' into ent-6375-proyectos-auto-aplicacion-de-politicas 2022-02-08 22:08:37 +01:00
Jose Gonzalez 3d4146c926 Minor fix 2022-02-08 17:54:37 +01:00
fbsanchez 83d8b5348f pol group api create agent auto-assign fix 2022-02-08 17:54:14 +01:00
Daniel Rodriguez cc2685676a Merge branch 'ent-8486-datos-discovery-sap-al-reves' into 'develop' 
patterns for text inputs

See merge request artica/pandorafms!4655
 2022-02-08 16:17:38 +00:00
Daniel Barbero Martin 1dd9ff568e Merge remote-tracking branch 'origin/develop' into ent-7063-Informes-de-servicio-en-Meta 
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
 2022-02-08 14:34:59 +01:00
Daniel Barbero Martin 07ed6689d6 external alerts new filters pandora_enterprise#7933 2022-02-08 13:56:19 +01:00
fbsanchez 6bb754d5d2 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 
Conflicts:
	pandora_console/pandoradb.sql
 2022-02-08 13:02:22 +01:00
José González fc4b702db0 Merge branch 'develop' into 'ent-8422-Revision-completa-audit-logs' 
# Conflicts:
#   pandora_console/godmode/alerts/configure_alert_template.php
 2022-02-08 11:35:01 +00:00
Daniel Rodriguez f659016c6f Merge branch 'ent-3943-Plantillas-de-alerta-con-varios-horarios' into 'develop' 
WIP #3943

Closes pandora_enterprise#3943

See merge request artica/pandorafms!4595
 2022-02-08 11:29:34 +00:00
Jose Gonzalez 995095afc7 Fixed issue with web_available token 2022-02-08 11:56:12 +01:00
Luis 352e0992d6 Event response creation name required 2022-02-08 10:58:23 +01:00
Luis 4eade30e48 Merge remote-tracking branch 'origin/develop' into ent-8552-fallo-subida-pspz-y-pspz2 2022-02-08 10:03:31 +01:00
Luis 611cac2340 Fix plugin registration pspz pspz2 2022-02-08 10:01:17 +01:00
Daniel Barbero Martin ba6d6f9107 calendar not editable pandora_enterprise#3943 2022-02-08 09:38:42 +01:00
artica b47003a7b4 Auto-updated build strings. 2022-02-08 01:00:17 +01:00
fbsanchez f1a3d40309 removed policy stuff from massive edition (agents) 2022-02-07 18:58:00 +01:00
fbsanchez 3f52679969 removed policy stuff from api update_agent_field 2022-02-07 18:56:58 +01:00
fbsanchez d6b6357e98 removed policy stuff from api update_agent 2022-02-07 18:54:24 +01:00
fbsanchez e9249d550a removed policy stuff from configurar_agente 2022-02-07 18:53:31 +01:00
fbsanchez 3caa8fd14f Merge remote-tracking branch 'origin/develop' into ent-6375-proyectos-auto-aplicacion-de-politicas 2022-02-07 18:32:10 +01:00
Daniel Rodriguez bb066d5c9f Merge branch 'ent-8549-quitar-el-syslog-server-como-habilitado-por-defecto' into 'develop' 
disabling syslog by default

See merge request artica/pandorafms!4680
 2022-02-07 17:23:45 +00:00
Daniel Rodriguez 3fbbaf031c Merge branch 'ent-8273-modificar-item-last-value-en-reports' into 'develop' 
Report item last value shows last value on selected interval

See merge request artica/pandorafms!4660
 2022-02-07 17:22:11 +00:00
Daniel Rodriguez 279ddb0eeb Merge branch 'ent-7978-timeout-en-ejecuciones-de-plugins' into 'develop' 
Add a timeout message for Plug-in modules.

See merge request artica/pandorafms!4656
 2022-02-07 17:19:51 +00:00
Jose Gonzalez 351b8fcb97 Fix 2022-02-07 16:44:21 +01:00
fbsanchez 838b6b30e9 php8 compatibility review 2022-02-07 14:32:59 +01:00
fbsanchez 849ab9820e php72 fallback compat 2022-02-07 13:58:42 +01:00
fbsanchez 331f8e8906 php8 incompatibility fixes 2022-02-07 13:48:25 +01:00
fbsanchez ef01e19de9 php8 incompatibility fixes 2022-02-07 13:40:42 +01:00
fbsanchez 412104300c php8 incompatibility fixes 2022-02-07 13:38:45 +01:00