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

21464 Commits

Author SHA1 Message Date
Calvo 888915a1c1 Fix reource registraton error 500 on empty or bad ptr file 2021-04-21 17:04:11 +02:00
Calvo 371f87bcdf Fixed bug on api call create_agent 2021-04-21 15:47:56 +02:00
alejandro.campos@artica.es 8f58b74976 fixed filter load in events view 2021-04-21 13:05:18 +02:00
vgilc c99e810b54 Merge branch 'ent-7331-Bug-en-background-de-widgets-dashboards' into 'develop' 
Fixed errors widgets background black-theme and required group

See merge request artica/pandorafms!4044
 2021-04-21 09:29:10 +00:00
vgilc ac8f669b8e Merge branch 'ent-7338-spinner-infinito-input-agent-grouped-general' into 'develop' 
Fixed infinite spinner on agent field grouped general report

See merge request artica/pandorafms!4046
 2021-04-21 09:28:40 +00:00
Calvo 00e61aba79 Fixed infinite spinner on agent field grouped general report 2021-04-21 10:59:39 +02:00
fbsanchez 9d8079ad77 minor method Group 2021-04-21 10:26:33 +02:00
Calvo 29e7f44cda Fixed visual bugs on search view reports 2021-04-21 09:41:25 +02:00
Daniel Barbero Martin 41fe646461 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-21 09:17:35 +02:00
Daniel Barbero Martin eb5704a660 Fixed errors widgets background black-theme and required group 2021-04-21 08:57:12 +02:00
artica d4d7494e27 Auto-updated build strings. 2021-04-21 01:00:16 +02:00
fbsanchez 37e3f68b18 minor fix 2021-04-20 14:08:27 +02:00
Daniel Barbero Martin 100ae705f8 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-20 13:33:40 +02:00
fbsanchez b33104c641 Fixed notifications when not fully configured 2021-04-20 13:19:19 +02:00
fbsanchez c601bde472 Dump autoload updated 2021-04-20 11:10:38 +02:00
fbsanchez 36df48c621 Some improvements in Group class 2021-04-20 11:09:07 +02:00
vgilc 3c7fc18abb Merge branch 'ent-7288-correlacion-eventos-no-permite-crear-condiciones-complejas' into 'develop' 
reviewing correlated alerts

See merge request artica/pandorafms!4024
 2021-04-20 07:56:04 +00:00
vgilc a990689e59 Merge branch 'ent-7268-Falla-sincronizacion-de-inventario-Integria-Pandora' into 'develop' 
changed request protocol

See merge request artica/pandorafms!4033
 2021-04-20 07:31:13 +00:00
vgilc 55677850a6 Merge branch 'ent-7317-11690-problema-grave-consolas-visuales-modo-legacy-activado' into 'develop' 
fixeed visual error vc legacy mode

See merge request artica/pandorafms!4036
 2021-04-20 07:30:11 +00:00
Daniel Barbero Martin b8b9fa561f Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-20 08:07:21 +02:00
artica 20fe99ef29 Auto-updated build strings. 2021-04-20 01:00:15 +02:00
artica 3737d61793 Updated version and build strings. 2021-04-19 16:09:29 +02:00
fbsanchez 0a6fd37913 minor style change 2021-04-19 14:51:22 +02:00
fbsanchez 50f580c112 Merge remote-tracking branch 'origin/develop' into ent-7288-correlacion-eventos-no-permite-crear-condiciones-complejas 2021-04-19 14:35:59 +02:00
marcos 4655668ca4 fixeed visual error vc legacy mode 2021-04-19 14:16:30 +02:00
marcos 6ebb6f6843 fixeed visual error vc legacy mode 2021-04-19 12:59:52 +02:00
Daniel Rodriguez 71af7103d1 Merge branch 'ent-7267-Fallo-al-meter-comentario-en-ticket-desde-pandora-integracion-integria-pandora' into 'develop' 
fixed bug on integria api calls

See merge request artica/pandorafms!4034
 2021-04-19 07:19:15 +00:00
Daniel Rodriguez 59ec6c850d Merge branch 'ent-6387-limitar-agentes-por-grupo' into 'develop' 
Added control for max agents in groups

Closes pandora_enterprise#6387

See merge request artica/pandorafms!3800
 2021-04-19 07:17:56 +00:00
Daniel Barbero Martin 0966d3d662 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-19 08:42:46 +02:00
artica 08abb25fc4 Auto-updated build strings. 2021-04-19 01:00:13 +02:00
artica 1030ef052a Auto-updated build strings. 2021-04-18 01:00:13 +02:00
artica 9ec945fa3c Auto-updated build strings. 2021-04-17 01:00:15 +02:00
alejandro.campos@artica.es 2732c6db1c fixed bug in api call 2021-04-16 11:22:29 +02:00
alejandro.campos@artica.es 3ff361977c check page load protocol on integria setup 2021-04-16 10:02:34 +02:00
Jose Gonzalez 8e503086a2 Event type changed 2021-04-16 09:51:11 +02:00
Jose Gonzalez 494666244d Fixed stupid bug 2021-04-16 09:10:38 +02:00
Daniel Barbero Martin 004b73f63d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-16 08:29:11 +02:00
artica f585e44692 Auto-updated build strings. 2021-04-16 01:00:41 +02:00
Jose Gonzalez 0e12402469 Fixed message issue 2021-04-15 21:20:59 +02:00
Jose Gonzalez 93d70da822 Modified function 2021-04-15 21:20:34 +02:00
Daniel Barbero Martin 741ec6a144 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-15 17:41:56 +02:00
Daniel Rodriguez 8cc4ddc9e0 Merge branch 'ent-7293-bug-visual-selector-ip-agente' into 'develop' 
Agent conf ip selector visual fix

See merge request artica/pandorafms!4030
 2021-04-15 14:53:32 +00:00
Jose Gonzalez a6936f16d5 Cleaned event create control for centralized management 2021-04-15 15:50:10 +02:00
fbsanchez 3bc8f6c4ac Merge remote-tracking branch 'origin/develop' into ent-7288-correlacion-eventos-no-permite-crear-condiciones-complejas 2021-04-15 15:33:14 +02:00
Jose Gonzalez 3d3beca727 Added feature of generate event 2021-04-15 15:06:48 +02:00
Daniel Rodriguez 5fbd209a73 Merge branch 'ent-1516-dias-de-la-semana-aparecen-siempre-en-ingles' into 'develop' 
fixed error with weeckly days sla

See merge request artica/pandorafms!3951
 2021-04-15 12:37:38 +00:00
Marcos Alconada 798c1d060f fixed error with weeckly days sla 2021-04-15 12:37:38 +00:00
Daniel Rodriguez 4c46caac72 Merge branch 'ent-4263-idgets-dashboard-en-black-them-que-falta-por-adaptar' into 'develop' 
Ent 4263 idgets dashboard en black them que falta por adaptar

See merge request artica/pandorafms!4031
 2021-04-15 12:36:58 +00:00
marcos e506523fff fixed minnor error 2021-04-15 13:55:14 +02:00
alejandro.campos@artica.es 8021b53763 fixed bug on integria api calls 2021-04-15 13:46:28 +02:00
Marcos Alconada 317bf0da3d minnor error fixed 2021-04-15 10:33:31 +00:00
alejandro.campos@artica.es ada6bccfd6 changed request protocol 2021-04-15 12:12:06 +02:00
Jose Gonzalez a69666aad9 Added Event class 2021-04-15 12:00:32 +02:00
Jose Gonzalez ff177c544d Modified and adapted Event class 2021-04-15 12:00:00 +02:00
marcos 24099644be remove log 2021-04-15 11:22:24 +02:00
fbsanchez 2e45e0bde4 Fixes in table tevent_rule definition 2021-04-15 10:35:21 +02:00
Daniel Barbero Martin c28ea4cc9a Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-15 08:40:58 +02:00
artica fe9109e585 Auto-updated build strings. 2021-04-15 01:00:43 +02:00
fbsanchez 21d72f41f9 Revert "Revert "Update tevent_rule schema"" 
This reverts commit 2b05cde214.

 Changes to be committed:
	modified:   pandora_console/extras/mr/46.sql
	modified:   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	modified:   pandora_console/pandoradb.sql
 2021-04-15 00:20:42 +02:00
fbsanchez 2b05cde214 Revert "Update tevent_rule schema" 
This reverts commit a80e50b730.

 Changes to be committed:
	modified:   pandora_console/extras/mr/46.sql
	modified:   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	modified:   pandora_console/pandoradb.sql
 2021-04-14 21:42:19 +02:00
fbsanchez a80e50b730 Update tevent_rule schema 2021-04-14 21:39:58 +02:00
Daniel Rodriguez a93a3b7967 Merge branch 'ent-6933-fix-inconsistency-in-alerts-group-profiles-revised' into 'develop' 
Fixed and improved alert functions.

See merge request artica/pandorafms!3957
 2021-04-14 13:15:29 +00:00
marcos 48cc1283cc add black theme to widget dashboard 2021-04-14 15:09:19 +02:00
Jose Gonzalez f684cef491 Changed audit log for event and refactor 2021-04-14 12:16:28 +02:00
marcos b6ea565118 add black theme to widget dashboard 2021-04-14 12:07:38 +02:00
Daniel Rodriguez 1d6c7c6eed Merge branch 'ent-6782-revision-general-de-la-consola-movil' into 'develop' 
SAML login in mobile console

See merge request artica/pandorafms!3733
 2021-04-14 07:39:29 +00:00
fbsanchez 3dc49bea23 Merge remote-tracking branch 'origin/develop' into ent-7288-correlacion-eventos-no-permite-crear-condiciones-complejas 2021-04-14 09:38:44 +02:00
Calvo 3396af66b0 Agent conf ip selector visual fix 2021-04-14 09:26:19 +02:00
Daniel Barbero Martin 1b21652ed2 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-14 08:35:02 +02:00
artica 46291eed66 Auto-updated build strings. 2021-04-14 01:00:15 +02:00
Daniel Rodriguez 72480bdb1a Merge branch 'ent-7287-selectores-desplegados-en-home-screen' into 'develop' 
fixed visual error selects home view

See merge request artica/pandorafms!4028
 2021-04-13 14:48:36 +00:00
Daniel Rodriguez fff13ad2ac Merge branch 'ent-6377-proyectos-amazon-s3-en-el-discovery' into 'develop' 
Minor changes

See merge request artica/pandorafms!3930
 2021-04-13 14:31:37 +00:00
marcos 0500b90101 fixed visual error selects home view 2021-04-13 16:29:28 +02:00
marcos 87362d07f4 fixed visual error selects home view 2021-04-13 15:37:44 +02:00
marcos 4f803c8abb fixed visual error selects home view 2021-04-13 13:23:22 +02:00
Jose Gonzalez 3d359dab36 Fixed merge with 7161 2021-04-13 12:55:35 +02:00
Daniel Rodriguez 751d7ec3cf Merge branch 'ent-7161-Cambiar-opciones-de-skin-en-usuarios-y-grupos' into 'develop' 
Ent 7161 cambiar opciones de skin en usuarios y grupos

See merge request artica/pandorafms!3972
 2021-04-13 09:26:50 +00:00
Daniel Maya 9bbac06771 Ent 7161 cambiar opciones de skin en usuarios y grupos 2021-04-13 09:26:50 +00:00
José González 4a028b2ee3 Merge branch 'develop' into 'ent-6387-limitar-agentes-por-grupo' 
# Conflicts:
#   pandora_console/extras/mr/46.sql
 2021-04-13 07:52:48 +00:00
Daniel Barbero Martin aa31ed8f58 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-13 08:34:05 +02:00
artica c33f2182ff Auto-updated build strings. 2021-04-13 01:00:16 +02:00
fbsanchez 1b4251cf49 minor improvement, disabledElements 2021-04-12 20:10:58 +02:00
fbsanchez 6a220208b4 reviewing correlated alerts 2021-04-12 19:16:39 +02:00
Daniel Rodriguez a6f2b364f6 Merge branch 'ent-7281-Aumentar-carácteres-de-la-caja-de-consulta-SQL-en-Informes' into 'develop' 
Ent 7281 aumentar carácteres de la caja de consulta sql en informes

See merge request artica/pandorafms!4014
 2021-04-12 14:44:33 +00:00
Daniel Maya 8a27517cc5 Ent 7281 aumentar carácteres de la caja de consulta sql en informes 2021-04-12 14:44:33 +00:00
Daniel Rodriguez b4e469c463 Merge branch 'ent-7040-forzar-URL-publica-meta' into 'develop' 
Reverted failed change

Closes pandora_enterprise#7040

See merge request artica/pandorafms!4007
 2021-04-12 14:40:28 +00:00
Jose Gonzalez 3b4927e9b0 Fixed missed params to update max_agents 2021-04-12 13:20:21 +02:00
Daniel Rodriguez eeff80638f Merge branch 'ent-3059-revision-de-la-funcion-metaconsole_connect' into 'develop' 
multiple fixes

See merge request artica/pandorafms!3812
 2021-04-12 10:39:41 +00:00
Daniel Rodriguez 9184d2b11f Merge branch 'ent-6857-implementar-control-de-descarga-csv-del-log-viewer-en-metaconsola' into 'develop' 
Ent 6857 implementar control de descarga csv del log viewer en metaconsola

See merge request artica/pandorafms!3917
 2021-04-12 08:48:16 +00:00
Daniel Rodriguez 79b11a6b30 Merge branch 'ent-4264-cambios-vista-de-eventos' into 'develop' 
Ent 4264 cambios vista de eventos

See merge request artica/pandorafms!3893
 2021-04-12 08:47:13 +00:00
Jose Gonzalez 141daec1ab Missed value for add 2021-04-12 10:42:13 +02:00
Daniel Rodriguez 558ba562ee Merge branch 'ent-7292-bug-creacion-grupos' into 'develop' 
Added boolean casting for check acl

Closes pandora_enterprise#7292

See merge request artica/pandorafms!4016
 2021-04-12 08:17:34 +00:00
Daniel Barbero Martin 319a329aec Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-12 08:04:04 +02:00
artica 4a071237b4 Auto-updated build strings. 2021-04-12 01:00:26 +02:00
artica 3627be1f85 Auto-updated build strings. 2021-04-11 01:00:32 +02:00
artica ea81d04e5f Auto-updated build strings. 2021-04-10 01:00:37 +02:00
Daniel Barbero Martin 37fe9bfafb WIP command center 2021-04-09 14:27:12 +02:00
Jose Gonzalez 62264c9d07 Added boolean casting for check acl 2021-04-09 14:05:33 +02:00
Daniel Rodriguez bcb0832309 Merge branch 'ent-7070-archivo-raro-0-en-pandoa_console' into 'develop' 
Avoid file 0 with log in pandora_console

See merge request artica/pandorafms!3863
 2021-04-09 11:53:26 +00:00
Marcos Alconada dafa88c27d Ent 7266 black theme mala implementacion de vista de ticket integracion integria 2021-04-09 10:00:11 +00:00