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

24737 Commits

Author SHA1 Message Date
fbsanchez faaf14bfd4 Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos 
Conflicts:
	pandora_console/extras/mr/39.sql
	pandora_console/include/lib/Module.php
 2020-06-30 17:04:33 +02:00
fbsanchez 1d621bd3d5 WIP services 2020-06-30 16:57:08 +02:00
Daniel Rodriguez f0cbd61ad3 Merge branch 'ent-5649-visor-de-log-en-metaconsola' into 'develop' 
Added log_viewer in metaconsole

See merge request artica/pandorafms!3312
 2020-06-30 15:51:51 +02:00
Alejandro Fraguas ed04527a96 Merge branch 'ent-5310-Mejorar-datos-Wizard-SNMP-WMI' into 'develop' 
Backup upload

See merge request artica/pandorafms!3160
 2020-06-30 12:16:51 +02:00
José González 311b259684 Backup upload 2020-06-30 12:16:51 +02:00
artica 8882124487 Auto-updated build strings. 2020-06-30 01:00:17 +02:00
fbsanchez c07daa3199 WIP Services 2020-06-29 19:17:40 +02:00
Daniel Rodriguez 57c7a98990 Merge branch 'ent-6038-Comprobar-funcionamiento-de-la-funcionalidad-de-feedback' into 'develop' 
changed text

See merge request artica/pandorafms!3336
 2020-06-29 12:09:20 +02:00
alejandro-campos b7af840a20 changed text 2020-06-29 10:57:19 +02:00
artica 2cb3c5eb57 Auto-updated build strings. 2020-06-29 01:00:14 +02:00
artica bf52e7bbc8 Auto-updated build strings. 2020-06-28 01:00:14 +02:00
artica 2a641c344d Auto-updated build strings. 2020-06-27 01:00:20 +02:00
fbsanchez 032faf8c0c WIP Smart services 2020-06-26 15:48:58 +02:00
Daniel Rodriguez 898d29060a Merge branch 'ent-5914-problema-css-con-resolucion-pantalla-1366' into 'develop' 
Ent 5914 problema css con resolucion pantalla 1366

See merge request artica/pandorafms!3257
 2020-06-26 13:29:17 +02:00
Manuel Montes b7411da737 Ent 5914 problema css con resolucion pantalla 1366 2020-06-26 13:29:17 +02:00
Daniel Rodriguez 1adcce21af Merge branch 'ent-5386-9454-Graficas-en-tiempo-real-modulos-snmp-no-funcionan-con-caracteres-especiales-en-comunidad' into 'develop' 
fix broken snmp modules real time graphs when community string has certain chars

See merge request artica/pandorafms!3131
 2020-06-26 13:28:04 +02:00
Daniel Rodriguez 7f1bd68c26 Merge branch 'ent-5865-9984-Error-al-realizar-SNMPWalk-en-consola-con-v3-y-caracteres-especiales' into 'develop' 
fixed ajax call params when using url characters

See merge request artica/pandorafms!3237
 2020-06-26 12:41:25 +02:00
artica 03016871ad Auto-updated build strings. 2020-06-26 01:00:17 +02:00
Daniel Rodriguez 40a5262ae8 Merge branch 'ent-6058-SNMP-Browser-v3-No-funciona' into 'develop' 
Fixed error snmp V3 not working

See merge request artica/pandorafms!3333
 2020-06-25 17:09:38 +02:00
Daniel Rodriguez 8a2b0becd8 Merge branch 'ent-5787-change-default-web-engine-to-curl' into 'develop' 
Changed default web engine from LWP to CURL

See merge request artica/pandorafms!3259
 2020-06-25 16:34:09 +02:00
Luis 5db15e12d8 Changed default web engine from LWP to CURL 2020-06-25 16:34:09 +02:00
Daniel Barbero Martin c588914869 Fixed error snmp V3 not working 2020-06-25 15:31:36 +02:00
Alejandro Fraguas 02bffc7e0d Merge branch 'ent-5935-Logs-de-la-consola-refactorizacion' into 'develop' 
changed console and audit log locations

See merge request artica/pandorafms!3278
 2020-06-25 15:28:13 +02:00
Daniel Rodriguez fad08b9d66 Merge branch 'ent-5945-Fallo-visual-en-graficas-de-tipo-sparse' into 'develop' 
Fixed minor error graph sparse width

See merge request artica/pandorafms!3274
 2020-06-25 15:18:33 +02:00
daniel 7dc759f3ac Fixed minor error graph sparse width 2020-06-25 15:18:33 +02:00
Daniel Rodriguez a645f3c0b2 Merge branch 'ent-5850-error-reports-historical-serialize-command-snapshots' into 'develop' 
Ent 5850 error reports historical serialize command snapshots

See merge request artica/pandorafms!3217
 2020-06-25 15:17:24 +02:00
Luis 5bc968aefe Ent 5850 error reports historical serialize command snapshots 2020-06-25 15:17:24 +02:00
Daniel Rodriguez ae0ac8dc8c Merge branch 'ent-5832-10030-Faltan-campos-en-API-Events' into 'develop' 
fixed bug in get_events_with_user call

See merge request artica/pandorafms!3213
 2020-06-25 12:21:27 +02:00
Daniel Rodriguez 0079f5d3b5 Merge branch 'ent-5346-Tipo-de-informe-que-obtenga-el-ultimo-valor-del-modulo' into 'develop' 
New report last value

See merge request artica/pandorafms!3256
 2020-06-25 12:18:37 +02:00
daniel 36e57ddd1d New report last value 2020-06-25 12:18:37 +02:00
fbsanchez a8671078f1 Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos 
Conflicts:
	pandora_console/install.php
 2020-06-25 11:25:43 +02:00
artica 8735c8a950 Auto-updated build strings. 2020-06-25 01:00:18 +02:00
fbsanchez 45a161426b Services review 2020-06-24 18:01:34 +02:00
Daniel Rodriguez 3c5a893c71 Merge branch 'ent-5830-SNMP-Browser-Network-components-OID-info-and-Create-agent-modules' into 'develop' 
Ent 5830 snmp browser network components oid info and create agent modules

See merge request artica/pandorafms!3249
 2020-06-24 12:46:49 +02:00
Daniel Rodriguez 5aef38dd72 Merge branch 'ent-5186-Texto-HTML-plano-en-apartado-de-los-reports-en-visual-styles' into 'develop' 
fixes in reports front page default setup

See merge request artica/pandorafms!3250
 2020-06-24 12:43:23 +02:00
Alejandro Fraguas 9fad5758db Merge branch 'ent-5906-Bug-compactación-pandora-db-con-datos-tipo-boolean' into 'develop' 
Ent 5906 bug compactación pandora db con datos tipo boolean

See merge request artica/pandorafms!3327
 2020-06-24 10:09:39 +02:00
artica 8748bd9e72 Auto-updated build strings. 2020-06-24 01:00:18 +02:00
Alejandro Fraguas 16fd52c47c Merge branch 'ent-5918-9948-correlacion-de-alertas-no-funcionan-con-logs' into 'develop' 
Improved coment

See merge request artica/pandorafms!3268
 2020-06-23 15:55:09 +02:00
Daniel Rodriguez e7907de53b Merge branch 'ent-4144-Consolas-visuales-no-se-visualizan-bien-en-dispositivos-moviles' into 'develop' 
Remove visual console mobile

See merge request artica/pandorafms!3254
 2020-06-23 14:47:09 +02:00
Daniel Rodriguez f1e931c04f Merge branch 'ent-5803-SNMP-Browser-modulos-string-sin-historico' into 'develop' 
Added type to SNMP browser module creation

See merge request artica/pandorafms!3258
 2020-06-23 14:46:22 +02:00
Luis b40b98fc54 Added type to SNMP browser module creation 2020-06-23 14:46:22 +02:00
Daniel Rodriguez 57df59448e Merge branch 'ent-5845-Bug-en-CV-linkadas-desaparece-item' into 'develop' 
Ent 5845 bug en cv linkadas desaparece item

See merge request artica/pandorafms!3255
 2020-06-23 14:45:56 +02:00
Daniel Rodriguez adc279332c Merge branch 'ent-5470-se-duplican-los-sistemas-operativos' into 'develop' 
Ent 5470 se duplican los sistemas operativos

See merge request artica/pandorafms!3248
 2020-06-23 14:45:04 +02:00
Manuel Montes 549a17a428 Ent 5470 se duplican los sistemas operativos 2020-06-23 14:45:04 +02:00
Daniel Rodriguez 9245e598a9 Merge branch 'ent-5679-Barras-desplazamiento-en-Consola-Visual-DIBA' into 'develop' 
Ent 5679 barras desplazamiento en consola visual diba

See merge request artica/pandorafms!3253
 2020-06-23 14:43:40 +02:00
Daniel Rodriguez e514840031 Merge branch 'ent-5761-notificacion-max_execution_value-php-consola' into 'develop' 
Ent 5761 notificacion max execution value php consola

See merge request artica/pandorafms!3236
 2020-06-23 14:39:32 +02:00
alejandro-campos 584b19cc85 fix load spinner on close 2020-06-23 14:23:14 +02:00
fbsanchez d4b247acae Merge remote-tracking branch 'origin/develop' into ent-5918-9948-correlacion-de-alertas-no-funcionan-con-logs 2020-06-23 10:17:22 +02:00
Alejandro Campos 9ce4c90456 Merge branch 'develop' into 'ent-5186-Texto-HTML-plano-en-apartado-de-los-reports-en-visual-styles' 
# Conflicts:
#   pandora_console/godmode/setup/setup_visuals.php
 2020-06-23 10:04:24 +02:00
alejandro-campos cec16d01b8 Merge branch 'develop' into ent-5935-Logs-de-la-consola-refactorizacion 2020-06-23 09:56:21 +02:00