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

1883 Commits

Author SHA1 Message Date
alejandro-campos acf3c94642 fix bad solved conflict and added changes in bd to migrate and mr 
Former-commit-id: d52e91d0f2b886620aa9fc07dda48bfeb27ffe0c
 2019-02-21 13:16:32 +01:00
manuel 00cba4cbc9 Fixed bug in filtered modules by tag 
Former-commit-id: 098d3c88a9a30fb1c38074e741f093ff40fd5d02
 2019-02-19 13:05:31 +01:00
alejandro-campos e4ca9b7fc8 Merge branch 'develop' into 3281-Vista-monitor-detail-personalizar-campos-a-mostrar 
Former-commit-id: 1683307f273ba5676ec61709403249b24113c47f
 2019-02-15 14:22:55 +01:00
Tatiana Llorente 4c2215a3db Merge remote-tracking branch 'origin/develop' into 3446-Imagen-grupos-no-se-muestra-None 
Conflicts:
	pandora_console/install.php


Former-commit-id: bc20f50737c115ade0034b4ca9e6d4cab26d35e6
 2019-02-07 08:59:45 +01:00
Tatiana Llorente 9baa3dcfa2 Merge remote-tracking branch 'origin/develop' into 3358-Mejora-en-la-aplicación-de-estilos 
Conflicts:
	pandora_console/extensions/agents_modules.php
	pandora_console/extensions/module_groups.php
	pandora_console/general/login_page.php
	pandora_console/godmode/alerts/alert_list.builder.php
	pandora_console/godmode/alerts/alert_list.list.php
	pandora_console/godmode/gis_maps/configure_gis_map.php
	pandora_console/godmode/groups/group_list.php
	pandora_console/godmode/reporting/visual_console_builder.data.php
	pandora_console/godmode/reporting/visual_console_builder.editor.php
	pandora_console/godmode/reporting/visual_console_builder.elements.php
	pandora_console/godmode/setup/setup_visuals.php
	pandora_console/include/chart_generator.php
	pandora_console/include/functions_networkmap.php
	pandora_console/include/functions_pandora_networkmap.php
	pandora_console/include/functions_ui.php
	pandora_console/include/functions_visual_map_editor.php
	pandora_console/include/styles/common.css
	pandora_console/include/styles/countdown.css
	pandora_console/include/styles/datepicker.css
	pandora_console/include/styles/dialog.css
	pandora_console/include/styles/help.css
	pandora_console/include/styles/menu.css
	pandora_console/include/styles/pandora.css
	pandora_console/include/styles/pandora_forms.css
	pandora_console/operation/agentes/estado_monitores.php
	pandora_console/operation/agentes/interface_traffic_graph_win.php
	pandora_console/operation/agentes/realtime_win.php
	pandora_console/operation/agentes/stat_win.php
	pandora_console/operation/events/events.php
	pandora_console/operation/snmpconsole/snmp_view.php
	pandora_console/operation/tree.php
	pandora_console/operation/visual_console/render_view.php


Former-commit-id: 87793fc5a319121753f591da7949ad0ff3bd72b1
 2019-02-05 09:23:53 +01:00
artica b3da2803a4 Changed the format of the .php files 
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
 2019-01-30 16:18:44 +01:00
tatiana.llorente@artica.es f5c96b7e5d New organization of CSS files - #3358 
Former-commit-id: 8512adc7742eecb64db2b0ee539acfddd33406c2
 2019-01-24 11:10:49 +01:00
alejandro-campos 2155420d71 implement custom fields for node monitor view 
Former-commit-id: d9dd515a726d1fa7cc5855b016270b9ef083cb6f
 2019-01-18 11:13:29 +01:00
danielmaya 07dc9a0b84 first load it does not show the data 
Former-commit-id: 417e37dfb7acd78f3fb9e379a62534ca611aa9b1
 2019-01-09 12:27:22 +01:00
Samuel Carcases 05cc3d0538 Merge branch '3125_Fallo_en_calendario_Begin_Date_en_el_filtro_de_las_combined_graph' into 'develop' 
Fixed calendar in combined graphs

See merge request artica/pandorafms!2005

Former-commit-id: a7df2231f2c3b6e94b9d3273c99112f07c258441
 2019-01-03 16:41:21 +01:00
fbsanchez 0686982055 Fixed agents_get_group_agents while trying to get agent list from target group 
Former-commit-id: 8a005e1574760688f5823cc854a287774c8c828b
 2018-12-28 13:09:37 +01:00
danielmaya b155b06ae9 Fixed issue with secondary group 
Former-commit-id: 879f30eec17cc27446c86dcc34bb4d774f0632dc
 2018-12-07 11:20:15 +01:00
vgilc b88e584e85 Merge branch '2938-Problema-con-tags-en-el-wizard-y-la-vista-de-informes-dev' into 'develop' 
Added check of tags in report wizard

See merge request artica/pandorafms!2007
 2018-11-30 13:07:22 +01:00
daniel 557002d7fd fixed error events graphs 2018-11-23 10:32:58 +01:00
danielmaya 62ad6b9a35 Added check of tags in report wizard 2018-11-22 10:39:48 +01:00
samucarc 099e0e6ed2 Fixed calendar in combined graphs 2018-11-21 16:28:43 +01:00
daniel 494b858a20 fixed errors session_start 2018-11-21 13:08:58 +01:00
vgilc f99dadca39 Merge branch 'fix/ux-panel-historical-images' into 'develop' 
Fix/ux panel historical images

See merge request artica/pandorafms!1984
 2018-11-16 12:51:31 +01:00
fbsanchez 35870d13fd allow snapshot_view check historical db 2018-11-16 12:42:08 +01:00
daniel 0a097d185d fixed errors in custom fields view 2018-11-16 11:58:49 +01:00
vgilc d7db1e95e4 Merge branch 'fix/ehorus-password' into 'develop' 
Decode entities in the eHorus password.

See merge request artica/pandorafms!1972
 2018-11-14 12:41:52 +01:00
Ramon Novoa 574e537ff1 Decode entities in the eHorus password. 
Ref pandora_enterprise#3073.
 2018-11-14 12:16:59 +01:00
daniel ac671d041c Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields 2018-11-13 15:47:07 +01:00
fermin831 a201262737 Fixed php errors on radial networkmap 2018-11-12 16:29:31 +01:00
daniel 1c1df4b5f7 fixed errors css jqueryui 2018-11-07 17:09:42 +01:00
daniel 218bf81fa1 Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields 2018-11-07 13:30:19 +01:00
daniel 3f78f15499 WIP View custom fields data 2018-11-07 13:28:00 +01:00
danielmaya 3ffd976365 resolved conflicts in ver_agente 2018-11-07 12:31:54 +01:00
samucarc 3d99ef48aa Fixed ACLs in monitoring View and agent detail 2018-11-05 13:05:34 +01:00
danielmaya 3c78e387df Fixed nodes count in pandora_networkmap 2018-11-02 11:32:07 +01:00
fbsanchez 39b6164526 snapshot viewer fix 2018-10-30 18:20:10 +01:00
vgilc b1bf1d7b4b Merge branch '2326-unificar-vistas-ux-y-wux-en-un-mismo-portal' into 'develop' 
2326 unificar vistas ux y wux en un mismo portal

See merge request artica/pandorafms!1917
 2018-10-30 16:20:26 +01:00
fbsanchez a58bde2118 fixed UX historical snapshot viewer 2018-10-30 16:12:48 +01:00
vgilc e03f56f0d7 Merge branch '2429-Resaltar-elementos-al-pasar-por-encima-o-marcar' into 'develop' 
2429 resaltar elementos al pasar por encima o marcar

See merge request artica/pandorafms!1762
 2018-10-29 09:17:54 +01:00
vgilc 17286414c7 Merge branch '2619_Group_View' into 'develop' 
Added warning and normal status agents in group view

See merge request artica/pandorafms!1799
 2018-10-29 09:16:33 +01:00
vgilc 1973a5fe54 Merge branch '2326-unificar-vistas-ux-y-wux-en-un-mismo-portal' into 'develop' 
WUX-UX integration

See merge request artica/pandorafms!1890
 2018-10-26 14:42:23 +02:00
daniel 0b0bad8a73 Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 
Conflicts:
	pandora_console/extras/mr/22.sql
	pandora_console/include/chart_generator.php
	pandora_console/include/functions_graph.php
	pandora_console/include/functions_reporting.php
	pandora_console/include/functions_reporting_html.php
	pandora_console/include/graphs/fgraph.php
 2018-10-25 17:43:28 +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 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
danielmaya bbde9c70b6 conflict resolved 2018-10-25 11:13:57 +02:00
vgilc 582db8d3b5 Merge branch '2618_Bug_Acceso_agentes_en_vista_de_grupo' into 'develop' 
Fixed enterprise ACLs in Agents View

See merge request artica/pandorafms!1853
 2018-10-25 10:40:12 +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
fbsanchez 50aa314191 WUX-UX integration 2018-10-24 19:31:39 +02:00
danielmaya 87abf1dc02 added event time filter in tactical view 2018-10-24 16:36:44 +02:00
danielmaya f10a661cd6 Fixed group and set_center 2018-10-23 12:36:20 +02:00
daniel ffc7734ebc delete flash_charts and library pchart 2018-10-19 11:31:06 +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
fermin831 41d104ae2c Improve performance on tactical view with a lot of events 2018-10-15 12:23:51 +02:00
fermin831 c74e4a3d6a Fixed agent filter on agents/module view to see secondary groups 2018-10-11 15:45:11 +02:00
samucarc 015dcdb032 Fixed enterprise ACLs in Agents View 2018-10-11 13:07:59 +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 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
fermin831 28f9e152e7 [Tags performance] Fixed tags filter and removed unwanted code 2018-10-09 10:56:02 +02:00
samucarc 61a82337c3 Fixed error in agents bulk operations 2018-10-08 17:57:05 +02:00
Fermin 099f01a4ba [Tags performance] Fixed select modules from Agent/Module dashboard widget 2018-10-08 13:45:30 +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
Fermin 1278f03fd9 [Tags performance] agents_get_modules misc checks 2018-10-04 19:08:01 +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
danielmaya 14caf7bc07 Added new search input for the module name 2018-10-02 11:12:10 +02:00
fermin831 28b879f058 [Tags performance] Added TODOS to revise agents_get_modules 2018-10-02 09:48:29 +02:00
fermin831 9a47d5325e [Tags performance] Events improvements 2018-10-01 17:03:37 +02:00
fermin831 debf8db577 [Tags performance] Added some TODOs 2018-09-28 12:39:23 +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
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
samucarc 638c4f8bc7 Added warning and normal status agents in group view 2018-09-21 15:10:30 +02:00
vgilc ddfb527668 Merge branch 'ent-2668-gis-visual-improvements' into 'develop' 
Minor visual improvements for the GIS views

See merge request artica/pandorafms!1764
 2018-09-14 08:24:32 +02:00
Alejandro Gallardo Escobar 8601e38eed Minor visual improvements for the GIS views 2018-09-13 16:38:17 +02:00
daniel 5d6f414d68 fixed view manage groups 2018-09-13 16:28:08 +02:00
tatiana.llorente@artica.es 22bb52759c Resolved conflict - #2429 2018-09-13 16:25:53 +02:00
tatiana.llorente@artica.es d652a9c942 Created function that adds class checkselected and added inputs to select all in several tables - #2429 2018-09-13 16:07:40 +02:00
fermin831 5c54afe673 Fixed secondary groups in alerts details 2018-09-11 09:15:48 +02:00
daniel ac0f0536c7 performance improve view groups 2018-09-07 14:19:01 +02:00
daniel 6072cd3dc9 improve performance on group view 2018-09-06 15:28:22 +02:00
fermin831 09a80abdd2 [Secondary groups] Fixed monitor permission checking in metaconsole 2018-08-17 14:57:50 +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 024a1cc1ee Fixed snapshot view in metaconsole 2018-08-14 13:21:32 +02:00
fermin831 4315cef4c9 [Secondary groups] Fixed modules permissions in some views 2018-08-08 11:49:54 +02:00
daniel 06c436e5bf add new tocken zoom graph visual styles 2018-08-03 10:01:04 +02:00
fermin831 5e6eca8e51 Added ACL to snapshot view 2018-08-02 14:32:12 +02:00
fermin831 c1269ca23f Refactorized snapshot link on meta 2018-08-02 13:42:39 +02:00
fermin831 18800feaae Refactorized snapshot link on node 2018-08-02 13:02:33 +02:00
vgilc 1baf56159e Merge branch 'ent-2567-no-se-muestran-las-graficas-con-permisos-para-secundary-group' into 'develop' 
Fixed acl in module graph view

See merge request artica/pandorafms!1653
 2018-08-01 15:12:41 +02:00
fermin831 04cfbe4ef9 Fixed acl in module graph view 2018-08-01 13:16:21 +02:00
daniel d740240a51 fixed error data string show 2018-07-27 14:07:02 +02:00
daniel 3985316a9b fixed errors in policies metaconsole 2018-07-26 12:41:09 +02:00
vgilc 99773177dd Merge branch 'ent-2076-ue-mejoras-en-gestion-de-politicas-desde-metaconsola' into 'develop' 
Resolve "[UE] Mejoras en gestion de politicas desde Metaconsola"

See merge request artica/pandorafms!1604
 2018-07-19 14:22:40 +02:00
manuel.montes 0621b5a3ac Fixed in Custom graphs 2018-07-18 13:33:53 +02:00
alejandro-campos 213a59d26e fixed bug on bulk delete and bulk update module operation 2018-07-16 18:14:18 +02:00
fermin831 d0b6c9775f Addapted modules edition to metaconsole 2018-07-13 11:56:37 +02:00
vgilc a573f69593 Merge branch '2173-REDIRIS-Desplegable-de-grupo-All-en-grupos-pandorafms2' into 'develop' 
Reverse changes for non-administrators users

See merge request artica/pandorafms!1600
 2018-07-09 08:53:51 +02:00
daniel c26a50e838 fixed errors in graphs 2018-07-06 11:56:38 +02:00
manuel.montes 9f9728fd03 Reverse changes for non-administrators users 2018-07-06 10:22:57 +02:00
manuel.montes 5436c64800 Merge branch '2396-fallo-acl-en-vista-de-cluster' of https://brutus.artica.lan:8081/artica/pandorafms into 2396-fallo-acl-en-vista-de-cluster 2018-06-29 08:52:46 +02:00
manuel.montes 4f23407ea8 Fixed for group All 2018-06-28 17:03:02 +02:00
daniel 65eb4744a1 fixed boolean graph no zoom 2018-06-27 16:17:17 +02:00
slerena b40770b944 Merge branch '2036-Cambiar-color-de-la-marca-de-Quiet' into 'develop' 
Image for mode Quiet changed to blue - #2036

See merge request artica/pandorafms!1573
 2018-06-26 22:37:50 +02:00
daniel 998eacc630 fixed minor errors in graph remove avgOnly 2018-06-26 13:26:37 +02:00
tatiana.llorente@artica.es 965c6c839b Image for mode Quiet changed to blue - #2036 2018-06-26 12:31:23 +02:00
slerena c0cd577fb4 Merge branch '2173-REDIRIS-Desplegable-de-grupo-All-en-grupos' into 'develop' 
Fixed bug in pandorafms

See merge request artica/pandorafms!1523
 2018-06-25 19:05:26 +02:00
slerena 99271a4822 Merge branch '1797-Menú-desplegable-de-gráficas-miniaturizado' into 'develop' 
fixed resize in stat_win.php

See merge request artica/pandorafms!1503
 2018-06-25 18:59:09 +02:00
daniel 05d8d0ccf5 fixed errors graph 2018-06-13 19:13:42 +02:00
daniel 9ecc770519 remove only average for all graphs and add zoom for sparse graph in stat-win and stat-win-interfaces 2018-06-13 11:02:58 +02:00
vgilc 24ec62b807 Merge branch '1827-Graficas_TIP_eje_x_no_mantiene_ratio' into 'develop' 
fixed errors agent access and other fix

See merge request artica/pandorafms!1525
 2018-06-12 12:13:46 +02:00
daniel 6eba3250da fixed errors agent access and other fix 2018-06-12 12:08:04 +02:00
vgilc fdbe03ef83 Merge branch 'ent-639-add-user-defined-timezones' into 'develop' 
Add user defined timezones

See merge request artica/pandorafms!1462
 2018-06-12 10:20:31 +02:00
manuel.montes bcd937b1ba Fixed bug in pandorafms 2018-06-11 17:42:12 +02:00
Alejandro Gallardo Escobar f6184b52da Merge branch 'develop' into ent-639-add-user-defined-timezones 2018-06-11 17:42:02 +02:00
Alejandro Gallardo Escobar fac3e21829 Added a lot of fixes to the dates stored as strings without timezone information to made them use the user timezone 2018-06-11 16:40:10 +02:00
fermin831 c949ab3dc7 Merge branch 'develop' into 2290-seguridad-en-la-api 
Conflicts:
	pandora_console/include/functions_api.php
 2018-06-11 15:55:48 +02:00
daniel eb7cdc7c90 fixed errors in graph delete to image pdf 2018-06-08 08:58:18 +02:00
Fermin 2e1bb2ac9c Merge branch 'develop' into 2290-seguridad-en-la-api 
Conflicts:
	pandora_console/include/functions_api.php
 2018-06-07 11:38:37 +02:00
fermin831 0afd436cea [ACL API] Added ACL to some get api calls and refactorized agent count 2018-06-06 15:04:30 +02:00
daniel badfd83b0d Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 
Conflicts:
	pandora_console/include/functions_graph.php
	pandora_console/include/graphs/fgraph.php
 2018-06-06 11:57:02 +02:00
daniel 89a481c452 fixed errors in graphs 2018-06-06 11:18:39 +02:00
vgilc a69550f79e Merge branch 'fix-warnings-with-php72' into 'develop' 
Fixed warnings and some icons are not shown correctly with php7.2.

See merge request artica/pandorafms!1490
 2018-06-05 10:26:40 +02:00
daniel 47a287b6f6 fixed errors in graph 2018-06-01 13:58:29 +02:00
danielmaya 04f117523b Fixed sources in log report 2018-05-31 17:33:51 +02:00
daniel a8b8f309e6 fixed graphs 2018-05-30 17:45:17 +02:00
manuel.montes 5021144405 fixed resize in stat_win.php 2018-05-29 13:19:20 +02:00
daniel dd57ddbd3c Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 
Conflicts:
	pandora_console/include/functions.php
	pandora_console/include/styles/pandora.css
 2018-05-28 17:54:53 +02:00
daniel 02a442a8db fixed errors in graph add phantom js 2018-05-28 17:47:40 +02:00
fermin831 43447bbee4 [Rebranding] Minor ended fixed 2018-05-23 18:19:24 +02:00
fermin831 e71fd399fb Merge branch 'develop' into 2106-intracom-rebranding 
Conflicts:
	pandora_console/godmode/admin_access_logs.php
	pandora_console/include/javascript/functions_pandora_networkmap.js
 2018-05-22 19:29:46 +02:00
Junichi Satoh cb10d6d4a4 Fixed warnings and some icons are not shown correctly with php7.2. 2018-05-22 20:18:49 +09:00
fermin831 0e3db1eb80 [Rebranding] Added custom logo to network maps central node 2018-05-21 18:26:28 +02:00
daniel 78f73d5a76 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-05-21 17:26:19 +02:00
daniel b323d524d6 fixed errors in graph update version 2018-05-21 17:25:09 +02:00
daniel 79354a0ebf fixed graphs 2018-05-18 14:22:39 +02:00
fermin831 80aeded931 [Rebranding] Central node in network maps 2018-05-14 12:58:22 +02:00
vgilc 334d359076 Merge branch 'ent-2244-5710-No-funciona-el-Command-Line-Screenshot-en-v722' into 'develop' 
Fixed snapshots view in string data

See merge request artica/pandorafms!1471
 2018-05-14 11:46:07 +02:00
Fermin 29f56df1fd [Rebranding] Open operation/agents 2018-05-11 15:17:53 +02:00
daniel 123d49d604 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 
Conflicts:
	pandora_console/include/functions_graph.php
	pandora_console/include/styles/pandora.css
 2018-05-10 08:52:45 +02:00
daniel f758124531 fixed treshold graph 2018-05-10 08:43:09 +02:00
fermin831 57fb63bd91 Fixed snapshots view in string data 2018-05-07 19:40:38 +02:00
fermin831 fd91ba63f6 Added realtime graph to monitor view 2018-05-07 12:53:12 +02:00
fermin831 bd3f0712f1 Added separated window view to SNMP realtime graphs 2018-05-04 10:58:37 +02:00
daniel 27aa2a4632 fixed minor error in monitors view metaconsole filter group 2018-04-27 11:07:54 +02:00
daniel 2a81703a68 fixed minor error custom graph 2018-04-26 10:24:37 +02:00
daniel 3fbd9adc38 fixed graph 2018-04-24 13:19:24 +02:00
fermin831 cfbe80669a Fixed unloaded includes in interface graphs 2018-04-23 15:48:17 +02:00
enriquecd b4b6852e27 Change id_os number refence and add get_cluster status function in api and CLI - #2007 2018-04-23 13:52:16 +02:00
daniel e7a8706434 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 
Conflicts:
	pandora_console/include/functions_graph.php
	pandora_console/include/graphs/fgraph.php
	pandora_console/include/graphs/flot/pandora.flot.js
	pandora_console/include/graphs/functions_flot.php
 2018-04-23 12:21:11 +02:00
vgilc 5ee01aa70f Merge branch '2007-Monitorizacion-de-cluster-fase-2' into 'develop' 
Cluster monitoring 2 - #2007

See merge request artica/pandorafms!1378
 2018-04-20 10:31:57 +02:00
fermin831 bc2c92807a Fixed agent view graphs (stat_win.php entry point) 2018-04-19 13:15:13 +02:00
fermin831 60f7a0ab79 Merge branch 'develop' into 2015-implementacion-de-grupos-secundarios 
Conflicts:
	pandora_console/include/class/Tree.class.php
 2018-04-10 09:29:14 +02:00
fermin831 678aa02ed7 [Secondary groups] Added hint to node group view 2018-04-09 20:18:37 +02:00
fermin831 6310b499be [Secondary groups] Added secondary groups to meta monitor status view 2018-04-09 19:10:19 +02:00
fermin831 361bd23093 [Secondary groups] Added secondary groups to node monitor detail 2018-04-09 18:56:05 +02:00
fermin831 5dec329941 [Secondary groups] Added secondary groups to agent view 2018-04-09 18:23:06 +02:00
fermin831 3463cd1ea2 [Secondary Groups] Added secondary agents to node group view 2018-04-06 12:04:08 +02:00
fermin831 c88e6e703a [Secondary groups] Fixed duplicated agents in group view and agent detail 2018-04-04 11:17:08 +02:00
enriquecd 52b61933df Hide password custom fields in agent view - #2030 2018-03-28 18:14:15 +02:00
fermin831 88375a2460 [Secondary groups] Fixed some problems in agent view 2018-03-27 16:38:17 +02:00
fermin831 c96b883614 [Secondary groups] Fixed agent view to include secondary agents 2018-03-26 12:52:37 +02:00
enriquecd 632845c9b3 Adapt search bar to cluster id_os 100 - #1866 2018-03-22 11:04:19 +01:00
vgilc 6fd44faad1 Merge branch '2030-5422-Esconder-los-campos-de-tipo-password-dentro-de-los-custom-fields-del-agente' into 'develop' 
Hide password custom fields data in agent custom fileds section - #2030

See merge request artica/pandorafms!1362
 2018-03-22 10:13:33 +01:00
vgilc c8c6c2ad1a Merge branch '1866-Cluster-Añadir-filtro-de-grupos-con-recursión-buscador-de-agentes-a-wizard-en-paso-2' into 'develop' 
Add search bar to cluster agent aggregator - #1866

See merge request artica/pandorafms!1351
 2018-03-22 10:11:43 +01:00
enriquecd 8690aa908a Cluster monitoring 2 - #2007 2018-03-19 10:05:29 +01:00
enriquecd 753d10920a Hide password custom fields data in agent custom fileds section - #2030 2018-03-13 12:46:27 +01:00
fermin831 74f899736f [Snapshots] Fixed snapshots in metaconsole. Changed functionallity but preserve all way to work 2018-03-12 15:17:59 +01:00
enriquecd 9a4ea41942 Add search bar to cluster agent aggregator - #1866 2018-03-07 16:18:35 +01:00
vgilc 88d000379a Merge branch 'fix-modules_selection_mode_changes_not_update_module_list' into 'develop' 
Make change of "modules selection mode" in scheduled downtime editor updates module list

See merge request artica/pandorafms!1334
 2018-03-05 09:15:30 +01:00
daniel 78bb12f015 fixed errors select all agent where module common 2018-03-02 12:55:03 +01:00
KIKUCHI Koichiro a63a107f10 Cast $idAgents to array to prevent PHP warning 2018-03-02 17:33:19 +09:00
daniel 738776ef7e merge develop 2018-03-01 10:13:55 +01:00
fermin831 6093f6a0d8 [Metaconsole] Fixed img broken links on metaconsole 2018-02-28 12:08:15 +01:00
daniel 7b47ea4c32 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-02-28 08:47:44 +01:00
daniel d2390528ac fixed errors in graphs 2018-02-27 16:28:00 +01:00
vgilc 85bc975606 Merge branch '1962-No-aparecen-las-alertas-en-la-vista-de-agente-dev' into 'develop' 
Fixed tags in alert list

See merge request artica/pandorafms!1318
 2018-02-27 09:39:46 +01:00
danielmaya 25bed4d5c2 Fixed tags in alert list 2018-02-26 13:42:28 +01:00
fermin831 7d84b3445d [Console ACL] Fixed permission on agent view when order arrows or search button is clicked 2018-02-26 12:59:26 +01:00
danielmaya 43ce57d5ed Fixed status filter in bulk operation (modules) 2018-02-20 10:03:23 +01:00
daniel 0d0b7ada48 Merge branch 'develop' into 1749-sistena-cache-de-acl-s-de-la-consola 
Conflicts:
	pandora_console/include/functions_users.php
 2018-01-30 17:56:30 +01:00
vgilc ffc9a44f8d Merge branch '1747-Error-Mapas-de-red-Pandora-Open-dev' into 'develop' 
deleted column of nodes in pandora open

See merge request artica/pandorafms!1242
 2018-01-29 13:22:34 +01:00
vgilc 8ec7d21932 Merge branch '1723-Etiquetas-en-datos-largos-(vista-de-módulos)-dev' into 'develop' 
Fixed tag i in status monitor data

See merge request artica/pandorafms!1228
 2018-01-29 12:51:24 +01:00
vgilc 1b7b17d28f Merge branch '1676-Tags-y-vista-de-alertas' into 'develop' 
Fix tag filter in alert view - #1676

See merge request artica/pandorafms!1171
 2018-01-29 12:48:31 +01:00
daniel 5d61ff5056 fixed error in ACL 2018-01-12 14:17:48 +01:00
danielmaya fde490b934 deleted column of nodes in pandora open 2018-01-10 12:33:41 +01:00
danielmaya 42967862c8 Fixed tag i in status monitor data 2018-01-08 10:57:30 +01:00
daniel d2bc062766 fixed errors extensions agent-modules and recursion groups 2018-01-05 10:29:46 +01:00
enriquecd 0fac48d71c Fix only show average graphs checkbox - #1460 2018-01-02 16:43:13 +01:00
vgilc 66b88f3764 Merge branch 'graph-window-resize-change' into 'develop' 
Resolve: "Graph window resize change"

See merge request artica/pandorafms!1111
 2018-01-02 10:29:49 +01:00
vgilc d9884fd431 Merge branch 'actualizar-el-cliente-de-ehorus' into 'develop' 
Resolve: "Actualizar el cliente de eHorus"

See merge request artica/pandorafms!1055
 2017-12-21 10:57:15 +01:00
vgilc 6325e336c5 Merge branch 'ent-1580-flecha-de-interface-information-casi-no-se-ve' into 'develop' 
Fixed dark arrow in Interface information (SNMP)

See merge request artica/pandorafms!1087
 2017-12-21 10:55:40 +01:00
vgilc 8ea951a4bb Merge branch 'ent-1520-error-en-grafica-de-agente-no-dinamica' into 'develop' 
Fixed non interactive status graphs

See merge request artica/pandorafms!1063
 2017-12-21 10:48:17 +01:00
vgilc 0c8315ec9f Merge branch 'ent-1581-graficas-de-interfaces-se-abren-mal' into 'develop' 
Fixed first click on interface graphs

See merge request artica/pandorafms!1070
 2017-12-21 10:46:02 +01:00
vgilc 3dad6d1837 Merge branch '1460-4706-No-funciona-token-Mostrar-solo-la-media-en-Visual-Styles' into 'develop' 
Only average token for graphs fix - #1460

See merge request artica/pandorafms!1040
 2017-12-21 10:42:12 +01:00
daniel 4a1a0ae8b7 fixed errors in graphs 2017-12-13 17:17:45 +01:00
enriquecd 2c40b48ddc Fix tag filter in alert view - #1676 2017-12-11 16:07:39 +01:00
daniel 06c1c4f243 fixed errors in fullscale graph and normal graph 2017-12-05 13:44:42 +01:00
Arturo Gonzalez cd7b5b68b6 Added disabled style 2017-12-01 10:14:08 +01:00
vgilc 35ba173b88 Merge branch '1664-al-editar-un-radial-dinamic-pierde-el-tipo-dev' into 'develop' 
Fixed update map

See merge request artica/pandorafms!1141
 2017-12-01 09:04:30 +01:00
Arturo Gonzalez 031196782b Fixed update map 2017-11-30 16:50:10 +01:00
Arturo Gonzalez 30c879b600 Added more changes to improve radial dynamic maps 2017-11-30 10:45:28 +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 9c32657220 Merge branch 'ent-1514-buscador-monitor-detail' into 'develop' 
Added wux modules to monitor view

See merge request artica/pandorafms!1024
 2017-11-29 16:48:11 +01:00
vgilc 57dbb0599d Merge branch '1654-No-sale-el-nombre-del-mapa-en-pandora-open-dev' into 'develop' 
Added lost map info

See merge request artica/pandorafms!1126
 2017-11-29 16:20:34 +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 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 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
Arturo Gonzalez 3ffbb7ed85 Added lost map info 2017-11-28 12:06:45 +01:00
Arturo Gonzalez 192175a4cc Added custom graphviz fields to map creation 2017-11-27 13:52:31 +01:00
Arturo Gonzalez 06f83825dc Added code to fix agents generation in sunbrust chart 2017-11-24 11:27:10 +01:00
Alejandro Gallardo Escobar dc579f6bbe [Console] Fixed the graph popup size in Firefox 2017-11-23 13:51:43 +01:00
Alejandro Gallardo Escobar 279a864d82 [Console] Adjustments to the graph popup size 2017-11-23 12:53:54 +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
fermin831 0f814c0b63 Added public dashboard authentication to some components 2017-11-21 16:59:49 +01:00
Arturo Gonzalez f4d035cfa5 Added changes to filter by group. Not finished 2017-11-21 10:27:17 +01:00
fermin831 49411f17e4 Fixed dark arrow in Interface information (SNMP) 2017-11-16 15:35:26 +01:00
Arturo Gonzalez f665fe9d07 Added empty maps to flow 2017-11-16 12:10:37 +01:00
Arturo Gonzalez 06d47e03db Added dinamic to new flow 2017-11-16 12:03:20 +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
Arturo Gonzalez 088aa51996 Added changes to obtain id from external php 2017-11-15 15:30:55 +01:00
Arturo Gonzalez 72acac8b57 Fixed null values in js 2017-11-15 12:19:41 +01:00
fermin831 6e942fc0b9 Fixed first click on interface graphs 2017-11-15 11:02:42 +01:00
vgilc 1789287673 Merge branch '1539-new-flow-in-networkmaps-when-creates-a-map-dev' into 'develop' 
Changed flow

See merge request artica/pandorafms!1031
 2017-11-15 09:39:31 +01:00
vgilc 55ac22055b Merge branch '1457-select-position-and-z-scale-in-networkmaps-dev' into 'develop' 
Added the options in networkmap editor

See merge request artica/pandorafms!997
 2017-11-15 09:35:19 +01:00
fermin831 ff58a171e9 Fixed non interactive status graphs 2017-11-14 12:20:28 +01:00
Alejandro Gallardo Escobar 47cf03950a [Console] Changed the authentication method of the eHorus integration 2017-11-13 12:03:01 +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 eb39d25c4b Added field to get string modules 2017-11-10 15:03:52 +01:00
vgilc 68a10343fb Revert "Merge branch…" 
This reverts merge request !1025
 2017-11-10 12:24:33 +01:00
enriquecd 24770c79ac Only average token for graphs fix - #1460 2017-11-08 10:40:03 +01:00
Arturo Gonzalez 35ec64e2ea Changed flow 2017-11-07 11:41:40 +01:00
enriquecd fa419aa367 Change agent events bar height - #1550 2017-11-07 11:00:33 +01:00
daniel c780cb5285 fixed errors in fullscale graph and normal graph 2017-11-07 09:46:37 +01:00
fermin831 a446997534 Added wux modules to monitor view 2017-11-06 18:45:53 +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
Alejandro Gallardo Escobar ac70caac71 [Console] Fixed XSS vulnerabilities 2017-11-06 15:20:24 +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
fermin831 443163515d Added checkbox to free search on agents data view 2017-11-02 15:51:37 +01:00
fermin831 c849df1c21 Added enterprise_hook to a UX function on the Open part 2017-11-02 10:31:01 +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
Arturo Gonzalez 3ead7ca3da Added the options in networkmap editor 2017-10-31 11:11:30 +01:00
fermin831 2adf951121 Added free search values to data table 2017-10-30 15:45:31 +01:00
vgilc 0f50c3ff82 Merge branch '1429-new-options-in-agent-graphs-section-dev' into 'develop' 
Added new item to choose between line and area. Changed radio button to select.

See merge request artica/pandorafms!886
 2017-10-26 13:28:24 +02:00
vgilc 89f5af3b52 Merge branch '1282-Errores-en-selectores-de-agentes-y-módulos-dev' into 'develop' 
Fixed ordering and repetition modules

See merge request artica/pandorafms!820
 2017-10-26 12:29:00 +02:00