15600 Commits

Author SHA1 Message Date
Daniel Maya
b9851a3a71 code backup 2017-10-31 11:51:19 +01:00
vgilc
39123869a2 Merge branch 'ent-1353-cron-jobs-save-custom-xml-report-to-disk' into 'develop'
Moved xml report generation to a function

See merge request artica/pandorafms!839
2017-10-26 11:39:34 +02:00
vgilc
197e9a4a30 Merge branch '1367-radial-dinamic-details-dev' into 'develop'
Added 3 and 4 points

See merge request artica/pandorafms!882
2017-10-26 11:32:28 +02:00
vgilc
c38546fa65 Merge branch '1386-Elemento-histograma-en-el-editor-se-ve-raro' into 'develop'
Change auto sla graphs size in visual console editor mode - #1386

See merge request artica/pandorafms!897
2017-10-26 11:19:23 +02:00
vgilc
3d897f6f3f Merge branch '1394-Errores-tema-black' into 'develop'
Change styles for pandora black theme - #1394

See merge request artica/pandorafms!910
2017-10-26 11:16:21 +02:00
vgilc
8a39b25ee0 Merge branch 'ent-1404-no-estan-funcionando-correctamente-los-watchdog-de-procesos-windows' into 'develop'
Added module_user_session token to module_proc on windows agent

See merge request artica/pandorafms!916
2017-10-26 11:15:29 +02:00
vgilc
99e2b07e23 Merge branch 'ent-1415-falta-espacio-en-nombre-de-evento-al-reiniciar-server' into 'develop'
Added space on restart server event

See merge request artica/pandorafms!876
2017-10-26 11:14:45 +02:00
vgilc
0604dfedbf Merge branch '1433-Mensaje-No-data-to-show-diferentes-en-graficas-de-modulos-y-de-interfaces' into 'develop'
Change image_problem no data sign to image_problem_area_small - #1433

See merge request artica/pandorafms!908
2017-10-26 11:13:31 +02:00
vgilc
3ff14bb001 Merge branch '895-Borrado-masivo-de-informes-7' into 'develop'
Add multiple checkbox selector for report delete - #895

See merge request artica/pandorafms!596
2017-10-26 11:08:47 +02:00
vgilc
f654bdd241 Merge branch '1113-Enumeración-recursiva-de-grupos-en-vista-agente-modulo-3805-media-open' into 'develop'
Add recursion group search for agent/module view and angent/module item in reports - #1113

See merge request artica/pandorafms!812
2017-10-26 11:07:46 +02:00
vgilc
0d6804d052 Merge branch '1121-Icono-personalizado-por-agente-en-mapas-GIS-4283-2' into 'develop'
Add agent icon group marker option in setup visuals for GIS maps - #1121

See merge request artica/pandorafms!848
2017-10-26 11:06:48 +02:00
vgilc
1898896e96 Merge branch 'ent-1290-monitorizacion-de-windows-module_logevent' into 'develop'
Ent 1290 monitorizacion de windows module logevent

See merge request artica/pandorafms!975
2017-10-26 11:04:59 +02:00
vgilc
00c8efb335 Merge branch '1364-Graficas-gauge-no-muestran-umbrales-menores-a-1' into 'develop'
Unable show float numbers in gauge charts - #1364

See merge request artica/pandorafms!896
2017-10-26 10:39:57 +02:00
vgilc
e1c3e55582 Merge branch 'ent-1411-pandora_manage---get_module_data-con-modulos-incrementales' into 'develop'
Fixed inc modules on pandora manage --get_module_data

See merge request artica/pandorafms!894
2017-10-26 10:39:16 +02:00
vgilc
5e8b4491fe Merge branch '1334-Dashboards-con-widgets-que-contienen-una-consola-visual-con-elementos-Auto-SLA-Graph' into 'develop'
Fix resize sla graphs in visual console - #1334

See merge request artica/pandorafms!915
2017-10-26 10:00:33 +02:00
vgilc
0249234b20 Merge branch 'ent-1408-last-value-en-plantillas-de-informes' into 'develop'
Fixed last value on general template reports and individual reports

See merge request artica/pandorafms!898
2017-10-26 09:56:07 +02:00
vgilc
9767f9bb9e Merge branch 'ent-1436-opciones-avanzadas-cron-modulos-sinteticos-no-funciona-correctamente' into 'develop'
Fixed cron on server modules

See merge request artica/pandorafms!914
2017-10-26 09:54:29 +02:00
vgilc
e344ad8de8 Merge branch '1441-Busqueda-y-ordenacion-no-funcionan-correctamente-en-Gestionar-agentes-Carrefour' into 'develop'
Uncomment collation order for case insensitive agent search - #1441

See merge request artica/pandorafms!913
2017-10-26 09:53:45 +02:00
vgilc
3c15924037 Merge branch '1456-Errores-en-paradas-planificadas-dev' into 'develop'
fixed icon with planned downtime

See merge request artica/pandorafms!937
2017-10-26 09:53:01 +02:00
vgilc
64117e2744 Merge branch 'tardanza-en-vista-de-arbol-carrefour' into 'develop'
Tardanza en vista de arbol carrefour

See merge request artica/pandorafms!924
2017-10-26 09:51:34 +02:00
artica
0a74291730 Auto-updated build strings. 2017-10-26 00:01:09 +02:00
vgilc
8fa33a2401 Merge branch '1487-Problemas_varios_en_consolas_visuales_4' into 'develop'
fixed error in visual console link

See merge request artica/pandorafms!966
2017-10-25 11:12:44 +02:00
daniel
cb0bc1bd33 fixed error in visual console link 2017-10-25 11:01:12 +02:00
vgilc
144bf0ef13 Merge branch 'cherry-pick-a235abb9' into 'develop'
Removed unwanted trace (pandora_module_service.cc)

See merge request artica/pandorafms!948
2017-10-25 09:43:40 +02:00
artica
fc81469b7c Auto-updated build strings. 2017-10-25 00:01:09 +02:00
vgilc
934ed84fd5 Merge branch '1487-Problemas_varios_en_consolas_visuales_3' into 'develop'
fixed errors visual console

See merge request artica/pandorafms!963
2017-10-24 18:22:50 +02:00
daniel
4ef0c6cd5f fixed errors visual console 2017-10-24 18:14:57 +02:00
vgilc
e49f921ee8 Merge branch '1487-Problemas_varios_en_consolas_visuales_2' into 'develop'
fixed errors in visual console

See merge request artica/pandorafms!960
2017-10-24 17:19:21 +02:00
daniel
92d2179469 updated version 2017-10-24 17:11:56 +02:00
daniel
b23b9448b6 fixed errors in visual console 2017-10-24 17:03:35 +02:00
fermin831
854adac713 Added module_logchannel implementation to agent on module_factory 2017-10-24 13:05:31 +02:00
fermin831
7e4363b87a Added module_pattern to module_logchannel 2017-10-24 12:56:12 +02:00
fermin831
e748fb025c Added filter by code and event type to module_logchannel 2017-10-24 12:41:47 +02:00
fermin831
da06d78b1c Get the log time to put the properly timestamp on XML on module_logchannel 2017-10-24 11:32:43 +02:00
vgilc
1dd8f630f8 Merge branch '1066-Traducción-erronea-al-actualizar-configuración-en-setup-setup-General-setup' into 'develop'
Fix translation - #1066

See merge request artica/pandorafms!955
2017-10-24 08:48:47 +02:00
artica
326b1a0828 Auto-updated build strings. 2017-10-24 00:01:10 +02:00
enriquecd
5ef2b24a56 Fix translation - #1066 2017-10-23 19:11:58 +02:00
artica
906201a34c Updated version and build strings. 2017-10-23 17:45:29 +02:00
vgilc
7e88dd720e Merge branch 'fix-snmp-alerts-double-encode' into 'develop'
eventos-de-alertas-snmp-tienen-codificacion-html-en-la-aplicacion-de-android-ext-4282

See merge request artica/pandorafms!950
2017-10-23 17:24:36 +02:00
Alejandro Gallardo Escobar
edcff5e1f1 [Pandora Server] Added a decode to the alert description before the event creation, to avoid a double encode with HTML entities 2017-10-23 16:23:30 +02:00
fermin831
423e6f29e1 Removed unwanted trace (pandora_module_service.cc)
(cherry picked from commit a235abb903a89881126745ca63ca8b2775240a90)
2017-10-23 15:53:07 +02:00
fermin831
a235abb903 Removed unwanted trace (pandora_module_service.cc) 2017-10-23 15:51:58 +02:00
vgilc
d443bc03ab Merge branch '1478-Filtro-para-consolas-visuales-dev' into 'develop'
Fixed issue in filter visual console

See merge request artica/pandorafms!947
2017-10-23 15:44:08 +02:00
Daniel Maya
5eacf15d65 Fixed issue in filter visual console 2017-10-23 15:37:07 +02:00
vgilc
9de7f7591d Merge branch '1478-Problemas_varios_en_consolas_visuales' into 'develop'
1478 problemas varios en consolas visuales

See merge request artica/pandorafms!944
2017-10-23 11:06:51 +02:00
fermin831
68ac55e33c Added first version of new windows module type module_logchannel 2017-10-23 10:43:12 +02:00
daniel
12f51156f8 fixed error background image metaconsole 2017-10-23 10:35:57 +02:00
vgilc
3fcf01f886 Merge branch '1478-Filtro-para-consolas-visuales--Carrefour]-dev' into 'develop'
added filter in VISUAL CONSOLE

See merge request artica/pandorafms!942
2017-10-23 09:12:32 +02:00
artica
f59c4f591c Auto-updated build strings. 2017-10-23 00:01:07 +02:00
artica
50c0447d85 Auto-updated build strings. 2017-10-22 00:01:08 +02:00