Commit Graph

7966 Commits

Author SHA1 Message Date
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
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
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
artica 13e0221013 Updated version and build strings. 2017-11-27 12:24:02 +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
Arturo Gonzalez 06f83825dc Added code to fix agents generation in sunbrust chart 2017-11-24 11:27:10 +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
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
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
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