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

14848 Commits

Author SHA1 Message Date
vgilc 65a1ebae77 Merge branch '375_Agente_xml_buffer_y_modo_secundario_always' into 'develop' 
fixed errors in agent buffered always

See merge request !686
 2017-07-24 11:11:01 +02:00
Ramon Novoa 17229cbcd7 Add a script to count .data files by agent. 2017-07-24 11:09:41 +02:00
artica f3d6d7262e Auto-updated build strings. 2017-07-24 00:01:17 +02:00
artica c51cf9774f Auto-updated build strings. 2017-07-23 00:01:13 +02:00
artica b5caec31b5 Auto-updated build strings. 2017-07-22 00:01:45 +02:00
daniel aa5d18ff3f fixed errors in agent buffered always 2017-07-21 14:45:23 +02:00
artica 1d35620ea6 Auto-updated build strings. 2017-07-21 00:01:16 +02:00
vgilc 74f3c15f91 Merge branch '1088-Macros-en-automatic-combined-graph-plantillas-de-informes-open-u-2' into 'develop' 
Fix labels - #1088

See merge request !684
 2017-07-20 15:58:57 +02:00
enriquecd ef007f8a6f Fix labels - #1088 2017-07-20 15:53:43 +02:00
vgilc 4185cc6687 Merge branch '1088-Macros-en-automatic-combined-graph-plantillas-de-informes-open-u' into 'develop' 
1088 macros en automatic combined graph plantillas de informes open u

See merge request !683
 2017-07-20 15:34:03 +02:00
Enrique Camargo 9cc461ec8b Update functions_reporting.php 2017-07-20 15:23:46 +02:00
enriquecd f88f375ea3 Filter agents by server automatico module graph and fix bug - #1088 2017-07-20 15:14:20 +02:00
vgilc 8971560f5d Merge branch '412-consola-visual-Módulo-imagen-2-size' into 'develop' 
Fix restore element width when press double click over data image simple_value - #412

See merge request !681
 2017-07-20 09:42:31 +02:00
artica 728fb7cc69 Auto-updated build strings. 2017-07-20 00:01:18 +02:00
enriquecd 31a8995176 Fix restore element width when press double click over data image simple_value - #412 2017-07-19 19:02:20 +02:00
vgilc ef0e6a2093 Merge branch '713-Asignar-políticas-a-grupos-dev' into 'develop' 
713 asignar políticas a grupos dev

See merge request !667
 2017-07-19 09:55:10 +02:00
artica b8b6937284 Auto-updated build strings. 2017-07-19 00:01:16 +02:00
vgilc d36fef16c0 Merge branch 'ent-1050-el-instalador-de-tarball-del-agente-no-lo-para-despues-de-desinstalar' into 'develop' 
Stop agent on uninstall tarball

See merge request !673
 2017-07-18 18:34:57 +02:00
fermin831 1c059f5afc Stop agent on uninstall tarball 2017-07-18 17:28:26 +02:00
vgilc fb1e51301d Merge branch '1008-fallo-del-instalador-de-debian-del-agente-de-pandora' into 'develop' 
Avoid to launch postinst script on Debian remove fail

See merge request !671
 2017-07-18 17:15:50 +02:00
fermin831 4da7b08f84 Avoid to launch postinst script on Debian remove fail 2017-07-18 16:23:45 +02:00
vgilc 97cfe0260a Merge branch '815-modify-debug-text-line-in-pandora_agent.conf-files-dev' into 'develop' 
Added new comment to debug in conf

See merge request !669
 2017-07-18 13:44:25 +02:00
Arturo Gonzalez a331de63eb Added new comment to debug in conf 2017-07-18 13:31:50 +02:00
vgilc 6dba0a5040 Merge branch 'develop' into '713-Asignar-políticas-a-grupos-dev' 
# Conflicts:
#   pandora_console/extras/mr/4.sql
 2017-07-18 12:24:49 +02:00
Daniel Maya f0e43e252c New feature: Add groups to policies 2017-07-18 12:06:57 +02:00
artica d65ad2693e Auto-updated build strings. 2017-07-18 00:01:17 +02:00
vgilc e56eac3648 Merge branch 'MR4-1015' into 'develop' 
Set texport_server table name field varchar 600 - #1015

See merge request !664
 2017-07-17 17:05:00 +02:00
vgilc 393a1e2ee0 Merge branch '815-update-conf-info-about-debug-mode-dev' into 'develop' 
Changed conf description

See merge request !663
 2017-07-17 17:03:42 +02:00
vgilc 7dd0e989fa Merge branch '412-consola-visual-Módulo-imagen' into 'develop' 
Add data image option to simple data visual console element - #412

See merge request !584
 2017-07-17 17:03:04 +02:00
enriquecd 4aa04cfef0 Set texport_server table name field varchar 600 - #1015 2017-07-17 16:19:38 +02:00
vgilc 66ad86a302 Merge branch '1015-Aumentar-tamaño-del-campo-nombre-en-tabla-texport_server_data' into 'develop' 
Change tserver_export_data to varchar 600 - #1015

See merge request !600
 2017-07-17 15:41:45 +02:00
Arturo Gonzalez dd6e4a3bd8 Changed conf description 2017-07-17 11:26:22 +02:00
vgilc 0bd74d92f0 Merge branch '1040-autorefresh-in-user-section-is-separated-by-user-dev' into 'develop' 
Added refresh by user

See merge request !607
 2017-07-17 10:54:06 +02:00
vgilc cdb00253b6 Merge branch '1131-create-MR-number-4-dev' into 'develop' 
Added db changes to package 708

See merge request !662
 2017-07-17 10:51:42 +02:00
Arturo Gonzalez 1ea465b7d4 Added db changes to package 708 2017-07-17 10:46:26 +02:00
Enrique Camargo 1e7fbc443e Merge branch 'develop' into '412-consola-visual-Módulo-imagen' 
# Conflicts:
#   pandora_console/godmode/reporting/visual_console_builder.editor.js
 2017-07-17 10:39:20 +02:00
Daniel Maya c13644951f update agent 2017-07-17 09:22:28 +02:00
artica 3fb887f516 Auto-updated build strings. 2017-07-17 00:01:15 +02:00
artica c5c748c831 Auto-updated build strings. 2017-07-16 00:01:15 +02:00
artica 8f88f87203 Auto-updated build strings. 2017-07-15 00:01:15 +02:00
artica 65cbbd1bae Auto-updated build strings. 2017-07-14 00:01:19 +02:00
vgilc f8a1b77158 Merge branch '1115-Redimensiónde-los-iconos-y-texto-en-mapas-GIS' into 'develop' 
Hold mark labels font size when autorefresh and fix drag map font size bug - #1115

See merge request !660
 2017-07-13 17:16:49 +02:00
vgilc 43a975141c Merge branch '719-Color-de-gráficas-en-widgets-dev' into 'develop' 
added graph colors in dahsboard

See merge request !563
 2017-07-13 15:30:21 +02:00
Daniel Maya 27077dad6f Resolving conflicts 2017-07-13 15:23:22 +02:00
vgilc 54b90c75fe Merge branch '1019-Editar-modulo-no-muestra-nombre' into 'develop' 
Fix module editor can not show name with quotes - #1019

See merge request !587
 2017-07-13 13:17:34 +02:00
vgilc f10e67342d Merge branch '844-Error-en-la-posición-al-crear-un-elemento-con-imagen-en-las-consolas-visuales' into 'develop' 
Fix image align when create a static graph in vconsole - #844

See merge request !642
 2017-07-13 13:15:26 +02:00
vgilc bb02b2307b Merge branch '1013-snmp-alert-dont-send-agent-alias-dev' into 'develop' 
Added alias to snmp alert agent object

See merge request !604
 2017-07-13 12:43:10 +02:00
Arturo Gonzalez 230c617c02 Merge branch 'develop' into 1013-snmp-alert-dont-send-agent-alias-dev 
pandora_server/lib/PandoraFMS/Core.pm
 2017-07-13 12:33:27 +02:00
vgilc c2c677de65 Merge branch '1014-Aparece-el-agent-name-en-lugar-del-alias-en-la-consola-SNMP-dev' into 'develop' 
Changed agent name by alias

See merge request !590
 2017-07-13 12:11:18 +02:00
Enrique Camargo 0ff56b0856 Update openlayers.pandora.js 2017-07-13 12:07:53 +02:00