Commit Graph

8530 Commits

Author SHA1 Message Date
alejandro.campos@artica.es 8ff87ec93a Merge remote-tracking branch 'origin/develop' into ent-12688-Mejoras-sistema-datos-de-demo-y-adaptar-al-nuevo-sistema-PRD 2024-02-13 09:36:36 +01:00
Rafael Ameijeiras 8422aba9d7 Merge branch 'ent-12851-Se-ha-roto-el-token-Enable-log-collection-de-agente-software-linux-desde-la-consola' into 'develop'
fix toggling log in linux agent

See merge request artica/pandorafms!6923
2024-02-13 08:19:48 +00:00
Jonathan 0dcced8b53 #12695 wip removing warnings 2024-02-12 17:59:27 +01:00
alejandro.campos@artica.es 405f15f9f0 minor fixes 2024-02-12 13:52:45 +01:00
Daniel Maya 15382049b8 #12687 Fixed delete file 2024-02-12 10:35:01 +01:00
Daniel Maya 35713c358b #12687 Added info message 2024-02-12 09:37:18 +01:00
Enrique Martin d382ca4066 Merge remote-tracking branch 'origin/develop' into ent-12317-mejora-del-discovery-host-scan-y-el-wizard-de-discovery-de-bienvenida
Conflicts:
	pandora_console/extras/mr/68.sql
2024-02-12 09:29:28 +01:00
daniel 851b046add Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0 2024-02-12 08:05:36 +01:00
alejandro.campos@artica.es df8c14864c improvements 2024-02-09 10:37:04 +01:00
Rafael Ameijeiras 4cdea9d8ef Merge branch 'ent-12460-cientos-de-errores-en-el-log-de-apache' into 'develop'
Ent 12460 Cientos de errores en el log de apache

See merge request artica/pandorafms!6748
2024-02-09 09:22:48 +00:00
Rafael Ameijeiras 5a1b5b53cc Merge branch 'ent-12843-error-deshabilitar-agentes-por-masivas-en-meta-16996' into 'develop'
Ent 12843 error deshabilitar agentes por masivas en meta 16996

See merge request artica/pandorafms!6915
2024-02-09 09:21:44 +00:00
Rafael Ameijeiras de47bcf7b1 Merge branch 'ent-12617-columna-name-y-botones-en-la-vista-de-servidores' into 'develop'
Ent 12617 columna name y botones en la vista de servidores

See merge request artica/pandorafms!6869
2024-02-09 09:21:22 +00:00
Daniel Maya 5b0f330491 #12687 changes in css 3 2024-02-09 10:08:54 +01:00
daniel 181f3ae7b3 Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0 2024-02-09 08:19:48 +01:00
Jonathan 6e1fb2f061 #12695 wip removing warnings 2024-02-08 17:17:17 +01:00
Rafael Ameijeiras 06a3fa3f27 Merge branch 'ent-12636-error-con-los-iconos-y-cabecera-de-sistemas-operativos' into 'develop'
Ent 12636 error con los iconos y cabecera de sistemas operativos

See merge request artica/pandorafms!6872
2024-02-08 14:50:49 +00:00
Daniel Maya cf3b8e7359 #12687 changes in css 2024-02-08 15:42:00 +01:00
Jonathan 9084a34514 #12695 wip removing warnings 2024-02-08 12:31:55 +01:00
daniel 5ff79dc550 new api 2.0 2024-02-08 12:23:56 +01:00
alejandro.campos@artica.es 14ae2c5206 Merge remote-tracking branch 'origin/ent-12687-sistema-import-export-prd' into ent-12688-Mejoras-sistema-datos-de-demo-y-adaptar-al-nuevo-sistema-PRD 2024-02-08 11:06:58 +01:00
alejandro.campos@artica.es bf4786e8fb fix toggling log in linux agent 2024-02-08 10:22:20 +01:00
Daniel Maya 9844f95f16 #12350 resolved conflict 2024-02-08 09:19:13 +01:00
Daniel Maya b9d871cbd9 #12687 Changes in import dialog 2024-02-08 09:07:33 +01:00
Daniel Maya b858527a31 #12687 Changes in export dialog 2024-02-07 16:45:11 +01:00
Jonathan 2246fd8049 #12695 WIP warnings 2024-02-07 16:39:33 +01:00
Daniel Maya 8675e60c9b #12687 Changes to the export name 2024-02-07 15:49:20 +01:00
Daniel Cebrian f2a15061f0 #12783 check if module is use by agent for safe mode before delete 2024-02-07 15:39:23 +01:00
Daniel Maya 5bc20f9768 #12687 Added message prd 2024-02-07 15:01:53 +01:00
Daniel Cebrian 0d235f3b6d #12460 fixed deprecated 2024-02-07 13:17:39 +01:00
Jonathan 834635a487 Merge remote-tracking branch 'origin/ent-12460-cientos-de-errores-en-el-log-de-apache' into ent-12695-16818-eliminar-warnings-en-console-log 2024-02-07 10:39:47 +01:00
daniel c0a2a4fdeb Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0 2024-02-07 08:55:52 +01:00
daniel 8cfb04d243 new api 2.0 2024-02-07 08:53:54 +01:00
Enrique Martin 2421f07291 Included parse error message 2024-02-07 04:16:51 +01:00
Daniel Maya d308aa6822 #12687 Added import 2024-02-06 16:02:37 +01:00
Enrique Martin bff917bdaf Remove console.log() entries 2024-02-06 15:30:39 +01:00
Rafael Ameijeiras adb67e9ff0 Merge branch 'ent-12847-nombres-de-consolas-visuales-favoritas-muestran-entities' into 'develop'
Ent 12847 nombres de consolas visuales favoritas muestran entities

See merge request artica/pandorafms!6912
2024-02-06 11:14:20 +00:00
Jonathan f869c18b69 #12843 fix node db update massive 2024-02-06 10:57:26 +01:00
Rafael Ameijeiras 542d1c2b51 Merge branch 'ent-12751-path-traversal-and-untrusted-upload-file' into 'develop'
Ent 12751 Path Traversal and Untrusted Upload File

See merge request artica/pandorafms!6905
2024-02-06 07:59:50 +00:00
Rafael Ameijeiras 1ae069ce12 Merge branch 'ent-12833-17008-bulk-operations-cuadros-min-critical-y-max-critical-referencian-incorrectamente' into 'develop'
Ent 12833 [#17008] Bulk Operations: Cuadros Min Critical y Max Critical referencian incorrectamente

See merge request artica/pandorafms!6895
2024-02-06 07:59:09 +00:00
Enrique Martin f00e491738 Fix merge issues 2024-02-05 23:30:35 +01:00
Enrique Martin d1c6c9843b Added net scan options to welcome wizard 2024-02-05 23:26:55 +01:00
Jonathan 5f00166b74 #12847 remove entities title and name 2024-02-05 16:52:12 +01:00
Enrique Martin f7dbd8f3b2 Net scan improvements 2024-02-02 14:41:28 +01:00
Rafael Ameijeiras f65acbd4f3 Merge branch 'ent-9992-9740-introducir-el-boton-de-email-test-en-la-configuracion-de-correo-de-la-metaconsola' into 'develop'
Ent 9992 [#9740] Introducir el botón de email test en la configuración de correo de la Metaconsola

See merge request artica/pandorafms!6901
2024-02-02 13:08:17 +00:00
Daniel Cebrian da1c74e9db #12751 fixed path with spaces and vul 2024-02-02 14:04:37 +01:00
Rafael Ameijeiras 67bbaa311c Merge branch 'ent-12824-no-se-pueden-crear-agentes-manualmente-en-develop-775' into 'develop'
Ent 12824 No se pueden crear agentes manualmente en develop (775)

See merge request artica/pandorafms!6899
2024-02-01 16:37:10 +00:00
Diego Muñoz-Reja 83e6ad429d Merge branch 'ent-12794-no-se-puede-cambiar-pass-de-users-locales-con-autenticacion-externa' into 'develop'
Ent 12794 No se puede cambiar pass de users locales con autenticación externa

See merge request artica/pandorafms!6896
2024-02-01 15:07:33 +00:00
Daniel Cebrian 9b57534f2a #12751 fixed vul 2024-02-01 11:41:19 +01:00
Daniel Maya 688f235c6b #12687 Fixed export with json_ref 2 2024-02-01 10:48:34 +01:00
Daniel Cebrian 5feb11c547 9992 added email test dialog in metaconsole 2024-01-31 16:34:25 +01:00
Jonathan b026a248e3 #12805 ipam change permisions AW/PM 2024-01-31 15:40:44 +01:00
Daniel Cebrian 8bf3794072 #12824 fixed create agent view 2024-01-31 15:02:20 +01:00
Daniel Cebrian 60d2733066 #12794 fixed login when user use external login 2024-01-30 18:22:20 +01:00
Daniel Cebrian 1882c7a624 #12833 fixed critical value in bulk operation 2024-01-30 17:58:41 +01:00
Daniel Maya a83577d1a8 #12687 Added import/export prd 4 2024-01-30 17:34:37 +01:00
Daniel Cebrian f68615cba0 #12460 fixed deprecated 2024-01-30 17:00:38 +01:00
Daniel Cebrian 5b7a123086 Merge branch 'develop' into ent-12460-cientos-de-errores-en-el-log-de-apache 2024-01-30 13:21:44 +01:00
Daniel Cebrian c0ad547625 #12460 fixed deprecated 2024-01-30 13:14:54 +01:00
Jonathan c008aee180 #12815 modules search space entity 2024-01-30 12:01:20 +01:00
Daniel Maya e07d89883f #12687 Added import/export prd 3 2024-01-29 17:38:01 +01:00
Daniel Rodriguez 3db0090c0e Merge branch 'ent-12351-16497-Mejoras-Ampliacion-de-los-informes-monitorizacion-Netflow-Top-N-Connection' into 'develop'
implement several changes in top-n connection report item

See merge request artica/pandorafms!6833
2024-01-29 11:14:58 +00:00
Rafael Ameijeiras 8bb2b46c48 Merge branch 'ent-12568-Falta-la-opcion-de-escoger-Exec-server-en-la-configuracion-de-Event-response' into 'develop'
fix missing fields

See merge request artica/pandorafms!6766
2024-01-29 09:32:50 +00:00
alejandro.campos@artica.es 2ba5dd767d visual changes in demo view 2024-01-26 12:41:32 +01:00
alejandro.campos@artica.es 31312eaa53 visual fix 2024-01-25 17:19:05 +01:00
Jonathan cdd9af5108 #11799 hide interval for broker agents 2024-01-25 15:25:08 +01:00
Jonathan 874bd04aa8 #11799 hide interval for broker agents 2024-01-25 15:23:48 +01:00
Rafael Ameijeiras e19f520eb0 Merge branch 'ent-12522-mejoras-en-audit-log' into 'develop'
Ent 12522 Mejoras en audit log

See merge request artica/pandorafms!6816
2024-01-25 14:00:56 +00:00
Rafael Ameijeiras 574db2befe Merge branch 'ent-12128-en-alert-details-no-se-muestra-el-nombre-de-la-accion-correspondiente-a-la-alerta-al-usar' into 'develop'
Ent 12128 en alert details no se muestra el nombre de la accion correspondiente a la alerta al usar

See merge request artica/pandorafms!6802
2024-01-25 13:57:05 +00:00
Daniel Cebrian fd8d233cf8 #12460 fixed deprecated 2024-01-24 13:28:43 +01:00
Daniel Maya 401b1973be #12687 Added import/export prd 2 2024-01-24 12:15:16 +01:00
Daniel Cebrian fbb5d349a2 Merge branch 'develop' into ent-12460-cientos-de-errores-en-el-log-de-apache 2024-01-24 11:58:00 +01:00
Diego Muñoz-Reja 6352243e64 Merge branch 'ent-12386-16541-Implementar-autorefresh-en-la-vista-de-modulos-del-agente' into 'develop'
add autorefresh to agent view

See merge request artica/pandorafms!6786
2024-01-23 14:22:22 +00:00
Matias Didier e47b8eb364 Merge branch 'ent-12323-campo-para-configurar-rotado-de-netflow_interval' into 'develop'
Ent 12323 Campo para configurar rotado de netflow_interval

See merge request artica/pandorafms!6824
2024-01-23 12:51:28 +00:00
Matias Didier 1cce0a3cea Merge branch 'ent-12777-export-qr-mete-html-encoding' into 'develop'
Ent 12777 export qr mete html encoding

See merge request artica/pandorafms!6865
2024-01-23 11:23:33 +00:00
Rafael Ameijeiras c5f94a203e Merge branch 'ent-12693-bug-al-editar-inventario-remoto' into 'develop'
Ent 12693 bug al editar inventario remoto

See merge request artica/pandorafms!6863
2024-01-23 07:22:16 +00:00
Rafael Ameijeiras b14825b2b3 Merge branch 'ent-12734-perdida-de-agente-al-actualizar-gis-map' into 'develop'
Ent 12734 perdida de agente al actualizar gis map

See merge request artica/pandorafms!6839
2024-01-23 07:21:50 +00:00
Daniel Maya 95f8519d5d #12687 Added import/export prd 2024-01-22 17:22:23 +01:00
Jonathan a747308b26 #12636 fix errors 2024-01-22 16:21:51 +01:00
Matias Didier 23c33a73f6 Merge branch 'ent-12299-al-borrar-un-agente-por-masivas-en-meta-no-se-borra-el-md5-y-el-conf' into 'develop'
remove agents bulk operation pandora_enterprise#12299

See merge request artica/pandorafms!6749
2024-01-22 14:34:29 +00:00
Daniel Cebrian d504267460 Merge branch 'develop' into ent-12460-cientos-de-errores-en-el-log-de-apache 2024-01-22 15:18:01 +01:00
Jonathan 29207ed367 #12617 add class correct colum 2024-01-22 12:59:11 +01:00
Jonathan f43279acc3 #12777 qr name remove entities 2024-01-22 09:27:02 +01:00
Daniel Cebrian 5ece13fc9f #11086 fixed acl in extensions view 2024-01-19 14:05:20 +01:00
Jonathan d36ec9a8c0 #12693 add filter id_agente 2024-01-19 10:18:38 +01:00
Rafael Ameijeiras 0c73dab521 Merge branch 'ent-12366-bug-al-asignar-5-o-mas-perfiles-a-un-usuario' into 'develop'
Ent 12366 bug al asignar 5 o mas perfiles a un usuario

See merge request artica/pandorafms!6771
2024-01-19 08:36:45 +00:00
Rafael Ameijeiras 2baef1ccf2 Merge branch 'ent-12553-correccion-de-erratas' into 'develop'
Ent 12553 Corrección de erratas

See merge request artica/pandorafms!6817
2024-01-19 08:23:35 +00:00
Rafael Ameijeiras 23c63e2c3f Merge branch 'ent-12674-selectores-sin-accion-en-custom-graphs' into 'develop'
Ent 12674 selectores sin accion en custom graphs

See merge request artica/pandorafms!6798
2024-01-19 08:21:43 +00:00
Rafael Ameijeiras 5afa5c36c0 Merge branch 'ent-12598-16733-Filtro-de-eventos-borrado-y-asignado-como-favorito-permanece-en-la-seccion' into 'develop'
Ent 12598 16733 filtro de eventos borrado y asignado como favorito permanece en la seccion

See merge request artica/pandorafms!6736
2024-01-19 08:20:47 +00:00
Rafael Ameijeiras 49487c0960 Merge branch 'ent-12577-Error-visual-de-los-contenedores-de-opciones-avanzadas-de-modulos-Dynamic-Threshold-FF-threshold-y-Cron-from' into 'develop'
Ent 12577 error visual de los contenedores de opciones avanzadas de modulos dynamic threshold ff threshold y cron from

See merge request artica/pandorafms!6743
2024-01-19 08:20:07 +00:00
Rafael Ameijeiras 4705aefb83 Merge branch 'ent-12692-anadir-informacion-i-al-token-event-storm-protection-del-setup-para-evitar-confusiones' into 'develop'
Ent 12692 anadir informacion i al token event storm protection del setup para evitar confusiones

See merge request artica/pandorafms!6819
2024-01-19 08:19:48 +00:00
Rafael Ameijeiras 838d68d5e4 Merge branch 'ent-12733-faltan-los-botones-de-accion-de-los-filtros-de-eventos' into 'develop'
Ent 12733 faltan los botones de accion de los filtros de eventos

See merge request artica/pandorafms!6836
2024-01-19 08:19:15 +00:00
Rafael Ameijeiras e4c30eaeb6 Merge branch 'ent-12501-varios-errores-en-los-campos-personalizados-por-consola-web' into 'develop'
Ent 12501 varios errores en los campos personalizados por consola web

See merge request artica/pandorafms!6723
2024-01-19 08:18:53 +00:00
Rafael Ameijeiras 2dad4fcf0b Merge branch 'ent-12435-metaconsola-external-links-recorta-enlaces-muy-largos' into 'develop'
Ent 12435 metaconsola external links recorta enlaces muy largos

See merge request artica/pandorafms!6775
2024-01-18 12:57:53 +00:00
Rafael Ameijeiras 04478bbdfb Merge branch 'ent-12503-cambio-visual-del-boton-unique-ip-de-la-config-de-agentes' into 'develop'
Ent 12503 Cambio Visual del Botón Unique IP de la Config de Agentes

See merge request artica/pandorafms!6820
2024-01-18 12:57:08 +00:00
Rafael Ameijeiras d98c264640 Merge branch 'ent-11900-16100-contador-de-items-en-distintas-vistas' into 'develop'
Ent 11900 16100 contador de items en distintas vistas

See merge request artica/pandorafms!6792
2024-01-18 12:53:43 +00:00
Jonathan 3d1492b6a3 Merge branch 'develop' into ent-12435-metaconsola-external-links-recorta-enlaces-muy-largos 2024-01-18 13:50:27 +01:00
Diego Muñoz-Reja d1855569dc Merge branch 'ent-12571-arreglar-interfaz-de-definicion-de-graficas-combinadas' into 'develop'
Ent 12571 Arreglar interfaz de definicion de graficas combinadas

See merge request artica/pandorafms!6767
2024-01-18 11:32:59 +00:00
Rafael Ameijeiras 1f64fb6115 Merge branch 'ent-12320-wizard-de-bienvenida-mas-molon-visualmente' into 'develop'
Ent 12320 wizard de bienvenida mas molon visualmente

See merge request artica/pandorafms!6842
2024-01-18 11:16:08 +00:00
Rafael Ameijeiras e7ee0ef6b8 Merge branch 'ent-12747-Home-Screen-no-actualiza-en-nodo-cuando-mergeamos-nodo-y-meta-2' into 'develop'
fix home screen

See merge request artica/pandorafms!6850
2024-01-18 11:13:04 +00:00
Rafael Ameijeiras 2b839149fd Merge branch 'ent-12419-solicitud-de-cambio-de-longitud-maxima-del-campo-external-link' into 'develop'
Ent 12419 Solicitud de cambio de longitud máxima del campo External Link

See merge request artica/pandorafms!6821
2024-01-18 11:10:05 +00:00
Daniel Cebrian 7d1e06ce30 #12571 resolve conflics 2024-01-18 10:39:07 +01:00
Matias Didier 1201da4b50 Merge branch 'ent-12402-multiselector-roto-en-Components-groups' into 'develop'
Ent 12402 multiselector roto en components groups

See merge request artica/pandorafms!6774
2024-01-18 08:39:26 +00:00
Matias Didier 78652c0009 Merge branch 'ent-12192-enlace-a-pandora-itsm-en-idioma-espanol' into 'develop'
Ent 12192 enlace a pandora itsm en idioma espanol

See merge request artica/pandorafms!6558
2024-01-18 08:36:38 +00:00
Daniel Rodriguez 947f6511d5 Merge branch 'ent-12569-boton-para-agregar-item-en-credential-boxes-no-hace-nada' into 'develop'
Ent 12569 Botón para agregar item en Credential boxes no hace nada

See merge request artica/pandorafms!6728
2024-01-18 08:14:30 +00:00
Daniel Cebrian bb2d908de7 #12460 fixed deprecated log 2024-01-17 12:25:57 +01:00
alejandro.campos@artica.es f52700f392 fix home screen 2024-01-15 17:42:41 +01:00
Daniel Cebrian 0b18397095 #12503 fixed empty all_ip in create agent 2024-01-15 09:19:37 +01:00
Daniel Maya 75964a0406 #12721 free licence change 2024-01-12 12:50:15 +01:00
Pablo Aragon 40d1efac11 12320-Welcome wizard new styles, fix in Configuration->Configuration Wizard 2024-01-11 11:39:14 +01:00
Daniel Maya 034b9805cc #12734 Fixed visible 2024-01-10 11:17:46 +01:00
Jonathan 6bb619fb62 #12733 fix delete button 2024-01-09 16:47:53 +01:00
alejandro.campos@artica.es 9a7ef16f9c implement several changes in top-n connection report item 2024-01-08 17:31:52 +01:00
Jonathan 72d34ef99b #12435 fix conflict merge develop 2024-01-08 13:14:07 +01:00
Jonathan 706426471e #12366 fix for spaces on users 2024-01-08 10:57:32 +01:00
Daniel Cebrian 110d7f4842 #12323 added netflow interval select 2024-01-02 12:57:02 +01:00
Daniel Cebrian 3044ef4823 #12419 fixed external url and changed size field 2024-01-02 10:26:36 +01:00
Daniel Cebrian 0627ea07cd #12503 changed unique ip in agent 2023-12-29 13:43:28 +01:00
miguel angel rasteu 87f1346ee1 #12692 Add help tip in Event storm protection token 2023-12-29 09:58:20 +01:00
Daniel Cebrian 5b4531e74f #12553 fixed titles 2023-12-27 17:10:11 +01:00
Daniel Cebrian 05ec992fac #12522 enhanced audit log 2023-12-27 16:05:34 +01:00
Rafael Ameijeiras c4b6183074 Merge branch 'ent-11951-anadir-nombre-de-servidor-en-la-lista-de-servidores' into 'develop'
Fix servers name

See merge request artica/pandorafms!6794
2023-12-21 15:16:13 +00:00
Jonathan a0ad52b75f #12128 action alert no show when empty 2023-12-21 13:13:31 +01:00
Rafael Ameijeiras 5bdf1b0766 Merge branch 'ent-12398-actualizar-los-enlaces-de-ayuda-movidos-en-el-12287-2' into 'develop'
Ent 12398 actualizar los enlaces de ayuda movidos en el 12287 2

See merge request artica/pandorafms!6758
2023-12-21 12:00:44 +00:00
Jonathan 87cfc51793 #12674 fix sort custom reports 2023-12-20 17:19:18 +01:00
Calvo ca33be4495 Fix servers name 2023-12-20 11:58:31 +01:00
Calvo 421eb1fe23 Merge remote-tracking branch 'origin/develop' into ent-12236-varios-bugs-en-modulos-predictivos-de-politica 2023-12-19 18:59:07 +01:00
Calvo e41dc13ac2 WIP: Policy synthetic op: Creating modules 2023-12-19 18:37:49 +01:00
Jonathan d68daca985 #11900 counter items 2023-12-19 16:50:36 +01:00
Daniel Rodriguez d4e6c09acb Merge branch 'ent-10906-Carga-de-datos-de-demo' into 'develop'
implement demo data feature

See merge request artica/pandorafms!6606
2023-12-19 15:40:09 +00:00
daniel 855fc32a7d Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
Conflicts:
	pandora_console/include/javascript/pandora.js
	pandora_console/include/styles/pandora.css
2023-12-19 09:39:24 +01:00
Rafael Ameijeiras 8cc159f19f Merge branch 'ent-12665-error-500-al-crear-un-custom-graph' into 'develop'
fix rerors selectors pandora_enterprise#12665

See merge request artica/pandorafms!6788
2023-12-19 07:57:28 +00:00
Rafael Ameijeiras a4eed65758 Merge branch 'ent-12200-huevo-de-pascua-efecto-nieve' into 'develop'
Ent 12200 huevo de pascua efecto nieve

See merge request artica/pandorafms!6675
2023-12-19 07:56:55 +00:00
daniel ae43f8a948 fix rerors selectors pandora_enterprise#12665 2023-12-18 16:29:56 +01:00
Daniel Rodriguez 348c48d974 Merge branch 'ent-12631-nuevo-modo-de-los-modulos-ignorar-desconocidos-ignore-unknown-parte-de-consola' into 'develop'
Ent 12631 Nuevo modo de los modulos: ignorar desconocidos (Ignore unknown). Parte de Consola

See merge request artica/pandorafms!6757
2023-12-18 13:40:21 +00:00
alejandro.campos@artica.es 315d1a3223 add autorefresh to agent view 2023-12-18 13:50:54 +01:00
Daniel Maya 0ac20717f1 #12200 resolved conflict 2023-12-18 13:15:42 +01:00
Alejandro Campos c700633fce Merge branch 'develop' into 'ent-10906-Carga-de-datos-de-demo'
# Conflicts:
#   pandora_console/extras/mr/67.sql
#   pandora_console/pandoradb.sql
2023-12-18 10:54:27 +00:00
daniel 8aeee6d876 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 2023-12-18 11:15:18 +01:00
Matias Didier 9158b43945 Merge branch 'ent-12333-anadir-tablas-dinamicas-a-pandoradb-sql' into 'develop'
move extension translate_string and file_repo pandora_enterprise#12333

See merge request artica/pandorafms!6706
2023-12-15 11:49:11 +00:00
Daniel Cebrian 8df792f11b #12571 custom graphs refactored 2023-12-15 10:41:21 +01:00
Daniel Rodriguez 3fe41179e0 Merge branch 'ent-12216-Entradas-fantasma-para-elementos-de-discovery-offline' into 'develop'
Ent 12216 entradas fantasma para elementos de discovery offline

See merge request artica/pandorafms!6740
2023-12-15 09:22:10 +00:00
daniel 70dd1719db Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 2023-12-15 09:13:07 +01:00
Daniel Cebrian d84faad8cf #12631 added field ignore_unknown in api modules and cli 2023-12-14 18:11:34 +01:00
Jonathan c6d29ea60e #12435 external link users fix 2023-12-14 16:59:39 +01:00
daniel 4c11595899 fix name token easter eggs pandora_enterprise#12201 2023-12-14 16:48:10 +01:00
daniel 27a83a8eb5 Merge remote-tracking branch 'origin/develop' into ent-12201-eastern-egg-setup
Conflicts:
	pandora_console/include/functions_config.php
2023-12-14 16:36:11 +01:00
alejandro.campos@artica.es 7398982912 fix multiple selector 2023-12-14 12:27:00 +01:00
alejandro.campos@artica.es 9258de7edc fix multiple selector 2023-12-14 12:25:21 +01:00
daniel 3cb4b5cce4 Merge remote-tracking branch 'origin/develop' into ent-12333-anadir-tablas-dinamicas-a-pandoradb-sql
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/extras/mr/67.sql
	pandora_console/operation/menu.php
2023-12-14 11:21:51 +01:00
daniel 2890fd3dab Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
Conflicts:
	pandora_console/include/styles/pandora.css
2023-12-14 11:05:29 +01:00
Jonathan 065b096f14 #12366 user list 5 users bug styles 2023-12-14 10:03:58 +01:00
Jonathan 53b56b31af Merge branch 'develop' into ent-8365-ncm-fase-3 2023-12-14 08:38:52 +01:00
Rafael Ameijeiras c5687ee1fd Merge branch 'ent-12511-error-handeling-en-los-clusters-no-es-del-todo-correcto' into 'develop'
fix error empty clusters pandora_enterprise#12511

See merge request artica/pandorafms!6719
2023-12-13 16:32:17 +00:00
alejandro.campos@artica.es 29260473fc fix missing fields 2023-12-13 13:29:48 +01:00
Rafael Ameijeiras e042c67d2a Merge branch 'ent-11495-nuevo-tipo-de-informe-service-level-detailed' into 'develop'
Ent 11495 nuevo tipo de informe service level detailed

See merge request artica/pandorafms!6447
2023-12-13 12:20:17 +00:00
Rafael Ameijeiras adcf2df86d Merge branch 'ent-12345-16503-boton-deshabilitar-modulo-en-vista-modulos-no-inserta-token-module_disabled-1' into 'develop'
Ent 12345 16503 boton deshabilitar modulo en vista modulos no inserta token module disabled 1

See merge request artica/pandorafms!6638
2023-12-13 12:18:52 +00:00
Rafael Ameijeiras 710edde3e0 Merge branch 'ent-9753-derivado-del-trabajo-q-a-766-reparar-la-administracion-de-module-groups-en-metaconsola' into 'develop'
Ent 9753 derivado del trabajo q a 766 reparar la administracion de module groups en metaconsola

See merge request artica/pandorafms!6703
2023-12-13 12:08:45 +00:00
Daniel Rodriguez 70d8b344b7 Merge branch 'ent-12176-mejorar-la-captura-de-errores-en-nuevo-discovery-cuando-termine-con-errores' into 'develop'
Ent 12176 Mejorar la captura de errores en nuevo Discovery cuando termine con errores

See merge request artica/pandorafms!6705
2023-12-13 10:32:58 +00:00
Jonathan 5fa9cd5877 Merge branches 'develop' and 'ent-8365-ncm-fase-3' of brutus.artica.es:artica/pandorafms into ent-8365-ncm-fase-3 2023-12-13 11:19:32 +01:00
daniel cc12c77008 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
Conflicts:
	pandora_console/include/styles/pandora.css
2023-12-13 10:39:48 +01:00
daniel 7df7fdff7d fix msg error agent cluster pandora_enterprise#12511 2023-12-13 10:32:29 +01:00
daniel 56f50bf4b0 Merge remote-tracking branch 'origin/develop' into ent-12511-error-handeling-en-los-clusters-no-es-del-todo-correcto 2023-12-13 10:05:07 +01:00
Daniel Cebrian a5889b5913 #12631 added Ignore unknown in massive edit agent 2023-12-12 15:55:27 +01:00
Jonathan 6e60d19193 #8365 ftp server ip 2023-12-12 15:46:42 +01:00
Daniel Cebrian 464ad467aa #12631 created new token Ignore unknown for agent and modules 2023-12-12 15:30:10 +01:00
Jonathan c593161525 #12398 change urls wiki 2023-12-12 12:22:51 +01:00
miguel angel rasteu fec7bf8b90 Merge branch 'develop' into ent-11495-nuevo-tipo-de-informe-service-level-detailed 2023-12-12 09:45:36 +01:00
miguel angel rasteu 94256559f1 #11495 Fix agent name in metaconsole module selector 2023-12-11 16:46:19 +01:00
Rafael Ameijeiras a2436cf60e Merge branch 'ent-12620-elementos-de-lista-negra-de-deteccion-de-cambios-en-inventario-en-el-setup-no-funciona' into 'develop'
Ent 12620 elementos de lista negra de deteccion de cambios en inventario en el setup no funciona

See merge request artica/pandorafms!6745
2023-12-11 14:46:27 +00:00
Rafael Ameijeiras 7f75445d75 Merge branch 'ent-11537-bug-en-cuadros-de-busqueda-con-los-caracteres-2-y-0' into 'develop'
Ent 11537 bug en cuadros de busqueda con los caracteres 2 y 0

See merge request artica/pandorafms!6410
2023-12-11 14:30:51 +00:00
Rafael Ameijeiras d072187a2c Merge branch 'ent-12605-vista-de-agentes-error-500-en-develop' into 'develop'
fix error 500 and warnings pandora_enterprise#12605

See merge request artica/pandorafms!6738
2023-12-11 14:27:39 +00:00
Rafael Ameijeiras 8b0d96bab7 Merge branch 'ent-12606-no-deja-editar-tiempo-en-reportes-sla' into 'develop'
Ent 12606 no deja editar tiempo en reportes sla

See merge request artica/pandorafms!6744
2023-12-11 14:23:53 +00:00
miguel angel rasteu 3a00ba0fd6 Merge branch 'develop' into ent-11495-nuevo-tipo-de-informe-service-level-detailed 2023-12-11 12:41:37 +01:00
Enrique Martin 28d6b73bd8 Removed services and plugin agents setup for demo 2023-12-11 12:12:47 +01:00
Daniel Maya 86671c7211 #12350 added agent name editing 2023-12-11 11:36:34 +01:00
Diego Muñoz-Reja 5c0435d226 Merge branch 'ent-11846-rehacer-vista-list-of-elements-consolas-visuales-relacionado-con-11835' into 'develop'
Ent 11846 rehacer vista list of elements consolas visuales relacionado con 11835

See merge request artica/pandorafms!6563
2023-12-11 10:34:10 +00:00
daniel a418673489 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 2023-12-11 11:09:54 +01:00
daniel 7258188491 remove agents bulk operation pandora_enterprise#12299 2023-12-11 11:01:53 +01:00
Jonathan 49fd9435dd Merge branch 'develop' into ent-8365-ncm-fase-3 2023-12-11 10:13:46 +01:00
Rafael Ameijeiras be553ed170 Merge branch 'ent-11954-16123-borrado-de-acciones-no-deseadas-con-bulk' into 'develop'
Ent 11954 16123 borrado de acciones no deseadas con bulk

See merge request artica/pandorafms!6380
2023-12-11 08:29:29 +00:00
Rafael Ameijeiras ce298c1e8f Merge branch 'ent-12353-URL-de-Pandora-RC-en-Pandora-FMS-continua-siendo-ehorus-en-el-Setup' into 'develop'
change url pandorarc name

See merge request artica/pandorafms!6649
2023-12-11 08:24:46 +00:00
miguel angel rasteu 8e69326e3c Merge branch 'develop' into ent-11495-nuevo-tipo-de-informe-service-level-detailed 2023-12-11 08:43:37 +01:00
Jorge Rincon 725c5d964c #12620 fixed blacklist items in setup 2023-12-07 13:09:42 +01:00
Daniel Maya b99b0d4708 #12606 Fixed period 2023-12-07 12:49:20 +01:00
Jonathan 78bb8e0bae #8365 ix merge conflict 2023-12-07 10:58:45 +01:00
Diego Muñoz-Reja b1b3cced7d Merge branch 'ent-11903-16107-borrar-listado-mapas-gis' into 'develop'
Ent 11903 16107 borrar listado mapas gis

See merge request artica/pandorafms!6393
2023-12-07 09:27:38 +00:00
Jorge Rincon abfa08b6e0 #12577 fixed visual error of the dynamic threshold ff threshold and cron from module containers 2023-12-07 10:25:11 +01:00
Alejandro Campos 0bdc6978e6 Merge branch 'develop' into 'ent-10906-Carga-de-datos-de-demo'
# Conflicts:
#   pandora_console/extras/mr/67.sql
#   pandora_console/pandoradb.sql
2023-12-05 15:30:06 +00:00
alejandro.campos@artica.es 457f8e9448 some changes in discovery 2023-12-05 16:07:14 +01:00
alejandro.campos@artica.es d601103df3 fix url 2023-12-05 11:49:43 +01:00
alejandro.campos@artica.es 433ce7971f minor change 2023-12-05 11:38:11 +01:00
alejandro.campos@artica.es 60137eb300 changes in discovery extensions 2023-12-05 11:32:19 +01:00
daniel 1d36d8a436 fix error 500 and warnings pandora_enterprise#12605 2023-12-05 09:14:02 +01:00
daniel 77cf0ce6ca Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
Conflicts:
	pandora_console/include/styles/pandora.css
2023-12-05 08:02:55 +01:00
Daniel Cebrian c22525febc #12569 fixed actions credential boxes 2023-12-04 16:54:14 +01:00
Jorge Rincon 706540f947 #12598 Fixed event filter deleted and assigned as favorite 2023-12-04 15:12:33 +01:00
alejandro.campos@artica.es 4a64f023fe Merge branch 'ent-10906-Carga-de-datos-de-demo' of brutus.artica.es:artica/pandorafms into ent-10906-Carga-de-datos-de-demo 2023-12-04 11:37:41 +01:00
alejandro.campos@artica.es 75ddb3b934 minor changes in demo data functionality 2023-12-04 11:37:12 +01:00
Diego Muñoz-Reja 3952c259d4 Merge branch 'ent-12062-16257-16240-caracteres-extranos-bloquean-modulo-plugin-con-o-sin-politica' into 'develop'
Ent 12062 16257 16240 caracteres extranos bloquean modulo plugin con o sin politica

See merge request artica/pandorafms!6545
2023-12-04 09:22:13 +00:00
Rafael Ameijeiras 38672764a3 Merge branch 'ent-12341-agent-basic-options' into 'develop'
Ent 12341 agent basic options

See merge request artica/pandorafms!6681
2023-12-04 08:12:23 +00:00
Enrique Martin 55aee67df3 Added GIS maps creation 2023-12-03 23:23:57 +01:00
Calvo fd48d6eba6 Merge remote-tracking branch 'origin/develop' into ent-12236-varios-bugs-en-modulos-predictivos-de-politica 2023-12-01 11:16:56 +01:00
Rafael Ameijeiras 0ed2a6f946 Merge branch 'ent-12516-cambio-de-modelo-en-actualizaciones-solo-LTS-por-defecto-mostrar-informacion-sobre-versiones-en-warp-update' into 'develop'
Ent 12516 cambio de modelo en actualizaciones solo lts por defecto mostrar informacion sobre versiones en warp update

See merge request artica/pandorafms!6715
2023-12-01 09:27:45 +00:00
Rafael Ameijeiras d8063fd008 Merge branch 'ent-11652-en-detalles-de-alertas-el-contenido-no-se-adapta-al-espacio-adicional-disponible-al-colapsar' into 'develop'
Ent 11652 en detalles de alertas el contenido no se adapta al espacio adicional disponible al colapsar

See merge request artica/pandorafms!6397
2023-12-01 09:23:23 +00:00
miguel angel rasteu ec8d16e49b #11652 Resolve conflicts 2023-12-01 10:07:41 +01:00
miguel angel rasteu 0ef4685569 #12123 Resolve conflicts 2023-12-01 09:35:50 +01:00
Daniel Cebrian 24c8e606f4 #12569 fixed button credential boxes 2023-11-30 16:29:18 +01:00
Jorge Rincon 6edc90ec87 #12516 The modal is added to the online updates view.
lts_updates token is added to pandoradb_data.sql
2023-11-30 15:59:57 +01:00
Matias Didier 874e60bf55 Merge branch 'ent-12248-mover-token-de-configuracion-s-flow-a-la-seccion-de-netflow' into 'develop'
Ent 12248 mover token de configuracion s flow a la seccion de netflow

See merge request artica/pandorafms!6621
2023-11-30 13:05:46 +00:00
Daniel Maya 6154ce725b #12501 Fixed password field 2023-11-30 13:18:44 +01:00
Jonathan ee6717aa06 #12341 limit invnetory on windows basic options 2023-11-30 12:53:59 +01:00
Jonathan 607d7e36e5 #12341 enable invetory .vbs 2023-11-30 12:11:12 +01:00
Jonathan c41b360a6e #8365 merge conflict 2023-11-30 12:04:28 +01:00
Jorge Rincon 313407dcc5 Merge branch 'develop' into ent-12516-cambio-de-modelo-en-actualizaciones-solo-LTS-por-defecto-mostrar-informacion-sobre-versiones-en-warp-update 2023-11-30 11:53:35 +01:00
Jorge Rincon f9fd33fa2e #12516 Fixed set token configuration lts updates 2023-11-30 11:50:19 +01:00
Jonathan f600648cc0 #12341 fix agent_version 2023-11-30 11:43:54 +01:00
Rafael Ameijeiras c60c75475b Merge branch 'ent-10316-hover-para-mostrar-ip-no-funciona-si-se-utiliza-una-macro' into 'develop'
Ent 10316 hover para mostrar ip no funciona si se utiliza una macro

See merge request artica/pandorafms!6523
2023-11-30 09:23:16 +00:00
Jonathan bac9d4b7a6 #12341 agent version when string have build 2023-11-30 09:38:12 +01:00
Jorge Rincon ac4b45646d #12516 Modal update lts added 2023-11-30 09:30:50 +01:00
Jonathan 1fc2c432e5 Merge branch 'develop' into ent-12341-agent-basic-options 2023-11-30 09:14:35 +01:00
Jonathan b99c9240de #8365 NCM Merge conflict 2023-11-30 08:32:15 +01:00
Jonathan 75d57337af #11705 Fix merge conflict 2023-11-30 08:10:32 +01:00
Daniel Rodriguez 7f4a928f35 Merge branch 'ent-12243-no-funciona-integracion-pandora-pitsm-a-nivel-usuario' into 'develop'
Hide test button and setup in ITSM pandora_enterprise#12243

See merge request artica/pandorafms!6629
2023-11-29 17:52:26 +00:00
alejandro.campos@artica.es a290203847 implement demo data load 2023-11-29 16:57:38 +01:00
daniel db89c72be5 fix error empty clusters pandora_enterprise#12511 2023-11-29 16:00:46 +01:00
Jorge Rincon 38a79fa6a6 #12516 fixed modal body padding 2023-11-29 15:30:41 +01:00
Rafael Ameijeiras 33ca5ab4ab Merge branch 'ent-12424-aviso-en-thresholds-de-tipo-percentage-que-no-deberia-aparecer' into 'develop'
Ent 12424 aviso en thresholds de tipo percentage que no deberia aparecer

See merge request artica/pandorafms!6651
2023-11-29 14:23:32 +00:00
Jorge Rincon df76a5194c #12561 information for LTS versions in Warp Update 2023-11-29 13:40:38 +01:00
Matias Didier e7ad23c477 Merge branch 'ent-11127-poner-el-aviso-de-cantidad-de-modulos-en-cola-dinamico' into 'develop'
Ent 11127 poner el aviso de cantidad de modulos en cola dinamico

See merge request artica/pandorafms!6489
2023-11-29 09:30:08 +00:00
Matias Didier 9511d82692 Merge branch 'ent-11714-15928-pantalla-personalizada-del-usuario-error-al-establecer-link-externo-como-homescreen' into 'develop'
Ent 11714 15928 pantalla personalizada del usuario error al establecer link externo como homescreen

See merge request artica/pandorafms!6250
2023-11-29 09:29:43 +00:00
Jonathan 824e6b78a0 #12341 module plugin enable disable windows 2023-11-29 10:27:40 +01:00
Matias Didier 22969eff6e Merge branch 'ent-11074-para-el-listado-de-plugin-registrados-falta-enlace-web-desde-nodo-registrado-hacia-metaconsola' into 'develop'
Ent 11074 para el listado de plugin registrados falta enlace web desde nodo registrado hacia metaconsola

See merge request artica/pandorafms!6482
2023-11-29 08:09:54 +00:00
alejandro.campos@artica.es 7240bbf934 implement demo data load 2023-11-29 09:00:45 +01:00
Matias Didier 447e788ab3 Merge branch 'ent-12260-cuando-haces-el-cambio-de-grupo-en-un-agente-el-icono-se-queda-petado' into 'develop'
Ent 12260 cuando haces el cambio de grupo en un agente el icono se queda petado

See merge request artica/pandorafms!6587
2023-11-28 14:14:26 +00:00
Jonathan 837f1ff73c Merge branch 'develop' into ent-8365-ncm-fase-3 2023-11-28 13:04:13 +01:00
Jonathan c68bf25886 #12341 agent basic options 2023-11-28 12:52:27 +01:00
Rafael Ameijeiras 8b6a4733cf Merge branch 'ent-12253-informe-de-vulnerabilidades' into 'develop'
Ent 12253 Informe de vulnerabilidades

See merge request artica/pandorafms!6686
2023-11-28 11:14:48 +00:00
daniel 5bd689500c move extension translate_string and file_repo pandora_enterprise#12333 2023-11-28 11:06:39 +01:00
Matias Didier c8daeda489 Merge branch 'ent-12372-error-visual-al-acceder-configuracion-avanzada-remota-del-servidor' into 'develop'
Ent 12372 error visual al acceder configuracion avanzada remota del servidor

See merge request artica/pandorafms!6662
2023-11-28 10:01:01 +00:00
Rafael Ameijeiras e5237aafe1 Merge branch 'ent-12517-cambiar-nombre-al-token-allow-all-ips' into 'develop'
Ent 12517 Cambiar nombre al token "Allow all IPs"

See merge request artica/pandorafms!6696
2023-11-28 09:58:44 +00:00
Daniel Cebrian 4ce47cec8e #12176 control error legacy 2023-11-28 09:56:51 +01:00
Daniel Cebrian e7ebbedabc #12176 formatted error 2023-11-28 09:34:10 +01:00
Jonathan 30fd521cb7 Merge branch 'develop' into ent-12341-agent-basic-options 2023-11-28 09:32:59 +01:00
Matias Didier bda55cc3a5 Merge branch 'ent-11894-editor-de-links-no-actualiza-la-pagina-al-crear-o-borrar-enlaces' into 'develop'
Ent 11894 editor de links no actualiza la pagina al crear o borrar enlaces

See merge request artica/pandorafms!6373
2023-11-28 08:22:37 +00:00
daniel f9e7f19771 Merge remote-tracking branch 'origin/develop' into ent-12333-anadir-tablas-dinamicas-a-pandoradb-sql 2023-11-28 08:43:45 +01:00
Jonathan 9819c3a5ff Merge branch 'develop' into ent-11705-15916-campo-editable-en-vista-de-eventos 2023-11-28 08:30:23 +01:00
daniel f6f0f15731 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
	pandora_console/include/graphs/fgraph.php
	pandora_console/include/lib/Dashboard/Widgets/single_graph.php
	pandora_console/include/styles/pandora.css
2023-11-28 08:29:10 +01:00
Jonathan 2dec31485a Merge branch 'develop' into ent-12424-aviso-en-thresholds-de-tipo-percentage-que-no-deberia-aparecer 2023-11-28 08:19:53 +01:00
daniel 3f3e8e42bc move extension translate_string and file_repo pandora_enterprise#12333 2023-11-28 08:13:00 +01:00
Matias Didier 4dc84d58e3 Merge branch 'ent-12023-en-create-custom-report-al-seleccionar-write-access-no-aparece-lista-de-grupo' into 'develop'
Ent 12023 en create custom report al seleccionar write access no aparece lista de grupo

See merge request artica/pandorafms!6460
2023-11-28 07:12:51 +00:00
Matias Didier 746eb298ea Merge branch 'ent-11831-literales-de-opciones-de-menu-no-coinciden' into 'develop'
Ent 11831 literales de opciones de menu no coinciden

See merge request artica/pandorafms!6437
2023-11-28 07:07:58 +00:00
Jonathan def169abb8 Merge branch 'develop' into ent-8365-ncm-fase-3 2023-11-28 07:58:50 +01:00
Daniel Cebrian dde1146ccb #fixed delete allow ip when edit user 2023-11-27 17:54:05 +01:00
Daniel Rodriguez c7fcf7c168 Merge branch 'ent-11815-Modificar-creacion-de-modulos-predictivos-en-politicas-e-individualmente' into 'develop'
changed behavior of prediction modules creation

See merge request artica/pandorafms!6540
2023-11-27 16:01:57 +00:00
Daniel Cebrian ead68be05a Merge branch 'develop' into ent-12517-cambiar-nombre-al-token-allow-all-ips 2023-11-27 16:59:29 +01:00
Daniel Cebrian 139d884525 #12517 fixed permission 2023-11-27 16:59:21 +01:00
Jorge Rincon 34f9e0df49 Merge branch 'develop' into ent-11127-poner-el-aviso-de-cantidad-de-modulos-en-cola-dinamico 2023-11-27 15:52:41 +01:00
Rafael Ameijeiras 964321d1bd Merge branch 'ent-12091-filtrado-de-agentes-modulos-en-operaciones-masivas-de-alertas' into 'develop'
Ent 12091 filtrado de agentes modulos en operaciones masivas de alertas

See merge request artica/pandorafms!6516
2023-11-27 14:50:39 +00:00
Rafael Ameijeiras 41e1593afb Merge branch 'ent-11759-15977-cambios-en-la-eliminacion-de-acciones-en-las-alertas-snmp' into 'develop'
Ent 11759 15977 cambios en la eliminacion de acciones en las alertas snmp

See merge request artica/pandorafms!6387
2023-11-27 14:49:08 +00:00
Rafael Ameijeiras 5825a95eae Merge branch 'ent-11855-bug-custom-graphs-el-icono-graph-container-desaparece' into 'develop'
Ent 11855 bug custom graphs el icono graph container desaparece

See merge request artica/pandorafms!6428
2023-11-27 14:47:55 +00:00
Jorge Rincon 6b385ca260 Merge branch 'develop' into ent-12372-error-visual-al-acceder-configuracion-avanzada-remota-del-servidor 2023-11-27 15:45:14 +01:00
Rafael Ameijeiras 8e68198ab5 Merge branch 'ent-11679-15855-nombres-de-modulos-no-tienen-link-a-su-edicion' into 'develop'
Ent 11679 15855 nombres de modulos no tienen link a su edicion

See merge request artica/pandorafms!6422
2023-11-27 14:39:14 +00:00
Rafael Ameijeiras 2fa8ed3c9e Merge branch 'ent-12219-error-al-eliminar-perfiles-en-edicion-de-usuario' into 'develop'
Ent 12219 error al eliminar perfiles en edicion de usuario

See merge request artica/pandorafms!6555
2023-11-27 14:38:14 +00:00
Rafael Ameijeiras 707f85ed7f Merge branch 'ent-11511-cambiar-el-apartado-de-tools-a-seccion-management' into 'develop'
Ent 11511 cambiar el apartado de tools a seccion management

See merge request artica/pandorafms!6403
2023-11-27 14:36:38 +00:00
Daniel Cebrian afa6a7d415 #12517 allow ip limited to user admin 2023-11-27 13:55:08 +01:00
Daniel Cebrian 27d78ef049 Merge branch 'develop' into ent-12253-informe-de-vulnerabilidades 2023-11-27 13:29:05 +01:00
Daniel Cebrian 7cd163b01e #12253 new reports 2023-11-27 13:25:52 +01:00
Matias Didier d544ef4ac5 Merge branch 'ent-8686-13248-anadir-buscador-de-grupos-en-agent-management-tree-group-de-metaconsola' into 'develop'
Ent 8686 13248 anadir buscador de grupos en agent management tree group de metaconsola

See merge request artica/pandorafms!6539
2023-11-27 12:24:22 +00:00
Matias Didier 4e37f309b4 Merge branch 'ent-10807-mejorar-vista-gis-map-builder' into 'develop'
Ent 10807 mejorar vista gis map builder

See merge request artica/pandorafms!6552
2023-11-27 12:24:17 +00:00
Matias Didier 7bc998d230 Merge branch 'ent-12206-limitacion-cambio-de-contrasena-de-usuarios' into 'develop'
Ent 12206 limitacion cambio de contrasena de usuarios

See merge request artica/pandorafms!6542
2023-11-27 12:12:10 +00:00
miguel angel rasteu 167be52f5f #11714 Resolve conflict 2023-11-27 13:11:38 +01:00
Rafael Ameijeiras 793b6502ab Merge branch 'ent-10529-token-session_timeout-se-desborda-con-valor-9999999999' into 'develop'
Ent 10529 token session timeout se desborda con valor 9999999999

See merge request artica/pandorafms!6425
2023-11-27 12:05:29 +00:00
Rafael Ameijeiras 8865f0394e Merge branch 'ent-12218-bug-del-boton-show-hide-password-de-usuarios' into 'develop'
Ent 12218 bug del boton show hide password de usuarios

See merge request artica/pandorafms!6553
2023-11-27 12:00:28 +00:00
Rafael Ameijeiras 6992562178 Merge branch 'ent-12126-al-crear-una-nueva-plantilla-de-alerta-aparece-una-opcion-en-cero-literalmente-en-campo' into 'develop'
Ent 12126 al crear una nueva plantilla de alerta aparece una opcion en cero literalmente en campo

See merge request artica/pandorafms!6500
2023-11-27 11:58:30 +00:00
Rafael Ameijeiras 9a172b3f84 Merge branch 'ent-11898-16094-bug-paginacion-en-custom-fields' into 'develop'
Ent 11898 16094 bug paginacion en custom fields

See merge request artica/pandorafms!6379
2023-11-27 11:57:53 +00:00
Rafael Ameijeiras c3af86414f Merge branch 'ent-11650-aviso-emergente-no-acorde-con-la-nueva-interfaz' into 'develop'
Ent 11650 aviso emergente no acorde con la nueva interfaz

See merge request artica/pandorafms!6395
2023-11-27 11:56:57 +00:00
Rafael Ameijeiras cf65c66c38 Merge branch 'ent-12177-en-gestion-de-versiones-obsolescencia-planeada-al-subir-una-supuesta-imagen-guarda-y-se-va-al' into 'develop'
Ent 12177 en gestion de versiones obsolescencia planeada al subir una supuesta imagen guarda y se va al

See merge request artica/pandorafms!6560
2023-11-27 11:55:29 +00:00
Rafael Ameijeiras 7b4423148e Merge branch 'ent-11655-fe-de-erratas-en-idioma-ingles-por-consola-web' into 'develop'
Ent 11655 fe de erratas en idioma ingles por consola web

See merge request artica/pandorafms!6416
2023-11-27 11:53:17 +00:00
miguel angel rasteu b0125d943e #12138 Resolve conflict 2023-11-27 11:51:00 +01:00
miguel angel rasteu a4cd6d7fe1 #12138 Resolve conflict 2023-11-27 11:43:24 +01:00
Rafael Ameijeiras b58714d769 Merge branch 'ent-11951-anadir-nombre-de-servidor-en-la-lista-de-servidores' into 'develop'
Added name and master server column to servers view

See merge request artica/pandorafms!6613
2023-11-27 10:41:03 +00:00
Rafael Ameijeiras 6f4d519b32 Merge branch 'ent-12417-grafica-de-umbrales-numericos-en-modulos-alfanumericos' into 'develop'
Ent 12417 grafica de umbrales numericos en modulos alfanumericos

See merge request artica/pandorafms!6646
2023-11-27 10:35:53 +00:00
Rafael Ameijeiras e5df1a5285 Merge branch 'ent-12122-CVE-2023-44088-SQL-Injection-en-Consola-Visual' into 'develop'
Ent 12122 cve 2023 44088 sql injection en consola visual

See merge request artica/pandorafms!6525
2023-11-27 10:26:30 +00:00
Rafael Ameijeiras cd8652f9e6 Merge branch 'ent-12121-cve-2023-41814-xss-en-file-manager' into 'develop'
Ent 12121 cve 2023 41814 xss en file manager

See merge request artica/pandorafms!6499
2023-11-27 10:25:54 +00:00
Matias Didier c321165252 Merge branch 'ent-12298-error-en-almacenamiento-de-datos-de-acciones-de-alerta' into 'develop'
Ent 12298 error en almacenamiento de datos de acciones de alerta

See merge request artica/pandorafms!6597
2023-11-27 10:23:58 +00:00
Daniel Maya 3d3cbd5e96 9753 Fixed group list 2023-11-27 09:39:56 +01:00
Jorge Rincon 2c0a88f7da Merge branch 'develop' into ent-11691-15801-feature-token-para-ignorar-desconocidos-en-grafica-simple 2023-11-27 09:14:04 +01:00
miguel angel rasteu 262affeb74 Merge branch 'develop' into ent-12138-eliminar-agent-access-graph 2023-11-27 08:18:35 +01:00
Jorge Rincon 1f51b0475e #12201 Added configuration in the setup for easter egg 2023-11-24 13:12:12 +01:00
alejandro.campos@artica.es a1916dc4b9 implement demo data load 2023-11-24 12:56:21 +01:00
Jonathan e812d52f8b #12341 remove security switch 2023-11-24 10:54:48 +01:00
alejandro.campos@artica.es c7770ec4f1 implement demo data load 2023-11-23 17:59:22 +01:00
Jonathan fafe4bc9b4 #10316 new function return_agent_macros 2023-11-23 17:21:37 +01:00
Daniel Cebrian c16992f69a #12517 hide allowlist if token is disabled 2023-11-23 15:29:26 +01:00
miguel angel rasteu 1b09f61aab #11495 Resolve conflict 2023-11-23 09:31:04 +01:00
Jonathan 4f707a5a1b Merge branch 'develop' into ent-11705-15916-campo-editable-en-vista-de-eventos 2023-11-23 09:27:46 +01:00
Daniel Cebrian 8350bdcec8 #12253 fixed input order 2023-11-22 16:41:20 +01:00
Daniel Cebrian 5996af094e Merge branch 'ent-12250-informe-detallado-de-seguridad' into ent-12253-informe-de-vulnerabilidades 2023-11-22 16:36:57 +01:00
Daniel Cebrian d0185c7a10 #12250 unified fields selects 2023-11-22 16:36:32 +01:00
Daniel Cebrian 7d962bc494 Merge branch 'ent-12250-informe-detallado-de-seguridad' into ent-12253-informe-de-vulnerabilidades 2023-11-22 16:33:26 +01:00