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

30902 Commits

Author SHA1 Message Date
artica 04e9c8de43 Auto-updated build strings. 2022-07-30 01:00:20 +02:00
Luis 33f9972293 Merge branch 'develop' into 'ent-7683-switch-en-consola-para-desactivar-la-actualizacion-automatica-de-la-ip-principal' 
# Conflicts:
#   pandora_console/extras/mr/56.sql
 2022-07-29 11:20:22 +00:00
Daniel Rodriguez 9751167f56 Merge branch 'ent-9273-comprobacion-base-de-datos-de-historico-del-setup-provoca-error-504' into 'develop' 
fixed history timeout pandora_enterprise#9273

See merge request artica/pandorafms!5034
 2022-07-29 08:38:12 +00:00
Daniel Barbero Martin bd69105d7e fix label color vc black theme pandora_enterprise#9321 2022-07-29 09:37:38 +02:00
Daniel Barbero Martin fe1a2cd962 collation mysql8 pandora_enterprise#9290 2022-07-29 08:46:17 +02:00
Daniel Barbero Martin b60ab583bf Merge remote-tracking branch 'origin/develop' into ent-9290-pete-sql-al-buscar-eventos-por-custom-data 2022-07-29 08:43:58 +02:00
artica 7d4ba6191c Auto-updated build strings. 2022-07-29 01:00:22 +02:00
Jimmy Olano 86ad06a3bb Merge branch 'ent-9304-columna-custom-data-se-muestra-incorrectamente-en-vista-de-eventos' into 'develop' 
fix error custom data events list pandora_enterprise#9304

pandora_enterprise#9304

See merge request artica/pandorafms!5027
 2022-07-28 16:25:27 +00:00
Daniel Barbero Martin d8bac6dde9 fixed show modal label VC in list item pandora_enterprise#9321 2022-07-28 14:30:08 +02:00
Daniel Rodriguez e726a55091 Merge branch 'ent-9079-Metaconsola-no-puede-sacar-queries-con-datos-historicos-de-nodo' into 'develop' 
fixed access to history db from metaconsole

See merge request artica/pandorafms!5032
 2022-07-28 11:48:04 +00:00
Alejandro Sánchez 29f6658900 Merge branch 'ent-9096-antispam-cisco-ironport-plugin' into 'develop' 
adding plugin cisco ironports, python3

See merge request artica/pandorafms!5020
 2022-07-28 08:43:01 +00:00
Jimmy Olano 2ebc4c801d Merge branch 'ent-8792-13023-Rotado-de-logs-de-agente-no-empieza-desde-0' into 'develop' 
Ent 8792 13023 rotado de logs de agente no empieza desde 0

Ref pandora_enterprise#8792

See merge request artica/pandorafms!4988
 2022-07-28 02:40:41 +00:00
artica e1bdde1aa9 Auto-updated build strings. 2022-07-28 01:00:20 +02:00
Daniel Barbero Martin 770933a2dd fixed history timeout pandora_enterprise#9273 2022-07-27 14:28:50 +02:00
artica 95d369cca0 Auto-updated build strings. 2022-07-27 01:00:20 +02:00
alejandro.campos@artica.es 3b50d84abd fixed access to history db from metaconsole 2022-07-26 12:50:57 +02:00
Daniel Barbero Martin e3e9f86119 not group by event status pandora_enterprise#8043 2022-07-26 10:55:11 +02:00
Daniel Barbero Martin 35333422b4 fix errors massive operations pandora_enterprise#8564 2022-07-26 09:53:30 +02:00
Daniel Barbero Martin 526e5a9b34 Merge remote-tracking branch 'origin/develop' into ent-8564-operaciones-masivas-metaconsola-edicion-de-agentes 2022-07-26 08:00:28 +02:00
Daniel Barbero Martin 9d33fa08fe fix error collation events pandora_enterprise#9290 2022-07-26 07:57:04 +02:00
artica e30eff5e6e Auto-updated build strings. 2022-07-26 01:00:17 +02:00
artica f9aa8676bc Auto-updated build strings. 2022-07-25 01:00:16 +02:00
artica 5bf282fe05 Auto-updated build strings. 2022-07-24 01:00:12 +02:00
artica f6aa9d64ae Auto-updated build strings. 2022-07-23 01:00:20 +02:00
Jimmy Olano 7b411ae0de Merge branch 'ent-9045-mensaje-de-error-por-falta-de-acceso-fallos-de-formato' into 'develop' 
Ent 9045 mensaje de error por falta de acceso fallos de formato

#9045 https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9045

See merge request artica/pandorafms!5004
 2022-07-22 14:39:18 +00:00
Jimmy Olano 3a7ba1ecb4 Merge branch 'ent-9157-13709-bug-programacion-plantilla-de-alertas' into 'develop' 
Ent 9157 13709 bug programacion plantilla de alertas

#9157 https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9157

See merge request artica/pandorafms!5010
 2022-07-22 13:18:58 +00:00
Diego Muñoz-Reja a5b9135442 Merge branch 'ent-9307-error-500-en-vista-mobile-con-php-7-2' into 'develop' 
fix 550 error evnts mobile php 7.2 pandora_enterprise#9307

See merge request artica/pandorafms!5029
 2022-07-22 10:34:52 +00:00
Daniel Barbero Martin 57f82b0c31 fix 550 error evnts mobile php 7.2 pandora_enterprise#9307 2022-07-22 12:27:58 +02:00
Daniel Barbero Martin bdd9612812 fix error custom data show all in tab events pandora_enterprise#9305 2022-07-22 10:13:57 +02:00
Daniel Barbero Martin bbf9174903 fix error custom data events list pandora_enterprise#9304 2022-07-22 10:11:14 +02:00
Jimmy Olano 33f6ae1875 Merge branch 'ent-8797-giss-13405-acciones-vista-de-alertas-metaconsola' into 'develop' 
Alerts list datatable

Ref: pandora_enterprise#8797

See merge request artica/pandorafms!5018
 2022-07-22 02:39:35 +00:00
artica fa23c453a1 Auto-updated build strings. 2022-07-22 01:00:21 +02:00
Daniel Rodriguez 5d674b76b6 Merge branch 'ent-8942-token-para-cambiar-comportamiento-de-la-busqueda-de-grupos-en-filtro-de-eventos' into 'develop' 
new filter search eventspandora_enterprise#8942

See merge request artica/pandorafms!5007
 2022-07-21 10:15:49 +00:00
Calvo e286793e95 Fix alert list agent link in metaconsole 2022-07-21 11:52:45 +02:00
Daniel Barbero Martin ac23665244 Merge remote-tracking branch 'origin/develop' into ent-8564-operaciones-masivas-metaconsola-edicion-de-agentes 2022-07-21 10:58:37 +02:00
Jimmy Olano 673798a43e Merge branch 'ent-9279-doble-refresco-en-vista-de-eventos-de-metaconsola-al-tener-autorrefresco-activado' into 'develop' 
double refresh page events pandora_enterprise#9279

pandora_enterprise#9279

See merge request artica/pandorafms!5021
 2022-07-21 01:36:33 +00:00
artica b76dc9d062 Auto-updated build strings. 2022-07-21 01:00:17 +02:00
Jimmy Olano 7f1ecff302 Merge branch 'ent-9062-mensaje-de-advertencia-sin-traducir' into 'develop' 
Add transaltion to discovery message

Ref: pandora_enterprise#9062

See merge request artica/pandorafms!4967
 2022-07-20 22:24:13 +00:00
vgilc 762959b85f Merge branch 'ent-fix-deb-package-creation' into 'develop' 
Fixed deb package creation scripts to work with recent Ubuntu, 20.04 LTS and 22.04 LTS.

See merge request artica/pandorafms!5026
 2022-07-20 06:01:00 +00:00
Junichi Satoh 44cc9898c2 Fixed deb package creation scripts to work with recent Ubuntu, 20.04 LTS and 22.04 LTS. 2022-07-20 14:10:37 +09:00
artica 385610fef6 Auto-updated build strings. 2022-07-20 01:00:21 +02:00
Jimmy Olano b512a359d4 Merge branch 'ent-8522-13078-edicion-de-elementos-de-un-servicio-2' into 'develop' 
fix error services items pandora_enterprise#8522

pandora_enterprise#8522

See merge request artica/pandorafms!5024
 2022-07-19 22:16:56 +00:00
Jimmy Olano 97132edd4f Merge branch 'ent-9284-13964-fallo-en-creacion-de-eventos-via-api-create_event-a-la-hora-de-guardar-timestamp-del' into 'develop' 
fix time api create event pandora_enterprise#9284

pandora_enterprise#9284

See merge request artica/pandorafms!5022
 2022-07-19 14:43:54 +00:00
Diego Muñoz-Reja 288e6f3a53 Merge branch 'ent-9140-POST-Usuarios-LDAP-no-ven-comentarios-de-eventos-agrupados' into 'develop' 
Ent 9140 post usuarios ldap no ven comentarios de eventos agrupados

See merge request artica/pandorafms!4993
 2022-07-19 13:07:45 +00:00
Diego Muñoz-Reja 1f06b20745 Merge branch 'ent-9280-vista-mobile-permite-a-usuarios-acceder-a-nodos-para-los-que-no-tiene-permiso' into 'develop' 
fix mobile index access user to node pandora_enterprise#9280

See merge request artica/pandorafms!5023
 2022-07-19 10:55:51 +00:00
Ramon Novoa 6aca4be90c Add an option to control alert queuing. 
The alertserver_queue configuration option enables or disables alert
queuing for the local server. Ref. pandora_enterprise#8762.
 2022-07-19 11:29:47 +02:00
Daniel Barbero Martin 1e9ca202f0 fix error services items pandora_enterprise#8522 2022-07-19 11:09:49 +02:00
Daniel Barbero Martin 027f61daff Merge remote-tracking branch 'origin/develop' into ent-8942-token-para-cambiar-comportamiento-de-la-busqueda-de-grupos-en-filtro-de-eventos 
Conflicts:
	pandora_console/extras/mr/56.sql
 2022-07-19 10:18:04 +02:00
Daniel Barbero Martin 44a2bb2bdb fix mobile index access user to node pandora_enterprise#9280 2022-07-19 10:13:43 +02:00
Calvo 642c60428c Merge remote-tracking branch 'origin/develop' into ent-8797-giss-13405-acciones-vista-de-alertas-metaconsola 2022-07-19 09:40:56 +02:00