Commit Graph

19775 Commits

Author SHA1 Message Date
Calvo 0afac84b34 Merge remote-tracking branch 'origin/develop' into ent-11607-migracion-de-discovery-bajo-demanda 2023-09-08 11:14:11 +02:00
miguel angel rasteu 9cdc7273a6 #10676 increase chars in agents name in monitor view and truncate at the end 2023-09-08 10:42:40 +02:00
Rafael Ameijeiras 885ed9747b Merge branch 'ent-11953-informe-group-report-en-meta-no-muestra-mas-nodos-que-el-1' into 'develop'
Ent 11953 informe group report en meta no muestra mas nodos que el 1

See merge request artica/pandorafms!6408
2023-09-08 07:25:04 +00:00
Rafael Ameijeiras 1014287cba Merge branch 'ent-11801-giss-y-entornos-pesados-desactivar-filtrado-por-defecto-al-acceder-a-vista-de-alertas-y-vista' into 'develop'
Ent 11801 giss y entornos pesados desactivar filtrado por defecto al acceder a vista de alertas y vista

See merge request artica/pandorafms!6384
2023-09-08 07:24:18 +00:00
artica 90d4bbf1be Auto-updated build strings. 2023-09-08 01:00:23 +02:00
alejandro.campos@artica.es f76615ba72 change 2023-09-07 17:53:31 +02:00
alejandro.campos@artica.es 318fa38721 Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada 2023-09-07 17:44:51 +02:00
Daniel Cebrian a8b107bb92 #11965 new structure for hardening 2023-09-07 17:08:27 +02:00
Daniel Cebrian 133c1676c0 Merge branch 'ent-11807-security-hardening-console-informes' into ent-11965-security-hardening-console-vistas-estaticas 2023-09-07 15:28:55 +02:00
Daniel Cebrian 907105cfcb #11807 changed order columns in report 2023-09-07 15:17:45 +02:00
Calvo b011a8127a Fix error when empty group 2023-09-07 14:30:31 +02:00
miguel angel rasteu 82bef687e1 #11993 Fix notifications mesagge token 2023-09-07 14:16:36 +02:00
Daniel Cebrian 39a44828fc Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-09-07 13:55:48 +02:00
miguel angel rasteu f624f88964 #11993 Fix setup title labels 2023-09-07 12:46:39 +02:00
Calvo 9deccd7d29 Fix OS stats for group report 2023-09-07 12:41:37 +02:00
Pablo Aragon 87c02fd0a7 11801-Resolve conflict 2023-09-07 11:08:31 +02:00
miguel angel rasteu a433a78a4c #Fix graph 2023-09-07 10:44:46 +02:00
artica b1518fb6a6 Auto-updated build strings. 2023-09-07 01:00:24 +02:00
alejandro.campos@artica.es eea6400f45 implemented os version management 2023-09-06 17:05:07 +02:00
alejandro.campos@artica.es f8911bcf9c implemented os version management 2023-09-06 17:00:16 +02:00
Daniel Cebrian e3050c2933 #11965 change css in hardening 2023-09-06 15:09:42 +02:00
miguel angel rasteu 793c953e07 #11947 Fix notification 2023-09-06 10:38:09 +02:00
Rafael Ameijeiras e3a5fe0fb6 Merge branch 'ent-10602-Inventory-Widget' into 'develop'
Ent 10602 inventory widget

See merge request artica/pandorafms!6301
2023-09-06 07:08:19 +00:00
Rafael Ameijeiras 7b7bb5d9b4 Merge branch 'ent-11840-iconos-desproporcionados-y-mal-funcionamiento-de-las-cajas-de-credenciales-el-satellite-server' into 'develop'
Ent 11840 iconos desproporcionados y mal funcionamiento de las cajas de credenciales el satellite server

See merge request artica/pandorafms!6376
2023-09-06 07:06:20 +00:00
Matias Didier 96c722b816 Merge branch 'ent-9814-nuego-item-graficas-de-capacity-planning-en-dashboard' into 'develop'
Ent 9814 nuego item graficas de capacity planning en dashboard

See merge request artica/pandorafms!6382
2023-09-06 06:56:59 +00:00
daniel fce86cb2ac Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-06 07:50:27 +02:00
artica cd4548d6ca Auto-updated build strings. 2023-09-06 01:00:23 +02:00
Calvo 351fad8f82 Fix group report metaconsole 2023-09-05 16:21:19 +02:00
Calvo 33d5dc2e76 Fix group report metaconsole 2023-09-05 15:33:20 +02:00
Calvo c0fbfda25c Merge remote-tracking branch 'origin/develop' into ent-11953-informe-group-report-en-meta-no-muestra-mas-nodos-que-el-1 2023-09-05 13:32:45 +02:00
Calvo da35e8e346 Fix group report metaconsole 2023-09-05 13:13:16 +02:00
miguel angel rasteu 4911d84c76 #11993 Fix configration users notification 2023-09-05 11:52:16 +02:00
Rafael Ameijeiras f2b99cf38e Merge branch 'ent-10639-unificacion-de-controles-de-fecha' into 'develop'
Ent 10639 unificacion de controles de fecha

See merge request artica/pandorafms!6212
2023-09-05 07:50:45 +00:00
Rafael Ameijeiras f95e0af2c9 Merge branch 'ent-11968-16139-graficas-de-histograma-se-visualizan-vacias-en-pdf' into 'develop'
Ent 11968 16139 graficas de histograma se visualizan vacias en pdf

See merge request artica/pandorafms!6399
2023-09-05 07:48:29 +00:00
Daniel Cebrian a417b15d6f Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-09-05 09:23:35 +02:00
artica c4d51a86b5 Auto-updated build strings. 2023-09-05 01:00:25 +02:00
Calvo a8a201cf19 Agents show events 24h switch checked default 2023-09-04 16:47:01 +02:00
felix.suarez 85462b3aae Add alert modules, queue and status 2023-09-04 08:46:24 -06:00
Calvo 9a42e5e333 Discovery migration. Console visual cahnges 2023-09-04 16:27:43 +02:00
Daniel Cebrian 12ebf45f87 #11965 adjust css for column with 70% in hardening 2023-09-04 16:04:26 +02:00
Rafael Ameijeiras 025aa9f72a Merge branch 'ent-11780-remote-code-execution-via-mibs-file-uploader' into 'develop'
Ent 11780 remote code execution via mibs file uploader

See merge request artica/pandorafms!6357
2023-09-04 12:59:59 +00:00
Alejandro Campos fa5af7efab Merge branch 'develop' into 'ent-10348-15022-SNMP-Console-no-muestra-Traps-de-1-hora-de-plazo-con-timezone-de-Usuario-1'
# Conflicts:
#   pandora_console/extras/mr/66.sql
2023-09-04 11:50:03 +00:00
alejandro.campos@artica.es 4b5bc0ea05 minor fix 2023-09-04 13:46:28 +02:00
Pablo Aragon e23420a3fa #11968-Fix Histogram graph pdf 2023-09-04 11:30:11 +02:00
Daniel Cebrian 586a5523b6 #11965 added new screen auditing 2023-09-04 11:07:33 +02:00
Jorge Rincon ba1a3da03a #10065 fixed checkbox switch style 2023-09-04 10:03:53 +02:00
Gorka Sanchez 2caa760634 Merge branch 'ent-11786-path-traversal-in-get_file-php' into 'develop'
Ent 11786 path traversal in get file php

See merge request artica/pandorafms!6356
2023-09-04 07:10:02 +00:00
Rafael Ameijeiras 6e60eeb09b Merge branch 'ent-11490-nuevo-widget-group-status-map' into 'develop'
Ent 11490 Nuevo widget: group status map

See merge request artica/pandorafms!6252
2023-09-04 07:05:49 +00:00
daniel 1a1087e311 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
	pandora_console/extras/mr/66.sql
2023-09-04 08:16:48 +02:00
artica d9e21b9471 Auto-updated build strings. 2023-09-04 01:00:18 +02:00
artica 153b2017d3 Auto-updated build strings. 2023-09-03 01:00:17 +02:00
artica e3ad3f6590 Auto-updated build strings. 2023-09-02 01:00:23 +02:00
Gorka Sanchez 7dcb38f382 Merge branch 'ent-11821-error-sql-en-vista-de-eventos-al-agregar-columna-de-comentarios' into 'develop'
Ent 11821 error sql en vista de eventos al agregar columna de comentarios

See merge request artica/pandorafms!6359
2023-09-01 09:24:10 +00:00
Daniel Cebrian 7e049cb1b5 #11490 fixed calculate text in firefox 2023-09-01 09:30:22 +02:00
Daniel Rodriguez aac8aa43fd Merge branch 'ent-11216-clonar-widget' into 'develop'
Ent 11216 clonar widget

See merge request artica/pandorafms!6222
2023-09-01 07:05:11 +00:00
artica 3e4aad7063 Auto-updated build strings. 2023-09-01 01:00:23 +02:00
Pablo Aragon 9010d079d3 11801-Datatables add parameter Start disabled (enable on filter) 2023-08-31 14:58:47 +02:00
Jonathan 1e22d473e6 #9814 projection graphs - module view & dashboard 2023-08-31 13:42:52 +02:00
Daniel Cebrian 075cc1d372 #11490 calculate font size in treemap 2023-08-31 13:39:52 +02:00
Gorka Sanchez 20a89db60b Merge branch 'ent-11809-error-de-colores-del-widget-event-cardboard-en-metaconsola' into 'develop'
Ent 11809 error de colores del widget event cardboard en metaconsola

See merge request artica/pandorafms!6363
2023-08-31 10:35:12 +00:00
Gorka Sanchez 6102cb5015 Merge branch 'ent-11423-nueva-herramienta-graph-analytics' into 'develop'
Ent 11423 nueva herramienta graph analytics

See merge request artica/pandorafms!6327
2023-08-31 10:30:27 +00:00
Pablo Aragon 9603f90401 11839-Add check global_block_size 2023-08-31 12:23:46 +02:00
Daniel Cebrian d90f2b8cad #11965 new view audit and hardening in menu 2023-08-31 10:47:18 +02:00
Gorka Sanchez 66eaf39645 Merge branch 'ent-10637-mejora-informe-grupo' into 'develop'
Ent 10637 mejora informe grupo

See merge request artica/pandorafms!6206
2023-08-31 06:47:57 +00:00
Gorka Sanchez d2b768c8cf Merge branch 'ent-9160-selector-de-elementos-multiple-en-consola-visual' into 'develop'
Ent 9160 selector de elementos multiple en consola visual

See merge request artica/pandorafms!6367
2023-08-31 06:46:16 +00:00
Gorka Sanchez f2f8038d99 Merge branch 'ent-11960-metaconsola-widgets-data-matrix-latest-events-modules-by-status-no-cargan' into 'develop'
Ent 11960 metaconsola widgets data matrix latest events modules by status no cargan

See merge request artica/pandorafms!6366
2023-08-31 06:40:41 +00:00
Gorka Sanchez 79857d6b71 Merge branch 'ent-11879-error-acl-cuando-no-existe-disco-nuevo-discovery' into 'develop'
Ent 11879 error acl cuando no existe disco nuevo discovery

See merge request artica/pandorafms!6369
2023-08-31 06:38:21 +00:00
artica beeacf0cf3 Auto-updated build strings. 2023-08-31 01:00:10 +02:00
Daniel Cebrian 13dbed4327 #11490 deleted name in treemap if it's empty and fixed bug in metaconsole 2023-08-30 12:37:34 +02:00
Pablo Aragon 1c83137b72 11840-Fix satellite credential boxes 2023-08-30 11:50:37 +02:00
artica d006028ce9 Updated version and build strings. 2023-08-30 09:18:04 +02:00
artica d63a304906 Auto-updated build strings. 2023-08-30 01:00:23 +02:00
Daniel Cebrian 1fa0bc0ab1 #11965 new section security in menu 2023-08-29 15:09:41 +02:00
miguel angel rasteu df6d0655d1 #11947 Fix agentaccess evaluate 2023-08-29 13:30:05 +02:00
Matias Didier 36d8f3c15a Merge branch 'ent-11952-16143-widget-list-of-latest-events-no-aplica-filtrado' into 'develop'
Ent 11952 16143 widget list of latest events no aplica filtrado

See merge request artica/pandorafms!6365
2023-08-29 11:03:34 +00:00
Pablo Aragon c61d6051b4 11952-Add event status in List of latest events 2023-08-29 12:43:33 +02:00
Jonathan 4ca9b6d8d2 Merge branch 'develop' into ent-10639-unificacion-de-controles-de-fecha 2023-08-29 12:29:41 +02:00
Jonathan 84bb4780ca #10639 new datepicker style and save filter 2023-08-29 12:17:41 +02:00
Daniel Cebrian dee5667783 Merge branch 'develop' into ent-11490-nuevo-widget-group-status-map 2023-08-29 10:57:43 +02:00
Daniel Cebrian 77c7694082 Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-08-29 10:30:05 +02:00
Jorge Rincon 601e533a3a #11879 error control is added .disco file is missing 2023-08-29 10:27:35 +02:00
Daniel Maya 287848b71c #9160 Added multi selector 2023-08-29 08:58:19 +02:00
miguel angel rasteu 32c2925515 #11780 Fix functions_filemanager 2023-08-29 08:23:06 +02:00
artica ff37a940da Auto-updated build strings. 2023-08-29 01:00:21 +02:00
Daniel Cebrian aa39c4295e #11807 fixed bugs and added new report evolution hardening 2023-08-28 15:43:59 +02:00
miguel angel rasteu 94dc07e4ca #11786 Fix get_file 2023-08-28 14:44:22 +02:00
Pablo Aragon 17bfcba735 11960-Fix url import datatables node/meta 2023-08-28 14:10:03 +02:00
Jorge Rincon 797b24af86 #10065 Added switch to filter create/edit modal. 2023-08-28 13:54:35 +02:00
miguel angel rasteu 3b6e947422 #11786 Fix get_file 2023-08-28 13:34:19 +02:00
Pablo Aragon cd430f9f3f 11952-Fix filters in List of latest events 2023-08-28 12:27:45 +02:00
miguel angel rasteu e8613dc2f0 #11780 Fix mibs upload 2023-08-28 10:45:42 +02:00
miguel angel rasteu e9a54c0133 #11786 Clean HD 2023-08-28 10:32:46 +02:00
miguel angel rasteu bd602272f8 #11786 Fix get_file and File Repository Manager 2023-08-28 10:32:13 +02:00
artica 85c2cc507f Auto-updated build strings. 2023-08-28 01:00:17 +02:00
artica 2215b3cf5c Auto-updated build strings. 2023-08-27 01:00:19 +02:00
Pablo Aragon 7b59035d1d 11809-Colors meta Event cardboard widget 2023-08-26 12:18:00 +02:00
artica c21eac1fcd Auto-updated build strings. 2023-08-26 01:00:22 +02:00
daniel ecfa71b43c ITSM pandora_enterprise#11471 2023-08-25 14:15:32 +02:00
Pablo Aragon e0c5b2777d 11821-Show events comment in table 2023-08-25 12:06:29 +02:00
Pablo Aragon fac107ca49 Merge branch 'develop' into ent-11821-error-sql-en-vista-de-eventos-al-agregar-columna-de-comentarios 2023-08-25 11:45:41 +02:00
Pablo Aragon 28316e25c3 11423-Graph analytics. Remove Group None from export filter 2023-08-25 10:33:32 +02:00
miguel angel rasteu 29a43de69a #11786 Fix get_file 2023-08-25 09:39:07 +02:00
Rafael Ameijeiras 699b170338 Merge branch 'ent-11943-dashboards-reemplaza-etiqueta-script-por-string' into 'develop'
Ent 11943 dashboards reemplaza etiqueta script por string

See merge request artica/pandorafms!6355
2023-08-25 05:57:42 +00:00
Rafael Ameijeiras f34dd7a222 Merge branch 'ent-11929-16108-paginas-con-bola-de-carga-no-terminan-de-cargar-773' into 'develop'
Ent 11929 16108 paginas con bola de carga no terminan de cargar 773

See merge request artica/pandorafms!6352
2023-08-25 05:56:43 +00:00
artica de204a055e Auto-updated build strings. 2023-08-25 01:00:21 +02:00
miguel angel rasteu 6a4e8e9a92 #10637 Fix group view 2023-08-24 14:58:30 +02:00
Pablo Aragon 9271dc33f1 11821-Events not sort by comments 2023-08-24 14:43:05 +02:00
miguel angel rasteu bb3a45050f Merge branch 'develop' into ent-10637-mejora-informe-grupo 2023-08-24 12:38:23 +02:00
Pablo Aragon 670cf7d9a7 11423-Graph analytics. Remove graphs & several changes 2023-08-24 12:27:06 +02:00
miguel angel rasteu 44467d1ce1 #11780 Check mib upload security 2023-08-24 12:19:15 +02:00
daniel a7baab0aba Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-24 12:07:32 +02:00
rafael 27e37f6897 11944 adding patch 773.2 changes on develop 2023-08-24 12:04:27 +02:00
miguel angel rasteu 498a957571 #11786 Check traversal path 2023-08-24 10:52:53 +02:00
Matias Didier 9e747e9952 Merge branch 'ent-11873-paradas-planificadas-de-modulos-ponen-en-modo-quiet-agente-en-vez-de-modulos' into 'develop'
Ent 11873 paradas planificadas de modulos ponen en modo quiet agente en vez de modulos

See merge request artica/pandorafms!6345
2023-08-24 08:43:28 +00:00
Jonathan c7a55e6a0b Merge branch 'develop' into ent-10639-unificacion-de-controles-de-fecha 2023-08-24 10:07:16 +02:00
Jonathan d9e897568a Merge branch 'develop' into ent-10639-unificacion-de-controles-de-fecha 2023-08-24 10:06:19 +02:00
miguel angel rasteu aba22003b3 #10637 Fix PDF 2023-08-24 09:47:03 +02:00
Jonathan ab50a519ea #10639 version 2 datepicker 2023-08-24 09:36:15 +02:00
Daniel Cebrian ae288e3dd4 #11807 added new report scoring 2023-08-24 09:24:31 +02:00
Pablo Aragon 208304ed80 11943-Dashboards script tag as string 2023-08-24 08:42:20 +02:00
artica 89b679c4a4 Auto-updated build strings. 2023-08-24 01:00:18 +02:00
daniel dca15b5637 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-23 18:54:01 +02:00
daniel 512d5331d3 ITSM pandora_enterprise#11471 2023-08-23 18:52:06 +02:00
Rafael Ameijeiras 7a916dcb27 Merge branch 'ent-11547-diferenciar-about-para-usuarios-no-admin' into 'develop'
Ent 11547 diferenciar about para usuarios no admin

See merge request artica/pandorafms!6265
2023-08-23 14:34:23 +00:00
artica 4830cf21e6 Updated version and build strings. 2023-08-23 15:49:36 +02:00
Pablo Aragon 45c15acf8e 11930-Remove in pandora_db.pl integrity & functions_agents.php 2023-08-23 14:46:55 +02:00
Pablo Aragon 120298e6a3 11930-Remove in pandora_db.pl integrity & functions_agents.php 2023-08-23 14:00:35 +02:00
Jonathan 92fae2bb54 #11929 fix datatable for port != 80 2023-08-23 13:25:06 +02:00
Pablo Aragon 6757e69a75 11423-Graph analytics. Resolve Confict 2023-08-23 11:55:41 +02:00
Pablo Aragon c0933e8b15 11423-Graph analytics 2023-08-23 11:51:29 +02:00
miguel angel rasteu 34bbc5f0de #10637 Fix recursive group 2023-08-23 11:48:39 +02:00
miguel angel rasteu 3a39670faf #11547 fix profile admin 2023-08-23 10:08:45 +02:00
miguel angel rasteu ba606fa47a Merge branch 'develop' into ent-11547-diferenciar-about-para-usuarios-no-admin 2023-08-23 09:44:03 +02:00
Rafael Ameijeiras 1fa70b3afc Merge branch 'ent-11852-advertencia-al-usar-intervalos-largos' into 'develop'
Ent 11852 advertencia al usar intervalos largos

See merge request artica/pandorafms!6346
2023-08-23 05:56:19 +00:00
Rafael Ameijeiras 1bca8b0006 Merge branch 'ent-11819-cambios-en-wizard-de-las-consolas-visuales' into 'develop'
Ent 11819 cambios en wizard de las consolas visuales

See merge request artica/pandorafms!6338
2023-08-23 05:54:46 +00:00
artica 71ddd71146 Auto-updated build strings. 2023-08-23 01:00:53 +02:00
Daniel Cebrian 61839db7ff #11807 new report list of checks agent 2023-08-22 16:28:01 +02:00
Pablo Aragon bfa09367d4 11423-Graph analytics. Share function 2023-08-22 15:28:05 +02:00
miguel angel rasteu fa2d3ec2e5 #10637 Fix all group view 2023-08-22 15:03:12 +02:00
miguel angel rasteu 4d500b98e4 #10637 Change group report view 2023-08-22 13:04:31 +02:00
miguel angel rasteu feac240905 #10637 Resolve conflicts 2023-08-22 11:49:23 +02:00
Alejandro Campos ad4a46d2b1 Merge branch 'develop' into 'ent-10348-15022-SNMP-Console-no-muestra-Traps-de-1-hora-de-plazo-con-timezone-de-Usuario-1'
# Conflicts:
#   pandora_console/extras/mr/66.sql
2023-08-22 08:43:10 +00:00
alejandro.campos@artica.es 5624b8256c several changes 2023-08-22 10:29:58 +02:00
Pablo Aragon ce1c8cdbb7 11423-Graph analytics. Before Share & Export 2023-08-22 10:04:33 +02:00
Daniel Cebrian dd453507d2 #11807 new report top n failed by checks 2023-08-22 09:53:35 +02:00
daniel 5a61f074d7 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-22 09:22:11 +02:00
Rafael Ameijeiras 8eab813101 Merge branch 'ent-11051-marcar-como-leidos-todos-los-mensajes-del-sistema' into 'develop'
Ent 11051 marcar como leidos todos los mensajes del sistema

See merge request artica/pandorafms!6202
2023-08-22 06:46:29 +00:00
artica d17ea9891b Auto-updated build strings. 2023-08-22 01:00:41 +02:00
artica b977a2b0cc Updated version and build strings. 2023-08-21 16:13:08 +02:00
Rafael Ameijeiras 305c421ce0 Merge branch 'ent-8285-exportar-a-csv-vistas-parte-2-agent-modules-view' into 'develop'
Ent 8285 exportar a csv vistas parte 2 agent modules view

See merge request artica/pandorafms!6246
2023-08-21 11:44:43 +00:00
Jonathan 6a903f9dc3 #11819 vertical range for new rows only 2023-08-21 13:29:36 +02:00
Rafael Ameijeiras 4b10cd4216 Merge branch 'ent-10946-enlaces-filtrando-por-estado-en-widget-general-group-status' into 'develop'
Ent 10946 enlaces filtrando por estado en widget general group status

See merge request artica/pandorafms!6225
2023-08-21 11:18:14 +00:00
miguel angel rasteu 19fb83cd92 #11051 Fix css conflict 2023-08-21 13:16:53 +02:00
miguel angel rasteu e41ea004e2 #11051 Fix discovery task notification 2023-08-21 13:11:57 +02:00
Rafael Ameijeiras 82389ddf2d Merge branch 'ent-10870-15385-limpiar-eventos-desde-la-vista-detallada-de-evento' into 'develop'
Ent 10870 [#15385] Limpiar eventos desde la vista detallada de evento

See merge request artica/pandorafms!6174
2023-08-21 11:10:35 +00:00
Jonathan 563323d0be #11852 warning time lapse more than 30 days 2023-08-21 13:05:39 +02:00
Jorge Rincon 35a7c409bf #11873 Fixed Scheduled Downtime quiet mode for modules 2023-08-21 13:03:44 +02:00
miguel angel rasteu ec11dbab08 Merge branch 'develop' into ent-8285-exportar-a-csv-vistas-parte-2-agent-modules-view 2023-08-21 11:12:02 +02:00
miguel angel rasteu 4191a7037f #11051 Fix checkbox 2023-08-21 10:59:29 +02:00
miguel angel rasteu 6cbb332a8a #10701 Fix css conflict 2023-08-21 09:16:22 +02:00
miguel angel rasteu ebd98b479d #11051 Fix conflict css 2023-08-21 09:01:05 +02:00
miguel angel rasteu 970cc997cc #11051 Fix conflict 2023-08-21 08:25:53 +02:00
Rafael Ameijeiras a6e1e1cf61 Merge branch 'ent-11794-stored-cross-site-scripting-via-dashboard-panel' into 'develop'
Ent 11794 stored cross site scripting via dashboard panel

See merge request artica/pandorafms!6296
2023-08-21 06:23:49 +00:00
Rafael Ameijeiras 1f9cd3a773 Merge branch 'ent-11316-simplificar-vistas-de-soporte' into 'develop'
Ent 11316 Simplificar vistas de soporte

See merge request artica/pandorafms!6173
2023-08-21 06:16:41 +00:00
Rafael Ameijeiras 9c4825f03e Merge branch 'ent-10905-comprobacion-en-el-servidor-de-que-tiene-acceso-a-la-api' into 'develop'
Ent-10905-comprobacion-en-el-servidor-de-que-tiene-acceso-a-la-api

Closes pandora_enterprise#10905

See merge request artica/pandorafms!6289
2023-08-21 06:15:45 +00:00
daniel a63824d802 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
	pandora_console/extras/mr/66.sql
	pandora_console/godmode/users/user_management.php
2023-08-21 08:08:34 +02:00
Rafael Ameijeiras d60890dd08 Merge branch 'ent-11315-anadir-filtrado-al-wizard-de-servicios' into 'develop'
Ent 11315 anadir filtrado al wizard de servicios

See merge request artica/pandorafms!6251
2023-08-21 05:59:38 +00:00
Rafael Ameijeiras dbd90d79a7 Merge branch 'ent-10344-conexion-con-el-servidor-se-ha-perdido' into 'develop'
Ent 10344 Conexion con el servidor se ha perdido

See merge request artica/pandorafms!6228
2023-08-21 05:58:32 +00:00
artica 8ce9d3aa31 Auto-updated build strings. 2023-08-21 01:00:55 +02:00
artica b031f4140c Auto-updated build strings. 2023-08-20 01:00:46 +02:00
artica a6b55c1580 Auto-updated build strings. 2023-08-19 01:01:10 +02:00
Daniel Cebrian 0696ca60da Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-08-18 14:48:47 +02:00
Daniel Cebrian dd5a4887a2 #10870 fixed change status from event 2023-08-18 14:14:51 +02:00
daniel dba0bbebeb ITSM pandora_enterprise#11471 2023-08-18 13:46:27 +02:00
Daniel Cebrian fa04db27a7 Merge branch 'develop' into ent-10870-15385-limpiar-eventos-desde-la-vista-detallada-de-evento 2023-08-18 10:40:29 +02:00
Daniel Cebrian abb173c1a7 #11807 new report top checks more frequent 2023-08-18 10:27:55 +02:00
Jorge Rincon 5e91d8a340 Merge branch develop into ent-11315-anadir-filtrado-al-wizard-de-servicios 2023-08-18 09:38:05 +02:00
Jorge Rincon 3e4178c490 Merge branch develop into ent-10065-post-filtros-de-eventos-privados 2023-08-18 09:19:57 +02:00
Daniel Cebrian 26a09987c0 #11316 fixed modal in black theme and header welcome in header 2023-08-18 08:48:33 +02:00
Daniel Rodriguez 3ed7f222e4 Merge branch 'ent-11609-15731-Copiando-de-contraseñas-incorrectas-de-monitores-WMI-usando-encriptacion-de-contraseñas' into 'develop'
fix pass encryption

See merge request artica/pandorafms!6153
2023-08-18 06:45:29 +00:00
Rafael Ameijeiras 9651177034 Merge branch 'ent-11059-mejora-visual-en-widget-top-n-eventos' into 'develop'
Ent 11059 Mejora visual en widget Top-N Eventos

See merge request artica/pandorafms!6169
2023-08-18 06:36:40 +00:00
Daniel Rodriguez 2e4c542f28 Merge branch 'ent-11636-SNMP-v2-hace-que-wizard-no-funcione' into 'develop'
Ent 11636 snmp v2 hace que wizard no funcione

See merge request artica/pandorafms!6303
2023-08-18 06:29:45 +00:00
daniel b27867d504 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-18 08:28:06 +02:00
Daniel Cebrian 74ed3d6c2b Merge branch 'develop' into ent-11316-simplificar-vistas-de-soporte 2023-08-18 08:26:45 +02:00
artica e54fc904b3 Auto-updated build strings. 2023-08-18 01:00:57 +02:00
daniel 1fecd7d289 ITSM pandora_enterprise#11471 2023-08-17 14:56:55 +02:00
Daniel Cebrian 484570aa4c #11490 fixed grouped by id in widget status map 2023-08-17 09:41:46 +02:00
Daniel Cebrian 9327d50306 Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-08-17 08:26:58 +02:00
artica 6e5f4ef20a Auto-updated build strings. 2023-08-17 01:00:37 +02:00
daniel 8bc65474f0 ITSM pandora_enterprise#11471 2023-08-16 16:52:57 +02:00
Daniel Cebrian 5ee4dbee87 #11490 added new widget group status map 2023-08-16 16:11:35 +02:00
Pablo Aragon 63d3745794 11423-Graph analytics. Get filter data (WIP) 2023-08-16 15:12:31 +02:00
daniel 7baad52e79 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-16 08:18:05 +02:00
Daniel Cebrian aa3dfe606f Merge branch 'develop' into ent-11490-nuevo-widget-group-status-map 2023-08-16 08:09:58 +02:00
daniel 6d642ed6e3 ITSM pandora_enterprise#11471 2023-08-16 08:09:19 +02:00
artica 2f4174c0d3 Auto-updated build strings. 2023-08-16 01:00:55 +02:00
artica 4b98cc97a9 Auto-updated build strings. 2023-08-15 01:00:54 +02:00
Pablo Aragon a10b526938 11423-Graph analytics. Get filter data (WIP) 2023-08-14 15:36:19 +02:00
Jonathan 53bf10acc0 #11819 wizard visual console update 2023-08-14 14:54:15 +02:00
daniel b1c662da67 ITSM pandora_enterprise#11471 2023-08-14 14:19:09 +02:00