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

656 Commits

Author SHA1 Message Date
Alejandro Campos
c389769602 Merge branch 'develop' into 'ent-5135-No-funciona-la-exploracion-SNMP-remota' 
# Conflicts:
#   pandora_console/extras/mr/35.sql
 2020-01-15 17:12:32 +01:00
Luis
2926ead13b Fixed group change on networkmap.ACL and source group working separated 2020-01-15 12:14:37 +01:00
alejandro-campos
5eb2953810 Added port option on server configuration to be used when connecting to execution server 2020-01-14 15:43:17 +01:00
Daniel Maya
7204e7c0f2 Ent 4862 mas opciones en los filtros de severidad 2020-01-13 18:24:29 +01:00
daniel
3dbdfdb6eb Fix Landscape reports 2019-12-11 15:07:38 +01:00
Luis
6ba4a26564 Added timeoout option to command event responses 2019-12-10 11:54:30 +01:00
Luis
b0d5b7223e Added report template regex to MR 2019-11-27 13:21:05 +01:00
Alejandro Fraguas
ed0ad76e61 Merge branch 'ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este' into 'develop' 
Add new search for id source event in metaconsole

See merge request artica/pandorafms!2438
 2019-11-27 10:14:35 +01:00
fbsanchez
c28dfd60a5 Merge remote-tracking branch 'origin/develop' into ent-EDF 2019-11-26 16:16:15 +01:00
Daniel Maya
cf8bae66d1 Added index in MR 2019-11-26 10:31:57 +01:00
fbsanchez
5423e78d62 Merge remote-tracking branch 'origin/develop' into ent-4610-Alertas-de-logs 
Conflicts:
	pandora_console/extras/mr/33.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/godmode/agentes/configurar_agente.php
	pandora_console/godmode/wizards/Wizard.main.php
	pandora_console/include/functions_agents.php
	pandora_console/include/styles/alert.css
	pandora_console/pandoradb.sql
	pandora_server/lib/PandoraFMS/Recon/Base.pm
 2019-11-22 15:49:07 +01:00
marcos
21bf49c218 update id_source_event 2019-11-22 13:38:08 +01:00
fbsanchez
fd12c5a009 DB update, default values for Alert correlation 2019-11-22 11:57:20 +01:00
Daniel Barbero
35abd12499 WIP alert correlations 2019-11-22 11:06:55 +01:00
marcos
ab1a64a2e6 Merge remote-tracking branch 'origin/develop' into ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este 2019-11-22 10:56:36 +01:00
daniel
960326b980 Add menu omnishell 2019-11-21 18:21:46 +01:00
fbsanchez
362837f856 updated default values for tevent_rule, new tokens for correlated alerts 2019-11-21 17:47:21 +01:00
Marcos Alconada
34cdcdfd6e Merge branch 'develop' into 'ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este' 
# Conflicts:
#   pandora_console/extras/mr/29.sql
#   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
#   pandora_console/include/functions_events.php
 2019-11-21 10:13:00 +01:00
fbsanchez
79a135b077 Fix errata DESC => COMMENT 2019-11-20 11:36:15 +01:00
fbsanchez
43ecba3bbb operator fields for event_rule 2019-11-20 10:40:52 +01:00
fbsanchez
443eb1168c Merge remote-tracking branch 'origin/ent-EDF' into ent-4610-Alertas-de-logs 2019-11-18 12:48:31 +01:00
fbsanchez
9440570548 Merge remote-tracking branch 'origin/ent-4772-omnishell' into ent-EDF 2019-11-15 13:08:09 +01:00
fbsanchez
990ad339d3 db schema 2019-11-15 09:45:49 +01:00
fbsanchez
f69b86663a Merge remote-tracking branch 'origin/ent-4226-mejoras-plugin-sap' into ent-EDF 
Conflicts:
	pandora_console/extras/mr/33.sql
	pandora_console/godmode/wizards/Wizard.main.php
 2019-11-14 21:40:35 +01:00
Daniel Barbero Martin
c17acefc49 Merge remote-tracking branch 'origin/ent-EDF' into ent-4610-Alertas-de-logs 
Conflicts:
	pandora_console/extras/mr/33.sql
 2019-11-14 12:22:11 +01:00
Daniel Barbero Martin
0213bc675e add changes bbdd 2019-11-08 11:28:37 +01:00
Daniel Barbero Martin
c68a5b57dd fixed Change bbdd 2019-11-05 16:04:48 +01:00
fbsanchez
276fc82556 Merge branch 'ent-EDF' into ent-4226-mejoras-plugin-sap 
Conflicts:
	pandora_console/extras/mr/33.sql
 2019-11-05 15:39:18 +01:00
Daniel Barbero Martin
e5f24ca884 Merge develop 2019-11-05 15:27:06 +01:00
fbsanchez
115c884cd4 Discovery SAP 2019-10-31 21:13:18 +01:00
Daniel Barbero Martin
7bfa076263 fixed error bbdd 2019-10-30 14:52:10 +01:00
Daniel Barbero Martin
d37410ed8c fixed error bbdd 2019-10-30 14:43:10 +01:00
Daniel Barbero Martin
3056c6741a changes bbdd mr34 2019-10-28 12:20:55 +01:00
Tatiana Llorente
30caad5a6c Added column cache_expiration in tlayout_template_data in MR, migrate, and pandoradb.sql - #4810 2019-10-15 16:50:05 +02:00
fbsanchez
6def88472a Merge branch 'develop' into 'ent-4190-mejoras-para-el-menu-de-gestionar-ha' 
# Conflicts:
#   pandora_console/extras/mr/32.sql
 2019-09-19 10:18:15 +02:00
Luis Calvo
43af2269ee Fixed default values uncompress data 2019-09-18 11:51:01 +02:00
Luis Calvo
e409b33c6c Added changes to treport_content_template to db 2019-09-17 12:32:07 +02:00
Luis Calvo
a04268b33c Merge remote-tracking branch 'origin/develop' into ent-3878-Report-type-summation-not-working-properly 2019-09-16 11:02:18 +02:00
fbsanchez
148cd5cce6 db updates pandora_db 2019-09-05 10:45:17 +02:00
fbsanchez
adbb48ab87 pandora HA review 2019-08-10 02:13:01 +02:00
fbsanchez
db25d3b231 Cleared unused table 2019-07-26 21:56:37 +02:00
fbsanchez
ce346bd604 agent deployment 2019-07-24 17:38:25 +02:00
fbsanchez
62d8c04ab3 Agent deployment v1 2019-07-23 13:01:50 +02:00
fbsanchez
8d9c4682c7 WIP Agent repository 2019-07-17 20:37:13 +02:00
fbsanchez
17dc0b82ac Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora 2019-07-17 17:19:58 +02:00
fbsanchez
f0bfe6910d WIP agent deployment 2019-07-16 20:56:47 +02:00
fbsanchez
3bbd01026e WIP agent deployment 2019-07-15 19:37:04 +02:00
Luis Calvo
ef9502a552 Fixed errors on sum report uncompressed checkbox 2019-07-15 11:56:57 +02:00
Daniel Barbero
ecaba5ebd3 fixed errorsr macros reports 2019-07-12 10:24:46 +02:00
fbsanchez
47cc0d9d6e WIP: Agent deployment center 2019-07-10 23:59:09 +02:00