35720 Commits

Author SHA1 Message Date
Enrique Martin
3c5ee4e03b Added multiprocessing functions 2023-08-02 10:31:52 +02:00
Rafael Ameijeiras
d96977b883 Merge branch 'ent-10562-Nueva-vista-de-detalle-de-alertas-encoladas' into 'develop'
Ent 10562 nueva vista de detalle de alertas encoladas

See merge request artica/pandorafms!6273
2023-08-02 08:26:50 +00:00
Rafael Ameijeiras
25b2532c7a Merge branch 'ent-11777-API-add-event-comment-se-ha-roto-cambios-tevent-comment' into 'develop'
fixed api call

See merge request artica/pandorafms!6288
2023-08-02 08:26:10 +00:00
Jonathan
7e8b26b73a Merge branch 'develop' into ent-11693-15876-inverse-interval-no-se-activa-para-modulos-web-server-de-tipo-string 2023-08-02 09:29:42 +02:00
Jonathan
f063c5182e #11693 fix warning/critical inverse for serverdata 2023-08-02 09:26:14 +02:00
miguel angel rasteu
57df761622 #11377 Fix sql query 2023-08-02 09:11:55 +02:00
Daniel Maya
ae22b99835 Merge branch 'develop' into ent-11739-compatibilidad-php-8-2-second 2023-08-02 09:10:04 +02:00
artica
d3fdb28d05 Auto-updated build strings. 2023-08-02 01:00:29 +02:00
miguel angel rasteu
ca42714fca #10701 include d3 v7 2023-08-01 14:56:44 +02:00
Daniel Maya
aef7f0edd0 #11739 Fixed deprecated functions 4 2023-08-01 14:51:31 +02:00
alejandro.campos@artica.es
700bb53df4 implemented pending alerts list for event server 2023-08-01 14:37:16 +02:00
Rafael Ameijeiras
965184c688 Merge branch 'ent-11629-neflow-filter-no-admite-grupo-all' into 'develop'
Ent 11629 neflow filter no admite grupo all

See merge request artica/pandorafms!6151
2023-08-01 12:33:07 +00:00
Rafael Ameijeiras
b052711c92 Merge branch 'ent-11697-arreglar-menu-sin-click-to-display' into 'develop'
Draft: Ent 11697 arreglar menu sin click to display

See merge request artica/pandorafms!6230
2023-08-01 12:32:37 +00:00
Jonathan
cf1e274456 #11697 fix menu display lateral 2023-08-01 13:54:48 +02:00
Jonathan
3b38824ca7 #11697 arrow left menu collapse 2023-08-01 13:06:43 +02:00
alejandro.campos@artica.es
30784cc992 implemented inventory widget 2023-08-01 11:47:37 +02:00
Rafael Ameijeiras
ece276e724 Merge branch 'ent-11571-contact-details' into 'develop'
Ent 11571 contact details

See merge request artica/pandorafms!6161
2023-08-01 09:32:46 +00:00
Daniel Maya
0d321f5311 #11739 Fixed deprecated functions 3 2023-08-01 11:19:04 +02:00
Jonathan
84df4e1195 #11571 fix for firefox margin api token span 2023-08-01 11:11:24 +02:00
Jonathan
629f43c8f5 Merge branch 'develop' into ent-11571-contact-details 2023-08-01 10:27:40 +02:00
alejandro.campos@artica.es
8fdc841254 Merge remote-tracking branch 'origin/develop' into ent-10602-Inventory-Widget 2023-08-01 09:58:37 +02:00
alejandro.campos@artica.es
78e76e1ad3 implemented inventory widget 2023-08-01 09:57:49 +02:00
Jonathan
f2328407b1 Merge branch 'develop' into ent-10639-unificacion-de-controles-de-fecha 2023-08-01 09:39:56 +02:00
Rafael Ameijeiras
9f36729d30 Merge branch 'ent-11771-15990-configuracion-de-modulos-de-plugin-en-politicas-en-metaconsola-se-muestran-vacias' into 'develop'
Ent 11771 15990 configuracion de modulos de plugin en politicas en metaconsola se muestran vacias

See merge request artica/pandorafms!6291
2023-08-01 07:28:27 +00:00
artica
dcb9f89b5d Auto-updated build strings. 2023-08-01 01:00:44 +02:00
Jorge Rincon
e7c2340e72 #11771 Fixed plugin field operation in module creation/edition 2023-07-31 15:30:39 +02:00
Rafael Ameijeiras
f65a4ddca9 Merge branch 'ent-11755-netflow-live-view-tipo-summary-no-muestra-grafica-al-usar-aggregated-by-ports' into 'develop'
Ent 11755 netflow live view tipo summary no muestra grafica al usar aggregated by ports

See merge request artica/pandorafms!6279
2023-07-31 13:11:34 +00: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
02bf721e39 Merge branch 'ent-11751-15966-metaconsola-no-se-exportan-los-eventos-a-csv' into 'develop'
Ent 11751 15966 metaconsola no se exportan los eventos a csv

See merge request artica/pandorafms!6269
2023-07-31 13:04:24 +00:00
Rafael Ameijeiras
0c4331f9d4 Merge branch 'ent-11351-15668-snmp-alerts-crea-alerta-sin-tener-ningun-dato-puesto-en-formulario' into 'develop'
Ent 11351 15668 snmp alerts crea alerta sin tener ningun dato puesto en formulario

See merge request artica/pandorafms!5988
2023-07-31 11:08:29 +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
miguel angel rasteu
ded7bb1017 #11751 Fix reset 2023-07-31 11:49:29 +02:00
miguel angel rasteu
63923e3599 Merge branch 'develop' into ent-11751-15966-metaconsola-no-se-exportan-los-eventos-a-csv 2023-07-31 11:28:59 +02:00
miguel angel rasteu
f09ab409cc #11794 Fix entitites in dashboard 2023-07-31 11:24:44 +02:00
miguel angel rasteu
1937c3fa00 #11713 Fix style 2023-07-31 10:06:12 +02:00
Rafael Ameijeiras
538f8363bc Merge branch 'ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id' into 'develop'
change events user_comment new table tevent_comment pandora_enterprise#11387

See merge request artica/pandorafms!6223
2023-07-31 07:51:57 +00:00
Daniel Maya
ad24712eed resolved conflict 2 2023-07-31 09:48:42 +02:00
Daniel Maya
8bbaa11ce3 resolved conflict 2023-07-31 09:44:46 +02:00
Rafael Ameijeiras
c26d721ecb Merge branch 'ent-11386-post-alertas-sonoras-integradas-en-consola-y-metaconsola' into 'develop'
Ent 11386 post alertas sonoras integradas en consola y metaconsola

See merge request artica/pandorafms!6217
2023-07-31 07:30:15 +00:00
miguel angel rasteu
9781809b22 #11713 Fix title 2023-07-31 09:27:50 +02:00
miguel angel rasteu
95e17b46bf Merge branch 'develop' into ent-11713-bugs-de-visualizacion-de-los-botones-de-accion-en-metaconsola-y-consola 2023-07-31 09:03:03 +02:00
Daniel Maya
858a6230b3 resolved conflict 2023-07-31 09:02:58 +02:00
Jorge Rincon
2fb9634c4b #11772 Fixed netflow server image 2023-07-31 09:02:46 +02:00
Rafael Ameijeiras
3a9404ad12 Merge branch 'ent-11653-cascade-protection-modules-solamente-se-debe-permitir-habilitar-si-se-tiene-un-agente-padre' into 'develop'
Ent 11653 cascade protection modules solamente se debe permitir habilitar si se tiene un agente padre

See merge request artica/pandorafms!6262
2023-07-31 06:57:32 +00:00
Rafael Ameijeiras
6db5b41633 Merge branch 'ent-10875-15383-limitar-ancho-y-o-largo-de-la-linea-de-los-eventos' into 'develop'
Ent 10875 15383 limitar ancho y o largo de la linea de los eventos

See merge request artica/pandorafms!6034
2023-07-31 06:40:38 +00:00
artica
3dae79d593 Auto-updated build strings. 2023-07-31 01:00:25 +02:00
Félix Suárez
3434b2e621 Fix on where clause 2023-07-30 10:48:57 -06:00
Félix Suárez
f9e1480c56 Fix on table selection 2023-07-30 10:44:38 -06:00
Félix Suárez
9287c34008 Add _dataunit_ macro 2023-07-30 10:39:13 -06:00
artica
c52539ebdc Auto-updated build strings. 2023-07-30 01:00:35 +02:00