tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 08:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity
30,721 Commits 34 Branches 30 Tags
Commit Graph

30721 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Barbero Martin
ca298422bd Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-20 07:58:40 +02:00
artica
c4fadcd461 Auto-updated build strings. 2022-06-20 01:00:14 +02:00
artica
d2e140e85b Auto-updated build strings. 2022-06-19 01:00:14 +02:00
artica
7574e99e80 Auto-updated build strings. 2022-06-18 01:00:19 +02:00
José González
14edca5143 Merge remote-tracking branch 'origin' into ent-8690-gestion-snmptraps-pandora_db 2022-06-17 15:26:57 +02:00
Calvo
291c6c6a69 Merge remote-tracking branch 'origin/develop' into ent-8857-llamada-set-new_agent-api-meta 2022-06-17 13:27:31 +02:00
Daniel Barbero Martin
7e25a86d52 refactor events meta pandora_enterprise#9086 2022-06-17 12:50:40 +02:00
José González
6f903023a7 Fix 2022-06-17 12:42:24 +02:00
Calvo
0c2823f23f Merge remote-tracking branch 'origin/develop' into ent-8590-indicar-a-que-satelite-pertenece-un-agente 2022-06-17 12:38:11 +02:00
Ramon Novoa
1d66d66cdf Merge remote-tracking branch 'origin/develop' into ent-test-corr 2022-06-17 10:41:20 +02:00
Ramon Novoa
d53c2f8ed4 Merge remote-tracking branch 'origin/develop' into ent-test-corr 2022-06-17 10:37:42 +02:00
Ramon Novoa
7edd433566 Add recovery support for correlation alerts. 2022-06-17 10:21:06 +02:00
Calvo
5ce0ebb72a Fix agent view satellite name visual 2022-06-17 10:09:37 +02:00
José González
7f2182d52a Merge branch 'develop' into 'ent-8912-Problemas-en-recuperación-alertas-de-evento---Necesaria-refactorizacion' 
# Conflicts:
#   pandora_console/install.php
 2022-06-17 07:37:01 +00:00
José González
93b9e6142e DB Changes #8912 2022-06-17 09:00:35 +02:00
Daniel Barbero Martin
f3e645146d Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-17 08:51:11 +02:00
Daniel Maya
6d1f03a633 #9158 Fixed digital clock 2022-06-17 08:17:55 +02:00
artica
ddee99b016 Auto-updated build strings. 2022-06-17 01:00:19 +02:00
José González
6d70353254 Fix mistake 2022-06-16 16:09:05 +00:00
edu.corral
a0f7c9e6a2 ent-9067 fixed notification system 2022-06-16 16:19:33 +02:00
José González
4c2ad2822f Fix visual issue 2022-06-16 16:04:22 +02:00
Daniel Maya
ad98356957 resolved conflict 2022-06-16 14:21:47 +02:00
Daniel Rodriguez
bea57c8991 Merge branch 'ent-8861-wizard-snmp-convierte-valores-hex-string-en-string' into 'develop' 
Changed snmpwalk parameters for wizard

See merge request artica/pandorafms!4872
 2022-06-16 12:17:27 +00:00
Daniel Barbero Martin
6f49f63353 fixed VC pandora_enterprise#8888 2022-06-16 14:09:30 +02:00
Daniel Rodriguez
d400d5b7dc Merge branch 'ent-8860-mejora-wizard-snmp' into 'develop' 
Applied fix for snmp

See merge request artica/pandorafms!4868
 2022-06-16 11:46:53 +00:00
Daniel Rodriguez
ae5c4dca24 Merge branch 'ent-9026-Buscador-roto-agregar-acciones-a-alerta-SNMP' into 'develop' 
Fix several issues with SNMP Alert view

See merge request artica/pandorafms!4913
 2022-06-16 11:35:40 +00:00
Daniel Rodriguez
928ef28f20 Merge branch 'ent-8971-13608-definicion-de-umbrales-en-plugin-oracle-database-agente-no-funciona' into 'develop' 
8971-13608-definicion-de-umbrales-en-plugin-oracle-database-agente-no-funciona

See merge request artica/pandorafms!4926
 2022-06-16 11:23:55 +00:00
edu.corral
4ee4590690 ent-9067 notifications fixed 2022-06-16 13:02:49 +02:00
alejandro.campos@artica.es
705ebb8168 fixed vc elements edition 2022-06-16 12:19:59 +02:00
Daniel Rodriguez
ba5693a961 Merge branch 'ent-8517-13067-Prefijo-en-módulo-Oracle-connection' into 'develop' 
Ent 8517 13067 prefijo en módulo oracle connection

See merge request artica/pandorafms!4881
 2022-06-16 10:15:29 +00:00
Rafael Ameijeiras
879cc4c094 merge 2022-06-16 11:54:14 +02:00
José González
32bfa233d5 Merge 2022-06-16 11:45:58 +02:00
Daniel Barbero Martin
8e7ed75b3e refactor events meta pandora_enterprise#9086 2022-06-16 11:31:07 +02:00
José González
bad0335502 Changed styles 2022-06-16 11:14:29 +02:00
José González
ea60e4be71 Added database changes 2022-06-16 11:14:00 +02:00
Calvo
f03b76a3ad Merge remote-tracking branch 'origin/develop' into ent-8896-discovery-y-satelite-cuando-detectamos-equipos-de-red-faltan-datos-basicos 2022-06-16 11:12:32 +02:00
Calvo
c46f1ac31a SNMP Bandwith modules on discovery task 2022-06-16 11:11:04 +02:00
Daniel Rodriguez
52cfd6b70a Merge branch 'ent-8899-13499-problema-con-conexion-db-hist-con-contrasenas-con-caracteres-especiales' into 'develop' 
Ent 8899 13499 problema con conexion db hist con contrasenas con caracteres especiales

See merge request artica/pandorafms!4852
 2022-06-16 09:03:28 +00:00
Daniel Rodriguez
fa28b5b7e1 Merge branch 'ent-9000-cambio-update-manager-a-warp-update' into 'develop' 
Ent 9000 cambio update manager a warp update

See merge request artica/pandorafms!4957
 2022-06-16 08:43:12 +00:00
Daniel Rodriguez
f34ec5dcc9 Merge branch 'ent-9022-Bug-histórico-de-actualizaciones' into 'develop' 
Ent 9022 bug histórico de actualizaciones

See merge request artica/pandorafms!4917
 2022-06-16 08:42:39 +00:00
Daniel Rodriguez
0bbfa02498 Merge branch 'ent-8673-13219-r-works-instalador-de-tentacle_server' into 'develop' 
ent-8673-13219-r-works-instalador-de-tentacle_server

See merge request artica/pandorafms!4958
 2022-06-16 07:54:23 +00:00
Daniel Rodriguez
6a72479771 Merge branch 'ent-9141-dependencias-que-faltan-para-instaladores' into 'develop' 
Adding dependencies to pandorafms rpm packages

See merge request artica/pandorafms!4961
 2022-06-16 07:16:49 +00:00
Daniel Rodriguez
28cc684c18 Merge branch 'ent-8871-GUARDIA-13422-Problema-con-timestamp-del-agente-datalist' into 'develop' 
minor fix

See merge request artica/pandorafms!4847
 2022-06-16 07:16:07 +00:00
Daniel Barbero Martin
acef7e6f63 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 
Conflicts:
	pandora_console/operation/events/events.php
 2022-06-16 09:09:49 +02:00
Daniel Maya
bb01bfe2d0 #8899 Fixed history_db_enabled 2 2022-06-16 08:44:09 +02:00
Daniel Rodriguez
74e2dcad26 Merge branch 'ent-9064-Cambiar-logo-en-CSS-blanco-estándar' into 'develop' 
Set new brand and color for header

See merge request artica/pandorafms!4944
 2022-06-16 06:43:21 +00:00
Daniel Rodriguez
d57394c0b9 Merge branch 'ent-8856-no-funciona-crear-componentes-en-metaconsola-api-2' into 'develop' 
Ent 8856 no funciona crear componentes en metaconsola api 2

See merge request artica/pandorafms!4955
 2022-06-16 06:42:38 +00:00
Daniel Rodriguez
ffdc8ee656 Merge branch 'ent-9032-Mejora-visual-eventos-largos-destrozan' into 'develop' 
Improve event names

See merge request artica/pandorafms!4951
 2022-06-16 06:41:07 +00:00
artica
592d09d34a Auto-updated build strings. 2022-06-16 01:00:17 +02:00
Daniel Barbero Martin
d22c667776 fixed VC pandora_enterprise#8888 2022-06-15 19:50:19 +02:00