Commit Graph

1377 Commits

Author SHA1 Message Date
alejandro.campos@artica.es f47e2dda8c handling synchronizer instantiation when metaconsole is merging 2023-03-06 17:27:21 +01:00
daniel 5ba9e0e9aa fixed styles 2023-03-06 16:21:10 +01:00
Jose Gonzalez e33a9bc3e4 Services TreeView 2023-03-06 13:32:21 +01:00
Daniel Cebrian 6a54b814f3 #9073 added arrow images and fixed format php 2023-03-06 13:07:39 +01:00
Jose Gonzalez 3c1c14576e Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-06 11:34:10 +01:00
Jose Gonzalez e4f63206eb Network maps minor fixes 2023-03-06 11:33:42 +01:00
Jose Gonzalez 6a35eb9950 Network map minor fixes 2023-03-06 11:12:59 +01:00
Jose Gonzalez c48ec28743 Minor fixes 2023-03-06 10:35:34 +01:00
Pablo Aragon f77f635b8d div>ul>li styles 2023-03-06 10:09:21 +01:00
daniel f6e063b981 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
	pandora_console/include/class/SnmpConsole.class.php
2023-03-06 08:09:29 +01:00
Jimmy Olano 6b55c65330 Merge branch 'ent-10092-14739-peticion-de-filtro-en-widget-tree-view' into 'develop', JJOS.
Ent 10092 14739 peticion de filtro en widget tree view

See merge request artica/pandorafms!5532
2023-03-05 22:56:35 +00:00
daniel 08dca1a83c fixed styles 2023-03-05 13:46:27 +01:00
Jimmy Olano aea0aa3fb9 Merge branch 'ent-10282-desactivar-la-edicion-de-traps-en-la-version-open' into 'develop', JJOS.
Draft: Ent 10282 desactivar la edicion de traps en la version open

See merge request artica/pandorafms!5483
2023-03-03 14:00:40 +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
Pablo Aragon 816f0f4770 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-02 17:10:01 +01:00
Pablo Aragon 0e9f7331db Ipam 2023-03-02 17:08:47 +01:00
daniel 5f8e9a3e3c fixed styles 2023-03-02 12:46:47 +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 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
daniel 8ac9df14ab fixed styles 2023-02-28 19:01:37 +01:00
Matias Didier 9def6eb6d5 Merge branch 'ent-9047-vista-de-auditoria-mejoras-funcionales-y-esteticas' into 'develop'
Ent 9047 vista de auditoria mejoras funcionales y esteticas

See merge request artica/pandorafms!5500
2023-02-28 13:28:45 +00:00
Jose Gonzalez 114e9a366f Networkmap 2023-02-28 10:39:31 +01:00
Jose Gonzalez ce5ccbec5d Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-28 09:36:21 +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
daniel f38adff73a fixed styles 2023-02-27 18:05:51 +01:00
Daniel Maya a19856b18d 10585 Fixed server log dir 2023-02-27 17:43:21 +01:00
Jose Gonzalez 973444014a Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-27 16:37:17 +01:00
Jose Gonzalez 5df442e83e Network maps improve 2023-02-27 16:37:00 +01:00
Jonathan 1d930dccc7 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-27 16:34:02 +01:00
Jonathan dcdf0a5188 SNMP and reporting visual changes 2023-02-27 16:33:54 +01: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
Pablo Aragon 32cf508633 10457-System audit log 2023-02-27 14:38:39 +01:00
daniel 12212fff02 restyling 2023-02-27 13:41:44 +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
Daniel Cebrian 5d4c61f8c4 #10253 added notify enforcement in metaconsole 2023-02-27 13:26:32 +01:00
Jonathan 87f17890f9 SNMP visual changes 2023-02-27 12:13:38 +01:00
Jonathan 74c0dbb39f SNMP black theme 2023-02-27 10:31:50 +01:00
Jonathan 9ed46e3b52 SNMP fix view 2023-02-27 09:41:39 +01:00
Daniel Maya fceddb1365 #8642 Added heatmap widget 3 2023-02-26 18:10:58 +01:00
daniel 65ed10be1a restyling 2023-02-24 13:43:34 +01:00
Jonathan 0a5571cd4d SNMP browser icons 2023-02-24 13:21:00 +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
Daniel Cebrian c7e53f5a1a #10259 resolve conflics 2023-02-24 12:07:37 +01:00
Jonathan 84e3f11b7b Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-24 12:00:12 +01:00
Jonathan c56aac317a SNMP console view fix 2023-02-24 12:00:02 +01:00
daniel afbbb57a53 restyling 2023-02-24 10:48:30 +01:00
daniel 6381aaa9a8 restyling 2023-02-24 10:18:52 +01:00
Jose Gonzalez fbca56500a TreeView minor fixes 2023-02-23 16:24:20 +01:00
daniel ff9ee7a4f0 restyling 2023-02-23 10:24:03 +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
Matias Didier 8b8414be52 Merge branch 'ent-10305-ultima-ejecucion-de-pandora-db-en-vista-about-da-53-anos-como-dato' into 'develop'
Ent 10305 ultima ejecucion de pandora db en vista about da 53 anos como dato

See merge request artica/pandorafms!5501
2023-02-21 15:31:31 +00:00
Daniel Maya 6efaa2bbc6 #8642 Added heatmap widget 2023-02-21 15:06:15 +01:00
Jimmy Olano 34f66ae6f8 Merge branch 'ent-10283-arreglar-layout-de-filtro-de-la-vista-de-consola-de-traps' into 'develop'
Ent 10283 arreglar layout de filtro de la vista de consola de traps

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

See merge request artica/pandorafms!5495
2023-02-20 16:11:29 +00:00
Jimmy Olano 30604d50a6 Merge branch 'ent-10296-anadir-hora-del-servidor-live-en-general-setup-de-la-consola' into 'develop'
Ent 10296 anadir hora del servidor live en general setup de la consola

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

See merge request artica/pandorafms!5515
2023-02-20 13:56:55 +00:00
Jose Gonzalez 8f21229246 Ticket 10467 Improve External Tools view 2023-02-20 14:50:17 +01:00
Jonathan 521f7ad0ce Menu go to images correction 2023-02-20 08:57:04 +01:00
Daniel Cebrian 864d54ee88 #9073 fixed filter title 2023-02-17 14:15:16 +01:00
Daniel Cebrian 35a1a67006 #9073 refactoring 2023-02-17 12:53:35 +01:00
Daniel Cebrian 9a0dc247c0 #9073 added preview tip 2023-02-17 11:07:28 +01:00
Daniel Cebrian 0cee40e40a #9073 create button for preview tip 2023-02-16 18:13:34 +01:00
Daniel Cebrian dce5b07109 #9073 added control image and fixed bug with language filter 2023-02-16 16:14:50 +01:00
Jonathan b8432a8a55 Search go to icons 2023-02-16 15:03:45 +01:00
Daniel Cebrian e0b75f9829 #9073 added system profiles in tips 2023-02-16 13:14:59 +01:00
Daniel Cebrian d8cfc68585 #9073 order by language tips 2023-02-15 17:51:30 +01:00
Daniel Cebrian 8ea9a0fc7e #9073 added system system for edit images in edit tip 2023-02-15 16:41:14 +01:00
Diego Muñoz-Reja e34677e5f6 Merge branch 'ent-10195-offset-de-mapas' into 'develop'
Ent 10195 offset de mapas

See merge request artica/pandorafms!5539
2023-02-15 14:34:17 +00:00
Daniel Cebrian c92c355a3e #9073 added uniqid in image 2023-02-15 15:18:41 +01:00
Daniel Cebrian 1b82af24e8 #9073 added view edit tip 2023-02-15 15:14:17 +01:00
Diego Muñoz-Reja 472ffdf443 Merge branch 'ent-10118-creacion-de-mapas-de-red' into 'develop'
Ent 10118 creacion de mapas de red

See merge request artica/pandorafms!5531
2023-02-15 12:55:43 +00:00
Daniel Cebrian 35e1e46a31 #9073 added delete tip 2023-02-15 13:11:02 +01:00
Daniel Cebrian 09d703f981 #9073 added images input in create tips 2023-02-15 11:58:34 +01:00
Daniel Maya cac9f67153 #10195 Fixed minimap drawing 2023-02-15 10:49:31 +01:00
Daniel Cebrian 1ab8767c34 #9073 added section welcome tips in menu 2023-02-15 08:56:03 +01:00
Rafael Ameijeiras f4c94e2a86 Merge branch 'ent-9509-agregar-mensaje-notificacion-de-omnishell-si-falta-libreria' into 'develop'
Omnishell error xml if YAML::Tiny not installed on agent

See merge request artica/pandorafms!5529
2023-02-14 17:00:13 +00:00
Jose Gonzalez 36308b1be0 Minor visual fixes 2023-02-14 16:41:24 +01:00
Daniel Maya ccb0cda305 #10118 changed CIDR input 2023-02-14 12:16:38 +01:00
Daniel Cebrian bdd6d2bb15 #9073 added control session 2023-02-14 11:18:39 +01:00
Daniel Cebrian ad4750c409 #9073 fixed bug in firts tips 2023-02-14 10:55:01 +01:00
Daniel Cebrian dfb93d2cf5 #9073 added token for tips in user profile configuration 2023-02-14 10:34:08 +01:00
Calvo 9c4a0f8a2b Agent library error notification 2023-02-14 09:03:51 +01:00
Daniel Maya 5b263981c4 #10118 Added group multiselector 2023-02-13 17:06:09 +01:00
Daniel Cebrian 887d2f8f18 #9073 added counter round un footer 2023-02-13 16:21:37 +01:00
Calvo a9832e9886 WIP: Added pandora notification if missing library on agent 2023-02-13 15:40:55 +01:00
Pablo Aragon feb2f3ffa2 10092-Widget tree view, Not normal status 2023-02-13 15:03:23 +01:00
Daniel Cebrian 6619cf059d #9073 added design v1 2023-02-13 13:26:49 +01:00
Daniel Rodriguez 57dd29063c Merge branch 'ent-10228-tsessions_php-crece-indefinidamente' into 'develop'
Added cookie management to api curl and wget calls

See merge request artica/pandorafms!5502
2023-02-13 09:50:41 +00:00
Jose Gonzalez 98736c1ab4 Merge 2023-02-13 10:24:07 +01:00
Daniel Cebrian e62dee1c62 #9073 create files structure 2023-02-13 10:06:14 +01:00
Jose Gonzalez d6eedf07aa Merge 2023-02-13 10:03:09 +01:00
Jonathan 7a8777dba2 #10281 snmpconsole visual correction and show/hide elements 2023-02-09 14:45:10 +01:00
Daniel Cebrian 1457dffe6c #10296 added getSystemDate in AJAXMethods 2023-02-07 10:30:22 +01:00
Daniel Cebrian a39fe577b5 #10296 added date in popup about 2023-02-07 10:21:45 +01:00
Daniel Cebrian aedf6986b3 #10253 added console alert for control variables performance 2023-02-06 15:22:39 +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 e3b2ec529a Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2023-02-03 14:16:47 +01:00
Calvo cc3d826117 Added cookie management to api curl and wget calls 2023-02-03 12:35:20 +01:00
Daniel Cebrian c133e77ce0 #10305 fixed calculate last run pandora db when report never has been executed 2023-02-03 12:23:47 +01:00
Jonathan 8d3432e7f2 #9047 REVIEW LOGS styles 2023-02-03 11:19:58 +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
Daniel Rodriguez f28a4d0f28 Merge branch 'ent-10162-stored-cross-site-scripting-special-days-module' into 'develop'
Ent 10162 stored cross site scripting special days module

See merge request artica/pandorafms!5444
2023-02-02 14:29:14 +00:00
Daniel Cebrian 18f2cee2a7 #10283 fixed filter design in snmp console 2023-02-02 11:18:47 +01:00
Daniel Cebrian 427ab4d058 #10277 remove db size in about popup 2023-02-01 17:51:31 +01:00
Daniel Cebrian f476538170 #10282 disable button edit trap in open version 2023-02-01 10:27:11 +01:00
Jose Gonzalez 0363a90e1f Resolve merge issues 2023-01-31 17:35:44 +01:00
Diego Muñoz-Reja 0aa16baf33 Merge branch 'ent-10171-14838-tokens-snmp-de-interfaz-en-performance-no-se-activan-por-defecto-en-snmp-interfaces' into 'develop'
Ent 10171 14838 tokens snmp de interfaz en performance no se activan por defecto en snmp interfaces

See merge request artica/pandorafms!5437
2023-01-31 14:48:25 +00:00
Daniel Cebrian 1f13daf2be #10233 added padding in form main wizard 2023-01-31 12:53:04 +01:00
Jonathan b88f26500b #9819 Change labels Accoustic console 2023-01-31 08:35:47 +01:00
Jose Gonzalez 6496c08f28 Polish TreeView 2023-01-30 13:39:27 +01:00
Jonathan 34fede2ce1 #9819 New section configuration sound event 2023-01-27 12:42:23 +01:00
Daniel Cebrian e8a355870e #10233 fixed filter styles in snmp interfaces wizard 2023-01-26 15:46:02 +01:00
Jose Gonzalez 17c0e78d06 Improve TreeView 2023-01-26 13:25:24 +01:00
Jonathan 83216bc4bf #8148 conflict solution 2023-01-24 16:15:22 +01:00
Pablo Aragon 0ec58067ab 9220 Cast config['license_nms'] 2023-01-24 14:45:42 +01:00
Pablo Aragon d2c286fc4c 9220 Conflict resolved 2023-01-24 09:50:34 +01:00
Daniel Cebrian 293d067a4d #10162 safe input description in special days 2023-01-23 14:44:10 +01:00
Diego Muñoz-Reja c462f389a4 Merge branch 'ent-10014-filtros-personalizados-para-logviewer' into 'develop'
Ent 10014 filtros personalizados para logviewer

See merge request artica/pandorafms!5414
2023-01-23 13:27:11 +00:00
Daniel Cebrian 290fb23cc5 #10171 fixed SNMP Interface Wizard defaults in performance when create snmp interface wizard 2023-01-20 09:31:02 +01:00
Daniel Cebrian 2816eeb003 #10009 added Recon script in create custom netscan 2023-01-19 13:46:46 +01:00
Jose Gonzalez 8510629781 Treeview improvement 2023-01-19 00:31:11 +01:00
Daniel Maya d56460c8de #10154 Fixed get_discovery_agents 2023-01-16 13:00:10 +01:00
Jonathan f3cd19c315 #10014 New filters log viewer 2023-01-16 11:34:28 +01:00
Pablo Aragon 4392bd7fa8 9220 Restrict access to collections with nms license 2023-01-13 12:09:15 +01:00
Jose Gonzalez a9c4dd625c Merge develop branch 2023-01-11 13:46:15 +01:00
Jonathan ceead626ee #8148 viewer log tables changes styles 2023-01-11 09:25:45 +01:00
Daniel Maya 0832d9613a #10052 Fixed fictional color 2023-01-10 16:40:53 +01:00
Jose Gonzalez 8421fb49ca Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2023-01-04 15:54:16 +01:00
Jonathan bc6893b83e #9362 Change sql for count modules from tagente_datos 2023-01-04 11:36:26 +01:00
Jonathan 6f2b50af56 #9362 Change getInforTAgenteDatos count alert 2023-01-04 11:16:51 +01:00
Rafael Ameijeiras b9d33a6315 Merge branch 'ent-10044-bugs-vista-snmp-traps' into 'develop'
Ent 10044 bugs vista snmp traps

See merge request artica/pandorafms!5353
2022-12-28 09:58:38 +00:00
Jonathan b666a3c308 #10044 Fix limit on rows showing on monitoring snmp console traps 2022-12-22 16:32:17 +01:00
daniel 47c503bdab Merge remote-tracking branch 'origin/develop' into ent-9554-nuevas-graficas-de-tarta-que-reemplazar-a-las-actuales-3 2022-12-21 12:51:18 +01:00
Daniel Barbero 3e071a7d33 remove phamtomjs pandora_enterprise#9554 2022-12-20 12:23:18 +01:00
Daniel Rodriguez 0f4e3d4056 Merge branch 'ent-9292-13830-vista-traps-snmp-peta-con-muchos-elementos' into 'develop'
Ent 9292 13830 vista traps snmp peta con muchos elementos

See merge request artica/pandorafms!5255
2022-12-20 10:20:26 +00:00
Daniel Maya 23407892b9 #9292 fixed issues 3 2022-12-20 10:03:45 +01:00
Jose Gonzalez b0997850f4 Fix server type icon definition 2022-12-19 16:38:47 +01:00
Daniel Maya 091dda3eea #9292 fixed issues 2 2022-12-19 16:30:41 +01:00
Daniel Maya aa34653049 #9292 fixed issues 2022-12-19 11:51:43 +01:00
alejandro.campos@artica.es 4ca220a3a7 Merge remote-tracking branch 'origin/develop' into ent-9323-14021-Modificar-el-display-de-valores-de-informe 2022-12-15 15:28:58 +01:00
Diego Muñoz-Reja 31919d4d2c Merge branch 'ent-9801-bloqueo-de-boton-en-generacion-de-ficheros-pdf-csv-json-varias-secciones' into 'develop'
Prepare download control

See merge request artica/pandorafms!5276
2022-12-12 08:29:51 +00:00
jose.gonzalez@pandorafms.com 445a8161cf Merge 2022-12-05 09:44:35 +01:00
Calvo 718be360d5 Download wait message 2022-12-02 15:40:47 +01:00
Calvo d525cb594c WIP: Download wait message 2022-12-02 09:42:24 +01:00
jose.gonzalez@pandorafms.com dccd950e9e Changes 2022-11-30 10:14:42 +01:00
Daniel Maya c0e5706d85 #9880 Fixed network usage map 2022-11-29 15:41:10 +01:00
jose.gonzalez@pandorafms.com a688182062 Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2022-11-22 17:47:02 +01:00
jose.gonzalez@pandorafms.com 8e0e249b81 Fixed views and styles 2022-11-21 14:49:07 +01:00
Calvo 43fd43d0d5 Updated php versopm notifications to php8 2022-11-15 10:29:15 +01:00
Daniel Maya 564cd837ae #9292 code refactoring 2022-11-14 17:43:35 +01:00