Commit Graph

14316 Commits

Author SHA1 Message Date
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
tatiana.llorente@artica.es 51af767549 Limited number of characters shown in the table - #2783 2018-09-21 09:21:21 +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
tatiana.llorente@artica.es e0e098a7a6 Added module name and agent name in actions enable and disable module - #2783 2018-09-19 16:51:31 +02:00
alejandro-campos 3f046441f0 Changed custom graph item insertion and deletion to fix bug when sorting elements in list 2018-09-19 10:06:57 +02:00
artica 687a742746 Auto-updated build strings. 2018-09-19 00:01:28 +02:00
fermin831 8979890964 Added is_favourite to tservice table 2018-09-18 19:05:20 +02:00
fermin831 8196ed21df New mr 21.sql commit 2018-09-18 18:55:53 +02:00
artica bcfda72269 Updated version and build strings. 2018-09-18 16:39:44 +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
manuel.montes 65010d7080 Merge remote-tracking branch 'origin/develop' into 2497-Especificar-version-SNMP-en-tarea-de-reconocimiento-Lead-21487
Conflicts:
	pandora_console/extras/mr/20.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/pandoradb.sql
2018-09-18 11:17:47 +02:00
manuel.montes 40bf163fed Disabled vlan vhen SNMP version is v3 2018-09-18 11:03:30 +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
Alejandro Gallardo Escobar 5f732d035b Now the integer numbers of the Y axis of the realtime graphs are shorter 2018-09-17 13:13:10 +02:00
manuel.montes cfec231107 Especified SNMP version in recon task 2018-09-17 12:48:08 +02:00
danielmaya 50a3e43bd4 Insert apache log model in tlog_graph_models 2018-09-17 12:43:51 +02:00
fermin831 c9af020d91 Remove unwanted git traces on 20.sql 2018-09-17 10:16:12 +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
tatiana.llorente@artica.es 7e4ca193cf Countdown in group view for autorefresh 2018-09-14 14:19:49 +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
vgilc 2d1b9072ff Merge branch 'ent-2522-custom-fields-de-modulos-de-inventario-en-politicas' into 'develop'
Added columns for a policy feature

See merge request artica/pandorafms!1763
2018-09-14 10:54:39 +02:00
tatiana.llorente@artica.es 69ec75e392 Capital letter in the letter a of audit - #2762 2018-09-14 09:38:36 +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
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
manuel.montes 19645f0550 Modified trecon_task table 2018-09-13 18:17:28 +02:00
Alejandro Gallardo Escobar e9752e790e Added columns for a policy feature 2018-09-13 16:57:13 +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
vgilc d46cfab6db Merge branch 'ent-2301-fallo-mapas-de-red-consola-movil' into 'develop'
Removed Networkmaps on mobile console

See merge request artica/pandorafms!1760
2018-09-13 16:15:57 +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
artica c54f414a73 Updated version and build strings. 2018-09-13 15:53:21 +02:00
fermin831 1096319faf Removed Networkmaps on mobile console 2018-09-13 15:48:26 +02:00
fermin831 764b1125bd Generate session csrf code to avoid attacks in user edition 2018-09-13 15:19:08 +02:00
vgilc 87d1bdd29d Merge branch 'ent-2351-seguridad-4' into 'develop'
Added .htaccess to avoid external access to attachment files

See merge request artica/pandorafms!1758
2018-09-13 08:35:20 +02:00
artica 583a7475e4 Auto-updated build strings. 2018-09-13 00:01:26 +02:00
fermin831 52f89def20 Added .htaccess to avoid external access to attachment files 2018-09-12 17:30:13 +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
fermin831 0ec93011da Fixed security fail filling the plugin fields 2018-09-12 15:05:30 +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
tatiana.llorente@artica.es 2fb8c99b2a Database and application_osx icons added to select icon of group - #2572 2018-09-11 15:30:16 +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
manuel.montes a807763c1f Added horizontal scroll in the interfaces select 2018-09-07 13:56:35 +02:00
manuel.montes a721eadcbd Fixed bug in the construction of the name of the xml file 2018-09-07 08:36:06 +02:00
artica fb68f3f9b6 Auto-updated build strings. 2018-09-07 00:01:31 +02:00
danielmaya 816b969741 Added table tlog_graph_models 2018-09-06 16:48:18 +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
manuel.montes 7d6bf289f8 visuals fix in visual styles 2018-09-05 08:23:57 +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
manuel.montes a0470114a5 Fixed bug in module manager 2018-09-04 13:00:43 +02:00
nramon 1f808adb27 Merge branch '2499-Mapas-GIS-dev' into 'develop'
Fixed agent view in public Visual Console

See merge request artica/pandorafms!1726
2018-09-04 12:59:33 +02:00
danielmaya 19f7a5180c Added default value in parent_module_id 2018-09-04 12:48:58 +02:00
daniel 718401467d put tree view in separate files 2018-09-04 11:51:36 +02:00
danielmaya 66c8404fcf Fixed agent view in public Visual Console 2018-09-04 11:08:10 +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 862c1ae8a7 Merge branch '2063-Bug-cambio-hora-en-relojes-de-la-Consola-visual-dev' into 'develop'
Fixed issue with timezone in visual console editor

See merge request artica/pandorafms!1724
2018-09-03 15:47:55 +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
nramon c3c26e9618 Merge branch '2712-mejora-rendimiento' into 'develop'
fixed ajax.php two call function translate

See merge request artica/pandorafms!1721
2018-09-03 15:46:46 +02:00
danielmaya fd27b6d445 Fixed issue with timezone in visual console editor 2018-09-03 14:43:21 +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 5cd4e0d300 fixed ajax.php two call function translate 2018-08-31 13:46: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
vgilc 0aeef6367a Merge branch '1958-Informe-agrupado-de-grupo' into 'develop'
fixed recursion option in custom report's item editor

See merge request artica/pandorafms!1719
2018-08-29 08:26:58 +02:00
artica 91bdb0094a Auto-updated build strings. 2018-08-29 00:01:26 +02:00
alejandro-campos 5f4d76f3a7 fixed recursion option in custom report's item editor 2018-08-28 16:38:32 +02:00
vgilc 3f1d7e9947 Merge branch '2682_Cambiar_ayuda_contextual' into 'develop'
Changed soft graphs hint

See merge request artica/pandorafms!1718
2018-08-28 16:00:53 +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
samucarc dae0021db9 Changed soft graphs hint 2018-08-28 11:02:27 +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
manuel.montes e59f123d19 Fixed bug in agent-manager 2018-08-28 10:23:25 +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
manuel.montes b007e2d924 Suppress entities in System audit log comments 2018-08-27 12:12:09 +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 266dba4600 Merge branch '2654-No-se-puede-editar-agente-y-no-aparece-QR2' into 'develop'
Fixed bug in agent manager

See merge request artica/pandorafms!1711
2018-08-27 09:15:11 +02:00
vgilc df4c61d673 Merge branch '2379-Entrar-a-consola-sin-licencia-mobile' into 'develop'
Implemented license validation for mobile console

See merge request artica/pandorafms!1712
2018-08-27 09:14:32 +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
alejandro-campos 8e2f4b0eaa Implemented license validation for mobile console 2018-08-23 13:57:41 +02:00
manuel.montes 5d495226d3 Fixed bug in agent manager 2018-08-23 08:28:02 +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
samucarc 708349bcba Fixed visual error in module agent 2018-08-20 16:57:12 +02:00
manuel.montes 14c4b8d10a Fixed bug in Fields Selected (Custom Events) 2018-08-20 16:39:51 +02:00
daniel 271466fb66 fixed errors automatic combined graph report metaconsole 2018-08-20 13:52:01 +02:00
vgilc c8414a82a5 Merge branch '572-Extension-de-self-assestment2' into 'develop'
Fixed visual bug

See merge request artica/pandorafms!1702
2018-08-20 12:43:59 +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
vgilc 2d00bbe50a Merge branch 'ent-2555-fix-incremental-realtime-charts' into 'develop'
Fix the incremental realtime charts

See merge request artica/pandorafms!1701
2018-08-20 12:41:53 +02:00
vgilc 99569017cd Merge branch 'ent-2626-pantalla-de-edicion-de-modulos-en-grupos-secundarios-4' into 'develop'
[Secondary groups] Fixed monitor permission checking in metaconsole

See merge request artica/pandorafms!1699
2018-08-20 12:41:04 +02:00
fermin831 b597c936e8 [Secondary groups] Avoid duplicates in manage agents 2018-08-20 12:02:34 +02:00
fermin831 168d081268 [Secondary groups] Added to manage agents view 2018-08-20 11:38:01 +02:00
manuel.montes 49f747f739 Fixed visual bug 2018-08-20 10:09:09 +02:00
Alejandro Gallardo Escobar 28336d3e1a Update realtime_graphs.js 2018-08-20 09:53:11 +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
fermin831 09a80abdd2 [Secondary groups] Fixed monitor permission checking in metaconsole 2018-08-17 14:57:50 +02:00
samucarc 52da571212 Fixed visual error 2018-08-17 14:42:17 +02:00
Alejandro Gallardo Escobar 3320bf1fb2 Now the group item addition to the GIS layer is disabled if it is already in the list 2018-08-17 14:20:16 +02:00
Alejandro Gallardo Escobar 3edd42a453 Bug fixes on the gis map layer configuration 2018-08-17 14:10:47 +02:00
fermin831 e54e91cdf1 Revert "Improved metaconsole sync (added centralized management)"
This reverts commit 3c99242508.
2018-08-17 13:27:55 +02:00
vgilc e1a3eaf236 Merge branch 'ent-2555-fix-incremental-realtime-charts' into 'develop'
Fixed the incremental realtime charts

See merge request artica/pandorafms!1695
2018-08-17 13:23:23 +02:00
Alejandro Gallardo Escobar 5934f141a8 Fixed the incremental realtime charts 2018-08-17 13:17:27 +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 df46772733 [Secondary groups] Fixed modules edition problems 2018-08-16 14:55:48 +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 855283421b Merge branch 'ent-2647-version-open-fallo-funcions-cps' into 'develop'
Added missing enterprise_hook in get cps

See merge request artica/pandorafms!1683
2018-08-16 09:47:04 +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
artica b222c6627a Auto-updated build strings. 2018-08-15 00:01:24 +02:00
fermin831 6372f44212 Added some docs 2018-08-14 17:08:00 +02:00
fermin831 05a0eb0db6 Fixed events secondary groups filter in metaconsole 2018-08-14 17:06:15 +02:00
artica e94af2ee15 Updated version and build strings. 2018-08-14 15:24:31 +02:00
fermin831 4678c0df53 Fixed copy is_secondary to no_hierarchy in mr 19 2018-08-14 14:16:40 +02:00
fermin831 024a1cc1ee Fixed snapshot view in metaconsole 2018-08-14 13:21:32 +02:00
fermin831 d3c3304976 Fixed pagination and added filter to All events 2018-08-14 10:40:56 +02:00
artica b8d8f20d64 Auto-updated build strings. 2018-08-14 00:01:24 +02:00
fermin831 54803de45d Added missing enterprise_hook in get cps 2018-08-13 16:43:01 +02:00
fermin831 3daea977b0 Fixed migration rebranding Event commands 2018-08-13 14:10:19 +02:00
vgilc 6b700d337a Merge branch '572-Extension-de-self-assestment' into 'develop'
Extension self assestment

See merge request artica/pandorafms!1676
2018-08-13 12:56:04 +02:00
fermin831 962e793c1b Reupload the manuel.montes changes 2018-08-13 12:52:01 +02:00
fermin831 837df1f196 Revert "Extension self assestment"
This reverts commit de459c7761.
2018-08-13 12:49:41 +02:00
Alejandro Gallardo Escobar dd6b9aed81 Refactored the layer configuration of the GIS maps to fix some bugs 2018-08-13 12:42:30 +02:00
fermin831 a5ff91185b Fixed text format in html historic data 2018-08-13 12:41:09 +02:00
fermin831 13ad7b4fc7 Fixed group all alert templates visualization 2018-08-13 11:24:32 +02:00
fermin831 9d4297356e Fixed bullet charts (7 pixels for tickline) 2018-08-13 10:59:38 +02:00
vgilc 9dd9ad71a8 Merge branch '2609-cambios-en-la-forma-de-gestionar-grupos-secundarios-en-la-vista-de-usuario' into 'develop'
2609 cambios en la forma de gestionar grupos secundarios en la vista de usuario

See merge request artica/pandorafms!1665
2018-08-13 10:28:14 +02:00
vgilc 9df412ca72 Merge branch '2415-plantillas-de-consola-visual-eu-comm' into 'develop'
2415 plantillas de consola visual eu comm

See merge request artica/pandorafms!1677
2018-08-13 08:21:16 +02:00
artica aba54d65fa Auto-updated build strings. 2018-08-13 00:01:21 +02:00
artica 29c8a54e57 Auto-updated build strings. 2018-08-12 00:01:24 +02:00
artica f6382725dd Auto-updated build strings. 2018-08-11 00:01:25 +02:00
fbsanchez 8f329698d0 Vconsole templates, fixed permissions 2018-08-10 18:16:31 +02:00
manuel.montes de459c7761 Extension self assestment 2018-08-10 17:56:43 +02:00
fermin831 8be030b7da Fixed agents_get_agentmodule_group to search only in tagente table 2018-08-10 12:55:04 +02:00
vgilc c6acf4abe2 Merge branch '572-extensionode-self-assestment' into 'develop'
fix bug in pandora_diag.php

See merge request artica/pandorafms!1673
2018-08-10 11:22:51 +02:00
vgilc 7515cc6529 Merge branch '2635-6317-graficas-combinadas' into 'develop'
Added thresholds to comb/interface graphs

See merge request artica/pandorafms!1672
2018-08-10 11:11:07 +02:00
manuel.montes bb8fc7a765 fix bug in pandora_diag.php 2018-08-10 10:41:18 +02:00
artica e1904878b5 Auto-updated build strings. 2018-08-10 00:01:24 +02:00
fbsanchez 6142fa1b05 Added thresholds to comb/interface graphs 2018-08-09 16:33:29 +02:00
manuel.montes 2c72ec54b8 Update self-assestment 2018-08-09 13:08:08 +02:00
artica 50b4c45652 Auto-updated build strings. 2018-08-09 00:01:24 +02:00
fermin831 01b8ec8acb Deleted some unwanted traces 2018-08-08 13:20:15 +02:00
fermin831 62617e609c [Secondary groups] Fixed group agents and group events in events filter 2018-08-08 13:17:03 +02:00
fermin831 4315cef4c9 [Secondary groups] Fixed modules permissions in some views 2018-08-08 11:49:54 +02:00
fermin831 10a4268bbc Implemented no_hierarchy profile in users_et_groups function 2018-08-08 09:26:07 +02:00
artica c6eef38ae8 Auto-updated build strings. 2018-08-08 00:01:22 +02:00
Alejandro Gallardo Escobar 2778239a0f Fix the api info call 2018-08-07 13:03:53 +02:00
fermin831 188733962f Changed is_secondary by no_hierarchy on tusuario_perfil table 2018-08-07 08:31:40 +02:00
artica e614e3ecec Auto-updated build strings. 2018-08-07 00:01:22 +02:00
artica 1367d0e57e Auto-updated build strings. 2018-08-06 00:01:22 +02:00
artica e5e97a304b Auto-updated build strings. 2018-08-05 00:01:21 +02:00
artica 517c98cf1a Auto-updated build strings. 2018-08-04 00:01:25 +02:00
alejandro-campos 8e55522e3f added alert message on module deletion at agent modules view 2018-08-03 15:18:03 +02:00
alejandro-campos ae47e7c03a added redirection after module deletion on agent modules view 2018-08-03 14:40:51 +02:00
fermin831 d8d18e422e Fixed ACL enterprise in home screen 2018-08-03 14:22:26 +02:00
daniel 4bab741454 fixed error in visual console width and heigth custom graph 2018-08-03 11:58:45 +02:00
vgilc ab3998e097 Merge branch '2600-Error-al-crear-servicio-en-meta-dev' into 'develop'
Fixed create services

See merge request artica/pandorafms!1661
2018-08-03 11:35:56 +02:00
vgilc 1d607834dc Merge branch '2389-Ordenar-eventos-por-campo' into 'develop'
implemented sort filter to event view custom fields

See merge request artica/pandorafms!1660
2018-08-03 10:50:56 +02:00
danielmaya a9e162a199 Fixed create services 2018-08-03 10:49:01 +02:00
alejandro-campos 097661d82b implemented sort filter to event view custom fields 2018-08-03 10:38:53 +02:00
daniel 06c436e5bf add new tocken zoom graph visual styles 2018-08-03 10:01:04 +02:00
vgilc 7390905f07 Merge branch '2043-fallos-en-la-visualizacion-de-snapshots' into 'develop'
2043 fallos en la visualizacion de snapshots

See merge request artica/pandorafms!1656
2018-08-03 09:01:09 +02:00
vgilc d84a945daa Merge branch 'ent-2555-fix-incremental-realtime-charts' into 'develop'
Fix incremental realtime charts

See merge request artica/pandorafms!1658
2018-08-03 09:00:31 +02:00
artica 392b5bc935 Auto-updated build strings. 2018-08-03 00:01:25 +02:00
Alejandro Gallardo Escobar f5304af062 Removed unused code which was causing an error 2018-08-02 14:59:56 +02:00
Alejandro Gallardo Escobar 568484cf6e Fixed the incremental mode of the realtime charts and overall improvements 2018-08-02 14:59:10 +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 7b22caaea8 Fixed warning 2018-08-02 13:41:56 +02:00
vgilc fdedc78b24 Merge branch '2415-Plantillas_de_Consola_visual' into 'develop'
2415 plantillas de consola visual

See merge request artica/pandorafms!1652
2018-08-02 13:22:26 +02:00
vgilc 58aecc9039 Merge branch '2598-Error-de-permisos-en-acciones-de-alertas-dev' into 'develop'
Fixed permissions in alert_actions

See merge request artica/pandorafms!1655
2018-08-02 13:08:54 +02:00
daniel c78ac2f4d5 fixed minor error 2018-08-02 13:07:40 +02:00
daniel c3413bbf62 fixed minor error 2018-08-02 13:06:43 +02:00
fermin831 18800feaae Refactorized snapshot link on node 2018-08-02 13:02:33 +02:00
fermin831 ca67bd632e Removed Oracle and Posgre code 2018-08-02 12:56:43 +02:00
danielmaya a9bb538e1a Fixed permissions in alert_actions 2018-08-02 12:47:42 +02:00
daniel 9d5004efbf fixed minor error 2018-08-02 11:07:22 +02:00
daniel ef2ff49504 mv enterprise visual console template 2018-08-02 11:03:13 +02:00
daniel d5f0429390 mv enterprise templates visual console 2018-08-02 10:57:00 +02:00
vgilc 22ffd8d1e5 Merge branch '2389-Ordenar-eventos-por-campo' into 'develop'
added order filters to events table

See merge request artica/pandorafms!1608
2018-08-02 10:55:33 +02:00
alejandro-campos 01656f2e76 conflict resolution on branch 2389-Ordenar-eventos-por-campo 2018-08-02 10:27:31 +02:00
fbsanchez 4968ff3878 Included library from enterprise 2018-08-02 10:07:47 +02:00
fbsanchez a51851cc79 Moved vconsole templates to enterprise 2018-08-02 09:35:16 +02:00
artica d06c0ebffe Auto-updated build strings. 2018-08-02 00:01:23 +02:00
vgilc fcda8f56f9 Merge branch '2460-tu-zona-horaria-es-distinta-pero-igual' into 'develop'
fixed bug: when system timezone is equal to your timezone, dont show the…

See merge request artica/pandorafms!1645
2018-08-01 15:20:08 +02:00
fbsanchez 9924c7877a Weird fix agentmodule retrieval proc. 2018-08-01 15:17:58 +02:00
vgilc 6e2af64746 Merge branch 'ent-2394-fix-api-info-html-encoded-chars' into 'develop'
Remove html encoded characters from the product name when returning the info using the API

See merge request artica/pandorafms!1646
2018-08-01 15:13:51 +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
vgilc cce7af9c37 Merge branch '2397-No-se-ve-la-gráfica-de-eventos-de-la-pantalla-de-cluster-dev' into 'develop'
Fixed event graph in cluster view

See merge request artica/pandorafms!1651
2018-08-01 15:08:43 +02:00
vgilc ce18002ae5 Merge branch '2385-Siguen-fallando-los-mapas-en-la-metaconsola-dev' into 'develop'
Fixed node connection in visual_map

See merge request artica/pandorafms!1637
2018-08-01 15:06:27 +02:00
vgilc 44411c4628 Merge branch '2432-Edición-módulos-snmpv3-en-operaciones-masivas-dev' into 'develop'
Fixed edit snmp modules in bulk

See merge request artica/pandorafms!1642
2018-08-01 15:05:50 +02:00
vgilc 1e71f93bba Merge branch '2537-Error-al-editar-módulos-con-tags-dev' into 'develop'
Fixed tags_check_acl when standar user have 'any' tag

See merge request artica/pandorafms!1647
2018-08-01 15:04:43 +02:00
vgilc cd98a5a414 Merge branch '2433-Los_datos_reportados_por_generic_data_string_aparecen_sin_saltos_de_linea_y_la_vista_ampliada_falla' into 'develop'
fixed error data string show

See merge request artica/pandorafms!1643
2018-08-01 14:56:23 +02:00
vgilc 8af71bfc35 Merge branch '2424-Bug_umbrales_graficas' into 'develop'
fixed minor error

See merge request artica/pandorafms!1644
2018-08-01 14:55:18 +02:00
fbsanchez a709d0af9f Minor fix vconsole templates 2018-08-01 14:54:14 +02:00
vgilc 3b64404278 Merge branch '2576-No_esta_guardando_el_postprocesado' into 'develop'
2576 no esta guardando el postprocesado

See merge request artica/pandorafms!1650
2018-08-01 14:53:58 +02:00
alejandro-campos 87296eb472 added methods to api (metaconsole and node) to create and update operating systems 2018-08-01 14:35:05 +02:00
fbsanchez 1369333ab8 Minor fix vconsole template 2018-08-01 13:52:34 +02:00
daniel 2a7e710b9e fixed errors in template wizar visual console 2018-08-01 13:51:45 +02:00
daniel 62d2b509ad fixed minor error 2018-08-01 13:21:04 +02:00
daniel dc56e0712c delete template visual console 2018-08-01 13:20:20 +02:00
fermin831 04cfbe4ef9 Fixed acl in module graph view 2018-08-01 13:16:21 +02:00
fbsanchez 11372e5b94 Delete vconsole template method 2018-08-01 13:12:10 +02:00
daniel e14f1580a1 Merge branch '2415-Plantillas_de_Consola_visual' of brutus.artica.lan:artica/pandorafms into 2415-Plantillas_de_Consola_visual 2018-08-01 13:10:20 +02:00
daniel 49aeb349eb create form templates visual console 2018-08-01 13:10:10 +02:00
fbsanchez 8e52d9e184 added visual_map_instanciate_template 2018-08-01 13:05:27 +02:00