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

4173 Commits

Author SHA1 Message Date
alejandro-campos c05b4c53e8 fix bug when updating path of ssl certificate in general setup 
Former-commit-id: dfe466e64e18c7e3ea949f7786e0ef6343334260
 2018-12-07 15:12:09 +01:00
alejandro-campos 0af861f5b9 fix visual console's percentile item: label color not showing and removed label from view menu 
Former-commit-id: a19e1307b326a60bfef6441a7af0c7be2520ac6a
 2018-12-05 16:25:46 +01:00
tatiana.llorente@artica.es 94c6144653 Changed funciton size by length in jquery - #2893 2018-12-04 15:08:17 +01:00
vgilc abdd33949d Merge branch '2877_Mejora_audit_log' into 'develop' 
Fixed Audit log in profiles, collections and policies

See merge request artica/pandorafms!1876
 2018-12-04 08:15:42 +01:00
samucarc 34986a5477 Merge branch 'develop' into 2877_Mejora_audit_log 
# Conflicts:
#	pandora_console/godmode/users/profile_list.php
 2018-12-03 18:57:04 +01:00
vgilc d9e3b58aee Merge branch '2893-Error-configuración-personalizada-de-eventos' into 'develop' 
Changed timestamp value by default - #2893

See merge request artica/pandorafms!1881
 2018-12-03 15:36:10 +01:00
vgilc 7d52afff16 Merge branch '1886-Bug-Aviso-Enterprise-Network-Component-Open' into 'develop' 
Changed the value from modal to false - #1886

See merge request artica/pandorafms!1828
 2018-11-30 13:37:44 +01:00
vgilc 33603a79d8 Merge branch '2176-SNMP-Wizard-Nombres-de-modulos-con-entities2' into 'develop' 
Fixed bug in SNMP Wizard

See merge request artica/pandorafms!1929
 2018-11-30 13:37:07 +01:00
vgilc b45ad25b56 Merge branch '2658_Operaciones_masicas_sobre_politicas' into 'develop' 
Fixed centralized management in nodes

See merge request artica/pandorafms!1870
 2018-11-30 13:28:58 +01:00
vgilc 111ae09928 Merge branch '2722-Labels-en-visual-console' into 'develop' 
fixed labels not showing for percentile item in visual console builder

See merge request artica/pandorafms!2019
 2018-11-30 13:27:15 +01:00
vgilc bf66319d90 Merge branch '2907-TIP-para-Query-History-DataBase' into 'develop' 
Tip added - #2907

See merge request artica/pandorafms!1884
 2018-11-30 13:09:15 +01:00
vgilc 4bdc7d5303 Merge branch '3077-Fallos_en_las_consolas_visuales' into 'develop' 
fixed errors in visual console

See merge request artica/pandorafms!2026
 2018-11-30 13:04:31 +01:00
vgilc ce8e33ba29 Merge branch '2517-api-listar-y-crear-perfiles-de-usuario-en-meta-6168-eucomm' into 'develop' 
2517 api listar y crear perfiles de usuario en meta 6168 eucomm

See merge request artica/pandorafms!1905
 2018-11-30 12:22:37 +01:00
vgilc b8b43b33d7 Merge branch 'ent-2520-api-listar-y-crear-repuestas-de-eventos-6165-eucomm' into 'develop' 
Ent 2520 api listar y crear repuestas de eventos 6165 eucomm

See merge request artica/pandorafms!1896
 2018-11-30 10:50:59 +01:00
daniel 9bdd1af488 fixed errors in visual console 2018-11-29 13:24:12 +01:00
alejandro-campos d48c228855 fixed label not showing on page reload in visual console's percentile item 2018-11-27 15:25:16 +01:00
daniel 1b78c1a78d fixed error log js and warning php visual style 2018-11-23 09:21:22 +01:00
alejandro-campos 9a8197ea1e fix duplicated table in active-passive cluster's alert builder 2018-11-22 13:03:41 +01:00
daniel a3aa84bf92 fixed errors in session with send mail alerts graph API 2018-11-21 15:16:52 +01:00
daniel 494b858a20 fixed errors session_start 2018-11-21 13:08:58 +01:00
vgilc 5ac947c2fd Merge branch 'ent-2169-REDIRIS-modificacion-de-comandos-en-alertas' into 'develop' 
Ent 2169 rediris modificacion de comandos en alertas

See merge request artica/pandorafms!1878
 2018-11-20 11:33:00 +01:00
fermin831 8735e6e1a3 Added a translation 2018-11-20 11:18:57 +01:00
samucarc 8bd99e6c82 Removed Web Analysis and Log4x from data server module 2018-11-16 13:28:16 +01:00
daniel 449c02763a fixed minor error cfv 2018-11-16 13:22:10 +01:00
vgilc a00c10a136 Merge branch '2166-Hide-not-init-agents-2' into 'develop' 
removed hide not init modules from sla and availability report

See merge request artica/pandorafms!1976
 2018-11-15 17:20:00 +01:00
alejandro-campos a1846a6e22 removed hide not init modules from sla and availability report 2018-11-15 12:00:25 +01:00
daniel 6174e622c8 create alert php7 2018-11-14 18:15:48 +01:00
daniel 60212dae50 fixed errors cv 2018-11-14 16:38:44 +01:00
daniel 22a26aa072 fixed error upgrade jquery 2018-11-14 11:40:01 +01:00
vgilc d91f81d0ed Merge branch '2718-Creacion-de-usuarios-desde-metaconsola' into 'develop' 
fixed minor bug: Assigned node field showing in meta user update form when…

See merge request artica/pandorafms!1968
 2018-11-14 08:30:42 +01:00
alejandro-campos 5eed82eb62 fixed minor bug: Assigned node field showing in meta user update form when selecting admin profile in case the user was a stardard user 2018-11-13 19:00:16 +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
daniel 4dbcecb951 WIP custom fields view 2018-11-13 15:46:44 +01:00
alejandro-campos c5a0065cba decoded entities when retrieving module name in case SNMP module name is updated 2018-11-13 11:50:46 +01:00
manuel.montes 5420da9f23 fixed error message 2018-11-13 09:36:20 +01:00
vgilc 6d0d7fd410 Merge branch '2718-Creacion-de-usuarios-desde-metaconsola' into 'develop' 
removed Assigned node field from admin global profile when creating user from metaconsole

See merge request artica/pandorafms!1959
 2018-11-12 16:49:08 +01:00
alejandro-campos 75ad60a071 removed Assigned node field from admin global profile when creating user from metaconsole 2018-11-12 15:57:18 +01:00
daniel afaa6ad2ba Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields 2018-11-12 09:07:56 +01:00
fermin831 d63666cbbc Merge branch 'develop' into ent-2169-REDIRIS-modificacion-de-comandos-en-alertas 
Conflicts:
	pandora_console/extras/mr/22.sql
	pandora_console/godmode/alerts/alert_actions.php

Modified files extra:
	pandora_console/include/functions_alerts.php
 2018-11-08 14:00:49 +01:00
manuel.montes 1d8a746329 Removed the adjustment of dimensions in custom graph 2018-11-08 09:49:36 +01:00
daniel 5c99a8138f fixed minor error 2018-11-07 17:16:25 +01:00
manuel.montes c131c631d4 Fixed bug in visual styles configuration 2018-11-07 16:34:09 +01:00
daniel 3f78f15499 WIP View custom fields data 2018-11-07 13:28:00 +01:00
manuel.montes 45b757b5db Fixed bug in SNMP Wizard 2018-11-05 14:17:43 +01:00
samucarc 0f3717a268 Be able to change the subject and body of the report message when necessary 2018-11-02 12:57:52 +01:00
daniel c4eeb3cc76 fixed error edit modules in massive operation php7 error select 2018-11-02 10:18:33 +01:00
daniel f2b1c99013 fixed minor error cluster name by alias 2018-11-02 09:56:31 +01:00
daniel 78a1c72eac fixed warnings php7 2018-10-30 17:38:46 +01:00
vgilc e6a9ca7bfb Merge branch '2984-problemas-tras-actualizacion-php7' into 'develop' 
fixed errors php7

See merge request artica/pandorafms!1916
 2018-10-30 15:00:54 +01:00
daniel 0978be9b51 fixed errors php7 2018-10-30 14:43:27 +01:00
alejandro-campos 74016c928f fixed bug: failing load of post process and unit fields in plugin component in module creation 2018-10-30 10:20:31 +01:00
fermin831 294553941d Fixed add button on alerts 2018-10-29 16:41:55 +01:00
fermin831 c7a624000e Added API function set delete_user_profile_info 2018-10-29 13:34:30 +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 08a8165b93 Merge branch '2827-Mensaje-de-alerta-disparada' into 'develop' 
Added number of times an alert is fired - #2827

See merge request artica/pandorafms!1823
 2018-10-29 09:15:32 +01: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
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
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
vgilc 9aed441246 Merge branch '2452-Fallo-recalculo-custom-graph' into 'develop' 
Changed custom graph item insertion and deletion to fix bug when sorting elements in list

See merge request artica/pandorafms!1782
 2018-10-25 13:20:30 +02:00
vgilc fcb95a8d8d Merge branch '2510-Checkboxes-y-radio-buttons-en-Config.-visual' into 'develop' 
visuals fix in visual styles

See merge request artica/pandorafms!1731
 2018-10-25 13:16:57 +02:00
vgilc 3c4f6d3b23 Merge branch '2580-VERSION-OPEN-Línea-divisoria' into 'develop' 
Fixed bug in module manager

See merge request artica/pandorafms!1729
 2018-10-25 13:00:59 +02:00
vgilc ea2ed80f05 Merge branch '2655-Audit-log-con-entities' into 'develop' 
Suppress entities in System audit log comments

See merge request artica/pandorafms!1714
 2018-10-25 12:32:07 +02:00
vgilc b50f52ae9d Merge branch '2718-Creacion-de-usuarios-desde-metaconsola' into 'develop' 
fixed bug: admin users not able to log in to node when they are created in…

See merge request artica/pandorafms!1812
 2018-10-25 12:10:58 +02:00
vgilc af2e49966b Merge branch '2734-6444-Nombre-de-interfaces-en-SNMP-Interface-Wizard2' into 'develop' 
Added horizontal scroll in the interfaces select

See merge request artica/pandorafms!1738
 2018-10-25 11:58:33 +02:00
vgilc 5255ced7d1 Merge branch '2762-Poner-capitalizacion-correcta' into 'develop' 
Capital letter in the letter a of audit - #2762

See merge request artica/pandorafms!1766
 2018-10-25 11:55:15 +02:00
fermin831 c0afbf0b6f Added get event_responses to API 2018-10-25 11:49:39 +02:00
vgilc cab90a4fd3 Merge branch '2783-Falta-de-información-de-Module-Management-en-Last-Activity' into 'develop' 
Added module name and agent name in actions enable and disable module - #2783

See merge request artica/pandorafms!1783
 2018-10-25 11:44:42 +02:00
vgilc e0f7d1310b Merge branch '2858-Mensaje-de-error-poco-descriptivo-en-alertas' into 'develop' 
2858 mensaje de error poco descriptivo en alertas

See merge request artica/pandorafms!1825
 2018-10-25 11:14:31 +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 2f9169c679 Merge branch '2903-Limitación-de-caracteres-en-Warning-Critical-status-tipo-string-al-crear-Network-component' into 'develop' 
Increased the character limit in Warning / Critical status string type when…

See merge request artica/pandorafms!1861
 2018-10-25 10:56:34 +02:00
tatiana.llorente@artica.es d12791c03f Added parameter width id agent - #2958 2018-10-25 10:41:40 +02:00
danielmaya a1f28480ae Fixed force_type check in delete/edit modules in bulk 2018-10-23 15:46:48 +02:00
tatiana.llorente@artica.es 8dde77fb0e Tip added - #2907 2018-10-23 15:42:01 +02:00
tatiana.llorente@artica.es 448353e39c Changed timestamp value by default - #2893 2018-10-23 12:44:14 +02:00
fermin831 4308c3f92e Added acl to alert commands select 2018-10-23 10:53:09 +02:00
fermin831 e24794d6ea Fixed alert command creation error management 2018-10-22 16:54:22 +02:00
fermin831 7e8fbb4568 Added warning icon to actions that does not match with their commands 2018-10-22 16:48:24 +02:00
fermin831 d8a7ebea08 Only change the group to all grupo if neccesary when command is changed 2018-10-22 16:26:58 +02:00
fermin831 f537dbb961 Validate the group command on action creation 2018-10-22 16:19:29 +02:00
fermin831 1f299cad52 Added copy button to alert commands 2018-10-22 12:01:29 +02:00
fermin831 b50b1c9f34 Added group icon to alerts commands view 2018-10-22 10:08:25 +02:00
samucarc 57c411e3fa Fixed Audit log in profiles, collections and policies 2018-10-22 10:06:02 +02:00
fermin831 8b0b23dc27 Added group to alert commands update and creation 2018-10-22 09:49: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
daniel ffc7734ebc delete flash_charts and library pchart 2018-10-19 11:31:06 +02:00
samucarc c27ac9a0e0 Fixed centralized management in nodes 2018-10-18 16:34:54 +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
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
fermin831 14afe2ff88 Added message 'Please, select an agent first' 2018-10-17 12:35:11 +02:00
danielmaya 9ee64b4894 Fixed report agent/module 2018-10-17 08:44:51 +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
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
manuel.montes 23fa30a514 Increased the character limit in Warning / Critical status string type when creating Network component 2018-10-15 16:59:39 +02:00
danielmaya 392d4e7aad Fixed lost id_agent in visual console 2018-10-15 15:05:47 +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 f3c8b14b32 Merge branch '2457-Formulario-de-creacion-repetido' into 'develop' 
added check to prevent alert creation form from being printed in alert cluster for step 5

See merge request artica/pandorafms!1854
 2018-10-15 00:06:41 +02:00
alejandro-campos aa33522670 added check to prevent alert creation form from being printed in alert cluster for step 5 2018-10-11 15:22:36 +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
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
alejandro-campos 7fcbc6ece9 added check whto skip alert creation table printing in cluster alert only when step is 5 2018-10-10 18:54:46 +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
daniel fd13e33259 fixed minor error input max-length in plugin network component 2018-10-09 10:51:03 +02:00
Fermin 052d888ac4 Fixed a minor warning 2018-10-08 18:53:21 +02:00
danielmaya f952d5c70e tags_get_acl_tags revision 2018-10-08 17:45:26 +02:00
Fermin 198eb1bbc3 [Tags performance] Fixed parent module select 2018-10-05 10:12:40 +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 530017a79d Eliminadas entidades html de vista de auditoria 2018-10-04 17:02:38 +02:00
tatiana.llorente@artica.es 90610ed778 Changed the value from modal to false - #1886 2018-10-04 15:31:16 +02:00
vgilc 21c9a7ee4a Merge branch '2127-Paginacion-en-busqueda-de-modulos' into 'develop' 
added hidden input to policy modules filters form

See merge request artica/pandorafms!1597
 2018-10-04 14:16:22 +02:00
daniel e2f7157545 fixed php7 2018-10-04 11:43:08 +02:00
tatiana.llorente@artica.es 0855d09156 Fixed a minor mistake - #2858 2018-10-03 16:46:35 +02:00
tatiana.llorente@artica.es 61a3d147af Added descriptive error messages - #2858 2018-10-03 16:41:58 +02:00
fermin831 0ca13b8e98 Removed unused code 2018-10-03 15:04:45 +02:00
fermin831 7bd0615681 [Tags performace] Check visual consoles 2018-10-03 13:53:59 +02:00
fermin831 b277c71c44 [Tags performance] Check massive operations 2018-10-03 13:02:51 +02:00
fermin831 3d1e2e4c79 Removed unused code 2018-10-03 11:14:11 +02:00
fermin831 7ffeaaf50b [Tags performance] fermin revision 1 2018-10-03 11:13:52 +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
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
vgilc 17b183a6eb Merge branch '1807-Entities-en-el-nombre-de-modulo' into 'develop' 
fixed minor bug: entities in module name

See merge request artica/pandorafms!1592
 2018-10-01 15:16:03 +02:00
vgilc a7421fc385 Merge branch '1805_Campo_vacio_Informes_personalizados' into 'develop' 
Added title in custom reports

See merge request artica/pandorafms!1632
 2018-10-01 15:15:38 +02:00
vgilc 4b583c7477 Merge branch '2303_Aparecen_entidades_html_en_las_vistas_de_auditoria' into 'develop' 
Removed html entities in the audit views

See merge request artica/pandorafms!1631
 2018-10-01 12:37:52 +02:00
vgilc e979de64b3 Merge branch '2454-Borrado-de-modulos-masivo-filtrado-por-no-inicilizado-elimina-todos-los-modulos-con-el-mismo-nombre' into 'develop' 
fixed bug in modules massive deletion to avoid deletion of modules with the same…

See merge request artica/pandorafms!1629
 2018-10-01 10:58:06 +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 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 429c670743 Merge branch '2639-Visualizacion-campo-personalizado-eventos' into 'develop' 
Fixed bug in Fields Selected (Custom Events)

See merge request artica/pandorafms!1704
 2018-09-28 10:30:05 +02:00
vgilc 796e7ee06f Merge branch '6338_Visualizacion_erronea_de_advertencia' into 'develop' 
Fixed visual error in module agent

See merge request artica/pandorafms!1705
 2018-09-28 10:23:54 +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 ddd799c926 Merge branch '2579-version-open-enterprise-borrado-de-modulo' into 'develop' 
added redirection after module deletion on agent modules view

See merge request artica/pandorafms!1663
 2018-09-28 10:01:57 +02:00
danielmaya 453fb3f67b TODO List 2018-09-27 13:30:32 +02:00
alejandro-campos 93f4b74c9c fixed bug: admin users not able to log in to node when they are created in metaconsole and included option assigned node at admin user creation form 2018-09-26 18:48:27 +02:00
danielmaya 896ba6051b fixed issue with string data in visual map 2018-09-26 11:00:44 +02:00
fermin831 8fe3e1606f Fixed string (avoiding macaronic English) 2018-09-26 10:50:16 +02:00
fermin831 90bbd31b66 Added tip to disabled radiobutton in agent edition and massive operations 2018-09-25 16:00:37 +02:00
fermin831 823b32ac63 Added update standby token in massive operations 2018-09-24 17:32:58 +02:00
fermin831 9cf578e1f6 Update configuration files when disabled is modified on agents editing 2018-09-24 16:54:53 +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
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 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 0c853a83d1 add new tree view edition group 2018-09-18 09:28:22 +02:00
manuel.montes cfec231107 Especified SNMP version in recon task 2018-09-17 12:48:08 +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
tatiana.llorente@artica.es 69ec75e392 Capital letter in the letter a of audit - #2762 2018-09-14 09:38:36 +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
Alejandro Gallardo Escobar 98b2907857 Bug fixes 2018-09-12 16:16:04 +02:00
fermin831 0ec93011da Fixed security fail filling the plugin fields 2018-09-12 15:05:30 +02:00
daniel f117d1af43 fixed heigth charts for reports 2018-09-11 09:33:24 +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
manuel.montes a807763c1f Added horizontal scroll in the interfaces select 2018-09-07 13:56:35 +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
manuel.montes 7d6bf289f8 visuals fix in visual styles 2018-09-05 08:23:57 +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 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 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
danielmaya fd27b6d445 Fixed issue with timezone in visual console editor 2018-09-03 14:43:21 +02:00
danielmaya 5b30aa5560 Added source, comment and id_extra in event filter 2018-08-31 16:25:12 +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
alejandro-campos 5f4d76f3a7 fixed recursion option in custom report's item editor 2018-08-28 16:38:32 +02:00
samucarc dae0021db9 Changed soft graphs hint 2018-08-28 11:02:27 +02:00
manuel.montes e59f123d19 Fixed bug in agent-manager 2018-08-28 10:23:25 +02:00
manuel.montes b007e2d924 Suppress entities in System audit log comments 2018-08-27 12:12:09 +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 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
manuel.montes 5d495226d3 Fixed bug in agent manager 2018-08-23 08:28:02 +02:00
fermin831 399c9c2d58 [Secondary groups] Fixed agent/modules view 2018-08-21 13:33:16 +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
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
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
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
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
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
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
fermin831 54803de45d Added missing enterprise_hook in get cps 2018-08-13 16:43:01 +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 13ad7b4fc7 Fixed group all alert templates visualization 2018-08-13 11:24:32 +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
fbsanchez 8f329698d0 Vconsole templates, fixed permissions 2018-08-10 18:16:31 +02:00
fermin831 01b8ec8acb Deleted some unwanted traces 2018-08-08 13:20:15 +02:00
fermin831 188733962f Changed is_secondary by no_hierarchy on tusuario_perfil table 2018-08-07 08:31:40 +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
daniel 06c436e5bf add new tocken zoom graph visual styles 2018-08-03 10:01:04 +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
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
fbsanchez 4968ff3878 Included library from enterprise 2018-08-02 10:07:47 +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
daniel 49aeb349eb create form templates visual console 2018-08-01 13:10:10 +02:00
daniel 92911e8fb8 fixed js wizard template visual console 2018-08-01 12:24:27 +02:00
daniel 333e5c874c create template visual console 2018-08-01 11:52:20 +02:00
daniel cb77a299bb add templates console visual 2018-08-01 09:58:48 +02:00
danielmaya 8247df6d65 Fixed edit snmp modules in bulk 2018-07-27 10:42:45 +02:00
manuel.montes 4b23824eb4 fix bug in metaconsole view events 2018-07-26 15:41:52 +02:00
alejandro-campos c70475cd38 Added new funcionality to cluster alert configuration: update alert 2018-07-26 10:24:45 +02:00
samucarc 2b11d8cd7c Added title in custom reports 2018-07-25 13:48:02 +02:00
samucarc ad7610d7f1 Removed html entities in the audit views 2018-07-24 15:02:11 +02:00
alejandro-campos e4b74cffc8 fixed bug in modules massive deletion to avoid deletion of modules with the same name in distinct agents regardless of their status when module status filter has been applied 2018-07-24 13:04:31 +02:00
fbsanchez ba676e13e3 Added autoconfiguration menu 2018-07-23 20:11:35 +02:00
manuel.montes b922066a72 Add items to the view events 2018-07-19 18:04:50 +02:00
fermin831 e762b7322c Fixed detection disabled on serialized ajax get groups and clean call in metaconsole 2018-07-19 13:49:51 +02:00
fermin831 2d45c0b39f Added serialized to groups ajax calls 2018-07-19 11:02:20 +02:00
daniel f317f3e736 fixed errors in graph min and max warning and critical for edition module 2018-07-17 11:26:25 +02:00
fermin831 001861b746 Hide policy edition on centralized management on node 2018-07-17 08:51:39 +02:00
daniel 9e8126542a fixed minor error 2018-07-16 18:15:04 +02:00
alejandro-campos 213a59d26e fixed bug on bulk delete and bulk update module operation 2018-07-16 18:14:18 +02:00
daniel 713fbd5368 fixed visual errors and console 2018-07-16 17:01:50 +02:00
fermin831 025cc01830 Added missing dependencie in network component 2018-07-13 12:33:24 +02:00
fermin831 d0b6c9775f Addapted modules edition to metaconsole 2018-07-13 11:56:37 +02:00
vgilc 49ed21b93d Merge branch '2173-REDIRIS-Desplegable-de-grupo-All-en-grupos-pandorafms3' into 'develop' 
Reverse changes for non-administrators users

See merge request artica/pandorafms!1603
 2018-07-09 08:54:03 +02:00
manuel.montes 0d7acdc574 Reverse changes for non-administrators users 2018-07-06 12:02:34 +02:00
manuel.montes 9f9728fd03 Reverse changes for non-administrators users 2018-07-06 10:22:57 +02:00
alejandro-campos 30b720c291 added hidden input to policy modules filters form 2018-07-05 12:41:05 +02:00
daniel 0dd39f1f00 fixed errors in graph slice for uncompresed 2018-07-05 11:52:52 +02:00
vgilc 6c695999e8 Merge branch '2416-Popup-feo-y-erroneo-editor-de-modulos' into 'develop' 
changed width of changing snmp module name alert popup

See merge request artica/pandorafms!1589
 2018-07-03 14:03:29 +02:00
alejandro-campos b372bcabac fixed minor bug: entities in module name 2018-07-03 13:47:34 +02:00
manuel.montes 54a74c43d0 Remove the 'All Groups' option in non-administrators users 2018-07-03 13:11:00 +02:00
alejandro-campos 0cf3aa2e78 changed width of changing snmp module name alert popup 2018-07-03 12:50:28 +02:00
vgilc 0040837f4b Merge branch 'ent-2375-servidores-sin-referenciar' into 'develop' 
Fixed new servers (migration and autoprovision) icons

See merge request artica/pandorafms!1564
 2018-07-02 09:48:28 +02:00
alejandro-campos c400b261ff changed size of changing snmp module name alert popup 2018-06-29 14:57:40 +02:00
slerena 8f294cfe47 Merge branch '2411-Eventos-custom-fields' into 'develop' 
changed selectboxes width to fit length of the fields

See merge request artica/pandorafms!1575
 2018-06-27 18:12:15 +02:00
slerena 905e6bfc56 Merge branch '2075-Proteccion_en_cascada_de_servicios' into 'develop' 
2075 proteccion en cascada de servicios

See merge request artica/pandorafms!1578
 2018-06-27 18:10:41 +02:00
daniel 85897315cd cascade protection services 2018-06-27 15:03:46 +02:00
alejandro-campos 2a2a322f55 changed selectboxes width to fit length of the fields 2018-06-27 11:10:47 +02:00
daniel 84f1cf95eb Merge remote-tracking branch 'origin/develop' into 2075-Proteccion_en_cascada_de_servicios 
Conflicts:
	pandora_console/godmode/agentes/configurar_agente.php
 2018-06-26 13:44:16 +02:00
daniel 76cd718262 add cps for agent, module, policies and bulk opertaion 2018-06-26 13:23:12 +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 0520fba0f8 Merge branch '2330-No-funciona-seleccionar-todos-los-objetos-en-plantillas-de-módulos' into 'develop' 
Fixed checkbox select in manage_network_templates.php

See merge request artica/pandorafms!1516
 2018-06-25 19:02:48 +02:00
slerena 2284d6d3fa Merge branch 'ent-2320-pete-grupos-secundarios' into 'develop' 
Fixed secondary groups configuration in agent creation

See merge request artica/pandorafms!1545
 2018-06-25 19:01:58 +02:00
slerena 053f037d0d Merge branch '2312-No-funciona-búsqueda-en-consolas-visuales-dev' into 'develop' 
Changed permission AW for VR in visual console

See merge request artica/pandorafms!1537
 2018-06-25 19:01:21 +02:00
slerena 79131b938e Merge branch '2410Opción-show-in-two-columns-en-informes' into 'develop' 
Deleted 'show in two columns' option

See merge request artica/pandorafms!1569
 2018-06-25 18:55:47 +02:00
slerena e2f9e25dd9 Merge branch '2396-fallo-acl-en-vista-de-cluster' into 'develop' 
Fixed bug in cluster view

See merge request artica/pandorafms!1571
 2018-06-25 18:54:26 +02:00
slerena dddde8fba1 Merge branch '2194-IDs-de-SO-en-Manage-agents' into 'develop' 
Fixed select in modificar_agente.php

See merge request artica/pandorafms!1520
 2018-06-25 18:52:38 +02:00
manuel.montes 6f25c229e3 Fixed bug in cluster view 2018-06-25 12:35:39 +02:00
manuel.montes 02822bcfd6 Deleted 'show in two columns' option 2018-06-22 13:36:38 +02:00
fermin831 251c308d8c Fixed new servers (migration and autoprovision) icons 2018-06-20 18:31:52 +02:00
danielmaya 4214577eea Added new token for static graph height 2018-06-19 18:27:04 +02:00
fermin831 fec5299179 Fixed secondary groups configuration in agent creation 2018-06-18 13:46:13 +02:00
vgilc 3a4f3a38be Merge branch '1827-Graficas_TIP_eje_x_no_mantiene_ratio' into 'develop' 
1827 graficas tip eje x no mantiene ratio

See merge request artica/pandorafms!1538
 2018-06-14 10:12:05 +02:00
daniel 05d8d0ccf5 fixed errors graph 2018-06-13 19:13:42 +02:00
danielmaya 9af4b25f31 Changed permission AW for VR in visual console 2018-06-13 17:28:03 +02:00
vgilc 822fc05258 Merge branch '2042-HA_cluster-dev' into 'develop' 
2042 ha cluster dev

See merge request artica/pandorafms!1524
 2018-06-13 16:14:29 +02:00
daniel 7fe88d761e remove setup resolution graph 2018-06-13 11:32:03 +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 d42d8a2fd7 Merge branch 'ent-2010-error-de-ACLs-en-custom-graphs-y-reports-2' into 'develop' 
Always group All in custom reports and custom graphs

See merge request artica/pandorafms!1528
 2018-06-12 15:56:09 +02:00
daniel 25942907cf Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-06-12 15:46:41 +02:00
daniel 2d6fa8d0e0 fixed errors graphs 2018-06-12 15:46:05 +02:00
fermin831 68ae6e3112 Always group All in custom reports and custom graphs 2018-06-12 13:06:42 +02:00
enriquecd 632fc26be2 Thermometer graph only for intracom - #2214 2018-06-12 12:39:05 +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
manuel.montes 17b2b01e7a Fixed select in modificar_agente.php 2018-06-08 14:09:59 +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
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
manuel.montes d4aae1c4c1 Fixed checkbox select in manage_network_templates.php 2018-06-05 10:11:44 +02:00
vgilc 6152e93a9e Merge branch '1973-Entities-en-op-masivas-plugins' into 'develop' 
Implement function io_safe_output

See merge request artica/pandorafms!1499
 2018-06-05 09:44:00 +02:00
vgilc dbb802fb31 Merge branch '2214-Crear-nuevo-tipo-de-custom-graph-thermometer' into 'develop' 
New graph thermometer - #2214

See merge request artica/pandorafms!1465
 2018-06-04 10:19:21 +02:00
vgilc e808150f6b Merge branch '2251-Advertencia-al-cambiar-nombre-de-modulo-de-tipo-interfaz' into 'develop' 
Show warning modal window when change snmp or satellite module name - #2251

See merge request artica/pandorafms!1480
 2018-06-04 10:18:44 +02:00
vgilc 4abf3f3b2e Merge branch '1976-Informe-de-log-dev' into 'develop' 
Fixed sources in log report

See merge request artica/pandorafms!1508
 2018-06-04 10:17:17 +02:00
vgilc 9ea0115043 Merge branch 'ent-2010-error-de-ACLs-en-custom-graphs-y-reports' into 'develop' 
[ACL] Now only RM can delete custom graphs

See merge request artica/pandorafms!1341
 2018-06-04 10:10:56 +02:00
fermin831 a55b829aa1 Fixed a PHP warning 2018-06-01 12:36:34 +02:00
danielmaya 04f117523b Fixed sources in log report 2018-05-31 17:33:51 +02:00
fermin831 836cce115d Fixed ACL in custom graphs 2018-05-31 15:29:31 +02:00
fermin831 3155fecbfe Fixed ACL in reports created by another user in bit RM 2018-05-30 15:09:47 +02:00
fermin831 061df6495c Merge branch 'develop' into ent-2010-error-de-ACLs-en-custom-graphs-y-reports 2018-05-30 12:14:35 +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
fermin831 88e060893a Merge branch 'develop' into 2106-intracom-rebranding 
Conflicts resolved:
	pandora_console/operation/events/events_rss.php
 2018-05-28 12:12:16 +02:00
manuel.montes f0e7a59ae7 Implement function io_safe_output 2018-05-25 14:21:52 +02:00