tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
33,907 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

33907 Commits

Author SHA1 Message Date
Jonathan 5e7a3d96d4 #10976 fix pagination search global 2023-05-08 09:42:17 +02:00
Jonathan 606ef7d48a Merge branch 'develop' into ent-10976-busqueda-rapida-agentes-pasar-a-datatables 2023-05-08 09:18:38 +02:00
Rafael Ameijeiras 37d0cff221 Merge branch 'ent-10340-gotty-quickshell-no-funciona' into 'develop' 
Fix gotty host missing on ws.php

See merge request artica/pandorafms!5812
 2023-05-08 06:05:31 +00:00
artica 4653ebd854 Auto-updated build strings. 2023-05-08 01:00:20 +02:00
artica 6a0d746892 Auto-updated build strings. 2023-05-07 01:00:13 +02:00
artica 0db1ef549a Auto-updated build strings. 2023-05-06 01:00:19 +02:00
Diego Muñoz-Reja 13b4cdd176 Merge branch 'ent-10369-15058-metaconsola-con-encrypt_db-no-conecta-a-nodos-correlacion' into 'develop' 
Fix correlation server connection with nodes with encrypt enabled

See merge request artica/pandorafms!5785
 2023-05-05 13:05:01 +00:00
Calvo b4adb079a9 Fix correlated alerts criticity rules 2023-05-05 14:32:49 +02:00
Jonathan 49a795fdb9 #10976 datatables seatch agents 2023-05-05 13:04:27 +02:00
Calvo 4f48fa4450 Fix ws test button 2023-05-05 11:25:33 +02:00
Daniel Rodriguez ebd5f6c01f Merge branch 'ent-9690-14344-alertas-con-threshold-propio-envian-correos-de-recuperacion-no-esperados' into 'develop' 
Recovered alerts skipping when threshold applies

See merge request artica/pandorafms!5653
 2023-05-05 07:58:31 +00:00
Ramon Novoa 782ee0e9ac Revert "Test GitLab hooks." 
This reverts commit bd643f1cef.
 2023-05-05 09:37:20 +02:00
Ramon Novoa bd643f1cef Test GitLab hooks. 
(cherry picked from commit c8b6be3e92)
 2023-05-05 09:32:58 +02:00
Calvo 56a587791c Change correct MR 2023-05-05 09:10:49 +02:00
artica d4107cad5d Auto-updated build strings. 2023-05-05 01:00:19 +02:00
Calvo 8c73a0176d Alert recuperation only executes one time if in threshold interval 2023-05-04 20:18:36 +02:00
Calvo 3bbaf5e562 Alert recuperation only executes one time if in threshold interval 2023-05-04 20:17:31 +02:00
Daniel Rodriguez 23b831a707 Merge branch 'ent-10743-no-hace-el-cambio-a-el-server-master-ha-en-servidores-remotos-si-no-existe-el-servidor' into 'develop' 
Improved module execution for master servers.

See merge request artica/pandorafms!5777
 2023-05-04 17:18:05 +00:00
Daniel Rodriguez 38d2d66469 Merge branch 'ent-10597-pantalla-de-error-de-sistemas-no-mergeados' into 'develop' 
Ent 10597 pantalla de error de sistemas no mergeados

See merge request artica/pandorafms!5705
 2023-05-04 17:15:16 +00:00
Daniel Rodriguez 492032bd41 Merge branch 'ent-10157-14544-plugin-anadir-parametro-extra-para-calcular-el-de-bandwidth-max-de-port-channels' into 'develop' 
Ent 10157 14544 plugin anadir parametro extra para calcular el de bandwidth max de port channels

See merge request artica/pandorafms!5810
 2023-05-04 17:14:26 +00:00
Calvo c2e16ec94f Fix commit changes 2023-05-04 16:59:12 +02:00
Daniel Rodriguez 9b69ec4393 Merge branch 'ent-10179-wizard-deploy-agentes' into 'develop' 
Ent 10179 wizard deploy agentes

See merge request artica/pandorafms!5692
 2023-05-04 14:37:48 +00:00
Jonathan 477dc1d14d #10597 add logo pandora maintenance 2023-05-04 16:28:51 +02:00
Jonathan 0336f03a6c #10976 search agents 2023-05-04 16:01:08 +02:00
Calvo 768d7008f4 Fix commit error 2023-05-04 15:50:38 +02:00
Calvo f2a9716c79 Fix alert recovery execute one time 2023-05-04 15:18:02 +02:00
Calvo da96d5bd1e Merge remote-tracking branch 'origin/develop' into ent-9690-14344-alertas-con-threshold-propio-envian-correos-de-recuperacion-no-esperados 2023-05-04 15:14:01 +02:00
Matias Didier 96305c9528 Merge branch 'ent-11110-selectores-de-tipo-select2-rotos-en-metaconsola' into 'develop' 
fix select2 pandora_enterprise#11110

See merge request artica/pandorafms!5831
 2023-05-04 12:39:20 +00:00
Calvo fb7a94ddd4 Fix ws exceptions on socket close event 2023-05-04 14:34:50 +02:00
daniel e77a63a91f fix select2 pandora_enterprise#11110 2023-05-04 12:57:01 +02:00
Calvo c74ed4914b Websocket engine test button 2023-05-04 11:37:16 +02:00
Diego Muñoz-Reja 038e21cf0c Merge branch 'ent-10744-mejorar-deteccion-de-os-con-nmap-mucho-mas-lento' into 'develop' 
Remoced xprobe and modified nmap for better performance detecting OS

See merge request artica/pandorafms!5797
 2023-05-04 09:01:52 +00:00
artica 151358190c Auto-updated build strings. 2023-05-04 01:00:20 +02:00
Matias Didier 5983333965 Merge branch 'ent-10908-Fallo-en-el-editor-de-tips' into 'develop' 
changes regarding encoding of tables

See merge request artica/pandorafms!5763
 2023-05-03 11:01:06 +00:00
Matias Didier 1d81b67082 Merge branch 'ent-10530-giss-demasiados-modulos-en-cola-en-vista-de-servidores' into 'develop' 
Ent 10530 giss demasiados modulos en cola en vista de servidores

See merge request artica/pandorafms!5688
 2023-05-03 09:25:04 +00:00
Daniel Maya 87a55dd26a #10530 Added img 2023-05-03 09:32:52 +02:00
Alejandro Campos 9e1caceb11 Merge branch 'develop' into 'ent-10908-Fallo-en-el-editor-de-tips' 
# Conflicts:
#   pandora_console/extras/mr/63.sql
 2023-05-03 07:11:28 +00:00
artica 77ac357745 Auto-updated build strings. 2023-05-03 01:00:14 +02:00
artica b58ece6359 Auto-updated build strings. 2023-05-02 01:00:10 +02:00
artica 2e9c6a339f Auto-updated build strings. 2023-05-01 01:00:13 +02:00
artica 0bef49b5e7 Auto-updated build strings. 2023-04-30 01:00:18 +02:00
artica 459da487b8 Auto-updated build strings. 2023-04-29 01:00:23 +02:00
Calvo 8c65652c64 Fix gotty host missing on ws.php 2023-04-28 14:06:35 +02:00
Matias Didier 56614f8df0 Merge branch 'ent-10474-mejorar-visualmente-mapa-dinamico-sunburst' into 'develop' 
Ent 10474 mejorar visualmente mapa dinamico sunburst

See merge request artica/pandorafms!5800
 2023-04-28 11:01:17 +00:00
Calvo 7ef41d6273 Merge remote-tracking branch 'origin/develop' into ent-9690-14344-alertas-con-threshold-propio-envian-correos-de-recuperacion-no-esperados 2023-04-28 11:11:36 +02:00
Daniel Maya 77b5b7af45 #10157 Fix max_interfaces 2023-04-28 10:51:21 +02:00
Daniel Maya 44ffd0f75b #10157 Added max parameter 2023-04-28 10:27:45 +02:00
Alejandro Campos 539ff07aec Merge branch 'develop' into 'ent-10179-wizard-deploy-agentes' 
# Conflicts:
#   pandora_console/include/styles/pandora.css
 2023-04-28 08:07:10 +00:00
Daniel Rodriguez 0bc18b47db Merge branch 'ent-10420-14668-errores-en-usuarios-ldap-ad-con-apostrofes' into 'develop' 
Ent 10420 14668 errores en usuarios ldap ad con apostrofes

See merge request artica/pandorafms!5687
 2023-04-28 07:03:37 +00:00
Daniel Rodriguez 6570f0b98d Merge branch 'ent-10053-No-existe-borrado-en-cascada-de-modulos-usando-CLI' into 'develop' 
implemented module cascade deletion

See merge request artica/pandorafms!5641
 2023-04-28 07:00:59 +00:00