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

7658 Commits

Author SHA1 Message Date
Daniel Cebrian b1d1dbb80f #11003 fixed alerts options in metaconsole 2023-04-20 09:42:42 +02:00
Rafael Ameijeiras b070eb9094 Merge branch 'ent-10974-inverse-interval-no-queda-seteado-tras-modificar-modulos-en-agente' into 'develop' 
Ent 10974 inverse interval no queda seteado tras modificar modulos en agente

See merge request artica/pandorafms!5727
 2023-04-20 07:28:08 +00:00
alejandro.campos@artica.es b293587aa9 implemented agent deploy wizard 2023-04-19 19:25:22 +02:00
alejandro.campos@artica.es 9553c42496 implemented agent deploy wizard 2023-04-19 19:21:38 +02:00
Jorge Rincon e1e72ca882 #10955 Fixed Netscan styling bugs. Group, module templates, Description 2023-04-19 15:51:51 +02:00
Rafael Ameijeiras 3199cc484b Merge branch 'ent-10330-14989-Safe-Operation-Mode-en-Bulks-Operations-de-Metaconsola' into 'develop' 
minor fix

See merge request artica/pandorafms!5673
 2023-04-19 12:41:32 +00:00
miguel angel rasteu 77b1212076 add new icon svg 2023-04-19 10:53:52 +02:00
Jorge Rincon dcecdd5590 Fixed the first part, group control 2023-04-18 17:13:39 +02:00
Daniel Cebrian 6df1c74722 Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-04-18 15:56:59 +02:00
miguel angel rasteu 4a250fc7c0 Trimmed tag name 2023-04-18 12:51:12 +02:00
Daniel Cebrian ea1ace2c71 #9771 added new discovery in menu 2023-04-18 12:48:14 +02:00
Daniel Cebrian b6379c4075 #9771 deleted buttons for task extensions list 2023-04-18 12:25:56 +02:00
miguel angel rasteu 2387cbd352 Check variable value to show error message 2023-04-18 12:14:25 +02:00
miguel angel rasteu 4d1e043236 Add width parameter on icons images 2023-04-18 11:08:43 +02:00
Matias Didier 0300f3723d Merge branch 'ent-10941-status-de-alerta-invisible' into 'develop' 
Ent 10941 status de alerta invisible

See merge request artica/pandorafms!5720
 2023-04-18 09:00:38 +00:00
Daniel Cebrian 660127b884 #9771 new task list view 2023-04-18 10:57:42 +02:00
Jonathan 726ab896f1 #10899 remove entities from inventory custom fields 2023-04-18 09:49:35 +02:00
Jorge Rincon e33fadb8eb #10974 Warning threshold Inverse Interval and Critical threshold Inverse Interval set 2023-04-18 09:31:22 +02:00
Daniel Cebrian 8183f7aa5d Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-04-17 15:48:23 +02:00
Daniel Cebrian 8e2bcc5651 #9771 remove table tdiscovery_apps_tasks from list task 2023-04-17 15:43:35 +02:00
Rafael Ameijeiras ec772f592d Merge branch 'ent-10803-no-hay-formulario-de-perfiles-al-crear-usuario' into 'develop' 
fix profiles and users pandora_enterprise#10803

See merge request artica/pandorafms!5721
 2023-04-17 12:44:16 +00:00
Matias Didier 75a40d3c5a Merge branch 'ent-10898-error-en-la-asignacion-de-grupo-secundario' into 'develop' 
Ent 10898 error en la asignacion de grupo secundario

See merge request artica/pandorafms!5697
 2023-04-17 12:27:23 +00:00
Daniel Cebrian 59271429b3 #9771 added custom section in discovery 2023-04-17 13:40:15 +02:00
miguel angel rasteu e0437d3fbd Fix duplicate code 2023-04-17 09:23:55 +02:00
Jonathan f6be23c353 #10899 json_ucescaped_unicode to inventory manage and visual fix 2023-04-14 12:24:39 +02:00
daniel 976633bc4f fix profiles and users pandora_enterprise#10803 2023-04-14 10:02:41 +02:00
Daniel Rodriguez 895b1bea7c Merge branch 'ent-10945-timestamp-desconocido-en-vista-de-eventos' into 'develop' 
Ent 10945 timestamp desconocido en vista de eventos

See merge request artica/pandorafms!5717
 2023-04-13 14:53:45 +00:00
miguel angel rasteu 65cfb69bfc #10941 remove class table_action_buttons to make alert status visible ever 2023-04-13 15:47:45 +02:00
Rafael Ameijeiras 357893d2c0 Merge branch 'ent-10911-icono-de-borrar-enorme-en-edicion-de-elementos-de-custom-report' into 'develop' 
Ent 10911 icono de borrar enorme en edicion de elementos de custom report

See merge request artica/pandorafms!5718
 2023-04-13 13:06:07 +00:00
miguel angel rasteu 10c7d4dddb #15263 created filter for modules 2023-04-13 13:54:11 +02:00
miguel angel rasteu b043717df5 #15263 created filter for modules 2023-04-13 13:49:05 +02:00
Jonathan 85052a948d #10911 fix visual delete icon size 2023-04-13 12:30:07 +02:00
Daniel Maya a8277dc19f #10945 Fix timestamp 2023-04-13 12:25:18 +02:00
Jorge Rincon 53d813fa0b #10353 Removed name validation for new network components 2023-04-13 11:36:57 +02:00
miguel angel rasteu c26db22fa5 #10563 Move menu item Links from Management to Operation. Add button in setup to global disable the Feedback functionality 2023-04-13 11:07:09 +02:00
Jonathan 7d9fb5c77a #10730 Regular expresion inventory reports 2023-04-13 10:42:37 +02:00
Daniel Cebrian 60700000fe Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-04-12 18:28:55 +02:00
alejandro.campos@artica.es 23f0ffdf9e Keep In process status for new events with same extra id 2023-04-12 17:46:10 +02:00
alejandro.campos@artica.es 2ca27ae15d Keep In process status for new events with same extra id 2023-04-12 17:32:52 +02:00
Daniel Rodriguez 7ae8f185b0 Merge branch 'ent-10909-se-han-roto-los-iconos-de-grupo-de-agentes-en-v770' into 'develop' 
Ent 10909 se han roto los iconos de grupo de agentes en v770

See merge request artica/pandorafms!5701
 2023-04-12 15:29:44 +00:00
Daniel Maya a42c235cab #10917 Fix icon 2023-04-12 14:44:01 +02:00
Jorge Rincon 32c8109cbe #10266 added tip visual setup option in Open version 2023-04-12 14:17:10 +02:00
Daniel Maya 2bb016474a #10909 Fix icon group 2 2023-04-12 13:37:51 +02:00
Matias Didier 5a38024e25 Merge branch 'ent-10320-no-pide-confirmacion-al-eliminar-usuario' into 'develop' 
Ent 10320 no pide confirmacion al eliminar usuario

See merge request artica/pandorafms!5678
 2023-04-12 11:03:01 +00:00
Daniel Cebrian 3652317270 Merge branch 'develop' 2023-04-12 12:37:39 +02:00
Daniel Maya d006bc3c3a #10909 Fix icon group 2023-04-12 12:23:54 +02:00
Matias Didier ad3f1dd8d6 Merge branch 'ent-10526-derivado-del-trabajo-de-q-a-en-ticket-https-brutus-artica-es-8081-artica-pandora_enterprise' into 'develop' 
Ent 10526 derivado del trabajo de q a en ticket https brutus artica es 8081 artica pandora enterprise

See merge request artica/pandorafms!5691
 2023-04-12 10:16:24 +00:00
Jonathan 1a05c71e78 #10526 fix create module dialog 2023-04-12 10:44:20 +02:00
Jonathan aa9fefd30c #10899 entities inventory and correction visual style 2023-04-12 10:25:35 +02:00
Matias Didier 310496f135 Merge branch 'ent-10258-bug-en-edicion-de-accion-mail-to-admin' into 'develop' 
Ent 10258 bug en edicion de accion mail to admin

See merge request artica/pandorafms!5680
 2023-04-12 07:47:35 +00:00
Pablo Aragon c21397476e 10898-Assign secondary groups in agent view 2023-04-12 08:21:26 +02:00
Jonathan 2164e0d9a2 #10526 tree view modal show on create agent 2023-04-11 14:57:53 +02:00
Daniel Rodriguez 57c6788a19 Merge branch 'ent-10891-no-tenemos-local-components-en-open' into 'develop' 
Ent 10891 no tenemos local components en open

See merge request artica/pandorafms!5685
 2023-04-11 12:26:31 +00:00
Jonathan f98303b3ba #10891 Local components for enterprise menu 2023-04-11 12:14:18 +02:00
alejandro.campos@artica.es db663be86d minor fix 2023-04-11 10:30:40 +02:00
Pablo Aragon 564085ee01 10258-Event mail to admin 2023-04-11 09:52:49 +02:00
Pablo Aragon a3ed2b1f6b 10320-Confirm delete user 2023-04-10 16:10:44 +02:00
Pablo Aragon bf76104350 10327-Change snmp_version when network_component change 2023-04-10 15:41:18 +02:00
alejandro.campos@artica.es 3b7e57c93f implemented massive edition of safe operation mode 2023-04-10 12:33:18 +02:00
alejandro.campos@artica.es c2a21a42ca implemented massive edition of safe operation mode 2023-04-10 12:31:49 +02:00
alejandro.campos@artica.es 40b8bcf0eb minor fix 2023-04-10 10:48:51 +02:00
Jonathan 55fc0c57ad Merge branch 'develop' into ent-10864-conflicto-mergeo-fichero-ver_agentes-php 2023-04-10 09:24:30 +02:00
alejandro.campos@artica.es d0aa931f46 setup check to enable/disable vc item alert frame 2023-04-05 16:24:46 +02:00
Daniel Rodriguez ccadd5157a Merge branch 'ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow' into 'develop' 
Ent 7427 nexcon datos de monitorizacion con origen en netflow

See merge request artica/pandorafms!5604
 2023-04-05 11:55:20 +00:00
Jonathan 17a9d6020f #10864 Solution conflict files removed 2023-04-05 12:52:44 +02:00
alejandro.campos@artica.es 1b93472426 minor fix in cps selector 2023-04-05 12:38:23 +02:00
Daniel Cebrian 7e05b9bccb #9771 created installation system with .disco file 2023-04-05 09:24:37 +02:00
alejandro.campos@artica.es 795ccb14e6 fixed metaconsole link 2023-04-04 13:57:53 +02:00
Jimmy Olano 89aa227b98 Merge branch 'ent-10734-sistema-de-favoritos-no-actualiza-nombre-en-el-menu-lateral-del-objeto-favorito-consola-visual' into 'develop', JJOS. 
Ent 10734 sistema de favoritos no actualiza nombre en el menu lateral del objeto favorito consola visual

See merge request artica/pandorafms!5613
 2023-04-04 11:57:45 +00:00
Jonathan 99b07a2fb2 Conflict solution 2023-04-04 11:35:26 +02:00
Jonathan 000ab68327 #10490 TinyMCE Upgrade V6 2023-04-04 11:24:49 +02:00
Daniel Cebrian 5872d37d39 #9771 fixed new tables task list 2023-04-04 09:37:17 +02:00
Pablo Aragon e4c8097e9c 10402 remove passwords box & 10856 vcard 2023-04-04 09:24:29 +02:00
Daniel Cebrian 5a6cea6588 #9771 added extensions app in task list 2023-04-03 17:18:20 +02:00
Matias Didier e4b718a468 Merge branch 'ent-10839-problema-con-buscador-agentes' into 'develop' 
Ent 10839 problema con buscador agentes

See merge request artica/pandorafms!5642
 2023-04-03 06:58:55 +00:00
Jonathan 8d950c3672 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-31 13:37:59 +02:00
Jonathan e8e7dcc5ec Actions select bulk operations view 2023-03-31 13:37:43 +02:00
daniel c315a7f8c5 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-31 13:31:39 +02:00
Pablo Aragon 2f619d1ef6 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-31 10:45:43 +02:00
Pablo Aragon 426690bc35 10843 & 10844 2023-03-31 10:44:51 +02:00
Daniel Rodriguez ca16c5dd61 Merge branch 'ent-10441-control-de-cache-en-actualizaciones' into 'develop' 
Ent 10441 control de cache en actualizaciones

See merge request artica/pandorafms!5623
 2023-03-31 07:33:26 +00:00
daniel d6a1155dbb fixed styles 2023-03-31 08:45:54 +02:00
daniel 24e5fca884 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-30 17:34:06 +02:00
Pablo Aragon 3a2cbb7a62 Datatables & styles fix 2023-03-30 16:50:30 +02:00
Matias Didier 9344bd16c9 Merge branch 'ent-10525-15104-netflow-no-esta-mostrando-correctamente-todos-los-datos' into 'develop' 
Unified default netflow interval and deleted from console setup

See merge request artica/pandorafms!5614
 2023-03-30 12:39:06 +00:00
Daniel Maya 6bfdfa5a3b 10839 Fixed search 2023-03-30 14:09:02 +02:00
daniel f2e1b2ef57 fixed styles 2023-03-30 12:36:05 +02:00
Pablo Aragon e03e1e45ed Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-30 12:26:06 +02:00
Pablo Aragon 5e24706f71 Style fix 2023-03-30 12:25:45 +02:00
Daniel Cebrian f442272177 Merge branch 'develop' into ent-10633-pantalla-de-timeout 2023-03-30 09:30:38 +02:00
Daniel Cebrian b9fc352578 merge develop into ent-10633-pantalla-de-timeout 2023-03-30 09:15:10 +02:00
daniel 2c1301f542 fixed styles 2023-03-30 08:59:40 +02:00
daniel 1262fee2e8 fixed styles 2023-03-30 08:43:23 +02:00
alejandro.campos@artica.es e8323e4b00 several minor fixes 2023-03-29 17:45:37 +02:00
daniel 8458716ba9 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-29 17:27:57 +02:00
Pablo Aragon 2b121a2fd2 New qrcode.js version & vcard 2023-03-29 15:34:03 +02:00
Matias Didier 4297481c35 Merge branch 'ent-10819-guardia-15316-alertas-en-vista-de-alertas-tienen-icono-de-politica-sin-estar-en-ellas' into 'develop' 
Ent 10819 guardia 15316 alertas en vista de alertas tienen icono de politica sin estar en ellas

See merge request artica/pandorafms!5633
 2023-03-29 12:32:44 +00:00
Daniel Maya 3af2637a7c #10819 Fixed img 2023-03-29 13:37:07 +02:00
Diego Muñoz-Reja 35a1c2332d Merge branch 'ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob' into 'develop' 
implemented consoles management

See merge request artica/pandorafms!5558
 2023-03-28 15:33:37 +00:00
Alejandro Campos e909686ddc Merge branch 'develop' into 'ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob' 
# Conflicts:
#   pandora_console/extras/mr/62.sql
 2023-03-28 14:09:33 +00:00
Jonathan 53194f7c3d Reports visual changes 2023-03-28 11:04:52 +02:00
Jonathan 87946161f3 Solution conflict 2023-03-28 09:30:18 +02:00
Jonathan 81be0da7fd Module manager editor relations visual change 2023-03-28 09:17:47 +02:00
daniel 19ddbdc30a fixed styles 2023-03-28 08:34:05 +02:00
daniel ebffb004e9 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-27 21:22:06 +02:00
daniel 0461881420 fixed styles 2023-03-27 17:13:23 +02:00
Pablo Aragon 98f812b757 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-27 17:03:45 +02:00
Pablo Aragon 55ff0e0597 wux and wmi 2023-03-27 17:03:38 +02:00
daniel 48a254c4b2 fixed styles 2023-03-27 14:34:05 +02:00
Daniel Cebrian fd9dfcf08f Merge branch 'develop' into 'ent-10665-version-open-edicion-del-propio-usuario-y-gestion-de-usuarios-devuelve-error-500' 
# Conflicts:
#   pandora_console/install.php
 2023-03-27 11:01:24 +00:00
Daniel Cebrian aeab39737b Merge branch 'develop' into ent-10665-version-open-edicion-del-propio-usuario-y-gestion-de-usuarios-devuelve-error-500 2023-03-27 12:11:59 +02:00
daniel 3beec9bfab fixed styles 2023-03-27 11:47:08 +02:00
Jonathan 665976e011 Bulks masive visual action buttons 2023-03-27 11:10:51 +02:00
Jonathan f8aefa6e34 Merge conflict solution 2023-03-27 08:31:00 +02:00
daniel abf9fcf200 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-24 14:05:30 +01:00
daniel 25ea15fe0f fixed styles 2023-03-24 14:04:38 +01:00
Calvo c4ef22164b Merge remote-tracking branch 'origin/develop' into ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow 2023-03-24 10:38:44 +01:00
Daniel Cebrian da742bc15e #10441 added version file in js 2023-03-24 09:13:22 +01:00
Rafael Ameijeiras a30ba4cf27 Merge branch 'ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos' into 'develop' 
Ent 9624 meter soporte a sflow en nuestro gestor de flujos

See merge request artica/pandorafms!5587
 2023-03-24 07:25:52 +00:00
daniel 96d03ca31c Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-23 17:47:58 +01:00
Pablo Aragon 0fa79e44f1 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-23 17:44:16 +01:00
daniel bac1a7bf65 fixed styles 2023-03-23 17:44:06 +01:00
Pablo Aragon 122f45fcaa Metasetup 2023-03-23 17:44:04 +01:00
Daniel Rodriguez b09d65dd91 Merge branch 'ent-10010-mejorar-filtrado-logs-en-informe-de-logs' into 'develop' 
Ent 10010 mejorar filtrado logs en informe de logs

See merge request artica/pandorafms!5602
 2023-03-23 11:46:49 +00:00
daniel 95834b2de7 fixed styles 2023-03-23 12:41:39 +01:00
Pablo Aragon 8b163cd100 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-22 16:42:15 +01:00
Pablo Aragon b0b2778c4a 10760-Setup 2023-03-22 16:42:03 +01:00
Calvo 96017090ce Netflow monitoring filters forms 2023-03-22 14:22:17 +01:00
Jonathan c52ca613b2 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-22 14:22:08 +01:00
Jonathan a063c7a0ac Fix header and menu 2023-03-22 14:21:56 +01:00
daniel e82de5d6aa fixed styles 2023-03-22 14:08:03 +01:00
Calvo 784bd2dbcf Merge remote-tracking branch 'origin/develop' into ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow 2023-03-22 12:31:11 +01:00
daniel 5eaa4a10bb fixed styles 2023-03-22 11:13:56 +01:00
Rafael Ameijeiras 87421e772d Merge branch 'develop' into 'ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos' 
# Conflicts:
#   pandora_console/install.php
 2023-03-22 08:23:07 +00:00
Pablo Aragon 583ec8209c Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-21 18:12:11 +01:00
Pablo Aragon 99b845db3f progress bar 2023-03-21 18:12:02 +01:00
Jonathan e2615b9593 Visual changes header 2023-03-21 17:02:03 +01:00
Jonathan 93f5b62bd2 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-21 14:23:15 +01:00
Jonathan a960644975 Omnishell fix view 2023-03-21 14:23:12 +01:00
daniel 64fc4bcd46 fixed styles 2023-03-21 14:06:28 +01:00
Pablo Aragon e8744b5d12 10712-New login 2023-03-21 13:31:11 +01:00
Calvo a69151a3ca Merge remote-tracking branch 'origin/develop' into ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow 2023-03-21 11:23:02 +01:00
Daniel Cebrian 563e9e15c4 #9624 fixed conflics 2023-03-21 10:30:35 +01:00
Jonathan 82dd6ebb37 Metaconsole view reports change 2023-03-21 09:52:21 +01:00
Daniel Cebrian 9dea38f440 Merge branch 'develop' into ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos 2023-03-21 09:38:56 +01:00
Jonathan a1144ce7ab Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-17 13:35:46 +01:00
Jonathan de538a10cb setup Performance visual changes 2023-03-17 13:35:43 +01:00
daniel 594d34931c fixed styles 2023-03-17 13:20:58 +01:00
Daniel Cebrian b81b7ce7af #fixed in fav menu when change name the original name 2023-03-17 12:25:43 +01:00
Jonathan fd5347e893 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-17 12:15:13 +01:00
Jonathan dfbdfbaf60 Create module message error correction 2023-03-17 12:15:10 +01:00
daniel a9633085bc fixed styles 2023-03-17 12:00:51 +01:00
Calvo 284e20fc8a Unified default netflow interval and deleted from console setup 2023-03-17 10:58:58 +01:00
daniel f83acb99f0 fixed create user and add profile 2023-03-17 10:09:11 +01:00
Jonathan c219ad91c7 Visual minor fix 2023-03-17 08:53:58 +01:00
daniel 0934b75cbd fixed styles 2023-03-17 08:10:19 +01:00
daniel 3f09fd16a7 fixed styles 2023-03-16 18:51:54 +01:00
Jose Gonzalez 211f29c0f9 Websocket engine and quickshell 2023-03-16 17:49:57 +01:00
Jose Gonzalez bbb1855d81 External Tools 2023-03-16 17:38:51 +01:00
daniel a22b5479d9 fixed styles 2023-03-16 16:48:03 +01:00
Jose Gonzalez 1500edc06e Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-16 16:33:22 +01:00
Jose Gonzalez 6d37781255 Minor fixes visual styles 2023-03-16 16:33:08 +01:00
Jonathan 921e949947 cluster visual fix link 2023-03-16 16:06:03 +01:00
Jonathan d006c93297 Create update module msg error on open 2023-03-16 15:38:08 +01:00
Jose Gonzalez 9508d2d572 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-16 13:11:22 +01:00
Jose Gonzalez 8d7620e88d Setup updates 2023-03-16 13:11:11 +01:00
Pablo Aragon de93dd1c6e Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-16 12:57:59 +01:00
Pablo Aragon 260caca63a 10021, 10224, 10652, 10414 2023-03-16 12:57:48 +01:00
Jose Gonzalez 21c263c7c4 Setup views 2023-03-16 11:58:35 +01:00
Jose Gonzalez 2cf13b00a1 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-15 17:43:47 +01:00
Jose Gonzalez d2a807636e General Setup view 2023-03-15 17:43:35 +01:00
Pablo Aragon 4d6029ba3f 10408-Manage agents, Agent view 2023-03-15 17:02:25 +01:00
Jose Gonzalez e9526bf886 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-15 16:37:33 +01:00
Jose Gonzalez 84fe5695d8 Visual styles Setup view 2023-03-15 16:34:18 +01:00
Pablo Aragon 797f43ff3c Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-15 15:58:34 +01:00
Pablo Aragon bed1e34fd2 Dashboards widgets 2023-03-15 15:58:28 +01:00
Daniel Cebrian c346aefeaa #10685 changed in system fav, tips and Tactical group view 2023-03-15 12:46:09 +01:00
Jonathan 8a7b60e983 PDF changes visual 2023-03-15 09:58:56 +01:00
Daniel Cebrian 1b0477bd1f Merge branch 'develop' into ent-10633-pantalla-de-timeout 2023-03-15 09:06:00 +01:00
Calvo 4adaf31a5a Merge remote-tracking branch 'origin/develop' into ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow 2023-03-14 19:45:48 +01:00
Calvo 6950624cc9 Added new netflow server filters form 2023-03-14 18:55:43 +01:00
daniel cec81f1cc2 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 
Conflicts:
	pandora_console/extras/mr/62.sql
 2023-03-14 18:17:54 +01:00
Jose Gonzalez 49b5b8b253 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-14 18:15:35 +01:00
Jose Gonzalez 4f5d3ed924 Netflow meta 2023-03-14 18:15:31 +01:00
Jonathan c2b8554713 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-14 17:28:24 +01:00
Jonathan f9fe35e0c3 log viewer and sort reporting 2023-03-14 17:28:17 +01:00
daniel 423767a32a fixed styles 2023-03-14 17:27:01 +01:00
daniel c4f4d371cc fixed styles 2023-03-14 17:25:58 +01:00
Daniel Maya 4220ac6e4f #10010 Added full text 2023-03-14 16:27:22 +01:00
Pablo Aragon 6e4fe7bc48 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-14 14:56:52 +01:00
Pablo Aragon 658f2853f7 Dashboards widgets 2023-03-14 14:56:33 +01:00
Jose Gonzalez bd9ec31c2b User list and other fixes 2023-03-14 13:46:49 +01:00
Daniel Cebrian d315d4cda7 #10633 added token for control check conexion interval 2023-03-14 13:16:58 +01:00
Jose Gonzalez b428e77e7c User management for meta 2023-03-14 13:11:57 +01:00
Daniel Cebrian be6c15fc58 #9624 change icon sflow 2023-03-14 10:46:50 +01:00
Daniel Cebrian dff82df484 #10324 fixed deleted filter event in fav menu 2023-03-14 10:31:31 +01:00
Jose Gonzalez e71014607a 10669 fix revision 2023-03-14 09:05:59 +01:00
Daniel Cebrian e36bb1d065 Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-14 08:36:12 +01:00
Jose Gonzalez 397c4bd720 Fix plugin icon 2023-03-14 08:35:05 +01:00
Jose Gonzalez 3ab0b1c4cb Minor fixes 2023-03-14 08:04:48 +01:00
Jose Gonzalez f0a424a493 Module manager fix 2023-03-14 08:04:05 +01:00
Jose Gonzalez ca39fa8560 #10669 Fix configure_user issue 2023-03-13 21:21:25 +01:00
Jose Gonzalez 79fbab3696 Tubercles removal 2023-03-13 21:17:55 +01:00
Daniel Cebrian 721d7eaff9 #10665 fixed error 500 in user edit view 2023-03-13 18:07:04 +01:00
Jose Gonzalez fe20b4c49c Plugins view 2023-03-13 17:32:20 +01:00
Jose Gonzalez b6251edb79 Minor fix 2023-03-13 17:31:43 +01:00
Daniel Cebrian 90f0c3771f #10324 fixed deleted element fav menu 2023-03-13 17:21:28 +01:00
Pablo Aragon 51ab985784 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-13 16:14:02 +01:00
Pablo Aragon 6450100f23 Manage agent, setup view 2023-03-13 16:13:49 +01:00
Jose Gonzalez a7cfa310a3 Agents alias in header 2023-03-13 15:52:28 +01:00
Jose Gonzalez 1c85038ffa Discovery progress bars 2023-03-13 15:44:55 +01:00
Jose Gonzalez bbec6a92a4 Minor fixes 2023-03-13 09:35:12 +01:00
Daniel Cebrian 596ade6d37 #10324 added system fav in tactical view group 2023-03-13 09:14:16 +01:00
Daniel Cebrian dfa2ab818e Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-13 08:53:35 +01:00
Daniel Cebrian ca78f069f6 #9624 added support sflow 2023-03-10 17:12:38 +01:00
daniel dcfaaea016 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-10 14:50:31 +01:00
daniel 8778fcea93 fixed styles 2023-03-10 14:49:38 +01:00
alejandro.campos@artica.es 39a119d150 Merge remote-tracking branch 'origin/develop' into ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob 2023-03-10 13:29:20 +01:00
Matias Didier 7d6452554f Merge branch 'ent-10551-Al-crear-actualizar-CV-con-espacios-se-meten-entities-en-el-nombre' into 'develop' 
fixed entities

See merge request artica/pandorafms!5578
 2023-03-10 11:54:46 +00:00
Jose Gonzalez a065833117 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-10 12:48:50 +01:00
Jose Gonzalez bb6bf85537 Minor visual fixes 2023-03-10 12:48:31 +01:00
daniel 3be507ca7e fixed styles 2023-03-10 12:40:21 +01:00
Daniel Cebrian 841478a86c Merge branch 'develop' into 'ent-9073-nuevo-sistema-de-tips-de-bienvenida' 
# Conflicts:
#   pandora_console/pandoradb.sql
 2023-03-10 10:41:08 +00:00
Pablo Aragon 92e5c4efa0 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-10 08:40:48 +01:00
Pablo Aragon ae6159c7a1 Events 2023-03-10 08:40:38 +01:00
Jose Gonzalez edbc9d8f6b Icons review 2023-03-09 23:31:40 +01:00
daniel 9aa5d76963 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-09 20:00:32 +01:00
Jose Gonzalez ac1db7820c Minor fixes 2023-03-09 17:41:29 +01:00
Jose Gonzalez d4fa2831bf Inventory tab 2023-03-09 16:44:45 +01:00
Pablo Aragon cbc05f7ea0 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-09 15:15:06 +01:00
Pablo Aragon 2a97b26cfe Admin tools 2023-03-09 15:14:47 +01:00
daniel 1a63f8070a fixed styles 2023-03-09 15:06:03 +01:00
Jonathan 72a3cb0e3f Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-09 14:15:23 +01:00
Jonathan 1e2657fed3 Chart generator bug solution 2023-03-09 14:15:18 +01:00
Diego Muñoz-Reja c977188e75 Merge branch 'ent-9883-mejora-de-informes-de-inventario-de-monitorizacion' into 'develop' 
Ent 9883 mejora de informes de inventario de monitorizacion

See merge request artica/pandorafms!5490
 2023-03-09 11:28:48 +00:00
daniel f2123efa16 fixed styles 2023-03-09 11:32:50 +01:00
alejandro.campos@artica.es 4c926f1e04 fixed entities 2023-03-09 09:07:04 +01:00
alejandro.campos@artica.es 15afa2d976 Merge remote-tracking branch 'origin/develop' into ent-10551-Al-crear-actualizar-CV-con-espacios-se-meten-entities-en-el-nombre 2023-03-09 08:49:27 +01:00
daniel e21d9968e8 fixed styles 2023-03-08 19:25:25 +01:00
Pablo Aragon bb1d9c323d Admin tools 2023-03-08 17:12:15 +01:00
Jose Gonzalez c51c00f974 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-08 15:05:35 +01:00
Jose Gonzalez f5daa72c6b Scheduled downtime 2023-03-08 15:04:07 +01:00
Jose Gonzalez 0373cd3514 Scheduled downtime 2023-03-08 15:02:12 +01:00
Jonathan 862e1c0ad3 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-08 13:45:29 +01:00
Jonathan 91a708dfb8 SNMP Browser and agent module SNMP walk 2023-03-08 13:41:00 +01:00
Pablo Aragon 78eccfd73b Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-08 13:36:49 +01:00
Pablo Aragon 1a7e063c60 Alerts 2023-03-08 13:36:36 +01:00
Daniel Cebrian 11250bd59b Merge branch 'develop' into ent-9073-nuevo-sistema-de-tips-de-bienvenida 2023-03-08 13:00:18 +01:00
Daniel Cebrian 3ec11f4c9d Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-08 12:55:53 +01:00
Daniel Cebrian abf8792ec9 #9073 fixed error error for multiple io_safe_input 2023-03-08 09:13:04 +01:00
Alejandro Campos 7c9b4c6944 Merge branch 'develop' into 'ent-10551-Al-crear-actualizar-CV-con-espacios-se-meten-entities-en-el-nombre' 
# Conflicts:
#   pandora_console/godmode/reporting/map_builder.php
 2023-03-07 17:05:08 +00:00
Daniel Cebrian 27005158ba #9073 resolve conflics and bugs 2023-03-07 17:57:09 +01:00
Jose Gonzalez 5925cb0b2c Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-07 17:50:57 +01:00
Jose Gonzalez 2dbc2e801f Minor icon fixes 2023-03-07 17:24:36 +01:00
Pablo Aragon dbd565fd1d Alerts 2023-03-07 16:17:48 +01:00
Pablo Aragon 3ecbf1e4fa Alerts 2023-03-07 16:17:01 +01:00
daniel 5a41c8b61c fixed styles 2023-03-07 16:00:33 +01:00
Jose Gonzalez f7aab35082 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-07 15:59:51 +01:00
Pablo Aragon d529e6f384 Alerts 2023-03-07 15:59:36 +01:00
Jose Gonzalez 1b0fe3887f Fixed issue with spinner 2023-03-07 15:08:03 +01:00
Daniel Maya 6b9175ea0d Merge branch 'develop' into ent-9662-second-round 2023-03-07 15:05:28 +01:00
Jose Gonzalez 4ea1d697dc Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-07 15:00:40 +01:00
Jose Gonzalez 845a637082 Inventory modules forms 2023-03-07 14:59:59 +01:00
Jonathan 8dbcffaa8b Buttons and view report 2023-03-07 14:15:02 +01:00
Jose Gonzalez f01b18b965 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-07 14:11:23 +01:00
Jose Gonzalez d4f900d1a4 Manage inventory icons 2023-03-07 14:11:20 +01:00
daniel b316542044 fixed styles 2023-03-07 14:03:04 +01:00
Daniel Cebrian a4634717d8 Merge branch 'develop' into ent-9073-nuevo-sistema-de-tips-de-bienvenida 2023-03-07 13:49:39 +01:00
Daniel Cebrian fdc73be979 Merge branch 'develop' into ent-10347-vista-tactica-de-grupo 2023-03-07 13:19:52 +01:00
daniel 1db803b8f6 fixed styles 2023-03-07 12:59:34 +01:00
Jose Gonzalez dd68cc7a9e Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-07 11:48:20 +01:00
Jose Gonzalez 8f2a2f12c6 Templates view 2023-03-07 11:48:14 +01:00
Jonathan d6a461acb8 Graph container create styles 2023-03-07 11:21:25 +01:00
Jonathan 89780a7085 Container graph visual 2023-03-07 09:53:19 +01:00
Pablo Aragon 6cb78d312f Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-07 09:52:05 +01:00
Pablo Aragon 6c6943c591 Alerts 2023-03-07 09:51:53 +01:00
Jose Gonzalez 1d93c666ba Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-07 09:51:23 +01:00
Jose Gonzalez e860dea8ca Manage agent groups 2023-03-07 09:41:24 +01:00
Pablo Aragon 62afce562f Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-07 08:28:22 +01:00
Pablo Aragon 5aac1a6152 Alerts 2023-03-07 08:28:10 +01:00
daniel 70d2223a46 fixed styles 2023-03-06 17:51:49 +01:00
daniel 5ba9e0e9aa fixed styles 2023-03-06 16:21:10 +01:00
Daniel Cebrian 135793454c #9073 added images 2023-03-06 12:20:08 +01:00
Jose Gonzalez c48ec28743 Minor fixes 2023-03-06 10:35:34 +01:00
daniel 08dca1a83c fixed styles 2023-03-05 13:46:27 +01:00
daniel ff3b7001c3 fixed styles 2023-03-04 13:22:52 +01:00
Jose Gonzalez 6846961ff0 Icon updates 2023-03-03 14:50:47 +01:00
Jose Gonzalez df6dddb586 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-03 13:52:49 +01:00
Jose Gonzalez 128dc9c42c Visual console changes 2023-03-03 13:52:28 +01:00
Daniel Cebrian 00b5d3f237 #1347 added links tactical view group 2023-03-03 13:24:33 +01:00
Daniel Cebrian 7562a9253a #10347 refactoring and add link to events in graph 2023-03-03 13:13:49 +01:00
alejandro.campos@artica.es 6cee279de7 fixed entities 2023-03-03 12:49:54 +01:00
Jonathan 5d73f96823 Graphs template wizard visual change 2023-03-03 12:41:32 +01:00
Jonathan e5cbe07a86 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-03 10:12:28 +01:00
Jonathan 8d31603e44 Custom Graphs visual changes 2023-03-03 10:12:24 +01:00
Alejandro Campos 3ddb3c1034 Merge branch 'develop' into 'ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob' 
# Conflicts:
#   pandora_console/extras/mr/62.sql
#   pandora_console/pandoradb.sql
 2023-03-03 08:12:57 +00:00
daniel 5d7738a05e Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/extras/mr/62.sql
	pandora_console/include/ajax/module.php
	pandora_console/include/functions_ui.php
	pandora_console/operation/agentes/estado_agente.php
	pandora_console/operation/agentes/status_monitor.php
	pandora_console/operation/events/events.php
 2023-03-03 08:20:44 +01:00
daniel 310ad88707 fixed styles 2023-03-02 19:25:31 +01:00
Jose Gonzalez 7a11ce4145 Visual Consoles 2023-03-02 17:24:52 +01:00
Daniel Cebrian cdf359481a #10347 cleared code for apply acl permission 2023-03-02 17:06:16 +01:00
Daniel Cebrian af5a620883 #10347 fixed urls monitors and added name group 2023-03-02 16:22:25 +01:00
Jonathan 1c057773aa Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-02 14:35:05 +01:00
Jonathan dd1b58b83a Reporting Custom Graphs change visual 2023-03-02 14:35:01 +01:00
Daniel Cebrian dc6256058f #10347 added list agents in tactical view groups 2023-03-02 13:48:14 +01:00
Jose Gonzalez 9a295cf974 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-02 12:59:47 +01:00
Jose Gonzalez d65852e9aa Visual console 2023-03-02 12:59:40 +01:00
daniel 5f8e9a3e3c fixed styles 2023-03-02 12:46:47 +01:00
Daniel Cebrian a4a5650a01 #10347 added modal in heatmap agent 2023-03-02 11:10:37 +01:00
daniel ad33accfda fixed styles 2023-03-02 11:10:09 +01:00
Jonathan fdab2cff8e Merge branch 'develop' into ent-9819-crear-tip-en-consola-sonora-de-eventos 2023-03-02 08:26:53 +01:00
daniel a5e6e569e8 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 2023-03-02 08:04:00 +01:00
Daniel Cebrian ea51399460 #10347 create view tactic for groups with monitoring and alerts 2023-03-01 17:27:32 +01:00
daniel 5d0d485efa fixed styles 2023-03-01 14:18:27 +01:00
daniel 69d1bdd908 fixed styles 2023-03-01 13:44:01 +01:00
Daniel Rodriguez 23f91fa0f3 Merge branch 'ent-9962-14776-Mergear-resultados-de-ITEM-SQL-Query-de-informes-en-META' into 'develop' 
added all nodes option in sql query report item in meta

See merge request artica/pandorafms!5535
 2023-03-01 12:29:54 +00:00
Jonathan 7e4337e4f3 Reporting templates 2023-03-01 12:14:23 +01:00
daniel a758528968 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/extras/mr/62.sql
	pandora_console/include/class/AuditLog.class.php
 2023-03-01 07:56:32 +01:00
Pablo Aragon c0ab435f4f Events meta 2023-02-28 17:49:22 +01:00
Pablo Aragon 3dbe668973 Events meta 2023-02-28 17:47:49 +01:00
Jonathan 78af41b700 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-28 14:27:24 +01:00
Jonathan 8d44bb7af1 Reporting view new style 2023-02-28 14:27:18 +01:00
Diego Muñoz-Reja 44cf59bfd3 Merge branch 'ent-10253-enforcement-de-opciones-de-configuracion-aviso-en-consola' into 'develop' 
Ent 10253 enforcement de opciones de configuracion aviso en consola

See merge request artica/pandorafms!5499
 2023-02-28 12:27:54 +00:00
Jose Gonzalez 114e9a366f Networkmap 2023-02-28 10:39:31 +01:00
Jonathan d1ace9d560 SNMP filters mesage empty 2023-02-28 08:29:29 +01:00
daniel f00f974c60 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/godmode/alerts/alert_commands.php
	pandora_console/godmode/alerts/alert_templates.php
	pandora_console/godmode/groups/configure_modu_group.php
	pandora_console/godmode/groups/modu_group_list.php
	pandora_console/godmode/modules/manage_network_components.php
	pandora_console/godmode/users/user_list.php
 2023-02-28 07:32:43 +01:00
Jonathan dcdf0a5188 SNMP and reporting visual changes 2023-02-27 16:33:54 +01:00
Daniel Cebrian 3259795a0b #10559 control delete task list if not exist id 2023-02-27 16:15:34 +01:00
Matias Didier 47ec49280c Merge branch 'ent-10335-15016-edicion-comunidad-snmp-desdes-operaciones-masivas' into 'develop' 
Ent 10335 15016 edicion comunidad snmp desdes operaciones masivas

See merge request artica/pandorafms!5520
 2023-02-27 14:39:49 +00:00
Daniel Cebrian c8096d73b2 Merge branch 'develop' into ent-10253-enforcement-de-opciones-de-configuracion-aviso-en-consola 2023-02-27 14:58:25 +01:00
Daniel Cebrian 2c7d00a664 Merge branch 'develop' into ent-10253-enforcement-de-opciones-de-configuracion-aviso-en-consola 2023-02-27 13:34:41 +01:00
Jonathan 87f17890f9 SNMP visual changes 2023-02-27 12:13:38 +01:00
Matias Didier 86b7e278ad Merge branch 'ent-10493-reinicio-de-la-paginacion-al-interactuar-con-un-elemento' into 'develop' 
Ent 10493 reinicio de la paginacion al interactuar con un elemento

See merge request artica/pandorafms!5556
 2023-02-27 11:08:42 +00:00
Daniel Cebrian 08fb4e3396 #10324 fixed delete element in favmenu 2023-02-27 10:07:35 +01:00
Pablo Aragon e024658520 10454-Events 2023-02-27 09:57:17 +01:00
Jonathan 9ed46e3b52 SNMP fix view 2023-02-27 09:41:39 +01:00
Jose Gonzalez 6c97fd16a2 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-24 14:34:52 +01:00
Jose Gonzalez 4e2af1d5f2 Fixes 2023-02-24 14:34:32 +01:00
daniel 7602ec1bd8 fixed styles 2023-02-24 14:28:07 +01:00
Jose Gonzalez a6f1037c9a Minor fixes or improvements 2023-02-24 13:37:47 +01:00
Daniel Cebrian 728991ad9a #10324 delete fav menu when delete element 2023-02-24 13:36:13 +01:00
Daniel Cebrian b367284d72 Merge branch 'develop' into 'ent-10259-control-de-configuracion-en-tagent_acess' 
# Conflicts:
#   pandora_console/include/class/ConsoleSupervisor.php
 2023-02-24 11:09:16 +00:00
Jose Gonzalez 70216262a9 Minor fixes 2023-02-24 12:05:53 +01:00
Diego Muñoz-Reja 76dbaf46d2 Merge branch 'ent-10321-limitacion-del-numero-de-eventos' into 'develop' 
Ent 10321 limitacion del numero de eventos

See merge request artica/pandorafms!5513
 2023-02-24 10:06:44 +00:00
Jonathan 4be8bbd9be SNMP trap generatos create view 2023-02-24 10:30:51 +01:00
Jonathan c4a0dc1934 SNMP views 2023-02-24 09:51:55 +01:00
alejandro.campos@artica.es 25bfc49055 minor fix 2023-02-23 18:04:04 +01:00
Jonathan 831579f9c8 Conflicto solution 2023-02-23 17:10:44 +01:00
Jonathan a09c423284 SNMP views fix 2023-02-23 17:09:58 +01:00
daniel fa81a4e744 restyling 2023-02-23 15:44:01 +01:00
Daniel Cebrian 0990fe672e #10324 added system fav menu in agent and events 2023-02-23 09:48:13 +01:00
Jose Gonzalez 6180a42413 More pandora_black fixes 2023-02-22 21:19:28 +01:00
daniel e514a0efb5 fixed styles 2023-02-22 17:41:19 +01:00
Jose Gonzalez 0380e8a10c Ticket 10394 Black theme fixes 2023-02-22 16:24:11 +01:00
Jose Gonzalez ec58cb4593 Plugins view 2023-02-22 14:19:57 +01:00
daniel 8230ae616b Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/godmode/users/user_list.php
	pandora_console/operation/events/events.php
 2023-02-22 12:35:34 +01:00
Jose Gonzalez 370ee54d9f Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-22 12:16:14 +01:00
Jose Gonzalez bbde3e4181 Minor fixes 2023-02-22 12:15:17 +01:00
Matias Didier c8109dadd3 Merge branch 'ent-9523-derivado-del-trabajo-q-a-765-fe-de-errata-en-titulo-de-ventana-emergente-para-informacion-de' into 'develop' 
Ent 9523 derivado del trabajo q a 765 fe de errata en titulo de ventana emergente para informacion de

See merge request artica/pandorafms!5496
 2023-02-22 10:15:26 +00:00
Pablo Aragon 95fb797a7e 10488-Fix views reports 2023-02-22 10:33:45 +01:00
Daniel Cebrian 2b7b49db20 #10493 fixed pagination in tags 2023-02-22 09:29:55 +01:00
Daniel Cebrian 2f1060af56 #10493 fixed pagination in collection 2023-02-22 09:05:27 +01:00
Daniel Cebrian dfadbb0f80 #10493 added pagination in group module 2023-02-21 16:51:05 +01:00
Daniel Cebrian f9c3524be8 #10493 fixed pagination in profiles 2023-02-21 16:05:24 +01:00
Daniel Cebrian 2b185b5754 #10493 fixed pagination in alerts 2023-02-21 15:44:41 +01:00
alejandro.campos@artica.es 6c64ccd6d6 implemented consoles management 2023-02-21 15:32:45 +01:00
Jose Gonzalez 1d566b4d18 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-21 14:15:05 +01:00
Jose Gonzalez 2fd52eff48 Sprint 2025Feb Improve UI-UX and Resources views 2023-02-21 14:14:13 +01:00
Pablo Aragon 80818d7b6e 10489-Fix alerts edition and event response 2023-02-21 13:18:44 +01:00
Jose Gonzalez 13aa4e77f1 Fix minor issues 2023-02-20 17:49:02 +01:00
Rafael Ameijeiras 8d13e873cc Merge branch 'ent-10217-disable-admin-s-account-via-cross-site-request-forgery' into 'develop' 
Ent 10217 disable admin s account via cross site request forgery

See merge request artica/pandorafms!5503
 2023-02-20 15:03:42 +00:00
Jose Gonzalez da58e4b9e0 Ticket 10484 Fixed List Operating Systems 2023-02-20 13:02:24 +01:00
Jose Gonzalez c1f8510563 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-17 14:21:49 +01:00
Jose Gonzalez a1bf42c9f9 Ticket 10470 Agent improvements 2023-02-17 14:21:29 +01:00
Daniel Cebrian 35a1a67006 #9073 refactoring 2023-02-17 12:53:35 +01:00
Pablo Aragon 46a4ee9af2 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-17 12:53:12 +01:00
Pablo Aragon a065f4578c 9662-Login 2023-02-17 12:52:13 +01:00
Daniel Maya 320b87b77e menu bug fixes 2023-02-17 10:10:47 +01:00
Daniel Cebrian 63a23799a4 #9073 fixed image size 2023-02-16 14:17:05 +01:00
Jonathan ca39b4a4ce Conflict solution 2023-02-16 13:27:11 +01:00
Jonathan ce45469f83 Fix setup visual bugs 2023-02-16 13:16:31 +01:00
Daniel Cebrian e0b75f9829 #9073 added system profiles in tips 2023-02-16 13:14:59 +01:00
Jose Gonzalez 29ed8be0d2 Minor fix 2023-02-16 12:59:23 +01:00
Jose Gonzalez 5dc8e19d6d Include Api Token and QR code mockup 2023-02-16 12:44:11 +01:00
Jonathan 041ce5d5e8 Manage Agents delete and create required "primary group" 2023-02-16 10:59:45 +01:00
Jose Gonzalez 21a4a4ced8 Edit user fix 2023-02-16 07:44:41 +01:00
Jose Gonzalez e42c4575d5 Double authentication active 2023-02-16 07:25:26 +01:00
Daniel Cebrian 8ea9a0fc7e #9073 added system system for edit images in edit tip 2023-02-15 16:41:14 +01:00
Jose Gonzalez 8673ea57b1 Fix issues with view button in setup view 2023-02-15 16:28:40 +01:00
Daniel Cebrian 1b82af24e8 #9073 added view edit tip 2023-02-15 15:14:17 +01:00
Jose Gonzalez 38dbec8618 Fix Firefox bug 2023-02-15 14:45:28 +01:00
Daniel Cebrian 35e1e46a31 #9073 added delete tip 2023-02-15 13:11:02 +01:00
Jose Gonzalez 1b174f9cd4 Ticket 10412 Reporting builder fix 2023-02-15 12:49:31 +01:00
Daniel Cebrian 09d703f981 #9073 added images input in create tips 2023-02-15 11:58:34 +01:00
Daniel Cebrian 1ab8767c34 #9073 added section welcome tips in menu 2023-02-15 08:56:03 +01:00
Jose Gonzalez 36308b1be0 Minor visual fixes 2023-02-14 16:41:24 +01:00
Jose Gonzalez be33b2f51a Several visual fixes for fit with mockups 2023-02-14 14:06:51 +01:00
Jose Gonzalez 1d682521e9 Minor fixes in agent/module view 2023-02-14 10:41:40 +01:00
alejandro.campos@artica.es 5534771351 added all nodes option in sql query report item in meta 2023-02-14 10:24:08 +01:00
Jose Gonzalez 8f65ee4fb8 Minor fix: search submit in module list 2023-02-14 07:52:13 +01:00
Jose Gonzalez 31f6c9a9d9 Minor patches 2023-02-13 17:35:54 +01:00
Jose Gonzalez 3fdd0a08d1 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-13 14:32:40 +01:00
Daniel Maya 98f82b4ce8 #9662 Fixed discovery menu 2023-02-13 14:32:02 +01:00
Jose Gonzalez d33babd48a Fix user modification-creation 2023-02-13 14:23:31 +01:00
Jose Gonzalez d45a631ea5 Final merge with new menu 2023-02-13 10:37:37 +01:00
Jose Gonzalez 98736c1ab4 Merge 2023-02-13 10:24:07 +01:00
Jose Gonzalez d6eedf07aa Merge 2023-02-13 10:03:09 +01:00
Jose Gonzalez 6a46af495d Fix issue with dev environment starting and added button fixed id parameter 2023-02-10 13:38:47 +01:00
Daniel Maya be3c7bca6c resolved conflict 2023-02-10 11:55:45 +01:00
Jose Gonzalez 175d4b7341 Fixes in Event view and other fixes 2023-02-09 16:13:30 +01:00
Jose Gonzalez 4b592b6610 Minor fixes 2023-02-08 17:20:52 +01:00
Daniel Cebrian bcfa977f56 #10335 fixed plugin select in edit modules in bulk 2023-02-08 15:23:13 +01:00
Jose Gonzalez 4d9c6ab33a Minor fixes 2023-02-08 12:58:23 +01:00
Jose Gonzalez f14d324490 Minor fixes and improves 2023-02-08 12:43:08 +01:00
Jose Gonzalez 3a741f8ed9 Update icons and improve tables 2023-02-07 16:22:52 +01:00
Jose Gonzalez ab1d2f38f6 Changed function name 2023-02-07 15:39:53 +01:00
Jose Gonzalez e99ad97e17 Fixes and improvements 2023-02-07 15:33:29 +01:00
Daniel Maya 758f906616 #9663 menu redesing 4 2023-02-07 15:22:51 +01:00
Jose Gonzalez 8f78f89aa3 Improve views and forms 2023-02-07 13:19:40 +01:00
Daniel Cebrian 5927687ad3 #10321 create token events_per_query for limit consult sql 2023-02-07 09:49:46 +01:00
Jose Gonzalez dfdcb688d4 Improve code 2023-02-06 23:10:28 +01:00
Daniel Cebrian aedf6986b3 #10253 added console alert for control variables performance 2023-02-06 15:22:39 +01:00
Daniel Cebrian fecee4895f #10259 fixed bug in agentaccess token 2023-02-06 11:04:08 +01:00
Daniel Cebrian aaae7454fa #10259 create control for token agentaccess if agents morte than 200 2023-02-06 10:37:01 +01:00
Jose Gonzalez ac144de6d6 WIP: Minor fixes 2023-02-06 10:17:51 +01:00
Daniel Cebrian 31acafc00f #10253 Enforcement options in setup visuals and general setup 2023-02-06 09:06:34 +01:00
Jose Gonzalez a9df7e2ec5 WIP: Improve somethings 2023-02-03 16:36:04 +01:00
Jose Gonzalez e3b2ec529a Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2023-02-03 14:16:47 +01:00
Jonathan 0437e46b5b #10217 CSRF for enable/disable users 2023-02-03 14:14:44 +01:00
Daniel Cebrian af6f5efdd8 #10253 Enforcement options in configuration 2023-02-03 14:12:49 +01:00
Jose Gonzalez 0a61f6dcc7 WIP: User management View and BL 2023-02-03 14:10:26 +01:00
Jose Gonzalez b9992c5a67 Minor fixes for solve visual issues 2023-02-03 12:37:09 +01:00
Pablo Aragon 54e4da7aad Merge branch 'develop' into ent-9220-verificar-y-capar-en-su-caso-que-las-colecciones-no-funcionan-en-la-nms-2 2023-02-03 10:48:42 +01:00
Rafael Ameijeiras 30a0e2abe8 Merge branch 'ent-10076-anadir-un-acceso-mas-directo-a-attachments-plugins' into 'develop' 
Ent 10076 anadir un acceso mas directo a attachments plugins

See merge request artica/pandorafms!5441
 2023-02-03 09:36:53 +00:00
Daniel Rodriguez 67a4e2b04b Merge branch 'ent-9600-Estado-erroneo-de-servidor-cuando-hay-un-TZ-distinto-entre-servidor-consola' into 'develop' 
fix server status when distinct timezones

See merge request artica/pandorafms!5439
 2023-02-02 16:07:02 +00:00
Jonathan 925880dbdb #9523 dialog title plugins 2023-02-02 17:06:28 +01:00
Rafael Ameijeiras 3bc593e58a Merge branch 'ent-10219-stored-cross-site-scripting-in-syslog-section' into 'develop' 
Ent 10219 stored cross site scripting in syslog section

See merge request artica/pandorafms!5464
 2023-02-02 10:02:32 +00:00
Rafael Ameijeiras ccb93c0918 Merge branch 'ent-10163-Remote-Code-Execution-via-Unrestricted-File-Upload' into 'develop' 
fixed vulnerability

See merge request artica/pandorafms!5476
 2023-02-02 10:02:15 +00:00
Pablo Aragon 1d8112ae74 9983-Changes inventory reports 2023-02-02 10:05:24 +01:00
Diego Muñoz-Reja acb7416148 Merge branch 'ent-10236-14934-module-bulk-operations-anade-dynamic-interval-a-los-modulos-a-pesar-de-estar-en-none' into 'develop' 
Ent 10236 14934 module bulk operations anade dynamic interval a los modulos a pesar de estar en none

See merge request artica/pandorafms!5471
 2023-02-01 14:17:15 +00:00
Jimmy Olano c4659f0c58 Merge branch 'ent-10126-no-permite-editar-etiqueta-en-elemento-de-consola-visual' into 'develop' 
Ent 10126 no permite editar etiqueta en elemento de consola visual

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

See merge request artica/pandorafms!5407
 2023-02-01 10:56:25 +00:00
alejandro.campos@artica.es a69f3eb0dc minor change 2023-02-01 10:24:35 +01:00
Jose Gonzalez 0363a90e1f Resolve merge issues 2023-01-31 17:35:44 +01:00
Daniel Cebrian dcb69c2cf4 Merge branch 'develop' into 'ent-10236-14934-module-bulk-operations-anade-dynamic-interval-a-los-modulos-a-pesar-de-estar-en-none' 
# Conflicts:
#   pandora_console/godmode/massive/massive_edit_modules.php
 2023-01-31 15:10:26 +00:00
Jose Gonzalez fbdd91e4ff Improve user profile list view 2023-01-31 12:59:49 +01:00
Daniel Cebrian bbb249d031 #10126 clear log 2023-01-31 12:13:57 +01:00
Jonathan b88f26500b #9819 Change labels Accoustic console 2023-01-31 08:35:47 +01:00
Jonathan 7923a5919c Merge branch 'develop' into ent-9819-crear-tip-en-consola-sonora-de-eventos 2023-01-31 08:18:17 +01:00
alejandro.campos@artica.es a0c311c110 fixed vulnerability 2023-01-30 19:47:02 +01:00
Jose Gonzalez 891e485781 Fixed users list view 2023-01-30 16:14:05 +01:00
Jose Gonzalez 0162767f6d Clean debug 2023-01-30 13:39:58 +01:00
Rafael Ameijeiras 4984599132 Merge branch 'ent-9175-13829-visualizacion-de-contrasenas-en-texto-plano-dentro-del-inspector-onenet-pakistan' into 'develop' 
Ent 9175 13829 visualizacion de contrasenas en texto plano dentro del inspector onenet pakistan

See merge request artica/pandorafms!5392
 2023-01-30 11:24:39 +00:00
Rafael Ameijeiras 24528f29e4 Merge branch 'ent-10210-14895-Valor-seleccionado-por-defecto-para-el-intervalo-dinamico-se-establece-en-5-min-cuando-aparece-como-none' into 'develop' 
fixed default value

See merge request artica/pandorafms!5459
 2023-01-30 10:31:57 +00:00
Jonathan 624463d573 #9819 change setcion menu configuration sound 2023-01-30 08:27:03 +01:00
Daniel Cebrian 0bf97acf50 #10236 fixed typed control 2023-01-27 13:39:41 +01:00
Jonathan 27b42d3137 #10076 add easy acces on directorys 2023-01-27 13:23:48 +01:00
Daniel Cebrian f62df0253f #10236 fixed dynamic_interval in bulk operations 2023-01-27 13:18:57 +01:00
Jonathan 34fede2ce1 #9819 New section configuration sound event 2023-01-27 12:42:23 +01:00
Daniel Cebrian c2a16eb311 #10219 added db_escape_string_sql for control quotes 2023-01-26 16:34:35 +01:00
Daniel Cebrian 9282aa2319 #10219 fixed xss injection in syslog 2023-01-26 16:20:25 +01:00
Rafael Ameijeiras 7c379062cf Merge branch 'ent-10160-stored-cross-site-scripting-vulnerability-in-visual-console-module' into 'develop' 
Ent 10160 stored cross site scripting vulnerability in visual console module

See merge request artica/pandorafms!5447
 2023-01-26 12:55:15 +00:00
Rafael Ameijeiras 7bdfb1a096 Merge branch 'ent-10055-introducir-aviso-de-borrado-de-modulos-hijos' into 'develop' 
Added child module delete warning

See merge request artica/pandorafms!5429
 2023-01-26 12:53:03 +00:00
alejandro.campos@artica.es 8e8db9c666 fixed default value 2023-01-26 12:36:33 +01:00
Alejandro Campos 87d09d47ca Merge branch 'develop' into 'ent-9600-Estado-erroneo-de-servidor-cuando-hay-un-TZ-distinto-entre-servidor-consola' 
# Conflicts:
#   pandora_console/extras/mr/61.sql
 2023-01-26 09:53:51 +00:00
Rafael Ameijeiras 8f88827c0b Merge branch 'ent-7936-12354-anadir-opcion-dashboard-en-home-screen-de-usuario-en-meta' into 'develop' 
Added home page dashboard to metaconsole

See merge request artica/pandorafms!5452
 2023-01-25 14:40:20 +00:00
Pablo Aragon 0ec58067ab 9220 Cast config['license_nms'] 2023-01-24 14:45:42 +01:00
Calvo 91e8cc2633 Added home page dashboard to metaconsole 2023-01-24 14:22:33 +01:00
Rafael Ameijeiras 2be4dc7960 Merge branch 'ent-9069-schedule-downtime-poner-decente-el-filtro' into 'develop' 
Ent 9069 schedule downtime poner decente el filtro

See merge request artica/pandorafms!5398
 2023-01-24 12:03:10 +00:00
Rafael Ameijeiras 1ed1b19cd0 Merge branch 'ent-9829-listado-de-dashboards-en-pantalla-de-inicio' into 'develop' 
Fix list all private dashboards on user edition

See merge request artica/pandorafms!5320
 2023-01-24 11:59:23 +00:00
Calvo 5d0826f412 Delete modules with children message 2023-01-24 12:26:49 +01:00
Pablo Aragon d2c286fc4c 9220 Conflict resolved 2023-01-24 09:50:34 +01:00
Daniel Cebrian 7163b3d853 #10160 fixed xss vulnerability in visual console name 2023-01-23 16:47:27 +01:00
Daniel Rodriguez 0a4ddc480a Merge branch 'ent-10106-borrar-sesion-de-usuario-cuando-se-borra-un-usuario' into 'develop' 
Ent 10106 borrar sesion de usuario cuando se borra un usuario

See merge request artica/pandorafms!5397
 2023-01-23 15:28:19 +00:00
Jonathan 60756ebb18 #10076 attachments-plugins icon tab 2023-01-23 13:01:31 +01:00
Jonathan aacf069acf #10076 attachments-plugins access 2023-01-23 11:19:59 +01:00
Jonathan c380a588ea #10076 attachments-plugins access 2023-01-23 11:07:34 +01:00
alejandro.campos@artica.es a2076ffd0c fix server status when distinct timezones 2023-01-20 13:11:49 +01:00
Calvo 8c071532e9 Added child module delete warning 2023-01-19 10:34:13 +01:00
Jose Gonzalez 8510629781 Treeview improvement 2023-01-19 00:31:11 +01:00
Calvo 2fc1abc893 Merge remote-tracking branch 'origin/develop' into ent-9829-listado-de-dashboards-en-pantalla-de-inicio 2023-01-18 11:33:21 +01:00
Jose Gonzalez 8c1bd2c1ee Agent module manager fixed and improve action buttons 2023-01-17 15:21:07 +01:00
Daniel Rodriguez a165eec2a1 Merge branch 'ent-8558-inventario-pasa-de-enterprise-open' into 'develop' 
Move inventory to open

See merge request artica/pandorafms!5105
 2023-01-16 13:43:19 +00:00
Jose Gonzalez 8c852fb3df Agent improvements 2023-01-16 01:28:53 +01:00
Jose Gonzalez 7277e026cd New notifications and added autoclose function 2023-01-13 14:23:48 +01:00
Pablo Aragon 4392bd7fa8 9220 Restrict access to collections with nms license 2023-01-13 12:09:15 +01:00
Calvo d8428a46a7 Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API 2023-01-13 10:12:21 +01:00
Calvo ce224d67ba Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open 2023-01-13 09:08:17 +01:00
Daniel Rodriguez 29624c92e8 Merge branch 'ent-9618-ver-la-ip-contra-la-que-se-esta-ejecutado-un-modulo-remoto-en-la-vista-de-agente' into 'develop' 
Ent 9618 ver la ip contra la que se esta ejecutado un modulo remoto en la vista de agente

See merge request artica/pandorafms!5393
 2023-01-12 12:25:35 +00:00
Daniel Cebrian aff91aa1b2 #10126 added button save in visual console 2023-01-12 12:42:48 +01:00
Pablo Aragon c503836634 Restrict access to collections with nms license 2023-01-12 12:28:40 +01:00
Daniel Cebrian 31d0cceecc #10131 fixed error 500 in module templates 2023-01-11 17:00:39 +01:00
Daniel Cebrian 0f7ffec6aa #9069 fixed style in SCHEDULED DOWNTIME form 2023-01-11 13:57:46 +01:00
Jose Gonzalez a9c4dd625c Merge develop branch 2023-01-11 13:46:15 +01:00
Jose Gonzalez 118099cd24 Minor fixes and solve issues with module templates 2023-01-11 13:02:18 +01:00
Daniel Cebrian a7fccc2f77 #10106 deleted session when user is deleted 2023-01-11 10:59:52 +01:00
Daniel Rodriguez 1ce72edf0f Merge branch 'ent-9878-meta-anadir-multiselector-de-servidores-a-la-edicion-de-filtros-de-eventos' into 'develop' 
add new field for filters events pandora_enterprise#9878

See merge request artica/pandorafms!5391
 2023-01-11 09:38:11 +00:00
Daniel Rodriguez c6f522d2bf Merge branch 'ent-9984-orden-snmp-v3-en-recon-discovery' into 'develop' 
Ent 9984 orden snmp v3 en recon discovery

See merge request artica/pandorafms!5386
 2023-01-10 16:19:29 +00:00
Daniel Rodriguez 2f4758009b Merge branch 'ent-9817-duplicado-de-perfiles-al-crear-agente' into 'develop' 
Ent 9817 duplicado de perfiles al crear agente

See merge request artica/pandorafms!5377
 2023-01-10 16:18:24 +00:00
Jose Gonzalez 4cb5055488 TODO added 2023-01-10 15:16:58 +01:00
Daniel Cebrian df87c122af added ip in modules list 2023-01-10 10:50:47 +01:00
Pablo Aragon 72acbae5a6 Hide module password value 2023-01-10 10:23:09 +01:00