Commit Graph

13607 Commits

Author SHA1 Message Date
Daniel Rodriguez 5ad265cbc8 Merge branch 'ent-6456-error-critico-operaciones-masivas-grupo-0' into 'develop'
Fix unhandled extra-options in group selector inclusions

See merge request artica/pandorafms!3518
2020-10-09 10:23:18 +02:00
artica 70cea5cdff Auto-updated build strings. 2020-10-09 01:00:21 +02:00
Daniel Rodriguez b6ee1a9434 Merge branch 'ent-6432-No-funciona-el-envio-de-mails-by-default' into 'develop'
fixed email test

See merge request artica/pandorafms!3504
2020-10-08 20:01:33 +02:00
fbsanchez a4b2e38ffc Fix unhandled extra-options in group selector inclusions 2020-10-08 16:41:26 +02:00
Daniel Rodriguez 76c3fe8e83 Merge branch 'ent-6346-9940-event-group-no-muestra-eventos-para-grupos-secundarios' into 'develop'
Fix secondary groups match while group filtering

See merge request artica/pandorafms!3502
2020-10-08 16:34:20 +02:00
Jose Gonzalez 3b14453d1e WIP: Added QueryResult ui type 2020-10-08 13:47:26 +02:00
Marcos Alconada 54035e9615 fixed error with sql query pie graph 2020-10-08 11:54:10 +02:00
Daniel Rodriguez 3838070ef7 Merge branch 'ent-6439-Error-summary-Availability-custom-report' into 'develop'
fixed errors availability reports

See merge request artica/pandorafms!3508
2020-10-08 10:14:37 +02:00
artica ed434135c2 Auto-updated build strings. 2020-10-08 01:00:17 +02:00
fbsanchez 2e0321fc6e Limit server down notifications once a day 2020-10-07 18:48:17 +02:00
daniel 3455de7f85 fixed visual errors and default values 2020-10-07 16:03:52 +02:00
fbsanchez 0deff70f8b Alert report (group) Group + secondary groups + recursion 2020-10-07 14:07:17 +02:00
Daniel Barbero Martin c4c987d6c1 fixed errors availability reports 2020-10-07 12:12:06 +02:00
fbsanchez 5ce1bd23e4 Discovery task instead Recon task in some places 2020-10-07 10:56:40 +02:00
artica d677fedc0e Auto-updated build strings. 2020-10-07 01:00:18 +02:00
alejandro-campos 929310d0e9 fixed bad module id reference 2020-10-06 17:33:34 +02:00
marcos 848f60229a updates on 2FA all users feature 2020-10-06 17:02:58 +02:00
fbsanchez ff8aaf18fe Group event reports (with secondary groups) 2020-10-06 15:48:12 +02:00
fbsanchez 35b80f0778 Merge remote-tracking branch 'origin/develop' into ent-6346-9940-event-group-no-muestra-eventos-para-grupos-secundarios 2020-10-06 13:00:06 +02:00
Daniel Rodriguez b6cf44184d Merge branch 'ent-6394-api-delete-agent-no-funciona-meta' into 'develop'
add new acl on delete agent api/cli

See merge request artica/pandorafms!3499
2020-10-06 12:33:47 +02:00
alejandro-campos 2915a3bd35 fixed email test 2020-10-06 11:07:46 +02:00
artica 63ed443b98 Auto-updated build strings. 2020-10-06 01:00:19 +02:00
daniel 1b5ccfb20a Add new token chart fit to content 2020-10-05 17:03:30 +02:00
fbsanchez cc3189196c Fix secondary groups match while group filtering 2020-10-05 12:45:26 +02:00
fbsanchez e21fa82b48 Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos 2020-10-05 10:58:21 +02:00
marcos a1048301e8 add new acl on delete agent api/cli 2020-10-05 09:02:11 +02:00
artica b1d218d875 Auto-updated build strings. 2020-10-05 01:00:14 +02:00
artica 2965099f2f Auto-updated build strings. 2020-10-04 01:00:17 +02:00
artica 344cf25874 Auto-updated build strings. 2020-10-03 01:00:18 +02:00
fbsanchez 2187f9d0c9 Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
2020-10-02 14:56:07 +02:00
daniel a5d5a45cac add render graph to reports 2020-10-02 14:16:55 +02:00
fbsanchez 07ed5ac9d8 minor fix AJAX group selector in MC 2020-10-02 14:00:04 +02:00
Daniel Rodriguez 1cdb91a02d Merge branch 'ent-6302-proyectos-anadir-un-campo-de-numero-de-ticket-para-modulos' into 'develop'
Custom id improvements

See merge request artica/pandorafms!3464
2020-10-02 13:07:59 +02:00
artica 354ae84171 Auto-updated build strings. 2020-10-02 01:00:20 +02:00
ismael.moreno d7845fa430 SQL query do not need to be cleaned 2020-10-01 18:56:16 +02:00
daniel 0db539c444 fix visual windows charts 2020-10-01 15:29:54 +02:00
fbsanchez f44b614f54 Fix cache hit users_get_groups 2020-10-01 15:17:06 +02:00
fbsanchez 679d72e5c0 minor fix 2020-10-01 14:05:25 +02:00
fbsanchez 4f80eec179 recovered changes after merge request 2020-10-01 13:42:41 +02:00
fbsanchez d052c09f44 Merge remote-tracking branch 'origin/develop' into ent-6302-proyectos-anadir-un-campo-de-numero-de-ticket-para-modulos 2020-10-01 13:36:13 +02:00
artica 43b02efa4e Auto-updated build strings. 2020-10-01 01:00:20 +02:00
fbsanchez b07d24ed25 Merge remote-tracking branch 'origin/develop' into ent-6302-proyectos-anadir-un-campo-de-numero-de-ticket-para-modulos
Conflicts:
	pandora_console/include/functions_api.php
	pandora_console/operation/events/events.php
2020-09-30 18:38:27 +02:00
fbsanchez 95f58776c8 fixes group selection 2020-09-30 17:47:44 +02:00
marcos f8666adf0f F2 feature 2020-09-30 14:20:57 +02:00
Daniel Rodriguez 311186a70a Merge branch 'ent-6328-Consola-movil-imagenes-rotas' into 'develop'
fixed mobile console donut charts

See merge request artica/pandorafms!3470
2020-09-30 13:19:06 +02:00
artica 1a2f14a35b Auto-updated build strings. 2020-09-30 01:00:21 +02:00
fbsanchez d73c215b91 Avoid create agent if no group is selected 2020-09-29 15:48:20 +02:00
fbsanchez 5d63bc547e Group selection review 2020-09-29 14:22:58 +02:00
fbsanchez 5f4893ef1a Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos 2020-09-29 12:47:11 +02:00
Daniel Rodriguez 4939d71420 Merge branch 'ent-6382-10451-Bug-en-chequeos-de-notificaciones-por-HA-+-ticket-guardia' into 'develop'
fixed bug when node is disabled

See merge request artica/pandorafms!3484
2020-09-29 12:43:59 +02:00
Jose Gonzalez 00b289a557 Adapt functions for work in Metaconsole 2020-09-29 12:21:52 +02:00
Jose Gonzalez 6a21a668bf Added control for reveal passwords 2020-09-29 09:44:20 +02:00
artica f9dfa8bbc3 Auto-updated build strings. 2020-09-29 01:00:20 +02:00
fbsanchez f69166bd53 Updates style width group selector 2020-09-28 18:04:46 +02:00
fbsanchez d152ba2980 estado_agente prevent filter options overlapping 2020-09-28 16:11:26 +02:00
fbsanchez 12314d33c3 fixed direct html responses with sl2 2020-09-28 16:02:54 +02:00
fbsanchez 29ac13815a preload env required files (css,js) 2020-09-28 15:56:17 +02:00
fbsanchez d4e837b7e6 Group all management, "all" selected instead "none" if included 2020-09-28 15:47:38 +02:00
artica fe4916c0c3 Auto-updated build strings. 2020-09-28 01:00:14 +02:00
artica 0cbec13ec6 Auto-updated build strings. 2020-09-27 01:00:17 +02:00
artica bc7b0ae798 Auto-updated build strings. 2020-09-26 01:00:19 +02:00
fbsanchez b2d819aa29 Minor fixes 2020-09-25 19:35:19 +02:00
Daniel Rodriguez 5af6718941 Merge branch 'ent-6336-ifHCXXXX-nuevo-wizard-snmp-interfaces' into 'develop'
Added x64 interface modules to wizard

See merge request artica/pandorafms!3478
2020-09-25 10:46:39 +02:00
artica 6854c13aec Auto-updated build strings. 2020-09-25 01:00:51 +02:00
Manuel Montes f78ae89a99 Ent 6177 mejoras para el public link de dashboards 2020-09-24 16:20:13 +02:00
alejandro-campos 4662fba06a fixed bug when node is disabled 2020-09-24 13:05:17 +02:00
Daniel Rodriguez 04215ba582 Merge branch 'ent-5435-9411-filtro-por-defecto-para-snmp-console' into 'develop'
default values for date intervals (trap view)

See merge request artica/pandorafms!3469
2020-09-24 10:57:43 +02:00
Daniel Rodriguez 0c78b09891 Merge branch 'ent-6334-10699-10652-Wizard-WMI-SNMP-no-añade-modulos-o-incluye-los-que-quiera' into 'develop'
fixed modules selection in agent wizard

See merge request artica/pandorafms!3472
2020-09-24 10:56:51 +02:00
artica ba598d6d80 Auto-updated build strings. 2020-09-24 01:00:24 +02:00
Daniel Rodriguez 4d9956f4c5 Merge branch 'ent-6327-10666-Llamada-a-la-API-add-cluster-agent-no-funciona' into 'develop'
fixed api calls

See merge request artica/pandorafms!3467
2020-09-23 14:08:18 +02:00
fbsanchez 9ce54213b6 WIP GCP 2020-09-23 14:07:23 +02:00
alejandro-campos a0dad4812e fixed error messages 2020-09-23 13:10:10 +02:00
Daniel Maya a07f1d891f Ent 6262 um operaciones masivas 2020-09-23 11:36:15 +02:00
alejandro-campos 86cf99ac81 fixed api call check when cluster id does not exist 2020-09-23 11:31:28 +02:00
Daniel Rodriguez d8daf9f063 Merge branch 'ent-6361-10708-bug-en-visualizacion-de-eventos-con-standar-user' into 'develop'
fixes

See merge request artica/pandorafms!3468
2020-09-23 09:42:20 +02:00
artica 0b6d87e317 Auto-updated build strings. 2020-09-23 01:00:23 +02:00
fbsanchez 4ceeb61c87 Merge remote-tracking branch 'origin/develop' into ent-4231-crear-plugin-para-google-cloud-y-anadirlo-a-discovery 2020-09-22 16:56:11 +02:00
fbsanchez 4394a8cf6a wip discovery.cloud.gcp 2020-09-22 16:55:46 +02:00
Luis Calvo a7db77d4fb Added x64 interface modules to wizard 2020-09-22 16:45:34 +02:00
Marcos Alconada a9b2c6beb8 Ent 5898 secciones en diagnostico aparecen 2 veces 2020-09-22 12:16:31 +02:00
Daniel Rodriguez 6f6c18ef7b Merge branch 'ent-6127-corregir-feedback-esp' into 'develop'
Ent 6127 corregir feedback esp

See merge request artica/pandorafms!3422
2020-09-22 12:13:55 +02:00
fbsanchez 0e0c529b7e missed css file 2020-09-22 12:01:37 +02:00
artica 6a525deeea Auto-updated build strings. 2020-09-22 01:00:23 +02:00
alejandro-campos b1bb1e2aa0 fixed modules selection in agent wizard 2020-09-21 16:22:17 +02:00
Daniel Barbero Martin c6165fbdee fixed mobile console donut charts 2020-09-21 15:13:07 +02:00
artica 89714f3fd1 Auto-updated build strings. 2020-09-21 01:00:14 +02:00
artica 76a5be406f Auto-updated build strings. 2020-09-20 01:00:17 +02:00
artica 36121333e5 Auto-updated build strings. 2020-09-19 01:00:21 +02:00
fbsanchez 6f2eb57587 Switched from time range to hours old selector (SNMP console) 2020-09-18 15:07:31 +02:00
Marcos Alconada 85a41af644 Ent 5296 anadir boton guardar contrasena en active directory 2020-09-18 14:50:50 +02:00
Daniel Rodriguez b18bbbf237 Merge branch 'ent-3357-7329-comision-europea-ordenar-consolas-por-nombre-en-metaconsola-y-anadir-buscador' into 'develop'
mc search nodes

See merge request artica/pandorafms!3463
2020-09-18 14:37:10 +02:00
Daniel Rodriguez d450213b95 Merge branch 'ent-6322-10688-edicion-usuarios-tecla-intro-borra-perfil' into 'develop'
Avoid deleting profiles while pressing enter in user details (management)

See merge request artica/pandorafms!3456
2020-09-18 14:35:32 +02:00
fbsanchez ca8683dd22 removed traces 2020-09-18 11:51:31 +02:00
fbsanchez 696b58544c fixes 2020-09-18 11:47:50 +02:00
Daniel Rodriguez f8152d5ee5 Merge branch 'ent-5971-10211-error-click-en-el-evento-de-grafica-modulo' into 'develop'
fix event legend

See merge request artica/pandorafms!3458
2020-09-18 10:05:35 +02:00
alejandro-campos 57b06be302 fixed api calls 2020-09-18 09:33:10 +02:00
Daniel Rodriguez 12356695a6 Merge branch 'ent-6197-login-background-doestn-work-on-edge' into 'develop'
Fixed custom login background on Edge and IE

See merge request artica/pandorafms!3427
2020-09-18 09:26:51 +02:00
artica 53da45e3c1 Auto-updated build strings. 2020-09-18 01:00:23 +02:00
fbsanchez 5c511bb88e Merge remote-tracking branch 'origin/develop' into ent-6302-proyectos-anadir-un-campo-de-numero-de-ticket-para-modulos 2020-09-17 16:57:56 +02:00
fbsanchez 92da78496b Added module custom id to general tab in event details 2020-09-17 16:54:40 +02:00
fbsanchez bc166dfba2 module custom id in event list + minor fixes 2020-09-17 16:51:23 +02:00
Daniel Rodriguez 02d364b66c Merge branch 'ent-6176-10390-Problema-de-permisos-en-los-dashboard' into 'develop'
added acl checks on dashboard update

See merge request artica/pandorafms!3461
2020-09-17 16:33:15 +02:00
Daniel Rodriguez 48fff2ff4f Merge branch 'ent-6320-10385-bug-timestamp-general-consola' into 'develop'
Applying date format from configuration to date specification

See merge request artica/pandorafms!3457
2020-09-17 16:00:30 +02:00
Daniel Rodriguez 8ef5e7cb9f Merge branch 'ent-6138-credentials-without-identifier-error-message' into 'develop'
Fixed credential store error message on required inputs

See merge request artica/pandorafms!3428
2020-09-17 15:17:03 +02:00
Daniel Rodriguez 4c8414cda5 Merge branch 'ent-4292-TinyMCE-status-bar' into 'develop'
Solved issue with TinyMCE status bar. Now can view it properly

See merge request artica/pandorafms!2910
2020-09-17 15:14:33 +02:00
fbsanchez 867fccf604 Custom id improvements 2020-09-17 14:38:01 +02:00
fbsanchez 79bedb4982 Merge remote-tracking branch 'origin/develop' into ent-3357-7329-comision-europea-ordenar-consolas-por-nombre-en-metaconsola-y-anadir-buscador 2020-09-17 11:51:29 +02:00
fbsanchez 90c7de86a3 RC1 filtering, ordering and pagination in node list view (MC) 2020-09-17 11:42:53 +02:00
Jose Gonzalez 0e3c10a698 Merge 2020-09-17 10:35:18 +02:00
Daniel Rodriguez cfe2b108af Merge branch 'ent-5735-9752-problema-no-inicializados-modulos-de-tipo-log' into 'develop'
Entity with enterprise capabilites

See merge request artica/pandorafms!3373
2020-09-17 10:19:00 +02:00
Daniel Rodriguez 4174d9910f Merge branch 'ent-6279-vulnerabilidades-XSS' into 'develop'
Ent 6279 vulnerabilidades xss

See merge request artica/pandorafms!3445
2020-09-17 10:17:11 +02:00
artica 21b3a5ad2a Auto-updated build strings. 2020-09-17 01:00:20 +02:00
fbsanchez 9d40f900ba WIP mc search nodes 2020-09-16 15:54:43 +02:00
Luis 12735f6ace Fixed module templates submit button value 2020-09-16 12:41:49 +02:00
alejandro-campos 05a0a3a366 fixed bug 2020-09-16 10:09:23 +02:00
alejandro-campos 5bb50acfb1 added acl checks on dashboard update 2020-09-16 10:00:05 +02:00
artica a400e5b5d7 Auto-updated build strings. 2020-09-16 01:00:19 +02:00
Luis Calvo fae8070e29 Report macros now apply on showing report 2020-09-15 19:57:52 +02:00
Daniel Rodriguez aceedbe795 Merge branch 'ent-6250-Errores-log-consola' into 'develop'
Ent 6250 errores log consola

Closes pandora_enterprise#6250

See merge request artica/pandorafms!3436
2020-09-15 15:30:07 +02:00
Daniel Rodriguez 1649757975 Merge branch 'ent-6276-graficas-snmp-metaconsola' into 'develop'
Fixed metaconsole SNMP interface graphs

See merge request artica/pandorafms!3439
2020-09-15 11:56:35 +02:00
fbsanchez cd81e77b18 fix event legend 2020-09-15 11:13:41 +02:00
artica d4b081bef7 Auto-updated build strings. 2020-09-15 01:00:21 +02:00
fbsanchez 19831f833c more accurate fix 2020-09-14 17:59:41 +02:00
fbsanchez adafaa4db2 Applying date format from configuration to date specification 2020-09-14 17:56:09 +02:00
fbsanchez 589d9c1d7c minor fixes 2020-09-14 17:48:38 +02:00
fbsanchez fcb23b1efc Merge remote-tracking branch 'origin/develop' into ent-5735-9752-problema-no-inicializados-modulos-de-tipo-log 2020-09-14 16:20:26 +02:00
fbsanchez d52fbac943 Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos 2020-09-14 09:03:24 +02:00
artica 410d517a92 Auto-updated build strings. 2020-09-14 01:00:17 +02:00
artica 807eb5ee82 Auto-updated build strings. 2020-09-13 01:00:17 +02:00
artica eb4a4c17fe Auto-updated build strings. 2020-09-12 01:00:19 +02:00
fbsanchez c2238ac295 minor changes 2020-09-11 15:30:18 +02:00
fbsanchez 09a5bad4f1 Fixes in visualization (groups selection) 2020-09-11 15:17:08 +02:00
fbsanchez da7f286b22 fixed pagination (final page) 2020-09-11 15:09:52 +02:00
fbsanchez 017333c46a fixed pagination (final page) 2020-09-11 15:03:40 +02:00
fbsanchez a72002dc0e fixed pagination (final page) 2020-09-11 14:56:32 +02:00
fbsanchez 426286b8b5 fixed pagination (started by 1 instead 0, select2 requirement) 2020-09-11 14:53:29 +02:00
fbsanchez 3374a89ae0 Group selection improvement 2020-09-11 14:34:41 +02:00
artica 100c1297fb Auto-updated build strings. 2020-09-11 01:00:18 +02:00
artica 3a95c3dd58 Auto-updated build strings. 2020-09-10 01:00:17 +02:00
Jose Gonzalez e833c318a5 Avoid XSS in Module templates 2020-09-09 12:35:28 +02:00
Jose Gonzalez b9b94e1382 Avoid XSS in Private Enterprise Numbers 2020-09-09 11:44:26 +02:00
Jose Gonzalez 6a192433cb Avoid XSS in Net Scan scripts 2020-09-09 11:27:08 +02:00
artica cbed2ef758 Auto-updated build strings. 2020-09-09 01:00:18 +02:00
artica 0ee9ed5dfa Updated version and build strings. 2020-09-08 15:00:36 +02:00
Luis Calvo 4a93f6c3a6 Fixed metaconsole SNMP interface graphs 2020-09-08 11:48:27 +02:00
artica 958c485f9d Auto-updated build strings. 2020-09-08 01:00:23 +02:00
Jose Gonzalez aecbab5c36 Fix variable type for array_flip instruction 2020-09-07 14:13:53 +02:00
Jose Gonzalez 42a615166e Fixed object definitions 2020-09-07 13:54:18 +02:00
Jose Gonzalez e3e7f3b313 Fixed error message "Invalid argument supplied for foreach()" and "in_array() expects parameter 2 to be array" 2020-09-07 12:58:09 +02:00
fbsanchez 9d3a209fc8 Merge remote-tracking branch 'origin/develop' into ent-5735-9752-problema-no-inicializados-modulos-de-tipo-log 2020-09-07 09:26:47 +02:00
artica 5093d94db3 Auto-updated build strings. 2020-09-07 01:00:14 +02:00
artica d86b11deb4 Auto-updated build strings. 2020-09-06 01:00:15 +02:00
artica 6433fadddd Auto-updated build strings. 2020-09-05 01:00:23 +02:00
artica 44033aff20 Auto-updated build strings. 2020-09-04 01:00:18 +02:00
Marcos Alconada b02d44ced5 fixed error with snmp interfaces 2020-09-03 11:17:04 +02:00
artica 4c8e468437 Auto-updated build strings. 2020-09-03 01:00:17 +02:00
Luis Calvo 3d947ef77b Fixed credential store error message on required inputs 2020-09-02 11:20:31 +02:00
artica ba681816c1 Auto-updated build strings. 2020-09-02 01:00:16 +02:00
Luis Calvo 8314a25830 Fixed custom login background on Edge and IE 2020-09-01 17:52:36 +02:00
Alejandro Fraguas 7d3bc0b67f Merge branch 'ent-6211-Revisar-actualizacion-online-open' into 'develop'
fixed open online update

See merge request artica/pandorafms!3420
2020-09-01 15:55:33 +02:00
Marcos Alconada f75a0a98f1 add condition in UM if group equals 0 2020-09-01 13:26:10 +02:00
manuel.montes 51ed420d77 Fixed visual bug 2020-09-01 12:18:10 +02:00
alejandro-campos 0345d36d08 fixed open online update 2020-09-01 08:12:57 +02:00
artica 21c879c74f Auto-updated build strings. 2020-09-01 01:00:18 +02:00
Alejandro Fraguas b1402c1ad7 Merge branch 'ent-6248-10587-Error-SQL-graficas-interface-information-SNMP' into 'develop'
fix bug in combined graphs

See merge request artica/pandorafms!3410
2020-08-31 14:20:38 +02:00
Alejandro Fraguas d2df6fa00a Merge branch 'ent-6264-10617-No-se-crean-las-graficas-Interface-Information-SNMP' into 'develop'
Fixed module types check

See merge request artica/pandorafms!3417
2020-08-31 13:19:45 +02:00
daniel b96cade165 new options 24x7 sla,availavility reports 2020-08-31 12:33:41 +02:00
alejandro-campos 24d1522bd0 Fixed module types check 2020-08-31 12:12:52 +02:00
artica a4e0bfe38e Auto-updated build strings. 2020-08-31 01:00:15 +02:00
artica cd5c4ac63a Auto-updated build strings. 2020-08-30 01:00:18 +02:00
artica 2c81502c11 Auto-updated build strings. 2020-08-29 01:00:25 +02:00
artica 20a1436711 Auto-updated build strings. 2020-08-28 01:00:19 +02:00
artica 881a8e6a01 Auto-updated build strings. 2020-08-27 01:00:18 +02:00
alejandro-campos a92c3c7ca3 fix bug in combined graphs 2020-08-26 11:47:54 +02:00
artica 24eeebd6be Auto-updated build strings. 2020-08-26 01:00:18 +02:00
artica 223774875c Auto-updated build strings. 2020-08-25 01:00:17 +02:00
artica 022167fa9c Auto-updated build strings. 2020-08-24 01:00:14 +02:00
artica 07c7d917c8 Auto-updated build strings. 2020-08-23 01:00:14 +02:00
artica b5752f1b2d Auto-updated build strings. 2020-08-22 01:00:41 +02:00
marcos 195f09a7cf fixed error on delete agent api 2020-08-21 09:40:24 +02:00
artica f0a91cce56 Auto-updated build strings. 2020-08-21 01:00:18 +02:00
Daniel Rodriguez 0512149ee4 Merge branch 'ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola' into 'develop'
Ent 6102 edicion nombre sincronizacion alertas metaconsola

See merge request artica/pandorafms!3364
2020-08-20 14:43:17 +02:00
artica 06f17b5d0b Auto-updated build strings. 2020-08-20 01:00:18 +02:00
artica 2231fcab72 Auto-updated build strings. 2020-08-19 01:00:14 +02:00
artica c1c2fb3b57 Auto-updated build strings. 2020-08-18 01:00:16 +02:00
Daniel Rodriguez 55986ede39 Merge branch 'ent-6201-10495-macro-en-event-response-no-funciona' into 'develop'
fix parameter macros in event responses

See merge request artica/pandorafms!3405
2020-08-17 09:38:47 +02:00
artica b4b3fc5866 Auto-updated build strings. 2020-08-17 01:00:14 +02:00
artica fbb0699bf7 Auto-updated build strings. 2020-08-16 01:00:14 +02:00
artica c4dd6d2395 Auto-updated build strings. 2020-08-15 01:00:20 +02:00
alejandro-campos 0917a631ee fix parameter macros in event responses 2020-08-14 14:48:34 +02:00
Daniel Rodriguez 4ada69a804 Merge branch 'ent-6201-10495-macro-en-event-response-no-funciona' into 'develop'
Ent 6201 10495 macro en event response no funciona

See merge request artica/pandorafms!3403
2020-08-14 11:47:11 +02:00
artica 177341e6af Auto-updated build strings. 2020-08-14 01:00:18 +02:00
alejandro-campos 8f96ca0805 fix parameter macros in event responses 2020-08-13 14:13:12 +02:00
alejandro-campos 90ea61f753 fix parameter macros in event responses 2020-08-13 14:10:57 +02:00
artica e510d517f2 Auto-updated build strings. 2020-08-13 01:00:18 +02:00
artica 1c20cbd197 Auto-updated build strings. 2020-08-12 01:00:18 +02:00
Daniel Rodriguez 5deb7e6297 Merge branch 'ent-6167-fallo-wizard-procesos' into 'develop'
Fixed wizard snmp process module process field

See merge request artica/pandorafms!3396
2020-08-11 09:59:43 +02:00
artica 9b3909e5d0 Auto-updated build strings. 2020-08-11 01:00:18 +02:00
Daniel Rodriguez f43dc364de Merge branch 'ent-5821-bug-en-configuracion-de-notificaciones-de-la-console' into 'develop'
show hidden title on setup notifications

See merge request artica/pandorafms!3377
2020-08-10 09:46:54 +02:00
artica a60715a985 Auto-updated build strings. 2020-08-10 01:00:13 +02:00
artica 6902c61669 Auto-updated build strings. 2020-08-09 01:00:13 +02:00
artica 725b880d5e Auto-updated build strings. 2020-08-08 01:00:18 +02:00
Luis Calvo 18e6b26db8 Fixed wizard snmp process module process field 2020-08-07 16:46:35 +02:00
José González 85d8e1f796 Merge branch 'develop' into 'ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola'
# Conflicts:
#   pandora_console/extras/mr/40.sql
#   pandora_console/godmode/alerts/configure_alert_template.php
2020-08-07 13:17:41 +02:00
Daniel Rodriguez 386ab5ef91 Merge branch 'ent-6075-SNMP-Browser-no-muestra-OIDs-con-version-v2' into 'develop'
fix snmp browser v2

See merge request artica/pandorafms!3354
2020-08-07 09:47:28 +02:00
Daniel Rodriguez f7854ab633 Merge branch 'ent-6068-snmp-browser-community-spcial-char' into 'develop'
Fixed snmp community special char

See merge request artica/pandorafms!3352
2020-08-07 09:46:57 +02:00
Daniel Rodriguez c86ec629cd Merge branch 'ent-6054-Dashboard-group-status-mas-de-1-grupo' into 'develop'
fixed errors in dashboard widget groups status

See merge request artica/pandorafms!3369
2020-08-07 09:40:12 +02:00
artica a8d3c50467 Auto-updated build strings. 2020-08-07 01:00:17 +02:00
artica b812399ca3 Auto-updated build strings. 2020-08-06 01:00:16 +02:00
Alejandro Fraguas 2d25c19a5f Merge branch 'ent-6139-formatos-fecha-no-muestran-bien' into 'develop'
Fixed and added strfdate formats

See merge request artica/pandorafms!3383
2020-08-05 11:51:01 +02:00
artica bdec27d2a3 Auto-updated build strings. 2020-08-05 01:00:13 +02:00
artica b6d8cc1f2c Auto-updated build strings. 2020-08-04 01:00:14 +02:00
artica 6e6e194e73 Updated version and build strings. 2020-08-03 14:50:49 +02:00
vanessa gil 9fafb931e9 Updated translations. 2020-08-03 14:38:16 +02:00
artica add395279f Auto-updated build strings. 2020-08-03 01:00:14 +02:00
artica ed7928b8aa Auto-updated build strings. 2020-08-02 01:00:14 +02:00
artica ee69438620 Auto-updated build strings. 2020-08-01 01:00:18 +02:00
Luis 3327abc328 Ent 5824 connection lost warn mejora 2020-07-31 14:24:02 +02:00
artica e14c3f7dbd Auto-updated build strings. 2020-07-31 01:00:17 +02:00
artica 2ca821cc4d Auto-updated build strings. 2020-07-30 01:00:15 +02:00
artica 2b915d4546 Auto-updated build strings. 2020-07-29 01:00:16 +02:00
artica 4c3f0dfc59 Auto-updated build strings. 2020-07-28 01:00:18 +02:00
Daniel Rodriguez b5a62a9977 Merge branch 'ent-6141-cambios-sistema-de-licencias-trial' into 'develop'
Do not show the UM registration wizard for trial licenses.

See merge request artica/pandorafms!3385
2020-07-27 13:07:34 +02:00
Junichi Satoh d1146277dc Updated Japanese console translations. 2020-07-27 14:24:58 +09:00
artica f0724446a2 Auto-updated build strings. 2020-07-27 01:00:13 +02:00
artica b3e33f8104 Auto-updated build strings. 2020-07-26 01:00:14 +02:00
artica faccfb275d Auto-updated build strings. 2020-07-25 01:00:16 +02:00
Daniel Rodriguez 5577b42540 Merge branch 'ent-6161-no-abre-ventana-datos-modulo-string' into 'develop'
Fixed result div for string modules bug

See merge request artica/pandorafms!3386
2020-07-24 09:43:35 +02:00
artica f2e6d84d04 Auto-updated build strings. 2020-07-24 01:00:16 +02:00
Luis Calvo 158cbc74e2 Fixed result div for string modules bug 2020-07-23 17:28:44 +02:00
Daniel Maya cbc8630dfc Ent 5206 9287 exportacion a csv con dato con muchos decimales y miles trae confusion 2020-07-23 16:52:24 +02:00
Ramon Novoa d3114254ce Do not show the UM registration wizard for trial licenses.
Ref pandora_enterprise#6141
2020-07-23 15:54:01 +02:00
Daniel Maya 9f2e722787 Ent 6034 improvement of the um profile 2020-07-23 13:26:39 +02:00
artica 61f6a794b5 Auto-updated build strings. 2020-07-23 01:00:16 +02:00
Daniel Rodriguez bd3fdeed25 Merge branch 'ent-4158-Bug-al-crear-evento-con-id_server-que-no-existe-desde-la-API-en-meta' into 'develop'
Ent 4158 bug al crear evento con id server que no existe desde la api en meta

See merge request artica/pandorafms!3330
2020-07-22 16:29:28 +02:00
Daniel Rodriguez 7afc8902d3 Merge branch 'ent-6107-console-notifications-doesnt-clean-afeter-solved' into 'develop'
Server notifications clean when solved

See merge request artica/pandorafms!3360
2020-07-22 13:47:57 +02:00
daniel fdad32e4f0 Add public link dashboards 2020-07-22 10:56:16 +02:00
artica b6af8758cb Auto-updated build strings. 2020-07-22 01:00:17 +02:00
Daniel Rodriguez 413e113cad Merge branch 'ent-5814-Titulo-erroneo' into 'develop'
Fixed errors po and mo

See merge request artica/pandorafms!3371
2020-07-21 15:11:42 +02:00
daniel 2c535bb747 Fixed labels mode classic 2020-07-21 15:06:41 +02:00
Daniel Rodriguez 50cba7936a Revert "Merge branch 'ent-5992-XSS-Vuln-en-los-eventos-metaconsola' into 'develop'"
This reverts merge request !3311
2020-07-21 14:03:17 +02:00
Daniel Rodriguez 3ad555048f Merge branch 'ent-5992-XSS-Vuln-en-los-eventos-metaconsola' into 'develop'
fix vulnerability

See merge request artica/pandorafms!3311
2020-07-21 14:00:07 +02:00
artica 001edf95dd Auto-updated build strings. 2020-07-21 01:00:16 +02:00
Daniel Rodriguez de271193cc Merge branch 'ent-5963-10190-Mala-representacion-de-graficas-en-pdf-group-report-agent-configuration-y-group-settings' into 'develop'
Ent 5963 10190 mala representacion de graficas en pdf group report agent configuration y group settings

See merge request artica/pandorafms!3296
2020-07-20 15:33:53 +02:00
Luis 2dc239afe9 Ent 5443 group report no funcion bien 2020-07-20 13:26:39 +02:00
Daniel Rodriguez 56c1de4b04 Merge branch 'ent-5970-Columna-status-de-items-agent-configuration-y-group-settings-no-aparece-en-PDFs' into 'develop'
fixed pdf status field

See merge request artica/pandorafms!3307
2020-07-20 07:51:29 +02:00
artica fc6852359d Auto-updated build strings. 2020-07-20 01:00:13 +02:00
artica 85609e1e82 Auto-updated build strings. 2020-07-19 01:00:17 +02:00
artica 7cc8b9a016 Auto-updated build strings. 2020-07-18 01:00:18 +02:00
alejandro.campos@artica.es 685acf2200 Changed status displayed in pdfs 2020-07-17 11:42:42 +02:00
alejandro.campos@artica.es c6ee74e6b7 Merge branch 'develop' into ent-5105-9235-Error-tactical-view-consola-movil 2020-07-17 10:54:12 +02:00
Daniel Rodriguez f2f8debab6 Merge branch 'ent-5969-fallo-visual-en-reports-vista-html' into 'develop'
fixed error

See merge request artica/pandorafms!3308
2020-07-17 10:34:28 +02:00
daniel bd1c6b95ec Add agent/module view in dashboard 2020-07-17 10:33:40 +02:00
Luis 2c713f45dd Added mib uploader to get file 2020-07-17 10:01:10 +02:00
artica 60e0d5ec34 Auto-updated build strings. 2020-07-17 01:00:16 +02:00
marcos e221175bf4 updated changes 2020-07-16 15:57:28 +02:00
Luis Calvo 4b1d586ef0 Fixed and added strfdate formats 2020-07-16 14:07:29 +02:00
Daniel Rodriguez d6fc3a6195 Merge branch 'ent-5967-botones-de-events-responses-no-son-iguales' into 'develop'
fixed visual style repsonse buttons

See merge request artica/pandorafms!3319
2020-07-16 12:16:57 +02:00
marcos 10b2fe25ba fixed error 2020-07-16 10:57:27 +02:00
marcos c76238bdb0 Merge remote-tracking branch 'origin/develop' into ent-4425-api-cli-eventos-en-progreso 2020-07-16 09:57:14 +02:00
artica 8b85bba631 Auto-updated build strings. 2020-07-16 01:00:20 +02:00
marcos a6a97d264e changed event in progress method api refactored 2020-07-15 23:41:25 +02:00
marcos 9632b36551 changed event in progress method 2020-07-15 23:36:21 +02:00
fbsanchez c8d86a4bdb minor fix 2020-07-15 13:46:51 +02:00
fbsanchez dbf1265fd0 Merge remote-tracking branch 'origin/develop' into ent-5735-9752-problema-no-inicializados-modulos-de-tipo-log 2020-07-15 11:38:18 +02:00
artica 593ed43f10 Auto-updated build strings. 2020-07-15 01:00:17 +02:00
Daniel Rodriguez 846fd10ce1 Merge branch 'ent-5824-connection-lost-warn' into 'develop'
Ent 5824 connection lost warn

See merge request artica/pandorafms!3326
2020-07-14 18:10:11 +02:00
Daniel Rodriguez 76828ba745 Merge branch 'ent-5769-borrado-de-eventos-no-pide-confirmacion' into 'develop'
Ent 5769 borrado de eventos no pide confirmacion

See merge request artica/pandorafms!3271
2020-07-14 11:04:03 +02:00
Daniel Rodriguez 52dc38fcb2 Merge branch 'ent-5672-Graficas-gauge-no-se-muestran-bien-en-PDF' into 'develop'
Fixed error in gauges

See merge request artica/pandorafms!3261
2020-07-14 11:01:21 +02:00
marcos 26e0703617 Merge remote-tracking branch 'origin/develop' into ent-4425-api-cli-eventos-en-progreso 2020-07-14 10:05:18 +02:00
artica f81e66084c Auto-updated build strings. 2020-07-14 01:00:16 +02:00
fbsanchez 45062874ce minor fix disabled textareas 2020-07-13 14:06:52 +02:00
fbsanchez a0028e47ad Merge remote-tracking branch 'origin/develop' into ent-5735-9752-problema-no-inicializados-modulos-de-tipo-log 2020-07-13 13:56:54 +02:00
fbsanchez dc5767705f minor fixes 2020-07-13 13:56:41 +02:00
Daniel Rodriguez 1e31eae1a2 Merge branch 'ent-6130-Errores-en-Custom-graph-Informes-de-metaconsola' into 'develop'
Fixed errors custom graph metaconsole

See merge request artica/pandorafms!3376
2020-07-13 13:13:29 +02:00
marcos 2a62f3328a show hidden title on setup notifications 2020-07-13 13:00:47 +02:00
daniel f3ad52e0fa Ent 5532 edicion creacion de templates acciones comandos modo centralizado 2020-07-13 12:23:46 +02:00
Daniel Barbero Martin 293cdc6c08 Fixed errors custom graph metaconsole 2020-07-13 11:48:11 +02:00
Daniel Rodriguez ad93a7c681 Merge branch 'ent-5445-Item-prediction-date-no-funciona-correctamente-en-meta' into 'develop'
fix prediction date item in meta

See merge request artica/pandorafms!3340
2020-07-13 11:12:53 +02:00
Daniel Rodriguez 47686f2f51 Merge branch 'ent-5618-bug-en-nombres-de-los-usuarios-en-el-owner-de-eventos' into 'develop'
Change owner event responses

See merge request artica/pandorafms!3294
2020-07-13 11:12:02 +02:00
Alejandro Fraguas bd6904b99f Merge branch 'ent-6002-pandora-communty-vulnerabilities' into 'develop'
Fixed xss event comments vulnerabiluty and some acls on event ajax

See merge request artica/pandorafms!3335
2020-07-13 10:06:26 +02:00
daniel c0661fc1b7 fixed legend max 10 modules for chart 2020-07-13 10:02:56 +02:00
artica 313607efdf Auto-updated build strings. 2020-07-13 01:00:12 +02:00
artica e80252287c Auto-updated build strings. 2020-07-12 01:00:12 +02:00
artica 9d16783254 Auto-updated build strings. 2020-07-11 01:00:19 +02:00
fbsanchez 23641e45bb Entity with enterprise capabilites 2020-07-10 13:38:42 +02:00
Daniel Barbero Martin b87c2d986f Fixed errors po and mo 2020-07-10 12:36:57 +02:00
Daniel Rodriguez 9d6fff0850 Merge branch 'ent-5369-parseo-de-event-name-en-exportar-elementos' into 'develop'
Deleted columns s, options and m on csv datatables events

See merge request artica/pandorafms!3313
2020-07-10 10:16:34 +02:00
Daniel Rodriguez a83b10ff97 Merge branch 'ent-1957-Informe-agrupado-general' into 'develop'
Implemented all-in-row data for grouped general report

See merge request artica/pandorafms!3351
2020-07-10 10:11:57 +02:00
Daniel Rodriguez 0d68dde3db Merge branch 'ent-1940-Peso-en-graficas-personalizadas' into 'develop'
fixed weight legend

See merge request artica/pandorafms!3339
2020-07-10 10:10:42 +02:00
Daniel Barbero Martin af87e8c621 fixed errors in dashboard widget groups status 2020-07-10 08:30:57 +02:00
José González f3d1a80252 Merge branch 'develop' into 'ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola'
# Conflicts:
#   pandora_console/extras/mr/40.sql (solved)
2020-07-10 08:19:07 +02:00
artica 941dfc2b62 Auto-updated build strings. 2020-07-10 01:00:16 +02:00
fbsanchez 009d5c7bc0 Merge remote-tracking branch 'origin/develop' into ent-6000-operaciones-masivas-de-servicios 2020-07-09 16:51:50 +02:00
fbsanchez 865c2eb208 allowed service create propagate exceptions 2020-07-09 11:35:04 +02:00
artica a410ebffb4 Auto-updated build strings. 2020-07-09 01:00:14 +02:00
Alejandro Fraguas df9ab22fc1 Merge branch 'ent-6012-servicios-dinamicos' into 'develop'
MR change smart services

See merge request artica/pandorafms!3316
2020-07-08 18:01:16 +02:00
artica 3b091525f5 Auto-updated build strings. 2020-07-08 01:00:15 +02:00
fbsanchez 3d493f14da massive services 2020-07-07 19:10:24 +02:00
daniel 51104136a9 fixed errors in automatic combined graph 2020-07-07 16:07:13 +02:00
fbsanchez 02299bffdb Merge branch 'ent-6012-servicios-dinamicos' into ent-6000-operaciones-masivas-de-servicios 2020-07-07 11:57:12 +02:00
fbsanchez 98dc5f1796 minor fix range input 2020-07-07 11:54:55 +02:00
Jose Gonzalez 5e039adb26 Solve the issue for alerts, os names and tags 2020-07-07 11:05:19 +02:00
fbsanchez cb38f5569a Merge remote-tracking branch 'origin/develop' into ent-6000-operaciones-masivas-de-servicios 2020-07-07 10:26:27 +02:00
fbsanchez 80015a8691 smart services API adjustments 2020-07-07 10:21:28 +02:00
fbsanchez 0b42d1b61f smart services API adjustments 2020-07-07 10:19:49 +02:00
artica 93ad38888b Auto-updated build strings. 2020-07-07 01:00:14 +02:00
Luis Calvo 71eaebc03b Server notifications clean when solved 2020-07-06 17:01:52 +02:00
fbsanchez 534aa8c7c5 Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos 2020-07-06 14:31:55 +02:00
fbsanchez 53a2215a41 minor fix 2020-07-06 14:01:51 +02:00
fbsanchez 2442336f45 Minor fix 2020-07-06 13:58:35 +02:00
fbsanchez a0d489b90e Smart services 2020-07-06 11:10:43 +02:00
Luis Calvo d3087de163 Merge remote-tracking branch 'origin/develop' into ent-5824-connection-lost-warn 2020-07-06 10:49:24 +02:00
artica 50ef2f6e54 Auto-updated build strings. 2020-07-06 01:00:12 +02:00
artica ba9f22f7f9 Auto-updated build strings. 2020-07-05 01:00:12 +02:00
artica d2410e07e0 Auto-updated build strings. 2020-07-04 01:00:16 +02:00
fbsanchez 352da65640 WIP Smart services 2020-07-03 17:52:44 +02:00
alejandro-campos 458d729029 fix snmp browser v2 2020-07-03 14:22:07 +02:00
Luis Calvo 9ae225a505 Fixed snmp community special char 2020-07-03 13:34:04 +02:00
artica f7922b7607 Auto-updated build strings. 2020-07-03 01:00:15 +02:00
alejandro-campos 5b884e714b Implemented all-in-row data for grouped general report 2020-07-02 17:00:19 +02:00
fbsanchez af7981ed05 Service tree view 2020-07-02 14:53:33 +02:00
artica 40659c01da Updated version and build strings. 2020-07-02 10:52:47 +02:00
artica 7eee14de55 Auto-updated build strings. 2020-07-02 01:00:14 +02:00
fbsanchez 112f578512 wip smart services 2020-07-01 20:50:07 +02:00
alejandro-campos 63df6c15f0 Merge branch 'develop' into ent-6030-Problema-codificacion 2020-07-01 16:39:00 +02:00
artica 0a69318d88 Auto-updated build strings. 2020-07-01 01:01:14 +02:00
fbsanchez ffba7b8285 wip services improvements 2020-06-30 18:59:47 +02:00
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
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
alejandro-campos b13cab3e2a fix prediction date item in meta 2020-06-29 17:21:23 +02:00
Daniel Barbero Martin 595339613b fixed weight legend 2020-06-29 15:37:37 +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
Luis Calvo 9a8c42f4ac Fixed xss event comments vulnerabiluty and some acls on event ajax 2020-06-26 15:36:51 +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 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 7dc759f3ac Fixed minor error graph sparse width 2020-06-25 15:18:33 +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 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 Maya 9e449fe1c3 id server check in api event creation #4158 2020-06-24 13:05:40 +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
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
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 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
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 cec16d01b8 Merge branch 'develop' into ent-5935-Logs-de-la-consola-refactorizacion 2020-06-23 09:56:21 +02:00
Alejandro Campos a81e4acbb7 Merge branch 'develop' into 'ent-6030-Problema-de-codificacion'
# Conflicts:
#   pandora_console/include/functions_config.php
2020-06-23 09:28:21 +02:00
alejandro-campos 6520ad2107 Added setup token 2020-06-23 09:21:15 +02:00
artica 682f4eebf9 Auto-updated build strings. 2020-06-23 01:00:17 +02:00
Alejandro Fraguas 5d484b4eae Merge branch 'ent-6026-10243-Fatal-error-vista-servidores-metaconsola' into 'develop'
fix clippy help in meta

See merge request artica/pandorafms!3325
2020-06-22 16:32:16 +02:00
fbsanchez 94a7b625fb Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos
Conflicts:
	pandora_console/extras/mr/39.sql
2020-06-22 14:06:13 +02:00
Luis efb69c18bc Ent 5809 message delete not working 2020-06-22 13:52:54 +02:00
fbsanchez 166978f3aa Merge remote-tracking branch 'origin/develop' into ent-5759-intervalo-de-oracle-discovery-sale-mal 2020-06-22 12:25:04 +02:00
Daniel Rodriguez 30ce7fbc97 Merge branch 'ent-5726-Colors-severity-Eventos' into 'develop'
fixed bad constants

See merge request artica/pandorafms!3246
2020-06-22 11:20:59 +02:00
Luis bbf6fe8beb Fixed image modules historic report 2020-06-22 11:20:26 +02:00
Alejandro Fraguas 01c72e09b4 Merge branch 'ent-5997-marca-horaria-graficas-modulos' into 'develop'
Returned timestamp message for graphs

Closes pandora_enterprise#5997

See merge request artica/pandorafms!3306
2020-06-22 10:30:32 +02:00
marcos 1eb3891e94 Merge remote-tracking branch 'origin/develop' into ent-5958-xss-event-view 2020-06-22 09:44:34 +02:00
artica 6103e55287 Auto-updated build strings. 2020-06-22 01:00:13 +02:00
artica f601d43bb7 Auto-updated build strings. 2020-06-21 01:00:13 +02:00
artica 112f2cc25c Auto-updated build strings. 2020-06-20 01:00:19 +02:00
Luis Calvo d346c76322 Connection error dialog working 2020-06-19 23:03:37 +02:00
alejandro-campos d64ff918d6 Merge branch 'develop' into ent-5935-Logs-de-la-consola-refactorizacion 2020-06-19 12:22:28 +02:00
alejandro-campos 1243968872 Merge branch 'develop' into ent-5935-Logs-de-la-consola-refactorizacion 2020-06-19 12:12:52 +02:00
alejandro-campos e7424176ea fix clippy help in meta 2020-06-19 12:01:20 +02:00
marcos 7cfc68a3d6 ignore keys on xss event comments 2020-06-19 10:59:43 +02:00
Alejandro Fraguas 71c8451727 Merge branch 'ent-4973-Numero-de-estados-muestras-en-Availability-graph' into 'develop'
Fixed SLA error counter check

See merge request artica/pandorafms!3225
2020-06-19 10:05:41 +02:00
artica 9beb1ce22f Auto-updated build strings. 2020-06-19 01:00:15 +02:00
Luis Calvo e56a787ba8 WIP: Connection lost warn 2020-06-18 20:41:14 +02:00
Alejandro Fraguas 1e745c927c Merge branch 'ent-5905-10107-AD-Fallback-to-local-authentication-activo-siempre' into 'develop'
fixed ad authentication

See merge request artica/pandorafms!3269
2020-06-18 17:40:31 +02:00
marcos 1b0d40f88a fixed visual style repsonse buttons 2020-06-18 16:16:37 +02:00
Luis 28da2b9afb Ent 5473 report template inventory 2020-06-18 13:19:04 +02:00
artica c6c9b63338 Auto-updated build strings. 2020-06-18 01:00:14 +02:00
marcos eed12be281 Deleted columns s, options and m on csv datatables events 2020-06-17 13:05:04 +02:00
Daniel Maya eefe7688b4 Added log_viewer in metaconsole 2020-06-17 12:48:20 +02:00
fbsanchez 225b82233c Merge remote-tracking branch 'origin/develop' into ent-5778-9834-db2-para-discovery 2020-06-17 10:13:28 +02:00
alejandro-campos e78cd2b581 Merge branch 'develop' into ent-5951-XSS-SNMP-Browser 2020-06-17 09:46:41 +02:00
alejandro-campos f724b51512 Merge branch 'develop' into ent-5951-XSS-SNMP-Browser 2020-06-17 09:44:15 +02:00
artica 5d01c0976b Auto-updated build strings. 2020-06-17 01:00:15 +02:00
alejandro-campos 98b358e7ad fix vulnerability 2020-06-16 17:27:53 +02:00
Alejandro Fraguas b2084e3a1e Merge branch 'ent-5978-actualizacion-eventos-mediante-api' into 'develop'
Added api function for update events

Closes pandora_enterprise#5978

See merge request artica/pandorafms!3305
2020-06-16 10:23:09 +02:00
Jose Gonzalez e3fa68aef6 Correct event get for metaconsole 2020-06-16 10:03:22 +02:00