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

15231 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vgilc
2689213fdf Merge branch '1181-add-short-data-option-to-charts-dev' into 'develop' 
Added option to short data or not

See merge request !785
 2017-09-08 10:29:53 +02:00
vgilc
c2a132255c Merge branch '1057-No-muestra-imagenes-PNG-en-el-custom-logo-de-los-informes-OPEN' into 'develop' 
Let use png logo images for reports - #1057

See merge request !625
 2017-09-08 10:13:35 +02:00
vgilc
b4f0cf12ae Merge branch '1060-Letras-blancas-en-fondo-blanco-con-Black-theme-7' into 'develop' 
Change pandorin dialog font color with black theme - #1060

See merge request !635
 2017-09-08 10:02:45 +02:00
vgilc
054c13695c Merge branch '1203-Hora-descuadrada-en-caja-de-eventos-del-agente' into 'develop' 
Apply padding to event 24h event history bar for agent view - #1203

See merge request !738
 2017-09-08 10:01:47 +02:00
artica
7f3539ecf0 Auto-updated build strings. 2017-09-08 00:01:19 +02:00
vgilc
03032874b5 Merge branch '1198-rev_final' into 'develop' 
boolean graphs

See merge request !800
 2017-09-07 18:16:05 +02:00
daniel
f2f9cc666e boolean graphs 2017-09-07 18:11:42 +02:00
vgilc
191d6bb0d4 Merge branch '1198-errors-in-boolean-chart-fourth-time-dev' into 'develop' 
Added a change to boolean charts

See merge request !799
 2017-09-07 16:34:19 +02:00
vgilc
5f4f397901 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 !798
 2017-09-07 16:33:58 +02:00
Arturo Gonzalez
598b04c2db Added a change to boolean charts 2017-09-07 16:17:41 +02:00
Daniel Maya
c8bbe92412 Merge branch '125-Gestión-recolección-y-correlación-de-logs-dev' of https://192.168.50.5:8081/artica/pandorafms into 125-Gestión-recolección-y-correlación-de-logs-dev 2017-09-07 16:16:16 +02:00
Daniel Maya
a66a210db1 Update log report 2017-09-07 16:15:17 +02:00
vgilc
3d2948d7eb Merge branch '1198-errors-in-boolean-chart-third-time-dev' into 'develop' 
Updated module chart code

See merge request !796
 2017-09-07 15:29:29 +02:00
vgilc
1356cd45e1 Merge branch '1198-errors-in-boolean-chart-second-time-dev' into 'develop' 
Added minor change to boolean charts

See merge request !795
 2017-09-07 15:29:12 +02:00
Arturo Gonzalez
da117723ef Updated module chart code 2017-09-07 15:19:03 +02:00
Arturo Gonzalez
c986e4fad7 Added minor change to boolean charts 2017-09-07 14:45:20 +02:00
vgilc
512ddc9036 Merge branch '1198-errors-in-boolean-chart-dev' into 'develop' 
Added some changes in boolean charts

See merge request !792
 2017-09-07 11:44:34 +02:00
Arturo Gonzalez
2fba19d55c Added some changes in boolean charts 2017-09-07 11:14:06 +02:00
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
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
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