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

23975 Commits

Author SHA1 Message Date
Daniel Rodriguez c6a3a7df10 Merge branch 'ent-8569-item-icon-cv-cambiar-token-link-enabled-a-habilitado-por-defecto' into 'develop' 
enable link item icon for default CV pandora_enterprise#8569

See merge request artica/pandorafms!4771
 2022-03-25 10:44:07 +00:00
Daniel Rodriguez 42b561ab2b Merge branch 'ent-8612-Bugs-varios-relacionados-con-Netflow' into 'develop' 
Ent 8612 bugs varios relacionados con netflow

See merge request artica/pandorafms!4768
 2022-03-25 10:42:25 +00:00
Daniel Rodriguez ecd2f7e35e Merge branch 'ent-8651-fallos-menores-de-usabilidad-en-setup' into 'develop' 
Fix console setup visual issues

See merge request artica/pandorafms!4756
 2022-03-25 10:39:05 +00:00
Daniel Rodriguez c33cb143bf Merge branch 'ent-8645-estilos-dashboard-no-ajusta-bien-a-los-lados' into 'develop' 
fixed  visual dashboard pandora_enterprise#8645

See merge request artica/pandorafms!4770
 2022-03-25 10:29:16 +00:00
alejandro.campos@artica.es 84ca3c040c fix query 2022-03-25 11:04:14 +01:00
Daniel Maya 26d598529c Fixed margin 2022-03-25 10:53:30 +01:00
artica 0bf8c75d2f Auto-updated build strings. 2022-03-25 01:00:41 +01:00
Calvo 6ed8851188 Fix event list widget actions on dashboard 2022-03-24 18:52:06 +01:00
Daniel Rodriguez 64947b75cd Merge branch 'ent-8338-POST-Dejar-de-codificar-los-custom-data-en-base64-eventos' into 'develop' 
change storage format of custom data field in DB

See merge request artica/pandorafms!4766
 2022-03-24 16:19:39 +00:00
Daniel Maya 4c9bdca3f8 #8533 Fixed label 2022-03-24 15:15:08 +01:00
José González cae8290c77 Missed MR file 2022-03-24 14:20:20 +01:00
José González 61713b453a Added control for ascii characters 2022-03-24 13:53:22 +01:00
artica f190a85560 Auto-updated build strings. 2022-03-24 01:00:42 +01:00
Calvo 84261fcc82 Fix menu header visual issues 2022-03-23 18:03:27 +01:00
Calvo 8cae675841 Hide menu title when screen is too small 2022-03-23 17:55:52 +01:00
alejandro.campos@artica.es 24d144ae26 minor fix 2022-03-23 17:23:45 +01:00
alejandro.campos@artica.es c7dd55e959 minor fix 2022-03-23 17:18:24 +01:00
Daniel Maya 98aebc4587 #8533 added show module data (report) 2022-03-23 16:59:15 +01:00
Daniel Barbero Martin 4e444a9d20 Merge remote-tracking branch 'origin/develop' into ent-8677-app-android-consolas-visuales 2022-03-23 16:16:10 +01:00
fbsanchez da668a3a93 some style updates 2022-03-23 15:17:43 +01:00
fbsanchez d938d59263 remove extra margin from grid forms in discovery 2022-03-23 15:02:36 +01:00
alejandro.campos@artica.es 5757d4a933 implement csv export of events in meta and minor fixes 2022-03-23 14:24:39 +01:00
Daniel Maya ff60967bdf Merge branch 'develop' into ent-8533-Mostrar-valores-en-elementos-Agents-modules 2022-03-23 12:12:52 +01:00
Daniel Rodriguez 1e6d92f7fe Merge branch 'ent-8399-borrado-contenido-cache' into 'develop' 
phantomjs cache auto-clean

See merge request artica/pandorafms!4726
 2022-03-23 10:53:22 +00:00
José González cc776ddbf7 Added enable console task feature 2022-03-23 11:47:34 +01:00
Daniel Rodriguez 38b71b3de7 Merge branch 'ent-7063-Informes-de-servicio-en-Meta' into 'develop' 
report SLA services to metaconsole pandora_enterprise#7063

See merge request artica/pandorafms!4678
 2022-03-23 10:44:01 +00:00
Calvo c9cea837fa Fix setup header visual issues 2022-03-23 10:16:35 +01:00
Calvo 24b6394c83 Merge remote-tracking branch 'origin/develop' into ent-8651-fallos-menores-de-usabilidad-en-setup 2022-03-23 09:25:17 +01:00
artica 3dcdd13fe4 Auto-updated build strings. 2022-03-23 01:00:43 +01:00
Calvo 174f6dce51 Fix dashboard event list, Removed missing debugger in code 2022-03-22 18:02:53 +01:00
Daniel Barbero Martin 0a5a07537d fixed CV in console mobile metaconsole pandora_enterprise#8676 2022-03-22 12:31:30 +01:00
Daniel Barbero Martin 0d0db1ce9a fixed CV in console mobile metaconsole pandora_enterprise#8676 2022-03-22 12:01:42 +01:00
Daniel Barbero Martin 2e083c06d7 add report services sla to wizard metaconsole pandora_enterprise#7063 2022-03-22 11:32:44 +01:00
Daniel Barbero Martin cc4f325e3f Merge remote-tracking branch 'origin/develop' into ent-7063-Informes-de-servicio-en-Meta 2022-03-22 09:32:07 +01:00
Daniel Barbero Martin 2c2a0b4d7a fixed CV in console mobile metaconsole pandora_enterprise#8676 2022-03-22 09:29:02 +01:00
Daniel Barbero Martin 927b3360d0 Merge remote-tracking branch 'origin/develop' into ent-8676-consolas-visuales-en-consola-movil 2022-03-22 08:59:51 +01:00
artica 79162a787b Auto-updated build strings. 2022-03-22 01:00:46 +01:00
Luis ba6a56b9fc WIP: event dashboard responses 2022-03-21 18:15:58 +01:00
alejandro.campos@artica.es 709f17ee7f reverted changes 2022-03-21 17:47:08 +01:00
Daniel Barbero Martin b65e161ce7 fixed CV in console mobile metaconsole pandora_enterprise#8676 2022-03-21 16:37:27 +01:00
Daniel Barbero Martin 28232f7c49 enable link item icon for default CV pandora_enterprise#8569 2022-03-21 15:43:25 +01:00
Daniel Barbero Martin 93e0a261f9 fixed visual dashboard pandora_enterprise#8645 2022-03-21 14:52:32 +01:00
Daniel Barbero Martin aec87c8839 fixed calendar templates alerts pandora_enterprise#8687 2022-03-21 13:28:53 +01:00
alejandro.campos@artica.es 065617a67a fixed several netflow bugs 2022-03-21 13:24:23 +01:00
alejandro.campos@artica.es 1a030bcd42 fixed several netflow bugs 2022-03-21 12:21:47 +01:00
fbsanchez 82c5cbb929 PJ scheduler only enterprise 2022-03-21 12:07:14 +01:00
fbsanchez 2796d3c4e2 Merge remote-tracking branch 'origin/develop' into ent-8399-borrado-contenido-cache 2022-03-21 11:30:32 +01:00
Daniel Barbero Martin 76d8918a4e fixed CV in console mobile metaconsole #8676 2022-03-21 10:04:11 +01:00
Daniel Barbero Martin 0342f2a908 Merge remote-tracking branch 'origin/develop' into ent-8676-consolas-visuales-en-consola-movil 2022-03-21 09:06:44 +01:00
artica c736fbe726 Auto-updated build strings. 2022-03-21 01:00:36 +01:00
artica 95057697d8 Auto-updated build strings. 2022-03-20 01:00:36 +01:00
artica db28f5fbbe Auto-updated build strings. 2022-03-19 01:00:42 +01:00
Daniel Rodriguez 82474264a7 Merge branch 'ent-8339-POST-Macros-para-custom-data-de-eventos' into 'develop' 
Ent 8339 post macros para custom data de eventos

See merge request artica/pandorafms!4749
 2022-03-18 13:56:49 +00:00
Daniel Rodriguez 7d062a11d3 Merge branch 'ent-8607-12764-Agregar-columna-IDs-personalizadas-a-VLANs-en-IPAM' into 'develop' 
added new field to ipam vlan

See merge request artica/pandorafms!4715
 2022-03-18 13:55:36 +00:00
José González a90e31be4f Fix credential storing with spaces 2022-03-18 14:03:36 +01:00
Daniel Barbero Martin e5f8e32a9e fixed CV in console mobile metaconsole #8676 2022-03-18 13:07:29 +01:00
Daniel Rodriguez 4c418f5979 Merge branch 'ent-8596-Mal-funcionamiento-en-el-cálculo-de-estado-por-elementos-críticos-en-Consolas-Visuales' into 'develop' 
Ent 8596 mal funcionamiento en el cálculo de estado por elementos críticos en consolas visuales

See merge request artica/pandorafms!4745
 2022-03-18 10:57:37 +00:00
alejandro.campos@artica.es e1ec4ce40e change storage format of custom data field in DB 2022-03-18 11:23:29 +01:00
Daniel Barbero Martin 8ef56aa076 Merge remote-tracking branch 'origin/develop' into ent-8676-consolas-visuales-en-consola-movil 2022-03-18 09:05:38 +01:00
artica e088c0e564 Auto-updated build strings. 2022-03-18 01:00:41 +01:00
Daniel Maya c2d60fafa9 #8596 Fixed image-item 2022-03-17 16:37:43 +01:00
Daniel Maya e83d63430c #8533 added show module data 2022-03-17 14:48:01 +01:00
Daniel Rodriguez 8ff3b4f0ee Merge branch 'ent-8243-Netflow-nuevo-informe-top-n-connections' into 'develop' 
Ent 8243 netflow nuevo informe top n connections

See merge request artica/pandorafms!4709
 2022-03-17 08:56:07 +00:00
Daniel Rodriguez 59b51ea606 Merge branch 'ent-8624-command-snapshow-view-debe-mostrar-fuentes-monoespacio' into 'develop' 
Command snapshot monospaced font

See merge request artica/pandorafms!4762
 2022-03-17 08:55:29 +00:00
Daniel Barbero Martin 51998d5e71 Merge remote-tracking branch 'origin/develop' into ent-8676-consolas-visuales-en-consola-movil 2022-03-17 08:57:17 +01:00
artica 1bc96bb92d Auto-updated build strings. 2022-03-17 01:00:40 +01:00
Daniel Barbero Martin 066568e1d4 fixed CV in console mobile metaconsole #8676 2022-03-16 17:50:46 +01:00
Alejandro Campos 0c41459b83 Merge branch 'develop' into 'ent-8607-12764-Agregar-columna-IDs-personalizadas-a-VLANs-en-IPAM' 
# Conflicts:
#   pandora_console/extras/mr/53.sql
 2022-03-16 14:07:23 +00:00
Daniel Rodriguez 0ca61eff7a Merge branch 'ent-8699-error-sql-al-crear-usuario-sin-perfil' into 'develop' 
Fix sql error when user has no profile

See merge request artica/pandorafms!4757
 2022-03-16 10:06:04 +00:00
Daniel Barbero Martin eca1ba3917 Merge remote-tracking branch 'origin/develop' into ent-8676-consolas-visuales-en-consola-movil 2022-03-16 08:54:55 +01:00
artica f04a5be8e4 Auto-updated build strings. 2022-03-16 01:00:48 +01:00
Daniel Barbero Martin 6c4d2f2b31 fixed CV in console mobile metaconsole #8676 2022-03-15 18:12:01 +01:00
alejandro.campos@artica.es 7d38617278 Merge remote-tracking branch 'origin/develop' into ent-8243-Netflow-nuevo-informe-top-n-connections 2022-03-15 17:09:19 +01:00
Daniel Barbero Martin a310194f5d Merge remote-tracking branch 'origin/develop' into ent-8676-consolas-visuales-en-consola-movil 2022-03-15 11:47:55 +01:00
Daniel Rodriguez de75277c8a Merge branch 'ent-8664-deshabilitado-de-modulos-no-funciona-correctametne-en-docker-php8-de-develop' into 'develop' 
Fix missing include

See merge request artica/pandorafms!4741
 2022-03-15 10:47:39 +00:00
Daniel Barbero Martin 9e07afdab2 fixed CV in console mobile metaconsole #8676 2022-03-15 11:39:57 +01:00
Daniel Rodriguez 4dc6f7764c Merge branch 'ent-8400-borrado-backups-generados-por-tareas-de-consolas' into 'develop' 
Missed tables

See merge request artica/pandorafms!4721
 2022-03-15 10:09:32 +00:00
Daniel Rodriguez b582fff47e Merge branch 'ent-8679-Vulnerabilidad-File-Manager' into 'develop' 
Fix upload of not wanted files in File Manager

See merge request artica/pandorafms!4754
 2022-03-15 10:08:48 +00:00
Daniel Rodriguez 7af03dfeef Merge branch 'ent-8566-multiples-bugs-version-movil' into 'develop' 
Ent 8566 multiples bugs version movil

See merge request artica/pandorafms!4716
 2022-03-15 10:08:01 +00:00
Daniel Rodriguez f513a04e75 Merge branch 'ent-8547-POST-Macro-para-nombre-completo-de-usuario-event-responses' into 'develop' 
Ent 8547 post macro para nombre completo de usuario event responses

See merge request artica/pandorafms!4747
 2022-03-15 10:07:28 +00:00
Daniel Rodriguez d7598cefa5 Merge branch 'ent-8662-modulos-modulo-padre-no-se-ven-en-tree-view' into 'develop' 
Clean filtered references for parent modules

See merge request artica/pandorafms!4744
 2022-03-15 10:06:18 +00:00
Daniel Rodriguez c9a31722d4 Merge branch 'ent-8102-giss-interfaz-de-base-de-datos-para-metaconsola' into 'develop' 
Added db interface to metaconsole with option to query nodes

See merge request artica/pandorafms!4679
 2022-03-15 10:05:37 +00:00
Calvo 6067f356e9 Command snapshot monospaced font 2022-03-15 09:21:34 +01:00
Luis ae7c81bd8e Update pandora_console/include/functions_ui.php 2022-03-15 07:38:47 +00:00
Daniel Barbero Martin a3d248912a Merge remote-tracking branch 'origin/develop' into ent-8676-consolas-visuales-en-consola-movil 2022-03-15 07:47:55 +01:00
artica 1ee2387d6c Auto-updated build strings. 2022-03-15 01:00:17 +01:00
Calvo 52df92e715 Fix files repo download file hash error 2022-03-14 17:56:04 +01:00
Calvo 6dc775649d Fix dashboard events responses 2022-03-14 15:29:40 +01:00
fbsanchez 58a473276f js module fixes 2022-03-14 12:10:30 +01:00
José González 0dd6dc48b7 Solve generated issues 2022-03-14 11:51:49 +01:00
fbsanchez f48a7af04f Missing network components 2022-03-14 11:25:33 +01:00
Daniel Barbero Martin 78aa6f5a14 Merge remote-tracking branch 'origin/develop' into ent-8676-consolas-visuales-en-consola-movil 2022-03-14 09:01:27 +01:00
artica 72fce3b9a3 Auto-updated build strings. 2022-03-14 01:00:14 +01:00
artica e7637d2f07 Auto-updated build strings. 2022-03-13 01:00:15 +01:00
artica a232747e01 Auto-updated build strings. 2022-03-12 01:00:15 +01:00
Calvo 6ac7488ca4 Fix sql error when user has no profile 2022-03-11 15:42:06 +01:00
Daniel Rodriguez 601cd1cba4 Merge branch 'ent-8656-post-busqueda-no-funciona-al-cambiar-owner-de-un-evento' into 'develop' 
Fix select2 search on extended events dialog

See merge request artica/pandorafms!4738
 2022-03-11 12:41:22 +00:00
Daniel Rodriguez 185be2ddb8 Merge branch 'ent-8374-12855-giss-agentes-deshabilitados-en-meta' into 'develop' 
Addedd metaconsole tree view filter for disabled agents

See merge request artica/pandorafms!4725
 2022-03-11 11:38:05 +00:00
Daniel Rodriguez e66e738072 Merge branch 'ent-8663-error-500-en-docker' into 'develop' 
Ent 8663 error 500 en docker

See merge request artica/pandorafms!4740
 2022-03-11 10:03:50 +00:00
Daniel Barbero Martin 06ecbdb7a6 fixed CV in console mobile metaconsole #8676 2022-03-11 10:51:57 +01:00
Daniel Rodriguez a67b6647f7 Merge branch 'ent-2152-Operaciones-masivas-de-grupos-secundarios' into 'develop' 
bulk operation edit agents add secundary groups pandora_enterprise#2152

See merge request artica/pandorafms!4677
 2022-03-11 08:51:33 +00:00
Daniel Rodriguez 83b7173fc6 Merge branch 'ent-8351-error-visual-en-mensaje-de-exito-de-la-edicion-de-items-de-informes' into 'develop' 
Fix success message position on edit report items

See merge request artica/pandorafms!4720
 2022-03-11 08:51:02 +00:00
Daniel Barbero Martin e05d741109 Merge remote-tracking branch 'origin/develop' into ent-8676-consolas-visuales-en-consola-movil 2022-03-11 09:44:53 +01:00
Daniel Barbero Martin 1a6a75390d fixed error massive operation agents #2152 2022-03-11 09:20:20 +01:00
artica 36aea89db6 Auto-updated build strings. 2022-03-11 01:00:18 +01:00
Daniel Barbero Martin 7ffca83b29 fixed error massive operation agents #2152 2022-03-10 20:06:45 +01:00
Daniel Barbero Martin e1ab514757 fixed CV in console mobile metaconsole #8676 2022-03-10 16:56:00 +01:00
Daniel Rodriguez ef98f5bdef Merge branch 'ent-8611-vulnerabilidad-en-bulk-operations' into 'develop' 
Fix permission vulnerabilities on profile massive operations

See merge request artica/pandorafms!4717
 2022-03-10 13:54:10 +00:00
Daniel Rodriguez edd76aa959 Merge branch 'ent-8591-envio-de-feedback-no-funciona' into 'develop' 
Fix error/success from send feedback dialog

See merge request artica/pandorafms!4713
 2022-03-10 13:53:40 +00:00
Luis d1709a631c Merge branch 'develop' into 'ent-8664-deshabilitado-de-modulos-no-funciona-correctametne-en-docker-php8-de-develop' 
# Conflicts:
#   pandora_console/godmode/agentes/configurar_agente.php
 2022-03-10 10:55:12 +00:00
Daniel Rodriguez 8218df83d7 Merge branch 'ent-8633-escalada-de-privilegios-en-la-seccion-de-gestion-de-usuarios' into 'develop' 
Fix users vulnerabilities

See merge request artica/pandorafms!4734
 2022-03-10 10:49:12 +00:00
Calvo 176a94ce99 Fix tactical view user count when user is in group 2022-03-10 08:26:22 +01:00
Calvo 78ab628c8b Fix tactical view user count when user is in group 2022-03-10 08:22:45 +01:00
Calvo 565cb588ac Merge remote-tracking branch 'origin/develop' into ent-8447-conteo-erroneo-de-usuarios-en-index 2022-03-10 08:07:51 +01:00
Calvo aaf01c6a01 User list php format 2022-03-10 08:03:47 +01:00
Calvo ec9936bd59 Fix users vulnerabilities and bugs 2022-03-10 07:57:34 +01:00
artica 047f40a3f0 Auto-updated build strings. 2022-03-10 01:00:17 +01:00
José González 73838ef843 Fix upload of not wanted files in File Manager 2022-03-09 17:27:08 +01:00
Luis 81da96ac33 Merge branch 'develop' into 'ent-8611-vulnerabilidad-en-bulk-operations' 
# Conflicts:
#   pandora_console/include/functions_groups.php
 2022-03-09 16:24:06 +00:00
Calvo f06c90e692 Fix console setup visual issues 2022-03-09 17:20:24 +01:00
Daniel Barbero Martin 2d2d10c489 fixed server name selector agent in metaconsole #7653 2022-03-09 17:05:03 +01:00
Daniel Barbero Martin 28047f2348 Merge remote-tracking branch 'origin/develop' into ent-7653-Nuevo-informe-de-estados-de-modulos-de-agentes 2022-03-09 16:49:02 +01:00
Daniel Barbero Martin 0d6570ea24 fixed error massive operation agents #2152 2022-03-09 15:12:26 +01:00
Daniel Rodriguez e637c74dbf Merge branch 'ent-8692-Faltan-iconos-de-configuración-del-agente-en-760' into 'develop' 
Ent 8692 faltan iconos de configuración del agente en 760

See merge request artica/pandorafms!4752
 2022-03-09 13:20:12 +00:00
Daniel Rodriguez ebdc7e4fce Merge branch 'ent-8689-Error-500-en-wizard-de-agente' into 'develop' 
Ent 8689 error 500 en wizard de agente

See merge request artica/pandorafms!4751
 2022-03-09 12:57:20 +00:00
Daniel Maya 29906b3c53 #8692 Fixed remote config 2 2022-03-09 13:55:49 +01:00
Daniel Rodriguez 9f7dd951e5 Merge branch 'ent-8386-usuario-sin-acceso-a-servidores-ve-icono-con-info-de-servidores' into 'develop' 
Do not show servers header icon if user has no permission node

See merge request artica/pandorafms!4723
 2022-03-09 12:55:31 +00:00
Daniel Rodriguez 671dc5e923 Merge branch 'ent-8610-vulnerabilidad-en-gestion-de-usuarios-perfiles' into 'develop' 
Fix credential store ACL, only accces to PM or UM

See merge request artica/pandorafms!4719
 2022-03-09 12:54:41 +00:00
Daniel Rodriguez c1dd265085 Merge branch 'ent-8381-Bug-interfaces-view' into 'develop' 
Fixed issues with interfaces view and limited to show only agents with ifaces

See merge request artica/pandorafms!4712
 2022-03-09 12:54:04 +00:00
Daniel Rodriguez d73bd92157 Merge branch 'ent-8112-icono-collapse-recortado' into 'develop' 
Fix issue with collapse icon

Closes pandora_enterprise#8112

See merge request artica/pandorafms!4689
 2022-03-09 12:50:17 +00:00
Daniel Rodriguez 09ba16c593 Merge branch 'ent-5886-Vista-para-mostrar-modulos-agentes-en-paradas-planificadas' into 'develop' 
clean file planned_downtime pandora_enterprise#5886

See merge request artica/pandorafms!4688
 2022-03-09 12:48:47 +00:00
Daniel Rodriguez b6ffab0f43 Merge branch 'ent-7933-filtro-de-busqueda-de-modulo-en-alertas-externas' into 'develop' 
external alerts new filters pandora_enterprise#7933

See merge request artica/pandorafms!4687
 2022-03-09 12:48:04 +00:00
Daniel Maya 0a7238fe33 #8692 Fixed remote config 2022-03-09 12:06:21 +01:00
Daniel Barbero Martin 640d93045f Merge remote-tracking branch 'origin/develop' into ent-2152-Operaciones-masivas-de-grupos-secundarios 
Conflicts:
	pandora_console/godmode/massive/massive_edit_agents.php
 2022-03-09 09:28:08 +01:00
artica 18e6bd1c22 Auto-updated build strings. 2022-03-09 01:00:14 +01:00
Daniel Maya 0e70bc9f67 #8689 Fixed wizard 2022-03-08 18:00:09 +01:00
Daniel Barbero Martin 5b1353e493 fixed CV in console mobile #8676 2022-03-08 17:18:44 +01:00
Daniel Maya 860400fa9c #8339 added macros _customdata_json_ and _customdata_text_ 2022-03-08 16:42:19 +01:00
Daniel Rodriguez 6e98545bda Merge branch 'ent-8415-lista-templates-descuadrada-usuario-sin-RM' into 'develop' 
Fix reports view

Closes pandora_enterprise#8415

See merge request artica/pandorafms!4703
 2022-03-08 15:36:37 +00:00
Daniel Rodriguez 24da0283ee Merge branch 'ent-8524-se-pueden-crear-respuestas-de-eventos-sin-nombre' into 'develop' 
Event response creation name required

See merge request artica/pandorafms!4685
 2022-03-08 15:33:57 +00:00
Daniel Barbero Martin dee5f092c9 Merge remote-tracking branch 'origin/develop' into ent-7933-filtro-de-busqueda-de-modulo-en-alertas-externas 2022-03-08 15:47:33 +01:00
Daniel Barbero Martin b0d73fa3ff API CV #8677 2022-03-08 14:56:33 +01:00
Daniel Barbero Martin 4f67ec2f22 API CV #8677 2022-03-08 14:50:59 +01:00
Daniel Maya 7e29cd5a60 #8547 added macros _current_username_ and _owner_username_ 2022-03-08 10:44:24 +01:00
José González d511d75b8d Merge branch 'develop' into 'ent-8112-icono-collapse-recortado' 
# Conflicts:
#   pandora_console/general/main_menu.php
 2022-03-08 08:53:00 +00:00
artica 223475d546 Auto-updated build strings. 2022-03-08 01:00:06 +01:00
Daniel Maya 02fe08903c #8696 Fixed warning status 2022-03-07 15:07:06 +01:00
Daniel Maya 270bb433da added heatmap ajax and class 2022-03-07 13:11:54 +01:00
Daniel Maya 04f6cfc94f added heatmap 2022-03-07 12:50:36 +01:00
artica 3a5d412588 Updated version and build strings. 2022-03-07 12:21:14 +01:00
Daniel Maya d4439dcf51 heatmap css 2022-03-07 10:47:20 +01:00
José González 89d5b490bf Clean filtered references for parent modules 2022-03-07 10:45:11 +01:00
Daniel Maya f34e8fead7 Merge branch 'develop' into ent-8458-heatmap-view 2022-03-07 10:35:26 +01:00
artica d9f7ea4038 Auto-updated build strings. 2022-03-07 01:00:15 +01:00
artica 5f08afca26 Auto-updated build strings. 2022-03-06 01:00:16 +01:00
artica 69be7b1b55 Auto-updated build strings. 2022-03-05 01:00:19 +01:00
Calvo a34ba86129 Fix missing include 2022-03-04 15:26:47 +01:00
Calvo 17aa669d58 Fix modificar server non ininitalisez table 2022-03-04 10:49:25 +01:00
artica e3c80e015d Auto-updated build strings. 2022-03-04 01:00:14 +01:00
Calvo 433b4dda62 Fix select2 search on extended events dialog 2022-03-03 18:37:33 +01:00
fbsanchez 8d049a0ad5 removed invalid components from pandoradb_data 2022-03-03 18:26:28 +01:00
Calvo 036e2e3d6c Fix users vulnerabilities 2022-03-03 16:35:31 +01:00
artica 4a7160ce39 Auto-updated build strings. 2022-03-03 01:00:15 +01:00
artica f34722841f Auto-updated build strings. 2022-03-02 01:00:07 +01:00
Daniel Rodriguez f69ade2ca0 Merge branch 'ent-8653-No-funciona-selector-de-grupos-en-apartado-de-perfil-en-creacion-edicion-de-usuario' into 'develop' 
fix group selector in user creation and user edition view

See merge request artica/pandorafms!4728
 2022-03-01 15:12:41 +00:00
alejandro.campos@artica.es 69749e9498 fix group selector in user creation and user edition view 2022-03-01 15:12:28 +01:00
Daniel Rodriguez 953aa2887c Merge branch 'ent-6375-proyectos-auto-aplicacion-de-politicas' into 'develop' 
some tools for policy-auto-application

See merge request artica/pandorafms!4526
 2022-03-01 12:53:36 +00:00
artica 6f23817373 Auto-updated build strings. 2022-03-01 01:00:20 +01:00
fbsanchez c5d648677d phantomjs cache auto-clean 2022-02-28 18:56:01 +01:00
artica 2f3f82bf4c Auto-updated build strings. 2022-02-28 01:00:15 +01:00
artica 5ec4632216 Auto-updated build strings. 2022-02-27 01:00:14 +01:00
artica 8d6389c528 Auto-updated build strings. 2022-02-26 01:00:15 +01:00
Calvo 05c283642f Addedd metaconsole tree view filter for disabled agents 2022-02-25 15:37:08 +01:00
fbsanchez 32c5396dd3 cleaned files 2022-02-25 14:12:12 +01:00
Daniel Rodriguez db3e74a2f6 Merge branch 'ent-8623-error-sql-filtro-agentes' into 'develop' 
Fixed missing char

See merge request artica/pandorafms!4718
 2022-02-25 09:19:37 +00:00
Calvo 3ef537ceb2 Do not show servers header icon if user has no permission node 2022-02-25 10:16:12 +01:00
Daniel Maya 74996e3cc0 WIP heatmap 2 2022-02-25 09:41:32 +01:00
José González 95e8a10fe1 Clean traces 2022-02-25 08:31:14 +01:00
artica 144f3f2a10 Auto-updated build strings. 2022-02-25 01:00:21 +01:00
fbsanchez 182fac98f1 Missed tables 2022-02-24 18:27:57 +01:00
Calvo e95f2cd09d Fix success message position on edit report items 2022-02-24 18:02:38 +01:00
Calvo 4f3c509bde Fix credential store ACL, only accces to PM or UM 2022-02-24 17:33:13 +01:00
Luis b2bc884ec6 Fix minor bug 2022-02-24 15:53:56 +00:00
José González 08b393614a Fixed missing char 2022-02-24 14:55:47 +01:00
alejandro.campos@artica.es c319c30e24 added new field to ipam vlan 2022-02-24 13:58:04 +01:00
Calvo 39a971ad5b Fix permission vulnerabilities on profile massive operations 2022-02-24 12:17:21 +01:00
José González 64ed03784b Fix several issues with mobile view 2022-02-24 11:04:18 +01:00
Daniel Rodriguez 3f7067fe48 Merge branch 'ent-I-do-now-like-procedures' into 'develop' 
Allow both behaviours in alert time slots

See merge request artica/pandorafms!4711
 2022-02-24 09:55:40 +00:00
Daniel Rodriguez a4b6c996d1 Merge branch 'ent-8319-update-manager-comprobar-que-los-oums-y-los-mr-sean-consecutivos' into 'develop' 
UMC ImSureWhatImDoingWhenInstallingOfflinePatchesBecouseImGoingToIgnoreYourMessages

See merge request artica/pandorafms!4701
 2022-02-24 09:54:19 +00:00
alejandro.campos@artica.es bf88c54480 added new field to ipam vlan 2022-02-24 09:35:12 +01:00
artica 2cac1fed32 Auto-updated build strings. 2022-02-24 01:00:19 +01:00
José González f6a8fdf085 Fixes with scroll in agents and modules 2022-02-23 18:04:23 +01:00
fbsanchez cad5b8efa5 float current v 2022-02-23 17:52:09 +01:00
fbsanchez 45d1641169 Merge remote-tracking branch 'origin/develop' into ent-8319-update-manager-comprobar-que-los-oums-y-los-mr-sean-consecutivos 2022-02-23 17:45:15 +01:00
fbsanchez 5d5b0cb553 errata fix 2022-02-23 17:44:51 +01:00
fbsanchez eee355ff00 errata fix 2022-02-23 14:07:20 +01:00
fbsanchez deb46436d3 Merge remote-tracking branch 'origin/develop' into ent-6375-proyectos-auto-aplicacion-de-politicas 
Conflicts:
	pandora_console/extras/mr/52.sql
 2022-02-23 12:11:44 +01:00
Daniel Barbero Martin 9dc7c77cb0 remove procedure and retrocompatibility pandora_enterprise#3943 2022-02-23 10:58:38 +01:00
fbsanchez 2f304f9250 sync with updatemanager repo 2022-02-23 10:53:33 +01:00
fbsanchez 130b077202 Minor change 2022-02-23 10:51:19 +01:00
fbsanchez be9996ab9f Weird stuff for updates 2022-02-23 10:24:01 +01:00
Daniel Rodriguez 9f96c4e287 Merge branch 'ent-8551-cambio-nombre-fichero-migrate' into 'develop' 
Moved migrate fielename

See merge request artica/pandorafms!4708
 2022-02-23 08:25:09 +00:00
artica df94b6ce4a Auto-updated build strings. 2022-02-23 01:00:18 +01:00
Daniel Rodriguez 4c31e4cda3 Merge branch 'ent-8508-cepsa-correlation-server-no-encola-alertas-en-alert-server' into 'develop' 
Alert server improved

See merge request artica/pandorafms!4673
 2022-02-22 17:03:12 +00:00
Calvo 3e6a6445b1 Fix error/success from send feedback dialog 2022-02-22 17:29:17 +01:00
Daniel Barbero Martin 5b0d3fe6d4 remove procedure and retrocompatibility pandora_enterprise#3943 2022-02-22 13:26:13 +01:00
Daniel Barbero Martin 237a7feb98 remove procedure and retrocompatibility pandora_enterprise#3943 2022-02-22 13:20:53 +01:00
Daniel Rodriguez ffc7cb2b44 Merge branch 'ent-8455-ampliar-limite-comandos' into 'develop' 
Increased field size

Closes pandora_enterprise#8455

See merge request artica/pandorafms!4706
 2022-02-22 12:08:46 +00:00
Daniel Rodriguez 3092a00edb Merge branch 'ent-8532-widget-agent-modulos-no-muestra-modulos' into 'develop' 
Fix agentmodules widget conf style

See merge request artica/pandorafms!4693
 2022-02-22 11:47:55 +00:00
Daniel Rodriguez dcfe55f2dd Merge branch 'ent-8600-fallo-umbrales-creacion-modulo-snmp-interface' into 'develop' 
Quick fix

See merge request artica/pandorafms!4707
 2022-02-22 11:47:19 +00:00
José González 604633dd35 Fixed issues with interfaces view and limited to show only agents with ifaces 2022-02-22 12:37:01 +01:00
Daniel Barbero Martin 93cad269c8 fixed json entities pandora_enterprise#3943 2022-02-22 12:03:22 +01:00
Daniel Barbero Martin 3b1b9938ee fixed select2 multiple pandora_enterprise#8606 2022-02-22 11:00:11 +01:00
artica 4eaee57c75 Auto-updated build strings. 2022-02-22 01:00:51 +01:00
fbsanchez ef75a260d0 Merge remote-tracking branch 'origin/develop' into ent-8508-cepsa-correlation-server-no-encola-alertas-en-alert-server 2022-02-21 17:58:32 +01:00
Calvo b67683adff Fix agent modules selector on meta for dashboards 2022-02-21 16:38:09 +01:00
alejandro.campos@artica.es abae27e361 implement new netflow item 2022-02-21 15:27:41 +01:00
Calvo bacd0a616f Merge remote-tracking branch 'origin/develop' into ent-8532-widget-agent-modulos-no-muestra-modulos 2022-02-21 13:43:20 +01:00
alejandro.campos@artica.es 931477fcd5 implement new netflow item 2022-02-21 12:26:48 +01:00
alejandro.campos@artica.es 362898681e Implement new netflow item 2022-02-21 11:51:52 +01:00
alejandro.campos@artica.es 659408ee44 Implement new netflow item 2022-02-21 11:44:31 +01:00
fbsanchez 6bd5624a81 Moved migrate fielename 2022-02-21 10:41:43 +01:00
Daniel Maya d73fd0450d Merge branch 'develop' into ent-8458-heatmap-view 2022-02-21 10:18:15 +01:00
artica 9ddc8768d4 Auto-updated build strings. 2022-02-21 01:00:18 +01:00
artica 2fe7227190 Auto-updated build strings. 2022-02-20 01:00:17 +01:00
artica db4540cdb5 Auto-updated build strings. 2022-02-19 01:00:22 +01:00
fbsanchez 3b99a95368 Quick fix 2022-02-18 13:48:23 +01:00
Calvo 8d293c4777 Merge remote-tracking branch 'origin/develop' into ent-8532-widget-agent-modulos-no-muestra-modulos 2022-02-18 12:26:13 +01:00
Daniel Rodriguez 45b97be611 Merge branch 'ent-7049-permitir-seleccionar-a-nivel-de-usuario-si-autenticara-local-o-remotamente-ldap-ad' into 'develop' 
Added token local user to allow enabling local auth  at user level

See merge request artica/pandorafms!4668
 2022-02-18 11:04:06 +00:00
José González e2621f6230 Increased field size 2022-02-18 11:18:01 +01:00
Daniel Rodriguez c460e20537 Merge branch 'ent-6802-super-8' into 'develop' 
Super 8

See merge request artica/pandorafms!4622
 2022-02-18 09:33:24 +00:00
Calvo 5ba7b47b85 Merge remote-tracking branch 'origin/develop' into ent-7049-permitir-seleccionar-a-nivel-de-usuario-si-autenticara-local-o-remotamente-ldap-ad 2022-02-18 09:26:55 +01:00
Daniel Rodriguez 2d141a34dc Merge branch 'ent-8578-estilos-podridos-ehorus' into 'develop' 
Fix some styles

Closes pandora_enterprise#8578

See merge request artica/pandorafms!4698
 2022-02-18 08:17:07 +00:00
artica 5e69f1719e Auto-updated build strings. 2022-02-18 01:00:19 +01:00
Jose Gonzalez 7d71c60237 Fix reports view 2022-02-17 14:20:24 +01:00
Calvo 1dbc9c72b8 Fix users count on index and user list 2022-02-17 14:12:48 +01:00
fbsanchez 934be2eaf4 Updated testing and swap messages 2022-02-17 14:07:46 +01:00
fbsanchez 6434095be5 UMC ImSureWhatImDoingWhenInstallingOfflinePatchesBecouseImGoingToIgnoreYourMessages 2022-02-17 13:41:40 +01:00
fbsanchez 3150df98c6 Error fix in report - automatic combined graphs 2022-02-17 11:02:23 +01:00
fbsanchez d56fa44210 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-17 10:25:54 +01:00
artica d65eaed8ba Auto-updated build strings. 2022-02-17 01:00:08 +01:00
fbsanchez 4d1ddc2066 Force log check each based in configuration state 2022-02-16 19:04:41 +01:00
artica b27dd1c3ef Updated version and build strings. 2022-02-16 17:27:01 +01:00
Jose Gonzalez 7ee04bea49 Fix some styles 2022-02-16 15:26:56 +01:00
Calvo 3d02febd22 Fix local login with local user token enabled 2022-02-16 14:25:25 +01:00
fbsanchez af45aec166 reporting_label_macro general review 2022-02-16 14:01:23 +01:00
fbsanchez 8099a91117 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-16 13:49:59 +01:00
Calvo 5b59cfc194 Merge remote-tracking branch 'origin/develop' into ent-8532-widget-agent-modulos-no-muestra-modulos 2022-02-16 12:26:45 +01:00
Calvo a642f88364 Multiselect filtered revomed all/common modules select and added switch 2022-02-16 12:26:22 +01:00
fbsanchez 261fbe0ba3 Merge remote-tracking branch 'origin/develop' into ent-8508-cepsa-correlation-server-no-encola-alertas-en-alert-server 
Conflicts:
	pandora_console/extras/mr/52.sql
	pandora_console/pandoradb.sql
 2022-02-16 10:17:24 +01:00