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

15384 Commits

Author SHA1 Message Date
vgilc 6e1a201e2a Merge branch '125-Gestión-recolección-y-correlación-de-logs-dev' into 'develop' 
Added preproc header pandora_migrate_logs

Closes #125

See merge request !791
 2017-09-07 10:44:06 +02:00
fbsanchez 231ba7c2c6 minor fixes - migration tool 2017-09-07 10:40:00 +02:00
fbsanchez bb41da5ed4 help message for migrate tool 2017-09-07 10:19:38 +02:00
fbsanchez 06ff6d85ee Added preproc header pandora_migrate_logs 2017-09-07 10:15:01 +02:00
artica 80027e4d8c Auto-updated build strings. 2017-09-07 00:01:31 +02:00
vgilc 11de97b2fb Merge branch 'wux-fix' into 'develop' 
Added missed use in Tools.pm

See merge request !790
 2017-09-06 18:55:51 +02:00
fbsanchez 60424e5be2 Added missed use in Tools.pm 2017-09-06 18:50:03 +02:00
artica c4a709acf1 Updated version and build strings. 2017-09-06 17:22:32 +02:00
vgilc b2461dca65 Merge branch '1056-pandora-wux-grid-server' into 'develop' 
Moved pwrd to pandorafms

See merge request !789
 2017-09-06 17:16:46 +02:00
Ramon Novoa f78b6a9576 Change pandora_db.pl to work with the Elastic log collector. 2017-09-06 17:10:53 +02:00
vgilc 242abb1689 Merge branch '125-Gestión-recolección-y-correlación-de-logs-dev' into 'develop' 
Log migration tool

See merge request !788
 2017-09-06 16:36:37 +02:00
fbsanchez c51226e3de Moved pwrd to pandorafms 2017-09-06 16:33:39 +02:00
fbsanchez 6b6ca75d90 Merge branch 'develop' into 125-Gestión-recolección-y-correlación-de-logs-dev 2017-09-06 16:23:02 +02:00
fbsanchez c267073868 Migrate log tool 2017-09-06 16:22:54 +02:00
vgilc da5a060f7e Merge branch '1056-pandora-wux-grid-server' into 'develop' 
Added to_number to Tools.pm

See merge request !787
 2017-09-06 12:37:10 +02:00
fbsanchez 40dcf343d6 Added to_number to Tools.pm 2017-09-06 12:28:13 +02:00
artica ce4d898deb Auto-updated build strings. 2017-09-06 00:01:18 +02:00
Arturo Gonzalez ad2cf22fa4 Added new format to string data 2017-09-05 17:33:38 +02:00
Arturo Gonzalez 5664c72f8b Added option to short data or not 2017-09-05 16:23:21 +02:00
vgilc 22f7274c52 Merge branch '832-pandora-exec-proxy-problems-in-policies-dev' into 'develop' 
Added conf to wmi modules in policies

See merge request !784
 2017-09-05 15:16:57 +02:00
Arturo Gonzalez ba292e5009 Added conf to wmi modules in policies 2017-09-05 15:04:41 +02:00
daniel 8f9fd4cf3d fixed snmp comunity field 2017-09-05 14:39:36 +02:00
Arturo Gonzalez 1dae698333 Added disabled option to get ggroup agents function 2017-09-05 13:40:57 +02:00
vgilc daca367320 Merge branch '832-pandora-exec-proxy-xml-description-dev' into 'develop' 
Added safe output to conf

See merge request !781
 2017-09-05 13:20:32 +02:00
Arturo Gonzalez bc63e8051e Added safe output to conf 2017-09-05 12:51:39 +02:00
vgilc 522808492b Merge branch '1269-No_se_pueden_elegir_modulos_en_items_de_eventos' into 'develop' 
1269 no se pueden elegir modulos en items de eventos

See merge request !780
 2017-09-05 12:44:56 +02:00
daniel 4430a7b2fe fixed errors in autocomplete field 2017-09-05 12:35:21 +02:00
vgilc e04d3186f2 Merge branch '832-pandora-exec-proxy-specs-dev' into 'develop' 
Added specs from MPulido

See merge request !779
 2017-09-05 12:00:23 +02:00
Arturo Gonzalez 4d469426a5 Added specs from MPulido 2017-09-05 11:46:44 +02:00
vgilc d288a7d7be Merge branch '1056-revision_mr' into 'develop' 
fixed error in mr for WUX

See merge request !778
 2017-09-05 11:18:40 +02:00
daniel f954b92aae fixed error in mr for WUX 2017-09-05 11:06:49 +02:00
vgilc b4dc6f4fb0 Merge branch '125-Gestión-recolección-y-correlación-de-logs-dev' into 'develop' 
Resolve "Pandora7: Directorio de colecciones en gitlab"

See merge request !777
 2017-09-05 10:09:14 +02:00
Daniel Maya b6c44db3cd Merge branch 'develop' into '125-Gestión-recolección-y-correlación-de-logs-dev' 
# Conflicts:
#   pandora_server/lib/PandoraFMS/Config.pm
 2017-09-05 10:00:24 +02:00
artica 924518e02b Auto-updated build strings. 2017-09-05 00:01:21 +02:00
fbsanchez ae8ef93191 Logstash/Elasticsearch self monitoring 2017-09-04 20:07:14 +02:00
Daniel Maya c6d216df07 update functions_config with Number of logs viewed 2017-09-04 18:00:06 +02:00
vgilc 51454d752c Merge branch '1058-min-space-between-nodes-in-servicetree-dev' into 'develop' 
Added min size to the field

See merge request !776
 2017-09-04 17:37:01 +02:00
Arturo Gonzalez 3a9895b97b Added min size to the field 2017-09-04 16:58:55 +02:00
vgilc 76aa8d8b05 Merge branch '1256-cargarse-todo-rastro-de-ssh-gateway-y-vnc' into 'develop' 
Removed VNC & SSH extensions, go ehorus!

See merge request !774
 2017-09-04 16:39:16 +02:00
vgilc 09f92b51ae Merge branch '832-server-proxy-final-details-dev' into 'develop' 
Added last specifications to pandora exec proxy

See merge request !775
 2017-09-04 16:33:11 +02:00
fbsanchez 629f5aa237 Merge branch 'develop' into 1256-cargarse-todo-rastro-de-ssh-gateway-y-vnc 2017-09-04 16:20:20 +02:00
fbsanchez 6995a81509 Removed all traces of anytermd from code 2017-09-04 16:19:56 +02:00
vgilc 9ba802c506 Merge branch '1097-vulnerabilidad-en-extension-ssh_gateway-php' into 'develop' 
1097 vulnerabilidad en extension ssh gateway php

See merge request !742
 2017-09-04 16:04:45 +02:00
Arturo Gonzalez 018f449fc8 Added last specifications to pandora exec proxy 2017-09-04 16:02:58 +02:00
fbsanchez 5f350bb7ca Merge branch 'develop' into 1256-cargarse-todo-rastro-de-ssh-gateway-y-vnc 2017-09-04 16:01:38 +02:00
vgilc 1d05223ace Merge branch '1056-pandora-wux-grid-server' into 'develop' 
1056 pandora wux grid server

See merge request !773
 2017-09-04 15:52:57 +02:00
daniel a04e02570f Merge branch 'develop' into 1056-pandora-wux-grid-server 2017-09-04 14:09:08 +02:00
daniel f0862e1c5b fixed minor errors in WUX 2017-09-04 12:09:19 +02:00
Arturo Gonzalez 4ebc081855 Added image to planned downtime 2017-09-04 10:26:30 +02:00
artica 9169cff0b5 Auto-updated build strings. 2017-09-04 00:01:13 +02:00