Commit Graph

1393 Commits

Author SHA1 Message Date
Daniel Maya 287b983ce9 #12371 Fixed events 2023-11-02 15:39:55 +01:00
alejandro.campos@artica.es 1fd45fb95f implement demo data feature 2023-10-26 19:05:07 +02:00
Calvo 715f6abc69 Merge remote-tracking branch 'origin/develop' into ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine 2023-10-24 14:02:36 +02:00
Diego Muñoz-Reja 48c314669a Merge branch 'ent-10194-nueva-pantalla-tactica-relacionado-con-mejoras-en-la-automonitorizacion' into 'develop'
Ent 10194 Nueva pantalla táctica (relacionado con mejoras en la automonitorización)

See merge request artica/pandorafms!6485
2023-10-23 07:24:20 +00:00
Calvo 1ef42182a7 Merge remote-tracking branch 'origin/develop' into ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine 2023-10-20 10:46:34 +02:00
Matias Didier dcd891eedb Merge branch 'ent-12286-16465-acceso-a-pandora-a-traves-de-public-link-url-de-consolas-visuales-con-usuario-de-public-2' into 'develop'
Ent 12286 16465 acceso a pandora a traves de public link url de consolas visuales con usuario de public 2

See merge request artica/pandorafms!6578
2023-10-20 05:51:32 +00:00
Jonathan 98388bb7d2 #12286 fix dashboard vulnerability login admin 2023-10-19 17:06:01 +02:00
daniel eb5e56cc78 Merge remote-tracking branch 'origin/develop' into ent-12196-problemas-con-la-vista-mobile 2023-10-19 08:16:33 +02:00
Daniel Cebrian 9237e4038a Merge branch 'develop' into ent-10194-nueva-pantalla-tactica-relacionado-con-mejoras-en-la-automonitorizacion 2023-10-16 17:10:33 +02:00
miguel angel rasteu 5060398661 #11206 Fix conflict 2023-10-13 09:00:03 +02:00
miguel angel rasteu 3a2b56cc4c #12204 Fix force check icon 2023-10-10 16:50:42 +02:00
Daniel Cebrian 9b675868b9 Merge branch 'develop' into ent-10194-nueva-pantalla-tactica-relacionado-con-mejoras-en-la-automonitorizacion 2023-10-09 16:43:25 +02:00
miguel angel rasteu 049e25f866 #8686 Add filter in managemnet tree group 2023-10-06 13:51:18 +02:00
daniel 588f19fa18 fix cv in mobile pandora_enterprise#12196 2023-10-06 12:59:33 +02:00
miguel angel rasteu 09cae778c5 #12153 Create event list graph 2023-10-04 16:28:40 +02:00
miguel angel rasteu 874cb9c52a #12153 Create button and ajax request 2023-10-04 12:41:23 +02:00
Alejandro Campos 0f381b0db7 Merge branch 'develop' into 'ent-11114-Gestion-de-versiones-Obsolescencia-planeada'
# Conflicts:
#   pandora_console/extras/mr/66.sql
2023-10-03 13:11:09 +00:00
Daniel Cebrian 438cb11f95 #10194 added automonitoritation modules and interval refresh async 2023-10-02 16:44:53 +02:00
Rafael Ameijeiras 439d5b54aa Merge branch 'ent-11961-16159-activar-show-all-events-24h-por-defecto-en-vista-de-ultimos-eventos-de-agente' into 'develop'
Agents show events 24h switch checked default

See merge request artica/pandorafms!6405
2023-10-02 07:08:52 +00:00
Daniel Cebrian b8df74dace Merge branch 'develop' into ent-10194-nueva-pantalla-tactica-relacionado-con-mejoras-en-la-automonitorizacion 2023-09-28 16:22:58 +02:00
Jonathan 6db13cc55a merge conflict solution 2023-09-28 13:14:49 +02:00
Daniel Rodriguez 05cd8142bf Merge branch 'ent-11471-integracion-pandora-integria' into 'develop'
wip integration integriaIMS pandora_enterprise#11471

Closes pandora_enterprise#11471

See merge request artica/pandorafms!6131
2023-09-28 10:05:15 +00:00
Daniel Cebrian 62d501e6d5 #10194 sections Alerts and Events 2023-09-27 13:30:56 +02:00
Calvo 0b4ee35780 Fix query agent events 2023-09-27 11:01:21 +02:00
daniel 91393c9e39 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
	pandora_console/include/styles/pandora.css
2023-09-25 17:06:08 +02:00
Luis 086835765d Merge branch 'develop' into 'ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine'
# Conflicts:
#   pandora_console/extras/mr/66.sql
2023-09-25 14:08:43 +00:00
Jonathan e5c5f91576 #11705 change name event_custom_id 2023-09-25 10:32:23 +02:00
Jonathan 79fe89c3c5 #11705 new custom_field tevento 2023-09-22 12:24:15 +02:00
daniel f46626e120 refactor cluster view pandora_enterprise#12032 2023-09-21 10:21:45 +02:00
alejandro.campos@artica.es ae74caf7b1 Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada 2023-09-20 15:52:56 +02:00
alejandro.campos@artica.es 6f8212ed40 Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada 2023-09-20 15:46:47 +02:00
Daniel Cebrian 73d179e52f #12001 added autoselect module in inventory 2023-09-20 12:14:55 +02:00
miguel angel rasteu d83c1a81d2 #12052 Fix filter alter detail view 2023-09-19 13:50:06 +02:00
Daniel Rodriguez 6ecd8ca899 Merge branch 'ent-10065-post-filtros-de-eventos-privados' into 'develop'
Draft: Ent 10065 post filtros de eventos privados

See merge request artica/pandorafms!6318
2023-09-18 07:55:18 +00:00
Rafael Ameijeiras b568085841 Merge branch 'ent-12035-la-edicion-de-alertas-no-deberia-ser-posible-en-la-vista-de-agentes' into 'develop'
not show edition buttons of alert detail pandora_enterprise#12035

See merge request artica/pandorafms!6444
2023-09-18 07:22:13 +00:00
daniel af968b5e13 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-14 08:08:05 +02:00
daniel 802f0bf83b Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-12 12:37:31 +02:00
daniel 16f1d80919 not show edition buttons of alert detail pandora_enterprise#12035 2023-09-12 12:30:52 +02:00
miguel angel rasteu 55fa824792 #12037 Fix size of agent text and event text 2023-09-11 11:41:30 +02:00
Jorge Rincon 764d5908bb Merge branch 'develop' into ent-10065-post-filtros-de-eventos-privados 2023-09-11 10:58:37 +02:00
Rafael Ameijeiras 0c6aaa6723 Merge branch 'ent-11993-user-notifications-esta-roto' into 'develop'
Ent 11993 user notifications esta roto

See merge request artica/pandorafms!6412
2023-09-11 07:15:38 +00:00
daniel ce0468b37e Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
	pandora_console/include/functions_menu.php
2023-09-08 13:11:52 +02:00
Calvo c4271bf737 Merge remote-tracking branch 'origin/develop' into ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine 2023-09-07 17:58:27 +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
miguel angel rasteu f445066d13 #11679 Fix linked module name 2023-09-07 16:29:18 +02:00
alejandro.campos@artica.es f8911bcf9c implemented os version management 2023-09-06 17:00:16 +02: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
miguel angel rasteu 4911d84c76 #11993 Fix configration users notification 2023-09-05 11:52:16 +02:00
Calvo a8a201cf19 Agents show events 24h switch checked default 2023-09-04 16:47:01 +02:00
miguel angel rasteu dc520df039 #9946 Fix delete and copy 2023-09-04 11:09:58 +02:00
miguel angel rasteu 81610046e3 #9946 Fix url 2023-09-04 10:58:15 +02:00
miguel angel rasteu 5ca1c54792 #9946 Add search filter and change table to datatable 2023-09-04 10:49:29 +02:00
Calvo 2fc08b7246 Added enable MADE option to modules and bulk op 2023-08-31 18:07:26 +02:00
Jonathan 1e22d473e6 #9814 projection graphs - module view & dashboard 2023-08-31 13:42:52 +02:00
Jonathan 84bb4780ca #10639 new datepicker style and save filter 2023-08-29 12:17:41 +02:00
Jorge Rincon 797b24af86 #10065 Added switch to filter create/edit modal. 2023-08-28 13:54:35 +02:00
miguel angel rasteu 0194fbaa59 #11206 Fix custom field view 2023-08-22 11:16:17 +02:00
daniel 5a61f074d7 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-22 09:22:11 +02:00
miguel angel rasteu 817c3223be #11206 Fix custom field view 2023-08-21 15:11:13 +02:00
miguel angel rasteu a251046452 #11206 Fix conflict 2023-08-21 08:36:42 +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
Jorge Rincon 3e4178c490 Merge branch develop into ent-10065-post-filtros-de-eventos-privados 2023-08-18 09:19:57 +02:00
daniel 133eef456a Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-14 08:14:34 +02:00
Jonathan fb4ac30b57 #10598 show error on create web and check 2023-08-09 13:20:43 +02:00
daniel 7f82273dc4 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
	pandora_console/extras/mr/65.sql
2023-08-09 08:59:01 +02:00
Jorge Rincon 3429e0d190 #10065 Added the option to create-edit a private event filter. 2023-08-07 14:43:50 +02:00
Rafael Ameijeiras 75b311ad97 Merge branch 'ent-11768-texto-del-modal-de-save-filter-se-muestra-mal' into 'develop'
Ent 11768 texto del modal de save filter se muestra mal

See merge request artica/pandorafms!6287
2023-07-31 13:10:53 +00:00
Rafael Ameijeiras 68b2fbd616 Merge branch 'ent-11467-bug-en-vista-tree-view' into 'develop'
Ent 11467 bug en vista tree view

See merge request artica/pandorafms!6276
2023-07-31 10:12:33 +00:00
Daniel Maya ad24712eed resolved conflict 2 2023-07-31 09:48:42 +02:00
Daniel Maya 858a6230b3 resolved conflict 2023-07-31 09:02:58 +02:00
alejandro.campos@artica.es 6114787764 Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id 2023-07-27 13:32:26 +02:00
Jorge Rincon 03feeebbdf #11768 Fixed the style of the checkbox in the modal save filter 2023-07-27 11:09:24 +02:00
miguel angel rasteu 2b20b7f8ee #11386 Fix modal 2023-07-27 10:47:51 +02:00
Daniel Cebrian 2c9f7e026e Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-07-26 15:58:26 +02:00
Rafael Ameijeiras 1f52a2d466 Merge branch 'ent-11031-en-visor-de-auditoria-los-filtros-personalizados-tienen-tres-detalles-que-vale-la-pena' into 'develop'
Ent 11031 en visor de auditoria los filtros personalizados tienen tres detalles que vale la pena

See merge request artica/pandorafms!6235
2023-07-25 07:54:36 +00:00
Jorge Rincon 19c600fb9b #11467 fixed error message and advanced info section from tree view 2023-07-24 14:54:38 +02:00
miguel angel rasteu 5084c0490b #11386 Fix changes in soun event dialog 2023-07-21 13:32:12 +02:00
daniel 1f1b85561c Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id 2023-07-19 11:39:06 +02:00
daniel 5707ec9e4b Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-07-18 15:13:29 +02:00
daniel 9a72d0740c ITSM fixed pandora_enterprise#11471 2023-07-18 15:13:08 +02:00
Daniel Cebrian 41a03a7a49 Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-07-18 09:27:14 +02:00
Rafael Ameijeiras a8597e1cb4 Merge branch 'ent-11735-listado-de-modulos-rotos-en-develop' into 'develop'
Ent 11735 listado de modulos rotos en develop

See merge request artica/pandorafms!6254
2023-07-17 12:09:09 +00:00
Rafael Ameijeiras de84f5fae9 Merge branch 'ent-11418-cambiar-vista-de-graficas-del-detalle-de-un-agente' into 'develop'
Ent 11418 cambiar vista de graficas del detalle de un agente

See merge request artica/pandorafms!6014
2023-07-17 07:53:10 +00:00
miguel angel rasteu 8d89ed90d3 #11735 Fix Agent view modules 2023-07-17 09:34:57 +02:00
Rafael Ameijeiras 3f9aea5fe4 Merge branch 'ent-7116-anadir-token-en-snmp-browser-para-poder-aplicar-ip-del-agente-a-los-modulos' into 'develop'
Ent 7116 anadir token en snmp browser para poder aplicar ip del agente a los modulos

See merge request artica/pandorafms!6061
2023-07-17 06:00:36 +00:00
Rafael Ameijeiras d860d613d6 Merge branch 'ent-10598-nuevo-wizard-de-bienvenida' into 'develop'
Ent 10598 nuevo wizard de bienvenida

See merge request artica/pandorafms!6043
2023-07-17 05:57:29 +00:00
Jonathan ee37487b74 #10598 unknown create template and show 2023-07-14 11:44:37 +02:00
miguel angel rasteu 46f898c5a6 #11728 Fix module plugin server 2023-07-12 16:05:55 +02:00
miguel angel rasteu f6637e3827 #11031 fix audit log filter 2023-07-12 10:19:08 +02:00
miguel angel rasteu e3496a44b6 #11206 Add custom field view in nodes 2023-07-11 16:52:39 +02:00
daniel d3412a7ad1 add filter events comments pandora_enterprise#11387 2023-07-10 16:26:33 +02:00
daniel 200750f90b change events user_comment new table tevent_comment pandora_enterprise#11387 2023-07-07 12:53:14 +02:00
Gorka Sanchez 8fd3ed6650 Merge branch 'ent-9478-creacion-y-edicion-directa-de-alertas-desde-metaconsola' into 'develop'
Ent 9478 creacion y edicion directa de alertas desde metaconsola

See merge request artica/pandorafms!5806
2023-07-06 09:44:33 +00:00
Jonathan e9064dfd2f Merge branch 'develop' into ent-11093-reticula-en-consola-visual 2023-07-04 14:09:15 +02:00
Jonathan a385ff93a3 #9478 creation alerts to nodes on metaconsole 2023-07-04 12:47:04 +02:00
Matias Didier 203446af70 Merge branch 'ent-11475-cambiar-copyrights-backend-agentes' into 'develop'
Ent 11475 cambiar copyrights backend agentes

See merge request artica/pandorafms!6172
2023-07-04 08:49:14 +00:00
Félix Suárez c926349c67 Update copyright years 2023-07-03 09:20:25 -06:00
Matias Didier b3d098794d Merge branch 'ent-10660-update-journal-usar-las-opciones-de-visual-styles' into 'develop'
Ent 10660 update journal usar las opciones de visual styles

See merge request artica/pandorafms!5798
2023-07-03 11:50:06 +00:00
Jonathan 1c69208a6a Merge branch 'develop' into ent-9478-creacion-y-edicion-directa-de-alertas-desde-metaconsola 2023-07-03 10:21:55 +02:00