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

9587 Commits

Author SHA1 Message Date
fermin831 d70969e6e9 Merge branch 'develop' into ent-2520-api-listar-y-crear-repuestas-de-eventos-6165-eucomm 
Conflicts resolved:
	pandora_console/include/functions_api.php
 2018-10-25 15:45:16 +02:00
fermin831 f831e59ac3 Added documentation and minor fixes related with API event responses functions 2018-10-25 15:42:45 +02:00
fbsanchez 8619adbf4c estilos popup 2018-10-25 15:42:20 +02:00
fermin831 8cc68185d9 Added set delete_event_response to API 2018-10-25 15:34:02 +02:00
fermin831 1bd492307a Added set update_event_response to API 2018-10-25 15:25:27 +02:00
fermin831 6b93cba119 Added set create_event_response to API 2018-10-25 15:03:07 +02:00
fbsanchez 85051924b7 estilos popup 2018-10-25 14:01:12 +02:00
alejandro-campos ad652c82fa fixed english and spanish version of plugin-in macros help dialog 2018-10-25 13:56:17 +02:00
vgilc 2bd6b0c688 Merge branch '1863-Error-en-tipo-de-evento-going-up-critical' into 'develop' 
1863 error en tipo de evento going up critical

See merge request artica/pandorafms!1736
 2018-10-25 13:25:22 +02:00
vgilc d218c586d9 Merge branch '2166-Hide-not-init-agents' into 'develop' 
fixed bug: hide not init agents not working in report item creation

See merge request artica/pandorafms!1742
 2018-10-25 13:23:22 +02:00
tatiana.llorente@artica.es 4b522d3f03 Added disabled field in sql query - #2955 2018-10-25 13:18:28 +02:00
vgilc aabd5435d0 Merge branch '2535-Macro-para-unidad-informes' into 'develop' 
Added unit in label graphs

See merge request artica/pandorafms!1874
 2018-10-25 13:12:26 +02:00
vgilc d71257ea1c Merge branch 'ent-2540-Macro-de-IP-del-agente-no-funciona-event-responses-EUComm' into 'develop' 
Fixed macro _agent_adress_ on events responses

See merge request artica/pandorafms!1872
 2018-10-25 13:03:44 +02:00
vgilc 3c548f1c98 Merge branch '6219_Comprobacion_paradas_planificadas' into 'develop' 
Fixed problems in scheduled downtime CLI

See merge request artica/pandorafms!1806
 2018-10-25 13:03:17 +02:00
vgilc f2356a3a9b Merge branch 'ent-2608-mas-problemas-de-vistas-de-grupos-secundarios' into 'develop' 
Ent 2608 mas problemas de vistas de grupos secundarios

See merge request artica/pandorafms!1856
 2018-10-25 12:59:51 +02:00
vgilc 4c4c874553 Merge branch '2630-Exportación-Gráficas-relacionado-con-CSV' into 'develop' 
Fixed bug in csv export graph

See merge request artica/pandorafms!1814
 2018-10-25 12:57:24 +02:00
vgilc 330bdbbce0 Merge branch '2637-Help-en-Event-Viewer' into 'develop' 
Changed Actions column with the right icons - #2637

See merge request artica/pandorafms!1746
 2018-10-25 12:32:37 +02:00
vgilc fb32ea240f Merge branch '2704_SQL_Horizontal_bar_graph_en_informe_corta_los_labels_si_son_muy_largos' into 'develop' 
Fixed SQL graphs in reports

See merge request artica/pandorafms!1791
 2018-10-25 12:11:41 +02:00
vgilc 4b317b573b Merge branch '2708-API-metaconsola-function-get_agent-no-devuelve-nada' into 'develop' 
Added code for function api_get_agent_alias for the API of the metaconsole - #2708

See merge request artica/pandorafms!1816
 2018-10-25 12:11:16 +02:00
vgilc c14a7d270a Merge branch '2719-Links-desde-tree-view-de-meta' into 'develop' 
Fixed bug: bad link in meta tree view's agent data, using relative path

See merge request artica/pandorafms!1793
 2018-10-25 12:10:32 +02:00
vgilc de0c81b7fa Merge branch '2724-Fallo-en-una-parte-de-replicación-de-eventos3' into 'develop' 
Fixed bug in events replication

See merge request artica/pandorafms!1804
 2018-10-25 12:09:58 +02:00
vgilc 9b4eeb5c84 Merge branch '2723-Fallo-hint-en-eventos' into 'develop' 
new function that adds a border to the image if the status is warning - #2723

See merge request artica/pandorafms!1743
 2018-10-25 12:07:58 +02:00
vgilc 4dd2cd434c Merge branch '2726-Botones-background-en-Visual-consoles' into 'develop' 
Changed colors for buttons - #2726

See merge request artica/pandorafms!1797
 2018-10-25 12:05:56 +02:00
vgilc 48395acfaa Merge branch '2730-Fallo-políticas-desde-la-meta' into 'develop' 
Fixed bug in deleted policies from the metaconsole

See merge request artica/pandorafms!1774
 2018-10-25 12:03:24 +02:00
vgilc cf9bf2b4e2 Merge branch '2768-Mensajería-interna' into 'develop' 
Fixed borders of tables with classes databox and data - #2768

See merge request artica/pandorafms!1786
 2018-10-25 11:54:50 +02:00
vgilc 50d30e782f Merge branch '2769-Bug-en-la-ayuda-de-Custom-Macros-en-la-creacion-de-un-modulo' into 'develop' 
Fixed bug in custom macros help

See merge request artica/pandorafms!1779
 2018-10-25 11:54:12 +02:00
fermin831 c0afbf0b6f Added get event_responses to API 2018-10-25 11:49:39 +02:00
vgilc 82f6e3cb95 Merge branch '2786-Errores-en-mapas-de-red-dev' into 'develop' 
Fixed group and set_center

See merge request artica/pandorafms!1880
 2018-10-25 11:43:38 +02:00
vgilc a9949c8ed2 Merge branch '2860-idiomas-en-metaconsola' into 'develop' 
Added option charset to db_connect

See merge request artica/pandorafms!1831
 2018-10-25 11:13:59 +02:00
danielmaya bbde9c70b6 conflict resolved 2018-10-25 11:13:57 +02:00
vgilc 4f406d8702 Merge branch '2876-No-se-guardan-datos-Network-components' into 'develop' 
Fixed bug in the data collection of network component when creating its corresponding module

See merge request artica/pandorafms!1865
 2018-10-25 10:58:03 +02:00
vgilc aff94d0761 Merge branch 'ent-2543-6208-version-movil-metaconsola-no-muestra-graficas-ni-algunas-imagenes-metaconsola-no-redirige-a-vista-de-movil' into 'develop' 
Ent 2543 6208 version movil metaconsola no muestra graficas ni algunas imagenes metaconsola no redirige a vista de movil

See merge request artica/pandorafms!1886
 2018-10-25 10:40:56 +02:00
vgilc 5a551da1f8 Merge branch '2759-crear-iso-precargada-enterprise-para-demos' into 'develop' 
Minor fix in cde cluster api methods

See merge request artica/pandorafms!1864
 2018-10-25 10:34:39 +02:00
vgilc 6ab39aa728 Merge branch '2932-Bug-al-crear-un-evento-por-medio-de-la-API-no-te-inserta-el-campo-agent-name' into 'develop' 
fixed bug: calling api method create event not inserting agent name

See merge request artica/pandorafms!1877
 2018-10-25 10:33:06 +02:00
vgilc 2b6e8473dc Merge branch 'ent-2908-lentitud-vista-tactica-cuando-hay-millones-de-eventos' into 'develop' 
Improve performance on tactical view with a lot of events

See merge request artica/pandorafms!1857
 2018-10-25 10:32:11 +02:00
artica db802c5a2e Auto-updated build strings. 2018-10-25 00:01:22 +02:00
danielmaya 87abf1dc02 added event time filter in tactical view 2018-10-24 16:36:44 +02:00
fbsanchez f0dbff1885 Merge remote-tracking branch 'origin/develop' into 2759-crear-iso-precargada-enterprise-para-demos 2018-10-24 12:22:12 +02:00
manuel.montes ca75cff3f7 Fixed bug in alert details 2018-10-24 10:25:45 +02:00
artica 7a64bb4855 Auto-updated build strings. 2018-10-24 00:01:28 +02:00
fermin831 8cb2ff1d1b Fixed tactical view graph on mobile metaconsole 2018-10-23 17:41:14 +02:00
tatiana.llorente@artica.es 9e452993cf Tip added - #2904 2018-10-23 15:19:15 +02:00
fbsanchez 9765a8c113 Merge remote-tracking branch 'origin/develop' into 2759-crear-iso-precargada-enterprise-para-demos 2018-10-23 14:43:39 +02:00
danielmaya f10a661cd6 Fixed group and set_center 2018-10-23 12:36:20 +02:00
artica 9a77256198 Auto-updated build strings. 2018-10-23 00:01:29 +02:00
fermin831 f537dbb961 Validate the group command on action creation 2018-10-22 16:19:29 +02:00
alejandro-campos aaa2c6aa10 fixed bug: calling api method create event not inserting agent name 2018-10-22 10:31:10 +02:00
artica f899910dd0 Updated version and build strings. 2018-10-22 09:45:06 +02:00
daniel 6bb478ea1a Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 2018-10-22 08:04:36 +02:00
artica 1d0d656996 Auto-updated build strings. 2018-10-22 00:01:23 +02:00
artica b01362a873 Auto-updated build strings. 2018-10-21 00:01:26 +02:00
artica 5ced50863c Auto-updated build strings. 2018-10-20 00:01:25 +02:00
manuel.montes 972f4b1e89 Added unit in label graphs 2018-10-19 14:03:15 +02:00
daniel bd2a3a82ec silence error php7(not solution) 2018-10-19 12:25:01 +02:00
daniel 81ebfc755e fixed gdgraph 2018-10-19 12:01:22 +02:00
daniel 8c49b26a91 php7 version 2018-10-19 11:37:11 +02:00
daniel ffc7734ebc delete flash_charts and library pchart 2018-10-19 11:31:06 +02:00
vgilc b7f9149c20 Merge branch '2920-No-funciona-el-wizard-para-crear-agentes-desde-la-metaconsola' into 'develop' 
Changed function that creates a new agent from metaconsole to set field name…

See merge request artica/pandorafms!1873
 2018-10-19 11:30:47 +02:00
daniel 0a1bee92a5 fixed slicebar to php7 2018-10-19 10:49:13 +02:00
alejandro-campos 3fd588353b Changed function that creates a new agent from metaconsole to set field name with a hash and fixed bug when setting alias in database 2018-10-19 10:43:43 +02:00
daniel b736746e1c php version upgrade 2018-10-19 10:04:26 +02:00
artica f340a3dda0 Auto-updated build strings. 2018-10-19 00:01:26 +02:00
fermin831 4d3c74ed37 Minor typo fix in events responses 2018-10-18 19:20:37 +02:00
fermin831 40ceec6561 Fixed macro _agent_adress_ on events responses 2018-10-18 18:45:11 +02:00
daniel e299209a92 fixed visual console custam graph in meta 2018-10-18 13:24:15 +02:00
daniel 9492d11cc8 Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 2018-10-18 12:51:32 +02:00
vgilc d23e47dd9d Merge branch '2737-Optimización-de-tags-dev-2' into 'develop' 
Fixed tags filter on Tree tags

See merge request artica/pandorafms!1862
 2018-10-18 09:53:03 +02:00
artica 0c39e321e4 Auto-updated build strings. 2018-10-18 00:01:24 +02:00
fermin831 2d2c465ff6 Removed unwanted traces 2018-10-17 15:43:26 +02:00
manuel.montes aa0c4b41e7 Fixed bug in the data collection of network component when creating its corresponding module 2018-10-17 13:31:14 +02:00
fbsanchez 7a44f9dcdd Minor fix in cde cluster api methods 2018-10-17 13:26:41 +02:00
fermin831 14afe2ff88 Added message 'Please, select an agent first' 2018-10-17 12:35:11 +02:00
fermin831 060e46868d Fixed tags filter on bulk operation (select module first) 2018-10-17 11:57:22 +02:00
artica fd53704dc0 Auto-updated build strings. 2018-10-17 00:01:34 +02:00
daniel f824650642 Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 2018-10-16 15:42:17 +02:00
daniel 3c62388f0e fixed errors php and slicebars change version php7 2018-10-16 15:32:31 +02:00
fermin831 0ca34c744d Fixed tags filter on Tree tags 2018-10-16 13:29:00 +02:00
fermin831 aff2879340 Merge remote-tracking branch 'origin/develop' into ent-2740-servicios-favoritos 
Conflicts:
	pandora_console/extras/mr/21.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/pandoradb_data.sql
 2018-10-16 11:35:14 +02:00
vgilc 14419759b0 Merge branch 'ent-2631-i6106-error-al-editar-modulos-con-tag-con-perfil-de-usuario-determinado' into 'develop' 
Fixed modules tags acl with to tagged modules with an user without tags

See merge request artica/pandorafms!1860
 2018-10-16 09:01:13 +02:00
artica 9675c6ce52 Auto-updated build strings. 2018-10-16 00:01:27 +02:00
fermin831 dd4e1c9994 Fixed modules tags acl with to tagged modules with an user without tags 2018-10-15 16:50:23 +02:00
tatiana.llorente@artica.es 6adcba4b39 Changed url for widgets in public dashboard - #2888 2018-10-15 16:12:16 +02:00
fermin831 41d104ae2c Improve performance on tactical view with a lot of events 2018-10-15 12:23:51 +02:00
daniel d84427b014 fixed errors php 2018-10-15 10:32:24 +02:00
daniel d28bc79b79 upgrade php 2018-10-15 09:05:04 +02:00
daniel c3bcb84293 Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 2018-10-15 08:58:55 +02:00
vgilc 743c8a747e Merge branch 'ent-2819-i6537-se-descuadran-etiquetas-en-link-publico-cons-visuales' into 'develop' 
Fixed margin in public visual consoles

See merge request artica/pandorafms!1855
 2018-10-15 00:04:34 +02:00
artica 35e1234b3c Auto-updated build strings. 2018-10-15 00:01:24 +02:00
artica 44be4aea57 Auto-updated build strings. 2018-10-14 00:01:23 +02:00
artica b0e56cd506 Auto-updated build strings. 2018-10-13 00:01:24 +02:00
artica 179f3f0526 Auto-updated build strings. 2018-10-12 00:01:28 +02:00
fermin831 0747a5b263 Fixed secondary groups privileges in agent popup in tree view 2018-10-11 16:00:49 +02:00
fermin831 e5a2284b8b Fixed margin in public visual consoles 2018-10-11 14:51:52 +02:00
daniel 16be9488c8 Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 
Conflicts:
	pandora_console/include/functions_graph.php
 2018-10-11 13:06:17 +02:00
daniel 1f56054f6c fixed changes php7 2018-10-11 12:57:48 +02:00
vgilc edadc60957 Merge branch '2737-Optimización-de-tags-dev' into 'develop' 
2737 optimización de tags dev

See merge request artica/pandorafms!1815
 2018-10-11 12:14:10 +02:00
Ramón Novoa 3e584747b3
Merge pull request #104 from sofwerx/https-proxy 
Adding a check for HTTP_X_FORWARDED_PROTO in https_is_running()
 2018-10-11 09:34:26 +02:00
artica d087665d1e Auto-updated build strings. 2018-10-11 00:01:56 +02:00
fermin831 2693bbe209 Merge remote-tracking branch 'origin/develop' into 2737-Optimización-de-tags-dev 
Conflicts:
	pandora_console/godmode/massive/massive_delete_modules.php
	pandora_console/operation/agentes/ver_agente.php
 2018-10-10 19:39:27 +02:00
fermin831 18ad7a2ce9 [Tags performance] Fixed not init filter 2018-10-10 19:14:24 +02:00
danielmaya 4ac4f46daf Fixed html_print_autocomplete_modules 2018-10-10 18:02:10 +02:00
fermin831 496f99e42f [Tags performance] Fixed tags counters in tags view 2018-10-10 17:43:02 +02:00
fermin831 de10de03f7 [Tags performance] Fixed edit and delete massive delete and edit modules in bulk selecting modules first 2018-10-10 17:42:33 +02:00
danielmaya 8339eecacc Merge branch '2737-Optimización-de-tags-dev' of https://192.168.50.5:8081/artica/pandorafms into 2737-Optimización-de-tags-dev 2018-10-10 16:57:15 +02:00
danielmaya 4558c909ef Changed source filter in event list 2018-10-10 16:57:04 +02:00
vgilc ba419ad246 Merge branch '2881-Añadir-campo-de-estado-de-agente-en-la-llamada-API-get_all_agents-fix' into 'develop' 
Fix returnData - #2881

See merge request artica/pandorafms!1849
 2018-10-10 09:10:27 +02:00
artica 1694fccd83 Auto-updated build strings. 2018-10-10 00:01:47 +02:00
enriquecd 3d6451d64b Fix returnData - #2881 2018-10-09 20:03:49 +02:00
manuel.montes 159d7466cd Merge branch 'develop' into 2869-Filtro-de-estado-not-normal-incorrecto-en-vista-de-agent-detail 
Conflicts:
	pandora_console/include/functions_agents.php
 2018-10-09 17:01:08 +02:00
enriquecd 2083733329 Fix id for agent status - #2881 2018-10-09 16:33:07 +02:00
tatiana.llorente@artica.es 8f2472dcf8 Added css rule for links in the th tables with databox class- #2890 2018-10-09 12:38:59 +02:00
fermin831 ec7c645d1b [Tags performance] Fixed problems when there is not using secondary groups 2018-10-09 11:45:55 +02:00
fermin831 28f9e152e7 [Tags performance] Fixed tags filter and removed unwanted code 2018-10-09 10:56:02 +02:00
vgilc bc90e77a3d Merge branch '2881-Añadir-campo-de-estado-de-agente-en-la-llamada-API-get_all_agents-2' into 'develop' 
api function api_get_all_agents for meta - #2881

See merge request artica/pandorafms!1840
 2018-10-09 08:53:16 +02:00
vgilc 6ea8bee8ca Merge branch '2613_Error_en_filtrar_agentes_por_estado_en_bulk_operations_2' into 'develop' 
Fixed error in agents bulk operations

See merge request artica/pandorafms!1841
 2018-10-09 08:52:26 +02:00
artica 51c4fbece2 Auto-updated build strings. 2018-10-09 00:01:25 +02:00
samucarc 61a82337c3 Fixed error in agents bulk operations 2018-10-08 17:57:05 +02:00
danielmaya f952d5c70e tags_get_acl_tags revision 2018-10-08 17:45:26 +02:00
Fermin 441458843f [Tags performance] Fixed check acl tags by module and removed unused code 2018-10-08 17:19:46 +02:00
enriquecd f7700874a5 api function api_get_all_agents for meta - #2881 2018-10-08 16:45:44 +02:00
Fermin 099f01a4ba [Tags performance] Fixed select modules from Agent/Module dashboard widget 2018-10-08 13:45:30 +02:00
vgilc 11679461cd Merge branch '2881-Añadir-campo-de-estado-de-agente-en-la-llamada-API-get_all_agents' into 'develop' 
Add status data to get_all_agents API response - #2881

See merge request artica/pandorafms!1835
 2018-10-08 13:24:35 +02:00
Fermin d2b8939804 [Tags performance] Fixed select_modules_for_agent_group function (failed with several secondary groups). 2018-10-08 12:33:40 +02:00
tatiana.llorente@artica.es 918ba8ed77 Added text for nodata in graph and resized image - #1804 2018-10-08 11:53:30 +02:00
artica 76da7384b6 Auto-updated build strings. 2018-10-08 00:01:23 +02:00
artica 5171ef79b0 Auto-updated build strings. 2018-10-07 00:01:23 +02:00
artica a40057b3ff Auto-updated build strings. 2018-10-06 00:01:29 +02:00
enriquecd 112b4e3097 Add get_group_id_by_name and get_timezone to api functions - #2756 2018-10-05 17:01:11 +02:00
Fermin a72b9b0515 [Tags performance] Fixed agents_get_modules to ajax calls 2018-10-05 13:32:14 +02:00
enriquecd c0dd2bcab6 Add status data to get_all_agents API response - #2881 2018-10-05 12:57:25 +02:00
Fermin 1e4c570541 [Tags performance] check agents_get_modules in networkmap and removed unused code 2018-10-05 10:44:24 +02:00
danielmaya 5fd76bf8cb Merge branch '2737-Optimización-de-tags-dev' of https://192.168.50.5:8081/artica/pandorafms into 2737-Optimización-de-tags-dev 2018-10-05 09:42:09 +02:00
danielmaya e8621e54e5 Updated tags optimization 2018-10-05 09:40:08 +02:00
artica ec8d36f8eb Auto-updated build strings. 2018-10-05 00:01:30 +02:00
fbsanchez 7766881da6 Added option charset to db_connect 
Removed unused function db_get_table_count
 2018-10-04 17:07:34 +02:00
manuel.montes 07e476a740 Fixed bug in agent status filter 2018-10-04 16:35:37 +02:00
Fermin 979e443824 Removed unused code 2018-10-04 16:31:24 +02:00
Fermin 75768c9eaa [Tags performance] Open reporting checks 2018-10-04 16:23:36 +02:00
daniel e2f7157545 fixed php7 2018-10-04 11:43:08 +02:00
artica 7ac581ac1e Auto-updated build strings. 2018-10-04 00:01:27 +02:00
fermin831 f3eae5e111 [Tags performance] Some agents_get_modules checks 2018-10-03 17:00:57 +02:00
fermin831 a33cae9e8f [Tags performance] Check functions_agents agents_get_modules 2018-10-03 16:33:56 +02:00
fermin831 0ca13b8e98 Removed unused code 2018-10-03 15:04:45 +02:00
fermin831 36fade6b37 Removed unwanted traces 2018-10-03 13:55:06 +02:00
fermin831 7bd0615681 [Tags performace] Check visual consoles 2018-10-03 13:53:59 +02:00
fermin831 7ffeaaf50b [Tags performance] fermin revision 1 2018-10-03 11:13:52 +02:00
danielmaya 958930931e Fixed filter group in agents/modules view 2018-10-03 10:42:59 +02:00
vgilc 46830a4cbe Merge branch '2778-Mostrar-valor-numerico-en-el-tooltip-dev' into 'develop' 
fixed issue with string data in visual map

See merge request artica/pandorafms!1811
 2018-10-03 09:31:02 +02:00
artica f39788d8ef Auto-updated build strings. 2018-10-03 00:01:28 +02:00
vgilc ca67f52fb4 Merge branch '2670-Nuevo-widget-dashboard-system-group-status' into 'develop' 
2670 nuevo widget dashboard system group status

See merge request artica/pandorafms!1795
 2018-10-02 17:25:19 +02:00
alejandro-campos 62548c7f94 Merge branch 'develop' into 2670-Nuevo-widget-dashboard-system-group-status 
Conflicts:
	pandora_console/include/styles/pandora.css
 2018-10-02 17:11:02 +02:00
vgilc 7db6ae54ff Merge branch '2857-Falta-imagen-de-fondo-para-preview-de-logo-en-visual-setup-de-meta' into 'develop' 
edited css class ui-widget-content

See merge request artica/pandorafms!1822
 2018-10-02 15:39:18 +02:00
vgilc 5668857914 Merge branch '2479-Errores-en-vista-de-alertas-de-meta' into 'develop' 
2479 errores en vista de alertas de meta

See merge request artica/pandorafms!1821
 2018-10-02 15:37:08 +02:00
fermin831 f767474516 [Tags performance] Fixed indexed agents_get_modules with no details 2018-10-02 15:30:19 +02:00
fermin831 8d5953ce50 Removed unused code 2018-10-02 15:01:40 +02:00
fermin831 2d057f9ae9 Fixed tags problems with secondary groups in tree view 2018-10-02 13:35:48 +02:00
fermin831 dc92a00b48 [Tags performance] Fixed performance of main agent view 2018-10-02 13:19:36 +02:00
tatiana.llorente@artica.es 2dd10a4328 Added number of times an alert is fired - #2827 2018-10-02 12:35:20 +02:00
fermin831 28b879f058 [Tags performance] Added TODOS to revise agents_get_modules 2018-10-02 09:48:29 +02:00
artica 08a3aabdf2 Auto-updated build strings. 2018-10-02 00:01:33 +02:00
alejandro-campos 1c2743797e Revert "fixed conflict" 
This reverts commit 1d726d59f3.
 2018-10-01 18:16:55 +02:00
alejandro-campos e5e81e55d7 edited css class ui-widget-content 2018-10-01 17:58:29 +02:00
fermin831 9a47d5325e [Tags performance] Events improvements 2018-10-01 17:03:37 +02:00
alejandro-campos 1d726d59f3 fixed conflict 2018-10-01 15:34:36 +02:00
alejandro-campos 6b14754137 fixed conflict 2018-10-01 15:30:43 +02:00
daniel b5ebd81b19 fixed error values negative 2018-10-01 15:24:29 +02:00
vgilc 706a3ca4c0 Merge branch '2479-Errores-en-vista-de-alertas-de-meta' into 'develop' 
fixed bug in meta alert view: action field (other than default) not showing

See merge request artica/pandorafms!1621
 2018-10-01 14:45:16 +02:00
alejandro-campos 0c899f5078 Merge branch 'develop' into 2479-Errores-en-vista-de-alertas-de-meta 
Conflicts:
	pandora_console/include/functions_ui.php
 2018-10-01 14:03:30 +02:00
vgilc 600ee87149 Merge branch '2659-Usuarios-LDAP-no-se-actualizan-ante-cambio-de-permisos-dev' into 'develop' 
Added check permissions in ldap login

See merge request artica/pandorafms!1785
 2018-10-01 12:41:09 +02:00
vgilc 62dcf0f342 Merge branch '2459_No_se_ve_el_icono_por_defecto_del_widget_de_bienvenida' into 'develop' 
Fixed welcome icone

See merge request artica/pandorafms!1640
 2018-10-01 12:38:49 +02:00
vgilc d9a8e30229 Merge branch '2138-En-la-API-se-esta-usando-el-nombre-del-agente-para-filtrar-en-lugar-del-alias' into 'develop' 
Agent filtering by alias

See merge request artica/pandorafms!1627
 2018-10-01 12:30:09 +02:00
vgilc f73b4a55e6 Merge branch '2741-Refactorizar_vista_module_groups' into 'develop' 
refactoriced view module_groups

See merge request artica/pandorafms!1788
 2018-10-01 10:59:09 +02:00
tatiana.llorente@artica.es 9977f1ddf9 Added code for function api_get_agent_alias for the API of the metaconsole - #2708 2018-10-01 09:51:58 +02:00
artica 779f3c6c60 Auto-updated build strings. 2018-10-01 00:01:23 +02:00
artica 46373616fa Auto-updated build strings. 2018-09-30 00:01:22 +02:00
artica 2606b73e57 Auto-updated build strings. 2018-09-29 00:01:27 +02:00
fermin831 debf8db577 [Tags performance] Added some TODOs 2018-09-28 12:39:23 +02:00
fermin831 015d7eea09 [Tags performance] Fixed acl propagation in child groups 2018-09-28 12:37:11 +02:00
vgilc 2dac09435a Merge branch '2040-Tags-en-operaciones-masivas' into 'develop' 
fixed bug on bulk delete and bulk update module operation

See merge request artica/pandorafms!1613
 2018-09-28 11:05:34 +02:00
vgilc 7d3916fcb7 Merge branch '2436-Estadisticas-de-incidentes' into 'develop' 
removed watermark from incidents statistics graphs

See merge request artica/pandorafms!1598
 2018-09-28 10:51:36 +02:00
vgilc d5b9ddec46 Merge branch '2457-No-permite-editar-ni-eliminar-alertas-de-cluster' into 'develop' 
Added new funcionality to cluster alert configuration: update alert

See merge request artica/pandorafms!1634
 2018-09-28 10:50:44 +02:00
vgilc d933a966eb Merge branch '2478-Logo-meta' into 'develop' 
changed background of meta visual setup logo previews

See merge request artica/pandorafms!1641
 2018-09-28 10:50:13 +02:00
vgilc ad5581f0c2 Merge branch '2491-Alert-view-meta' into 'develop' 
fixed bug in meta alert view: agent names not showing in table

See merge request artica/pandorafms!1618
 2018-09-28 10:39:52 +02:00
vgilc d31a2f4cc4 Merge branch 'ent-2763-snmp-traps' into 'develop' 
Added recalculate counters when a status module is forced by console

See merge request artica/pandorafms!1794
 2018-09-28 10:29:14 +02:00
vgilc 4d2413b39b Merge branch '2501-Crear-SO-con-la-API' into 'develop' 
added methods to api (metaconsole and node) to create and update operating systems

See merge request artica/pandorafms!1654
 2018-09-28 10:26:47 +02:00
vgilc dec9021702 Merge branch '2548_Bug_edicion_modulos_operaciones_masivas' into 'develop' 
Fixed tags in module bulk operations

See merge request artica/pandorafms!1639
 2018-09-28 10:25:38 +02:00
vgilc f98e2ed1bf Merge branch '2613_Error_en_filtrar_agentes_por_estado_en_bulk_operations' into 'develop' 
Fixed error in agents bulk operations with a normal status

See merge request artica/pandorafms!1709
 2018-09-28 10:24:27 +02:00
vgilc eb5d169b53 Merge branch '2727-Link-publico-de-console-visual' into 'develop' 
new parameter has been passed in to check whether or not we are at a public…

See merge request artica/pandorafms!1808
 2018-09-28 10:04:52 +02:00
vgilc 6a6bae10b1 Merge branch 'ent-2782-ue-agente-software-en-modo-standby' into 'develop' 
Ent 2782 ue agente software en modo standby

See merge request artica/pandorafms!1800
 2018-09-28 10:04:12 +02:00
vgilc 2fe350ed75 Merge branch '2816-Reports-de-custom-graphs-no-funcionan-si-le-ponemos-un-nombre-a-la-custom-graph' into 'develop' 
fixed bug: reporting of custom graphs not showing graph when graph name is empty

See merge request artica/pandorafms!1809
 2018-09-28 09:58:11 +02:00
fermin831 81e15c4dc9 Fixed tags on Tree view 2018-09-28 09:37:16 +02:00
artica 1a60aee7a6 Auto-updated build strings. 2018-09-28 00:01:25 +02:00
danielmaya aceb67dd69 [Tags performance] Improve event view 2018-09-27 18:11:13 +02:00
manuel.montes 712103c308 Fixed bug in csv export graph 2018-09-27 17:35:52 +02:00
danielmaya 453fb3f67b TODO List 2018-09-27 13:30:32 +02:00
danielmaya 631c38ca84 [Tags performance] Improve monitor detail (aka status_monitor) 2018-09-27 12:46:45 +02:00
artica 79961b91d0 Auto-updated build strings. 2018-09-27 00:01:24 +02:00
danielmaya 896ba6051b fixed issue with string data in visual map 2018-09-26 11:00:44 +02:00
artica 643da5c993 Auto-updated build strings. 2018-09-26 00:01:28 +02:00
alejandro-campos 24de9d9119 fixed bug: reporting of custom graphs not showing graph when graph name is empty 2018-09-25 17:33:29 +02:00
fermin831 22b46e41f1 Added standby mode on disabled token of API function set update_agent 2018-09-25 15:59:33 +02:00
alejandro-campos 2bae8a0c54 new parameter has been passed in to check whether or not we are at a public console when obtaining url of child console 2018-09-25 13:58:19 +02:00
samucarc cc5104024d Fixed problems in scheduled downtime CLI 2018-09-25 13:33:10 +02:00
manuel.montes c77bc2328f Fixed bug in events replication 2018-09-25 12:04:18 +02:00
manuel.montes 9a56754384 Revert "Fixed bug in events replication" 
This reverts commit e59c40d687.
 2018-09-25 11:59:37 +02:00
vgilc 92381141b9 Merge branch '1979-5352-plugin-de-monitorizacion-log-apache-dev' into 'develop' 
Added help_log_viewer

See merge request artica/pandorafms!1805
 2018-09-25 08:31:02 +02:00
artica f280e54738 Auto-updated build strings. 2018-09-25 00:01:26 +02:00
danielmaya 97a5f5ba97 Added help_log_viewer 2018-09-24 17:58:23 +02:00
manuel.montes e59c40d687 Fixed bug in events replication 2018-09-24 14:01:17 +02:00
artica 010207e6ad Auto-updated build strings. 2018-09-24 00:01:23 +02:00
artica bd0176070a Auto-updated build strings. 2018-09-23 00:01:23 +02:00
artica 25f91a451e Auto-updated build strings. 2018-09-22 00:01:24 +02:00
samucarc 638c4f8bc7 Added warning and normal status agents in group view 2018-09-21 15:10:30 +02:00
fermin831 da3061651b Fixed search agentes and modules in others tree views 2018-09-21 13:01:40 +02:00
tatiana.llorente@artica.es 028cca0d66 Changed colors for buttons - #2726 2018-09-21 12:59:15 +02:00
fermin831 df660091ae Fixed search group in others tree views 2018-09-21 11:48:23 +02:00
fermin831 a097fdf5e6 Added recalculate counters when a status module is forced by console 2018-09-21 11:15:25 +02:00
alejandro-campos 1f801d5a3a fixed bug: bad link in meta tree view's agent data, go to agent edition button using relative path 2018-09-21 10:14:21 +02:00
alejandro-campos a5a92519aa Fixed bug: bad link in meta tree view's agent data, using relative path 2018-09-21 10:07:01 +02:00
vgilc ce2a21c70b Merge branch 'ent-2798-no-se-pueden-anadir-agentes-a-politicas-desde-la-meta' into 'develop' 
Added some secondary groups checks to meta

See merge request artica/pandorafms!1790
 2018-09-21 08:37:34 +02:00
artica fa05ecc477 Auto-updated build strings. 2018-09-21 00:01:24 +02:00
samucarc b66f3a9f6f Fixed SQL graphs in reports 2018-09-20 19:18:45 +02:00
fermin831 48798d4af5 Added some secondary groups checks to meta 2018-09-20 17:59:12 +02:00
vgilc da6fe0ec6b Merge branch '000-tool_debug' into 'develop' 
add new params html_debug for strig in one line and new alias hd

See merge request artica/pandorafms!1789
 2018-09-20 16:07:16 +02:00
daniel 34bb73ac4b add new params html_debug for strig in one line and new alias hd 2018-09-20 16:00:08 +02:00
daniel 26c08d9309 refactoriced view module_groups 2018-09-20 15:51:36 +02:00
samucarc 0ccb059e36 Fixed reports in alert module reports when module is empty 2018-09-20 15:50:45 +02:00
tatiana.llorente@artica.es e49c0e3ae7 Fixed a minor mistake in thead - #2768 2018-09-20 12:18:31 +02:00
tatiana.llorente@artica.es bc38468e6c Fixed borders of tables with classes databox and data - #2768 2018-09-20 11:50:47 +02:00
danielmaya a0a4a7fefb Added check permissions in ldap login 2018-09-20 11:21:29 +02:00
artica dcb3d7d7b9 Auto-updated build strings. 2018-09-20 00:01:25 +02:00
fermin831 e318d9539c Added favourite services configuration tokens 2018-09-19 16:56:58 +02:00
artica 687a742746 Auto-updated build strings. 2018-09-19 00:01:28 +02:00
Alejandro Gallardo Escobar 167cd67ece Bugfix 2018-09-18 15:44:55 +02:00
Alejandro Gallardo Escobar 2c88d33709 Merge branch 'develop' into ent-2588-service-like-visual-console-status 2018-09-18 15:35:56 +02:00
Alejandro Gallardo Escobar e5ff2b956c Bugfixes 2018-09-18 15:33:14 +02:00
manuel.montes e22d9e6d9b Fixed bug in custom macros help 2018-09-18 14:31:01 +02:00
vgilc bbb36fe6d8 Merge branch '1979-Informe-MAX-no-es-coherente-dev' into 'develop' 
Fixed max_value report

See merge request artica/pandorafms!1777
 2018-09-18 12:59:11 +02:00
danielmaya 6cf638a4d8 Fixed max_value report 2018-09-18 12:18:47 +02:00
daniel 8f3a602097 fixed error in metaconsole reports module events 2018-09-18 10:38:42 +02:00
vgilc e0eb6a3eff Merge branch '1920_Informe_de_alertas_3' into 'develop' 
Fixed minor error module/agent/group alert report

See merge request artica/pandorafms!1775
 2018-09-18 10:15:50 +02:00
samucarc 7100aed448 Fixed minor error module/agent/group alert report 2018-09-18 10:09:11 +02:00
manuel.montes d0e7b86112 Fixed bug in deleted policies from the metaconsole 2018-09-18 09:41:05 +02:00
daniel 0c853a83d1 add new tree view edition group 2018-09-18 09:28:22 +02:00
vgilc 9f0271c0b8 Merge branch '1920_Informe_de_alertas_2' into 'develop' 
Fixed module/agent/group alert report

See merge request artica/pandorafms!1772
 2018-09-18 08:37:03 +02:00
artica abc7e2cb3c Auto-updated build strings. 2018-09-18 00:01:27 +02:00
samucarc 8daca7d220 Fixed module/agent/group alert report 2018-09-17 18:57:29 +02:00
alejandro-campos 6d28b386d1 changed styles for system group status widget 2018-09-17 18:56:38 +02:00
vgilc 14df5bafd7 Merge branch 'ent-2588-service-like-visual-console-status' into 'develop' 
Bugfix

See merge request artica/pandorafms!1771
 2018-09-17 16:58:48 +02:00
Alejandro Gallardo Escobar 0fef339a13 Bugfix 2018-09-17 16:54:47 +02:00
vgilc 080cfb20ca Merge branch 'develop' into '1979-5352-plugin-de-monitorizacion-log-apache-dev' 
# Conflicts:
#   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
 2018-09-17 14:44:24 +02:00
artica 921a025262 Auto-updated build strings. 2018-09-17 00:01:24 +02:00
artica 4f6aff52c7 Auto-updated build strings. 2018-09-16 00:01:23 +02:00
artica 591db5001f Auto-updated build strings. 2018-09-15 00:01:24 +02:00
vgilc 59feccda72 Merge branch 'ent-2588-service-like-visual-console-status' into 'develop' 
Añadidos textos de ayuda

See merge request artica/pandorafms!1767
 2018-09-14 11:52:59 +02:00
Alejandro Gallardo Escobar 1ac837a1b2 Improved the linked visual console status help 2018-09-14 11:40:28 +02:00
artica dff3fb7d0d Auto-updated build strings. 2018-09-14 00:01:27 +02:00
alejandro-campos 89a4e3667f Added styles for new widget system group status 2018-09-13 19:08:45 +02:00
daniel 5d6f414d68 fixed view manage groups 2018-09-13 16:28:08 +02:00
artica c54f414a73 Updated version and build strings. 2018-09-13 15:53:21 +02:00
fermin831 764b1125bd Generate session csrf code to avoid attacks in user edition 2018-09-13 15:19:08 +02:00
artica 583a7475e4 Auto-updated build strings. 2018-09-13 00:01:26 +02:00
fermin831 a25d4ed166 Fixed alerts_get_alerts function 2018-09-12 17:27:09 +02:00
Alejandro Gallardo Escobar 7930f22dd0 WIP: Improved the linked visual console status help 2018-09-12 16:54:18 +02:00
Alejandro Gallardo Escobar 98b2907857 Bug fixes 2018-09-12 16:16:04 +02:00
daniel c5b942f13f fixed minor error legend graph and value avg 2018-09-12 15:57:22 +02:00
manuel.montes a2b3d6e07f Deleted reports from cron 2018-09-12 13:43:23 +02:00
vgilc 8622fc2738 Merge branch '2550-Las_graficas_no_se_muestran_bien_en_Dashboard' into 'develop' 
fixed minor error refresh graph pie

See merge request artica/pandorafms!1752
 2018-09-12 11:27:39 +02:00
daniel b0257eb3f4 fixed minor error refresh graph pie 2018-09-12 11:23:26 +02:00
vgilc ec0640083a Merge branch '2487-Cambiar_forma_de_captura_de_datos_de_graficas_forecast_y_baseline_2' into 'develop' 
2487 cambiar forma de captura de datos de graficas forecast y baseline 2

See merge request artica/pandorafms!1751
 2018-09-12 10:38:04 +02:00
daniel 6312d2e38a fixed forecast report 2018-09-12 10:34:14 +02:00
vgilc 1bdfaed293 Merge branch 'ent-2153-vistas-en-las-que-no-se-ha-tenido-en-cuenta-los-grupos-secundarios-2' into 'develop' 
Ent 2153 vistas en las que no se ha tenido en cuenta los grupos secundarios 2

See merge request artica/pandorafms!1750
 2018-09-12 10:21:09 +02:00
artica cef1b10ade Auto-updated build strings. 2018-09-12 00:01:26 +02:00
daniel ed0d89ec73 fixed baseline report 2018-09-11 17:06:35 +02:00
nramon 266cd6d394 Merge branch 'ent-2588-service-like-visual-console-status' into 'develop' 
Removed the Static Graph requirement for all the status calculation types

See merge request artica/pandorafms!1748
 2018-09-11 15:05:46 +02:00
Alejandro Gallardo Escobar 2fa2d713b8 Removed the Static Graph requirement for all the status calculation types of the visual console linked elements 2018-09-11 14:54:26 +02:00
fermin831 9c032f4dfe [Secondary groups] Fixed group report 2018-09-11 13:22:51 +02:00
daniel 7eed209339 fixed error size graph in dashboard 2018-09-11 11:37:11 +02:00
tatiana.llorente@artica.es 31c153ec27 Changed Actions column with the right icons - #2637 2018-09-11 11:01:37 +02:00
daniel f117d1af43 fixed heigth charts for reports 2018-09-11 09:33:24 +02:00
fermin831 5c54afe673 Fixed secondary groups in alerts details 2018-09-11 09:15:48 +02:00
artica f7940908c2 Auto-updated build strings. 2018-09-11 00:01:25 +02:00
vgilc 72a583399a Merge branch '2541-Functiones-API-traps-y-control-de-acceso-de-aplicacion-externa-open' into 'develop' 
Add intracom generic functions - #2541

See merge request artica/pandorafms!1725
 2018-09-10 15:44:00 +02:00
vgilc 97dcaab99c Merge branch '2611-Cache_de_vista_de_arbol_y_vista_de_grupos' into 'develop' 
2611 cache de vista de arbol y vista de grupos

See merge request artica/pandorafms!1744
 2018-09-10 15:43:16 +02:00
daniel 022adeb24d fixed metaconsole tree view popup modules 2018-09-10 15:35:11 +02:00
tatiana.llorente@artica.es d36c10fa08 new function that adds a border to the image if the status is warning - #2723 2018-09-10 13:22:02 +02:00
alejandro-campos e0242462eb modified function for availability reporting 2018-09-10 13:10:27 +02:00
alejandro-campos 3c25125713 fixed bug: hide not init agents not working in report item creation 2018-09-10 13:01:48 +02:00
daniel f123bac915 fixed total counters grouw view 2018-09-10 12:58:10 +02:00
vgilc f0e1d61f6d Merge branch '2611-Cache_de_vista_de_arbol_y_vista_de_grupos' into 'develop' 
fixed minor error no agents group view

See merge request artica/pandorafms!1740
 2018-09-10 12:43:26 +02:00
vgilc 683d748b38 Merge branch 'ent-2588-service-like-visual-console-status' into 'develop' 
Now is possible to link visual consoles from different nodes to the visual console elements

See merge request artica/pandorafms!1741
 2018-09-10 12:43:06 +02:00
daniel 729fe74758 fixed minor error tree view acl 2018-09-10 12:08:38 +02:00
Alejandro Gallardo Escobar 40ff7b9042 Now is possible to link visual consoles from different nodes to the visual console elements 2018-09-10 11:25:44 +02:00
daniel 3d3670f6f9 fixed minor error no agents group view 2018-09-10 11:13:31 +02:00
daniel 5e9fda93d9 Merge remote-tracking branch 'origin/develop' into 2611-Cache_de_vista_de_arbol_y_vista_de_grupos 2018-09-10 09:59:46 +02:00
daniel 68627e80b0 fixed metaconsole group view 2018-09-10 09:55:31 +02:00
artica 003b734f4e Auto-updated build strings. 2018-09-10 00:01:22 +02:00
artica 6ae51b5e34 Auto-updated build strings. 2018-09-09 00:01:23 +02:00
artica cc4de37515 Auto-updated build strings. 2018-09-08 00:01:53 +02:00
daniel 3fa4f44d68 fixed group view 2018-09-07 14:37:22 +02:00
daniel ac0f0536c7 performance improve view groups 2018-09-07 14:19:01 +02:00
danielmaya 39673ed93a Added class modaldeletebutton in pandora.css 2018-09-07 14:15:21 +02:00
artica fb68f3f9b6 Auto-updated build strings. 2018-09-07 00:01:31 +02:00
alejandro-campos 481582f628 Changed event type 'Going down to critical' to 'Going up to critical' 2018-09-06 16:42:52 +02:00
nramon 6511f67600 Merge branch '2611-Cache_de_vista_de_arbol_y_vista_de_grupos' into 'develop' 
improve performance on group view

See merge request artica/pandorafms!1735
 2018-09-06 15:46:21 +02:00
daniel 6072cd3dc9 improve performance on group view 2018-09-06 15:28:22 +02:00
nramon 4e7d641667 Merge branch '2611-Cache_de_vista_de_arbol_y_vista_de_grupos' into 'develop' 
fixed performance in group view

See merge request artica/pandorafms!1734
 2018-09-06 10:46:36 +02:00
nramon fdd529ce10 Merge branch 'ent-2588-service-like-visual-console-status' into 'develop' 
Nuevos tipos de cálculo de estado en los items con mapa de estado enlazado

See merge request artica/pandorafms!1732
 2018-09-06 10:46:14 +02:00
daniel 81ed14cc34 fixed performance in group view 2018-09-06 09:25:48 +02:00
nramon 8480deebba Merge branch '2611-Cache_de_vista_de_arbol_y_vista_de_grupos' into 'develop' 
2611 cache de vista de arbol y vista de grupos

See merge request artica/pandorafms!1733
 2018-09-06 08:18:11 +02:00
artica 647a324368 Auto-updated build strings. 2018-09-06 00:01:26 +02:00
daniel f3a2bda1a5 remove group cache in tree view 2018-09-05 18:31:13 +02:00
daniel 4781809e14 fixed minor error not init agent in tree view node 2018-09-05 18:28:31 +02:00
Alejandro Gallardo Escobar c20942f425 Now the status calculation can be configured for every visual console item 2018-09-05 15:25:19 +02:00
nramon aa98b62e5c Merge branch '2611-Cache_de_vista_de_arbol_y_vista_de_grupos' into 'develop' 
fixed errors in tree view

See merge request artica/pandorafms!1710
 2018-09-05 14:44:37 +02:00
daniel 3b0436008a Merge remote-tracking branch 'origin/develop' into 2611-Cache_de_vista_de_arbol_y_vista_de_grupos 2018-09-05 14:04:33 +02:00
daniel 82c4adc5c7 convert spaces to tab 2018-09-05 14:01:32 +02:00
daniel 7554906e59 minor refactorization tree view 2018-09-05 13:48:53 +02:00
daniel 51f71d1a07 fixed metaconsole tree view 2018-09-05 11:23:53 +02:00
Alejandro Gallardo Escobar ce6bfb96f1 Minor changes 2018-09-05 10:04:35 +02:00
nramon d91c7c062c Merge branch 'ent-2588-service-like-visual-console-status' into 'develop' 
Nuevos tipos de cálculo de estado en los items con mapa de estado enlazado

See merge request artica/pandorafms!1730
 2018-09-05 10:02:11 +02:00
daniel 2829ddd8dd clean main tree class code 2018-09-05 09:54:28 +02:00
artica 05d0bb0f5d Auto-updated build strings. 2018-09-05 00:01:26 +02:00
Alejandro Gallardo Escobar 9e085758af Minor fix 2018-09-04 17:52:05 +02:00
Alejandro Gallardo Escobar 36247d391f Merge branch 'develop' into ent-2588-service-like-visual-console-status 2018-09-04 17:25:23 +02:00
Alejandro Gallardo Escobar 21bad5330b Bug fix 2018-09-04 17:24:03 +02:00
Alejandro Gallardo Escobar 22696a0fc6 Added new modes to calculate the status of the linked visual maps 2018-09-04 17:23:42 +02:00
daniel 718401467d put tree view in separate files 2018-09-04 11:51:36 +02:00
artica 60360d8764 Auto-updated build strings. 2018-09-04 00:01:27 +02:00
enriquecd f4551faff0 Add intracom generic functions - #2541 2018-09-03 18:02:18 +02:00
nramon a84b1af4af Merge branch '2390-Añadir-en-filtro-de-eventos-todos-los-campos-posibles-de-búsqueda-dev' into 'develop' 
Added source, comment and id_extra in event filter

See merge request artica/pandorafms!1722
 2018-09-03 15:47:36 +02:00
artica b52661054d Auto-updated build strings. 2018-09-03 00:01:24 +02:00
artica 06b36965a2 Auto-updated build strings. 2018-09-02 00:01:23 +02:00
artica 97c562163e Auto-updated build strings. 2018-09-01 00:01:24 +02:00
danielmaya 5b30aa5560 Added source, comment and id_extra in event filter 2018-08-31 16:25:12 +02:00
daniel 41761bc525 fixed tree view tags 2018-08-31 13:33:22 +02:00
daniel e5fec6b303 Merge remote-tracking branch 'origin/develop' into 2611-Cache_de_vista_de_arbol_y_vista_de_grupos 2018-08-31 10:56:04 +02:00
daniel 3334138cb4 fixed tree view SO 2018-08-31 10:51:17 +02:00
daniel fb7def14af fixed tree view counter second level and module group view 2018-08-31 09:09:54 +02:00
artica 43a7d4973b Auto-updated build strings. 2018-08-31 00:01:28 +02:00
daniel 6a124487a4 fixed module tree view 2018-08-30 12:23:35 +02:00
artica 9d35a66ad3 Auto-updated build strings. 2018-08-30 00:01:25 +02:00
daniel b346e4dca9 refactorized group tree view 2018-08-29 13:55:50 +02:00
daniel 90d686a7ab fixed error in acl groups tree view 2018-08-29 09:16:07 +02:00
artica 91bdb0094a Auto-updated build strings. 2018-08-29 00:01:26 +02:00
daniel 59e405c2b3 disabled modules search in tree view 2018-08-28 15:24:35 +02:00
daniel 5079c59b88 Merge remote-tracking branch 'origin/develop' into 2611-Cache_de_vista_de_arbol_y_vista_de_grupos 2018-08-28 12:53:18 +02:00
daniel f9af750f47 fixed counters group tree view 2018-08-28 12:52:57 +02:00
vgilc 75d3d38bec Merge branch '2667-Añadir-ayuda-online-en-la-seccion-de-etiqueta-de-texto-de-una-consola-visual' into 'develop' 
fixed text errors in visual console macros' help text

See merge request artica/pandorafms!1717
 2018-08-28 10:41:44 +02:00
alejandro-campos 3b7b54cb68 fixed text errors in visual console macros' help text 2018-08-28 10:31:24 +02:00
vgilc 7a6c3c16ec Merge branch '1920_Informe_de_alertas' into 'develop' 
Fixed alert report date

See merge request artica/pandorafms!1715
 2018-08-28 10:30:23 +02:00
artica 7c37a7d2ee Auto-updated build strings. 2018-08-28 00:01:27 +02:00
samucarc 9915518b8e Fixed alert report date 2018-08-27 18:00:44 +02:00
vgilc a741e37f23 Merge branch '2667-Añadir-ayuda-online-en-la-seccion-de-etiqueta-de-texto-de-una-consola-visual' into 'develop' 
2667 añadir ayuda online en la seccion de etiqueta de texto de una consola visual

See merge request artica/pandorafms!1713
 2018-08-27 09:18:03 +02:00
vgilc 7f38e8273f Merge branch '2597_Errata_en_cluster' into 'develop' 
Fixed visual error

See merge request artica/pandorafms!1698
 2018-08-27 09:17:23 +02:00
vgilc 69545d7ed8 Merge branch 'ent-2153-vistas-en-las-que-no-se-ha-tenido-en-cuenta-los-grupos-secundarios' into 'develop' 
Ent 2153 vistas en las que no se ha tenido en cuenta los grupos secundarios

See merge request artica/pandorafms!1708
 2018-08-27 09:10:00 +02:00
vgilc a2ecec29cc Merge branch 'ent-2661-fallos-al-sincronizar-la-configuracion-de-la-metaconsola-en-el-nodo' into 'develop' 
Revert "Improved metaconsole sync (added centralized management)"

See merge request artica/pandorafms!1696
 2018-08-27 09:08:15 +02:00
artica 930a939764 Auto-updated build strings. 2018-08-27 00:01:22 +02:00
artica 6a99bb9aec Auto-updated build strings. 2018-08-26 00:01:22 +02:00
artica f345c01e3e Auto-updated build strings. 2018-08-25 00:01:25 +02:00
daniel e6a42f45be removed unwanted code 2018-08-24 12:55:09 +02:00
daniel fbe4e15ca7 fixed filter tree view 2018-08-24 12:54:22 +02:00
alejandro-campos 5f593df22a minor fix in visual maps macros help text 2018-08-24 09:19:48 +02:00
alejandro-campos a9ac4462a5 added help dialog in visual console editor 2018-08-24 09:15:10 +02:00
artica 733be2d8ba Auto-updated build strings. 2018-08-24 00:01:24 +02:00
daniel 9df565fae1 fixed metaconsole on performance changes 2018-08-23 16:33:20 +02:00
daniel 24f7dbd420 added cache to function agents_get_all_groups_agent 2018-08-23 14:50:19 +02:00
daniel 3e71513e4e performance tree view node 2018-08-23 14:49:09 +02:00
daniel aef428c405 Merge remote-tracking branch 'origin/develop' into 2611-Cache_de_vista_de_arbol_y_vista_de_grupos 2018-08-23 14:48:25 +02:00
artica 80cec1aadb Auto-updated build strings. 2018-08-23 00:01:29 +02:00
daniel 1f0b65eca6 fixed errors in tree view 2018-08-22 16:23:52 +02:00
artica 99858d3371 Auto-updated build strings. 2018-08-22 00:01:27 +02:00
samucarc 2687c9fce6 Fixed error in agents bulk operations with a normal status 2018-08-21 17:21:28 +02:00
fermin831 0a70284eaa [Secondary groups] Group report and adapted group_stat table to secondary groups 2018-08-21 13:34:52 +02:00
fermin831 399c9c2d58 [Secondary groups] Fixed agent/modules view 2018-08-21 13:33:16 +02:00
vgilc 281dbb4784 Merge branch '2664-No_funcionan_Automatic_Combined_Graphs_en_Metaconsola' into 'develop' 
fixed error automatic combined graph

See merge request artica/pandorafms!1707
 2018-08-21 10:58:57 +02:00
daniel 8e845d2948 fixed error automatic combined graph 2018-08-21 10:54:36 +02:00
vgilc 69513fdc63 Merge branch '2609-cambios-en-la-forma-de-gestionar-grupos-secundarios-en-la-vista-de-usuario-3' into 'develop' 
Added secondary groups and no hierarchy documentation

See merge request artica/pandorafms!1700
 2018-08-21 08:34:53 +02:00
fermin831 4d44fcb512 Added secondary groups documentation 2018-08-21 08:27:46 +02:00
artica e518135adf Auto-updated build strings. 2018-08-21 00:01:24 +02:00
daniel fac1b3b616 fixed error for each agent report metaconsole 2018-08-20 17:28:14 +02:00
daniel 271466fb66 fixed errors automatic combined graph report metaconsole 2018-08-20 13:52:01 +02:00
vgilc 7b9fe9573e Merge branch 'ent-2335-gis-group-items' into 'develop' 
Bug fixes on the GIS map layer configuration

See merge request artica/pandorafms!1697
 2018-08-20 12:42:48 +02:00
artica ad6a3d69e8 Auto-updated build strings. 2018-08-20 00:01:20 +02:00
artica c79b06e43c Auto-updated build strings. 2018-08-19 00:01:22 +02:00
artica 693f9617ac Auto-updated build strings. 2018-08-18 00:01:26 +02:00
fermin831 90e3a423c4 Added secondary groups and no hierarchy documentation 2018-08-17 15:45:59 +02:00
Alejandro Gallardo Escobar 1de746ab69 Fixed a problem with the autocomplete agent cache 2018-08-17 15:03:24 +02:00
samucarc 52da571212 Fixed visual error 2018-08-17 14:42:17 +02:00
fermin831 e54e91cdf1 Revert "Improved metaconsole sync (added centralized management)" 
This reverts commit 3c99242508.
 2018-08-17 13:27:55 +02:00
fermin831 e687ca03bf Fixed several attributes in a ldap configuration 2018-08-17 11:29:19 +02:00
Alejandro Gallardo Escobar 8a5495a283 Merge branch 'develop' into ent-2335-gis-group-items 2018-08-17 11:17:29 +02:00
Alejandro Gallardo Escobar 7da4557abc Added the feature of the new map items (groups) and fixed more bugs 2018-08-17 11:07:42 +02:00
artica 839a91b0ac Auto-updated build strings. 2018-08-17 00:01:25 +02:00
fermin831 304a3b40c2 Fixed overwrite primery group if user has no permissions for this group on update agent 2018-08-16 12:48:44 +02:00
vgilc a4d1cfc9e6 Merge branch '2641-no-se-filtran-eventos-por-grupo-secundario-en-meta' into 'develop' 
2641 no se filtran eventos por grupo secundario en meta

See merge request artica/pandorafms!1688
 2018-08-16 11:03:02 +02:00
vgilc b8560fd597 Merge branch '2433-Los_datos_reportados_por_generic_data_string_aparecen_sin_saltos_de_linea_y_la_vista_ampliada_falla-3' into 'develop' 
Removed unwanted safe input in a data display

See merge request artica/pandorafms!1689
 2018-08-16 10:06:11 +02:00
vgilc dc8020dbdc Merge branch 'ent-2626-pantalla-de-edicion-de-modulos-en-grupos-secundarios' into 'develop' 
[Secondary groups] Fixed modules permissions in some views

See merge request artica/pandorafms!1669
 2018-08-16 09:46:28 +02:00
fermin831 a23dd89c70 Removed unwanted safe input in a data display 2018-08-16 09:24:59 +02:00
artica 7ac2745b9e Auto-updated build strings. 2018-08-16 00:01:21 +02:00