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

24054 Commits

Author SHA1 Message Date
Daniel Rodriguez 846e6100b8 Merge branch 'ent-5395-Pelayo-Fallo-en-el-eje-de-titulos-de-los-custom-graphs-de-barra' into 'develop' 
fix format function for X axis of custom graphs

See merge request artica/pandorafms!3138
 2020-04-03 13:55:59 +02:00
Daniel Rodriguez a901e91274 Merge branch 'ent-5652-Grafica-de-modulo-en-los-email-gigante' into 'develop' 
Ent 5652 grafica de modulo en los email gigante

See merge request artica/pandorafms!3135
 2020-04-03 12:28:28 +02:00
Daniel Rodriguez 89e7d1921f Merge branch 'ent-5657-al-añadir-accion-en-la-lista-de-alertas-el-dialogo-modal-no-muestra-en-nombre-de-agente' into 'develop' 
fixed minnnor error

See merge request artica/pandorafms!3137
 2020-04-03 12:06:50 +02:00
Daniel Rodriguez c4bec9c36c Merge branch 'ent-5654-El-sistema-de-modificacion-de-notificaciones-no-funciona' into 'develop' 
minor visual changes on user notifications editor

See merge request artica/pandorafms!3134
 2020-04-03 11:29:53 +02:00
Alejandro Fraguas 23e3f69065 Merge branch 'ent-4827-8899-crear-nuevo-agente-con-binario-y-anadirlo-en-el-repositorio' into 'develop' 
spec version

See merge request artica/pandorafms!3129
 2020-04-03 10:44:41 +02:00
alejandro-campos 80ce89e650 fix format function for X axis of custom graphs 2020-04-03 10:41:24 +02:00
alejandro-campos 0c3a7166e0 fix format function for X axis of custom graphs 2020-04-03 10:34:54 +02:00
artica 297693a9d3 Auto-updated build strings. 2020-04-03 01:00:18 +02:00
marcos f229dada52 fixed minnnor error 2020-04-02 19:02:14 +02:00
Daniel Rodriguez 81e7e9a7d9 Merge branch 'ent-5656-Admin-lista-de-usuarios-cambios-menores-en-la-visualizacion' into 'develop' 
minor visual changes

See merge request artica/pandorafms!3132
 2020-04-02 15:25:40 +02:00
Daniel Maya 9b1d8a52de Fixed graph height when send email by alert 2020-04-02 14:58:03 +02:00
Daniel Rodriguez 1c596ea8af Merge branch 'ent-5640-9818-Alertas-SNMP-no-inserta-grupo-en-creacion-de-eventos' into 'develop' 
Ent 5640 9818 alertas snmp no inserta grupo en creacion de eventos

See merge request artica/pandorafms!3127
 2020-04-02 14:33:00 +02:00
Daniel Rodriguez 557864fdab Merge branch 'ent-5389-Errores-agente-debian' into 'develop' 
copy plugins instead of moving

See merge request artica/pandorafms!3124
 2020-04-02 14:32:23 +02:00
Daniel Rodriguez 16e7b4245d Merge branch 'ent-5604-policy-modules-japanese-bug' into 'develop' 
Ent 5604 policy modules japanese bug

See merge request artica/pandorafms!3120
 2020-04-02 14:30:02 +02:00
Luis bcd9aabcd8 Ent 5604 policy modules japanese bug 2020-04-02 14:30:02 +02:00
alejandro-campos 60c766ca29 minor visual changes on user notifications editor 2020-04-02 10:37:59 +02:00
artica e30b9a32d8 Auto-updated build strings. 2020-04-02 01:00:16 +02:00
alejandro-campos 6d6b891650 minor visual changes 2020-04-01 17:32:22 +02:00
artica f68d84940c Auto-updated build strings. 2020-04-01 01:00:19 +02:00
fbsanchez 9b63830f84 spec version 2020-03-31 19:03:40 +02:00
Daniel Maya 3f8948bc21 Added id_group in snmp alert 2020-03-31 15:26:41 +02:00
alejandro-campos 5ba4b3e523 copy plugins instead of moving 2020-03-31 10:11:37 +02:00
Alejandro Fraguas aee22eaf35 Merge branch 'ent-5630-Actualizar-el-cliente-de-eHorus-en-la-consola-de-Pandora' into 'develop' 
Fix bundle Ehorus

See merge request artica/pandorafms!3121
 2020-03-31 09:33:39 +02:00
daniel 263eaeeebd Fix bundle Ehorus 2020-03-31 09:33:39 +02:00
artica a2106a2056 Auto-updated build strings. 2020-03-31 01:00:18 +02:00
Daniel Rodriguez ea631afb52 Merge branch 'ent-5463-modificar-la-obtencion-de-logs-desde-la-consola-elastic' into 'develop' 
Deleted logstash

See merge request artica/pandorafms!3123
 2020-03-30 14:10:31 +02:00
artica 7991d6f215 Auto-updated build strings. 2020-03-30 01:00:14 +02:00
artica ea4b3bff04 Auto-updated build strings. 2020-03-29 01:00:15 +01:00
artica 9ca21e8768 Auto-updated build strings. 2020-03-28 01:00:19 +01:00
Daniel Maya b68f4d15e5 Deleted logstash 2020-03-27 14:36:42 +01:00
artica d2eac81d39 Auto-updated build strings. 2020-03-27 01:00:18 +01:00
Daniel Rodriguez 7578d5ebbe Merge branch 'ent-5353-Refactorizacion_de_los_dashboard' into 'develop' 
dashboards

See merge request artica/pandorafms!3043
 2020-03-26 12:29:38 +01:00
daniel 709201bf23 dashboards 2020-03-26 12:29:38 +01:00
Alejandro Fraguas 48fc714ba3 Merge branch 'ent-1775-SNMPServer.pm-CDE' into 'develop' 
added exception handler

See merge request artica/pandorafms!3119
 2020-03-26 10:32:08 +01:00
artica 63fca15ead Auto-updated build strings. 2020-03-26 01:00:17 +01:00
Daniel Rodriguez 87f2e434a4 Merge branch 'ent-5530-Mostrar-el-tiempo-en-que-un-elemento-se-ha-mantenido-en-un-estado' into 'develop' 
changes to show last status change of modules

See merge request artica/pandorafms!3114
 2020-03-25 18:10:09 +01:00
alejandro-campos 531e729ebe added N/A in case last status change is not set 2020-03-25 18:01:39 +01:00
alejandro-campos a8325653d4 add N/A in case time last_status_change is not set 2020-03-25 17:40:05 +01:00
alejandro-campos ecc6cd8f4e Merge branch 'ent-5530-Mostrar-el-tiempo-en-que-un-elemento-se-ha-mantenido-en-un-estado' of https://brutus.artica.es:8081/artica/pandorafms into ent-5530-Mostrar-el-tiempo-en-que-un-elemento-se-ha-mantenido-en-un-estado 2020-03-25 16:22:14 +01:00
alejandro-campos 4246c15157 add not available in case there is no last status change registered 2020-03-25 16:21:51 +01:00
Daniel Maya db3313c76d added exception handler 2020-03-25 15:42:55 +01:00
Daniel Rodriguez d9696051be Merge branch '5069-9071-proceso-tentacle-consume-memoria' into 'develop' 
Show a warning message if Net::SSLeay may leak memory.

See merge request artica/pandorafms!3117
 2020-03-25 14:48:38 +01:00
artica 29cac0477e Auto-updated build strings. 2020-03-25 01:00:16 +01:00
Daniel Rodriguez 415a9b4250 Merge branch 'ent-5250-Bug-con-nombres-en-la-task-list' into 'develop' 
fixed visual bug in table

See merge request artica/pandorafms!3071
 2020-03-24 14:17:21 +01:00
Alejandro Fraguas 55c2d7d3e3 Merge branch 'ent-5003-8862-Error-plugin-route-parser-cuando-hay-bucles' into 'develop' 
Avoid self parent

See merge request artica/pandorafms!3118
 2020-03-24 14:11:16 +01:00
Alejandro Campos b56076044b Merge branch 'develop' into 'ent-5530-Mostrar-el-tiempo-en-que-un-elemento-se-ha-mantenido-en-un-estado' 
# Conflicts:
#   pandora_console/extras/mr/37.sql
 2020-03-24 13:55:57 +01:00
Alejandro Fraguas e4ea3e036b Merge branch 'ent-5597-9746-primera-carga-de-filtro-no-funciona' into 'develop' 
Fixed tags_without

See merge request artica/pandorafms!3116
 2020-03-24 11:32:33 +01:00
Alejandro Fraguas b6bc6c9c30 Merge branch 'ent-5439-Error-grafica-eventos-de-agente' into 'develop' 
Ent 5439 error grafica eventos de agente

See merge request artica/pandorafms!3113
 2020-03-24 10:12:14 +01:00
Tatiana Llorente 4777ecd4bf Ent 5439 error grafica eventos de agente 2020-03-24 10:12:14 +01:00
alejandro-campos 6d7715c67f Avoid self parent 2020-03-24 09:56:43 +01:00