Commit Graph

25418 Commits

Author SHA1 Message Date
artica ab2a00b248 Auto-updated build strings. 2022-11-29 13:19:26 +01:00
artica 58ecdbd18e Updated version and build strings. 2022-11-29 13:18:16 +01:00
alejandro.campos@artica.es 2925df80e9 changed wrong count 2022-11-29 12:04:03 +01:00
alejandro.campos@artica.es 6243229345 changed wrong count 2022-11-29 11:54:25 +01:00
artica 64101bc837 Auto-updated build strings. 2022-11-29 01:00:19 +01:00
Diego Muñoz-Reja f6e880f84f Merge branch 'ent-9904-14470-Vista-erronea-tras-actualizacion' into 'develop'
fixed filter

See merge request artica/pandorafms!5293
2022-11-28 11:19:26 +00:00
Daniel Rodriguez 31e02467ce Merge branch 'ent-9927-anadir-nombre-de-release-lts-767-hope' into 'develop'
Ent 9927 anadir nombre de release lts 767 hope

See merge request artica/pandorafms!5297
2022-11-28 10:49:22 +00:00
Daniel Rodriguez 5809af9098 Merge branch 'ent-9894-error-500-ldap-con-php-function-php-8-0' into 'develop'
Ent 9894 error 500 ldap con php function php 8 0

See merge request artica/pandorafms!5290
2022-11-28 10:10:03 +00:00
Rafael Ameijeiras ee23bd1de8 Merge branch 'ent-9923-vista-de-setup-de-agentes-descuadrada-desplazada' into 'develop'
visual error pandora_enterprise#9923

See merge request artica/pandorafms!5294
2022-11-28 08:31:04 +00:00
Daniel Maya 306d0f0cf2 #9927 changed lts_name 2022-11-28 09:24:50 +01:00
José González 695f457a09 Fix issue with Database Lock. 2022-11-28 07:47:47 +00:00
artica c8df0dec0c Auto-updated build strings. 2022-11-28 01:00:16 +01:00
artica ca566d6d9b Auto-updated build strings. 2022-11-27 01:00:16 +01:00
artica f047f8bb14 Auto-updated build strings. 2022-11-26 01:00:19 +01:00
Daniel Barbero 117c2e6d5c visual error pandora_enterprise#9923 2022-11-25 14:12:11 +01:00
Rafael Ameijeiras ff82665da9 Merge branch 'ent-9901-no-se-visualizan-tags-en-tyr-saga-en-los-filtros-de-eventos' into 'develop'
Ent 9901 no se visualizan tags en tyr saga en los filtros de eventos

See merge request artica/pandorafms!5291
2022-11-25 12:29:01 +00:00
artica a276816bde Auto-updated build strings. 2022-11-25 01:00:18 +01:00
alejandro.campos@artica.es d170771905 fixed filter 2022-11-24 16:18:58 +01:00
Daniel Maya fcd918d00b #9851 Fixed background image size 2022-11-24 15:49:11 +01:00
Daniel Maya d59b587de2 #9901 Fixed tags 2022-11-24 14:04:10 +01:00
Rafael Ameijeiras bca50dc51c Merge branch 'ent-9900-Problemas-a-la-hora-de-añadir-perfiles-con-tags-en-tyr-y-parama' into 'develop'
minor fix

See merge request artica/pandorafms!5289
2022-11-24 11:46:14 +00:00
Rafael Ameijeiras f111191c86 Merge branch 'ent-9890-Error-en-masivas-de-modulos' into 'develop'
fix reference error

See merge request artica/pandorafms!5288
2022-11-24 11:45:37 +00:00
Daniel Maya 1ffac9bc80 #9894 Fixed ldap_search 2022-11-24 12:07:48 +01:00
alejandro.campos@artica.es 081e004381 minor fix 2022-11-24 11:45:26 +01:00
alejandro.campos@artica.es d564fc4022 fix reference error 2022-11-24 10:25:28 +01:00
artica 38259c9f8d Auto-updated build strings. 2022-11-24 01:00:20 +01:00
alejandro.campos@artica.es b9242b17d8 fixed bugs in meta profiles management 2022-11-23 16:29:27 +01:00
Daniel Rodriguez 33966c0ace Merge branch 'ent-9875-fallo-visual-en-el-filtro-de-eventos' into 'develop'
visual error pandora_enterprise#9875

See merge request artica/pandorafms!5282
2022-11-23 12:51:22 +00:00
alejandro.campos@artica.es cdddc07b86 changed mr 2022-11-23 12:22:19 +01:00
Jimmy Olano 38a6e59e6b Merge branch 'ent-9865-en-metaconsola-actualizar-la-notificacion-del-warp-update-para-php-8-a-partir-de-la-version-767' into 'develop'
Ent 9865 en metaconsola actualizar la notificacion del warp update para php 8 a partir de la version 767

Ref: pandora_enterprise#9865

See merge request artica/pandorafms!5285
2022-11-23 11:15:04 +00:00
Daniel Rodriguez 8e860d153b Merge branch 'ent-9874-editar-usuario-propio-admin-en-meta-da-un-error-500' into 'develop'
Ent 9874 editar usuario propio admin en meta da un error 500

See merge request artica/pandorafms!5286
2022-11-23 11:12:16 +00:00
Rafael Ameijeiras ce18775ac0 Merge branch 'ent-9501-tenencia-de-mismos-permisos-de-manera-simultanea' into 'develop'
Ent 9501 tenencia de mismos permisos de manera simultanea

See merge request artica/pandorafms!5218
2022-11-23 10:03:19 +00:00
Daniel Rodriguez fd56904ef1 Merge branch 'ent-9499-Backup-BBDD-desde-la-consola-no-esta-borrando-las-antiguas' into 'develop'
fixed backup cron task

See merge request artica/pandorafms!5241
2022-11-23 09:49:09 +00:00
Daniel Rodriguez ba4112907d Merge branch 'ent-9494-post-busqueda-de-eventos-por-custom_data-no-permite-espacios-ni-mayusculas' into 'develop'
Ent 9494 post busqueda de eventos por custom data no permite espacios ni mayusculas

See merge request artica/pandorafms!5208
2022-11-23 09:47:55 +00:00
Daniel Rodriguez 0fb90e3383 Merge branch 'ent-9861-stored-cross-site-scripting-vulnerability-in-create-event-section' into 'develop'
Fix events view XSS vulnerabilities

See merge request artica/pandorafms!5284
2022-11-23 09:46:52 +00:00
José González 001892ed5a Fix issue with empty autorefresh list 2022-11-23 09:42:12 +00:00
alejandro.campos@artica.es 743fef7d58 Merge remote-tracking branch 'origin/develop' into ent-9501-tenencia-de-mismos-permisos-de-manera-simultanea 2022-11-23 10:30:59 +01:00
alejandro.campos@artica.es 5accae9d47 minor changes 2022-11-23 10:30:53 +01:00
Luis 4729a21636 Update php_message.php 2022-11-23 07:43:41 +00:00
artica 2ef560d1a9 Auto-updated build strings. 2022-11-23 01:00:20 +01:00
alejandro.campos@artica.es f03cd5ec8c implemented link type custom field 2022-11-22 20:40:22 +01:00
alejandro.campos@artica.es b097046fc4 constraint when creating existing profiles 2022-11-22 17:09:13 +01:00
Calvo 4feb99a5f3 Update messages to php8 2022-11-22 16:32:10 +01:00
Calvo 4e9bc2d6ef Update messages to php8 2022-11-22 16:31:09 +01:00
Calvo 5aa51f28de Fix events view XSS vulnerabilities 2022-11-22 15:54:19 +01:00
Daniel Rodriguez 49d0f336fd Merge branch 'ent-9514-14202-Problemas-ACL-Enterprise-no-deja-borrar-alertas' into 'develop'
fix alert deletion from agent alerts

See merge request artica/pandorafms!5192
2022-11-22 14:04:08 +00:00
Daniel Rodriguez de9eb0551b Merge branch 'ent-9705-14417-pestanas-dentro-de-widget-events-incorrecta-visualizacion' into 'develop'
fix styles events list dashboards pandora_enterprise#9705

See merge request artica/pandorafms!5220
2022-11-22 14:03:35 +00:00
Daniel Barbero 8ddd046d3b visual error pandora_enterprise#9875 2022-11-22 14:08:40 +01:00
Diego Muñoz-Reja 2361bb9e07 Merge branch 'ent-9864-meta-filtro-de-servidor-en-eventos-no-se-guarda' into 'develop'
fixed filters pandora_enterprise#9864

See merge request artica/pandorafms!5281
2022-11-22 13:01:25 +00:00
Daniel Rodriguez 833032763d Merge branch 'ent-9822-14530-Problemas-en-Widgets-de-Dashboard' into 'develop'
minor fix

See merge request artica/pandorafms!5273
2022-11-22 12:29:37 +00:00
Daniel Maya 4e94976b9d #9494 Fixed custom data search 2022-11-22 13:24:26 +01:00
Daniel Barbero 899352443d visual error pandora_enterprise#9875 2022-11-22 13:16:50 +01:00
alejandro.campos@artica.es 767624b0c3 implemented link type custom field 2022-11-22 11:50:07 +01:00
Daniel Barbero 19f587b73a fixed filters pandora_enterprise#9864 2022-11-22 11:37:33 +01:00
Daniel Barbero d1beb5cb2d fixed filters pandora_enterprise#9864 2022-11-22 11:35:38 +01:00
Daniel Rodriguez 1a77ee9ce4 Merge branch 'ent-9716-14429-no-se-ve-primer-ultimo-evento-al-agrupar-por-extra-id' into 'develop'
fix timestamp modal event grouped by extra id pandora_enterprise#9716

See merge request artica/pandorafms!5229
2022-11-22 09:20:47 +00:00
Daniel Rodriguez 155349fbbb Merge branch 'ent-9417-bug-visual-en-acciones-extra-de-autoconfiguracion' into 'develop'
Ent 9417 bug visual en acciones extra de autoconfiguracion

See merge request artica/pandorafms!5170
2022-11-22 09:20:00 +00:00
Daniel Rodriguez 34c3f7a326 Merge branch 'ent-9487-GISS-Conteo-incorrecto-sobre-número-de-agentes-en-búsqueda-general' into 'develop'
fix count

See merge request artica/pandorafms!5194
2022-11-22 09:18:42 +00:00
Daniel Rodriguez 8963cc86d9 Merge branch 'ent-9798-13905-meta-availability-graphs-con-100-ok-muestra-grafico-en-gris' into 'develop'
fixed 24*7 availavility report pandora_enterprise#9798

See merge request artica/pandorafms!5263
2022-11-22 09:16:45 +00:00
Diego Muñoz-Reja ad812e1643 Merge branch 'ent-9620-borrado-masivo-de-elementos-en-cv-no-funciona' into 'develop'
Ent 9620 borrado masivo de elementos en cv no funciona

See merge request artica/pandorafms!5252
2022-11-22 09:16:07 +00:00
Jimmy Olano eaae19ab41 Merge branch 'ent-9683-bug-en-leyenda-de-graficas-snmp' into 'develop'
fix interfaces charts pandora_enterprise#9683

pandora_enterprise#9683

See merge request artica/pandorafms!5278
2022-11-22 00:32:10 +00:00
artica 542de85ba0 Auto-updated build strings. 2022-11-22 01:00:42 +01:00
sergio 5910002e9d #9833 Fixed general user search in open 2022-11-21 18:01:53 +01:00
Jimmy Olano 0363e94e34 Merge branch 'ent-9466-minimizar-ventana-en-configuracion-de-agente-superpone-iconos' into 'develop'
Ent 9466 minimizar ventana en configuracion de agente superpone iconos

#9466

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

See merge request artica/pandorafms!5222
2022-11-21 15:22:38 +00:00
Daniel Rodriguez e8c9683add Merge branch 'ent-9849-14554-Fallo-en-creacion-de-Custom-Graphs' into 'develop'
minor fix

See merge request artica/pandorafms!5274
2022-11-21 13:40:51 +00:00
Jimmy Olano 6565593dca Merge branch 'ent-9760-actualizar-la-notificacion-para-php-8-a-partir-de-la-version-767' into 'develop'
Updated php versopm notifications to php8

ref: pandora_enterprise#9760

See merge request artica/pandorafms!5266
2022-11-21 09:31:27 +00:00
alejandro.campos@artica.es c56787c459 visual fix 2022-11-21 09:55:35 +01:00
Luis 14745a9625 WIP:Prepare download control 2022-11-21 09:23:31 +01:00
artica a48e677b80 Auto-updated build strings. 2022-11-21 01:00:24 +01:00
artica 30768ca654 Auto-updated build strings. 2022-11-20 01:00:32 +01:00
Jimmy Olano 0da91d6372 Merge branch 'ent-9808-Derivado-del-trabajo-Q-A-766-AP1-1-0-PFMS-parametro-tags-de-get-events-devuelve-cero-eventos-a-pesar-que-existen-datos' into 'develop'
fixed api get events

Ref pandora_enterprise#9808

See merge request artica/pandorafms!5269
2022-11-19 01:06:52 +00:00
artica ffacefa06e Auto-updated build strings. 2022-11-19 01:00:45 +01:00
alejandro.campos@artica.es 1eb8b7d19e minor fix 2022-11-18 14:21:31 +01:00
Daniel Barbero a7d59fa0b3 fixed availavility report pandora_enterprise#9798 2022-11-18 14:10:06 +01:00
Daniel Barbero 4118a46b9f add new filter search events pandora_enterprise#9135 2022-11-18 14:04:54 +01:00
Daniel Rodriguez 18b8d3e0e1 Merge branch 'ent-9650-GISS-No-funciona-la-opcion-Dia-de-la-Semana-en-cron-de-modulos' into 'develop'
fixed cron execution of modules with week day setted

See merge request artica/pandorafms!5210
2022-11-18 08:35:59 +00:00
Daniel Barbero a31733ffef Merge remote-tracking branch 'origin/develop' into ent-9135-buscar-por-nombre-de-usuario-en-eventos 2022-11-18 07:51:26 +01:00
artica 616efb0f7d Auto-updated build strings. 2022-11-18 01:00:19 +01:00
alejandro.campos@artica.es eda1ace809 fix alerts fired widget 2022-11-17 12:46:37 +01:00
artica b6055908ae Auto-updated build strings. 2022-11-17 01:00:19 +01:00
Daniel Rodriguez cde26c127e Merge branch 'ent-9813-vista-ppal-de-agente-vista-heatmap-con-errores' into 'develop'
Ent 9813 vista ppal de agente vista heatmap con errores

See merge request artica/pandorafms!5268
2022-11-16 16:09:56 +00:00
Daniel Rodriguez fe6850a9c7 Merge branch 'ent-9793-imagen-de-fondo-en-consola-visual-no-carga-si-el-nombre-tiene-espacios' into 'develop'
Fix VC background with spaces on his name

See merge request artica/pandorafms!5267
2022-11-16 16:09:20 +00:00
alejandro.campos@artica.es 635eb692d1 minor fix 2022-11-16 16:43:21 +01:00
Calvo ef7ea84beb Added enterprise hook on excludedPassword funcion in open 2022-11-16 13:26:25 +01:00
Calvo b537fd042c Added enterprise hook on excludedPassword funcion in open 2022-11-16 13:20:52 +01:00
alejandro.campos@artica.es 5e510e7e12 implemented custom field 2022-11-16 10:28:50 +01:00
Calvo d8967804dd Change vc console backgroud blankspace with its entity 2022-11-16 09:32:08 +01:00
artica a225b1dd61 Auto-updated build strings. 2022-11-16 01:01:07 +01:00
alejandro.campos@artica.es a67e70f04e fixed api get events 2022-11-15 17:32:22 +01:00
Daniel Maya 5a7fcd6cc9 #9813 Fixed starmap 2022-11-15 14:18:12 +01:00
Calvo 51e832503a Fix VC background with spaces on his name 2022-11-15 13:54:57 +01:00
Calvo 43fd43d0d5 Updated php versopm notifications to php8 2022-11-15 10:29:15 +01:00
artica 2e7d5aa336 Auto-updated build strings. 2022-11-15 01:00:22 +01:00
Daniel Maya 564cd837ae #9292 code refactoring 2022-11-14 17:43:35 +01:00
Daniel Rodriguez 65ea42d8f7 Merge branch 'ent-9723-bug-con-el-get_events-de-la-api-14390' into 'develop'
fix api get events pandora_enterprise#9723

See merge request artica/pandorafms!5239
2022-11-14 11:33:59 +00:00
artica 4ecc5b9912 Auto-updated build strings. 2022-11-14 01:00:18 +01:00
artica 283f062646 Auto-updated build strings. 2022-11-13 01:00:18 +01:00
artica 24ee24be32 Auto-updated build strings. 2022-11-12 01:00:23 +01:00
alejandro.campos@artica.es a357dcfb0d updated delete files file 2022-11-11 13:20:23 +01:00
alejandro.campos@artica.es 780e6ac514 Removed transactional server 2022-11-11 12:53:41 +01:00
alejandro.campos@artica.es 6a173664d4 Removed transactional server 2022-11-11 12:09:03 +01:00
Daniel Rodriguez c18c056341 Merge branch 'ent-9796-Nuevos-cambios-en-inventario-remoto-766-no-referencian-ningun-plugin-2' into 'develop'
minor fix

See merge request artica/pandorafms!5262
2022-11-11 09:38:48 +00:00
Daniel Barbero 12b7c81620 fixed 24*7 availavility report pandora_enterprise#9798 2022-11-11 10:19:36 +01:00
Daniel Barbero e003d0d13a fixed get events API pandora_enterprise#9723 2022-11-11 08:55:20 +01:00
artica a8bb6706ca Auto-updated build strings. 2022-11-11 01:00:22 +01:00
alejandro.campos@artica.es e7bf53ee40 minor fix 2022-11-10 18:15:41 +01:00
Diego Muñoz-Reja 0a8405bc29 Merge branch 'ent-9794-14509-permisos-sobre-acciones-de-eventos-usuario' into 'develop'
fixed acl error in events list pandora_enterprise#9794

See merge request artica/pandorafms!5260
2022-11-10 15:48:36 +00:00
Daniel Barbero e10455c902 new widget datamatrix pandora_enterprise#8619 2022-11-10 16:10:50 +01:00
alejandro.campos@artica.es 4425825908 change update constraints for server plugins 2022-11-10 14:19:01 +01:00
Daniel Barbero 4385442690 fixed acl error in events list pandora_enterprise#9794 2022-11-10 13:13:44 +01:00
Daniel Barbero a246382325 fixed visual error pdf sla monthly pandora_enterprise#9789 2022-11-10 12:41:45 +01:00
edu.corral 47596dd300 ent 9557 delete private dashboards when deleting user 2022-11-10 12:14:44 +01:00
Daniel Barbero f273813869 new widget datamatrix pandora_enterprise#8619 2022-11-10 12:05:25 +01:00
Daniel Barbero ff8c0d999d Merge remote-tracking branch 'origin/develop' into ent-8619-copiando-a-grafana-2-data-table-como-widget-en-dashboard 2022-11-10 09:32:44 +01:00
Daniel Barbero c16901a5e2 fixed get events API pandora_enterprise#9723 2022-11-10 09:19:32 +01:00
artica 240bab48ec Auto-updated build strings. 2022-11-10 01:00:19 +01:00
artica dfe35f2819 Auto-updated build strings. 2022-11-09 01:00:21 +01:00
Daniel Barbero 4b4f92b11b new widget datamatrix pandora_enterprise#8619 2022-11-08 16:30:25 +01:00
artica 94ba216f81 Updated version and build strings. 2022-11-08 13:01:55 +01:00
Rafael Ameijeiras 43690d3aa6 Merge branch 'ent-9745-XSS' into 'develop'
fixed vulnerability in load of help iframes

See merge request artica/pandorafms!5245
2022-11-08 11:49:46 +00:00
edu.corral 5e224bb825 ent 9709 admin as local user 2022-11-08 11:38:45 +01:00
Daniel Barbero b8939cb624 fix api get agent criticity pandora_enterprise#9723 2022-11-08 09:00:25 +01:00
Daniel Maya 53ef84c7e5 #9765 Fixed check connection 2022-11-08 08:20:32 +01:00
Daniel Barbero 4ea2f505ab Merge remote-tracking branch 'origin/develop' into ent-9723-bug-con-el-get_events-de-la-api-14390 2022-11-08 08:17:01 +01:00
artica 778501d4bf Auto-updated build strings. 2022-11-08 01:00:31 +01:00
Daniel Rodriguez d989c68469 Merge branch 'ent-9470-bug-omnishell_client-pl-al-definir-timeouts' into 'develop'
Ent 9470 bug omnishell client pl al definir timeouts

See merge request artica/pandorafms!5243
2022-11-07 16:14:24 +00:00
Daniel Rodriguez 038195146e Merge branch 'ent-9774-XSS-reporting-dashboard-module' into 'develop'
fix xss

See merge request artica/pandorafms!5249
2022-11-07 16:06:29 +00:00
Daniel Rodriguez 3417ec9421 Merge branch 'ent-9526-Rendimiento-al-editar-informes-sql-query' into 'develop'
fix performance issue

See merge request artica/pandorafms!5199
2022-11-07 16:05:58 +00:00
Diego Muñoz-Reja f637bc12b8 Merge branch 'ent-9762-14476-reporte-de-eventos-de-todos-los-nodos-desde-metaconsola' into 'develop'
fix report agent groups pandora_enterprise#9762

See merge request artica/pandorafms!5250
2022-11-07 15:55:54 +00:00
edu.corral c092b0d941 ent 9620 massive removal of visual console items 2022-11-07 16:41:12 +01:00
Luis Calvo a40f1909e7 Fix events view coun with no pagination 2022-11-07 16:19:18 +01:00
= 58e5f7180d Fix events view coun with no pagination 2022-11-07 15:59:56 +01:00
Daniel Rodriguez 4f99d94dc0 Merge branch 'ent-9714-traducciones' into 'develop'
translates pandora_enterprise#9714

See merge request artica/pandorafms!5228
2022-11-07 13:27:51 +00:00
alejandro.campos@artica.es e3d01930b1 minor change 2022-11-07 14:13:04 +01:00
Daniel Rodriguez 7646f0629b Merge branch 'ent-8733-giss-anadir-alertas-externas-desde-varias-politicas-sin-pisar-las-anteriores' into 'develop'
multiple external alert policies pandora_enterprise#8733

See merge request artica/pandorafms!5205
2022-11-07 12:44:23 +00:00
Daniel Barbero 0b3b1c4ec0 fix report agent groups pandora_enterprise#9762 2022-11-07 11:37:26 +01:00
alejandro.campos@artica.es 75fe9dd8d3 fix xss 2022-11-07 11:26:00 +01:00
artica 883b2067db Auto-updated build strings. 2022-11-07 01:00:19 +01:00
artica f05015ab16 Auto-updated build strings. 2022-11-06 01:00:18 +01:00
artica 5c7862c4e1 Auto-updated build strings. 2022-11-05 01:00:22 +01:00
edu.corral 341fe37def ent 7914 status scaling based on time 2022-11-04 12:13:38 +01:00
Daniel Barbero 39df7fe13a Merge remote-tracking branch 'origin/develop' into ent-9714-traducciones
Conflicts:
	pandora_console/include/visual-console-client/maintenanceMode.png
	visual_console_client/src/lib/maintenanceMode.png
2022-11-04 11:14:20 +01:00
Jimmy Olano a548d2a798 Merge branch 'ent-9722-cartel-de-licencia-expirada' into 'develop'
Ent 9722 cartel de licencia expirada

#9722

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

See merge request artica/pandorafms!5237
2022-11-04 10:07:56 +00:00
edu.corral 1ff9b8c420 ent 7914 time based status scaling components 2022-11-04 09:45:06 +01:00
artica dce2b3f915 Auto-updated build strings. 2022-11-04 01:00:24 +01:00
alejandro.campos@artica.es 514b350e14 fixed performance problems 2022-11-03 18:20:39 +01:00
edu.corral ced830b52b ent 9722 exp license warning pm 2022-11-03 16:01:30 +01:00
edu.corral 1994db7f5c ent 9722 expired license warning PM 2022-11-03 15:42:13 +01:00
Daniel Rodriguez 8097001b19 Merge branch 'ent-9233-Historico-de-traps-2' into 'develop'
show historical traps in snmp console

See merge request artica/pandorafms!5235
2022-11-03 14:14:26 +00:00
Daniel Barbero ccc2e830f4 add sound events to metaconsole pandora_enterprise#8854 2022-11-03 15:12:50 +01:00
edu.corral fb4b42e6c5 ent 9722 expired license notifications 2022-11-03 13:55:06 +01:00
alejandro.campos@artica.es 2c7d7e4044 fixed vulnerability in load of help iframes 2022-11-03 13:53:10 +01:00
Daniel Rodriguez c678207f5d Merge branch 'ent-9746-error-500-en-la-edicion-de-module-groups' into 'develop'
fix error 500 in module groups pandora_enterprise#9746

See merge request artica/pandorafms!5242
2022-11-03 12:07:47 +00:00
Daniel Barbero 33b1c0ab8f add new filter pandora_enterprise#9135 2022-11-03 12:00:58 +01:00
edu.corral 5eee3ade4a ent 9722 expired license 2022-11-03 11:36:28 +01:00
Daniel Rodriguez e52da7d379 Merge branch 'ent-9105-poder-anadir-colecciones-al-satellite-server' into 'develop'
Ent 9105 poder anadir colecciones al satellite server

See merge request artica/pandorafms!5202
2022-11-03 10:28:32 +00:00
Daniel Barbero ea0274b63f fix error 500 in module groups pandora_enterprise#9746 2022-11-03 10:02:05 +01:00
artica 08f0d416cd Auto-updated build strings. 2022-11-03 01:00:24 +01:00
alejandro.campos@artica.es 92455e7ef9 fixed backup cron task 2022-11-02 17:36:17 +01:00
Daniel Barbero 0ff07d7224 add new macro event response group_contact pandora_enterprise#9246 2022-11-02 16:59:04 +01:00
Jimmy Olano 6a36fd305b Merge branch 'ent-9731-vista-de-alertas-en-agente-aplica-filtro-de-grupo-por-defecto' into 'develop'
Ent 9731 vista de alertas en agente aplica filtro de grupo por defecto

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

See merge request artica/pandorafms!5238
2022-11-02 14:58:39 +00:00
alejandro.campos@artica.es d7808f6dc3 re-sort traps if history enabled 2022-11-02 14:27:08 +01:00
alejandro.campos@artica.es 930da6c58f re-sort traps if history enabled 2022-11-02 14:25:48 +01:00
Jimmy Olano 271551c3e6 Merge branch 'ent-9717-vulnerabilidad-xss' into 'develop'
Fix XSS vulnerability

ref:pandora_enterprise#9717

See merge request artica/pandorafms!5230
2022-11-02 13:04:28 +00:00
Daniel Barbero 94fb25d104 Merge remote-tracking branch 'origin/develop' into ent-9705-14417-pestanas-dentro-de-widget-events-incorrecta-visualizacion 2022-11-02 13:42:13 +01:00
Daniel Barbero 7655c23637 fix api get events pandora_enterprise#9723 2022-11-02 13:40:23 +01:00
edu.corral ba70e8dd0d ent 7914 status scaling time based 2022-11-02 12:58:45 +01:00
edu.corral 6a9e30ae6d ent 7914 status scaling 2022-11-02 12:53:14 +01:00
Daniel Maya d44760fd08 #9731 Fixed idAgent 2022-11-02 09:41:07 +01:00
edu.corral 8d34ef88c5 ent 9722 expired licence notification 2022-11-02 09:19:15 +01:00
Daniel Barbero 19109a682e fix images maintenance mode 2022-11-02 08:14:11 +01:00
Junichi Satoh 98cc59a136 Updated Japanese console translations. 2022-11-02 15:55:00 +09:00
artica 42db6497aa Auto-updated build strings. 2022-11-02 01:00:18 +01:00
artica 91795a3078 Auto-updated build strings. 2022-11-01 01:00:24 +01:00
Daniel Rodriguez 65048966bf Merge branch 'ent-9376-Discovery-SNMP-Host-Filtro-por-interfaces-no-operativas' into 'develop'
implemented option to skip inoperative interfaces on demand

See merge request artica/pandorafms!5149
2022-10-31 15:55:29 +00:00
alejandro.campos@artica.es 8ad0bbf892 show historical traps in snmp console 2022-10-31 15:59:24 +01:00
Daniel Rodriguez d99ccaba9e Merge branch 'ent-9729-xss-en-busqueda-de-libreria-de-modulos' into 'develop'
Fix module library XSS

See merge request artica/pandorafms!5233
2022-10-31 14:12:46 +00:00
Daniel Barbero 331219ba16 Merge remote-tracking branch 'origin/develop' into ent-8733-giss-anadir-alertas-externas-desde-varias-politicas-sin-pisar-las-anteriores
Conflicts:
	pandora_console/extras/mr/58.sql
2022-10-31 14:13:45 +01:00
Daniel Rodriguez a1210c7814 Merge branch 'ent-9233-Historico-de-traps' into 'develop'
implemented trap history

See merge request artica/pandorafms!5116
2022-10-31 11:17:29 +00:00
Alejandro Campos 0889bcf142 Merge branch 'develop' into 'ent-9376-Discovery-SNMP-Host-Filtro-por-interfaces-no-operativas'
# Conflicts:
#   pandora_console/extras/mr/58.sql
2022-10-31 10:46:44 +00:00
Daniel Rodriguez 0be07d1bb4 Merge branch 'ent-9536-autoincremento-de-indices-en-la-sync-de-meta-nodo' into 'develop'
force insert with primary key pandora_enterprise#9536

See merge request artica/pandorafms!5171
2022-10-31 10:06:15 +00:00
Daniel Rodriguez 41946bfda7 Merge branch 'ent-4822-estado-de-consola-visual-mantenimiento' into 'develop'
add mode maintenance VC pandora_enterprise#4822

See merge request artica/pandorafms!5191
2022-10-31 10:02:44 +00:00
Calvo 7bdf103725 Fix module library XSS 2022-10-31 10:19:13 +01:00
artica 1288a3c00b Auto-updated build strings. 2022-10-31 01:00:17 +01:00
artica c1290bd7d0 Auto-updated build strings. 2022-10-30 01:00:19 +02:00
artica 0eb3c12cd9 Auto-updated build strings. 2022-10-29 01:00:22 +02:00
Jimmy Olano 15955d2329 Merge branch 'ent-5584-9778-nuevo-editor-masivo-de-usuarios-meta-y-nodo-post' into 'develop'
Ent 5584 9778 nuevo editor masivo de usuarios meta y nodo post

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

See merge request artica/pandorafms!5153
2022-10-28 15:18:15 +00:00
Jimmy Olano af73da2291 Merge branch 'ent-4043-proyectos-banco-de-credenciales-contrasenas-para-modulos' into 'develop'
Ent 4043 proyectos banco de credenciales contrasenas para modulos

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

See merge request artica/pandorafms!5172
2022-10-28 14:00:46 +00:00
Calvo ccc27883f6 Fix XSS vulnerability 2022-10-28 10:52:52 +02:00
Daniel Barbero 12c4217b3f fix timestamp modal event grouped by extra id pandora_enterprise#9716 2022-10-28 10:10:53 +02:00
Daniel Barbero 10750e2464 translates pandora_enterprise#9714 2022-10-28 08:35:21 +02:00
artica 0da1247d68 Auto-updated build strings. 2022-10-28 01:00:26 +02:00
Daniel Barbero 6d19391c72 fix interfaces charts pandora_enterprise#9683 2022-10-27 16:12:17 +02:00
Calvo 8a43421b49 Fix module type validadion on api set create network module 2022-10-27 15:18:15 +02:00
Calvo eed8361621 Check group and profile exist on api add permission user to group 2022-10-27 15:03:50 +02:00
edu.corral d76d46c1ab ent 9466 tip icon fix 2022-10-27 13:00:39 +02:00
Calvo a96eb2ce29 Hide meta treeview user hash 2022-10-27 12:35:31 +02:00
Ramon Novoa edc7507a55 Merge remote-tracking branch 'origin/develop' into ent-test-compile-omnishell 2022-10-27 11:51:53 +02:00
Alejandro Campos 9322e5b720 Merge branch 'develop' into 'ent-9376-Discovery-SNMP-Host-Filtro-por-interfaces-no-operativas'
# Conflicts:
#   pandora_console/extras/mr/58.sql
2022-10-27 09:50:24 +00:00
Alejandro Campos a58bc3bf08 Merge branch 'develop' into 'ent-9430-2FA-Authentication-sigue-saltando-tras-deshabilitar-en-consola'
# Conflicts:
#   pandora_console/general/register.php
2022-10-27 09:47:49 +00:00
Daniel Maya 382e74ae36 resolved conflict 2022-10-27 09:42:40 +02:00
Daniel Barbero 59f0bba7f3 fix styles events list dashboards pandora_enterprise#9705 2022-10-27 09:07:04 +02:00
artica bf6f5479e8 Auto-updated build strings. 2022-10-27 01:00:24 +02:00
alejandro.campos@artica.es 8d611a8e7f implemented float formatting and option in reports to change visualization format 2022-10-26 18:25:16 +02:00
Jimmy Olano d9c5b59eff Merge branch 'ent-9630-Bug-en-codigo-de-functions-api-php' into 'develop'
fix typo in code

Ref pandora_enterprise#9630

See merge request artica/pandorafms!5189
2022-10-26 11:02:42 +00:00
edu.corral 1a0fa24188 ent 7914 restore migration script 2022-10-26 11:04:53 +02:00
edu.corral c32da23dd0 ent 9501 user duplicated profiles 2022-10-26 10:46:20 +02:00
Daniel Barbero 17889c51c1 new image pandora_enterprise#4822 2022-10-26 09:54:55 +02:00
Diego Muñoz-Reja 00a1e74473 Merge branch 'ent-9332-13917-fallos-al-autenticarse-con-ldap-cuando-tenemos-la-contrasena-encriptada' into 'develop'
Fix entities ldap admin pass

See merge request artica/pandorafms!5217
2022-10-26 07:53:31 +00:00
Daniel Barbero 3273fc23ed Merge remote-tracking branch 'origin/develop' into ent-4822-estado-de-consola-visual-mantenimiento
Conflicts:
	pandora_console/extras/mr/58.sql
2022-10-26 09:42:02 +02:00
edu.corral 47521e7e3c ent 7914 database adjustements 2022-10-26 09:07:48 +02:00
edu.corral 90f8122232 ent 7914 table change for status scaling based on time 2022-10-26 08:51:51 +02:00
artica b1c35e7385 Auto-updated build strings. 2022-10-26 01:00:24 +02:00
Calvo 36f58579be Fix entities ldap admin pass 2022-10-25 18:46:49 +02:00
Calvo 406dac28c4 Merge remote-tracking branch 'origin/develop' into ent-9332-13917-fallos-al-autenticarse-con-ldap-cuando-tenemos-la-contrasena-encriptada 2022-10-25 17:38:31 +02:00
Calvo c2c62bae06 Fix missing parameter meta on event comments ajax 2022-10-25 17:37:56 +02:00
Daniel Rodriguez b4bf85064c Merge branch 'ent-9687-14398-ejecucion-de-codigo-en-barra-de-busqueda-de-modulos' into 'develop'
Fix vulnerabilies

See merge request artica/pandorafms!5209
2022-10-25 15:20:20 +00:00
alejandro.campos@artica.es 6dbc71713a add enable modules massive option 2022-10-25 15:52:30 +02:00
Calvo b8c2fe52b5 Added ACL to apì get tree agents plugin user and plugin pass 2022-10-25 15:33:22 +02:00
Daniel Rodriguez 8aa6ea8bc8 Merge branch 'ent-8725-lista-exclusion-passwords' into 'develop'
Added exclude words for passwords control

See merge request artica/pandorafms!5174
2022-10-25 09:07:08 +00:00
Daniel Rodriguez b6a38e1b7a Merge branch 'ent-9671-faltan-opciones-masivas-en-operaciones-con-eventos' into 'develop'
event multiple operations pandora_enterprise#9671

See merge request artica/pandorafms!5203
2022-10-25 09:05:43 +00:00
jose.gonzalez@pandorafms.com 6b1906d178 Added control for user creation 2022-10-25 09:37:49 +02:00
artica ce4fc25209 Auto-updated build strings. 2022-10-25 01:00:22 +02:00
edu.corral 66a5c8f7eb ent 7914 status scaling based on time 2022-10-24 18:04:04 +02:00
alejandro.campos@artica.es 8bf3de92ae fixed cron execution of modules with week day setted 2022-10-24 17:23:08 +02:00
Diego Muñoz-Reja aff8fdb005 Merge branch 'ent-9425-agrupar-eventos-por-id_extra' into 'develop'
new group by events for extraid pandora_enterprise#9425

See merge request artica/pandorafms!5147
2022-10-24 15:19:21 +00:00
Calvo 183d1ae120 Fix vulnerabilies 2022-10-24 16:44:10 +02:00
Daniel Maya dbe329f1de #9494 Fixed custom data 2022-10-24 15:17:02 +02:00
Daniel Maya 06967ad5d9 #5584 added in metaconsole 2022-10-24 12:03:18 +02:00
Daniel Barbero 821bdf16da fix error types php7.2 pandora_enterprise#9695 2022-10-24 09:26:22 +02:00
artica 204d711b30 Auto-updated build strings. 2022-10-24 01:00:19 +02:00
artica bd0f136dc0 Auto-updated build strings. 2022-10-23 01:00:17 +02:00
artica 4118f7656b Auto-updated build strings. 2022-10-22 01:00:24 +02:00
edu.corral 4ed96e4a6e ent 7914 warning scaling 2022-10-21 13:53:25 +02:00
Jimmy Olano d6ae6d5dbb Merge branch 'ent-9468-bug-vista-de-omnishell-boton-refresh-y-estilos' into 'develop'
Fix style issue

pandora_enterprise#9468

See merge request artica/pandorafms!5123
2022-10-21 11:48:11 +00:00
Diego Muñoz-Reja 3f37e2556c Merge branch 'ent-9457-14121-llamadas-api-no-funcionan-con-usuario-ldap-con-login-error' into 'develop'
API and LDAP remote user fix with login error fix

See merge request artica/pandorafms!5135
2022-10-21 11:24:31 +00:00
edu.corral 0f6f7b6563 ent 7914 status scaling based on time 2022-10-21 13:22:14 +02:00
edu.corral 0fd29caffe ent 7914 status scaling based on time 2022-10-21 13:10:12 +02:00
Daniel Rodriguez f57876b332 Merge branch 'ent-9591-mejoras-vista-administracion-agentes-satellite' into 'develop'
Ent 9591 mejoras vista administracion agentes satellite

See merge request artica/pandorafms!5190
2022-10-21 11:09:21 +00:00
Daniel Rodriguez a3dc8be0e5 Merge branch 'ent-9254-13891-encriptar-contrasenas-en-replicacion-de-bbdd' into 'develop'
Ent 9254 13891 encriptar contrasenas en replicacion de bbdd

See merge request artica/pandorafms!5140
2022-10-21 10:42:16 +00:00
Diego Muñoz-Reja 92c01531e7 Merge branch 'ent-9178-13815-alto-tiempo-de-espera-si-el-ldap-secundario-no-esta-disponible' into 'develop'
Added ldap timeout

See merge request artica/pandorafms!5134
2022-10-21 10:28:04 +00:00
Diego Muñoz-Reja 423d4b8763 Merge branch 'ent-9641-mejorar-heatmaps' into 'develop'
Ent 9641 mejorar heatmaps

See merge request artica/pandorafms!5196
2022-10-21 09:29:40 +00:00
Daniel Rodriguez be7a5add28 Merge branch 'ent-9460-14121-Reducir-permisos-necesarios-para-set-module-data' into 'develop'
change permissions

See merge request artica/pandorafms!5127
2022-10-21 09:27:47 +00:00
Daniel Rodriguez 77cb8be6cc Merge branch 'ent-2190-filtros-en-migracion-de-agentes-metaconsola' into 'develop'
Added id to form on html print form grid

See merge request artica/pandorafms!5181
2022-10-21 09:26:26 +00:00
José González 984fd10897 Merge branch 'develop' into 'ent-8725-lista-exclusion-passwords'
# Conflicts:
#   pandora_console/include/auth/mysql.php
2022-10-21 06:44:47 +00:00
artica e31699eed7 Auto-updated build strings. 2022-10-21 01:00:25 +02:00
Daniel Barbero 688597a006 multiple external alert policies pandora_enterprise#8733 2022-10-20 16:42:26 +02:00
Daniel Rodriguez ee0d9d92b6 Merge branch 'ent-9665-usuario-con-perfil-pandora-administrator-no-debe-poder-crear-comandos-de-alertas' into 'develop'
Ent 9665 usuario con perfil pandora administrator no debe poder crear comandos de alertas

See merge request artica/pandorafms!5200
2022-10-20 13:42:15 +00:00
Daniel Rodriguez 60a76530e0 Merge branch 'ent-9648-Notificaciones-por-defecto-en-creación-de-usuario' into 'develop'
Added control for add the notifications by default to users

See merge request artica/pandorafms!5195
2022-10-20 13:41:28 +00:00
Diego Muñoz-Reja 9bb8d4cc8b Merge branch 'ent-9166-13760-guardia-usuario-no-ve-vista-ncm' into 'develop'
Fix ACL for ncm

See merge request artica/pandorafms!4966
2022-10-20 13:02:54 +00:00
Jimmy Olano a276eb4dba Merge branch 'ent-9592-Problema-de-seguridad-con-la-gestion-de-sesiones-Limited-Authentication-bypass-in-ajax-php' into 'develop'
fixed vulnerability

Ref pandora_enterprise#9592

See merge request artica/pandorafms!5176
2022-10-20 12:10:59 +00:00
Calvo 2d71c75405 Added title to printFormAsGrid 2022-10-20 13:42:08 +02:00
alejandro.campos@artica.es 17d7261173 implement cluster in open project 2022-10-20 13:17:26 +02:00
Ramon Novoa 9f12b09fbf Move .exe files to Fit LFS. 2022-10-20 12:16:26 +02:00
Daniel Maya 89bd5ec22c #9665 Fixed button 2 2022-10-20 10:42:27 +02:00
Daniel Rodriguez 6657052308 Merge branch 'ent-9631-14357-No-se-guardan-los-cambios-en-Setup-Setup-Performance' into 'develop'
fix several problems in history db settings

See merge request artica/pandorafms!5188
2022-10-20 07:21:11 +00:00
Daniel Rodriguez 45722e9aa4 Merge branch 'ent-9612-PDF-informes-de-inventario-no-se-adapta-al-texto-y-es-ilegible' into 'develop'
workaround to avoid visual issue in PDFs

See merge request artica/pandorafms!5183
2022-10-20 07:19:26 +00:00
Daniel Rodriguez 35fcfa275f Merge branch 'ent-9117-diferencia-de-estilos-en-mouseovers-del-tree-view-de-servicios' into 'develop'
Ent 9117 diferencia de estilos en mouseovers del tree view de servicios

See merge request artica/pandorafms!5185
2022-10-20 07:13:39 +00:00
artica 61b3bc724a Auto-updated build strings. 2022-10-20 01:00:21 +02:00
alejandro.campos@artica.es 17a87392e3 minor fix 2022-10-19 18:38:27 +02:00
alejandro.campos@artica.es f87737a093 minor fix 2022-10-19 17:07:22 +02:00
alejandro.campos@artica.es 9520ce02e9 Merge branch 'ent-9592-Problema-de-seguridad-con-la-gestion-de-sesiones-Limited-Authentication-bypass-in-ajax-php' of brutus.artica.es:artica/pandorafms into ent-9592-Problema-de-seguridad-con-la-gestion-de-sesiones-Limited-Authentication-bypass-in-ajax-php 2022-10-19 16:46:31 +02:00
alejandro.campos@artica.es d707c29110 minor fix 2022-10-19 16:46:07 +02:00
Daniel Barbero 6ef3505eab event multiple operations pandora_enterprise#9671 2022-10-19 16:20:49 +02:00
Daniel Maya bfc1289ba6 #9105 Added collections satellite 2022-10-19 13:59:16 +02:00
Diego Muñoz-Reja c8e8ea61f3 Merge branch 'ent-2133-14061-recursividad-en-la-vista-de-eventos-accelya' into 'develop'
filter recursive groups in events pandora_enterprise#2133

See merge request artica/pandorafms!5155
2022-10-19 11:46:38 +00:00
Jimmy Olano aaedb39849 Merge branch 'ent-9392-no-funciona-insertar-agentes-en-paradas-planificadas' into 'develop'
Fix planned downtime issues

Ref: pandora_enterprise#9392

See merge request artica/pandorafms!5166
2022-10-19 11:00:04 +00:00
artica 95c485db38 Auto-updated build strings. 2022-10-19 01:00:22 +02:00
Calvo 11df57cd14 Fix planned downtime agent recursion bugs 2022-10-18 19:55:45 +02:00
Daniel Barbero f219a9678f minor fix 500 pandora_enterprise#9667 2022-10-18 16:55:05 +02:00
Daniel Barbero 1acb67ecad fixed multi selector pandora_enterprise#8620 2022-10-18 13:40:09 +02:00
Daniel Barbero 40dc913aca Merge remote-tracking branch 'origin/develop' into ent-8620-copiando-a-grafana-3-grouped-meter-graphs-como-widget-en-dashboard 2022-10-18 12:53:28 +02:00
Diego Muñoz-Reja dfb5776f68 Merge branch 'ent-8648-Improvement-for-SNMP-interface-wizard' into 'develop'
Added default definition for SNMP Interface Wizard

See merge request artica/pandorafms!5168
2022-10-18 09:25:17 +00:00
Daniel Maya fcb1cd24b5 #9665 Fixed button 2022-10-18 11:02:06 +02:00
Calvo 3f8e0f765a Fix adding agnents planned downtime 2022-10-18 09:52:08 +02:00
Alejandro Campos c995a5eafb Merge branch 'develop' into 'ent-9592-Problema-de-seguridad-con-la-gestion-de-sesiones-Limited-Authentication-bypass-in-ajax-php'
# Conflicts:
#   pandora_console/extras/mr/58.sql
2022-10-18 07:23:29 +00:00
Daniel Barbero 47a2e01a33 Merge remote-tracking branch 'origin/develop' into ent-2133-14061-recursividad-en-la-vista-de-eventos-accelya
Conflicts:
	pandora_console/extras/mr/58.sql
2022-10-18 07:59:26 +02:00
artica ed8b6678cd Auto-updated build strings. 2022-10-18 01:00:21 +02:00
Jimmy Olano ff4cff6f7a Merge branch 'ent-9208-Codigo-depuracion-expuesto-a-clientes' into 'develop'
Fix javascript injection in agent names

pandora_enterprise#9208

See merge request artica/pandorafms!5193
2022-10-17 17:28:39 +00:00
alejandro.campos@artica.es 08ab924160 fix performance issue 2022-10-17 18:08:48 +02:00
Daniel Rodriguez 38af75ccc1 Merge branch 'ent-9266-13916-formulario-de-registro-usuario-se-restablece-tras-error' into 'develop'
Fix user form reset if profile fails

See merge request artica/pandorafms!5137
2022-10-17 11:27:16 +00:00
Daniel Rodriguez 3ffc3c2b74 Merge branch 'ent-9434-14108-Añadir-y-eliminar-agentes-a-paradas-planificadas-CLI' into 'develop'
fixed api methods for creating and deleting scheduled downtimes agents

See merge request artica/pandorafms!5115
2022-10-17 11:26:38 +00:00
Jimmy Olano 164ccb0631 Merge branch 'ent-9519-un-widget-tipo-agent-module-view-en-un-dashboard-falla-al-agregar-mas-modulos-del-mismo-agente' into 'develop'
fixed agent/module widget pandora_enterprise#9519

pandora_enterprise#9519

See merge request artica/pandorafms!5118
2022-10-17 13:25:21 +02:00
Diego Muñoz-Reja 4c74f1bee7 Merge branch 'ent-9423-respuestas-de-evento-en-metaconsola-usan-configuracion-de-nodo' into 'develop'
fixed response events pandora_enterprise#9423

See merge request artica/pandorafms!5141
2022-10-17 10:49:01 +00:00
Calvo 391ff40c93 Fix var name misspell 2022-10-17 12:47:54 +02:00
Calvo 2251062d30 Fix user profile add bugs 2022-10-17 12:26:38 +02:00
Daniel Maya 357f9cc817 #9641 heatmap changes 3 2022-10-17 10:44:35 +02:00
Daniel Maya 0db0b50ebd #9641 heatmap changes 2 2022-10-17 10:32:28 +02:00
artica b79b7e5d57 Auto-updated build strings. 2022-10-17 01:00:17 +02:00
artica 92f0e4b709 Auto-updated build strings. 2022-10-16 01:00:17 +02:00
artica b31240a3cc Auto-updated build strings. 2022-10-15 01:00:23 +02:00
Daniel Maya f3bae30f55 #9641 heatmap changes 2022-10-14 13:53:05 +02:00
jose.gonzalez@pandorafms.com a10aa7a258 Added control for add the notifications by default to users 2022-10-14 13:29:26 +02:00
Daniel Rodriguez f7549f88cd Merge branch 'ent-9300-cambio-de-label-de-enable-sunburst-a-show-sunburst-by-default' into 'develop'
Ent 9300 cambio de label de enable sunburst a show sunburst by default

See merge request artica/pandorafms!5157
2022-10-14 11:19:00 +00:00
Daniel Rodriguez a36666f1fd Merge branch 'ent-9506-cambios-en-vista-de-usuarios-perfiles' into 'develop'
Ent 9506 cambios en vista de usuarios perfiles

See merge request artica/pandorafms!5124
2022-10-14 10:31:41 +00:00
Daniel Rodriguez 59c53b4668 Merge branch 'ent-9492-activar-password-policy-no-funciona' into 'develop'
Fix issue

See merge request artica/pandorafms!5175
2022-10-14 10:11:45 +00:00
Daniel Rodriguez af9084a4ef Merge branch 'ent-9322-token-unique-ip-da-problemas-a-la-hora-de-modificar-un-agente' into 'develop'
Fix agent edtion unique ip issues

See merge request artica/pandorafms!5145
2022-10-14 09:48:05 +00:00
Daniel Barbero 370852066f Merge remote-tracking branch 'origin/develop' into ent-8620-copiando-a-grafana-3-grouped-meter-graphs-como-widget-en-dashboard
Conflicts:
	pandora_console/include/functions_modules.php
2022-10-14 11:46:20 +02:00
Daniel Rodriguez 5a645498ea Merge branch 'ent-9493-14170-elementos-criticos-en-servicios-no-se-muestra-en-el-tree-view' into 'develop'
fixed tree view services pandora_enterprise#9493

See merge request artica/pandorafms!5111
2022-10-14 09:46:13 +00:00
Daniel Barbero 057a1466ab add mode maintenance VC pandora_enterprise#4822 2022-10-14 11:04:18 +02:00