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

1030 Commits

Author SHA1 Message Date
Daniel Cebrian aae86cd7ee Merge branch 'develop' into ent-10012-item-grafico-coincidencias-informe-logs 2023-07-10 16:04:04 +02:00
Daniel Cebrian 496058e144 Merge branch 'develop' into ent-11437-automatic-logout-mechanism-has-been-disabled 2023-07-06 12:12:23 +02:00
Daniel Cebrian 24358b5e95 Merge branch 'develop' into ent-10012-item-grafico-coincidencias-informe-logs 2023-07-06 12:07:49 +02:00
Jonathan e9064dfd2f Merge branch 'develop' into ent-11093-reticula-en-consola-visual 2023-07-04 14:09:15 +02:00
Félix Suárez c926349c67 Update copyright years 2023-07-03 09:20:25 -06:00
Félix Suárez b886d8d17e Replace "artica.es" 2023-06-23 15:49:33 -06:00
Félix Suárez cfc34033b6 Replace "Artica Soluciones Tecnol[o,ó]gicas" 2023-06-23 15:14:57 -06:00
Daniel Cebrian ac294805ea #11437 unify session_max_time_expire with mr 2023-06-12 12:24:22 +02:00
Daniel Cebrian 1980458572 #11437 added new control session 2023-06-08 14:06:15 +02:00
Jonathan 0463d3bea3 #11093 grid position recolocation after drag 2023-06-08 13:54:05 +02:00
Jonathan dd375dc73e #11093 grid background VC 2023-06-07 12:46:39 +02:00
miguel angel rasteu 6c4ee040ff #11446 Fix create table 2023-06-02 13:05:15 +02:00
miguel angel rasteu c1dd5d39c5 #11446 Add column in tlayout_template_data 2023-06-02 13:03:20 +02:00
Daniel Cebrian e44fee7d3a Merge branch 'ent-10011-nuevo-item-tabla-de-coincidencias-informe-logs' into ent-10012-item-grafico-coincidencias-informe-logs 2023-05-30 12:04:11 +02:00
Alejandro Campos 988db793da Merge branch 'develop' into 'ent-10865-15337-15360-Macros-Custom-Fields-no-funcionan-en-modulos-SNMP' 
# Conflicts:
#   pandora_console/extras/mr/64.sql
 2023-05-24 09:20:14 +00:00
miguel angel rasteu 33d95ef00e #11117 Add new field in tusuario for metaconsole event default and fix selectors 2023-05-22 12:08:27 +02:00
miguel angel rasteu e0781801ac #11117 add new tusuario columns on pandoradb.sql 2023-05-19 13:40:20 +02:00
Alejandro Campos 097dc8ef12 Merge branch 'develop' into 'ent-10865-15337-15360-Macros-Custom-Fields-no-funcionan-en-modulos-SNMP' 
# Conflicts:
#   pandora_console/extras/mr/64.sql
 2023-05-17 07:41:02 +00:00
Daniel Cebrian 24848df3ba #1001 new item report for group elastic log 2023-05-10 17:47:20 +02:00
Jonathan 13f0e3db23 #10362 recursive group visual console 2023-05-09 16:45:44 +02:00
Jonathan 410a5efcd5 Merge branch 'develop' into ent-10185-filtros-personalizados-para-el-visor-de-datos-de-logs 2023-05-05 11:32:23 +02:00
Jonathan 51630d32ef #10185 filters log select group 2023-05-05 11:28:58 +02:00
Calvo 8c73a0176d Alert recuperation only executes one time if in threshold interval 2023-05-04 20:18:36 +02:00
alejandro.campos@artica.es 9f9aed4d77 add target ip field to remote components 2023-04-27 09:40:32 +02:00
alejandro.campos@artica.es a453ed7cea changes regarding encoding of tables 2023-04-21 15:16:51 +02:00
Jonathan e7186b99ba #10185 log viewer filter save/update/load 2023-04-20 16:21:29 +02:00
Daniel Rodriguez ccadd5157a Merge branch 'ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow' into 'develop' 
Ent 7427 nexcon datos de monitorizacion con origen en netflow

See merge request artica/pandorafms!5604
 2023-04-05 11:55:20 +00:00
Alejandro Campos e909686ddc Merge branch 'develop' into 'ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob' 
# Conflicts:
#   pandora_console/extras/mr/62.sql
 2023-03-28 14:09:33 +00:00
Calvo c4ef22164b Merge remote-tracking branch 'origin/develop' into ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow 2023-03-24 10:38:44 +01:00
Calvo cd2f8021f5 Updated MR netflow server 2023-03-21 12:12:54 +01:00
Calvo 1686a758b9 Updated MR netflow server 2023-03-21 12:11:07 +01:00
Calvo 803e23fbac Updated MR netflow server 2023-03-21 11:28:11 +01:00
Daniel Maya 1d4aeef893 Merge branch 'develop' into ent-9893-nuevo-sistema-de-ha 2023-03-16 10:10:16 +01:00
Calvo ebc36625d5 FIX MR 2023-03-15 09:24:53 +01:00
Calvo 1be124059e FIX MR 2023-03-14 19:48:49 +01:00
Calvo 6950624cc9 Added new netflow server filters form 2023-03-14 18:55:43 +01:00
Daniel Maya b446e89728 Merge branch 'develop' into ent-9893-nuevo-sistema-de-ha 2023-03-13 15:08:44 +01:00
Daniel Cebrian dfa2ab818e Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-13 08:53:35 +01:00
alejandro.campos@artica.es 39a119d150 Merge remote-tracking branch 'origin/develop' into ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob 2023-03-10 13:29:20 +01:00
Daniel Cebrian 841478a86c Merge branch 'develop' into 'ent-9073-nuevo-sistema-de-tips-de-bienvenida' 
# Conflicts:
#   pandora_console/pandoradb.sql
 2023-03-10 10:41:08 +00:00
Daniel Maya d6dec9d869 #9893 merge develop 2023-03-09 16:27:47 +01:00
Jonathan 63ecb7eb0b Tree view metaconsole view like nodo 2023-03-08 15:45:18 +01:00
Daniel Cebrian 3ec11f4c9d Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-08 12:55:53 +01:00
Daniel Cebrian a4634717d8 Merge branch 'develop' into ent-9073-nuevo-sistema-de-tips-de-bienvenida 2023-03-07 13:49:39 +01:00
Daniel Maya 297a21c11d Merge branch 'develop' into 'ent-9893-nuevo-sistema-de-ha' 
# Conflicts:
#   pandora_console/extras/mr/62.sql
 2023-03-03 09:18:56 +00:00
Daniel Maya b5ea1c5868 #9893 Added mr 2023-03-03 10:15:02 +01:00
Alejandro Campos 3ddb3c1034 Merge branch 'develop' into 'ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob' 
# Conflicts:
#   pandora_console/extras/mr/62.sql
#   pandora_console/pandoradb.sql
 2023-03-03 08:12:57 +00:00
Alejandro Campos f297f6fff9 Merge branch 'develop' into 'ent-10008-Gestion-de-busquedas-en-la-vista-de-agentes-y-mejora-de-las-busquedas' 
# Conflicts:
#   pandora_console/extras/mr/62.sql
#   pandora_console/pandoradb.sql
 2023-03-02 16:53:42 +00:00
Jonathan 590ddc827c #9819 Change MR and add pandoradb.sql create table teventsound 2023-03-02 08:29:06 +01:00
Alejandro Campos f94c7e2a04 Merge branch 'develop' into 'ent-10008-Gestion-de-busquedas-en-la-vista-de-agentes-y-mejora-de-las-busquedas' 
# Conflicts:
#   pandora_console/extras/mr/62.sql
 2023-02-28 16:11:46 +00:00