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

6446 Commits

Author SHA1 Message Date
Daniel Barbero Martin ac23665244 Merge remote-tracking branch 'origin/develop' into ent-8564-operaciones-masivas-metaconsola-edicion-de-agentes 2022-07-21 10:58:37 +02:00
Jimmy Olano 7f1ecff302 Merge branch 'ent-9062-mensaje-de-advertencia-sin-traducir' into 'develop' 
Add transaltion to discovery message

Ref: pandora_enterprise#9062

See merge request artica/pandorafms!4967
 2022-07-20 22:24:13 +00:00
Daniel Barbero Martin 027f61daff Merge remote-tracking branch 'origin/develop' into ent-8942-token-para-cambiar-comportamiento-de-la-busqueda-de-grupos-en-filtro-de-eventos 
Conflicts:
	pandora_console/extras/mr/56.sql
 2022-07-19 10:18:04 +02:00
Calvo 3ee8f6b431 Added switch to agetn conf to avoid automatic Ip update 2022-07-15 13:40:54 +02:00
Daniel Barbero Martin e58bc4f96a move massive aperation edit agent pandora_enterprise#8564 2022-07-14 16:06:51 +02:00
Daniel Barbero Martin 8e2b074460 new console report pandora_enterprise#6367 2022-07-11 16:42:20 +02:00
Daniel Barbero Martin 01ba149280 new console report pandora_enterprise#6367 2022-07-08 13:40:20 +02:00
edu.corral 36e2043102 ent-9091 setup view 2022-07-06 10:58:16 +02:00
Daniel Maya 86052ff28a #8769 Fixed conflict 2022-07-06 09:49:39 +02:00
Daniel Barbero Martin 12f73d86fd new filter search eventspandora_enterprise#8942 2022-07-05 17:02:40 +02:00
Daniel Maya e839d82e00 resolved conflict 2022-07-04 13:40:06 +02:00
Jimmy Olano 2bf757a364 Merge branch 'ent-8252-12671-ordenar-campos-custom-fields-eventos' into 'develop' 
Ent 8252 12671 ordenar campos custom fields eventos

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/8252

See merge request artica/pandorafms!4948
 2022-07-01 11:01:57 +00:00
Diego Muñoz-Reja 488191d9d8 Merge branch 'ent-9129-ampliar-funcionalidad-de-los-informes-top-n-actuales' into 'develop' 
top n regex pandora_enterprise#9129

See merge request artica/pandorafms!4989
 2022-07-01 10:57:20 +00:00
Jimmy Olano c074cd81bf Merge branch 'ent-8302-Añadir-opción-de-mostrar-solo-grupos-con-datos-en-Group-view' into 'develop' 
Ent 8302 añadir opción de mostrar solo grupos con datos en group view

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/8302

See merge request artica/pandorafms!4949
 2022-07-01 10:47:27 +00:00
Jimmy Olano fb5dd4d557 Merge branch 'ent-8588-Diferencias-de-filtrado-en-vistas-similares-de-Pandora' into 'develop' 
fixed query filter

Ref pandora_enterprise#8588

See merge request artica/pandorafms!4895
 2022-06-29 23:54:48 +00:00
Jimmy Olano 1e832e9e8d Merge branch 'ent-9172-Edición-de-usuario-superadmin' into 'develop' 
Ent 9172 edición de usuario superadmin

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9172

See merge request artica/pandorafms!4985
 2022-06-29 17:55:51 +00:00
Diego Muñoz-Reja bc6f234029 Merge branch 'ent-9093-Harce-mas-grande-el-selector-acciones-alertas' into 'develop' 
Resized alert action list and refactor

See merge request artica/pandorafms!4980
 2022-06-29 14:50:37 +00:00
Diego Muñoz-Reja 0d8cfc3986 Merge branch 'ent-9147-13774-Lista-elementos-consola-visual-falla-con-muchos-elementos' into 'develop' 
fixed vc elements edition

See merge request artica/pandorafms!4963
 2022-06-29 14:36:41 +00:00
Diego Muñoz-Reja a2125580d9 Merge branch 'ent-9043-cambiar-mensaje-error-no-poder-mostrar-fichero-file-manager' into 'develop' 
Improved error message

See merge request artica/pandorafms!4939
 2022-06-29 14:01:49 +00:00
Daniel Barbero Martin 2ff94b319c Merge remote-tracking branch 'origin/develop' into ent-9129-ampliar-funcionalidad-de-los-informes-top-n-actuales 2022-06-29 13:54:27 +02:00
José González 7edcd3b0a6 Improve code and fix update alerts 2022-06-29 11:05:50 +02:00
Jimmy Olano f48d3a9849 Merge branch 'ent-8984-13630-Cuenta-de-plantillas-de-alerta-no-coincide' into 'develop' 
Ent 8984 13630 cuenta de plantillas de alerta no coincide

See merge request artica/pandorafms!4902
 2022-06-29 02:40:08 +00:00
José González 2d69ea4be5 Merge branch 'develop' into 'ent-9043-cambiar-mensaje-error-no-poder-mostrar-fichero-file-manager' 
# Conflicts:
#   pandora_console/index.php
 2022-06-28 14:39:37 +00:00
Daniel Barbero Martin 2632816e13 top n regex pandora_enterprise#9129 2022-06-28 16:32:37 +02:00
José González b03356cc3c Merge branch 'develop' into 'ent-9089-Mejoras-usabilidad-menu-gestion-eventos' 
# Conflicts:
#   pandora_console/godmode/menu.php
 2022-06-28 14:08:13 +00:00
daniel 867e659118 Merge branch 'ent-1419-umbrales-en-graficas-pdf-4649-com1' into 'develop' 
add treshold pdf pandora_enterprise#1419

See merge request artica/pandorafms!4894
 2022-06-28 13:45:53 +00:00
Daniel Maya 693c5d5044 #9172 Changed configure user 2022-06-27 16:48:00 +02:00
José González 237de0ee97 Resized alert action list and refactor 2022-06-23 12:21:00 +02:00
Daniel Rodriguez 4dd65c20a8 Merge branch 'ent-8888-consolas-visuales-vista-movil-carrefour' into 'develop' 
Not orientation CV view mobile pandora_enterprise#8888

See merge request artica/pandorafms!4886
 2022-06-23 10:07:24 +00:00
Daniel Rodriguez c0509a798c Merge branch 'ent-8812-Adaptar-WMI-Wizard-nuevo-binario-pandorawmic' into 'develop' 
Added control for WMI binary

See merge request artica/pandorafms!4884
 2022-06-23 08:27:11 +00:00
edu.corral 22d9c267af ent-9041 input text style 2022-06-21 13:29:50 +02:00
Daniel Rodriguez bf8cb56895 Merge branch 'ent-8590-indicar-a-que-satelite-pertenece-un-agente' into 'develop' 
Console changes for 8590

See merge request artica/pandorafms!4947
 2022-06-20 15:11:42 +00:00
Daniel Rodriguez 8fb54be1bb Merge branch 'ent-8730-problema-notificacion-consola-con-parches-soporte' into 'develop' 
some fixes in version control and php memory usage

See merge request artica/pandorafms!4803
 2022-06-20 15:07:01 +00:00
José González 275fd2ed19 Fix minor issues related with pandorawmic 2022-06-20 16:20:49 +02:00
Calvo 5a6fc5630e Add transaltion to discovery message 2022-06-20 10:37:25 +02:00
Calvo 0c2823f23f Merge remote-tracking branch 'origin/develop' into ent-8590-indicar-a-que-satelite-pertenece-un-agente 2022-06-17 12:38:11 +02:00
Daniel Maya ad98356957 resolved conflict 2022-06-16 14:21:47 +02:00
Daniel Rodriguez bea57c8991 Merge branch 'ent-8861-wizard-snmp-convierte-valores-hex-string-en-string' into 'develop' 
Changed snmpwalk parameters for wizard

See merge request artica/pandorafms!4872
 2022-06-16 12:17:27 +00:00
Daniel Rodriguez ae5c4dca24 Merge branch 'ent-9026-Buscador-roto-agregar-acciones-a-alerta-SNMP' into 'develop' 
Fix several issues with SNMP Alert view

See merge request artica/pandorafms!4913
 2022-06-16 11:35:40 +00:00
alejandro.campos@artica.es 705ebb8168 fixed vc elements edition 2022-06-16 12:19:59 +02:00
Daniel Rodriguez fa28b5b7e1 Merge branch 'ent-9000-cambio-update-manager-a-warp-update' into 'develop' 
Ent 9000 cambio update manager a warp update

See merge request artica/pandorafms!4957
 2022-06-16 08:43:12 +00:00
Daniel Barbero Martin 1bf1a83782 Merge remote-tracking branch 'origin/develop' into ent-8888-consolas-visuales-vista-movil-carrefour 2022-06-15 19:49:31 +02:00
Daniel Rodriguez a8c649c18a Merge branch 'ent-8630-Mensaje-de-erroneo-al-registrar-nodo-enlazado-a-una-meta' into 'develop' 
prevent registration dialog from showing up in update manager of metaconsole nodes

See merge request artica/pandorafms!4832
 2022-06-15 12:22:11 +00:00
Daniel Rodriguez c00f1ed1b6 Merge branch 'ent-8838-Longitud-id-user-tusuario' into 'develop' 
changed id_user field length from tusuario

See merge request artica/pandorafms!4876
 2022-06-14 09:33:09 +00:00
alejandro.campos@artica.es 5539ca51c5 minor change 2022-06-13 12:32:04 +02:00
José González 05bcbfaf79 Minor fixes 2022-06-10 12:57:25 +02:00
José González 0784b25ea0 Update Warp strings 2022-06-10 12:56:45 +02:00
José González 815a737a69 Change strings for Update Manager references to WARP update 2022-06-10 10:17:23 +02:00
Ramon Novoa 48b20b255b Merge remote-tracking branch 'origin/develop' into ent-8590-indicar-a-que-satelite-pertenece-un-agente 2022-06-09 12:05:24 +02:00
Daniel Rodriguez 60dad90807 Merge branch 'ent-9060-Bulk-operations-modifican-todos-modulos-incluso-con-acceso-restringido' into 'develop' 
Fix issue with bulk operations over modules with not allowed groups

See merge request artica/pandorafms!4922
 2022-06-09 07:36:20 +00:00
Daniel Rodriguez 336bc74d49 Merge branch 'ent-9021-proteccion-en-cascada-bucle-padre-hijo' into 'develop' 
Ent 9021 proteccion en cascada bucle padre hijo

See merge request artica/pandorafms!4921
 2022-06-09 07:34:40 +00:00
Daniel Maya 3e15ed2726 #8302 Added show_empty_groups 2022-06-08 15:17:03 +02:00
José González bad2438867 Update massive_edit_modules.php 2022-06-08 12:38:03 +00:00
Daniel Maya e43426ddc8 #8252 Fixed title 2022-06-08 13:29:43 +02:00
Daniel Maya 90d4cfa0db #8252 Move up and down fields 2022-06-08 13:24:27 +02:00
Calvo 5297123d17 Console changes for 8950 2022-06-08 13:10:01 +02:00
alejandro.campos@artica.es 6f0782782e Merge remote-tracking branch 'origin/develop' into ent-8838-Longitud-id-user-tusuario 2022-06-08 11:54:35 +02:00
Daniel Rodriguez a2c1b38a3f Merge branch 'ent-9011-Fallo-permisos-en-paradas-planificadas' into 'develop' 
fixed permissions in selectors

See merge request artica/pandorafms!4931
 2022-06-08 09:10:51 +00:00
Daniel Maya c9b94273be #8769 removed metaconsole_assigned_server 2022-06-07 15:21:07 +02:00
Daniel Rodriguez 08d8da9c83 Merge branch 'ent-8999-Cambiar-comportamiento-bulk-operations-meta' into 'develop' 
Ent 8999 cambiar comportamiento bulk operations meta

See merge request artica/pandorafms!4904
 2022-06-07 09:06:47 +00:00
José González 67ade2fccd Improved error message 2022-06-06 16:35:02 +02:00
Daniel Rodriguez 5138756525 Merge branch 'ent-8958-13577-Error-al-quitar-un-comando-de-una-acción' into 'develop' 
Ent 8958 13577 error al quitar un comando de una acción

See merge request artica/pandorafms!4878
 2022-06-06 12:16:15 +00:00
Daniel Rodriguez 618ff10fa2 Merge branch 'ent-8153-POST-Campos-extendidos-en-informe-de-eventos' into 'develop' 
Ent 8153 post campos extendidos en informe de eventos

See merge request artica/pandorafms!4830
 2022-06-06 10:52:51 +00:00
José González 4aea15228e Fix minor issue 2022-06-03 14:11:57 +02:00
Daniel Rodriguez b2acb41c10 Merge branch 'ent-8632-colocar-recursion-bien-modificar-agente' into 'develop' 
Fix recursion checkbox position

See merge request artica/pandorafms!4840
 2022-06-03 11:45:15 +00:00
Alejandro Campos 91d949942a Merge branch 'develop' into 'ent-8838-Longitud-id-user-tusuario' 
# Conflicts:
#   pandora_console/extras/mr/55.sql
 2022-06-03 10:26:35 +00:00
José González 1be4948e2d Changed strings and improve code 2022-06-03 12:26:15 +02:00
alejandro.campos@artica.es 0c9fdf8a18 changed field max length 2022-06-03 12:25:24 +02:00
Daniel Rodriguez 81e7f202c6 Merge branch 'ent-8890-Lista-de-tareas-RECON-con-muchos-targets-sale-horrible' into 'develop' 
Ent 8890 lista de tareas recon con muchos targets sale horrible

See merge request artica/pandorafms!4864
 2022-06-03 09:32:50 +00:00
Daniel Rodriguez 616c2b776a Merge branch 'ent-8710-Cuadro-eliminar-alertas-masivas-pequeño' into 'develop' 
Fix visual issue

See merge request artica/pandorafms!4844
 2022-06-02 14:00:24 +00:00
Daniel Rodriguez 8ea84fb247 Merge branch 'ent-8709-Limite-campo-update-manager-URL' into 'develop' 
Cleaned limit

See merge request artica/pandorafms!4805
 2022-06-02 07:38:56 +00:00
Daniel Rodriguez ff9d50f593 Merge branch 'ent-8788-Setup-Performance-e-Historical-database' into 'develop' 
Ent 8788 setup performance e historical database

See merge request artica/pandorafms!4798
 2022-06-02 07:05:38 +00:00
alejandro.campos@artica.es 8b57e1dfb4 fixed permissions in selectors 2022-06-01 14:00:33 +02:00
José González a251cb8439 Fix issue with bulk operations over modules with not allowed groups 2022-05-30 15:00:22 +02:00
Daniel Maya 79e7753cc8 #9021 Added offspring check 2022-05-30 11:29:17 +02:00
José González 0a99b608c5 Fix several issues with SNMP Alert view 2022-05-25 17:53:58 +02:00
José González 22fb61d39d Fix 2022-05-24 17:15:14 +02:00
José González 1b6ed0a670 Fix UMC Dependency in Update MR 2022-05-24 16:24:34 +02:00
Daniel Maya 2953bab0df #8999 Optimised delete agents in bulk 2022-05-24 09:55:37 +02:00
Daniel Maya 1379ca43b0 #8984 Fixed pagination 2022-05-23 17:10:00 +02:00
Daniel Maya 37c8fe73df #9017 Fixed alert list 2022-05-23 16:36:16 +02:00
alejandro.campos@artica.es f253ea561a fixed query filter 2022-05-19 10:15:38 +02:00
Daniel Rodriguez b132449c57 Merge branch 'ent-8949-PHP8-Error500-Netflow' into 'develop' 
Fix issue for php8

See merge request artica/pandorafms!4870
 2022-05-19 06:20:39 +00:00
Daniel Barbero Martin d0a04177c0 add treshold pdf pandora_enterprise#1419 2022-05-18 17:17:31 +02:00
Daniel Barbero Martin ececdca0b6 Not orientation CV view mobile pandora_enterprise#8888 2022-05-13 12:54:58 +02:00
José González 4589a7c298 Added control for WMI binary 2022-05-12 18:31:24 +02:00
Daniel Rodriguez 8127c72213 Merge branch 'ent-8901-Error-permisos-vista-tactica' into 'develop' 
Fix issue with ACLs

See merge request artica/pandorafms!4846
 2022-05-12 12:43:33 +00:00
Daniel Rodriguez f11c0078d3 Merge branch 'ent-8966-imposible-agregar-o-quitar-TODAS-las-etiquetas-de-un-módulo' into 'develop' 
Ent 8966 imposible agregar o quitar todas las etiquetas de un módulo

See merge request artica/pandorafms!4882
 2022-05-12 07:46:17 +00:00
Daniel Maya 38088ca598 #8966 Fixed tags 2022-05-11 16:04:02 +02:00
Daniel Maya a2de9121b7 #8958 remove the option none 2022-05-10 15:15:40 +02:00
Calvo dfc4786ef1 Changed snmpwalk parameters for wizard 2022-05-06 13:35:04 +02:00
Daniel Maya 1b3994d32c #8730 Fixed console server version 2022-05-06 11:54:17 +02:00
José González 94d86af645 Fix issue for php8 2022-05-06 11:19:44 +02:00
Daniel Maya 39ff5e6173 #8890 truncate text 2022-05-05 13:01:06 +02:00
Daniel Maya e39200f1dc #8924 Fixed XSS 2022-05-03 12:52:37 +02:00
Daniel Maya 7164bb0137 #8153 Added custom data 2022-04-28 13:13:10 +02:00
José González f8043a43f7 Fix issue with ACLs 2022-04-28 10:07:44 +02:00
José González 8dbf64b35a Fix visual issue 2022-04-27 12:10:13 +02:00
José González 7c2625fddf Fix recursion checkbox position 2022-04-26 11:47:34 +02:00
Daniel Rodriguez 08911d370f Merge branch 'ent-8800-13378-rendimiento-eventos-metaconsola' into 'develop' 
performance events view#8800

See merge request artica/pandorafms!4822
 2022-04-26 08:58:06 +00:00