Commit Graph

31426 Commits

Author SHA1 Message Date
Junichi Satoh 98cc59a136 Updated Japanese console translations. 2022-11-02 15:55:00 +09:00
artica 42db6497aa Auto-updated build strings. 2022-11-02 01:00:18 +01:00
artica 91795a3078 Auto-updated build strings. 2022-11-01 01:00:24 +01:00
Daniel Rodriguez 65048966bf Merge branch 'ent-9376-Discovery-SNMP-Host-Filtro-por-interfaces-no-operativas' into 'develop'
implemented option to skip inoperative interfaces on demand

See merge request artica/pandorafms!5149
2022-10-31 15:55:29 +00:00
alejandro.campos@artica.es 8ad0bbf892 show historical traps in snmp console 2022-10-31 15:59:24 +01:00
Daniel Rodriguez d99ccaba9e Merge branch 'ent-9729-xss-en-busqueda-de-libreria-de-modulos' into 'develop'
Fix module library XSS

See merge request artica/pandorafms!5233
2022-10-31 14:12:46 +00:00
Daniel Barbero 331219ba16 Merge remote-tracking branch 'origin/develop' into ent-8733-giss-anadir-alertas-externas-desde-varias-politicas-sin-pisar-las-anteriores
Conflicts:
	pandora_console/extras/mr/58.sql
2022-10-31 14:13:45 +01:00
Daniel Rodriguez 7baed1dffd Merge branch 'ent-9712-pandora_db-no-se-ejecuta-cuando-pasan-politicas-pero-si-al-reves' into 'develop'
Ent 9712 pandora db no se ejecuta cuando pasan politicas pero si al reves

See merge request artica/pandorafms!5234
2022-10-31 11:56:42 +00:00
Daniel Rodriguez a1210c7814 Merge branch 'ent-9233-Historico-de-traps' into 'develop'
implemented trap history

See merge request artica/pandorafms!5116
2022-10-31 11:17:29 +00:00
Daniel Rodriguez 92b99d0154 Merge branch 'ent-9659-optimizacion-pandora_db' into 'develop'
Query performance improvements in pandora_db.

See merge request artica/pandorafms!5211
2022-10-31 10:54:31 +00:00
Alejandro Campos 0889bcf142 Merge branch 'develop' into 'ent-9376-Discovery-SNMP-Host-Filtro-por-interfaces-no-operativas'
# Conflicts:
#   pandora_console/extras/mr/58.sql
2022-10-31 10:46:44 +00:00
Daniel Rodriguez 0be07d1bb4 Merge branch 'ent-9536-autoincremento-de-indices-en-la-sync-de-meta-nodo' into 'develop'
force insert with primary key pandora_enterprise#9536

See merge request artica/pandorafms!5171
2022-10-31 10:06:15 +00:00
Daniel Rodriguez 41946bfda7 Merge branch 'ent-4822-estado-de-consola-visual-mantenimiento' into 'develop'
add mode maintenance VC pandora_enterprise#4822

See merge request artica/pandorafms!5191
2022-10-31 10:02:44 +00:00
Ramon Novoa a7331c5603 Merge branch 'ent-test-pandoradb-lock' into ent-9712-pandora_db-no-se-ejecuta-cuando-pasan-politicas-pero-si-al-reves 2022-10-31 10:52:58 +01:00
Calvo 7bdf103725 Fix module library XSS 2022-10-31 10:19:13 +01:00
Ramon Novoa 5cd601b999 Improve the locking mechanism of pandora_db. 2022-10-31 10:16:17 +01:00
Rafael Ameijeiras aae620c407 Merge branch 'ent-9728-definit-php-8-por-defecto-en-las-instalaciones-online' into 'develop'
9728 set php8 by default

See merge request artica/pandorafms!5232
2022-10-31 08:28:14 +00:00
artica 1288a3c00b Auto-updated build strings. 2022-10-31 01:00:17 +01:00
artica c1290bd7d0 Auto-updated build strings. 2022-10-30 01:00:19 +02:00
rafael 8af1d6dd98 9728 set php8 by default 2022-10-29 07:07:34 +02:00
artica 0eb3c12cd9 Auto-updated build strings. 2022-10-29 01:00:22 +02:00
Jimmy Olano 15955d2329 Merge branch 'ent-5584-9778-nuevo-editor-masivo-de-usuarios-meta-y-nodo-post' into 'develop'
Ent 5584 9778 nuevo editor masivo de usuarios meta y nodo post

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/5584

See merge request artica/pandorafms!5153
2022-10-28 15:18:15 +00:00
Jimmy Olano af73da2291 Merge branch 'ent-4043-proyectos-banco-de-credenciales-contrasenas-para-modulos' into 'develop'
Ent 4043 proyectos banco de credenciales contrasenas para modulos

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/4043

See merge request artica/pandorafms!5172
2022-10-28 14:00:46 +00:00
Calvo ccc27883f6 Fix XSS vulnerability 2022-10-28 10:52:52 +02:00
jose.gonzalez@pandorafms.com 70aef3220a Fix 2022-10-28 10:06:38 +02:00
Daniel Barbero 10750e2464 translates pandora_enterprise#9714 2022-10-28 08:35:21 +02:00
Jimmy Olano 4594fb17e2 Merge branch 'ent-9500-cli-en-la-metaconsola-no-se-sicnroniza-con-los-nodos' into 'develop'
synch cli with nodes pandora_enterprise#9500

pandora_enterprise#9500

See merge request artica/pandorafms!5198
2022-10-28 01:30:22 +00:00
artica 0da1247d68 Auto-updated build strings. 2022-10-28 01:00:26 +02:00
Daniel Rodriguez 0f82209d7e Merge branch 'ent-9430-2FA-Authentication-sigue-saltando-tras-deshabilitar-en-consola' into 'develop'
fixes in double auth

See merge request artica/pandorafms!5133
2022-10-27 12:06:23 +00:00
Ramon Novoa edc7507a55 Merge remote-tracking branch 'origin/develop' into ent-test-compile-omnishell 2022-10-27 11:51:53 +02:00
Alejandro Campos 9322e5b720 Merge branch 'develop' into 'ent-9376-Discovery-SNMP-Host-Filtro-por-interfaces-no-operativas'
# Conflicts:
#   pandora_console/extras/mr/58.sql
2022-10-27 09:50:24 +00:00
Alejandro Campos a58bc3bf08 Merge branch 'develop' into 'ent-9430-2FA-Authentication-sigue-saltando-tras-deshabilitar-en-consola'
# Conflicts:
#   pandora_console/general/register.php
2022-10-27 09:47:49 +00:00
Ramon Novoa 3e73a52df1 Add pandora_agent_exec.exe to the win32 agent. 2022-10-27 11:47:46 +02:00
Daniel Maya 382e74ae36 resolved conflict 2022-10-27 09:42:40 +02:00
artica bf6f5479e8 Auto-updated build strings. 2022-10-27 01:00:24 +02:00
Daniel Rodriguez c98c58c157 Merge branch 'ent-9377-14016-inestabilidad-y-borrado-incorrecto-netflow' into 'develop'
Fix pandoradb deleting old netflow data

See merge request artica/pandorafms!5055
2022-10-26 12:39:50 +00:00
Jimmy Olano d9c5b59eff Merge branch 'ent-9630-Bug-en-codigo-de-functions-api-php' into 'develop'
fix typo in code

Ref pandora_enterprise#9630

See merge request artica/pandorafms!5189
2022-10-26 11:02:42 +00:00
edu.corral 1a0fa24188 ent 7914 restore migration script 2022-10-26 11:04:53 +02:00
Daniel Barbero 17889c51c1 new image pandora_enterprise#4822 2022-10-26 09:54:55 +02:00
Diego Muñoz-Reja 00a1e74473 Merge branch 'ent-9332-13917-fallos-al-autenticarse-con-ldap-cuando-tenemos-la-contrasena-encriptada' into 'develop'
Fix entities ldap admin pass

See merge request artica/pandorafms!5217
2022-10-26 07:53:31 +00:00
Daniel Barbero 3273fc23ed Merge remote-tracking branch 'origin/develop' into ent-4822-estado-de-consola-visual-mantenimiento
Conflicts:
	pandora_console/extras/mr/58.sql
2022-10-26 09:42:02 +02:00
edu.corral 47521e7e3c ent 7914 database adjustements 2022-10-26 09:07:48 +02:00
edu.corral 531e38925d Merge branch 'ent-7914-escalado-de-estados-en-base-al-tiempo' of https://brutus.artica.es:8081/artica/pandorafms into ent-7914-escalado-de-estados-en-base-al-tiempo 2022-10-26 08:52:06 +02:00
edu.corral 90f8122232 ent 7914 table change for status scaling based on time 2022-10-26 08:51:51 +02:00
artica b1c35e7385 Auto-updated build strings. 2022-10-26 01:00:24 +02:00
Ramon Novoa 9916ba85aa Add support for warning status escalation to critical. 2022-10-25 20:45:48 +02:00
Calvo 36f58579be Fix entities ldap admin pass 2022-10-25 18:46:49 +02:00
Diego Muñoz-Reja ae5d558dba Merge branch 'ent-9332-13917-fallos-al-autenticarse-con-ldap-cuando-tenemos-la-contrasena-encriptada' into 'develop'
Ent 9332 13917 fallos al autenticarse con ldap cuando tenemos la contrasena encriptada

See merge request artica/pandorafms!5216
2022-10-25 16:20:36 +00:00
Calvo 406dac28c4 Merge remote-tracking branch 'origin/develop' into ent-9332-13917-fallos-al-autenticarse-con-ldap-cuando-tenemos-la-contrasena-encriptada 2022-10-25 17:38:31 +02:00
Calvo c2c62bae06 Fix missing parameter meta on event comments ajax 2022-10-25 17:37:56 +02:00