Commit Graph

3176 Commits

Author SHA1 Message Date
fermin831 c74e4a3d6a Fixed agent filter on agents/module view to see secondary groups 2018-10-11 15:45:11 +02:00
fermin831 e5a2284b8b Fixed margin in public visual consoles 2018-10-11 14:51:52 +02:00
samucarc 015dcdb032 Fixed enterprise ACLs in Agents View 2018-10-11 13:07:59 +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
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
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 2d5d092e15 Merge branch '2884-Se-pierde-el-filtrado-en-vista-de-eventos' into 'develop'
Added two missing parameters in the url - #2884

See merge request artica/pandorafms!1842
2018-10-09 11:27:25 +02:00
fermin831 28f9e152e7 [Tags performance] Fixed tags filter and removed unwanted code 2018-10-09 10:56:02 +02:00
tatiana.llorente@artica.es eeba7b9350 Added two missing parameters in the url - #2884 2018-10-09 09:58:28 +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
samucarc 3c54710d1b Fixed conflicts 2018-10-03 13:09:39 +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
tatiana.llorente@artica.es ae4472d5c8 Added align center for the head of the table - #2848 2018-10-01 16:59:17 +02:00
tatiana.llorente@artica.es 04226c7940 Changed styles for the button create_network_component - #2814 2018-10-01 12:26:06 +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
vgilc 01d5c2fce9 Merge branch '2435-Botones-superpuestos-mensajeria-interna-pandora' into 'develop'
fixed visual bug: buttons in message edit bad positioned

See merge request artica/pandorafms!1601
2018-09-28 10:51:58 +02:00
vgilc ed30ed1f84 Merge branch '2503_Descuadre_Visual_Recon_Task_Windows' into 'develop'
Fixed Windows visual mismatch of the Recon task

See merge request artica/pandorafms!1619
2018-09-28 10:38:57 +02:00
vgilc ffb511c140 Merge branch '2558-No-aparece-nombre-de-agente-al-crear-incidente-desde-event-response' into 'develop'
fixed bug: agent field not retrieving value on incident creation from event response

See merge request artica/pandorafms!1648
2018-09-28 10:25:12 +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
tatiana.llorente@artica.es 7e4ca193cf Countdown in group view for autorefresh 2018-09-14 14:19:49 +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 764b1125bd Generate session csrf code to avoid attacks in user edition 2018-09-13 15:19:08 +02:00
fermin831 5c54afe673 Fixed secondary groups in alerts details 2018-09-11 09:15:48 +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
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
danielmaya 66c8404fcf Fixed agent view in public Visual Console 2018-09-04 11:08:10 +02:00
danielmaya 5b30aa5560 Added source, comment and id_extra in event filter 2018-08-31 16:25:12 +02:00
fermin831 09a80abdd2 [Secondary groups] Fixed monitor permission checking in metaconsole 2018-08-17 14:57:50 +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
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 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 05a0eb0db6 Fixed events secondary groups filter in metaconsole 2018-08-14 17:06:15 +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
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
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
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
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 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
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
alejandro-campos f42c705125 fixed bug: agent field not retrieving value on incident creation from event response 2018-07-31 10:59:19 +02:00
daniel d740240a51 fixed error data string show 2018-07-27 14:07:02 +02:00
manuel.montes a476d008ac fix bug in metaconsole view events 2018-07-26 15:30:49 +02:00
daniel 3985316a9b fixed errors in policies metaconsole 2018-07-26 12:41:09 +02:00
samucarc 202f72d1c3 Fixed fields list in manage events-custom fields 2018-07-25 17:23:13 +02:00
manuel.montes b922066a72 Add items to the view events 2018-07-19 18:04:50 +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
samucarc 88a9d6db4d Fixed Windows visual mismatch of the Recon task 2018-07-18 17:49:12 +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
alejandro-campos 6ec4787c38 added order filters to events table 2018-07-10 15:11:18 +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
alejandro-campos d3b39fe1dd fixed visual bug: buttons in message edit bad positioned 2018-07-06 11:03:52 +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 415f23ea14 Merge branch 'ent-2334-intracom-snmp-trap-forwarding-improvement' into 'develop'
Recover critical status the SNMPTrap on SNMP console actions

See merge request artica/pandorafms!1567
2018-06-26 22:40:02 +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
slerena 8320e5cc53 Merge branch '2128-Botón-de-"Crear-complementos-de-red"-en-SNMP-browser' into 'develop'
Fixed the online-style of submit

See merge request artica/pandorafms!1496
2018-06-25 18:58:17 +02:00
slerena c0e63bd1a0 Merge branch '2346-Pequeño-fallo-Consola-VIsual' into 'develop'
Fixed visual bug

See merge request artica/pandorafms!1566
2018-06-25 18:57:13 +02:00
slerena aa540614dd Merge branch 'ent-2409-Agregar-agentes-en-concreto-en-Mapas-Gis' into 'develop'
Fixed add particular agents to GIS layers

See merge request artica/pandorafms!1568
2018-06-25 18:55:17 +02:00
fermin831 dcb73f844e Revert "Revert "Recover critical status the SNMPTrap on SNMP console actions""
This reverts commit 16cff75242.
2018-06-22 13:37:36 +02:00
fermin831 2719cadc61 Revert "Fixed agents display on GIS maps"
This reverts commit 6a53e924bb.
2018-06-22 13:37:17 +02:00