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

7718 Commits

Author SHA1 Message Date
Rafael Ameijeiras b2821c0db3 Merge branch 'ent-11713-bugs-de-visualizacion-de-los-botones-de-accion-en-metaconsola-y-consola' into 'develop' 
Ent 11713 bugs de visualizacion de los botones de accion en metaconsola y consola

See merge request artica/pandorafms!6249
 2023-08-04 06:34:35 +00:00
Rafael Ameijeiras 0b680568b5 Merge branch 'ent-11739-compatibilidad-php-8-2-second' into 'develop' 
Ent 11739 compatibilidad php 8 2 second

See merge request artica/pandorafms!6300
 2023-08-04 06:32:37 +00:00
miguel angel rasteu 1009404bfd Merge branch 'develop' into ent-11668-noticias-en-consola-tienen-fondo-blanco-en-tema-oscuro 2023-08-03 13:42:49 +02:00
Jonathan 1807c1f84c #11805 hide "-1" on message 2023-08-03 13:00:33 +02:00
Jonathan 52038585f2 #11805 fix error for open 2023-08-03 12:57:31 +02:00
Daniel Maya ddcfa02e6f #11739 Fixed date_format 2 2023-08-03 12:51:50 +02:00
miguel angel rasteu 135c6835bd #11713 fix title buttons 2023-08-03 12:51:09 +02:00
miguel angel rasteu 1dc24cdfb4 #11668 Fix black theme 2023-08-03 12:22:20 +02:00
Rafael Ameijeiras 8f04fbec4d Merge branch 'ent-11645-mensaje-de-error-en-sla-items-erroneo' into 'develop' 
Ent 11645 mensaje de error en sla items erroneo

See merge request artica/pandorafms!6179
 2023-08-03 07:04:39 +00:00
Rafael Ameijeiras fec85ce8e7 Merge branch 'ent-11749-15964-conteo-de-agentes-no-aparece-en-v772' into 'develop' 
Ent 11749 15964 conteo de agentes no aparece en v772

See merge request artica/pandorafms!6266
 2023-08-03 07:04:11 +00:00
miguel angel rasteu ef07bea496 #10177 Fix underscore 2023-08-03 07:59:13 +02:00
miguel angel rasteu 3f85562f21 #10177 Fix server name 2023-08-02 13:42:11 +02:00
Rafael Ameijeiras f692dd4c7d Merge branch 'ent-11693-15876-inverse-interval-no-se-activa-para-modulos-web-server-de-tipo-string' into 'develop' 
Ent 11693 15876 inverse interval no se activa para modulos web server de tipo string

See merge request artica/pandorafms!6218
 2023-08-02 10:43:12 +00:00
Rafael Ameijeiras e6eee88a63 Merge branch 'ent-11377-users-bulk-operations-usuarios-con-perfil-x-anadido-no-aparecen-al-intentar-borrar-perfil' into 'develop' 
Ent 11377 users bulk operations usuarios con perfil x anadido no aparecen al intentar borrar perfil

See merge request artica/pandorafms!6010
 2023-08-02 10:42:36 +00:00
alejandro.campos@artica.es 8074448bfd remove snmp version 2 2023-08-02 11:07:08 +02:00
Rafael Ameijeiras d96977b883 Merge branch 'ent-10562-Nueva-vista-de-detalle-de-alertas-encoladas' into 'develop' 
Ent 10562 nueva vista de detalle de alertas encoladas

See merge request artica/pandorafms!6273
 2023-08-02 08:26:50 +00:00
Jonathan 7e8b26b73a Merge branch 'develop' into ent-11693-15876-inverse-interval-no-se-activa-para-modulos-web-server-de-tipo-string 2023-08-02 09:29:42 +02:00
Jonathan f063c5182e #11693 fix warning/critical inverse for serverdata 2023-08-02 09:26:14 +02:00
miguel angel rasteu 57df761622 #11377 Fix sql query 2023-08-02 09:11:55 +02:00
Daniel Maya ae22b99835 Merge branch 'develop' into ent-11739-compatibilidad-php-8-2-second 2023-08-02 09:10:04 +02:00
alejandro.campos@artica.es 700bb53df4 implemented pending alerts list for event server 2023-08-01 14:37:16 +02:00
Rafael Ameijeiras 965184c688 Merge branch 'ent-11629-neflow-filter-no-admite-grupo-all' into 'develop' 
Ent 11629 neflow filter no admite grupo all

See merge request artica/pandorafms!6151
 2023-08-01 12:33:07 +00:00
Daniel Maya 0d321f5311 #11739 Fixed deprecated functions 3 2023-08-01 11:19:04 +02:00
Jonathan 84df4e1195 #11571 fix for firefox margin api token span 2023-08-01 11:11:24 +02:00
Jonathan 629f43c8f5 Merge branch 'develop' into ent-11571-contact-details 2023-08-01 10:27:40 +02:00
Rafael Ameijeiras 9f36729d30 Merge branch 'ent-11771-15990-configuracion-de-modulos-de-plugin-en-politicas-en-metaconsola-se-muestran-vacias' into 'develop' 
Ent 11771 15990 configuracion de modulos de plugin en politicas en metaconsola se muestran vacias

See merge request artica/pandorafms!6291
 2023-08-01 07:28:27 +00:00
Jorge Rincon e7c2340e72 #11771 Fixed plugin field operation in module creation/edition 2023-07-31 15:30:39 +02:00
Rafael Ameijeiras 0c4331f9d4 Merge branch 'ent-11351-15668-snmp-alerts-crea-alerta-sin-tener-ningun-dato-puesto-en-formulario' into 'develop' 
Ent 11351 15668 snmp alerts crea alerta sin tener ningun dato puesto en formulario

See merge request artica/pandorafms!5988
 2023-07-31 11:08:29 +00:00
Daniel Maya 8bbaa11ce3 resolved conflict 2023-07-31 09:44:46 +02:00
miguel angel rasteu 9781809b22 #11713 Fix title 2023-07-31 09:27:50 +02:00
miguel angel rasteu 95e17b46bf Merge branch 'develop' into ent-11713-bugs-de-visualizacion-de-los-botones-de-accion-en-metaconsola-y-consola 2023-07-31 09:03:03 +02:00
Rafael Ameijeiras 3a9404ad12 Merge branch 'ent-11653-cascade-protection-modules-solamente-se-debe-permitir-habilitar-si-se-tiene-un-agente-padre' into 'develop' 
Ent 11653 cascade protection modules solamente se debe permitir habilitar si se tiene un agente padre

See merge request artica/pandorafms!6262
 2023-07-31 06:57:32 +00:00
Jorge Rincon 89f604a602 #11771 Fixed plugin type fields 2023-07-28 14:03:24 +02:00
Daniel Cebrian 022ccc6ace https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/11807 2023-07-28 13:54:51 +02:00
Daniel Cebrian a0fdb2a791 #11326 new report vulnerabilities 2023-07-28 12:11:36 +02:00
Daniel Rodriguez 42a5fc0716 Merge branch 'ent-9301-anadir-token-de-mantenimiento-para-que-el-pandora_db-elimine-agentes-deshabilitados-manualmente' into 'develop' 
Ent-9301-anadir-token-de-mantenimiento-para-que-el-pandora_db-elimine-agentes-deshabilitados

See merge request artica/pandorafms!6051
 2023-07-27 13:08:05 +00:00
alejandro.campos@artica.es 6114787764 Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id 2023-07-27 13:32:26 +02:00
Daniel Cebrian d44df2ea6b #11326 added top n agents with worst score 2023-07-27 13:21:57 +02:00
Daniel Rodriguez 84f61c9022 Merge branch 'ent-10265-eliminar-gestion-de-mapas-via-ntop-antigua-funcionalidad-deprecada' into 'develop' 
Ent-10265-eliminar-gestion-de-mapas-via-ntop-antigua-funcionalidad-deprecada

See merge request artica/pandorafms!6028
 2023-07-27 10:27:55 +00:00
Rafael Ameijeiras 9ce383d2ec Merge branch 'ent-11739-compatibilidad-php-8-2' into 'develop' 
Ent 11739 compatibilidad php 8 2

See merge request artica/pandorafms!6286
 2023-07-27 09:17:24 +00:00
Daniel Cebrian 2c9f7e026e Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-07-26 15:58:26 +02:00
Daniel Maya bee65bc575 #11739 Fixed deprecated functions 2023-07-26 14:18:20 +02:00
Daniel Rodriguez c2d7c10442 Merge branch 'ent-11606-Quitar-consolas-visuales-legacy' into 'develop' 
remove legacy visual console

See merge request artica/pandorafms!6140
 2023-07-26 11:09:44 +00:00
Rafael Ameijeiras d046e82208 Merge branch 'ent-11644-desaparece-selector-en-bulk-operations-en-nodo-centralizado' into 'develop' 
Ent 11644 desaparece selector en bulk operations en nodo centralizado

See merge request artica/pandorafms!6168
 2023-07-25 11:04:38 +00:00
Rafael Ameijeiras b4742f9e46 Merge branch 'ent-11698-proteccion-en-cascada-de-modulos-no-se-puede-configurar' into 'develop' 
Ent 11698 proteccion en cascada de modulos no se puede configurar

See merge request artica/pandorafms!6216
 2023-07-25 10:34:53 +00:00
Daniel Rodriguez 4b6be6596e Merge branch 'ent-10640-meter-programador-de-informes-en-la-vista-de-edicion-de-un-informe-en-una-nueva-solapa' into 'develop' 
Ent 10640 meter programador de informes en la vista de edicion de un informe en una nueva solapa

See merge request artica/pandorafms!5858
 2023-07-25 10:02:12 +00:00
Rafael Ameijeiras 391447c307 Merge branch 'ent-11708-error-al-visualizar-el-boton-de-delete-en-metaconsola-en-category-management' into 'develop' 
Ent 11708 error al visualizar el boton de delete en metaconsola en category management

See merge request artica/pandorafms!6231
 2023-07-25 09:05:16 +00:00
Rafael Ameijeiras 85a3e32c27 Merge branch 'ent-11421-Config-remota-del-servidor-no-accesible-si-no-hay-dataserver' into 'develop' 
show server conf remote edition in at least one server element

See merge request artica/pandorafms!6197
 2023-07-25 09:03:51 +00:00
Rafael Ameijeiras 7f2918990c Merge branch 'ent-11360-intervalo-en-1-hora-por-defecto-en-item-de-informe-module-histogram-graph' into 'develop' 
Ent 11360 intervalo en 1 hora por defecto en item de informe module histogram graph

See merge request artica/pandorafms!6166
 2023-07-25 07:53:48 +00:00
Rafael Ameijeiras 458226e24d Merge branch 'ent-11754-15970-error-de-paginacion-de-custom_graphs' into 'develop' 
Ent 11754 15970 error de paginacion de custom graphs

See merge request artica/pandorafms!6267
 2023-07-25 07:52:11 +00:00
alejandro.campos@artica.es 31ec1b8209 Merge remote-tracking branch 'origin/develop' into ent-11421-Config-remota-del-servidor-no-accesible-si-no-hay-dataserver 2023-07-24 13:49:28 +02:00
Rafael Ameijeiras db62d257df Merge branch 'ent-11716-text-area-plugin-parameters-se-rompe-si-no-anadimos-espacios' into 'develop' 
Ent 11716 text area plugin parameters se rompe si no anadimos espacios

See merge request artica/pandorafms!6244
 2023-07-24 10:52:56 +00:00
Pablo Aragon ccf124103d 11135-Move js code from ui_print_datatable. Resolve conflict 2023-07-24 10:46:19 +02:00
Pablo Aragon 2a89a494cc 10640-Report task. Resolve conflict 2023-07-24 10:06:43 +02:00
Pablo Aragon 8389169e16 Merge branch 'develop' into ent-10640-meter-programador-de-informes-en-la-vista-de-edicion-de-un-informe-en-una-nueva-solapa 2023-07-24 08:40:33 +02:00
alejandro.campos@artica.es 7b9170312c implemented pending alerts list for event server 2023-07-21 11:50:53 +02:00
Daniel Rodriguez 4148074996 Merge branch 'ent-11012-Flag-Experimental-para-la-consola' into 'develop' 
added setup token

See merge request artica/pandorafms!6133
 2023-07-21 07:23:33 +00:00
miguel angel rasteu 88ba679875 #11651 Fix console.log 2023-07-20 12:52:36 +02:00
miguel angel rasteu a4442ce31b #11651 Fix menu 2023-07-20 10:42:22 +02:00
miguel angel rasteu 9978bbe645 #11754 Add pagination 2023-07-20 09:42:09 +02:00
miguel angel rasteu 80b60eb86f #11749 Fix agent count 2023-07-20 08:43:51 +02:00
Jorge Rincon ac23a4c375 #11653 Fixed operation for Agent parent field 2023-07-19 15:48:33 +02:00
miguel angel rasteu 1759dfe4b5 #10603 Custom weekly schedule 2023-07-19 12:07:47 +02:00
daniel 1f1b85561c Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id 2023-07-19 11:39:06 +02:00
Rafael Ameijeiras 06d3664b2f Merge branch 'ent-10254-15114-anadir-timeout-y-secondary-server-a-ad' into 'develop' 
Ent 10254 [#15114]Añadir timeout y secondary server a AD

See merge request artica/pandorafms!6091
 2023-07-18 10:14:29 +00:00
Daniel Cebrian 41a03a7a49 Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-07-18 09:27:14 +02:00
Rafael Ameijeiras 9ad7ea0d6f Merge branch 'ent-11420-botones-incorrectos-en-config-remota-del-servidor' into 'develop' 
Ent 11420 botones incorrectos en config remota del servidor

See merge request artica/pandorafms!6035
 2023-07-17 11:12:17 +00:00
miguel angel rasteu 2e4066973a #11377 Show all groups 2023-07-17 12:32:47 +02:00
Daniel Maya c333ffcf0a #11420 fixed url and added buttons 2023-07-17 08:59:32 +02:00
Rafael Ameijeiras 8d423fa0ad Merge branch 'ent-2892-6602-borrar-en-descripcion-de-modulo-mensaje-de-que-ha-sido-creado-a-traves-de-plantilla' into 'develop' 
Ent 2892 6602 borrar en descripcion de modulo mensaje de que ha sido creado a traves de plantilla

See merge request artica/pandorafms!5791
 2023-07-17 06:02:29 +00:00
Rafael Ameijeiras 9cec3e1ba5 Merge branch 'ent-5344-seleccionables-de-pdf-en-open-reports' into 'develop' 
Ent 5344 seleccionables de pdf en open reports

See merge request artica/pandorafms!5792
 2023-07-17 05:59:15 +00:00
Rafael Ameijeiras d860d613d6 Merge branch 'ent-10598-nuevo-wizard-de-bienvenida' into 'develop' 
Ent 10598 nuevo wizard de bienvenida

See merge request artica/pandorafms!6043
 2023-07-17 05:57:29 +00:00
miguel angel rasteu fd56631ae4 #11713 Fix action button title 2023-07-14 13:07:04 +02:00
Rafael Ameijeiras 9499e50eea Merge branch 'ent-9686-crear-seccion-de-politicas-dentro-del-agente' into 'develop' 
Ent 9686 crear seccion de politicas dentro del agente

See merge request artica/pandorafms!5830
 2023-07-14 06:58:00 +00:00
Rafael Ameijeiras d9b95c08ed Merge branch 'ent-11719-selector-de-modulos-en-las-alertas-del-agente-no-muestra-los-modulos-del-agente-solo-en-nodo' into 'develop' 
Ent 11719 selector de modulos en las alertas del agente no muestra los modulos del agente solo en nodo

See merge request artica/pandorafms!6237
 2023-07-13 10:43:46 +00:00
Rafael Ameijeiras 9e3dcbd390 Merge branch 'ent-11331-editar-tarea-de-google-cloud-te-lleva-a-discovery' into 'develop' 
Ent 11331 editar tarea de google cloud te lleva a discovery

See merge request artica/pandorafms!5957
 2023-07-13 10:43:03 +00:00
Daniel Cebrian 20c225e410 Merge branch 'develop' into ent-9686-crear-seccion-de-politicas-dentro-del-agente 2023-07-13 10:16:52 +02:00
Diego Muñoz-Reja 57058c4f9c Merge branch 'ent-11266-no-se-habilita-el-log-de-consola-en-770-ni-771' into 'develop' 
Ent 11266 no se habilita el log de consola en 770 ni 771

See merge request artica/pandorafms!6001
 2023-07-13 07:55:47 +00:00
Daniel Cebrian 4f26bc2d51 #9686 fixed pagination in policies manager 2023-07-13 08:56:58 +02:00
Jonathan ab590f6493 #11716 fix size plugins preview 2023-07-12 16:24:46 +02:00
Jonathan 5ba8b4d1ad Merge branch 'develop' into ent-11687-giss-anchura-insuficiente-en-columna-de-agentes-al-utilizar-operaciones-masivas-de-eliminar 2023-07-12 15:30:55 +02:00
Jonathan 9a32c0c700 #11710 fix pagination alerts node on centraliced 2023-07-12 14:16:35 +02:00
Jonathan 0f1b8fce02 #11719 fix modules create alert 2023-07-12 12:11:50 +02:00
Jonathan d5335da885 #11687 overflow fix 2023-07-12 12:05:17 +02:00
Jonathan eada8e0652 #11687 fix errors agents and checks 2023-07-12 11:26:33 +02:00
Diego Muñoz-Reja a7c0866be0 Merge branch 'ent-11293-lista-de-reportes-en-metaconsola' into 'develop' 
Ent 11293 lista de reportes en metaconsola

See merge request artica/pandorafms!5952
 2023-07-12 07:16:35 +00:00
Jonathan 8b0c9af7a8 #11687 fix style delete modules 2023-07-12 08:41:30 +02:00
Jonathan 93571d1eb6 #11708 fix delete image category metaconsole 2023-07-11 14:10:55 +02:00
Matias Didier f5f71531ee Merge branch 'ent-9756-anadir-escalado-de-estados-a-op-masivas' into 'develop' 
Ent 9756 anadir escalado de estados a op masivas

See merge request artica/pandorafms!6079
 2023-07-11 10:48:55 +00:00
Jonathan f734b46a80 #9756 fix warning critical status remove duplicate 2023-07-11 12:21:16 +02:00
Diego Muñoz-Reja 3c3889e343 Merge branch 'ent-11161-campo-innecesario-y-no-solicitado-al-cambiar-contrasena-de-usuario-3-errores-distintos' into 'develop' 
Ent 11161 campo innecesario y no solicitado al cambiar contrasena de usuario 3 errores distintos

See merge request artica/pandorafms!5887
 2023-07-11 07:56:21 +00:00
daniel d3412a7ad1 add filter events comments pandora_enterprise#11387 2023-07-10 16:26:33 +02:00
Daniel Cebrian aae86cd7ee Merge branch 'develop' into ent-10012-item-grafico-coincidencias-informe-logs 2023-07-10 16:04:04 +02:00
Daniel Cebrian f3ee738fcc Merge branch 'develop' into ent-10012-item-grafico-coincidencias-informe-logs 2023-07-10 16:02:02 +02:00
Matias Didier 02f173e39d Merge branch 'ent-11612-en-alert-templates-se-permite-crear-plantillas-con-nombres-vacios' into 'develop' 
Ent 11612 en alert templates se permite crear plantillas con nombres vacios

See merge request artica/pandorafms!6135
 2023-07-10 13:07:53 +00:00
Gorka Sanchez bd9e62540f Merge branch 'ent-11701-aparicion-de-columnas-raras-en-detalles-de-alertas' into 'develop' 
Ent 11701 aparicion de columnas raras en detalles de alertas

See merge request artica/pandorafms!6219
 2023-07-10 11:46:54 +00:00
Miguel Angel Rasteu 3001cc90ce Merge branch 'develop' into 'ent-11161-campo-innecesario-y-no-solicitado-al-cambiar-contrasena-de-usuario-3-errores-distintos' 
# Conflicts:
#   pandora_console/godmode/users/user_management.php
 2023-07-10 09:45:11 +00:00
miguel angel rasteu a215620f2e #11701 Fix alert view 2023-07-10 11:39:43 +02:00
Diego Muñoz-Reja d7d5519e29 Merge branch 'ent-11327-14544-limite-de-macros-al-editar-el-plugin-no-permite-anadir-nuevo-parametro' into 'develop' 
Ent 11327 14544 limite de macros al editar el plugin no permite anadir nuevo parametro

See merge request artica/pandorafms!6005
 2023-07-10 09:36:37 +00:00
Matias Didier a575c3028f Merge branch 'ent-11037-modificar-etiqueta' into 'develop' 
Ent 11037 modificar etiqueta

See merge request artica/pandorafms!5795
 2023-07-07 11:57:33 +00:00