tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-15 23:08:44 +02:00
Code Issues Packages Projects Releases Wiki Activity
35,587 Commits 34 Branches 30 Tags
Commit Graph

1668 Commits

Author SHA1 Message Date
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
5470e4d749 Merge branch 'develop' into 'ent-11117-edicion-usuario-entorno-meta-nodo' 
# Conflicts:
#   pandora_console/extras/mr/64.sql
#   pandora_console/godmode/users/user_management.php
 2023-05-19 10:25:31 +00:00
miguel angel rasteu
efc2990a5c #11117 Fix homscreen in metaconsole 2023-05-19 10:49:16 +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
Jonathan
7b414c6b69 #10362 change MR 64 correction ticket #11109 2023-05-17 09:39:35 +02:00
Jonathan
e87da5e1e5 #10362 change MR after change Milestone 2023-05-17 08:09:26 +02:00
Jonathan
0ee3692d5b Merge branch 'develop' into ent-10362-15039-fallo-en-groups-items-de-consolas-visuales 2023-05-17 08:06:03 +02:00
Daniel Rodriguez
018f024815 Merge branch 'ent-11109-cambiar-estado-de-seleccion-por-defecto-de-power-supply-en-snmp-wizard' into 'develop' 
Draft: Ent 11109 cambiar estado de seleccion por defecto de power supply en snmp wizard

See merge request artica/pandorafms!5846
 2023-05-16 10:32:20 +00:00
Daniel Cebrian
37f24d3b5f #10011 fixed mr 2023-05-11 14:54:34 +02: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
Jorge Rincon
b8611573f2 #11109 Default value of the module_enabled field to 1 from the tnetwork_component table 2023-05-08 10:55:13 +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
56a587791c Change correct MR 2023-05-05 09:10:49 +02:00
Calvo
8c73a0176d Alert recuperation only executes one time if in threshold interval 2023-05-04 20:18:36 +02:00
Alejandro Campos
9e1caceb11 Merge branch 'develop' into 'ent-10908-Fallo-en-el-editor-de-tips' 
# Conflicts:
#   pandora_console/extras/mr/63.sql
 2023-05-03 07:11:28 +00:00
Jonathan
305a853281 Merge branch 'develop' into ent-10185-filtros-personalizados-para-el-visor-de-datos-de-logs 2023-04-28 10:18:31 +02:00
Jonathan
d0281443a4 #10185 MR 63.sql 2023-04-28 10:07:55 +02:00
Jonathan
afa26e45db #10185 change MR 63 to 64.sql 2023-04-28 09:16:29 +02:00
alejandro.campos@artica.es
9f9aed4d77 add target ip field to remote components 2023-04-27 09:40:32 +02:00
Daniel Cebrian
966dc63a92 #9771 changes in summary and new fields for trecon_task 2023-04-26 17:16:34 +02:00
Daniel Cebrian
cc2ab53db4 Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-04-26 13:02:13 +02:00
Jonathan
442daf0282 #11001 change MR 63 to 64 2023-04-25 14:28:51 +02:00
Jonathan
dfffed1912 #11001 fix sql error MR 2023-04-25 10:07:27 +02:00
Jonathan
cde914fb69 #11001 welcome tips english version 2023-04-25 09:10:34 +02:00
Jonathan
6a2d5165f8 #10960 remove alter table MR 63.sql 2023-04-24 07:48: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 Cebrian
7514195572 #9771 added mr 63 2023-04-18 15:56:50 +02:00
Jonathan
f026c76f69 #10960 fix mr63.sql add tsesion_filter 2023-04-18 11:27:07 +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
834be58631 Fix erorrs 2023-03-21 12:28:46 +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
1eae8a5a4d #9893 fixed images 2023-03-16 12:04:18 +01:00
Daniel Maya
1d4aeef893 Merge branch 'develop' into ent-9893-nuevo-sistema-de-ha 2023-03-16 10:10:16 +01:00
Calvo
1be124059e FIX MR 2023-03-14 19:48:49 +01:00
Calvo
4adaf31a5a Merge remote-tracking branch 'origin/develop' into ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow 2023-03-14 19:45:48 +01:00
Calvo
6950624cc9 Added new netflow server filters form 2023-03-14 18:55:43 +01:00
daniel
cec81f1cc2 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 
Conflicts:
	pandora_console/extras/mr/62.sql
 2023-03-14 18:17:54 +01:00
Jose Gonzalez
93a912b76b Fix MR 2023-03-14 10:01:09 +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 Maya
d6dec9d869 #9893 merge develop 2023-03-09 16:27:47 +01:00