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

3545 Commits

Author SHA1 Message Date
enriquecd efcc8b4ea7 Show no data advice when select none in visual console static graph or icon element - #1407 2017-10-09 17:57:20 +02:00
enriquecd c86bd5cc3c Fix pandora diag texts and delete old secitons files - #1350 2017-10-09 15:36:28 +02:00
enriquecd 99d5527c67 Fix labels for static graphs with image inserted, and avoid create without icon image - #1406 2017-10-09 12:56:37 +02:00
Arturo Gonzalez 8980edf2ad Adapt new items to meta 2017-10-09 12:55:57 +02:00
Daniel Maya 076e9cfec0 Changed period in functions_html 2017-10-09 12:25:01 +02:00
Arturo Gonzalez 4cb4a699a5 Added minor changes to percent items 2017-10-09 11:57:31 +02:00
vgilc f8023bf44a Merge branch '145-plain-text-mail-cannot-be-send-by-email' into 'develop' 
add send mail plain/text

See merge request !862
 2017-10-09 10:11:27 +02:00
Arturo Gonzalez 7410d66192 Bubble item and percentile bar item are new. Fixed some visual errors 2017-10-06 14:04:20 +02:00
enriquecd d7ebacf2dc Change auto sla graphs size in visual console editor mode - #1386 2017-10-06 14:03:44 +02:00
daniel 45743e2dc5 Merge branch 'develop' into 1335-Configurar_graficas_full_scale_por_defecto 2017-10-06 08:37:56 +02:00
Arturo Gonzalez 3b03bfe6b5 Added modifications to value option 2017-10-05 17:33:37 +02:00
Arturo Gonzalez 675426c3e0 Added the new item. Only to db and js creation and update. 2017-10-05 13:10:19 +02:00
enriquecd ca24fbc270 Change token text in general setup - #1255 2017-10-05 12:58:40 +02:00
enriquecd 570a209861 Db maintenance section is now called Admin tools with only admin access permission, erase all subsection except db interface and db status - #1350 2017-10-04 19:02:45 +02:00
Arturo Gonzalez 14095053cc Added good size to form elements 2017-10-04 18:01:01 +02:00
vgilc 563b903012 Merge branch '1373-agent-name-en-lugar-de-alias-en-módulos-sintéticos-dev' into 'develop' 
changed agent name by alias in module_manager_editor_prediction.php

See merge request !861
 2017-10-04 17:44:29 +02:00
vgilc d181edc471 Merge branch '393-Feature-para-mostrar-los-timesticks-en-Dias-Horas-Minutos-Seg-dev' into 'develop' 
New feature. Dynamic units

See merge request !818
 2017-10-04 17:41:37 +02:00
vgilc 13f12baa33 Merge branch '1255-Opcion-para-tener-Alias-as-name-por-defecto-4463-vodat' into 'develop' 
Use alias as name with option default tconfig - #1255

See merge request !803
 2017-10-04 15:52:17 +02:00
vgilc 45c35a1a0f Merge branch '1251-export-data-to-csv-in-graph-container-dev' into 'develop' 
Fixed error in js library and added good export to graph container graphs

See merge request !828
 2017-10-04 14:28:38 +02:00
vgilc df8210924c Merge branch '1266-Checkbox-All-modules-en-operaciones-masivas-4472-onenet' into 'develop' 
Prevent select any and others options at the same time for agents/modules multis…

See merge request !829
 2017-10-04 11:06:39 +02:00
enriquecd 76ae95ead4 Add new font sizes for visual console - #1388 2017-10-03 11:52:26 +02:00
enriquecd 788265713e Graph and table mode for max, min and avg reports an template reports - #654 2017-10-02 18:23:26 +02:00
daniel 9a66aa52f2 add send mail plain/text 2017-09-27 13:42:02 +02:00
Daniel Maya 078955a830 changed agent name by alias in module_manager_editor_prediction.php 2017-09-27 13:37:46 +02:00
daniel 4ec6b4e053 add new select to setup for TIP 2017-09-26 11:53:57 +02:00
Daniel Maya 237755a84c Merge branch 'develop' into '393-Feature-para-mostrar-los-timesticks-en-Dias-Horas-Minutos-Seg-dev' 
# Conflicts:
#   pandora_console/include/functions_graph.php
 2017-09-25 15:34:39 +02:00
Daniel Maya f67a4d90ae Dynamic unit in massive edit modules 2017-09-25 14:51:45 +02:00
daniel 00f779817d fixed errors in report interfaces 2017-09-25 13:26:04 +02:00
daniel 7a8135f36d fixed error merge dani 2017-09-25 09:45:58 +02:00
enriquecd 69f670d851 Add agent icon group marker option in setup visuals for GIS maps - #1121 2017-09-22 15:07:13 +02:00
daniel feae62f11c add tip reports simple graph 2017-09-22 11:39:54 +02:00
Arturo Gonzalez bc077c8a7d Added disable agents in policy when js is crazy 2017-09-21 12:22:55 +02:00
enriquecd 4aa4d44d0f Prevent select any and others options at the same time for agents/modules multiselect in modules bulk operations - #1266 2017-09-19 19:14:25 +02:00
Arturo Gonzalez ae657210f8 Fixed error in js library and added good export to graph container graphs 2017-09-19 17:46:12 +02:00
enriquecd e05d0bab25 Compatible with all browsers - #1245 2017-09-18 11:07:59 +02:00
vgilc 08ac4c2f35 Merge branch '161-Massive-Operations-remains-at-Console' into 'develop' 
"Massive Operations" had remained at Pandora Console.

Closes #161

See merge request !729
 2017-09-18 10:12:41 +02:00
Arturo Gonzalez eb6e67e1ca Added servers sction in menu to RR perms 2017-09-14 17:56:57 +02:00
Daniel Maya 44623f780e Fixed ordering and repetition modules 2017-09-14 17:34:00 +02:00
Daniel Maya d7f3e1ecde New feature. Dynamic units 2017-09-14 12:10:41 +02:00
enriquecd 7b2e2fadc6 Let create a group status visual map element without image selected - #1245 2017-09-13 17:07:35 +02:00
enriquecd dc33195358 Add recursion group search for agent/module view and angent/module item in reports - #1113 2017-09-11 17:20:07 +02:00
Enrique Camargo ae987427d7 Merge branch 'develop' into '624-Operaciones-multiples-con-elementos-de-la-consola-visual' 
# Conflicts:
#   pandora_console/godmode/reporting/visual_console_builder.editor.js
 2017-09-11 10:44:17 +02:00
vgilc 508a594dba Merge branch '1154-Fallo-en-creación-de-paradas-programadas-en-modo-quiet-dev' into 'develop' 
Added modules selection mode

See merge request !804
 2017-09-11 09:53:06 +02:00
vgilc da0294b872 Merge branch '1245-Anadir-resumen-de-grupos-como-elemento-de-consola-visual' into 'develop' 
Add show_statistics option for group item - #1245

See merge request !766
 2017-09-11 09:45:45 +02:00
vgilc da0394cc81 Merge branch '1237-Ampliar_caracteres_para_box_de_comunidad_SNMP_en_operaciones_masivas_v7' into 'develop' 
fixed snmp comunity field

See merge request !783
 2017-09-11 09:44:55 +02:00
vgilc fecd2b14e4 Merge branch '1168-icon-in-agents-know-if-is-in-planned-downtime-dev' into 'develop' 
Added image to planned downtime

See merge request !772
 2017-09-11 09:32:49 +02:00
enriquecd 3919edcbd8 Add snmp oid field in module bulk operations - #1205 2017-09-08 13:39:20 +02:00
Daniel Maya 32fa42a378 Added modules selection mode 2017-09-08 12:32:21 +02:00
enriquecd 74e4ae3f71 Use alias as name with option default tconfig - #1255 2017-09-08 12:11:15 +02:00
enriquecd d290d69d33 Now the label editor color is changed by the mouse scroll - #1103 2017-09-08 11:15:29 +02:00
vgilc c2a132255c Merge branch '1057-No-muestra-imagenes-PNG-en-el-custom-logo-de-los-informes-OPEN' into 'develop' 
Let use png logo images for reports - #1057

See merge request !625
 2017-09-08 10:13:35 +02:00
Daniel Maya c8bbe92412 Merge branch '125-Gestión-recolección-y-correlación-de-logs-dev' of https://192.168.50.5:8081/artica/pandorafms into 125-Gestión-recolección-y-correlación-de-logs-dev 2017-09-07 16:16:16 +02:00
Daniel Maya a66a210db1 Update log report 2017-09-07 16:15:17 +02:00
enriquecd da3905a593 Apply comfort displacement to update button in visual styles section - #1228 2017-09-07 13:25:39 +02:00
daniel 8f9fd4cf3d fixed snmp comunity field 2017-09-05 14:39:36 +02:00
vgilc daca367320 Merge branch '832-pandora-exec-proxy-xml-description-dev' into 'develop' 
Added safe output to conf

See merge request !781
 2017-09-05 13:20:32 +02:00
Arturo Gonzalez bc63e8051e Added safe output to conf 2017-09-05 12:51:39 +02:00
daniel 4430a7b2fe fixed errors in autocomplete field 2017-09-05 12:35:21 +02:00
Arturo Gonzalez 4d469426a5 Added specs from MPulido 2017-09-05 11:46:44 +02:00
Arturo Gonzalez 3a9895b97b Added min size to the field 2017-09-04 16:58:55 +02:00
vgilc 09f92b51ae Merge branch '832-server-proxy-final-details-dev' into 'develop' 
Added last specifications to pandora exec proxy

See merge request !775
 2017-09-04 16:33:11 +02:00
Arturo Gonzalez 018f449fc8 Added last specifications to pandora exec proxy 2017-09-04 16:02:58 +02:00
daniel a04e02570f Merge branch 'develop' into 1056-pandora-wux-grid-server 2017-09-04 14:09:08 +02:00
daniel f0862e1c5b fixed minor errors in WUX 2017-09-04 12:09:19 +02:00
Arturo Gonzalez 4ebc081855 Added image to planned downtime 2017-09-04 10:26:30 +02:00
nramon 13894ba403 Merge branch '832-server-proxy-details-dev' into 'develop' 
Added details to agent wizard and secundary servers

See merge request !770
 2017-09-01 11:36:53 +02:00
daniel d74a3f74b4 Merge branch 'develop' into 1056-pandora-wux-grid-server 2017-09-01 10:51:54 +02:00
Arturo Gonzalez a80f62003c Added details to agent wizard and secundary servers 2017-09-01 10:44:26 +02:00
enriquecd ac0820b9b4 change url in preview qr code in agent view - #1229 2017-08-31 15:57:34 +02:00
enriquecd f6c6e2a6ba Add show_statistics option for group item - #1245 2017-08-31 15:09:04 +02:00
nramon 17201b5dd8 Merge branch '1190-Error-in-module-cascade-selector-dev' into 'develop' 
Do the autocomplete field correct

See merge request !761
 2017-08-31 11:36:44 +02:00
slerena 0a11d3d086 Merge branch '1228-massive-module-deletes-all-modules-with-any-tag-dev' into 'develop' 
Fixed "any" filter with selects unknown and not init modules in massive delete operation

See merge request !756
 2017-08-30 17:50:15 +02:00
Arturo Gonzalez 0eabf7a0ce Do the autocomplete field correct 2017-08-30 15:52:28 +02:00
daniel b078d48918 fixed errors in wux 2017-08-30 09:47:57 +02:00
slerena 9c4eb3086e Merge branch '832-exec-proxy-dev' into 'develop' 
832 exec proxy dev

See merge request !755
 2017-08-29 16:11:03 +02:00
Arturo Gonzalez 32ad745c62 Added filter when id groups comes empty 2017-08-29 11:32:25 +02:00
Arturo Gonzalez 8daa66d6ee Added option to set exec proxy in server 2017-08-29 11:14:42 +02:00
fbsanchez 9a8e80bf68 Updates wux_module to web_analysis 2017-08-28 19:55:01 +02:00
Arturo Gonzalez 0e7b00f26e Added correct user and fixed db error 2017-08-28 16:38:30 +02:00
Arturo Gonzalez fc0db16d5e Fixed "any" filter with selects unknown and not init modules in massive delete operation 2017-08-28 15:47:16 +02:00
Arturo Gonzalez bab1f14a31 Added remote command execute to agent wizard 2017-08-28 12:44:51 +02:00
enriquecd 8b718371f9 Fix agent view qr mobile code - #1229 2017-08-24 16:09:04 +02:00
Arturo Gonzalez f021bedb5c Added proxy servers to events response form 2017-08-24 12:34:06 +02:00
Arturo Gonzalez 2521727ee1 Added ssh check connection 2017-08-24 11:05:10 +02:00
Arturo Gonzalez dce27f3ac2 Added new items to satellite editor view 2017-08-23 15:01:09 +02:00
daniel c29d8a4fdb Revert "merge develop" 
This reverts commit 8232911713, reversing
changes made to f5da86ac0a.
 2017-08-23 09:35:17 +02:00
daniel 8232911713 merge develop 2017-08-22 18:39:34 +02:00
daniel f5da86ac0a no apply policies in wux 2017-08-22 11:39:21 +02:00
vgilc 453838942e Merge branch '122-mensaje-de-error-en-gestion-de-usuarios-ext-3871-v7-0' into 'develop' 
If result param is null not show bad result message when delete,disable user - #122

See merge request !368
 2017-08-18 13:18:08 +02:00
vgilc 7d1a7103ad Merge branch '1190-Fallo-al-buscar-módulos-de-agente-en-protección-en-cascada-dev' into 'develop' 
Fixed issue to search agent modules in cascade protection

See merge request !717
 2017-08-18 13:05:01 +02:00
vgilc 7ce67ef053 Merge branch '1090-bad-event-custom-field-dev' into 'develop' 
Removed event custom field (id)

See merge request !649
 2017-08-18 13:04:12 +02:00
vgilc 93c03da3fe Merge branch '1091-Fixed-key-sensitive-search-in-agents-list-dev' into 'develop' 
Fixed search field in agents list

See merge request !650
 2017-08-18 13:01:01 +02:00
vgilc d858d4840a Merge branch '1111-Columna-email-error-en-vista-de-informes-dev' into 'develop' 
Fixed email column

See merge request !668
 2017-08-18 12:44:26 +02:00
vgilc 870be2c4ea Merge branch '1191-Fallo-en-base-de-datos-para-actualizar-protección-en-cascada-dev' into 'develop' 
Fixed issue with cascade_protection_module

See merge request !720
 2017-08-18 12:34:31 +02:00
Daniel Maya 3c18f706fa fixed errors in visual console on simple value 2 2017-08-16 10:38:02 +02:00
daniel 4b26cf119c fixed errors visual console 2017-08-16 10:38:02 +02:00
Hirofumi Kosaka 70a226540e "Massive Operations" had remained at Pandora Console. #161 2017-08-14 12:03:35 +09:00
Daniel Maya 5973ec7545 fixed errors in visual console on simple value 2 2017-08-11 11:48:25 +02:00
daniel 33ccab173e fixed errors visual console 2017-08-11 09:13:26 +02:00
daniel 1d7d55a451 fixed errors in form wux 2017-08-09 13:27:51 +02:00
daniel 788cb8cbd8 fixed errors in form wux 2017-08-09 12:08:52 +02:00
daniel 7e649b78b3 wux new form 2017-08-09 11:29:16 +02:00
daniel be0a91ed2c fixed minor error sql delete module 2017-08-09 10:35:57 +02:00
daniel 4cbd005137 fixed error in graph container 2017-08-08 12:07:28 +02:00
Daniel Maya 3ef3679f10 Fixed issue with cascade_protection_module 2017-08-08 10:38:30 +02:00
daniel 6a2d3a7011 fixed minor error 2017-08-07 17:02:56 +02:00
Daniel Maya 97392c4568 Fixed issue to search agent modules in cascade protection 2017-08-07 13:10:02 +02:00
Hirofumi Kosaka 76c951183c [bug fix] deleting a module had caused unextected alert deletion. #156 2017-08-02 15:41:44 +09:00
artu30 14a439faab Merge branch 'develop' into '618-new-item-auto-sla-graph-in-visual-console-dev' 
# Conflicts:
#   pandora_console/godmode/reporting/visual_console_builder.editor.js
#   pandora_console/include/functions_visual_map_editor.php
#   pandora_console/include/graphs/flot/pandora.flot.js
 2017-07-28 10:30:17 +02:00
vgilc e2a175327e Merge branch '1140-Gráficas_con_entities' into 'develop' 
fixed errors entities in mail

See merge request !682
 2017-07-28 10:21:04 +02:00
vgilc 333171c2b6 Merge branch '1124-4288-agrupar-graficas-combinadas-ii_open' into 'develop' 
fixed errors in graph container

See merge request !688
 2017-07-28 10:19:15 +02:00
Arturo Gonzalez 02ce575d9f Added a last fix 2017-07-27 12:39:38 +02:00
Arturo Gonzalez 39f4b48d84 Added some changes about update modules from local component with macros 2017-07-27 11:08:19 +02:00
enriquecd 240b6e017f Adapt historical_db checkbox for sql reports to sql templates - #1157 2017-07-26 13:50:55 +02:00
Arturo Gonzalez 82b6904289 Changed some lines in configurar_agente 2017-07-26 13:36:42 +02:00
daniel 4dfbdca423 add new field table view agents for type of agent 2017-07-24 15:53:31 +02:00
daniel 741cc05268 fixed errors in graph container 2017-07-24 10:53:04 +02:00
daniel 66d9dd9d27 fixed errors entities in mail 2017-07-20 13:36:16 +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
Arturo Gonzalez 1ff3202c43 Added the last things to the new vc item (module events) 2017-07-19 10:36:24 +02:00
Daniel Maya d29aa2c246 Fixed email column 2017-07-18 13:07:25 +02:00
Arturo Gonzalez 329050b02b Fixed error 2017-07-18 12:26:29 +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
Arturo Gonzalez e9e10d3a79 Merge branch 'develop' into 618-new-item-auto-sla-graph-in-visual-console-dev 
pandora_console/include/functions_visual_map.php
	pandora_console/include/functions_visual_map_editor.php
 2017-07-18 11:57:13 +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
Arturo Gonzalez d57508f09e Added sla_auto_graph item to vc first version 2017-07-13 16:23:16 +02:00
Arturo Gonzalez 8f2b4fb783 Added more changes to the first version 2017-07-13 13:25:28 +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
Arturo Gonzalez 19caa3ebfb Added js image 2017-07-13 12:26:13 +02:00
vgilc 1772cc273b Merge branch '1012-Problema-con-configuración-de-LDAP-dev' into 'develop' 
Erase functionality

See merge request !613
 2017-07-13 11:56:17 +02:00
vgilc 9e3fa2d310 Merge branch '1023-module-graph-in-visual-console-with-non-administrator-user-dev' into 'develop' 
Added Borja line to fix module graph period in visual console with non-administrator users

See merge request !609
 2017-07-13 11:55:23 +02:00
vgilc 6829c8734f Merge branch '1029-Falta-cuadro-de-búsqueda-en-filtro-de-metaconsola-dev' into 'develop' 
Style change text in user management

See merge request !599
 2017-07-13 11:53:36 +02:00
vgilc fa29d4072f Merge branch '1001-Alert-detail-muestra-el-agent_name-dev' into 'develop' 
Changed agent name by alias in alerts details

See merge request !573
 2017-07-13 11:49:00 +02:00
Arturo Gonzalez 63d07e1416 Added more things to new vc item 2017-07-12 13:34:20 +02:00
Arturo Gonzalez 9db5669f16 Added item in button palette with default fields 2017-07-12 11:51:00 +02:00
Arturo Gonzalez 75b82847b0 Fixed search field in agents list 2017-07-10 09:34:13 +02:00
Arturo Gonzalez 889045ff04 Removed event custom field (id) 2017-07-10 09:06:21 +02:00
vgilc c19aaa1d64 Merge branch '151-actualizar-el-cliente-de-ehorus' into 'develop' 
Replaced references to switch.ehorus.com with portal.ehorus.com.

See merge request !647
 2017-07-07 11:05:25 +02:00
vgilc e49c2351ae Merge branch '1075-Operaciones-masivas-ponen-postprocess-a-0-dev' into 'develop' 
Fixed post process in Edit modules in bulk

See merge request !638
 2017-07-07 09:38:48 +02:00
enriquecd ce35af3e61 Multiple erasure and displacement of elements in visual console - #624 2017-07-05 19:08:40 +02:00
vgilc ca45db3ba3 Merge branch '884-low-width-in-groups-select-agent-manager-section-dev' into 'develop' 
Fixed field

See merge request !623
 2017-07-05 12:06:54 +02:00
enriquecd f2f7a8179f Fix image align when create a static graph in vconsole - #844 2017-07-03 15:24:30 +02:00
Ramon Novoa 9a85c47f9e Replaced references to switch.ehorus.com with portal.ehorus.com. 2017-06-30 21:14:55 +02:00
Daniel Maya cfc7050bab Fixed post process in Edit modules in bulk 2017-06-30 14:18:23 +02:00
enriquecd 5c4b5a0242 Add link in minor release update dialog to documentation - #951 2017-06-28 15:47:24 +02:00
enriquecd b6d4416921 Let use png logo images for reports - #1057 2017-06-28 12:37:40 +02:00
Arturo Gonzalez 99ad586661 Fixed field 2017-06-27 11:35:48 +02:00
Arturo Gonzalez 242667e162 Fixed selector 2017-06-27 11:10:07 +02:00
enriquecd 1a34c7413c Fix creation prediction modules, add prediction_module param when create - #698 2017-06-26 12:22:05 +02:00
vgilc a151a7e0b8 Merge branch '884-groups-hierachy-in-select-dev' into 'develop' 
Fixed groups select width

See merge request !523
 2017-06-23 14:02:50 +02:00
Daniel Maya 42b822a07a Erase functionality 2017-06-22 15:27:00 +02:00
Arturo Gonzalez 2737b6567a Added Borja line to fix module graph period in visual console with non-administrator users 2017-06-21 14:35:22 +02:00
Daniel Maya 6703b1e9e5 Style change text in user management 2017-06-20 12:01:34 +02:00
enriquecd 0155dae269 Add multiple checkbox selector for report delete - #895 2017-06-19 17:28:35 +02:00
enriquecd c7c158297d Fix module editor can not show name with quotes - #1019 2017-06-14 19:12:17 +02:00
enriquecd 8b83b94a40 Change vconsole label editor background color when rightclick on it - #984 2017-06-14 16:59:59 +02:00
vgilc 8f693ee9c8 Merge branch '995-Agent-name-en-operaciones-masivas-de-plugins-dev' into 'develop' 
changed agent name by alias

See merge request !566
 2017-06-14 11:46:13 +02:00
vgilc c78711ba6f Merge branch '539-encrypt-agent-custom-fields-in-pandora-console-dev' into 'develop' 
539 encrypt agent custom fields in pandora console dev

See merge request !520
 2017-06-14 11:42:51 +02:00
vgilc 31161ff034 Merge branch '698-Modulos-predictivos-no-se-inician-en-la-versión-open' into 'develop' 
Take prediction_module param when create module and init module - #698

See merge request !548
 2017-06-14 11:36:33 +02:00
vgilc 7bfd3254a7 Merge branch '656-changes-in-system-log-viewer-dev' into 'develop' 
Added changes

See merge request !518
 2017-06-14 11:32:44 +02:00
enriquecd 2ede057298 Add data image option to simple data visual console element - #412 2017-06-13 16:49:25 +02:00
Daniel Maya 4bdc0df5c4 Changed agent name by alias in alerts details 2017-06-08 17:55:04 +02:00
Daniel Maya 95818e977e changed agent name by alias 2017-06-07 16:39:04 +02:00
enriquecd 912ec3dc34 Remove pandorfms name column link in server manager - #442 2017-06-07 15:05:19 +02:00
artu30 01f6f6ef5b Merge branch 'develop' into '851-new-report-type-max+min+avg-dev' 
# Conflicts:
#   pandora_console/godmode/reporting/reporting_builder.item_editor.php
#   pandora_console/include/functions_reporting_html.php
 2017-06-07 14:56:44 +02:00
enriquecd ced8050317 Decode html entities in module plugin selector for edit bulk operation - #959 2017-06-05 12:50:22 +02:00
vgilc 69c64fa7dd Merge branch '852-Bug-en-llave-de-Consola-Visual' into 'develop' 
No unselect elements when click over vconsole settings key - #852

See merge request !488
 2017-06-02 11:00:00 +02:00
enriquecd 13376bce42 Take prediction_module param when create module and init module - #698 2017-06-02 09:54:33 +02:00
enriquecd 7ab1748be6 Change processGet jquery call get to post - #959 2017-06-01 15:27:55 +02:00
vgilc 31a1096119 Merge branch '902-Perfil-con-edicion-de-agentes-no-tiene-permisos-para-una-opción-en-masivas' into 'develop' 
Change permission filter for module bulk operations, PM change to AW - #902

See merge request !493
 2017-05-31 17:42:57 +02:00
vgilc 1d6747c353 Merge branch '807-module-massive-operations-with-tag-filter-dev' into 'develop' 
807 module massive operations with tag filter dev

See merge request !476
 2017-05-31 17:42:09 +02:00
vgilc d92947d68d Merge branch '855-Icono-erroneo-en-custom-fields' into 'develop' 
Change display up front column icons for agent custom field manager - 855

See merge request !465
 2017-05-31 17:41:20 +02:00
vgilc d493151527 Merge branch '811-massive-operations-error-verbosity-dev' into 'develop' 
Added more specified alert to update modules and agents when no one field change

See merge request !458
 2017-05-31 17:37:43 +02:00
vgilc 61a9d923a4 Merge branch '889-Remove-babel-auth-in-pandora-dev' into 'develop' 
Removed babel

See merge request !502
 2017-05-31 17:34:47 +02:00
vgilc 18a2ff1701 Merge branch '937-Gráficas-de-servicios-muestran-datos-en-desconocido-entre-las-muestras-de-datos-correctos-almacenados-2' into 'develop' 
Fill empty data in graphs with last known data, no with nodata point - #937

See merge request !535
 2017-05-31 17:26:11 +02:00
vgilc 24ae080f5a Merge branch '840-No-hay-selector-de-postproceso-en-bulk-operations-v7-#4005-com1' into 'develop' 
Show preset options in post process selector for modules massive operations - #840

See merge request !447
 2017-05-31 17:14:51 +02:00
vgilc 313fef7531 Merge branch '442-Recon-server-aparece-con-la-fuente-en-gris' into 'develop' 
Add icon to recon server row in operation column for pandora servers view - #442

See merge request !482
 2017-05-31 17:11:35 +02:00
vgilc 7c038459d1 Merge branch '880-Barra-gris-en-consola-dev' into 'develop' 
Updated id module group

See merge request !505
 2017-05-31 17:06:44 +02:00
enriquecd 2216f7ecb9 Add token to Sql query report items for use historical database - #853 2017-05-31 12:42:43 +02:00
Arturo Gonzalez 90012f43ff Checkbox removed 2017-05-29 15:29:41 +02:00
Arturo Gonzalez f467d6d466 Fixed groups select width 2017-05-29 14:31:46 +02:00
Arturo Gonzalez 463c393c00 Added changes to encrypt custom values with a new token 2017-05-29 11:48:50 +02:00
Arturo Gonzalez 6bf672a846 Added changes 2017-05-26 14:47:37 +02:00
enriquecd d413b7d22d Hide admin tools empty link in left menu bar for operator read users without permissions - #922 2017-05-25 18:37:26 +02:00
vgilc 8a1136d99e Merge branch '704-Agrupar-gráficas-dev' into 'develop' 
Fixed problem without graphics

See merge request !512
 2017-05-25 17:30:09 +02:00
Daniel Maya b3e530658a Fixed problem without graphics 2017-05-25 16:54:07 +02:00
Arturo Gonzalez 71b809ac25 Fixed wrong ids 2017-05-24 18:01:58 +02:00
Daniel Maya a8cae99747 Updated id module group 2017-05-24 16:17:43 +02:00
Arturo Gonzalez 63554c54a2 Removed babel 2017-05-23 17:55:37 +02:00
Daniel Maya e243067c4b New feature: Graphic grouping 2017-05-23 17:13:47 +02:00
Arturo Gonzalez 8692a17567 Ficed bad include call 2017-05-23 15:36:35 +02:00
artu30 37757f7ace Merge branch 'develop' into '596-default_event_filter_by_user' 
# Conflicts:
#   pandora_console/godmode/users/configure_user.php
 2017-05-23 09:48:37 +02:00
artu30 a78b5cc60d Merge branch 'develop' into '777-translations-dev' 
# Conflicts:
#   pandora_console/godmode/update_manager/update_manager.offline.php
#   pandora_console/include/functions_update_manager.php
 2017-05-22 17:51:21 +02:00
vgilc 6bded36a60 Merge branch '599-csv_divider_selector' into 'develop' 
599 csv divider selector

See merge request !359
 2017-05-22 17:11:52 +02:00
enriquecd 3e230572ad Change permission filter for module bulk operations, PM change to AW - #902 2017-05-19 14:58:34 +02:00
enriquecd eb79a70b24 No unselect elements when click over vconsole settings key - #852 2017-05-18 18:31:24 +02:00
vgilc f56587e11c Merge branch '851-module-threshold-with-decimals-dev' into 'develop' 
Added float parser to module threshold

See merge request !460
 2017-05-18 16:08:05 +02:00
vgilc 19a76701a3 Merge branch '813-Footer-no-muestra-la-versión-correctamente' into 'develop' 
Show package version rather build version in footer (ext. fix update manager css) - #813

See merge request !454
 2017-05-17 17:51:25 +02:00
vgilc 4cee2eaea8 Merge branch '836-bad-parents-line-position-in-visual-console-dev' into 'develop' 
836 bad parents line position in visual console dev

See merge request !448
 2017-05-17 17:48:53 +02:00
vgilc 6cc43b4dd6 Merge branch '587-asignar-pantalla-de-inicio-a-usuarios-desde-admin' into 'develop' 
added home screen in the creation and modification of users

See merge request !349
 2017-05-17 17:30:26 +02:00
vgilc b506e47150 Merge branch '622-fixed-qick-guide' into 'develop' 
Remove temporality links to help. And in future chenge this help

See merge request !386
 2017-05-17 17:28:46 +02:00
vgilc 4ced4feeed Merge branch '783-Imagen-incorrecta-offline-manager-7' into 'develop' 
Change update manager offline icon - #783

See merge request !406
 2017-05-17 17:22:13 +02:00
vgilc aed804e022 Merge branch '759-actualizador-pandora' into 'develop' 
Change update manager advice when there are db changes - #759

See merge request !410
 2017-05-17 17:19:39 +02:00
vgilc bce443e0ba Merge branch '824-Pandora-Administrators-y-umbrales-de-módulos' into 'develop' 
Make warning a critical limits fields not disabled for admin profile users - #824

See merge request !439
 2017-05-17 17:15:57 +02:00
vgilc 5e442bcb0b Merge branch '711-Agent-name-en-lugar-de-alias-en-visor-de-actividad-dev' into 'develop' 
Changed name by alias when deleting agent

See merge request !380
 2017-05-17 17:12:46 +02:00
vgilc b861d2a19e Merge branch '795-elements-colocation-in-scheduled-downtime-dev' into 'develop' 
Changed elements colocation in planned downtime elements

See merge request !426
 2017-05-17 17:12:05 +02:00
enriquecd 2df8eb9454 Add icon to recon server row in operation column for pandora servers view - #442 2017-05-17 15:08:05 +02:00
Arturo Gonzalez 33ff4f8aba Added tags filter to copy modules in massive operations 2017-05-17 11:11:27 +02:00
Arturo Gonzalez 4a6b1a0daf Added tags filter to massive module deletion (anget first and module first selection) 2017-05-17 10:56:42 +02:00
Arturo Gonzalez d49f1f9916 Added tags filter to mosule massive operations (agent selection first) 2017-05-17 10:41:30 +02:00
Daniel Maya 1897ee59a3 fixed problem with parent agents 2017-05-17 10:34:35 +02:00
Arturo Gonzalez 4b94e7ce2b Added tag filter to module massive operations (edit and modules selection first) 2017-05-17 09:59:10 +02:00
Arturo Gonzalez 1361ecd2e9 Added tags select field 2017-05-16 16:37:48 +02:00
artu30 1546e48e15 Merge branch 'develop' into '689-Change_translations_in_mr_and_um_section' 
# Conflicts:
#   pandora_console/include/javascript/update_manager.js
 2017-05-16 11:57:58 +02:00
enriquecd da535e72eb Change display up front column icons for agent custom field manager - 855 2017-05-11 18:36:44 +02:00
Arturo Gonzalez 77a563eb29 Added new general table view to html 2017-05-11 14:00:59 +02:00
Arturo Gonzalez c1ef7b00db Added float parser to module threshold 2017-05-11 10:55:33 +02:00
Arturo Gonzalez 1f4b7fddc0 Added more specified alert to update modules and agents when no one field change 2017-05-11 09:29:08 +02:00
enriquecd 746eab7666 Show package version rather build version in footer (ext. fix update manager css) - #813 2017-05-10 13:18:45 +02:00
Arturo Gonzalez 6f40069aa9 Added a new system to draw lines in visual console when element have an image 2017-05-09 17:29:17 +02:00
enriquecd e8ccd7a309 Show preset options in post process selector for modules massive operations - #840 2017-05-09 16:35:58 +02:00
Arturo Gonzalez eb1dafe807 Fixed lines in visual console 2017-05-09 12:40:22 +02:00
Arturo Gonzalez 600f4bc364 Changed bad jquery get call in alert actions and alerts snmp. 2017-05-08 15:54:35 +02:00
enriquecd e32a3e4a72 Make warning a critical limits fields not disabled for admin profile users - #824 2017-05-08 13:40:12 +02:00
Arturo Gonzalez a916844f70 Changed elements colocation in planned downtime elements 2017-05-03 17:24:33 +02:00
enriquecd af5be1bfb0 Disable dinamic image size input changer on vconsole editor mode - #786 2017-04-27 17:32:28 +02:00
vgilc 211183e382 Merge branch '786-consolas-visuales-en-modo-full-screen-no-respetan-el-color-de-fondo-open' into 'develop' 
Fill background vconsole widget with vconsole color source and fix vconsole size editor - #786

See merge request !417
 2017-04-27 17:24:59 +02:00
vgilc b11865ccae Merge branch '782-Error-SQL-en-lista-de-alertas' into 'develop' 
Not use group filter sql if not exist filter_group data - #782

See merge request !412
 2017-04-27 16:31:45 +02:00
enriquecd a99eba3a45 Fill background vconsole widget with vconsole color source and fix vconsole size editor - #786 2017-04-27 13:28:49 +02:00
vgilc e11acefe38 Merge branch '143-no-saca-correos-con-caracteres-no-ascii' into 'develop' 
fixed errors send email text-plain

See merge request !411
 2017-04-26 16:30:44 +02:00
enriquecd c2208e5e4a Use real background-color in visual console builder - #785 2017-04-26 13:01:38 +02:00
enriquecd d2b409d276 Not use group filter sql if not exist filter_group data - #782 2017-04-26 12:09:35 +02:00
daniel bf2485ec25 fixed errors send email text-plain 2017-04-26 12:00:08 +02:00
Arturo Gonzalez 6aab4e60ae Added buttons text to translate them 2017-04-26 09:50:42 +02:00
enriquecd 1a6051caeb Change update manager advice when there are db changes - #759 2017-04-25 17:24:32 +02:00
vgilc cdf95a47dd Merge branch '140-error-a-la-hora-de-duplicar-alertas-snmp' into 'develop' 
fixed error duplicate alert SNMP

Closes #140

See merge request !402
 2017-04-25 16:27:17 +02:00
vgilc 4b5da69e31 Merge branch '688-problema-acl-enterprise-workspace-2-7' into 'develop' 
Change sec url string in message and vconsole section - #688 - 2

See merge request !378
 2017-04-25 16:21:00 +02:00
vgilc 5e72afaec8 Merge branch '679-añadir-tooltips-a-opciones-de-una-recon' into 'develop' 
Added tooltips in recon

See merge request !335
 2017-04-25 16:19:09 +02:00
vgilc 48939e10e7 Merge branch '716-delete_all_checkbox_in_report_items' into 'develop' 
Added checkbox to selet all items in report (to delete them)

See merge request !366
 2017-04-25 16:06:34 +02:00
enriquecd 7ee4c77897 Change update manager offline icon - #783 2017-04-25 15:37:52 +02:00
daniel 13e2f2d05b fixed error duplicate alert SNMP 2017-04-25 09:30:59 +02:00
m-lopez-f fcf3da2acf Remove temporality links to help. And in future chenge this help 2017-04-20 12:10:52 +02:00
Enrique Camargo 6259a62095 Merge branch 'develop' into '486-Mejoras-visuales-de-las-ventanas-modales-de-las-MRs-open' 
# Conflicts:
#   pandora_console/include/javascript/update_manager.js
 2017-04-19 11:39:57 +02:00
vgilc f01639a34d Merge branch '404-conf-del-satelite-se-mete-en-dataserver' into 'develop' 
Fixed problems with remote config view files of conf about server and satellite.

See merge request !329
 2017-04-18 16:01:55 +02:00
vgilc 61e328afa7 Merge branch '579-se-pueden-crear-module-templates-vacías' into 'develop' 
Deleted white space when saving modules template

See merge request !314
 2017-04-18 16:00:44 +02:00
Arturo Gonzalez 1066124678 Merge branch 'develop' into 596-default_event_filter_by_user 
Conflicts:
	pandora_agents/unix/DEBIAN/control
	pandora_agents/unix/DEBIAN/make_deb_package.sh
	pandora_agents/unix/pandora_agent
	pandora_agents/unix/pandora_agent.redhat.spec
	pandora_agents/unix/pandora_agent.spec
	pandora_agents/unix/pandora_agent_installer
	pandora_agents/win32/installer/pandora.mpi
	pandora_agents/win32/pandora.cc
	pandora_agents/win32/versioninfo.rc
	pandora_console/DEBIAN/control
	pandora_console/DEBIAN/make_deb_package.sh
	pandora_console/extras/mr/1.sql
	pandora_console/include/config_process.php
	pandora_console/install.php
	pandora_console/pandora_console.redhat.spec
	pandora_console/pandora_console.spec
	pandora_server/DEBIAN/control
	pandora_server/DEBIAN/make_deb_package.sh
	pandora_server/lib/PandoraFMS/Config.pm
	pandora_server/pandora_server.redhat.spec
	pandora_server/pandora_server.spec
	pandora_server/pandora_server_installer
	pandora_server/util/pandora_db.pl
	pandora_server/util/pandora_manage.pl
 2017-04-18 11:28:02 +02:00
Daniel Maya 42c7a400f0 Changed name by alias when deleting agent 2017-04-18 10:42:23 +02:00