Commit Graph

36008 Commits

Author SHA1 Message Date
alejandro.campos@artica.es 85598d5012 Merge remote-tracking branch 'origin/develop' into ent-11830-reemplazar-sistema-de-websocket-gotty-actual 2023-09-28 16:36:59 +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
artica 52f63a6f12 Auto-updated build strings. 2023-09-28 01:00:23 +02:00
alejandro.campos@artica.es 3f2caf9404 some gotty changes 2023-09-27 18:28:12 +02:00
Rafael Ameijeiras 6acbc5b684 Merge branch 'ent-12050-security-hardening-console-widget-dashboard' into 'develop'
Ent 12050 Security hardening: Console - Widget dashboard

See merge request artica/pandorafms!6450
2023-09-27 14:07:04 +00:00
Diego Muñoz-Reja 5fc3ed3338 Merge branch 'ent-9670-mejoras-automonitorizacion' into 'develop'
WIP:Automonitorization Upgrades

See merge request artica/pandorafms!6199
2023-09-27 11:43:38 +00:00
alejandro.campos@artica.es 00c48c1c7d implemented cron in open 2023-09-27 11:44:26 +02:00
alejandro.campos@artica.es f5be4cf17c implemented cron in open 2023-09-27 11:42:21 +02:00
alejandro.campos@artica.es 57a0249982 implmented cron in open 2023-09-27 11:38:00 +02:00
alejandro.campos@artica.es 831ed2570d implemented cron in open 2023-09-27 11:35:57 +02:00
artica da935b6569 Auto-updated build strings. 2023-09-27 01:00:22 +02:00
Rafael Ameijeiras 03700d2653 Merge branch 'ent-12032-refactoring-visual-de-la-vista-de-clusters' into 'develop'
refactor cluster view pandora_enterprise#12032

See merge request artica/pandorafms!6476
2023-09-26 15:15:27 +00:00
Rafael Ameijeiras a69550c733 Merge branch 'ent-12071-16277-columna-secondary-groups-en-la-vista-de-inventario-no-muestra-nada' into 'develop'
Fix inventory view agent secondary groups

See merge request artica/pandorafms!6456
2023-09-26 15:14:47 +00:00
artica fbeb616eb8 Auto-updated build strings. 2023-09-26 01:00:25 +02:00
alejandro.campos@artica.es 19a9f82fe1 gotty changes 2023-09-25 19:08:24 +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
Rafael Ameijeiras 60c3bb456a Merge branch 'ent-12099-cabecera-de-filtros-descuadrada-en-informes-vista-html' into 'develop'
Ent 12099 cabecera de filtros descuadrada en informes vista html

See merge request artica/pandorafms!6480
2023-09-25 11:22:08 +00:00
Diego Muñoz-Reja 738428a816 Merge branch 'ent-12090-editar-intevalos-por-defecto' into 'develop'
Ent 12090 editar intevalos por defecto

See merge request artica/pandorafms!6467
2023-09-25 09:27:49 +00:00
miguel angel rasteu 4b999b79d3 #12099 Fix filter position 2023-09-25 10:57:46 +02:00
Diego Muñoz-Reja 5079cb9256 Merge branch 'ent-12044-consola-acustica-rota-en-version-open' into 'develop'
Ent 12044 consola acustica rota en version open

See merge request artica/pandorafms!6469
2023-09-25 08:23:34 +00:00
miguel angel rasteu 9a5a1f02bf #12099 Fix filter position 2023-09-25 09:55:55 +02:00
Rafael Ameijeiras b1c3eb7f3c Merge branch 'ent-12100-graph-analysis-no-puedo-exportar-a-grafica-combinada' into 'develop'
Ent 12100 graph analysis no puedo exportar a grafica combinada

See merge request artica/pandorafms!6483
2023-09-25 07:11:48 +00:00
artica 8c19a075c3 Auto-updated build strings. 2023-09-25 01:00:18 +02:00
artica fa2e94eea3 Auto-updated build strings. 2023-09-24 01:00:19 +02:00
artica 7b3b1f9ccc Auto-updated build strings. 2023-09-23 01:00:21 +02:00
miguel angel rasteu f2bda1e58d #12099 Fix filter position 2023-09-22 13:05:29 +02:00
Rafael Ameijeiras 1ffebcf49c Merge branch 'ent-11990-error-al-configurar-un-servicio-existente' into 'develop'
Ent 11990 error al configurar un servicio existente

See merge request artica/pandorafms!6470
2023-09-22 06:59:42 +00:00
artica b706376fa7 Auto-updated build strings. 2023-09-22 01:00:25 +02:00
Daniel Maya d4e2fb4fea resolved conflict 2023-09-21 18:04:15 +02:00
Rafael Ameijeiras 56cb2c3232 Merge branch 'ent-12060-quitar-subrayado-curvo-en-las-pestanas-de-eventos' into 'develop'
Ent 12060 quitar subrayado curvo en las pestanas de eventos

See merge request artica/pandorafms!6453
2023-09-21 15:45:50 +00:00
Rafael Ameijeiras fb45a73279 Merge branch 'ent-12027-tree-view-muestra-raro-los-elementos-en-modo-quiet' into 'develop'
Ent 12027 tree view muestra raro los elementos en modo quiet

See merge request artica/pandorafms!6473
2023-09-21 15:45:12 +00:00
Rafael Ameijeiras bcd12e8ffd Merge branch 'ent-12038-meter-enlace-a-setup-en-el-header' into 'develop'
Ent 12038 meter enlace a setup en el header

See merge request artica/pandorafms!6474
2023-09-21 15:42:43 +00:00
Rafael Ameijeiras d136b7a9e3 Merge branch 'ent-9857-complex-alert-processing' into 'develop'
Ent-9857-complex-alert-processing

Closes pandora_enterprise#9857

See merge request artica/pandorafms!6347
2023-09-21 15:41:24 +00:00
Rafael Ameijeiras 902317fa70 Merge branch 'ent-12097-operacion-view-summary-en-discovery-tasks-no-funciona' into 'develop'
Ent 12097 operacion view summary en discovery tasks no funciona

See merge request artica/pandorafms!6479
2023-09-21 15:40:57 +00:00
Diego Muñoz-Reja 576ee1bf37 Merge branch 'ent-11965-security-hardening-console-vistas-estaticas' into 'develop'
Ent 11965 Security hardening: Console - Vistas estaticas

See merge request artica/pandorafms!6370
2023-09-21 14:57:06 +00:00
Enrique Martin ec4fecfd31 Merge branch 'ent-11919-separar-los-spec-para-el7-el8-y-el9-del-agente-binario' into 'develop'
Separate agent el7, el8 and el9 spec files

See merge request artica/pandorafms!6471
2023-09-21 14:30:14 +00:00
miguel angel rasteu e637866f72 #12100 Fix custom graph 2023-09-21 16:11:58 +02:00
Enrique Martin ea2d663c28 Fixed el8 and el9 agents spec file 2023-09-21 15:57:14 +02:00
Calvo efb2a3a314 Automonitorization 2023-09-21 15:53:13 +02:00
miguel angel rasteu 80b0522c7c #12097 Fix view discovery 2023-09-21 14:21:54 +02:00
Enrique Martin 02dcb740ec Merge remote-tracking branch 'origin/develop' into ent-11919-separar-los-spec-para-el7-el8-y-el9-del-agente-binario 2023-09-21 13:19:04 +02:00
miguel angel rasteu d7f774bf57 #12099 Fix filter header 2023-09-21 13:12:11 +02:00
miguel angel rasteu 7d5f4f17c6 #12097 Fix view summary in discovery task 2023-09-21 13:06:39 +02:00
Enrique Martin 7fc3b32142 Added perl deps to el8 and el9 agent rpm 2023-09-21 12:43:10 +02:00
Enrique Martin a3f27ceb01 Added require perl for agent binary rpm as plugins need it 2023-09-21 12:19:13 +02:00
Enrique Martin b1858a03f1 Debugging agent binary el8 and el9 spec file 2023-09-21 11:23:07 +02:00
daniel f46626e120 refactor cluster view pandora_enterprise#12032 2023-09-21 10:21:45 +02:00
Jonathan 192ec72b32 #12038 header link setup 2023-09-21 10:06:08 +02:00
Jonathan 23756e8495 #12038 header link setup 2023-09-21 08:46:09 +02:00
artica 963664c1d8 Auto-updated build strings. 2023-09-21 01:00:30 +02:00