Commit Graph

4173 Commits

Author SHA1 Message Date
tatiana.llorente@artica.es f5c96b7e5d New organization of CSS files - #3358
Former-commit-id: 8512adc7742eecb64db2b0ee539acfddd33406c2
2019-01-24 11:10:49 +01:00
manuel.montes e8497bb80c Changed the order of actions
Former-commit-id: ec733bfcf1705552f6257dc14c5a34e0a3e84e66
2019-01-22 11:03:52 +01:00
samucarc 91f547b6f4 Save password option disabled if Fallback is enabled
Former-commit-id: 5ed747ab6e22478a46102104095f5d2d1ba32deb
2019-01-21 18:11:12 +01:00
alejandro-campos 2155420d71 implement custom fields for node monitor view
Former-commit-id: d9dd515a726d1fa7cc5855b016270b9ef083cb6f
2019-01-18 11:13:29 +01:00
manuel.montes fd2dcb3281 Changed radio buttons by toogle switch checkbox
Former-commit-id: d4b46db05fa38e268e0c6f82979bca52fec36e78
2019-01-17 17:28:23 +01:00
samucarc ff85a4a8d5 Eliminated message when secondary groups are added
Former-commit-id: 07a6e423a66830543126444a5b4f54c196818e63
2019-01-15 13:10:13 +01:00
Daniel Rodriguez b38dc64ad8 Merge branch '3134-Tardanza_a_la_hora_de_aplicar_cambios_masivamente' into 'develop'
fixed errors in massive operation edit modules

See merge request artica/pandorafms!2101

Former-commit-id: 5c3a995d57b344ec860679b07b3624aec73cf4b8
2019-01-15 12:35:11 +01:00
daniel 4e6cf0182a fixed error create modules network
Former-commit-id: 4be4cbd7e796680772faada72504ed751b91cc36
2019-01-11 12:01:48 +01:00
Samuel Carcases f14acf12d2 Merge branch '1931_Cambiar_el_cuerpo_del_email_al_enviar_reportes' into 'develop'
Be able to change the subject and body of the report message when necessary

See merge request artica/pandorafms!1925

Former-commit-id: 18ef1606525fd0cf1ecd692fd156e3fd72f7ca43
2019-01-10 14:49:18 +01:00
samucarc 439f1db620 Fixed link in cron job and visual console manager
Former-commit-id: 6533fcc628157231c7bd524d878c144faac02447
2019-01-09 18:11:21 +01:00
tatiana.llorente@artica.es 6f65c9876f Added option in setup for unique main IP in agents - #1744
Former-commit-id: f8f9668a14818a01b811a73052e2e7e82e9a8c7a
2019-01-09 16:20:24 +01:00
Alejandro Campos 8d3644b002 Merge branch '3112-Bug-en-creacion-de-alertas-en-cluster' into 'develop'
fix duplicated table in active-passive cluster's alert builder

See merge request artica/pandorafms!2010

Former-commit-id: 5b92294a64c3ba4baa65f6eba4087edebd450ed9
2019-01-09 10:34:30 +01:00
Alejandro Campos 4f7733d8e8 Merge branch '2923-unit-y-post-process-no-se-guardan' into 'develop'
fixed bug: failing load of post process and unit fields in plugin component in module creation

See merge request artica/pandorafms!1912

Former-commit-id: 659495290305079e9932ab60b5fef924ef6089ed
2019-01-09 10:31:44 +01:00
alejandro-campos 471c01a4c5 fixed bad link to node in metaconsole's custom graph item editor
Former-commit-id: 22fb4302de980d8b3e16fb90d087b71c218598a1
2019-01-09 10:20:17 +01:00
Tatiana Llorente 561579580e Merge branch '2958-Bug-en-filtrado-de-módulos-en-la-creación-de-alertas' into 'develop'
Added parameter width id agent - #2958

See merge request artica/pandorafms!1891

Former-commit-id: 3288ce807e8ab67daab9d6f4795a263c8467bc7f
2019-01-08 13:38:35 +01:00
Samuel Carcases a96606088a Merge branch 'Tipo_de_datos_en_Module_Data_server' into 'develop'
Removed Web Analysis and Log4x from data server module

See merge request artica/pandorafms!1985

Former-commit-id: 53756c67551aba928a0bb545386eceeb870fc8d0
2019-01-04 16:52:28 +01:00
daniel ac228a7fad fixed error in massive operation
Former-commit-id: 691f3557d44c686645cfa634eab3630d060def33
2018-12-28 12:14:17 +01:00
fbsanchez fc5d3170b5 fixed warn/err messages in module_manager_editor
Former-commit-id: d3a30dd591470a177709b60d82041b8c21f4cce1
2018-12-28 11:57:16 +01:00
fbsanchez 17e773adcb Merge remote-tracking branch 'origin/develop' into 3325-Desaparicion_de_los_desplegables_en_module_component_al_crear_un_modulo
Former-commit-id: 9d128ea51bb2bf42c6d97c4f6b8378457028dae9
2018-12-28 11:54:12 +01:00
manuel.montes 5b7f796510 Changed popup windows by tooltips
Former-commit-id: 478e63e4bf81bb663898bba1afa76c7ab02ac6d9
2018-12-28 11:45:48 +01:00
fbsanchez c6b9122cfc minor fix in control messages format and processing
Former-commit-id: bda61b3e6d6ef74090c215f9aa9d2f3db42456bd
2018-12-27 19:16:56 +01:00
daniel 6d8b73f72e fix minor error module editor network
Former-commit-id: c0f2c03b441f939b842303186ecdf2ace5c253b6
2018-12-27 12:40:47 +01:00
daniel c0869b3c9e fixed error module editor
Former-commit-id: cf2c9325c84448222743830759bb4e2716745f75
2018-12-27 10:29:12 +01:00
daniel 7e2fb25e27 fixed errors in massive operation edit modules
Former-commit-id: 2d2fa21660369607e6c206d269b12d2041f74a1a
2018-12-24 08:59:23 +01:00
vgilc d4061641ec Merge branch '3061-Mensaje-de-error-al-crear-un-modulo-sin-nombre' into 'develop'
fixed error message

See merge request artica/pandorafms!1964

Former-commit-id: 55944da11dcd55a19e9147bc4520431dedc3a19a
2018-12-21 10:29:14 +01:00
vgilc 0ec0af6e6e Merge branch '2980-Ajuste-de-dimensiones-en-custom-graph' into 'develop'
Removed the adjustment of dimensions in custom graph

See merge request artica/pandorafms!1946

Former-commit-id: ee5fe8d83c851b2ade8d8b4c6966a23116716d24
2018-12-21 10:26:47 +01:00
vgilc 3fd61e8d81 Merge branch '3016-URL-Address-de-un-agente-no-funciona-link_2' into 'develop'
Added hint to url address input

See merge request artica/pandorafms!2099

Former-commit-id: 4b8d92593b6a1eae46f1cbb0670734fde7c90ae6
2018-12-21 10:25:04 +01:00
vgilc 2a407bb494 Merge branch '3253-Error_en_automatic_combined_graph_en_meta_con_varios_nodos' into 'develop'
fixed autocombined report metaconsole

See merge request artica/pandorafms!2077

Former-commit-id: 130262742f8bac0441b4b8285dc62bb0d3aa998a
2018-12-21 10:22:21 +01:00
alejandro-campos 91e90a1b26 remove special characters from agent alias string on creation and trim blank spaces from beginning and end of alias string
Former-commit-id: 2294ef705ac0df638bc897f56ff9e9beff8379fc
2018-12-20 13:35:57 +01:00
manuel.montes ac4d420173 Added hint to url address input
Former-commit-id: 5c51058ff8aea2e821bbb294034a538f040c46be
2018-12-20 13:08:46 +01:00
alejandro-campos f60b55ac2b fix metaconsole sql items creation
Former-commit-id: 68e45006b53599e3f59322fe08cf5a93df747c32
2018-12-19 13:14:09 +01:00
manuel.montes e6049870f7 Fixed validations and changed alert by dialog
Former-commit-id: 4c38c7f665cd328708bca48f997794b9a8586840
2018-12-18 12:52:01 +01:00
Ramon Novoa bc36bb0534 Add support for exact matches to SNMP alerts.
Ref pandora_enterprise#3214.


Former-commit-id: 35aa55d4d2ae236e614be7f4db50a9eb9f62aafa
2018-12-17 15:40:00 +01:00
vgilc f2f88579fa Merge branch 'ent-2997-color-cloud-vc-items' into 'develop'
Added a pending translation

See merge request artica/pandorafms!2083

Former-commit-id: 2ea6499b990e08750210593f2b4882044da392ed
2018-12-14 10:21:40 +01:00
Alejandro Gallardo Escobar d76612b247 Minor fix
Former-commit-id: 80d3a5ae66a68ea249d4afe571862b01bc71db78
2018-12-13 17:11:38 +01:00
vgilc 6839559eb5 Merge branch 'ent-2997-color-cloud-vc-items' into 'develop'
Error fixes and metaconsole support for the color cloud item of the VC

See merge request artica/pandorafms!2082

Former-commit-id: 445dbc16ce84f22ffb1d379c8539b7ec35c9e478
2018-12-13 15:42:48 +01:00
Alejandro Gallardo Escobar 06a68d01be Error fixes and metaconsole support for the color cloud item of the VC
Former-commit-id: 01b0045b76c41dc2c0f3145631fbd0beae3b16df
2018-12-13 15:36:01 +01:00
samucarc 6b940d07d5 Fixed
Former-commit-id: b22637cf04af8b09c8b274aa0f5a8d2f66e13f7c
2018-12-13 13:25:37 +01:00
vgilc efdfd7c3f4 Merge branch '2658_Operaciones_masicas_sobre_politicas_2_open' into 'develop'
Fixed minor error

See merge request artica/pandorafms!2079

Former-commit-id: 3eaab74701477c29e800f25eca6b163b7416b3db
2018-12-13 10:06:53 +01:00
samucarc eab744f65d Fixed minor error
Former-commit-id: 2af6e231aa20216a4601a8c1a03fa6828c989448
2018-12-12 20:26:38 +01:00
vgilc 1b4cd37d5f Merge branch 'ent-2997-color-cloud-vc-items' into 'develop'
Add the Color Cloud item to the Visual Console

See merge request artica/pandorafms!2075

Former-commit-id: e40e442631628db94c8f21c52cd8c04a0adbb6d6
2018-12-12 17:43:39 +01:00
daniel 358532c4a8 fixed autocombined report metaconsole
Former-commit-id: f277a1302c0b84ca0417693673ca3da0a4956f6c
2018-12-12 16:13:31 +01:00
Alejandro Gallardo Escobar 5d52e9f9c3 Minor fix
Former-commit-id: e9827e1294a995fc13deb42d701ea103cf9ad1da
2018-12-12 09:41:52 +01:00
Alejandro Gallardo Escobar 47a547367d Added a new item to the visual console
Former-commit-id: 6dcb8c9500e12932775d929646f7fdc676ee94fa
2018-12-11 19:14:14 +01:00
samucarc 8088a51035 Fixed audit log
Former-commit-id: a78fb3fb377814a6e664fd66606cd293c8af5df3
2018-12-11 17:17:46 +01:00
fermin831 e3243883f0 Fixed static graph without images creation and update previsualization
Former-commit-id: a3a0a7942f624d9ecb2a272560a57947be4b39a1
2018-12-11 13:56:48 +01:00
fermin831 562c5c14ee Added forgotten include
Former-commit-id: 78e7630eef24224f877998398c06c11ac864d261
2018-12-10 18:46:01 +01:00
alejandro-campos 4d5631d355 add safe output function to strings printed in system audit log
Former-commit-id: 383b5885f163d167c8944ad6dc8d66a8b4c35e51
2018-12-10 15:47:25 +01:00
alejandro-campos a2909db631 Revert "Eliminadas entidades html de vista de auditoria"
This reverts commit 530017a79d.


Former-commit-id: 7318b00afab9bf394f8095a8193fa35c05e52787
2018-12-10 13:42:29 +01:00
alejandro-campos dd1fb00e19 Revert "Removed html entities in the audit views"
This reverts commit ad7610d7f1.


Former-commit-id: a2b1fb7e9f6032cc255abb42e8ef0d65efc877b6
2018-12-10 13:40:37 +01:00
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