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

15513 Commits

Author SHA1 Message Date
artica 4cd17dca40 Auto-updated build strings. 2021-09-15 01:00:20 +02:00
fbsanchez 8f7e49b0d1 CS fix in memory_limit detection (MC) 2021-09-14 18:59:15 +02:00
Calvo e30fb70f11 Fix tag treeview level2 2021-09-14 13:03:38 +02:00
artica cf3c328d18 Auto-updated build strings. 2021-09-14 01:00:17 +02:00
artica c231c82e93 Updated version and build strings. 2021-09-13 12:08:23 +02:00
Calvo bb1e0a0b8b API set create alert template metaconsole support 2021-09-13 10:10:52 +02:00
artica 4ec67b51b7 Auto-updated build strings. 2021-09-13 01:00:16 +02:00
artica 4d2a52fcce Auto-updated build strings. 2021-09-12 01:00:13 +02:00
artica 48ee2d3fcd Auto-updated build strings. 2021-09-11 01:00:20 +02:00
Calvo 82e5b649d6 Css content moved to js to allow translation 2021-09-10 15:10:20 +02:00
Daniel Rodriguez 4a8461c2d3 Merge branch 'ent-7885-12292-General-Report-no-ordena-como-debe' into 'develop' 
Ent 7885 12292 general report no ordena como debe

See merge request artica/pandorafms!4378
 2021-09-10 11:17:54 +00:00
Daniel Rodriguez 93b4d81264 Merge branch 'ent-7730-visualizacion-update-manager-en-tema-oscuro' into 'develop' 
add update manager black background update manager

See merge request artica/pandorafms!4270
 2021-09-10 11:11:24 +00:00
Daniel Rodriguez 8ea02ab4c2 Merge branch 'ent-7991-bug-selector-css' into 'develop' 
Fix name for css

Closes pandora_enterprise#7991

See merge request artica/pandorafms!4397
 2021-09-10 11:08:24 +00:00
Jose Gonzalez a774d67f2a Merge remote-tracking branch 'origin' into ent-7514-pasar-networkmaps-a-open 2021-09-10 12:50:23 +02:00
Junichi Satoh 1c3ec719d7 Updated Japanese console translations. 2021-09-10 17:57:44 +09:00
Marcos Alconada 2ed5be71d6 Resolve conflict 2021-09-10 08:04:23 +00:00
Marcos Alconada 99a47b0739 set style on um-last and next button 2021-09-10 07:49:40 +00:00
Jose Gonzalez 316611f432 Fix name for css 2021-09-10 09:25:01 +02:00
artica 12b7cd0c63 Auto-updated build strings. 2021-09-10 01:00:21 +02:00
Daniel Rodriguez 1a66858020 Merge branch 'ent-7984-falla-chequeo-de-acls-en-la-api' into 'develop' 
Fixed API access

See merge request artica/pandorafms!4395
 2021-09-09 08:07:15 +00:00
artica f2875b5a86 Auto-updated build strings. 2021-09-09 01:00:24 +02:00
fbsanchez 34adf6e9e2 Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card 2021-09-08 21:21:45 +02:00
Daniel Rodriguez a18fd6ab0f Merge branch 'ent-7706-descuadre-texto-e-icono-de-los-botones' into 'develop' 
fixed icon button position

See merge request artica/pandorafms!4243
 2021-09-08 14:40:34 +00:00
Daniel Rodriguez 2e7dadb04e Merge branch 'ent-7591-mensaje-error-timeout-snmp-en-browser' into 'develop' 
Fix format on snmp browser error messages

See merge request artica/pandorafms!4276
 2021-09-08 14:37:14 +00:00
Daniel Rodriguez 3b5545cde4 Merge branch 'ent-7720-bug-visual-en-correlacion-de-alertas' into 'develop' 
fixed error

See merge request artica/pandorafms!4244
 2021-09-08 13:35:45 +00:00
Daniel Rodriguez 4372837f36 Merge branch 'ent-7961-bug-visual-en-las-graficas-de-log-viewer' into 'develop' 
Log viewer graph capture model visual  bug

See merge request artica/pandorafms!4393
 2021-09-08 13:23:22 +00:00
fbsanchez 52ba314612 Fixed API access 2021-09-08 14:28:48 +02:00
Daniel Rodriguez 6599f80dff Merge branch 'ent-7444-Metaconsole-Triggered-alerts-report' into 'develop' 
Fixed forget metaconsole alerts

Closes pandora_enterprise#7444

See merge request artica/pandorafms!4388
 2021-09-08 10:14:22 +00:00
Calvo 44663c914a Log viewer graph capture model visual bug 2021-09-08 10:44:57 +02:00
artica 7e5dc6a9c4 Auto-updated build strings. 2021-09-08 01:00:19 +02:00
artica ecd818bbb7 Auto-updated build strings. 2021-09-07 01:00:19 +02:00
Calvo 62775e0dae Fix api group_id_by_name with url enconde separator 2021-09-06 18:13:14 +02:00
marcos 1b4a137579 fixed visual error with modules agents 2021-09-06 17:16:49 +02:00
Jose Gonzalez bb743cb87f Fixed forget metaconsole alerts 2021-09-06 14:08:24 +02:00
Daniel Rodriguez 42d8bb6003 Merge branch 'ent-7801-Vulnerabilidad-File-Manager' into 'develop' 
Fix vulnerability

Closes pandora_enterprise#7801

See merge request artica/pandorafms!4385
 2021-09-06 11:23:26 +00:00
marcos 9552b9716e reduce title of longer module name odometer VC 2021-09-06 12:28:57 +02:00
artica 6bb994f4b7 Auto-updated build strings. 2021-09-06 01:00:37 +02:00
artica 42a999b207 Auto-updated build strings. 2021-09-05 01:00:13 +02:00
artica 22a0709953 Auto-updated build strings. 2021-09-04 01:00:22 +02:00
marcos 197ae303e2 reduce longer module name on odometers VC 2021-09-03 14:59:39 +02:00
marcos b3f4e68934 reduce longer module name on odometers VC 2021-09-03 14:57:09 +02:00
Jose Gonzalez fa101db3b6 Fix vulnerability 2021-09-03 13:30:15 +02:00
Daniel Rodriguez 3f5d37493e Merge branch 'ent-7955-500-en-link-al-agente-desde-widget-list-of-latest-events-dashboard-metaconsola' into 'develop' 
fixed error with node link events list dashboard

See merge request artica/pandorafms!4382
 2021-09-03 09:44:49 +00:00
artica 30c6a78b35 Auto-updated build strings. 2021-09-03 01:00:40 +02:00
marcos 8b048c8c19 fixed error with node link events list dashboard 2021-09-02 16:43:16 +02:00
Daniel Maya 5bf70f876c #7950 Fixed last_contact 2021-09-02 16:12:46 +02:00
Calvo 2ca6f52598 Revision ACL part 3 2021-09-02 15:43:20 +02:00
Jose Gonzalez ce2bdc1917 Fixed issues uploading files and fix vulnerability 2021-09-02 13:38:55 +02:00
Jose Gonzalez 0c96fd6f71 Merge remote-tracking branch 'origin' into ent-7804-modificar-comportamiento-file-manager 2021-09-02 12:43:05 +02:00
fbsanchez 6756c16c35 Added correlation server to server list 2021-09-02 12:21:31 +02:00
marcos 3547c09a16 add black theme on update manager online 2021-09-02 12:05:54 +02:00
artica 737943fee2 Auto-updated build strings. 2021-09-02 01:00:55 +02:00
José González 6b90b33a26 Merge branch 'develop' into 'ent-7804-modificar-comportamiento-file-manager' 
# Conflicts:
#   pandora_console/include/functions_filemanager.php
 2021-09-01 15:33:44 +00:00
marcos 1bec5014c7 resoled conflcits 2021-09-01 16:58:36 +02:00
Jose Gonzalez 423bd106d5 Fix issues 2021-09-01 16:57:48 +02:00
marcos f49d6d3088 fixed error with node link events list dashboard 2021-09-01 16:54:07 +02:00
Daniel Rodriguez b8e1391ffd Merge branch 'ent-7911-errores-file-manager' into 'develop' 
Fixed issues with files upload

Closes pandora_enterprise#7911

See merge request artica/pandorafms!4370
 2021-09-01 13:18:10 +00:00
Daniel Rodriguez fedc46dc1d Merge branch 'ent-7953-mapas-con-estilos-mal' into 'develop' 
Fix map styles

See merge request artica/pandorafms!4380
 2021-09-01 09:11:01 +00:00
Calvo 3204fdb71f Merge remote-tracking branch 'origin/develop' into ent-7844-revision-acl-enterprise-parte-3-fallos-actuales 2021-09-01 11:06:20 +02:00
Daniel Rodriguez 8397f778b3 Merge branch 'ent-6885-11172-añadir-opcion-de-nor-en-monitor-detail' into 'develop' 
add not option in monitor detail filter

See merge request artica/pandorafms!4112
 2021-09-01 08:54:49 +00:00
Daniel Rodriguez f94ad30df4 Merge branch 'ent-7506-ediciones-acciones-modo-advanced-no-amplia' into 'develop' 
fixed error with manual resize advanced action alerts

See merge request artica/pandorafms!4381
 2021-09-01 08:52:53 +00:00
artica 10dd28246c Auto-updated build strings. 2021-09-01 01:00:24 +02:00
Daniel Rodriguez a853c8a0c6 Merge branch 'ent-7786-agentes-asignados-a-politicas-en-metaconsola' into 'develop' 
Ent 7786 agentes asignados a politicas en metaconsola

See merge request artica/pandorafms!4280
 2021-08-31 13:47:00 +00:00
Jose Gonzalez 3570ee6e04 Merge remote-tracking branch 'origin' into ent-7662-rebranding-meta 2021-08-31 14:49:53 +02:00
Daniel Rodriguez f12f3d6cf4 Merge branch 'ent-7915-Error-SQL-en-filtro-de-custom-field-en-informe-de-inventario-de-agentes' into 'develop' 
Ent 7915 error sql en filtro de custom field en informe de inventario de agentes

See merge request artica/pandorafms!4375
 2021-08-31 10:05:31 +00:00
Daniel Rodriguez f53969731a Merge branch 'ent-7638-11735-vista-de-eventos-en-dashboard-menus-descolocados' into 'develop' 
fixed error with wrong event list dialog in dashboard

See merge request artica/pandorafms!4374
 2021-08-31 10:03:30 +00:00
marcos 3cb2b92774 fixed error with manual resize advanced action alerts 2021-08-31 11:47:36 +02:00
fbsanchez 88e4a804f5 Fix map styles 2021-08-31 11:05:41 +02:00
artica 966a5df96a Auto-updated build strings. 2021-08-31 01:00:50 +02:00
José González 215c0e3cc1 Branding 2021-08-30 16:24:51 +02:00
Daniel Maya 1e845cb5e3 #7867 Fixed id_agent 2021-08-30 12:13:33 +02:00
marcos 80f4e25b92 change first option value when not_condition its enabled 2021-08-30 11:19:53 +02:00
Daniel Maya 1d8dd85bbc #7885 Fixed order 2021-08-30 10:49:07 +02:00
Daniel Rodriguez 3be0c18165 Merge branch 'ent-7889-vulnerabilidad-xss-en-elementos-de-servicios' into 'develop' 
Ent 7889 vulnerabilidad xss en elementos de servicios

See merge request artica/pandorafms!4360
 2021-08-30 08:45:13 +00:00
José González b2a5e15c11 Merge remote-tracking branch 'origin' into ent-7662-rebranding-meta 2021-08-30 10:40:06 +02:00
artica b4c52f92f7 Auto-updated build strings. 2021-08-30 01:00:38 +02:00
artica bffc6c52ce Auto-updated build strings. 2021-08-29 01:00:17 +02:00
artica dd538c48bb Auto-updated build strings. 2021-08-28 01:00:24 +02:00
José González f31d156a46 Merge remote-tracking branch 'origin' into ent-7662-rebranding-meta 2021-08-27 13:00:37 +02:00
Daniel Rodriguez a0ff35670b Merge branch 'ent-7747-bug-en-descarga-de-plugins' into 'develop' 
Plugins get file correct downlad link

See merge request artica/pandorafms!4247
 2021-08-27 10:49:36 +00:00
Daniel Rodriguez a89faed47c Merge branch 'ent-7823-interfaces-view-no-calcula-bien-last-data' into 'develop' 
Fixed issue with last_data obtain

Closes pandora_enterprise#7823

See merge request artica/pandorafms!4338
 2021-08-27 10:46:39 +00:00
Daniel Maya c4e6c52fe2 #7915 fixed custom field filter 2021-08-27 11:24:23 +02:00
marcos 05de5f643f fixed error with wrong event list dialog in dashboard 2021-08-27 09:20:30 +02:00
artica 72e46df88b Auto-updated build strings. 2021-08-27 01:00:23 +02:00
marcos 2ed657c166 updates 2021-08-26 12:42:16 +02:00
Jose Gonzalez 945c29d1bc Fix issues 2021-08-26 11:15:02 +02:00
Daniel Rodriguez f33ccf1db9 Merge branch 'ent-7613-wizard-configuracion-inicial' into 'develop' 
Fix select2 write search field on dialog

See merge request artica/pandorafms!4242
 2021-08-26 08:55:57 +00:00
artica a8fcec1f6a Auto-updated build strings. 2021-08-26 01:00:50 +02:00
Jose Gonzalez 18cdc49b88 bad intentions directory creation avoided and solved some issues 2021-08-25 17:13:07 +02:00
Daniel Rodriguez d701e50b9f Merge branch 'ent-7684-mostrar-campo-con-el-nombre-de-nodo-que-viene-en-metaconsola-en-la-vista-de-detalle-del-evento' into 'develop' 
add node name on event details

See merge request artica/pandorafms!4274
 2021-08-25 13:01:02 +00:00
Daniel Rodriguez 22587a0dde Merge branch 'ent-7036-11346-Introducir-el-campo-de-IP-del-agente-en-la-vista-de-eventos' into 'develop' 
Ent 7036 11346 introducir el campo de ip del agente en la vista de eventos

See merge request artica/pandorafms!4275
 2021-08-25 13:00:42 +00:00
Daniel Rodriguez e6c5d1a6ef Merge branch 'ent-7392-aviso-configuracion-cron' into 'develop' 
Change time check for cron

Closes pandora_enterprise#7392

See merge request artica/pandorafms!4296
 2021-08-25 12:57:40 +00:00
fbsanchez 8b941b4d30 Merge remote-tracking branch 'origin/develop' into ent-7786-agentes-asignados-a-politicas-en-metaconsola 2021-08-25 11:13:35 +02:00
José González 8982e3d49b Fixed typo 2021-08-25 10:38:22 +02:00
José González 357b47a6d5 Merge remote-tracking branch 'origin' into ent-7666-boxes-relations-nodo-mapa-red-no-funcionan 2021-08-25 10:27:56 +02:00
artica f63fa5ab96 Auto-updated build strings. 2021-08-25 01:00:39 +02:00
Jose Gonzalez 1bbcc47344 Merge remote-tracking branch 'origin' into ent-7911-errores-file-manager 2021-08-24 16:17:33 +02:00
marcos 24a66f0173 updates 2021-08-24 13:30:50 +02:00
José González a930dc1d8a Merge branch 'ent-7666-boxes-relations-nodo-mapa-red-no-funcionan' of https://brutus.artica.es:8081/artica/pandorafms into ent-7666-boxes-relations-nodo-mapa-red-no-funcionan 2021-08-24 11:52:51 +02:00
José González 64982ee292 Fix issues with select inputs 2021-08-24 11:52:37 +02:00
Daniel Rodriguez 4d5926e427 Merge branch 'ent-7612-implementar-sistema-de-mensajeria-en-la-meta' into 'develop' 
Ent 7612 implementar sistema de mensajeria en la meta

See merge request artica/pandorafms!4353
 2021-08-24 08:13:02 +00:00
artica 5163f2831d Auto-updated build strings. 2021-08-24 01:00:38 +02:00
fbsanchez 9bdbad17db Merge remote-tracking branch 'origin/develop' into ent-7786-agentes-asignados-a-politicas-en-metaconsola 2021-08-23 15:40:23 +02:00
José González 6358f3fc9b Fixed issues with files upload 2021-08-23 15:35:47 +02:00
Daniel Rodriguez 8a7dbf653b Merge branch 'ent-7909-campos-Data-no-muestran-valores-String' into 'develop' 
Fix issues with string values

Closes pandora_enterprise#7909

See merge request artica/pandorafms!4366
 2021-08-23 08:37:58 +00:00
marcos 4d270a3559 set first option select2 all to none if not condition is enabled 2021-08-23 09:52:42 +02:00
marcos 61409b72b4 Merge remote-tracking branch 'origin/develop' into ent-6885-11172-añadir-opcion-de-nor-en-monitor-detail 2021-08-23 08:52:17 +02:00
artica e3619915cc Auto-updated build strings. 2021-08-23 01:00:21 +02:00
artica a8ae80f8a6 Auto-updated build strings. 2021-08-22 01:00:15 +02:00
artica 0f34554ba6 Auto-updated build strings. 2021-08-21 01:00:32 +02:00
José González 2f0681c29b Fix issues with string values 2021-08-20 14:11:03 +02:00
Daniel Rodriguez 8b9cb51d1e Merge branch 'ent-7884-metaconsola-no-se-pueden-crear-items-en-consola-visual' into 'develop' 
Fix issue with redeclaration of functions_metaconsole.php

Closes pandora_enterprise#7884

See merge request artica/pandorafms!4362
 2021-08-20 09:13:38 +00:00
artica 7e71b6537f Auto-updated build strings. 2021-08-20 01:00:19 +02:00
alejandro.campos@artica.es c07a112f4b migrate histrogram report items 2021-08-19 16:23:52 +02:00
Jose Gonzalez 7c89b271ac Merge remote-tracking branch 'origin' into ent-7666-boxes-relations-nodo-mapa-red-no-funcionan 2021-08-19 14:31:14 +02:00
Daniel Rodriguez ffa2aa717b Merge branch 'ent-7908-error-visual-grave-menu-principal-consola' into 'develop' 
Fix issue with initial visual problems

See merge request artica/pandorafms!4363
 2021-08-19 08:21:08 +00:00
José González b515bfe443 Fix merge 2021-08-19 09:39:13 +02:00
Jose Gonzalez 20c0d87165 Fix issue with initial visual problems 2021-08-19 08:18:06 +02:00
artica 38c044f2ae Auto-updated build strings. 2021-08-19 01:00:34 +02:00
Jose Gonzalez 1bba211086 Fix issue with redeclaration of functions_metaconsole.php 2021-08-18 15:07:34 +02:00
Daniel Maya fc4074b70b Fixed xss vulnerability 2021-08-18 13:57:47 +02:00
artica a1942147e4 Auto-updated build strings. 2021-08-18 01:00:49 +02:00
Daniel Rodriguez 8621d8cbb8 Merge branch 'ent-7824-problemas-vista-mobile' into 'develop' 
Fixed issues

Closes pandora_enterprise#7824

See merge request artica/pandorafms!4315
 2021-08-17 12:20:18 +00:00
Daniel Maya 0fd076810d Added services view widget 2 2021-08-17 13:32:54 +02:00
Daniel Rodriguez cf963992b0 Merge branch 'ent-7876-Datos-webserver-String-no-se-visualizan-en-botón-101' into 'develop' 
Ent 7876 datos webserver string no se visualizan en botón 101

See merge request artica/pandorafms!4341
 2021-08-17 07:10:04 +00:00
Daniel Rodriguez af6319eeb4 Merge branch 'ent-7531-menu-lateral-no-se-oculta-correctamente' into 'develop' 
Clean code and fix issue with lateral main menu

Closes pandora_enterprise#7531

See merge request artica/pandorafms!4213
 2021-08-17 07:08:34 +00:00
Daniel Rodriguez e75db62389 Merge branch 'ent-7124-vulnerabilidad-en-libreria-jquery' into 'develop' 
Upgraded jquery to 3.6.0, without npm

See merge request artica/pandorafms!4351
 2021-08-17 06:39:49 +00:00
artica 9f65e8deb0 Auto-updated build strings. 2021-08-17 01:00:44 +02:00
José González 1aa788bd83 Fix issue with colours in mobile view 2021-08-16 16:32:20 +02:00
José González baa49edd24 Merge branch 'develop' into 'ent-7666-boxes-relations-nodo-mapa-red-no-funcionan' 
# Conflicts:
#   pandora_console/include/functions_html.php
 2021-08-16 09:18:54 +00:00
José González 66ebe2ebf4 Merge branch 'develop' into 'ent-7531-menu-lateral-no-se-oculta-correctamente' 
# Conflicts:
#   pandora_console/index.php
 2021-08-16 08:12:40 +00:00
alejandro.campos@artica.es 54ae7e5783 modified availability report 2021-08-16 09:43:11 +02:00
artica 18698827a6 Auto-updated build strings. 2021-08-16 01:00:21 +02:00
artica 4e17c0ecf4 Auto-updated build strings. 2021-08-15 01:00:22 +02:00
artica ce2c4afbb5 Auto-updated build strings. 2021-08-14 01:00:24 +02:00
Calvo 34c3b00426 WIP: Revision ACL part 3 2021-08-13 15:57:01 +02:00
Daniel Maya d70752baa1 Added services view widget 2021-08-13 14:12:21 +02:00
artica 6a471546d5 Auto-updated build strings. 2021-08-13 01:00:30 +02:00
fbsanchez 486abde989 tree event graphs 2021-08-12 14:24:16 +02:00
fbsanchez c0b64735a5 Merge remote-tracking branch 'origin/develop' into ent-7124-vulnerabilidad-en-libreria-jquery 2021-08-12 13:32:30 +02:00
Manuel Montes 10f260c639 Merge branch 'ent-7894-12305-widget-agent-module-no-funciona-bien-dashboards' into 'develop' 
Fix in style table with images limited to dashboard agent_module widget

See merge request artica/pandorafms!4352
 2021-08-12 10:44:04 +00:00
fbsanchez 3109975e7d Notifications in MC 2021-08-12 12:01:24 +02:00
fbsanchez 6c8d002b12 Fix in style table with images limited to dashboard agent_module widget 2021-08-12 10:38:44 +02:00
fbsanchez 034e921e35 Upgraded jquery to 3.6.0, without npm 2021-08-12 09:30:43 +02:00
artica 3bb4c2ac09 Auto-updated build strings. 2021-08-12 01:00:45 +02:00
fbsanchez 3afeb47676 Width-height auto for images in tables - agent_module widget improvement 2021-08-11 14:09:18 +02:00
fbsanchez 4595b1ec11 Retro-compability 2021-08-11 14:02:56 +02:00
Daniel Rodriguez d2cc7d2f31 Merge branch 'ent-7861-fallo-umc-cuando-hay-db-historico' into 'develop' 
Fix searchpath for MR while updating

See merge request artica/pandorafms!4334
 2021-08-11 11:16:06 +00:00
Calvo 67e95f7f77 Merge remote-tracking branch 'origin/ent-7839-revision-acl-enterprise-parte-2-introduccion-opciones' into ent-7844-revision-acl-enterprise-parte-3-fallos-actuales 
Merge open branch ACL step 2 to continue with STEP3
 2021-08-11 11:16:57 +02:00
Daniel Rodriguez 9b684ab9ef Merge branch 'ent-7568-11898-Problemas-de-configuración-consolas-visuales' into 'develop' 
Ent 7568 11898 problemas de configuración consolas visuales

See merge request artica/pandorafms!4278
 2021-08-11 08:33:24 +00:00
fbsanchez cf976f9622 Merge remote-tracking branch 'origin/develop' into ent-7861-fallo-umc-cuando-hay-db-historico 
Conflicts:
	pandora_console/godmode/um_client/index.php
 2021-08-11 09:56:02 +02:00
fbsanchez d492b055da Merge remote-tracking branch 'origin/develop' into ent-7786-agentes-asignados-a-politicas-en-metaconsola 2021-08-11 09:25:26 +02:00
Daniel Rodriguez 089b981f7f Merge branch 'ent-7397-Bug-en-item-module-graph-de-cv' into 'develop' 
fixed several issues in item module graph of visual consoles

See merge request artica/pandorafms!4279
 2021-08-11 07:16:19 +00:00
Daniel Rodriguez 7673e40613 Merge branch 'ent-7737-Pandora-recien-instalado-mensaje-de-advertencia-de-fuente-por-defecto-no-definida' into 'develop' 
fixed font reference

See merge request artica/pandorafms!4238
 2021-08-11 07:12:13 +00:00
Daniel Rodriguez 3f4e0ee0f4 Merge branch 'ent-7692-selector-de-cambio-de-propietario-muy-estrecho-en-modal-de-eventos-metaconsola' into 'develop' 
more size for select owner modal events

See merge request artica/pandorafms!4222
 2021-08-11 07:11:18 +00:00
artica 568bdfb5c0 Auto-updated build strings. 2021-08-11 01:00:19 +02:00
Daniel Rodriguez ac23d187a1 Merge branch 'ent-7589-black-theme-y-edicion-de-usuario' into 'develop' 
fixed visual error

See merge request artica/pandorafms!4212
 2021-08-10 12:23:42 +00:00
Daniel Rodriguez 3e1208d5b2 Merge branch 'ent-7443-Metaconsola-Nodo-Dashboard-Top-N-events-de-todos-ninguno-saca-informacion' into 'develop' 
fixed top n widgets in meta

See merge request artica/pandorafms!4255
 2021-08-10 12:22:46 +00:00
Daniel Rodriguez 3ed53fbbea Merge branch 'ent-7642-error-de-sintaxis-sql-horizontal' into 'develop' 
Solve typo

Closes pandora_enterprise#7642

See merge request artica/pandorafms!4216
 2021-08-10 12:22:09 +00:00
Daniel Rodriguez a936deb255 Merge branch 'ent-7489-11802-iconos-desfasados-en-dashboard' into 'develop' 
fixed error with name on agent module view

See merge request artica/pandorafms!4257
 2021-08-10 12:20:39 +00:00
Daniel Rodriguez 00ed8233d0 Merge branch 'ent-7755-graficas-adjuntas-tienen-fuentes-muy-pequeñas' into 'develop' 
set default font size on graph modules when is send in mails

See merge request artica/pandorafms!4264
 2021-08-10 12:19:54 +00:00
Daniel Rodriguez cb498a9fe9 Merge branch 'ent-7441-Tree-View-Widget-no-coge-los-no-inicializados' into 'develop' 
Ent 7441 tree view widget no coge los no inicializados

See merge request artica/pandorafms!4277
 2021-08-10 07:00:12 +00:00
Daniel Rodriguez dca52dca6a Merge branch 'ent-7702-vista-de-agentes-sin-color-en-grafica-circulo-estado-agente' into 'develop' 
Fixes in pie coauth: daniel

See merge request artica/pandorafms!4210
 2021-08-10 06:59:29 +00:00
Daniel Rodriguez 9f754efc05 Merge branch 'ent-7648-Entities-en-nombre-de-ticket-de-Integria-creado-en-Pandora' into 'develop' 
fixed entities

See merge request artica/pandorafms!4207
 2021-08-10 06:58:32 +00:00
Junichi Satoh cadaca669f Fixed SNMP interfaces wizard against 32bit counter devices. 2021-08-10 12:08:28 +09:00
artica 2951bf2871 Auto-updated build strings. 2021-08-10 01:00:12 +02:00
Daniel Rodriguez 46b17e5156 Merge branch 'ent-7657-Vulnerabilidad-xss-en-nombre-de-modulos' into 'develop' 
fixed xss vulnerability

See merge request artica/pandorafms!4196
 2021-08-09 08:59:44 +00:00
Daniel Maya 7c5b2c8f2c resolved conflict 2021-08-09 09:55:11 +02:00
artica 8b36a96867 Auto-updated build strings. 2021-08-09 01:00:08 +02:00
artica 7a36b18fc0 Auto-updated build strings. 2021-08-08 01:00:11 +02:00
artica 9ea746991b Auto-updated build strings. 2021-08-07 01:00:19 +02:00
Daniel Rodriguez 7ae7f8ba2d Merge branch 'ent-7816-12139-no-devuelve-eventos-en-db-historico-informe-eventos-desde-metaconsola' into 'develop' 
Metaconsole shows historical events on reports

See merge request artica/pandorafms!4328
 2021-08-06 12:54:29 +00:00
Daniel Rodriguez 0c4b5619f5 Merge branch 'ent-7738-Pandora-recien-instalado-via-cloud-enlaces-a-mensajes-del-sistema-son-url-invalida' into 'develop' 
set urls as macros in console supervisor

See merge request artica/pandorafms!4234
 2021-08-06 12:53:54 +00:00
Daniel Rodriguez 604ef4bc89 Merge branch 'ent-7442-Metaconsole-Dashboard-WUX-Transaction-Stats-no-encuentra-trans' into 'develop' 
Ent 7442 metaconsole dashboard wux transaction stats no encuentra trans

Closes pandora_enterprise#7442

See merge request artica/pandorafms!4295
 2021-08-06 12:53:06 +00:00
Daniel Maya 64c9ed4453 #7711 Fixed movement when network link is deleted 2021-08-06 12:46:55 +02:00
Daniel Rodriguez cd500fe67b Merge branch 'ent-7857-12238-No-se-visualiza-Odómetro-en-Dashboard' into 'develop' 
Ent 7857 12238 no se visualiza odómetro en dashboard

See merge request artica/pandorafms!4342
 2021-08-06 08:31:29 +00:00
Calvo 9d04933ca2 Added missing sec related to GET params to ACL enterprise 2021-08-06 10:29:38 +02:00
artica 14688908e2 Auto-updated build strings. 2021-08-06 01:00:21 +02:00
Daniel Rodriguez f93b7fcd7a Merge branch 'ent-7817-ventana-de-registro-pequena' into 'develop' 
fixed licence modal size

See merge request artica/pandorafms!4308
 2021-08-05 11:59:01 +00:00
Daniel Rodriguez 45abf89e6b Merge branch 'ent-7667-12011-bug-de-mostrado-de-comentarios-en-eventos-con-filtrado' into 'develop' 
fixed minnor error when show event comment with filters

See merge request artica/pandorafms!4241
 2021-08-05 11:08:41 +00:00
Daniel Rodriguez fa2cec2878 Merge branch 'ent-7387-fallos-netflow-live-view' into 'develop' 
Fixed issues with views in Netflow live view

Closes pandora_enterprise#7387

See merge request artica/pandorafms!4240
 2021-08-05 11:08:04 +00:00
Daniel Maya 77f5ad2a6d Fixed odometer in dashboard 2021-08-05 11:57:31 +02:00
Daniel Rodriguez 874e35cc73 Merge branch 'ent-7537-estado-transaccion-muestra-siempre-ok' into 'develop' 
Added parameter onclick in anchors

Closes pandora_enterprise#7537

See merge request artica/pandorafms!4250
 2021-08-05 08:30:27 +00:00
artica 747d39a066 Auto-updated build strings. 2021-08-05 01:00:50 +02:00
Daniel Maya ffd6ee3f99 #7876 fixed web content string 2021-08-04 15:13:47 +02:00
Daniel Rodriguez 66ebc14dca Merge branch 'ent-7532-11853-Cambio-comportamiento-tags-en-Widget-de-eventos-en-dashboards' into 'develop' 
Ent 7532 11853 cambio comportamiento tags en widget de eventos en dashboards

See merge request artica/pandorafms!4233
 2021-08-04 12:04:57 +00:00
slerena 8f5f5fb9d3 Update a bad joke string, thanks @bpavesi for reporting 2021-08-04 10:37:45 +00:00
Daniel Maya f1f7291b5e Added basic chart 4 2021-08-04 11:11:28 +02:00
Daniel Maya f9c95e0145 oMerge branch 'develop' into ent-7273-Consola-Visual-nuevo-elemento-Gráfica-básica 2021-08-04 09:57:57 +02:00
Daniel Rodriguez 6bdc89bb26 Merge branch 'ent-7853-errores-con-autenticacion-ldaps' into 'develop' 
Fix ldaps authentication

See merge request artica/pandorafms!4330
 2021-08-04 07:12:58 +00:00
artica c4e1243f18 Auto-updated build strings. 2021-08-04 01:00:42 +02:00
Daniel Rodriguez 6071bfc29b Merge branch 'ent-7440-metaconsola-nodo-dashboard-group-status-no-pinta-los-colores-bien' into 'develop' 
Ent 7440 metaconsola nodo dashboard group status no pinta los colores bien

See merge request artica/pandorafms!4229
 2021-08-03 14:56:12 +00:00
Daniel Rodriguez 0dc6ab9353 Merge branch 'ent-7366-bug-bulk-operations-en-edicion-de-modulos-de-politica' into 'develop' 
Fixed missing return on tags_update_policy_module_tag function

See merge request artica/pandorafms!4227
 2021-08-03 14:31:06 +00:00
Daniel Maya 318edda041 Added basic chart 3 2021-08-03 15:46:01 +02:00
Daniel Rodriguez 25e8c2a850 Merge branch 'ent-7668-12023-Fallo-tags-en-filtro-de-vista-de-ultimos-eventos-de-Dashboard' into 'develop' 
Ent 7668 12023 fallo tags en filtro de vista de ultimos eventos de dashboard

See merge request artica/pandorafms!4226
 2021-08-03 06:51:23 +00:00
artica 69c4139cc1 Auto-updated build strings. 2021-08-03 01:00:44 +02:00
Daniel Rodriguez 2963d67225 Merge branch 'ent-7767-secondary-groups-no-se-anaden-agente' into 'develop' 
Improve code for get secondary groups

Closes pandora_enterprise#7767

See merge request artica/pandorafms!4259
 2021-08-02 07:18:02 +00:00
artica b837adaf00 Auto-updated build strings. 2021-08-02 01:00:34 +02:00
artica 6e66675f7f Auto-updated build strings. 2021-08-01 01:00:36 +02:00
artica 170f0d9045 Auto-updated build strings. 2021-07-31 01:00:44 +02:00
fbsanchez 499dc72f5c Merge remote-tracking branch 'origin/develop' into ent-7786-agentes-asignados-a-politicas-en-metaconsola 2021-07-30 18:46:55 +02:00
Calvo 9b736d0c48 Deleted and reubicated acl options 2021-07-30 13:49:22 +02:00
marcos ba8144124e fixed agent name flot-x-axis in sql vertical graph 2021-07-30 13:15:35 +02:00
José González b23aafdf03 Fixed issue with last_data obtain 2021-07-30 12:35:08 +02:00
artica 5e2c4349b3 Auto-updated build strings. 2021-07-30 01:00:38 +02:00
fbsanchez 41f2842e41 Proxy fix and some traceability for DBH upgrade 2021-07-29 13:11:45 +02:00
José González ce765a5dbd Fix module library 2021-07-29 10:36:16 +02:00
artica f9b69c289c Auto-updated build strings. 2021-07-29 01:00:43 +02:00
José González 6c9da79fac WIP: Backup upload 2021-07-28 14:23:02 +02:00
artica 5aef20ee31 Auto-updated build strings. 2021-07-28 01:00:37 +02:00
Calvo 8c30ca8c36 Fix ldaps authentication 2021-07-27 19:11:04 +02:00
marcos a00bcc35c4 Metaconsole shows historical events on reports 2021-07-27 14:14:23 +02:00
artica ee4868d433 Auto-updated build strings. 2021-07-27 01:00:18 +02:00
artica 1c6508947a Auto-updated build strings. 2021-07-26 01:00:35 +02:00
artica 29013e7dd6 Auto-updated build strings. 2021-07-25 01:00:36 +02:00
artica 8fa664c0c5 Auto-updated build strings. 2021-07-24 01:00:36 +02:00
artica 5654de748a Auto-updated build strings. 2021-07-23 01:00:43 +02:00
fbsanchez edc345acea Merge remote-tracking branch 'origin/develop' into ent-7786-agentes-asignados-a-politicas-en-metaconsola 2021-07-22 12:28:24 +02:00
fbsanchez 1cbda1ce15 Improved config.inc file content descriptions 2021-07-22 11:06:40 +02:00
fbsanchez c2eb452ec0 Exclude E_NOTICE by default 2021-07-22 11:02:55 +02:00
artica 32210ee7a3 Auto-updated build strings. 2021-07-22 01:00:34 +02:00
artica 53ad5e1cd9 Updated version and build strings. 2021-07-21 10:57:56 +02:00
vgilc caef7d922e Merge branch 'ent-7812-command-center-comportamiento-nuevo-nodo' into 'develop' 
Deactivated nodes if not unified

See merge request artica/pandorafms!4310
 2021-07-21 08:40:13 +00:00
artica 89ebe2ea2e Auto-updated build strings. 2021-07-21 01:00:44 +02:00
fbsanchez 0b138df2d9 Merge remote-tracking branch 'origin/develop' into ent-7786-agentes-asignados-a-politicas-en-metaconsola 2021-07-20 12:24:29 +02:00
Daniel Rodriguez 26bcb0d078 Merge branch 'ent-7809-no-se-despliegan-subgrupos-vista-arbol' into 'develop' 
Fixed issues with subgroups in Tree view

Closes pandora_enterprise#7809

See merge request artica/pandorafms!4307
 2021-07-20 09:37:34 +00:00
marcos 2494db3ff0 fixed error with percentiles in graphs 2021-07-20 10:18:08 +02:00
artica 63a8ff3f53 Auto-updated build strings. 2021-07-20 01:00:43 +02:00
José González 8968d6abb9 Fixed leafs for modules 2021-07-19 18:04:25 +02:00
fbsanchez 2a976e151e Merge remote-tracking branch 'origin/develop' into ent-7786-agentes-asignados-a-politicas-en-metaconsola 2021-07-19 17:20:41 +02:00
José González 533a94b09e Fixed issue with alert actions update 2021-07-19 14:34:48 +02:00
fbsanchez 0cec3afba0 Deactivated nodes if not unified 2021-07-19 13:47:43 +02:00
Calvo a8c0ba8e78 Include modules not init in total monitors count on tactical view 2021-07-19 13:20:00 +02:00
marcos 4afa72223e fixed licence modal size 2021-07-19 11:42:41 +02:00
José González 950ca956a3 Fixed issues with subgroups in Tree view 2021-07-19 11:17:36 +02:00
artica 9183110028 Auto-updated build strings. 2021-07-19 01:00:37 +02:00
artica ac28fb7b58 Auto-updated build strings. 2021-07-18 01:00:36 +02:00
artica c5b8f647fe Auto-updated build strings. 2021-07-17 01:00:41 +02:00
José González 96fccb01b9 Created token for hande file creation 2021-07-16 16:54:43 +02:00
Daniel Maya 71fc8bd6e3 Added basic chart 2 2021-07-16 14:18:06 +02:00
Daniel Maya 71767a3f11 Added basic chart 2021-07-16 14:16:45 +02:00
Calvo 77552805a4 Fix list agent with secondaty grouos on selec 2021-07-16 13:55:31 +02:00
José González 784d9b0121 Added rebranding features 2021-07-16 13:17:25 +02:00
fbsanchez 9643e3ade9 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-07-16 10:36:06 +02:00
artica 0508c0fa88 Auto-updated build strings. 2021-07-16 01:00:32 +02:00
artica bf890c0d11 Auto-updated build strings. 2021-07-15 01:00:40 +02:00
Calvo 7890c4269c Added checkbox for group recursion in network maps 2021-07-14 18:00:07 +02:00
José González 4c962cd25c Change time check for cron 2021-07-14 11:31:54 +02:00
fbsanchez bba7123793 Merge branch 'ent-7074-Command-Center' into ent-7786-agentes-asignados-a-politicas-en-metaconsola 2021-07-14 10:05:59 +02:00
fbsanchez 18948ea9c2 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-07-14 10:04:13 +02:00
artica 31b99ecbfb Auto-updated build strings. 2021-07-14 01:00:39 +02:00
José González 9695d62424 Fix 2021-07-13 18:18:36 +02:00
José González 3263ef8b9a Fix issue with WUX Trans Stats 2021-07-13 17:26:03 +02:00
fbsanchez d3fe504241 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-07-13 13:14:01 +02:00
marcos 83084f54bd fixed visual error with time in action on ca 2021-07-13 11:38:46 +02:00
vgilc c19e9795d0 Merge branch 'ent-7795-victor-eres-muy-lento-como-la-consola-de-pandora' into 'develop' 
Avoid check for UM messages more often than 2h

See merge request artica/pandorafms!4290
 2021-07-13 08:23:05 +00:00
fbsanchez 9b31906bdf Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/mr/48.sql
 2021-07-13 10:01:59 +02:00
artica 925c9fce4f Auto-updated build strings. 2021-07-13 01:00:34 +02:00
fbsanchez cc23b8310f Avoid check for UM messages more often than 2h 2021-07-12 17:41:58 +02:00
marcos 37b8541fa6 fixed size sap logo 2021-07-12 17:26:01 +02:00
Daniel Maya 3d3251bdc1 resolved conflict 2021-07-12 16:49:11 +02:00
Daniel Maya 5b792c9bd4 Fixed cursor 2021-07-12 14:41:44 +02:00
marcos 640c81b487 fallo critico del swich regordete 2021-07-12 13:06:30 +02:00
José González d3e815ce43 Fixed WUX widgets in meta 2021-07-12 12:32:05 +02:00
vgilc 56c22bec11 Merge branch 'ent-7541-12145-11876-alertas-sonoras-no-funcionan-bien' into 'develop' 
Sound alerts only for NEW events found

See merge request artica/pandorafms!4282
 2021-07-12 10:30:44 +00:00
Daniel Maya a4203aaee2 Ent 7272 nuevos elementos consola visual odómetro 2021-07-12 10:27:10 +00:00
Calvo 19e9613e3e WMI remote componente add text _field_wmi_n_ 2021-07-12 12:17:38 +02:00
marcos 201e9c7216 fixed visual error 2021-07-12 11:10:41 +02:00
marcos 1b6001d380 fixed visual error 2021-07-12 10:55:28 +02:00
artica 922fb81a58 Auto-updated build strings. 2021-07-12 01:00:31 +02:00
artica f3ea9fedf9 Auto-updated build strings. 2021-07-11 01:00:30 +02:00
artica faf154e69c Auto-updated build strings. 2021-07-10 01:00:35 +02:00
fbsanchez 554a32b567 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-07-09 14:40:44 +02:00
fbsanchez 056bd1460a Sound alerts only for NEW events found 2021-07-09 14:40:03 +02:00
artica d6cd48fdde Auto-updated build strings. 2021-07-09 01:00:35 +02:00
fbsanchez 98e9f8344f Avoid certain cirumstances while retrieving parameters API 2021-07-08 21:08:13 +02:00
fbsanchez ae562e5a7c Use node db directly to handle policy_agents 2021-07-08 21:06:38 +02:00
vgilc 1f27bb3479 Merge branch 'ent-6964-giss-agentes-cargados-por-csv-no-sincronizan-con-metaconsola' into 'develop' 
Force sync all new agents if node has metaconsole and agent cache is enabled

See merge request artica/pandorafms!4268
 2021-07-08 10:18:51 +00:00
alejandro.campos@artica.es a484fb2408 fixed several issues in item module graph of visual consoles 2021-07-08 10:03:57 +02:00
Daniel Maya 2b5c5f0cce Fixed height 2021-07-08 09:41:49 +02:00
artica 239e149b3c Auto-updated build strings. 2021-07-08 01:00:36 +02:00
Daniel Maya a73a8ff926 show not init agents in tree 2021-07-07 17:17:36 +02:00
Calvo 06d18985e0 Fix format on snmp browser error messages 2021-07-07 16:44:19 +02:00
Daniel Maya 66e9539818 Added agent ip in custom events 2021-07-07 16:07:08 +02:00
marcos 46bfa151a0 add node name on event details 2021-07-07 14:54:29 +02:00
marcos 6252da395c Merge remote-tracking branch 'origin/develop' into ent-7730-visualizacion-update-manager-en-tema-oscuro 2021-07-07 14:15:03 +02:00
José González a079edcf1a Fixed monospaced 2021-07-07 12:58:08 +02:00
Calvo cdf6c3972e Fix widgets style bugs 2021-07-07 12:09:47 +02:00
vgilc 967f7ac239 Merge branch 'ent-7783-Pantalla-de-login-fuente-blanca-en-black-theme-no-se-ve-el-texto-2' into 'develop' 
visual fix

See merge request artica/pandorafms!4269
 2021-07-07 09:02:10 +00:00
artica a06989dc11 Auto-updated build strings. 2021-07-07 01:00:38 +02:00
marcos b2992f90cb add update manager black background update manager 2021-07-06 12:50:39 +02:00
marcos 7a4224cef6 add update manager black background update manager 2021-07-06 12:49:20 +02:00
alejandro.campos@artica.es 2bf5e16bb1 visual fix 2021-07-06 10:37:47 +02:00
fbsanchez 2acb3abf92 Force sync all new agents if node has metaconsole and agent cache is enabled 2021-07-06 10:06:17 +02:00
Junichi Satoh b74beb76df Fixed that plugin module related APIs did not work properly in some cases. 2021-07-06 14:40:40 +09:00
artica dec62ffca4 Auto-updated build strings. 2021-07-06 01:00:32 +02:00
fbsanchez 198e4bf6a3 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-07-05 20:56:48 +02:00
fbsanchez 8365b47be7 MQ exceptions, warning message on mq issues 2021-07-05 20:56:40 +02:00
José González 47b6e40799 Added controls for filter with hours 2021-07-05 17:42:45 +02:00
vgilc 2be851ef83 Merge branch 'ent-7625-eliminar-traza-tree-class' into 'develop' 
trace deleted

See merge request artica/pandorafms!4163
 2021-07-05 15:21:59 +00:00
vgilc 3750b27d2c Merge branch 'ent-7762-External-Tools-SNMP-no-funciona' into 'develop' 
Fixed type mismatch

Closes pandora_enterprise#7762

See merge request artica/pandorafms!4260
 2021-07-05 13:56:39 +00:00
José González 4fca43640b Fix typos 2021-07-05 11:52:14 +02:00
marcos ea57c58f40 set default font size on graph modules when is send in mails 2021-07-05 11:34:32 +02:00
fbsanchez f52d389327 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/mr/48.sql
 2021-07-05 09:55:14 +02:00
artica 3baae4147a Auto-updated build strings. 2021-07-05 01:00:29 +02:00
artica b6477e5526 Auto-updated build strings. 2021-07-04 01:00:26 +02:00
artica 8a4e51bf1b Auto-updated build strings. 2021-07-03 01:00:31 +02:00
José González d219e004df Improve pen list handling 2021-07-02 16:39:59 +02:00
alejandro.campos@artica.es 38c8a498c1 fixed expand all tree tool in snmp browser 2021-07-02 14:57:39 +02:00
José González 350f34ebf5 Fixed type mismatch 2021-07-02 13:29:00 +02:00
José González 498a353a29 Improve code for get secondary groups 2021-07-02 12:20:53 +02:00
vgilc 159920a05d Merge branch 'ent-7127-alert-server-implementar-la-ejecucion-de-alertas-de-manera-independiente' into 'develop' 
Add the AlertServer to the repo.

See merge request artica/pandorafms!4251
 2021-07-02 09:15:27 +00:00
artica 1328b2055c Auto-updated build strings. 2021-07-02 01:00:32 +02:00
marcos 4100d541cf fixed error with name on agent module view 2021-07-01 17:28:12 +02:00
Ramon Novoa f8bcd1660f Add the AlertServer to the repo. 
The new AlertServer allows alerts to be queued and executed outside the
data processing pipeline. Ref. pandora_enterprise#7127.
 2021-07-01 16:19:47 +02:00
alejandro.campos@artica.es a88a131152 fixed top n widgets in meta 2021-07-01 15:07:52 +02:00
artica 911d9fe8fe Auto-updated build strings. 2021-07-01 01:00:09 +02:00
fbsanchez b3d88e6f6e Some general fixes, deprecated rrdir (use Files::rmrf) 2021-07-01 00:37:13 +02:00
artica 7dc2245f2e Auto-updated build strings. 2021-06-30 01:00:32 +02:00
fbsanchez 074fbf916c Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-29 20:03:07 +02:00
fbsanchez f8aeb57582 add method to test existing and at first look valid zip file 2021-06-29 20:03:00 +02:00
José González 1d468987d3 Added parameter onclick in anchors 2021-06-29 14:55:03 +02:00
Daniel Rodriguez b0c640767e Merge branch 'ent-7144-Consola-Visual-Poder-cambiar-color-de-leyenda-de-Event-histogram' into 'develop' 
Ent 7144 consola visual poder cambiar color de leyenda de event histogram

See merge request artica/pandorafms!4146
 2021-06-29 10:03:49 +00:00
Daniel Maya b73924052c Ent 7144 consola visual poder cambiar color de leyenda de event histogram 2021-06-29 10:03:49 +00:00
Daniel Rodriguez 04709fb16c Merge branch 'ent-7731-graficas-tamaño-fuente-diferente' into 'develop' 
Added control for font-size in events graph in agent view

Closes pandora_enterprise#7731

See merge request artica/pandorafms!4236
 2021-06-29 10:03:06 +00:00
Daniel Rodriguez 397eebd86c Merge branch 'ent-7143-Autoajuste-de-la-consola-visual' into 'develop' 
Ent 7143 autoajuste de la consola visual

See merge request artica/pandorafms!4218
 2021-06-29 10:02:13 +00:00
Daniel Maya b37bbcd944 Ent 7143 autoajuste de la consola visual 2021-06-29 10:02:13 +00:00
fbsanchez c64b972564 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-29 10:51:55 +02:00
artica 7f58a93bfd Auto-updated build strings. 2021-06-29 01:00:15 +02:00
fbsanchez 4e1110a052 MQ up to down connections (MC => NODES) 2021-06-28 21:21:31 +02:00
Calvo cf3c7a53f5 Plugins get file correct downlad link 2021-06-28 18:24:10 +02:00
marcos a2c9004c09 fixed error 2021-06-28 15:20:16 +02:00
marcos 7ff1277fb3 fixed icon button position 2021-06-28 14:40:32 +02:00
marcos a225bbdafc fixed minnor error when show event comment with filters 2021-06-28 14:21:45 +02:00
Calvo 2d74c2c0be Fix select2 write search field on dialog 2021-06-28 14:16:30 +02:00
José González fb129750d5 Fixed issues with views in Netflow live view 2021-06-28 12:03:25 +02:00
alejandro.campos@artica.es 7fa398b027 fixed font reference 2021-06-28 11:25:22 +02:00
fbsanchez 760522aeff Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-28 11:03:09 +02:00
fbsanchez 36f6ad4ee2 Merge remote-tracking branch 'origin/develop' into ent-6661-giss-agregar-elementos-en-servicios 
Conflicts:
	pandora_console/include/styles/meta_dashboards.css
 2021-06-28 10:37:49 +02:00
Daniel Rodriguez 174b0a0a60 Merge branch 'ent-7752-Bug-en-vista-dashboards-metaconsola' into 'develop' 
fixed visual bug in meta dashboards

See merge request artica/pandorafms!4237
 2021-06-28 08:33:56 +00:00
fbsanchez 771c51ef5d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-28 10:13:51 +02:00
artica 6fc94f3fad Auto-updated build strings. 2021-06-28 01:00:29 +02:00
artica 69c1a5fdad Auto-updated build strings. 2021-06-27 01:00:26 +02:00
artica b7d956041d Auto-updated build strings. 2021-06-26 01:01:41 +02:00
alejandro.campos@artica.es 9ec25a7cfb fixed visual bug in meta dashboards 2021-06-25 14:44:14 +02:00
José González b530ff1ee2 Added control for font-size in events graph in agent view 2021-06-25 12:56:03 +02:00
Daniel Rodriguez a13256043c Merge branch 'ent-7644-mapa-servicio-tree-view-muestra-elementos-deshabilitados' into 'develop' 
Ent 7644 mapa servicio tree view muestra elementos deshabilitados

See merge request artica/pandorafms!4193
 2021-06-25 09:37:09 +00:00
Luis 14e69c5c07 Ent 7644 mapa servicio tree view muestra elementos deshabilitados 2021-06-25 09:37:09 +00:00
Daniel Rodriguez cb101d5540 Merge branch 'ent-7707-wizard-de-interfaz-snmp-no-soporta-determinados-caracteres' into 'develop' 
Fixed SNMP interface wizard modules with special chars

See merge request artica/pandorafms!4215
 2021-06-25 09:15:55 +00:00
fbsanchez 1d66993d84 Some minor style improvements in error boxes 2021-06-25 11:10:56 +02:00
fbsanchez 92d84e4cda some minor style fix 2021-06-25 11:05:26 +02:00
fbsanchez c0d56f8563 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-25 09:48:52 +02:00
marcos 26acac191f ad not condition on monitor detail 2021-06-25 09:37:26 +02:00
artica 4438dad309 Auto-updated build strings. 2021-06-25 01:00:39 +02:00
fbsanchez eec373e896 Added link to MC place where user must manage the stuff when in centralised environment and ui_get_meta_url 2021-06-24 19:48:07 +02:00
fbsanchez 4c2ac234b8 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/mr/48.sql
	pandora_console/godmode/servers/plugin.php
 2021-06-24 14:37:30 +02:00
Daniel Rodriguez 040010d169 Merge branch 'ent-7670-reemplazar-url-en-ayuda-contextual' into 'develop' 
Changed new wiki url on helps

See merge request artica/pandorafms!4205
 2021-06-24 12:31:15 +00:00
Luis 497ecb329d Changed new wiki url on helps 2021-06-24 12:31:15 +00:00
Marcos Alconada 4bbd0ae508 fixed error with block current value 2021-06-24 12:28:49 +00:00
alejandro.campos@artica.es fec0114801 set urls as macros in console supervisor 2021-06-24 13:22:25 +02:00
fbsanchez cb8fcca0e9 Datatype fix in db_get_lock, updated classmap 2021-06-24 13:04:45 +02:00
Daniel Maya 76d996a966 Fixed tags in events 2021-06-24 12:51:14 +02:00
artica 86abd75206 Auto-updated build strings. 2021-06-24 01:00:51 +02:00
fbsanchez 2fe6092d37 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-23 20:08:59 +02:00
fbsanchez 775ffa66f6 Merge remote-tracking branch 'origin/develop' into ent-6661-giss-agregar-elementos-en-servicios 2021-06-23 20:06:47 +02:00
fbsanchez 36e455e5c5 Fixes for agent_module widget 2021-06-23 18:00:54 +02:00
Daniel Maya dcd6645b2c Ent 7655 porblema con npm build en visual console client 2021-06-23 14:39:48 +00:00
José González 2bc607c4aa Fixed issue with select2 fields 2021-06-23 16:14:37 +02:00
Daniel Maya 077d6ba313 Fixed color 2021-06-23 15:34:52 +02:00
fbsanchez be09c1c64d Some changes, multibox fixes for metaconsole 2021-06-23 14:24:16 +02:00
Calvo 538f17441f Fixed missing return on tags_update_policy_module_tag function 2021-06-23 12:49:32 +02:00
fbsanchez de03486134 Merge remote-tracking branch 'origin/develop' into ent-6661-giss-agregar-elementos-en-servicios 2021-06-23 09:48:01 +02:00
artica e99183e1f0 Auto-updated build strings. 2021-06-23 01:00:51 +02:00
fbsanchez b88609ca2e Improve error messages while saving a new Agent entity 2021-06-22 20:25:05 +02:00
fbsanchez 107c934371 Fixed not conditional in where_clause builder (mysql) 2021-06-22 19:31:04 +02:00
Daniel Maya 289e8a3902 #7668 fixed tags 2021-06-22 17:05:45 +02:00
fbsanchez 390bf14761 cover for bulk service operations in mc/node 2021-06-22 15:32:15 +02:00
artica 17bae49b21 Auto-updated build strings. 2021-06-22 01:00:56 +02:00
fbsanchez faa9fee273 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_agents/unix/Darwin/dmg/resources/text/conclusion.html
	pandora_agents/unix/Darwin/dmg/resources/text/license.html
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/extras/mr/48.sql
 2021-06-21 17:33:45 +02:00
fbsanchez d9bad6f5c6 Merge branch 'ent-7074-Command-Center' of brutus.artica.es:artica/pandorafms into ent-7074-Command-Center 
Conflicts:
	pandora_console/include/functions_network_components.php
 2021-06-21 17:31:41 +02:00
Daniel Rodriguez 7937a988df Merge branch 'ent-5023-limpiar-toda-referencia-a-event-alert' into 'develop' 
remove help_event_alert.php

See merge request artica/pandorafms!3057
 2021-06-21 14:08:03 +00:00
Daniel Rodriguez 294741b472 Merge branch 'ent-6990-copiar-informes' into 'develop' 
Ent 6990 copiar informes

See merge request artica/pandorafms!4129
 2021-06-21 14:07:03 +00:00
Luis 51844da01b Ent 6990 copiar informes 2021-06-21 14:07:03 +00:00
Daniel Rodriguez 7dfae672d5 Merge branch 'ent-7673-scroll-horizontal-en-moda-test' into 'develop' 
fixed visual error

See merge request artica/pandorafms!4199
 2021-06-21 14:06:29 +00:00
Marcos Alconada d6ecce1ce9 fixed visual error 2021-06-21 14:06:29 +00:00
Daniel Rodriguez 493cce4e6f Merge branch 'ent-7663-vulnerabilidad-hash-file-manager' into 'develop' 
Change token for hash generation

Closes pandora_enterprise#7663

See merge request artica/pandorafms!4182
 2021-06-21 14:05:10 +00:00
Daniel Rodriguez 043b512cc4 Merge branch 'ent-7142-Consola-Visual-me-oculta-los-botones' into 'develop' 
Ent 7142 consola visual me oculta los botones

See merge request artica/pandorafms!4178
 2021-06-21 14:04:11 +00:00
Daniel Maya 104dfdd92e Ent 7142 consola visual me oculta los botones 2021-06-21 14:04:11 +00:00
Daniel Rodriguez f134377b37 Merge branch 'ent-7547-Tree-view-no-filtra-bien-Dashboard' into 'develop' 
Ent 7547 tree view no filtra bien dashboard

See merge request artica/pandorafms!4136
 2021-06-21 14:01:32 +00:00
Daniel Maya 878a5321e8 Ent 7547 tree view no filtra bien dashboard 2021-06-21 14:01:32 +00:00
Daniel Rodriguez 19579c0801 Merge branch 'ent-7505-11819-Bug-en-widget-Tree-view' into 'develop' 
Ent 7505 11819 bug en widget tree view

See merge request artica/pandorafms!4125
 2021-06-21 13:58:57 +00:00
Luis ebceaebb58 Ent 7253 opcion formato envio informes templates 2021-06-21 13:41:14 +00:00
Daniel Rodriguez 6f98ae05a1 Merge branch 'ent-7038-regex-agent-filter-generacion-informe-tasks' into 'develop' 
Added agent regex to console task template send email

Closes pandora_enterprise#7038

See merge request artica/pandorafms!4135
 2021-06-21 10:21:48 +00:00
Daniel Rodriguez c5dab9b99b Merge branch 'ent-7488-pantallazo-blanco-config.php-installer-activo' into 'develop' 
Ent 7488 pantallazo blanco config.php installer activo

See merge request artica/pandorafms!4106
 2021-06-21 10:17:12 +00:00
Luis 10059822cd Ent 7488 pantallazo blanco config.php installer activo 2021-06-21 10:17:12 +00:00
fbsanchez fc0b605cee Merge remote-tracking branch 'origin/develop' into ent-6661-giss-agregar-elementos-en-servicios 2021-06-21 12:13:46 +02:00
marcos 5aeab363e9 more size for select owner modal events 2021-06-21 11:25:19 +02:00
Daniel Rodriguez f5221083b1 Merge branch 'ent-7244-Errores-network-tools' into 'develop' 
Solved issues with double quotes and improve the code

Closes pandora_enterprise#7244

See merge request artica/pandorafms!4101
 2021-06-21 09:13:35 +00:00
Daniel Rodriguez 95a152752b Merge branch 'ent-7555-11820-Filtro-de-eventos-en-widget-Lastest-events' into 'develop' 
Ent 7555 11820 filtro de eventos en widget lastest events

See merge request artica/pandorafms!4142
 2021-06-21 09:10:45 +00:00
artica 447d463518 Auto-updated build strings. 2021-06-21 01:00:36 +02:00
artica dd5e7e550d Auto-updated build strings. 2021-06-20 01:00:37 +02:00
artica 682a977ef1 Auto-updated build strings. 2021-06-19 01:00:49 +02:00
fbsanchez 1f34cf8596 Massive operation over service elements 2021-06-18 15:36:52 +02:00
marcos 36dd93701a Merge remote-tracking branch 'origin/develop' into ent-5023-limpiar-toda-referencia-a-event-alert 2021-06-18 12:28:58 +02:00
Daniel Barbero Martin 1e183c2b60 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-18 08:49:57 +02:00
artica 0c1918eb3c Auto-updated build strings. 2021-06-18 01:00:44 +02:00
Daniel Barbero Martin 6366040ec2 Wip command center, check versions php.ini 2021-06-17 17:09:44 +02:00
fbsanchez 1401f30e84 Merge branch 'ent-7074-Command-Center' of brutus.artica.es:artica/pandorafms into ent-7074-Command-Center 2021-06-17 14:49:25 +02:00
Daniel Barbero Martin 50c7394e7d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-17 08:23:46 +02:00
artica e5cbcd070b Auto-updated build strings. 2021-06-17 01:00:42 +02:00
fbsanchez ae448e6eb8 Some fixes 2021-06-16 20:34:29 +02:00
fbsanchez d2710b2e66 Clean components when removing plugin (server) 2021-06-16 19:39:25 +02:00
Daniel Barbero Martin 452d5d0b73 Wip command center, error merge 2021-06-16 19:37:09 +02:00
fbsanchez 81254cf3fb WIP Plugins sync 2021-06-16 18:18:38 +02:00
fbsanchez b032beb559 Merge branch 'ent-7074-Command-Center' of brutus.artica.es:artica/pandorafms into ent-7074-Command-Center 2021-06-16 17:27:06 +02:00
Daniel Barbero Martin c6877154fb Wip command center, Plugins in meta 2021-06-16 17:26:19 +02:00
José González 09d5657650 Solve typo 2021-06-16 16:36:14 +02:00
Calvo 06f3b0ea36 Fixed SNMP interface wizard modules with special chars 2021-06-16 16:30:45 +02:00
fbsanchez b701b2be32 Plugin sync 2021-06-16 15:53:05 +02:00
José González 00d4f0c57d Clean code and fix issue with lateral main menu 2021-06-16 15:29:28 +02:00
marcos 493047ae40 fixed visual error 2021-06-16 14:17:45 +02:00
fbsanchez 9ed895d457 Fixes in pie coauth: daniel 2021-06-16 11:41:57 +02:00
Daniel Barbero Martin 841842da59 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/pandoradb_data.sql
 2021-06-16 08:46:21 +02:00
artica 90905d72f5 Auto-updated build strings. 2021-06-16 01:00:23 +02:00
Daniel Barbero Martin 64dd4f2c2b Wip command center, Plugins in meta 2021-06-15 17:24:03 +02:00
alejandro.campos@artica.es e8b62561b7 fixed entities 2021-06-15 14:53:00 +02:00
Daniel Barbero Martin 9e6f3f7b46 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-15 10:35:50 +02:00
Daniel Barbero Martin f9bbc132a6 Wip command center, collections merge restore 2021-06-15 10:35:34 +02:00
artica 2f0cebe979 Auto-updated build strings. 2021-06-15 01:00:51 +02:00
fbsanchez 94cd4c96dd Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/include/javascript/pandora_ui.js
 2021-06-14 17:37:01 +02:00
fbsanchez 4db0f75763 Refresh & delete collections Async - synchronization 2021-06-14 14:54:07 +02:00
Daniel Rodriguez 08011d60b2 Merge branch 'ent-7122-nuevo-update-manager' into 'develop' 
Embebed UMC in Pandora FMS

See merge request artica/pandorafms!3894
 2021-06-14 11:56:43 +00:00
fbsanchez cdad04f9cd Update the DB schema when upgrading from RPMs. 
Call updateMR.php to update the database schema when manually upgrading
from RPM packages.
 2021-06-14 11:56:42 +00:00
Daniel Barbero Martin a7c1c49636 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-14 08:42:31 +02:00
marcos 0ab343e672 merge conflict 2021-06-14 08:26:33 +02:00
José González e17b63e6fc Fixed issue with single line 2021-06-14 08:16:35 +02:00
artica 595fabb232 Auto-updated build strings. 2021-06-14 01:00:18 +02:00
artica e7a204d6d8 Auto-updated build strings. 2021-06-13 01:00:16 +02:00
artica 8272eb4f5b Auto-updated build strings. 2021-06-12 01:00:21 +02:00
José González b3aa47877d Fixed issue with meta 2021-06-11 15:54:04 +02:00
fbsanchez 86f2beb587 Agent collection synchronization aysnc some improvements 2021-06-11 13:55:18 +02:00
fbsanchez 9c314bcd39 Files reviewed & tested 2021-06-11 13:04:06 +02:00
fbsanchez 085e0ba300 Added Files class to handle zip/unzip/rmrf and more 2021-06-11 10:48:58 +02:00
Daniel Rodriguez 81c2ebc43b Merge branch 'ent-7678-treeview-modules-no-funciona' into 'develop' 
Fix treeview modules sql inner condition

See merge request artica/pandorafms!4195
 2021-06-11 08:44:44 +00:00
Daniel Rodriguez 0adcf5aac2 Merge branch 'ent-7671-cambiar-enlaces-a-documentacion' into 'develop' 
add new link documentation

See merge request artica/pandorafms!4188
 2021-06-11 08:32:06 +00:00
Daniel Rodriguez d0c122c193 Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop' 
Ent 7519 cambio de fuentes en la consola a nivel global

See merge request artica/pandorafms!4194
 2021-06-11 08:24:27 +00:00
alejandro.campos@artica.es 98f0bc9fac fixed xss vulnerability 2021-06-11 08:54:00 +02:00
alejandro.campos@artica.es cb5905b000 fixed xss vulnerability 2021-06-11 08:52:10 +02:00
Daniel Barbero Martin 75b889875e Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-11 08:41:23 +02:00
artica 876e776d29 Auto-updated build strings. 2021-06-11 01:00:09 +02:00
fbsanchez ae34209f52 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-10 21:45:50 +02:00
fbsanchez f6f0d35a5f Collections Async synchronization Meta <=> Nodes 2021-06-10 21:36:54 +02:00
Calvo e0b3536d1b Fix treeview modules sql inner condition 2021-06-10 18:00:53 +02:00
marcos 1165ea11b9 cambio de fuentes css 2021-06-10 17:42:39 +02:00
artica ace916bc8e Updated version and build strings. 2021-06-10 17:12:11 +02:00
marcos 45667da362 cambio de fuentes css 2021-06-10 16:21:06 +02:00
marcos e75abd1d2f cambio de fuentes css 2021-06-10 16:13:45 +02:00
Daniel Barbero Martin b4e1c9d61f Wip command center, api call node 2021-06-10 14:15:36 +02:00
Marcos Alconada 665efa4fb7 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-10 08:19:11 +00:00
Daniel Barbero Martin 9e27843b19 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-10 08:51:48 +02:00
Daniel Barbero Martin a9864f7d87 Wip command center, clean functions db 2021-06-10 08:45:50 +02:00
artica 5ad364cc4a Auto-updated build strings. 2021-06-10 01:00:20 +02:00
fbsanchez 5b9098b7b0 Allow API access to nodes registered into the MC 2021-06-09 19:23:17 +02:00
Daniel Rodriguez 4b819360ff Revert "Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'" 
This reverts merge request !4132
 2021-06-09 18:09:43 +02:00
marcos 50282dccf4 add new link documentation 2021-06-09 16:55:25 +02:00
Daniel Rodriguez d58e9f634a Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop' 
Ent 7519 cambio de fuentes en la consola a nivel global

See merge request artica/pandorafms!4132
 2021-06-09 13:59:29 +00:00
Marcos Alconada 2334eccd01 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-09 13:59:28 +00:00
Marcos Alconada 8814b1f971 changed icons for black theme 2021-06-09 13:12:47 +00:00
Daniel Rodriguez 79499204ce Merge branch 'ent-fix-planned-downtime' into 'develop' 
Fixed problems in planned downtime

See merge request artica/pandorafms!4181
 2021-06-09 10:49:48 +00:00
Daniel Barbero Martin e54fde338d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-09 08:22:04 +02:00
artica 2953870e4f Auto-updated build strings. 2021-06-09 01:00:20 +02:00
Jose Gonzalez 9f120280a2 Change token for hash generation 2021-06-08 14:21:33 +02:00
Daniel Barbero Martin df2f72cce3 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-08 08:22:16 +02:00
Junichi Satoh 5fcf3eca23 Fixed problems in planned downtime below. 
- modules cannot be added to defined planned downtime with 'Quiet' mode.
- pending modules for delete can be selected when modify defined planned downtime.
 2021-06-08 14:43:43 +09:00
artica a63a4efb71 Auto-updated build strings. 2021-06-08 01:00:20 +02:00
fbsanchez bbbadff426 Minor style fixes - missed files - in massive services 2021-06-07 21:19:11 +02:00
Daniel Barbero Martin 3a947d31bd Wip command center, collections merge 2021-06-07 17:58:36 +02:00
Daniel Barbero Martin 835aad542f Wip command center, agent synch 2021-06-07 12:19:03 +02:00
Daniel Barbero Martin 8b7c5c08c6 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-07 08:32:15 +02:00
artica bc6b4acd8b Auto-updated build strings. 2021-06-07 01:00:19 +02:00
artica 656105cdf0 Auto-updated build strings. 2021-06-06 01:00:14 +02:00
artica 2513693ada Auto-updated build strings. 2021-06-05 01:00:19 +02:00
Marcos Alconada 3bc2844b4d fixed visual error black theme 2021-06-04 11:03:35 +00:00
Daniel Rodriguez 90a5a1c1a3 Merge branch 'ent-5785-Nuevo-informe-inventario-de-agentes' into 'develop' 
Added new item type in reports

See merge request artica/pandorafms!4133
 2021-06-04 09:03:32 +00:00
alejandro.campos@artica.es c9edf8081c excluded report item from templates list 2021-06-04 10:50:06 +02:00
alejandro.campos@artica.es 70946af507 Merge remote-tracking branch 'origin/develop' into ent-5785-Nuevo-informe-inventario-de-agentes 2021-06-04 10:32:45 +02:00
Daniel Barbero Martin ca59034cf3 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-04 08:13:20 +02:00
artica 8976ec4b6e Auto-updated build strings. 2021-06-04 01:00:19 +02:00
Daniel Rodriguez a12c692972 Merge branch 'ent-fix-custom-report' into 'develop' 
Fixed custom report

See merge request artica/pandorafms!4167
 2021-06-03 15:08:26 +00:00
alejandro.campos@artica.es fb5ecaeef4 minor fixes in report item 2021-06-03 13:49:10 +02:00
Daniel Rodriguez b5802d41c7 Merge branch 'ent-7604-Vulnerabilidad-file-manager-images' into 'develop' 
Fix vulnerability with directories created in upper levels

Closes pandora_enterprise#7604

See merge request artica/pandorafms!4158
 2021-06-03 11:36:22 +00:00
alejandro.campos@artica.es b8c6922902 minor fixes in report item 2021-06-03 12:04:25 +02:00
Daniel Barbero Martin 97595ad973 Wip command center 2021-06-03 10:16:29 +02:00
Daniel Barbero Martin 030a4fed6a Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-03 08:15:30 +02:00
artica e1ae9d7908 Auto-updated build strings. 2021-06-03 01:00:17 +02:00
alejandro.campos@artica.es 36eb084824 minor fixes 2021-06-02 19:02:25 +02:00
alejandro.campos@artica.es 84905a6579 minor fixes in report item 2021-06-02 18:39:33 +02:00
Daniel Barbero Martin ea90a61b06 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-02 18:27:15 +02:00
Jose Gonzalez 7895a82268 Fixed issue with types 2021-06-02 16:06:00 +02:00
Jose Gonzalez 897a98eab6 Handle directory paths for file upload 2021-06-02 13:17:34 +02:00