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

669 Commits

Author SHA1 Message Date
Calvo 0c2823f23f Merge remote-tracking branch 'origin/develop' into ent-8590-indicar-a-que-satelite-pertenece-un-agente 2022-06-17 12:38:11 +02:00
Daniel Rodriguez 709b49a371 Merge branch 'ent-9134-Falta-campo-disable-de-tabla-autoconfig-en-pandoradb.sql' into 'develop' 
Ent 9134 falta campo disable de tabla autoconfig en pandoradb.sql

See merge request artica/pandorafms!4954
 2022-06-14 12:10:22 +00:00
Daniel Maya 519fd13299 #9134 Added dsiabled in mr 2022-06-09 15:22:14 +02:00
Calvo 5297123d17 Console changes for 8950 2022-06-08 13:10:01 +02:00
alejandro.campos@artica.es 6f0782782e Merge remote-tracking branch 'origin/develop' into ent-8838-Longitud-id-user-tusuario 2022-06-08 11:54:35 +02:00
alejandro.campos@artica.es 12b0f5cda1 database changes 2022-06-08 11:49:48 +02:00
Daniel Maya ea16aac7af #8897 conflict resolved 2022-06-06 11:18:14 +02:00
Alejandro Campos 91d949942a Merge branch 'develop' into 'ent-8838-Longitud-id-user-tusuario' 
# Conflicts:
#   pandora_console/extras/mr/55.sql
 2022-06-03 10:26:35 +00:00
Daniel Rodriguez 0a51c5f916 Merge branch 'ent-8587-nueva-representacion-de-servicios-sunburst' into 'develop' 
Ent 8587 nueva representacion de servicios sunburst

See merge request artica/pandorafms!4819
 2022-06-02 07:21:17 +00:00
Daniel Maya fc7b4d8a11 #8897 Fixed tdashboard name 2022-05-25 13:13:09 +02:00
Daniel Maya 0d3b14da40 #9005 Added lts_name 2022-05-23 13:00:01 +02:00
alejandro.campos@artica.es 5c789125f2 changed id_user field length from tusuario 2022-05-09 12:40:36 +02:00
Daniel Maya aad40cb004 #8897 name changed 2022-05-04 16:11:08 +02:00
José González e272003396 Fix 2022-04-25 10:52:15 +02:00
Daniel Maya 9f1be4531b #8587 Added sunburst 2022-04-12 17:24:47 +02:00
fbsanchez 9406fa2c09 switch order of drops in MR 2022-04-08 11:31:36 +02:00
fbsanchez 037bf016fb Swap some stuff in MR becouse some environments had FK in deprecated tables 2022-04-07 17:26:14 +02:00
fbsanchez 686ba0a5a5 Merge remote-tracking branch 'origin/develop' into ent-8731-umc-en-vendor 
Conflicts:
	pandora_console/extras/mr/53.sql
 2022-04-07 09:44:12 +02:00
Daniel Barbero Martin c049f18bf1 Merge remote-tracking branch 'origin/develop' into ent-8540-contel-nuevo-informe-custom-render 2022-04-05 08:20:21 +02:00
Daniel Rodriguez 71fef65f35 Merge branch 'ent-8340-POST-Custom-data-en-vista-de-eventos' into 'develop' 
implemented custom data filter in event view

See merge request artica/pandorafms!4787
 2022-04-04 10:38:30 +00:00
Daniel Barbero Martin 318ac668e9 add new report custom render pandora_enterprise#8540 2022-03-31 20:11:52 +02:00
fbsanchez e70c85fc65 Merge remote-tracking branch 'origin/develop' into ent-8731-umc-en-vendor 2022-03-30 15:05:04 +02:00
fbsanchez 2d334f7860 Historical view for update manager 2022-03-30 14:41:47 +02:00
Daniel Rodriguez 134ee890eb Merge branch 'ent-8300-gestion-ejecucion-console-tasks' into 'develop' 
Added enable console task feature

See merge request artica/pandorafms!4776
 2022-03-30 09:29:22 +00:00
Alejandro Campos 3e5865b539 Merge branch 'develop' into 'ent-8340-POST-Custom-data-en-vista-de-eventos' 
# Conflicts:
#   pandora_console/extras/mr/53.sql
 2022-03-30 08:03:08 +00:00
alejandro.campos@artica.es d137e0d798 implemented custom data filter in event view 2022-03-29 18:09:19 +02:00
Daniel Maya 44e93fa1ed #8693 Emptying collate for alias and nombre 2022-03-28 13:48:33 +02:00
José González 187a633bae Fix mistake 2022-03-25 11:19:41 +00:00
José González cae8290c77 Missed MR file 2022-03-24 14:20:20 +01:00
Alejandro Campos 0c41459b83 Merge branch 'develop' into 'ent-8607-12764-Agregar-columna-IDs-personalizadas-a-VLANs-en-IPAM' 
# Conflicts:
#   pandora_console/extras/mr/53.sql
 2022-03-16 14:07:23 +00:00
Daniel Rodriguez 4dc6f7764c Merge branch 'ent-8400-borrado-backups-generados-por-tareas-de-consolas' into 'develop' 
Missed tables

See merge request artica/pandorafms!4721
 2022-03-15 10:09:32 +00:00
Daniel Rodriguez 953aa2887c Merge branch 'ent-6375-proyectos-auto-aplicacion-de-politicas' into 'develop' 
some tools for policy-auto-application

See merge request artica/pandorafms!4526
 2022-03-01 12:53:36 +00:00
fbsanchez 182fac98f1 Missed tables 2022-02-24 18:27:57 +01:00
alejandro.campos@artica.es c319c30e24 added new field to ipam vlan 2022-02-24 13:58:04 +01:00
Daniel Rodriguez 3f7067fe48 Merge branch 'ent-I-do-now-like-procedures' into 'develop' 
Allow both behaviours in alert time slots

See merge request artica/pandorafms!4711
 2022-02-24 09:55:40 +00:00
alejandro.campos@artica.es bf88c54480 added new field to ipam vlan 2022-02-24 09:35:12 +01:00
fbsanchez deb46436d3 Merge remote-tracking branch 'origin/develop' into ent-6375-proyectos-auto-aplicacion-de-politicas 
Conflicts:
	pandora_console/extras/mr/52.sql
 2022-02-23 12:11:44 +01:00
Daniel Barbero Martin 9dc7c77cb0 remove procedure and retrocompatibility pandora_enterprise#3943 2022-02-23 10:58:38 +01:00
Daniel Barbero Martin 237a7feb98 remove procedure and retrocompatibility pandora_enterprise#3943 2022-02-22 13:20:53 +01:00
fbsanchez ef75a260d0 Merge remote-tracking branch 'origin/develop' into ent-8508-cepsa-correlation-server-no-encola-alertas-en-alert-server 2022-02-21 17:58:32 +01:00
Calvo 5ba7b47b85 Merge remote-tracking branch 'origin/develop' into ent-7049-permitir-seleccionar-a-nivel-de-usuario-si-autenticara-local-o-remotamente-ldap-ad 2022-02-18 09:26:55 +01:00
fbsanchez 261fbe0ba3 Merge remote-tracking branch 'origin/develop' into ent-8508-cepsa-correlation-server-no-encola-alertas-en-alert-server 
Conflicts:
	pandora_console/extras/mr/52.sql
	pandora_console/pandoradb.sql
 2022-02-16 10:17:24 +01:00
fbsanchez bed223e27d latest changes 2022-02-14 11:04:01 +01: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
fbsanchez 4a61efd7b6 added tpolicy_group_agents 2022-02-08 22:52:54 +01:00
fbsanchez fcfb5e0d2a Schema, allow certain autoconfigurations being disabled on MC environments 2022-02-07 11:26:36 +01:00
fbsanchez cea110e209 Alert server improved 2022-02-02 13:37:45 +01:00
Calvo f1dca5e525 Merge remote-tracking branch 'origin/develop' into ent-7049-permitir-seleccionar-a-nivel-de-usuario-si-autenticara-local-o-remotamente-ldap-ad 2022-02-02 10:38:53 +01:00
Calvo 293c1cfb3a Chaged to correct MR 2022-02-02 10:36:54 +01:00
Daniel Barbero Martin b91109d747 Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios 2022-02-02 08:06:05 +01:00