Commit Graph

13389 Commits

Author SHA1 Message Date
Jose Gonzalez 765d7938f9 Handled comments for validated comments 2020-10-23 12:20:20 +02:00
alejandro-campos 3d561524be Merge branch 'develop' of https://brutus.artica.es:8081/artica/pandorafms into develop 2020-10-23 09:24:37 +02:00
alejandro-campos 5d812d5859 added new macros 2020-10-23 09:20:23 +02:00
artica 002509500c Auto-updated build strings. 2020-10-23 01:00:18 +02:00
fbsanchez 75bb4338b7 fixes in event macros (responses) 2020-10-22 18:10:46 +02:00
Jose Gonzalez a8c54dadee Fixed some errors 2020-10-22 17:03:31 +02:00
Jose Gonzalez ddc46c077f Solved issue 2020-10-22 17:01:10 +02:00
fbsanchez ef50b47269 avoid useless messages 2020-10-22 15:15:46 +02:00
Jose Gonzalez f09e864569 Solved issue 2020-10-22 12:47:25 +02:00
Luis Calvo bfa8d703e7 Fixed api create_event autovalidation on meta 2020-10-22 11:35:07 +02:00
fbsanchez 3220217ec8 exclude branch from select_for_Groups given group_id 2020-10-21 18:31:10 +02:00
fbsanchez 5d69ca3126 recursion taken in mind in group report 2020-10-21 17:54:33 +02:00
fbsanchez bfa5b81ee8 Added server component status - crash - 2020-10-21 14:03:46 +02:00
fbsanchez 6b25ae6004 improved agent_module report (CSV) 2020-10-21 13:23:17 +02:00
Daniel Barbero Martin 82f4e1d987 fixed error report SLA CSV and Visuals 2020-10-21 12:14:40 +02:00
fbsanchez 42cca865ac groups_get_children and propagate update 2020-10-21 11:38:57 +02:00
artica 7bd7d190c5 Auto-updated build strings. 2020-10-21 01:02:12 +02:00
Daniel Barbero Martin 73ff2cff9d fixed error report selector modules in metaconsole 2020-10-20 18:30:53 +02:00
fbsanchez 4babcbe647 Forced recursion while selecting All group - group_alert_report 2020-10-20 18:25:04 +02:00
fbsanchez 25295f7b0b fixes 2020-10-20 18:06:05 +02:00
fbsanchez 033dd531a8 Minor fix all group empty label 2020-10-20 17:47:35 +02:00
Daniel Barbero Martin 685acc6c20 fixed report avg-min-max 2020-10-20 16:00:19 +02:00
Daniel Barbero Martin 6c16587b40 fixed legend avg network interfaces 2020-10-20 12:58:25 +02:00
artica fbccb4ac6b Auto-updated build strings. 2020-10-20 01:00:17 +02:00
fbsanchez a961d04c6f Merge remote-tracking branch 'origin/develop' into ent-6472-graficas-con-phantomjs-y-saml 2020-10-19 19:40:40 +02:00
fbsanchez f6020e8791 Removed unwanted traces 2020-10-19 10:59:46 +02:00
artica c560fa6125 Auto-updated build strings. 2020-10-18 01:00:15 +02:00
artica 880c20dcab Auto-updated build strings. 2020-10-17 01:00:17 +02:00
fbsanchez 30c7da054f fixes SAML 2020-10-16 15:24:21 +02:00
fbsanchez ca9b167741 SAML with pandora sessions 2020-10-16 14:00:38 +02:00
artica dc41879a2c Auto-updated build strings. 2020-10-16 01:00:21 +02:00
artica 3a890dc8b8 Updated version and build strings. 2020-10-15 10:19:42 +02:00
artica 6aaa4802e5 Auto-updated build strings. 2020-10-15 01:00:18 +02:00
Daniel Rodriguez 609ec5de37 Merge branch 'ent-6472-graficas-con-phantomjs-y-saml' into 'develop'
Include SAML in pandora standard session handler (php)

See merge request artica/pandorafms!3528
2020-10-14 14:06:50 +02:00
daniel 510a96af8f fixed sql grph 2020-10-14 11:17:05 +02:00
fbsanchez b97e8697f9 Include SAML in pandora standard session handler (php) 2020-10-14 10:31:46 +02:00
Daniel Rodriguez 5b1d29e4cb Merge branch 'ent-6467-No-funciona-el-select-de-nodos-en-los-items-de-graficas-sql' into 'develop'
fixed sql graph pie

See merge request artica/pandorafms!3523
2020-10-14 10:29:53 +02:00
artica 4c67e17e84 Auto-updated build strings. 2020-10-14 01:00:19 +02:00
daniel 148384f8fb phantomjs performance 2020-10-13 18:24:10 +02:00
Daniel Barbero Martin 8c6c4d99a0 fixed sql graph pie 2020-10-13 09:32:28 +02:00
artica 2b06c5babc Auto-updated build strings. 2020-10-13 01:00:16 +02:00
artica 8146e5377e Auto-updated build strings. 2020-10-12 01:00:16 +02:00
artica 2c1ed80925 Auto-updated build strings. 2020-10-11 01:00:16 +02:00
artica d5b0966669 Auto-updated build strings. 2020-10-10 01:00:18 +02:00
fbsanchez a313f00755 First steps VC network link 2020-10-09 12:45:10 +02:00
Daniel Barbero Martin 8a72074a8a fixed sql graph pie 2020-10-09 12:05:57 +02:00
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
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
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
artica d677fedc0e Auto-updated build strings. 2020-10-07 01:00:18 +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
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
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
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
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
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
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