Commit Graph

8185 Commits

Author SHA1 Message Date
artica 9b40ee6422 Auto-updated build strings. 2017-12-21 00:01:25 +01:00
enriquecd a027defccd Make help and support links in login page customizables - #1709 2017-12-20 19:14:05 +01:00
artica 6db5ced911 Auto-updated build strings. 2017-12-20 00:01:11 +01:00
enriquecd ff462e7b44 Translations - #1257 2017-12-19 16:11:35 +01:00
daniel a335732267 fixed errors in graphs webproc and keep alive 2017-12-19 13:13:42 +01:00
enriquecd 02a90736f9 Alphabetic order in group selects - #1699 2017-12-19 10:57:44 +01:00
daniel fd66f84d0b fixed minor errors 2017-12-19 09:57:52 +01:00
artica b4d643f08f Auto-updated build strings. 2017-12-19 00:01:46 +01:00
danielmaya 146802119d Fixed pdf label 2017-12-18 16:50:24 +01:00
enriquecd e5ce6ee631 Let use translate strings extension in login page - #1706 2017-12-18 13:34:18 +01:00
artica e895d06016 Updated version and build strings. 2017-12-18 13:26:41 +01:00
danielmaya b65d649750 Fixed reporting custom graph 2017-12-18 13:12:29 +01:00
artica ee1b915735 Auto-updated build strings. 2017-12-18 00:01:13 +01:00
artica 925eb1cf72 Auto-updated build strings. 2017-12-17 00:01:13 +01:00
artica 7a0617ccce Auto-updated build strings. 2017-12-16 00:01:13 +01:00
artica 671ac77e44 Auto-updated build strings. 2017-12-15 00:01:16 +01:00
vgilc 9a96103164 Merge branch '1257-Traducciones-consola-open' into 'develop'
Change texts in pandora - #1257

See merge request artica/pandorafms!1062
2017-12-14 15:56:54 +01:00
enriquecd db9dc114fb Visual console status calculate errors / 2 - #1698 2017-12-14 15:14:46 +01:00
enriquecd 585da6de6b Visual console status calculate errors - #1698 2017-12-14 12:42:21 +01:00
artica 3598f13687 Auto-updated build strings. 2017-12-14 00:01:16 +01:00
daniel d7d1cfe81b Merge branch 'develop' into 1632-Pandora_FMS_charts 2017-12-13 17:18:36 +01:00
daniel 4a1a0ae8b7 fixed errors in graphs 2017-12-13 17:17:45 +01:00
enriquecd e4cc09e09c Add new function enable alert by alias - #1688 2017-12-13 13:57:38 +01:00
danielmaya 43e697a1cb Added hint in field Add summatory series 2017-12-13 11:50:15 +01:00
danielmaya 85ac142c6c Updated functions_graph and fixed percentil issue 2017-12-13 10:38:08 +01:00
danielmaya 1d3efb9d9e Updated functions_graph 2017-12-13 10:37:42 +01:00
danielmaya 61b33221bf Added check modules and series 2017-12-13 10:37:23 +01:00
Daniel Maya e01f00ac3d code backup 2017-12-13 10:36:08 +01:00
artica 1b32a4da7c Auto-updated build strings. 2017-12-13 00:01:14 +01:00
vgilc 6a0acb05f1 Merge branch '1684-Autenticacion-por-LDAP-con-mas-de-1000-usuarios-dev' into 'develop'
Added ldapsearch system command

See merge request artica/pandorafms!1173
2017-12-12 14:20:22 +01:00
vgilc 02378cbea2 Merge branch 'ent-1687-no-mostrar-valor-de-modulos-keepalive-en-static-graphs-carrefour' into 'develop'
keepalive modules are boolean too (console function fix)

See merge request artica/pandorafms!1170
2017-12-12 09:01:14 +01:00
artica 3d233645c5 Auto-updated build strings. 2017-12-12 00:01:14 +01:00
danielmaya 741df27ba0 Added ldapsearch system command 2017-12-11 17:19:52 +01:00
fermin831 84ff86fede keepalive modules are boolean too (console function fix) 2017-12-11 15:47:38 +01:00
artica 6b76392a60 Auto-updated build strings. 2017-12-11 00:01:12 +01:00
artica 4734283cd8 Auto-updated build strings. 2017-12-10 00:01:11 +01:00
artica e1583f1903 Auto-updated build strings. 2017-12-09 00:01:11 +01:00
artica 3804c3f826 Auto-updated build strings. 2017-12-08 00:01:13 +01:00
artica 633cb5a39c Auto-updated build strings. 2017-12-07 00:01:14 +01:00
artica 044d54a76f Auto-updated build strings. 2017-12-06 00:01:15 +01:00
vgilc 5b5ed2c45b Merge branch '1657-Agentes-en-crítico-salen-como-desconocido-en-GIS-dev' into 'develop'
Fixed Unkwon Icon in GIS

See merge request artica/pandorafms!1147
2017-12-05 16:55:06 +01:00
vgilc a4cf584468 Merge branch '1671-Filtro-en-mapas-gis-dev' into 'develop'
Fixed filter in gis maps

See merge request artica/pandorafms!1154
2017-12-05 16:54:35 +01:00
daniel fedb6003dd fixed errors in TIP 2017-12-05 13:46:23 +01:00
daniel 06c1c4f243 fixed errors in fullscale graph and normal graph 2017-12-05 13:44:42 +01:00
vgilc 20720c9f0b Merge branch 'grep_syslog_module' into 'develop'
Add an icon and constants for the new Syslog server.

See merge request artica/pandorafms!1160
2017-12-05 11:39:44 +01:00
Ramon Novoa dca173c8b8 Add an icon and constants for the new Syslog server. 2017-12-05 11:15:23 +01:00
vgilc 18fa3d29a9 Merge branch 'buscar-un-grupo-en-el-tree-view-carrefour' into 'develop'
Mostrar los descendientes de los grupos filtrados en el tree view

See merge request artica/pandorafms!1159
2017-12-05 09:55:06 +01:00
Alejandro Gallardo Escobar 33ab429182 [Console] Now the group filter extract the searched groups and show their descendants 2017-12-05 09:43:37 +01:00
artica 9d9233c99f Auto-updated build strings. 2017-12-05 00:01:16 +01:00
fbsanchez acfccd37ae Merge branch 'develop' into 1278-extension-vmware-ext-4456-y-4479 2017-12-04 16:12:43 +01:00
danielmaya a024d66fd7 Changed email by mail in mysql 2017-12-04 12:20:13 +01:00
danielmaya 87e2f4f3f9 Fixed filter in gis maps 2017-12-04 11:41:52 +01:00
artica 4d4cee2251 Auto-updated build strings. 2017-12-04 00:01:08 +01:00
artica 3d5e8760cd Auto-updated build strings. 2017-12-03 00:01:09 +01:00
artica dc8c5c54e6 Auto-updated build strings. 2017-12-02 00:01:38 +01:00
danielmaya dab2525355 Fixed jquery error 2017-12-01 13:32:50 +01:00
danielmaya 8b9c59a3b0 Fixed Unkwon Icon in GIS 2017-12-01 12:44:07 +01:00
enriquecd 521eb8f4cb Add clocks to visual console - #1403 2017-12-01 12:14:56 +01:00
vgilc 1949ee653b Merge branch '1540-ayuda-general-en-mapas-de-red-dev' into 'develop'
1540 ayuda general en mapas de red dev

See merge request artica/pandorafms!1144
2017-12-01 11:21:37 +01:00
Arturo Gonzalez d1f198b80b Added new networkmaps help section 2017-12-01 11:16:09 +01:00
vgilc 75c8b1ae8f Merge branch '1537-errores-al-reiniciar-el-mapa-de-red-dev' into 'develop'
Added fix to reset map function

See merge request artica/pandorafms!1140
2017-12-01 09:31:21 +01:00
vgilc 54f0f9130b Merge branch '1622-mapas-dinamicos-radiales-errores-varios-dev' into 'develop'
Added more changes to improve radial dynamic maps

See merge request artica/pandorafms!1136
2017-12-01 09:00:27 +01:00
artica 4652980457 Auto-updated build strings. 2017-12-01 00:01:11 +01:00
daniel a0bdab9b83 Merge branch 'develop' into 1483-Cuadro_de_umbrales
Conflicts:
	pandora_console/godmode/agentes/module_manager_editor_common.php
	pandora_console/godmode/modules/manage_network_components_form_common.php
2017-11-30 16:29:00 +01:00
Arturo Gonzalez 92d054695d Added fix to reset map function 2017-11-30 16:00:32 +01:00
daniel e0b90f2be0 optimization view events 2017-11-30 14:00:08 +01:00
nramon c7676d7f4a Merge branch '1326-Crear-un-checkbox-para-que-no-se-muestren-datos-vacíos-en-los-informes-open' into 'develop'
Add hide no data item checkbox to report templates - open - #1326

See merge request artica/pandorafms!940
2017-11-30 12:57:59 +01:00
enriquecd 628d5d2c62 Merge branch 'develop' into 1326-Crear-un-checkbox-para-que-no-se-muestren-datos-vacíos-en-los-informes-open 2017-11-30 12:09:53 +01:00
enriquecd 4f3f2525e1 Merge branch 'develop' into 1242-Unificar-ayudas-de-alertas
Conflicts:
	pandora_console/include/help/en/help_alert_config.php
	pandora_console/include/help/en/help_alert_macros.php
	pandora_console/include/help/es/help_alert_config.php
	pandora_console/include/help/es/help_alert_macros.php
2017-11-30 11:47:47 +01:00
Arturo Gonzalez 30c879b600 Added more changes to improve radial dynamic maps 2017-11-30 10:45:28 +01:00
Arturo Gonzalez fbab43b451 In progress 2017-11-30 08:04:56 +01:00
artica d8ee188b95 Auto-updated build strings. 2017-11-30 00:01:12 +01:00
danielmaya 3adb990970 Fixed redeclare function 2017-11-29 18:11:40 +01:00
vgilc 43308596c1 Merge branch '1490-Añadir-un-nuevo-campo-de-búsqueda-en-vista-de-agentes-dev' into 'develop'
added Search in custom fields

See merge request artica/pandorafms!969
2017-11-29 16:57:32 +01:00
vgilc df5722e499 Merge branch '1500-Fuente-erronea-en-el-boton-del-wizar-de-instalación-de-Pandora' into 'develop'
Change font family to install wizard button - #1500

See merge request artica/pandorafms!964
2017-11-29 16:57:03 +01:00
vgilc 93c0ddfad4 Merge branch 'ent-1545-no-mostrar-valor-de-modulos-booleanos-en-static-graphs-carrefour' into 'develop'
Removed last value on visual console boolean static graphs

See merge request artica/pandorafms!1053
2017-11-29 16:56:36 +01:00
vgilc 66d15f3e4f Merge branch 'ent-1239-falta-texto-de-ayuda-definicion-de-modulos' into 'develop'
Added autodisable mode help

See merge request artica/pandorafms!976
2017-11-29 16:55:24 +01:00
vgilc 55e93d8fc9 Merge branch 'ent-1418-error-cuando-mysql-no-esta-levantado' into 'develop'
Fixed console error 500 when mysql is not running

See merge request artica/pandorafms!959
2017-11-29 16:54:58 +01:00
vgilc 5b506764fd Merge branch '1467-Error-en-API-al-deshabilitar-alertas-dev' into 'develop'
Fixed function api_set_disable_alert

See merge request artica/pandorafms!989
2017-11-29 16:54:00 +01:00
vgilc ef86663813 Merge branch 'no-cargan-los-modulos-en-cualquier-arbol-que-no-sea-el-de-grupos' into 'develop'
Resolve: No cargan los modulos en cualquier arbol que no sea el de grupos

See merge request artica/pandorafms!977
2017-11-29 16:48:38 +01:00
vgilc f8695a2781 Merge branch 'ent-986-macros-para-comentarios-en-ipam-4113-vodat' into 'develop'
Added _event_cfX_ to macros help

See merge request artica/pandorafms!920
2017-11-29 16:47:09 +01:00
vgilc 7ce6535170 Merge branch '1658-permisos-para-manipular-archivos-en-colecciones-dev' into 'develop'
Added qw perms

See merge request artica/pandorafms!1127
2017-11-29 16:20:08 +01:00
vgilc 019829685c Merge branch '1564-Error-al-crear-módulos-SNMPv3-desde-snmpwalk-dev' into 'develop'
Fixed creating network components by snmpwalk

See merge request artica/pandorafms!1065
2017-11-29 16:15:21 +01:00
vgilc 3a5b8928ac Merge branch 'ent-1035-busqueda-libre-en-visor-de-datos' into 'develop'
Added free search values to data table

See merge request artica/pandorafms!992
2017-11-29 16:10:46 +01:00
danielmaya caa3539c4f Fixed group recursion in bulk operation 2017-11-29 15:54:00 +01:00
vgilc 1895bf3fe9 Merge branch '1375-Que-se-muestre-la-unidad-en-las-custom-graphs-dev' into 'develop'
added unit in custom graphs

See merge request artica/pandorafms!979
2017-11-29 15:42:40 +01:00
vgilc 55dd05c406 Merge branch 'buscar-un-grupo-en-el-tree-view-carrefour' into 'develop'
Resolve: Buscar un grupo en el tree view carrefour

See merge request artica/pandorafms!1003
2017-11-29 15:41:31 +01:00
vgilc 976fd7d315 Merge branch '1492-ACL-no-permiten-buscar-en-Monitor-View-dev' into 'develop'
Fixed search in status monitor with ACL enterprise

See merge request artica/pandorafms!949
2017-11-29 15:39:37 +01:00
vgilc b98ac19f91 Merge branch '1570-Error-en-paginación-de-eventos-con-texto-libre-dev' into 'develop'
Fixed pagination errors with free search

See merge request artica/pandorafms!1054
2017-11-29 15:38:19 +01:00
vgilc 8e5215d3fa Merge branch 'ent-1541-contador-de-alertas-disparadas-no-se-actualiza-al-borrar-una-alerta' into 'develop'
Update fired alert when delete it

See merge request artica/pandorafms!1034
2017-11-29 14:33:10 +01:00
vgilc e2680696ee Merge branch 'visual-console-agent-link-bug' into 'develop'
Bug en enlace de agente en Consolas visuales

See merge request artica/pandorafms!952
2017-11-29 14:10:51 +01:00
vgilc 89c08ede12 Merge branch '1351-AND-filters-added-to-snmp-filters-(so-much-wow)-dev' into 'develop'
1351 and filters added to snmp filters (so much wow) dev

See merge request artica/pandorafms!978
2017-11-29 14:07:58 +01:00
Alejandro Gallardo Escobar f49cef9ca4 Merge branch 'develop' into visual-console-agent-link-bug
Conflicts:
	pandora_console/include/ajax/visual_console_builder.ajax.php
2017-11-29 14:00:44 +01:00
vgilc 6ff9eb054c Merge branch '1083-linea-de-color-cuando-uno-de-los-modulos-de-la-relacion-no-esta-bien-dev' into 'develop'
Added link color

See merge request artica/pandorafms!1049
2017-11-29 13:28:17 +01:00
vgilc 7beb05f8db Merge branch '1369-interface-graphs-when-interface-is-not-init-in-networkmaps-dev' into 'develop'
Fixed filter to show interface graph or not

See merge request artica/pandorafms!957
2017-11-29 13:27:39 +01:00
vgilc 8e71f632e8 Merge branch '1537-new-option-in-networkmaps-to-reset-the-map-dev' into 'develop'
Added new option to networkmap, reset

See merge request artica/pandorafms!1035
2017-11-29 13:27:00 +01:00
vgilc c8d5abb0d5 Merge branch '1538-valores-editables-de-graphviz-al-crear-mapas-de-red-dev' into 'develop'
Added custom graphviz fields to map creation

See merge request artica/pandorafms!1122
2017-11-29 13:26:11 +01:00
vgilc cf3c9c6ed7 Merge branch '1622-filtro-por-grupo-en-mapa-radial-dinamico-dev' into 'develop'
1622 filtro por grupo en mapa radial dinamico dev

See merge request artica/pandorafms!1117
2017-11-29 13:24:33 +01:00
vgilc 6ecc9f524c Merge branch '1643-login-con-administrador-en-ldap-para-realizar-acciones-dev' into 'develop'
Added code to login with admin ldap user

See merge request artica/pandorafms!1119
2017-11-29 13:24:01 +01:00
artica 0df9ae47ce Auto-updated build strings. 2017-11-29 00:01:11 +01:00
danielmaya a3e47fb977 Fixed reporting_event_report_module in metaconsole 2017-11-28 15:56:46 +01:00
fermin831 94a3bc85d3 Fixed module definition help and add autodisable mode to bulk operations 2017-11-28 15:56:38 +01:00
Arturo Gonzalez 64b926e482 Added qw perms 2017-11-28 13:36:33 +01:00
artica 406c69d5be Auto-updated build strings. 2017-11-28 00:01:13 +01:00
Arturo Gonzalez 21bbfb557b Added lost code 2017-11-27 15:00:59 +01:00
Arturo Gonzalez 192175a4cc Added custom graphviz fields to map creation 2017-11-27 13:52:31 +01:00
Alejandro Gallardo Escobar 82012959af [Console > Module area graph] Now the value shown into the legend uses the config value to show shortened of full data 2017-11-27 12:41:10 +01:00
Alejandro Gallardo Escobar b26c46a7c6 [Console > Module area graph] Now the value shown into the legend has 2 decimals instead of 1 2017-11-27 12:31:40 +01:00
artica 13e0221013 Updated version and build strings. 2017-11-27 12:24:02 +01:00
Alejandro Gallardo Escobar b431f4afd3 [Console > Module area graph] Now the Y legend values are rounded properly to 2 dec when 'Shortened module graph data' is enabled 2017-11-27 11:56:52 +01:00
artica 6b79dc357d Auto-updated build strings. 2017-11-27 00:01:09 +01:00
artica 0ced834c75 Auto-updated build strings. 2017-11-26 00:01:09 +01:00
artica fd47d57ce2 Auto-updated build strings. 2017-11-25 00:01:11 +01:00
Alejandro Gallardo Escobar 9796b4b4a0 [Console > Network map] Fix the output of content with html entities 2017-11-24 14:23:09 +01:00
Arturo Gonzalez a455ba666a Added code to login with admin ldap user 2017-11-24 14:03:49 +01:00
Arturo Gonzalez 2883e45849 Added changes to get all hierachy to the chart 2017-11-24 12:08:15 +01:00
danielmaya 0b728375db Fixed interval when the period is less than resolution in custom graph 2017-11-24 11:55:25 +01:00
Arturo Gonzalez 06f83825dc Added code to fix agents generation in sunbrust chart 2017-11-24 11:27:10 +01:00
enriquecd afd84ce74d Change system audit log extended info to table format with change info - #1571 2017-11-24 10:59:44 +01:00
vgilc 3bc4bdb798 Merge branch '1471-fallo-enlace-publico-dashboards-2' into 'develop'
Fixed tree view on public dashboards

See merge request artica/pandorafms!1114
2017-11-24 09:38:34 +01:00
artica b6dfc147f3 Auto-updated build strings. 2017-11-24 00:01:11 +01:00
fermin831 fdd168007b Fixed tree view on public dashboards 2017-11-23 18:38:22 +01:00
danielmaya 897d7bf258 Added type graph selection in container graph 2017-11-23 18:01:32 +01:00
vgilc ebc35ae791 Merge branch 'ent-1436-opciones-avanzadas-cron-modulos-sinteticos-no-funciona-correctamente-3' into 'develop'
Ent 1436 opciones avanzadas cron modulos sinteticos no funciona correctamente 3

See merge request artica/pandorafms!1112
2017-11-23 17:44:25 +01:00
fermin831 34da44f9fb Added cron help 2017-11-23 17:00:59 +01:00
fermin831 00bdcf5996 Added new cron functions to console 2017-11-23 12:30:04 +01:00
vgilc 62ffb46763 Merge branch '1471-fallo-enlace-publico-dashboards' into 'develop'
Fixed public dashboard permissions

See merge request artica/pandorafms!1004
2017-11-23 09:03:07 +01:00
artica 1ce4adb54e Auto-updated build strings. 2017-11-23 00:01:12 +01:00
danielmaya 13b6be4994 Added _event_description_ in help_alert_macros.php 2017-11-22 17:10:25 +01:00
Fco de Borja Sánchez afab4be2af Merge branch 'develop' into 1278-extension-vmware-ext-4456-y-4479 2017-11-22 12:34:03 +01:00
artica b4ba8acaa2 Auto-updated build strings. 2017-11-22 00:01:11 +01:00
enriquecd 0581e6420d Fix history data dialog for base 64 images on modules view - #1525 2017-11-21 17:58:24 +01:00
fermin831 0f814c0b63 Added public dashboard authentication to some components 2017-11-21 16:59:49 +01:00
vgilc 1eb509371d Merge branch '1509-Ayudas-en-nuevos-elementos-de-la-consola-visual-dev' into 'develop'
Added help elements

See merge request artica/pandorafms!1105
2017-11-21 16:56:00 +01:00
Arturo Gonzalez 3495bb5cbf Added help elements 2017-11-21 16:47:45 +01:00
Arturo Gonzalez a819efbdb8 Added graphviz values to calibrate maps 2017-11-21 13:18:06 +01:00
Arturo Gonzalez f4d035cfa5 Added changes to filter by group. Not finished 2017-11-21 10:27:17 +01:00
artica ae6df5a24e Auto-updated build strings. 2017-11-21 00:01:13 +01:00
fermin831 f021664336 Added new events response macros documentation 2017-11-20 15:06:20 +01:00
vgilc 2502944dea Merge branch '1614-Pete-SQL-en-buscador-consolas-visuales-dev' into 'develop'
Fixed revert in functions_visual_map.php

See merge request artica/pandorafms!1097
2017-11-20 13:10:17 +01:00
danielmaya faa4d5169a Fixed revert in functions_visual_map.php 2017-11-20 13:01:10 +01:00
fermin831 76685aefe0 Added help documentation to _event_extra_id_ 2017-11-20 12:54:32 +01:00
fermin831 2425d19ddd Fixed typo 2017-11-20 11:16:18 +01:00
fermin831 2ef9d884ee Added spanish event responses new macros documentation 2017-11-20 11:14:26 +01:00
daniel 3d4485438d fixed error visual console remove link when edit console 2017-11-20 10:37:07 +01:00
artica 04c271ae61 Auto-updated build strings. 2017-11-20 00:01:08 +01:00
artica 92b71b17f4 Auto-updated build strings. 2017-11-19 00:01:09 +01:00
artica 1fb39ee151 Auto-updated build strings. 2017-11-18 00:01:11 +01:00
fermin831 492b55a713 Added custom_data to events responeses macros 2017-11-17 15:17:08 +01:00
fermin831 7fb8406bc0 Added several macros to events responses 2017-11-17 14:50:23 +01:00
enriquecd 1f2f8fdc0c Change time format in agent events 24h bar view and show the last start time - #1613 2017-11-17 11:44:38 +01:00
vgilc 215d3c005f Merge branch '1457-selectores-de-posicion-y-zoom-en-mapas-de-red-dev' into 'develop'
Added new map center

See merge request artica/pandorafms!1086
2017-11-17 10:07:48 +01:00
artica c624c213ea Auto-updated build strings. 2017-11-17 00:01:11 +01:00
Arturo Gonzalez fc9e78c301 Added new map center 2017-11-16 13:43:51 +01:00
enriquecd e902baaf9d Apply safe input to ui_get_url_refresh return - fix text form inputs js error - #1574 2017-11-16 12:46:19 +01:00
Arturo Gonzalez 76576899f9 Added acl group to visual console status elements 2017-11-16 10:37:46 +01:00
Arturo Gonzalez bcc6672cdf Merge branch 'develop' into 1612-se-borran-elementos-al-mover-un-item-en-consola-visual-dev
Conflicts:
	pandora_console/include/ajax/visual_console_builder.ajax.php
2017-11-16 08:09:05 +01:00
Arturo Gonzalez 1a4597874a Fixed move function 2017-11-16 08:06:52 +01:00
artica 104db9a875 Auto-updated build strings. 2017-11-16 00:01:12 +01:00
enriquecd 8fa2acfd2a Merge branch 'develop' into 1313-Poder-elegir-posición-en-consola-visual-4517-2
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/godmode/reporting/visual_console_builder.editor.js
	pandora_console/pandoradb.sql
2017-11-15 17:35:51 +01:00
enriquecd 2a13f5fbf6 Order by name group select in manage agent view - #1596 2017-11-15 17:03:16 +01:00
vgilc 7ad2e7e227 Merge branch '1361-errores-de-version-anterior-en-mapas-de-red-dev' into 'develop'
Fixed errors at update

See merge request artica/pandorafms!1076
2017-11-15 16:16:25 +01:00
vgilc 30eb222118 Merge branch '1594-acceso-con-ldap-con-un-id-diferente-al-nombre-dev' into 'develop'
1594 acceso con ldap con un id diferente al nombre dev

See merge request artica/pandorafms!1074
2017-11-15 16:09:03 +01:00
Arturo Gonzalez eb1789f08b Fixed errors at update 2017-11-15 16:06:28 +01:00
Arturo Gonzalez 0513a9e45a Merge branch 'develop' into 1316-new-empty-networkmaps-dev
Conflicts:
	pandora_console/include/functions_pandora_networkmap.php
2017-11-15 15:49:21 +01:00
vgilc a72f7b006e Merge branch 'develop' into '1505-acl-de-grupos-para-los-elementos-de-la-consola-visual-dev'
# Conflicts:
#   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
2017-11-15 12:04:11 +01:00
Arturo Gonzalez 59e1bdd225 Added email login attr to ldap users 2017-11-15 11:57:56 +01:00
Enrique Camargo 5c48dc9637 Update functions_container.php 2017-11-15 11:35:35 +01:00
enriquecd 27e7a51006 Fix graph container permissions and graph acl - #1576 2017-11-15 11:31:17 +01:00
Arturo Gonzalez 1a4502d150 Added new field to ldap config 2017-11-15 10:27:56 +01:00
vgilc faac4fa46f Merge branch '1240-fictional-node-link-to-other-map-dev' into 'develop'
Added function to update link to other map

See merge request artica/pandorafms!990
2017-11-15 09:45:03 +01:00
Arturo Gonzalez 776aca90d6 Merge branch 'develop' into 1505-acl-de-grupos-para-los-elementos-de-la-consola-visual-dev
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/godmode/reporting/visual_console_builder.editor.js
	pandora_console/include/ajax/visual_console_builder.ajax.php
	pandora_console/include/functions_visual_map_editor.php
	pandora_console/pandoradb.sql
2017-11-15 09:43:33 +01:00
vgilc 8ebada6dbf Merge branch '1464-error-in-networkmap-with-weird-agent-names-dev' into 'develop'
Added safe input to agent name

See merge request artica/pandorafms!996
2017-11-15 09:43:29 +01:00
vgilc d430375826 Merge branch '1413-CARREFOUR-Añadir-macros-en-los-label-de-las-consolas-visuales' into 'develop'
Add visual console macros - #1413

See merge request artica/pandorafms!1019
2017-11-15 09:40:38 +01:00
vgilc 7354ae534b Merge branch 'snmp-browser-safe-output' into 'develop'
Remove HTML entities from the SNMP community.

See merge request artica/pandorafms!1037
2017-11-15 09:36:20 +01:00
Arturo Gonzalez 4db2493cdd Merge branch 'develop' into 1464-error-in-networkmap-with-weird-agent-names-dev
Conflicts:
	pandora_console/include/functions_networkmap.php
2017-11-15 09:34:19 +01:00
vgilc 90b99c491a Merge branch '1509-calculo-de-estado-en-consola-visual-mediante-el-peso-de-su-padre-dev' into 'develop'
Added new system of calculate status if user set a parent weight

See merge request artica/pandorafms!1043
2017-11-15 09:28:10 +01:00
vgilc 4e09334718 Merge branch '1592-acceso-con-ldap-sin-establecer-pass-dev' into 'develop'
1592 acceso con ldap sin establecer pass dev

See merge request artica/pandorafms!1067
2017-11-15 09:27:39 +01:00
artica e793e3fd4e Auto-updated build strings. 2017-11-15 00:01:16 +01:00
fermin831 ae94be7779 Delete orig repo files 2017-11-14 19:37:00 +01:00
fbsanchez 0ea2475d60 minor fix pandora.flot.js 2017-11-14 19:02:13 +01:00
fermin831 78ef64ead2 Added resize functionality to flot graphs and fix overview in container graphs 2017-11-14 18:44:29 +01:00
Arturo Gonzalez 75cb2a668f Added a lot of changes to save or not user password, only ldap 2017-11-14 16:20:26 +01:00
enriquecd 36c3f1fef6 Change group items url links in metaconsole - #1253 2017-11-14 13:51:33 +01:00
danielmaya 31d1f80a12 Fixed creating network components by snmpwalk 2017-11-14 13:31:39 +01:00
Arturo Gonzalez 8a1ba7130f Added restriction to no pass token 2017-11-14 13:11:11 +01:00
Arturo Gonzalez efa762626b Changed text to new token 2017-11-14 12:47:23 +01:00
Arturo Gonzalez 861e112cec Added token to pandora auth conf 2017-11-14 12:36:32 +01:00
fermin831 ff58a171e9 Fixed non interactive status graphs 2017-11-14 12:20:28 +01:00
enriquecd 089a0f94ea Change texts in pandora - #1257 2017-11-14 11:37:49 +01:00
fbsanchez 958ef2bd38 Merge branch 'develop' into 1278-extension-vmware-ext-4456-y-4479
Added max/min thresholds to hbar graphs
2017-11-14 10:49:15 +01:00
Arturo Gonzalez 274c551671 Added height to bars graph 2017-11-14 08:50:12 +01:00
artica 69aff8a420 Auto-updated build strings. 2017-11-14 00:01:10 +01:00
enriquecd 2f9f2ddf90 Metaconsole synchronization for api - #979 2017-11-13 16:37:08 +01:00
Arturo Gonzalez 833983e34e Added visual changes to donut graph 2017-11-13 12:54:28 +01:00
danielmaya 14fe06e536 Fixed pagination errors with free search 2017-11-13 12:07:53 +01:00
Alejandro Gallardo Escobar b38c557491 [Console] Updated the eHorus client 2017-11-13 12:02:01 +01:00
fermin831 6c519ff08a Removed last value on visual console boolean static graphs 2017-11-13 11:13:42 +01:00
vgilc 3493b9c15c Revert "code backup"
This reverts commit b9851a3a71
2017-11-13 10:21:38 +01:00
vgilc 86a5599aad Revert "Fixed traces"
This reverts commit 173efae22d
2017-11-13 10:20:58 +01:00
Arturo Gonzalez 49df1e448a Added changes from donut graph 2017-11-13 09:59:00 +01:00
vgilc 67373e39ac Merge branch '1378-grafica-donut-en-consola-visual-dev' into 'develop'
1378 grafica donut en consola visual dev

See merge request artica/pandorafms!1051
2017-11-13 09:39:43 +01:00
Arturo Gonzalez 110945bccf Added the last change to load string modules 2017-11-13 09:35:24 +01:00
artica 301795af83 Auto-updated build strings. 2017-11-13 00:01:08 +01:00
artica 2e6e46c10c Auto-updated build strings. 2017-11-12 00:01:08 +01:00
artica b8e6d7927e Auto-updated build strings. 2017-11-11 00:01:10 +01:00
Arturo Gonzalez eb39d25c4b Added field to get string modules 2017-11-10 15:03:52 +01:00
Arturo Gonzalez de65e7cf27 Fixed element name and leyend separator 2017-11-10 14:43:31 +01:00
vgilc 68a10343fb Revert "Merge branch…"
This reverts merge request !1025
2017-11-10 12:24:33 +01:00
vgilc 555dc3744d Revert "Merge branch…"
This reverts merge request !1045
2017-11-10 12:24:01 +01:00
Arturo Gonzalez fa50ac5cdf Added link color 2017-11-10 11:05:53 +01:00
vgilc 29971f4d38 Merge branch '1512-ldap-atributo-de-login-dev' into 'develop'
Added changes to fix ldap login

See merge request artica/pandorafms!1047
2017-11-10 10:13:31 +01:00
enriquecd 845db988e8 Change license windows style - #1437 2017-11-10 10:13:24 +01:00
vgilc a38f47b4a9 Merge branch '1522-Fallos_a_la_hora_de_representar_las_gráficas_con_rangos_en_desconocido_v714_2' into 'develop'
fixed errors in TIP

See merge request artica/pandorafms!1045
2017-11-10 10:12:51 +01:00
Arturo Gonzalez fe4a93f646 Added changes to fix ldap login 2017-11-10 09:33:12 +01:00
artica 680d23038e Auto-updated build strings. 2017-11-10 00:01:09 +01:00
artica f512bea610 Auto-updated build strings. 2017-11-09 00:01:13 +01:00
daniel e6e925cbf6 fixed errors in TIP 2017-11-08 18:57:37 +01:00
fbsanchez a42a2ee7e2 Minor changes to allow hbar min/max ranges 2017-11-08 16:41:23 +01:00
artica ef8b69841c Updated version and build strings. 2017-11-08 15:30:28 +01:00
Arturo Gonzalez fac066debd Added groups acl in all visual console elements 2017-11-08 15:01:44 +01:00
Arturo Gonzalez c9d1fab036 Added new system of calculate status if user set a parent weight 2017-11-08 12:49:03 +01:00
Arturo Gonzalez 092c43bede Merge branch 'develop' into 1378-donut-graph-element-in-visual-console-dev
pandora_console/godmode/reporting/visual_console_builder.editor.js
	pandora_console/include/ajax/visual_console_builder.ajax.php
	pandora_console/include/functions_visual_map_editor.php
2017-11-08 10:27:44 +01:00
Arturo Gonzalez 3de0e38c2d Added color to resume data 2017-11-08 10:21:09 +01:00
Arturo Gonzalez b9b8b37abe Added grid color to bars graph in visual console 2017-11-08 09:55:36 +01:00
Ramon Novoa cea0f90117 Remove HTML entities from the SNMP community.
Ref. pandora_enterprise#1565.
2017-11-08 09:15:13 +01:00
artica b461121361 Auto-updated build strings. 2017-11-08 00:01:10 +01:00
Arturo Gonzalez 7b956e8ef6 Added new option to networkmap, reset 2017-11-07 15:05:31 +01:00
fermin831 bff2213e45 Update fired alert when delete it 2017-11-07 14:47:34 +01:00
vgilc 3c920e9d10 Merge branch '417-Labels-de-las-gráficas-en-Informes-PDF-se-ven-muy-pequeños-fix-2' into 'develop'
Fix pdf graph labels 2 - #417

See merge request artica/pandorafms!1032
2017-11-07 12:04:57 +01:00
vgilc 601d67fc7e Merge branch '1522-Fallos_a_la_hora_de_representar_las_gráficas_con_rangos_en_desconocido_v714' into 'develop'
fixed errors in fullscale graph and normal graph

See merge request artica/pandorafms!1025
2017-11-07 11:50:23 +01:00
enriquecd 2eec3dc766 Fix pdf graph labels 2 - #417 2017-11-07 11:43:42 +01:00
vgilc 7e6cc539e8 Merge branch '1396-problems-with-percentile-items-in-visual-console-dev' into 'develop'
Fixed problems with unit

See merge request artica/pandorafms!1027
2017-11-07 11:23:02 +01:00
vgilc 47171418cd Merge branch '1548-problems-with-simple-value-in-visual-console-dev' into 'develop'
Modified simple value

See merge request artica/pandorafms!1026
2017-11-07 11:22:28 +01:00
Arturo Gonzalez 31577a823c Fixed problems with unit 2017-11-07 10:57:30 +01:00
Arturo Gonzalez 94a9bcb85b Modified simple value 2017-11-07 10:26:26 +01:00
daniel c780cb5285 fixed errors in fullscale graph and normal graph 2017-11-07 09:46:37 +01:00
artica 3763a1a93c Auto-updated build strings. 2017-11-07 00:01:10 +01:00
vgilc 2d87172558 Merge branch 'vulnerabilidad-en-consola' into 'develop'
Resolve: Vulnerabilidad en consola

See merge request artica/pandorafms!1020
2017-11-06 17:41:45 +01:00
enriquecd b6d3444212 Fix PDF reports labels - #417 2017-11-06 17:02:54 +01:00
enriquecd 74fbd11628 Fix maximum data column - #654 2017-11-06 16:15:06 +01:00
Alejandro Gallardo Escobar ac70caac71 [Console] Fixed XSS vulnerabilities 2017-11-06 15:20:24 +01:00
Alejandro Gallardo Escobar 83becb3e80 [Console] Fixed an error into the 'ui_print_truncate_text' function 2017-11-06 15:18:55 +01:00
enriquecd cffbfd3fb3 Add visual console macros - #1413 2017-11-06 12:19:31 +01:00
vgilc 9b163ce3e0 Merge branch '1367-radial-dinamic-rotate-texts-around-center-dev' into 'develop'
Added some modifications to sunburst d3 function

See merge request artica/pandorafms!1018
2017-11-06 12:15:30 +01:00
Arturo Gonzalez b01d0e78af Added some modifications to sunburst d3 function 2017-11-06 10:52:27 +01:00
Arturo Gonzalez 4a6c7f1783 Fixed encoding problems and default label color 2017-11-06 08:35:42 +01:00
artica 2bca9c92fa Auto-updated build strings. 2017-11-06 00:01:08 +01:00
artica 3a220564ec Auto-updated build strings. 2017-11-05 00:01:09 +01:00
artica cc4e337f70 Auto-updated build strings. 2017-11-04 00:01:12 +01:00
vgilc c45154e9d7 Merge branch '179-Se-han-dejado-una-traza-en-la-vista-de-agente-dev' into 'develop'
Fixed traces

See merge request artica/pandorafms!1015
2017-11-03 14:48:47 +01:00
vgilc bbecd1af09 Merge branch '1534-No-se-inicializan-módulos-SNMPv3-con-caracteres-especiales-dev' into 'develop'
Fixed password entities in snmp walk

See merge request artica/pandorafms!1014
2017-11-03 13:49:40 +01:00
danielmaya 173efae22d Fixed traces 2017-11-03 13:38:59 +01:00
danielmaya 7c78cd2a34 Fixed password entities in snmp walk 2017-11-03 13:18:00 +01:00
vgilc 49d5f0878f Merge branch 'tardanza-en-vista-de-arbol-carrefour' into 'develop'
Initialize the group cache.

See merge request artica/pandorafms!1006
2017-11-03 12:10:55 +01:00
vgilc 43fdb65e92 Merge branch '1394-Errores-tema-black-2-open' into 'develop'
Change pandora black styles - #1394

See merge request artica/pandorafms!1013
2017-11-03 11:36:39 +01:00
vgilc 6ddf744163 Merge branch '1511-visual-console-elements-not-sorted-in-creation-dev' into 'develop'
Added changes to sort json in ajax return

See merge request artica/pandorafms!1001
2017-11-03 10:46:17 +01:00
enriquecd 1e138f240f Change pandora black styles - #1394 2017-11-03 10:27:01 +01:00
artica 3d6d1044ea Auto-updated build strings. 2017-11-03 00:01:11 +01:00
fermin831 24e93d0cd6 Fixed style code 2017-11-02 18:11:54 +01:00
enriquecd f0fe30fc3a Now can create static graphs a group items without images, fix bugs - #1407 2017-11-02 15:54:18 +01:00
fermin831 443163515d Added checkbox to free search on agents data view 2017-11-02 15:51:37 +01:00
vgilc 594b6e9417 Merge branch '1320-Exportación-CSV-saca-entities-dev' into 'develop'
1320 exportación csv saca entities dev

See merge request artica/pandorafms!1007
2017-11-02 15:35:38 +01:00
danielmaya 33bff02978 clear entities 2017-11-02 13:03:58 +01:00
Ramon Novoa ec870aa2f6 Initialize the group cache. 2017-11-02 10:41:07 +01:00
artica f8211e2c63 Auto-updated build strings. 2017-11-02 00:01:07 +01:00
artica 9b530c414f Auto-updated build strings. 2017-11-01 00:01:10 +01:00
fermin831 92c7eb59f5 Fixed public dashboard permissions 2017-10-31 19:48:56 +01:00
Arturo Gonzalez 50e7e5fc17 Added changes to sort json in ajax return 2017-10-31 16:39:58 +01:00
Arturo Gonzalez 1a04e6085a Added empty networkmap functions 2017-10-31 13:17:51 +01:00
fermin831 0a0506b9ff Merge branch 'develop' into ent-1365-graficas-gauge-no-muestran-umbrales-menores-a-1
Conflicts resolved:
*  pandora_console/include/graphs/pandora.d3.js
2017-10-31 12:47:42 +01:00
vgilc a7e1e877e7 Merge branch '654-Cambios-en-informes-de-maximo-minimo-y-media-4480-cherry' into 'develop'
654 cambios en informes de maximo minimo y media 4480 cherry

See merge request artica/pandorafms!994
2017-10-31 12:13:55 +01:00
enriquecd d1c29845a9 Add only one widget when creating a dashboard - #1398 2017-10-31 12:00:30 +01:00
Daniel Maya b9851a3a71 code backup 2017-10-31 11:51:19 +01:00
Arturo Gonzalez 385685de8a Added safe input to agent name 2017-10-31 09:35:13 +01:00
nramon 4e672cc758 Merge branch '655-module_data_increment_new_type_of_report' into 'develop'
655 module data increment new type of report

See merge request artica/pandorafms!519
2017-10-31 08:18:26 +01:00
artica 0653c17a9d Auto-updated build strings. 2017-10-31 00:01:11 +01:00
Alejandro Gallardo Escobar 849eba10d4 [Console] Fixed a vulnerability into the 'fgraph.php' script 2017-10-30 18:03:09 +01:00
Daniel Maya 718a2dbaff Fixed in visual map 2017-10-30 17:57:47 +01:00
enriquecd f608c686b8 Graph and table mode for max, min and avg reports an template reports - #654 2017-10-30 17:23:59 +01:00
nramon 8163200f54 Revert "Merge branch '654-Cambios-en-informes-de-maximo-minimo-y-media-4480' into 'develop'"
This reverts merge request !871
2017-10-30 16:11:58 +01:00
Alejandro Gallardo Escobar 64ec82f9d6 [Console] Added a notice to warn the users about the php files uploaded with the files manager 2017-10-30 16:04:58 +01:00
nramon 65ae5ed2eb Merge branch '654-Cambios-en-informes-de-maximo-minimo-y-media-4480' into 'develop'
Graph and table mode for max, min and avg reports and template reports - #654

See merge request artica/pandorafms!871
2017-10-30 15:51:51 +01:00
fermin831 2adf951121 Added free search values to data table 2017-10-30 15:45:31 +01:00
Arturo Gonzalez 2c3d72eedf Added lost parameter 2017-10-30 08:49:10 +01:00
artica 90b671de74 Auto-updated build strings. 2017-10-30 00:01:08 +01:00
artica 8f6d4a5d42 Auto-updated build strings. 2017-10-29 00:01:08 +02:00
artica 9bc804073a Auto-updated build strings. 2017-10-28 00:01:11 +02:00
Alejandro Gallardo Escobar c687e6a97b [Console] Fixed an XSS vulnerability into the 'ui_print_truncate_text' function 2017-10-27 13:25:27 +02:00
Arturo Gonzalez 74753918c3 Added function to update link to other map 2017-10-27 12:43:46 +02:00
vgilc 9592868491 Merge branch '1150-add-map-link-in-a-fictional-node-dev' into 'develop'
Added lost code in limbo, come back to the heaven darling

See merge request artica/pandorafms!982
2017-10-27 12:25:12 +02:00
Daniel Maya 5a2a97e94c Fixed function api_set_disable_alert 2017-10-27 12:25:00 +02:00
Arturo Gonzalez 9145811d29 Added final lost code 2017-10-27 10:40:58 +02:00
artica 42a43b0c4e Auto-updated build strings. 2017-10-27 00:01:09 +02:00
Arturo Gonzalez 139db28eca Added lost code 2017-10-26 16:13:27 +02:00
vgilc b96b50129c Merge branch '1103-Opciones-copiar-cortar-pegar-editor-de-etiquetas-de-la-consola-visual' into 'develop'
Now the label editor color is changed by the mouse scroll - #1103

See merge request artica/pandorafms!802
2017-10-26 15:48:33 +02:00
Arturo Gonzalez eb99b0a885 Added lost code 2017-10-26 15:37:43 +02:00
Arturo Gonzalez 802cb3ef5e Merge branch 'develop' into 1396-new-circular-percentile-item-in-visual-console-dev 2017-10-26 14:41:07 +02:00
Arturo Gonzalez 5a59f9e2a5 Merge branch 'develop' into 1378-donut-graph-in-visual-console-dev 2017-10-26 14:20:35 +02:00
vgilc 0537f8fe80 Merge branch '951-Añadir-enlace-documentación-en-aviso-de-MR-pendiente-open' into 'develop'
Add link in minor release update dialog to documentation - #951

See merge request artica/pandorafms!626
2017-10-26 13:59:54 +02:00