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

20506 Commits

Author SHA1 Message Date
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 Maya 3c95d17482 Fixed new_agent 2020-10-20 16:15:42 +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
Daniel Maya 0f379a2888 Fixed pagination counter 2020-10-20 12:38:42 +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 8b4fd551d1 minor fixes 2020-10-19 19:17:07 +02:00
fbsanchez d7f3810bba improved message saml 2020-10-19 19:00:00 +02:00
fbsanchez 3562192d69 minor fix 2020-10-19 18:51:18 +02:00
fbsanchez 92211c71b7 trick to avoid simplesamlphp logout bug while using custom session handlers 2020-10-19 18:45:40 +02:00
fbsanchez 987e77271e another try 2020-10-19 17:42:50 +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 7b73a36eb0 rc1 2020-10-16 16:41:42 +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
Jose Gonzalez dc15125cd8 Merge remote-tracking branch 'origin/develop' into ent-2323-Modo-Debug-instantáneo 
Update
 2020-10-15 12:27:59 +02:00
Jose Gonzalez c28e2917ed Modified database files 2020-10-15 11:29:47 +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
Jose Gonzalez 65851afe4d Database update 2020-10-14 10:59:55 +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
marcos 53362f6424 update branch 2020-10-13 15:04:33 +02:00
fbsanchez db716d6b1e Merge remote-tracking branch 'origin/develop' into ent-3653-finalizacion-de-paradas-planificadas-al-dia-siguiente-de-su-comienzo 2020-10-13 13:54:51 +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
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
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 5a5fb6eeea Allow define time start greater than time end in weekly planed downtimes 2020-10-07 14:49:46 +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
fbsanchez 2ba412cb55 Minor fixes discovery tasklist usability 2020-10-07 10:29:43 +02:00
daniel 40864eee6b add new token to report 2020-10-07 09:34:43 +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
Daniel Rodriguez e403c781ea Merge branch 'ent-5822-prueba-concepto-modal-selector-de-grupos' into 'develop' 
Group selection improvement

See merge request artica/pandorafms!3450
 2020-10-05 13:11:23 +02:00
fbsanchez cc3189196c Fix secondary groups match while group filtering 2020-10-05 12:45:26 +02:00
marcos e5fe9d5c29 feature 2FA_all_users 2020-10-05 12:29:51 +02:00
daniel 48831b5032 add new options char 2020-10-05 12:04:46 +02:00
fbsanchez 27c2fa0860 minor fix 2020-10-05 11:52:41 +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
fbsanchez ea3f147bad minor fixes group selector 2020-10-02 14:31:41 +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 add9387876 fixed error on create empty network map 2020-09-30 14:42:51 +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
Daniel Rodriguez ccbbd7909b Merge branch 'ent-6342-10704-wmi-errores-modulos-nuevos-cpu-disk-services-etc' into 'develop' 
Ent 6342 10704 wmi errores modulos nuevos cpu disk services etc

See merge request artica/pandorafms!3475
 2020-09-30 10:25:32 +02:00
artica 1a2f14a35b Auto-updated build strings. 2020-09-30 01:00:21 +02:00
fbsanchez b7c2913071 Avoid create agent if no group is selected 2020-09-29 15:49:10 +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 336f6924df Added images 2020-09-29 12:22:29 +02:00
Jose Gonzalez 00b289a557 Adapt functions for work in Metaconsole 2020-09-29 12:21:52 +02:00
Jose Gonzalez 9d0becc012 Added other password fields 2020-09-29 10:12:49 +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
fbsanchez 029a447e70 gcp minor fixes 2020-09-28 13:55:26 +02:00
Daniel Rodriguez 8df5fab69f Merge branch 'ent-6022-uptime-incorrecto-en-politica-mejorada-windows' into 'develop' 
Ent 6022 uptime incorrecto en politica mejorada windows

See merge request artica/pandorafms!3315
 2020-09-28 10:39:59 +02:00
Daniel Rodriguez 6d319cbe5d Merge branch 'ent-5847-optimizacion-recomendada-Gautier' into 'develop' 
Added indexes

Closes pandora_enterprise#5847

See merge request artica/pandorafms!3462
 2020-09-28 08:39:31 +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
Kevin b1c4a9890e Merge branch 'master' of brutus.artica.es:artica/pandorafms into ent-6022-uptime-incorrecto-en-politica-mejorada-windows 2020-09-25 11:46:08 +02:00
José González 0d8e2d5021 Merge branch 'develop' into 'ent-5847-optimizacion-recomendada-Gautier' 
# Conflicts:
#   pandora_console/extras/mr/42.sql

Solved conflicts.
 2020-09-25 11:27:41 +02:00
Luis ef043a169a Increased number of max macro data fields from 15 to 20 2020-09-25 10:47:36 +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 b3a29263e0 Merge branch 'ent-6338-Mensaje-perdida-conexion-aparece-siempre' into 'develop' 
Added lost connection data in stat_win file

Closes pandora_enterprise#6338

See merge request artica/pandorafms!3474
 2020-09-24 10:57:20 +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
Daniel Rodriguez 4880cbd29b Merge branch 'ent-6134-cambio-visual-en-checkbox-de-informes' into 'develop' 
Ent 6134 cambio visual en checkbox de informes

See merge request artica/pandorafms!3448
 2020-09-23 14:07:07 +02:00
Daniel Rodriguez f8bfd6c99b Merge branch 'ent-6119-cambiar-critical-warning-status-por-critical-warning-threshold' into 'develop' 
Ent 6119 cambiar critical warning status por critical warning threshold

See merge request artica/pandorafms!3423
 2020-09-23 14:06:09 +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
Daniel Rodriguez dadba4f81d Merge branch 'ent-6257-proyectos-imagenes-de-iso-de-demos-en-producto' into 'develop' 
Ent 6257 proyectos imagenes de iso de demos en producto

See merge request artica/pandorafms!3449
 2020-09-23 09:41:05 +02:00
Daniel Rodriguez 12bc9e2b4e Merge branch 'ent-6195-10482-entities-en-tabla-de-auditoria' into 'develop' 
Ent 6195 10482 entities en tabla de auditoria

See merge request artica/pandorafms!3411
 2020-09-23 09:38:29 +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 bf1d3f4af3 Merge branch 'ent-6278-SQL-Injection-ajax-cg_items' into 'develop' 
Solved ajax sql injection

Closes pandora_enterprise#6278

See merge request artica/pandorafms!3465
 2020-09-22 12:15:43 +02:00
Marcos Alconada 48e19f3b59 add condition 2020-09-22 12:15:05 +02:00
Daniel Rodriguez 49d8d1da9a Merge branch 'ent-6159-entities-al-exportar-ficheros-ptr-de-politicas' into 'develop' 
Ent 6159 entities al exportar ficheros ptr de politicas

See merge request artica/pandorafms!3414
 2020-09-22 12:14:19 +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
Daniel Rodriguez 422b0ac71d Merge branch 'ent-6050-tamano-de-la-ventana-de-front-page-for-custom-reports-muy-pequeno-en-los-visual-styles' into 'develop' 
Ent 6050 tamano de la ventana de front page for custom reports muy pequeno en los visual styles

See merge request artica/pandorafms!3446
 2020-09-22 11:11:26 +02:00
fbsanchez 04aa92ca0d Updated field number for WMI checks (new installations) 2020-09-22 10:35:56 +02:00
Daniel Rodriguez cc62975202 Merge branch 'ent-6118-create-user-user-id' into 'develop' 
Ent 6118 create user user

See merge request artica/pandorafms!3444
 2020-09-22 10:09:59 +02:00
artica 6a525deeea Auto-updated build strings. 2020-09-22 01:00:23 +02:00
fbsanchez c43c331d58 pandoradb_data.sql review, column selected in wmi modules 2020-09-21 18:13:18 +02:00
Jose Gonzalez 7f45a2133d Added lost connection data in stat_win file 2020-09-21 17:40:54 +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 7f0cc64193 default values for date intervals (trap view) 2020-09-18 14:03:28 +02:00
fbsanchez 724de97818 removed extra content 2020-09-18 11:53:16 +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
fbsanchez adceae8dda minor fixes 2020-09-18 09:40:26 +02:00
alejandro-campos 57b06be302 fixed api calls 2020-09-18 09:33:10 +02:00
Daniel Rodriguez 0d19f500b1 Merge branch 'ent-6153-AADCM-Reset-counter-for-non-sustained-alerts' into 'develop' 
checkd option by default on creation

See merge request artica/pandorafms!3454
 2020-09-18 09:27:22 +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
Daniel Rodriguez 957eae39f7 Merge branch 'ent-6169-10444-Bulk-Operations-sobre-modulo-SNMP-no-funciona' into 'develop' 
fix snmp version update

See merge request artica/pandorafms!3426
 2020-09-18 09:25:46 +02:00
artica 53da45e3c1 Auto-updated build strings. 2020-09-18 01:00:23 +02:00
fbsanchez 4fb69f343a minor fix 2020-09-17 19:32:28 +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
Jose Gonzalez 1258a1a635 Solved ajax sql injection 2020-09-17 15:14:03 +02:00
fbsanchez 867fccf604 Custom id improvements 2020-09-17 14:38:01 +02:00
Daniel Rodriguez 536e24d09e Merge branch 'ent-6288-No-se-puede-generar-Log-Report-item-en-informes' into 'develop' 
fix agents selector check

See merge request artica/pandorafms!3433
 2020-09-17 12:45:36 +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
Jose Gonzalez b97014f577 Cleaned traces 2020-09-16 17:40:18 +02:00
Jose Gonzalez da01f9abd5 Fix alter index 2020-09-16 17:32:05 +02:00
Jose Gonzalez dbb1ec6b84 Too long name fix 2020-09-16 17:19:07 +02:00
Jose Gonzalez ed4ba27158 Fixed index 2020-09-16 17:11:19 +02:00
fbsanchez 9d40f900ba WIP mc search nodes 2020-09-16 15:54:43 +02:00
Jose Gonzalez 9ac9a75658 Fixed mistake with update in os list 2020-09-16 14:47:33 +02:00
Jose Gonzalez e8efd228c0 Added indexes 2020-09-16 14:33:20 +02:00
Daniel Rodriguez 81cdfdbaa1 Merge branch 'ent-6289-Item-import-text-from-url-tiene-que-ser-items-de-la-ruta-de-consola-si-no-falla' into 'develop' 
added warning message

See merge request artica/pandorafms!3442
 2020-09-16 13:32:37 +02:00
Luis 12735f6ace Fixed module templates submit button value 2020-09-16 12:41:49 +02:00
alejandro-campos 8a6920a973 minor change 2020-09-16 11:43:53 +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 56c79c8024 Merge branch 'ent-6234-10501-borrado-de-filtros-en-eventos' into 'develop' 
fixed error with refresh in events filter

See merge request artica/pandorafms!3431
 2020-09-15 15:29:04 +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
Daniel Rodriguez feaa5a800d Merge branch 'ent-5328-falta-icono-mainframe-en-networks-maps' into 'develop' 
Ent 5328 falta icono mainframe en networks maps

See merge request artica/pandorafms!3424
 2020-09-15 11:20:36 +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 d86d0ff090 Avoid deleting profiles while pressing enter in user details (management) 2020-09-14 17:42:04 +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
alejandro-campos 5bd208a95c checkd option by default on creation 2020-09-14 13:43:18 +02:00
manuel.montes a70fc200b7 Fixed bug in unit field 2020-09-14 09:27:01 +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
alejandro-campos 77e465fff9 fixed errors in massive operations 2020-09-11 14:35:32 +02:00
fbsanchez 3374a89ae0 Group selection improvement 2020-09-11 14:34:41 +02:00
manuel.montes 0ff915e823 Added images 2020-09-11 10:22:51 +02:00
artica 100c1297fb Auto-updated build strings. 2020-09-11 01:00:18 +02:00
manuel.montes 4b531a96c2 Changed checkbox switch 2020-09-10 17:48:07 +02:00
artica 3a95c3dd58 Auto-updated build strings. 2020-09-10 01:00:17 +02:00
manuel.montes eaa4924a0f Fixed visual bug 2020-09-09 17:16:25 +02:00
Jose Gonzalez 58f521e8b5 Avoid XSS in Edit OS form. 2020-09-09 15:28:11 +02:00
Jose Gonzalez 99bb0eb809 Avoid XSS in Remote components form. 2020-09-09 14:44:19 +02:00
manuel.montes bcf5d3ca05 Fixed visual bug 2020-09-09 14:32:02 +02:00
Jose Gonzalez 8f477b1833 Avoid XSS in List of special days. Added control for only show help tip if description has data 2020-09-09 12:49:43 +02:00
Jose Gonzalez e833c318a5 Avoid XSS in Module templates 2020-09-09 12:35:28 +02:00
Jose Gonzalez de49530fd1 Avoid XSS in User management 2020-09-09 11:58:09 +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
alejandro-campos 77496bd5a2 added warning message 2020-09-09 09:35:21 +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 18a993145e Fixed type array warning messages 2020-09-07 14:38:43 +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
alejandro-campos c4e192f7f7 fix agents selector check 2020-09-04 13:54:07 +02:00
marcos 6f02ee8206 fixed error with refresh in events filter 2020-09-04 12:38:46 +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-campos d4b44d33a0 fix snmp version update 2020-09-01 17:39:25 +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
manuel.montes f8e36620e8 Added icon 2020-09-01 15:01:15 +02:00
Marcos Alconada f75a0a98f1 add condition in UM if group equals 0 2020-09-01 13:26:10 +02:00
manuel.montes 05fadd167d Changed names 2020-09-01 12:30:55 +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 fe8e7b7d0c Add new filter search actions 2020-08-31 12:48:00 +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
manuel.montes f7fe604914 Fixed entities in resource exporting 2020-08-28 14:43:20 +02:00
manuel.montes f477919433 Fixed entities in query 2020-08-28 13:56:15 +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
Jose Gonzalez 5565d839c3 Merge remote-tracking branch 'origin/develop' into ent-6093-error-fields-en-alertas-snmp 2020-08-26 09:00:35 +02:00
artica 24eeebd6be Auto-updated build strings. 2020-08-26 01:00:18 +02:00
Jose Gonzalez 516de686cf Fixed issue 2020-08-25 15:03:19 +02:00
Jose Gonzalez 1b14d83fd4 Added None value 2020-08-25 10:58:26 +02:00
artica 223774875c Auto-updated build strings. 2020-08-25 01:00:17 +02:00
Luis 0d27296b79 Fixed acl enterprise acl gextensions 2020-08-24 10:16:25 +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
Daniel Rodriguez 37c8cb74ce Merge branch 'ent-6123-Estado-de-los-log-source-de-agente' into 'develop' 
Implemented log source status info box in agent view

See merge request artica/pandorafms!3379
 2020-08-19 10:36:00 +02:00
alejandro-campos 29026ef3be changed tooltip 2020-08-19 09:10:17 +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 42c6989d5e Merge branch 'ent-5685-Historico-de-eventos-en-Metaconsola-no-tiene-paginacion-correcta' into 'develop' 
fix event pagination when events history is activated

See merge request artica/pandorafms!3401
 2020-08-14 11:47:19 +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
Marcos Alconada 77142a0c1a fixed vulnerability 2020-08-14 11:42:49 +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
alejandro-campos 6b989109d8 fix event pagination when events history is activated 2020-08-13 10:34:31 +02:00
artica e510d517f2 Auto-updated build strings. 2020-08-13 01:00:18 +02:00
Marcos Alconada 86bfcbcd90 changes on user list 2020-08-12 13:20:53 +02:00
artica 1c20cbd197 Auto-updated build strings. 2020-08-12 01:00:18 +02:00
Daniel Rodriguez ee61425bbf Merge branch 'ent-6170-xss-en-incidents' into 'develop' 
fixed vilnerability with filename incidents

See merge request artica/pandorafms!3399
 2020-08-11 12:40:22 +02:00
Alejandro Fraguas c33e4bcd32 Merge branch 'ent-6196-error-htaccess' into 'develop' 
change htacces to be compatible with php-fpm

See merge request artica/pandorafms!3390
 2020-08-11 10:14:45 +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
marcos 41249220df fixed vilnerability with filename incidents 2020-08-11 09:11:37 +02:00
Rafael Ameijeiras e6d81a76d2 Update .htaccess 2020-08-11 09:04:25 +02:00
artica 9b3909e5d0 Auto-updated build strings. 2020-08-11 01:00:18 +02:00
Jose Gonzalez 3c0ea8b08a Solved issues with DB 2020-08-10 15:10:17 +02:00
rafael 9cbf3d1306 Merge remote-tracking branch 'origin/develop' into ent-6196-error-htaccess 2020-08-10 14:55:28 +02:00
Jose Gonzalez 35644a367f Added ttag modifies 2020-08-10 14:53:07 +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
Jose Gonzalez 7300ccd185 Merge branch 'ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola' of brutus.artica.es:artica/pandorafms into ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola 2020-08-07 13:29:25 +02:00
Jose Gonzalez c67d8bd005 Fixed little issues 2020-08-07 13:29:09 +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
Luis f7f5798ee6 Fixed modules per agent enterprise message 2020-08-07 11:33:42 +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 1ab4e89a14 Merge branch 'ent-6036-Error-en-edicion-de-acciones-de-alerta' into 'develop' 
fix empty check condition

See merge request artica/pandorafms!3359
 2020-08-07 09:46:09 +02:00
Daniel Rodriguez a123eaa18c Merge branch 'ent-5609-link-to-credential-store-from-remote-module-creation' into 'develop' 
Added link to credential store from module creation

See merge request artica/pandorafms!3363
 2020-08-07 09:45:43 +02:00
Daniel Rodriguez ef73e7a73c Merge branch 'ent-6099-bug-al-duplicar-modulo' into 'develop' 
resolved error with duplucated modules

See merge request artica/pandorafms!3357
 2020-08-07 09:42:08 +02:00
Luis 7b09c1e943 Ent 6029 meta groups delete bug 2020-08-07 09:40:46 +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
Daniel Rodriguez d1730935d8 Merge branch 'ent-6080-cambiar-text-advertencia-modulos-no-inicializados-en-vista-agente' into 'develop' 
change message in non initialited modules

See merge request artica/pandorafms!3365
 2020-08-07 09:37:35 +02:00
Daniel Rodriguez bfe504b3be Merge branch 'ent-6053-error-envio-informe-mail-vista-informes' into 'develop' 
Fixed report sendmail success message

See merge request artica/pandorafms!3353
 2020-08-07 09:37:10 +02:00
Luis 35f231ac8c Restored alert actions help (needed for macros) 2020-08-07 09:36:43 +02:00
Luis 20addda9fe Fixed missing ckbox custom graphs 2020-08-07 09:35:27 +02:00
marcos 248c5936b6 fixed error with filter form 2020-08-07 09:19:46 +02:00
marcos bb2fb0c631 Merge remote-tracking branch 'origin/develop' into ent-6099-bug-al-duplicar-modulo 2020-08-07 08:47:11 +02:00
marcos e3a126c260 Merge remote-tracking branch 'origin/develop' into ent-6080-cambiar-text-advertencia-modulos-no-inicializados-en-vista-agente 2020-08-07 08:45:21 +02:00
Marcos Alconada 50c089587d Update estado_monitores.php 2020-08-07 08:39:58 +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
rafael e181199581 change htacces to be compatible with php-fpm 2020-07-30 08:57:54 +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
Daniel Rodriguez fa834bff1b Merge branch 'ent-update-japanese-console-translation' into 'develop' 
Updated Japanese console translations.

See merge request artica/pandorafms!3389
 2020-07-27 12:28:12 +02:00
Daniel Rodriguez 6e3ff47f0f Merge branch 'ent-mysql80-support' into 'develop' 
Added support for MySQL 8.0 in installer.

See merge request artica/pandorafms!3387
 2020-07-27 12:27:10 +02:00
Daniel Rodriguez 1f2e0e2d80 Merge branch 'ent-4943-identificar-version-instalada-server-enterprise-e6-o-e7' into 'develop' 
Increase the size of tserver.version.

See merge request artica/pandorafms!3368
 2020-07-27 12:17:27 +02:00
Junichi Satoh d1146277dc Updated Japanese console translations. 2020-07-27 14:24:58 +09:00
Junichi Satoh 81ffa4783f Added support for MySQL 8.0 in installer. 2020-07-27 13:41:18 +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 8820d2756f Update the migration script. 2020-07-23 16:31:55 +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 b93f826f89 Merge branch 'ent-6100-Comando-de-alerta-Pandora-FMS-event' into 'develop' 
Ent 6100 comando de alerta pandora fms event

See merge request artica/pandorafms!3356
 2020-07-22 16:37:46 +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
Daniel Rodriguez dd08f3bfdd Merge branch 'ent-5964-AADCM-Refresh-time-en-CV-link-publico' into 'develop' 
fix default refresh time in visual console public link

See merge request artica/pandorafms!3309
 2020-07-21 10:48:57 +02:00
Daniel Rodriguez 7d69cbe65d Merge branch 'ent-5907-bug-status-modulo-prediccion' into 'develop' 
Solved issue with thresholds in prediction modules

Closes pandora_enterprise#5907

See merge request artica/pandorafms!3293
 2020-07-21 10:48:06 +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 51f2db16cb Merge branch 'ent-5587-no-tiene-en-cuenta-las-acciones-default-filtrar-alertas' into 'develop' 
Changed query for get default actions in templates

Closes pandora_enterprise#5587

See merge request artica/pandorafms!3320
 2020-07-20 07:54:08 +02:00
Daniel Rodriguez 249e4a737a Merge branch 'ent-5806-post-process-genera-lineas-repetidas' into 'develop' 
Changed nothing option for avoid duplicates

Closes pandora_enterprise#5806

See merge request artica/pandorafms!3297
 2020-07-20 07:52:48 +02:00
Daniel Rodriguez 8915492323 Merge branch 'ent-6004-error-visual-en-el-filtrado-de-componentes-en-metaconsola' into 'develop' 
fixed visual error tag meta

See merge request artica/pandorafms!3318
 2020-07-20 07:51:57 +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
Daniel Rodriguez 100db2d4db Merge branch 'ent-5920-Fallo-al-pinchar-en-visual-console-manager-en-metaconsola' into 'develop' 
Fixed error link builder in VC

See merge request artica/pandorafms!3275
 2020-07-16 12:11:51 +02:00
Daniel Rodriguez 4bf2a2fedd Merge branch 'ent-5909-el-formato-encajado-de-la-busqueda-no-tiene-sentido' into 'develop' 
fixed error

See merge request artica/pandorafms!3266
 2020-07-16 12:10:31 +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
Alejandro Campos 0d3d4d7d6f Merge branch 'develop' into 'ent-6100-Comando-de-alerta-Pandora-FMS-event' 
# Conflicts:
#   pandora_console/extras/mr/40.sql
 2020-07-15 09:30:35 +02:00
alejandro-campos 4edef7099b added check to display log sources info box when log collector activated 2020-07-15 09:25:39 +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
alejandro-campos 909d7cba58 Implemented log source status info box in agent view 2020-07-14 17:12:38 +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 8b8fd7bf30 Merge branch 'ent-5764-consola-visual-pantalla-completa-autohide' into 'develop' 
Restored autoHide for controls modal in visual console with full screen

Closes pandora_enterprise#5764

See merge request artica/pandorafms!3299
 2020-07-14 11:03:33 +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
Alejandro Fraguas f79dd6db43 Merge branch 'ent-no-muestra-las-imagenes-en-el-modal-de-error-del-modulo-database-maintenance-en-metaconsola' into 'develop' 
5722-fixed image not found

See merge request artica/pandorafms!3263
 2020-07-13 13:22: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 492c7f90cf Merge branch 'ent-5670-no-aparecen-los-valores-introducidos-al-crear-una-platilla-de-alerta' into 'develop' 
fixed error

See merge request artica/pandorafms!3321
 2020-07-13 11:13:24 +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 fbb251f358 Merge branch 'ent-5468-parsear-campos-exec-server-por-si-hay-espacios-sobre-todo-ip' into 'develop' 
Ent 5468 parsear campos exec server por si hay espacios sobre todo ip

See merge request artica/pandorafms!3334
 2020-07-13 10:54:42 +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 8b24faa129 Merge branch 'ent-2002-Remote-component-centralizado' into 'develop' 
Blocked create and update of remote component group when meta has centralized management

Closes pandora_enterprise#2002

See merge request artica/pandorafms!3272
 2020-07-10 10:11:25 +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
Ramon Novoa 19a8288f26 Increase the size of tserver.version. 
Ref pandora_enterprise#4943
 2020-07-09 17:47:11 +02:00
fbsanchez 5df418d226 MR changes 2020-07-09 16:56:51 +02:00
fbsanchez 231ba795dd MR update 2020-07-09 16:53:03 +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
Daniel Rodriguez 8925821a2b Merge branch 'ent-6045-snmp-alert-field-10-se-borra' into 'develop' 
Fixed minor bug field10 param

See merge request artica/pandorafms!3346
 2020-07-08 11:04:47 +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
marcos e2ae568ed3 change message in non initialited modules 2020-07-07 15:48:31 +02:00
Daniel Rodriguez b18ace9ef6 Merge branch 'ent-5716-ventana-de-registrar-nodo-en-database-ha-queda-visible' into 'develop' 
Minor style fix

See merge request artica/pandorafms!3262
 2020-07-07 13:12:53 +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 a1bd93bac7 Add database changes 2020-07-07 11:08:44 +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
Luis Calvo 37a97cd2ad Added link to credential store from module creation 2020-07-07 10:26:19 +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
fbsanchez cf26293a33 WIP massive services 2020-07-06 19:35:31 +02:00
Luis Calvo 71eaebc03b Server notifications clean when solved 2020-07-06 17:01:52 +02:00
alejandro-campos 0ef7ff1198 fix empty check condition 2020-07-06 14:35:22 +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
marcos 4ad7735dd7 resolved error with duplucated modules 2020-07-06 10:09:36 +02:00
alejandro-campos 49888fe48f Added change to MR 2020-07-06 09:56:15 +02:00
alejandro-campos 47a7502c6b Added change to MR 2020-07-06 09:55:14 +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 76d724321f Fixed report sendmail success message 2020-07-03 14:18:30 +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
fbsanchez d1d47c721d missed logger for new log location 2020-07-02 18:32:32 +02:00