Commit Graph

14947 Commits

Author SHA1 Message Date
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
alejandro-campos 5235b62c0d fix disable actions in event list when centralized mode is enabled
Former-commit-id: d5f16b4453b1e291ba051cd381fc6c09ce0bd027
2019-01-15 11:29:12 +01:00
alejandro-campos 1ed90180c9 disable actions in event list when centralized mode is enabled and improve behavior of checkboxes when a massive action is applied
Former-commit-id: 11f4606d2e7dd9b91c918323dc8a3dada0c8f765
2019-01-15 11:27:05 +01:00
artica 6894623429 Auto-updated build strings.
Former-commit-id: 582bbf87e0972212cf48dc220871981f80974321
2019-01-15 00:01:25 +01:00
Daniel Rodriguez f68cc53bb2 Merge branch '2896-Vista-de-monitores-en-metaconsola' into 'develop'
first load it does not show the data

See merge request artica/pandorafms!2112

Former-commit-id: 5f88566e4123c079956274ac4f7db27316e11718
2019-01-14 19:21:01 +01:00
fermin 24260cea34 Merge branch 'ent-2753-meter-profiler-en-el-docker' into 'develop'
Added profiller to docker

See merge request artica/pandorafms!1966

Former-commit-id: 24ade418bbc05cc6a40ee6f988b53eb648fffec5
2019-01-14 14:59:50 +01:00
alejandro-campos efa2e5332f fix massive custom event responses
Former-commit-id: 24db40167b05bfd7fe4de88060f03a7a0ec38e73
2019-01-14 13:40:49 +01:00
alejandro-campos 5a8e46d608 modify the way event responses are executed in event list
Former-commit-id: 14ef545eef10427d95f96484e8d6b8d9656bd53c
2019-01-14 12:10:43 +01:00
fermin 98c0bbec9a Merge branch 'ent-2570-6239-ldap-grupos-secundarios' into 'develop'
Ent 2570 6239 ldap grupos secundarios

See merge request artica/pandorafms!2110

Former-commit-id: f710fa17c372e5dde1401d5cafa47a3e4ac56711
2019-01-14 10:53:45 +01:00
artica ad9a316a47 Auto-updated build strings.
Former-commit-id: 3426e636c31a7a9dcea09e442811310a4956d6ce
2019-01-14 00:01:23 +01:00
artica 20a0aefe84 Auto-updated build strings.
Former-commit-id: aab4a872f690f104fe10dbdf7ef8ba86e02daef8
2019-01-13 00:01:23 +01:00
artica 5abf8e14ff Auto-updated build strings.
Former-commit-id: f78ab7f528f841aeda3dd7e28b1a2fcb34c9a05e
2019-01-12 00:01:24 +01:00
daniel 16ecc4efa3 Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
Former-commit-id: 069f3fb28862a06eba76132c5e31da24ecf54b05
2019-01-11 13:12:35 +01:00
enriquecd 5ead23014d Add traps, and other intracom API functions - #2978
Former-commit-id: 6f4029434a36030206def701df0d6e66995c6ca3
2019-01-11 12:33:22 +01:00
Enrique Camargo 1865cc954c Revert "Merge branch…"
This reverts merge request !1899

Former-commit-id: e19c3f43ff8a1a416e339f874d73299406d7e57a
2019-01-11 12:12:51 +01:00
enriquecd ae9b595edd Merge branch 'develop' into 2978-Functiones-API-traps-y-control-de-acceso-de-aplicacion-externa-Fix-de-código-pisado
Conflicts:
	pandora_console/include/functions_api.php


Former-commit-id: 5a5debe1ed66000fb8569ec589c84cad8e8dfe63
2019-01-11 12:04:50 +01:00
daniel 4e6cf0182a fixed error create modules network
Former-commit-id: 4be4cbd7e796680772faada72504ed751b91cc36
2019-01-11 12:01:48 +01:00
daniel b963395d01 fixed errors
Former-commit-id: 813a875e0f3d0dc3c1097ced987a5a45e8051046
2019-01-11 08:45:12 +01:00
artica ea34cc3b16 Auto-updated build strings.
Former-commit-id: 0d164597ba66950d16573ad8b618164c24b578d1
2019-01-11 00:01:25 +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
artica 00523128cf Auto-updated build strings.
Former-commit-id: ea896e01eeba9faf882c98c4dbaa788b58d46f7b
2019-01-10 00:01:25 +01:00
danielmaya 07dc9a0b84 first load it does not show the data
Former-commit-id: 417e37dfb7acd78f3fb9e379a62534ca611aa9b1
2019-01-09 12:27:22 +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
artica 344e5f1a6f Auto-updated build strings.
Former-commit-id: a2919ff8afe0b64b756cc60b01a3145a02c8606a
2019-01-09 00:01:23 +01:00
fermin831 f0c0a86533 LDAP no hierarchy groups on node functionallity
Former-commit-id: a9fe31be70e178e190c0d0bacf1dd6e27e71f03b
2019-01-08 16:42:23 +01:00
Alejandro Campos 6e90172b59 Merge branch '2919-Bug-en-la-ayuda-de-plugin-en-la-creacion-de-un-modulo-de-tipo-plugin' into 'develop'
fixed english and spanish version of plugin-in macros help dialog

See merge request artica/pandorafms!1895

Former-commit-id: daf5cfd2aabda3284139069d403a6c327eeb682e
2019-01-08 15:38:07 +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
fermin831 0445e212fe Added default_no_hierarchy to config global variable
Former-commit-id: 0daba928d7adc7a848bca04b04168d05a82ea609
2019-01-08 12:54:32 +01:00
Tatiana Llorente 669c74c3dd Merge branch '2838-Vista-detalle-módulo-en-tree-view' into 'develop'
Removed text for modules with images - #2838

See merge request artica/pandorafms!1945

Former-commit-id: f9e95e0bf3262b8783c6b48927522d12d1edc2bf
2019-01-08 12:18:36 +01:00
Tatiana Llorente 7300f83552 Merge branch '2955-Group-view-cuenta-módulos-de-agentes-deshabilitados' into 'develop'
Added disabled field in sql query - #2955

See merge request artica/pandorafms!1893

Former-commit-id: 2eaba1884722b5294698620f9ca0464b12c7bd33
2019-01-08 12:17:09 +01:00
Tatiana Llorente 0cb7aa3d0e Merge branch '3047-Error-en-etiqueta-en-gráficas-horizontales' into 'develop'
Changed the font styles of the labels - #3047

See merge request artica/pandorafms!1982

Former-commit-id: 48a5230053344368f5858192e6eb3a4d7c42c830
2019-01-08 12:15:05 +01:00
alejandro-campos 752186cfba conflict solved
Former-commit-id: 1f523d736b97c48ecfb9b39598c529e601702775
2019-01-08 11:59:50 +01:00
artica 02b497c250 Auto-updated build strings.
Former-commit-id: 32c035216be628177ecd430d3c875e3dd504dccc
2019-01-08 00:01:27 +01:00
artica dd922c41fc Auto-updated build strings.
Former-commit-id: bb71b724086140b69a1314f914508cdbd2fc7776
2019-01-07 00:01:28 +01:00
artica 48f1196400 Auto-updated build strings.
Former-commit-id: 17e276d76c3ee7afa9866f8268d6dcb120485a0b
2019-01-06 00:02:00 +01:00
artica cf1d28cf8b Auto-updated build strings.
Former-commit-id: ed5de54f4a19cf94fad2d6978c0229928edcec6e
2019-01-05 00:01:24 +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
artica cfdde23d96 Auto-updated build strings.
Former-commit-id: 051d9c9f6f96c740c40cf8afc900125ab5ec80e9
2019-01-04 00:01:27 +01:00
Samuel Carcases 05cc3d0538 Merge branch '3125_Fallo_en_calendario_Begin_Date_en_el_filtro_de_las_combined_graph' into 'develop'
Fixed calendar in combined graphs

See merge request artica/pandorafms!2005

Former-commit-id: a7df2231f2c3b6e94b9d3273c99112f07c258441
2019-01-03 16:41:21 +01:00
samucarc 5ecc9276e0 Merge branch 'develop' into 2523-APIListar,-crear,-borrar-y-modificar-Usuarios-desde-la-API-#6167-EUComm
# Conflicts:
#	pandora_console/include/functions_api.php


Former-commit-id: 6ba5a8f0fd2d02daca0d05e08b27981c7137f0bc
2019-01-03 16:25:40 +01:00
fbsanchez 361b85efb8 Merge branch 'ent-3332-fallo-al-filtrar-por-grupos-en-prediction-module' into 'develop'
Fixed agents_get_group_agents while trying to get agent list from target group

See merge request artica/pandorafms!2107

Former-commit-id: 5c036aa603fbd341617b065dfa6bb870f652775e
2019-01-03 14:34:26 +01:00
Kike 133a5dc13e Merge remote-tracking branch 'origin/develop' into pandora_enterprise#2987
Conflicts:
	pandora_console/include/functions_events.php


Former-commit-id: 2c85907168c27c3707955668209ae5df2af4f4a7
2019-01-03 13:10:10 +01:00
artica d114a77151 Auto-updated build strings.
Former-commit-id: c0c7f09435de019d1dc0057f48f4e5fd964fb3da
2019-01-03 00:01:25 +01:00
daniel 17b2ff2819 Merge branch '3254-error_al_pasar_pandoradb_migrate_6_to_7' into 'develop'
fixed error migratesql

See merge request artica/pandorafms!2095

Former-commit-id: 672aed5f3493d7981398af0062a76c9255c0a87a
2019-01-02 11:50:32 +01:00
artica 5c16c08d59 Auto-updated build strings.
Former-commit-id: 1ce399660dc1fddf4ac163fdd4b7657cef8b6594
2019-01-02 00:01:25 +01:00
artica ff9f6549d4 Auto-updated build strings.
Former-commit-id: 9cd8d22d6cab6e4edaad7c4b184ec4bb4995b54f
2019-01-01 00:01:24 +01:00
artica 5139308723 Auto-updated build strings.
Former-commit-id: c78a0fd88b9100d3865413eb017d4dc0d8816b4c
2018-12-31 11:24:46 +01:00
artica 4356a8ce8e Auto-updated build strings.
Former-commit-id: 2971785cc199543f9d8e0e7fed646ec7aabd29d9
2018-12-31 00:01:23 +01:00
artica 5e8b4b4500 Auto-updated build strings.
Former-commit-id: f8005483f902558687e92a128c3c138d1323b141
2018-12-30 00:01:22 +01:00
artica 60617def24 Auto-updated build strings.
Former-commit-id: 5f0ff76fb4c03a0177dd9bb4b66609229cfec0b6
2018-12-29 00:01:35 +01:00
daniel ed30441f86 fixed error migrate 6 to 7
Former-commit-id: 117cd6b7b16e0b8cf0c69f50e87665732e241690
2018-12-28 13:42:40 +01:00
fbsanchez 0686982055 Fixed agents_get_group_agents while trying to get agent list from target group
Former-commit-id: 8a005e1574760688f5823cc854a287774c8c828b
2018-12-28 13:09:37 +01:00
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
fbsanchez 2260e8d82a Merge branch 'ent-3326-7195-no-se-pueden-eliminar-elementos-de-modulo-sintetico-aritmetico' into 'develop'
minor fix in control messages format and processing

See merge request artica/pandorafms!2105

Former-commit-id: cc9453bfcf71cf47c8571ba338c84a5f87f0e70b
2018-12-28 11:48:56 +01:00
artica fcfd68f102 Auto-updated build strings.
Former-commit-id: 9885d1113e1e998bdb8c1d93d636c33f3dcc43c1
2018-12-28 00:01:26 +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 a789b3350e fixed minor error pie chart
Former-commit-id: e335f96e7538f939c2fd20137c19c354125f0edb
2018-12-27 10:35:31 +01:00
daniel c0869b3c9e fixed error module editor
Former-commit-id: cf2c9325c84448222743830759bb4e2716745f75
2018-12-27 10:29:12 +01:00
artica 2043546c52 Auto-updated build strings.
Former-commit-id: 58052cc9973e0315e5a3b470d0514a2fcff3d418
2018-12-27 00:01:25 +01:00
fbsanchez 4229be94bf Merge remote-tracking branch 'origin/develop' into 2952_Mejora_en_wizard_para_crear_agentes_desde_la_metaconsola
Former-commit-id: f6f1fd106a21820cc3f9f93e11fd0f5907986cd8
2018-12-26 17:51:11 +01:00
artica 5377cf6039 Auto-updated build strings.
Former-commit-id: fec5c338a7ebb5e8c86ba8cab22102dde9945978
2018-12-26 00:01:25 +01:00
artica 34502da313 Auto-updated build strings.
Former-commit-id: 4bd0f17766d00bdbc9761346e7f13d1959df61e8
2018-12-25 00:01:28 +01:00
daniel ee7ff52a04 fixed error widgets wux
Former-commit-id: 149cfea6dc0d427b57f05594214374d220111031
2018-12-24 14:25:19 +01:00
daniel 7de36e1631 Merge branch '3257-No_se_ven_graficas_en_plantillas_de_informes_de_availability_SLA' into 'develop'
fixed error template availability

See merge request artica/pandorafms!2086

Former-commit-id: 94d91ceb98a78fc09a3d6af4e26baeba12343901
2018-12-24 09:23:35 +01:00
daniel 7e2fb25e27 fixed errors in massive operation edit modules
Former-commit-id: 2d2fa21660369607e6c206d269b12d2041f74a1a
2018-12-24 08:59:23 +01:00
artica 86b1a3e424 Auto-updated build strings.
Former-commit-id: ea35f14b67818e50e90f81c0f4daea2c77fdaeae
2018-12-24 00:01:23 +01:00
artica c5d4f395f2 Auto-updated build strings.
Former-commit-id: ab48062df957894db4ac37d0bc209c75eb12512a
2018-12-23 00:01:25 +01:00
artica cba18381bd Auto-updated build strings.
Former-commit-id: 32fc309340e7c464585f9ab5a459e40938176ce5
2018-12-22 00:01:28 +01:00
vgilc b0b7e812f3 Merge branch '2315_Redireccion_consola_visual_Meta' into 'develop'
Fixed link in static graph

See merge request artica/pandorafms!1957

Former-commit-id: 5e68fabf271505484c336300cb5bffe8fb01fc9c
2018-12-21 11:36:50 +01:00
vgilc 74f4c58693 Merge branch '2584_Visual_en_Mapas_GIS' into 'develop'
Fixed minor visual error in GIS Map

See merge request artica/pandorafms!1971

Former-commit-id: 6cdaa62ad743a06e6e7f2d0e4026a04f953fcb16
2018-12-21 10:33:17 +01:00
vgilc 9d557ced84 Merge branch '2855-Buscador-en-la-vista-de-modulo-de-grupos' into 'develop'
implemented search filters for module group and agent group in module groups view

See merge request artica/pandorafms!1956

Former-commit-id: 622169f4682d7197e6551e96568f6ff17f313f08
2018-12-21 10:32:45 +01:00
vgilc dd0165fe89 Merge branch '3042-Punto-de-inyeccion-sql' into 'develop'
avoid sql injection in visual_map_get_user_layouts function

See merge request artica/pandorafms!1951

Former-commit-id: cd680e3a3df45f6f54c6c2f25d118f97f30b8b81
2018-12-21 10:29:31 +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 2d00336682 Merge branch '3114_Error_en_reportes_de_tipo_ITIL_y_tipo_Modulo' into 'develop'
Fixed function report_value in reports

See merge request artica/pandorafms!1998

Former-commit-id: 6456c469f1e94ccaf49a0272f0f76e30b0ee6f0f
2018-12-21 10:28:52 +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 b9fd907933 Merge branch '2992-Realtime-Graph-decimales' into 'develop'
Implemented limitation decimals in y-axis realtime graphs

See merge request artica/pandorafms!1941

Former-commit-id: 0ca73da98323fa3880cccd96d12150228ce2dead
2018-12-21 10:25:57 +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 33f014695d Merge branch '3057-Agregar-token-barras-desplazamiento-en-vista-datos-de-modulo' into 'develop'
Fixed overflow in module data view

See merge request artica/pandorafms!1967

Former-commit-id: bfcf0c9c08953e1fa49e8731db808bc78ecc826b
2018-12-21 10:23:29 +01:00
vgilc 411c815f19 Merge branch '3096-Error-exportar-a-CSV-en-Graph-Container' into 'develop'
Removed unnecessary loop - #3096

See merge request artica/pandorafms!1992

Former-commit-id: 0708e60e64cd10bc27e3841f718fa64d8513b97c
2018-12-21 10:23:09 +01:00
vgilc 4f43396d81 Merge branch '3151-Fallo-jquery-en-consola-mobile' into 'develop'
fixed bug: pie graph not showing in mobile's tactical view dashboard widget

See merge request artica/pandorafms!2027

Former-commit-id: d3a814853a43ea8c6c5c621893a4eaaac3e7d401
2018-12-21 10:22:41 +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
vgilc 8c38ab63da Merge branch '3269-Errores_informe_availability_graph' into 'develop'
fixed errors in availability reports

See merge request artica/pandorafms!2088

Former-commit-id: 9497860a73fe05a656cc19423af8d9dce3f60d53
2018-12-21 10:18:24 +01:00
vgilc 8e4e4d8559 Merge branch '1440-Exportar-informes-pdf-en-formato-apaisado' into 'develop'
added new field in treport table

See merge request artica/pandorafms!1927

Former-commit-id: aeae9fa575683cb2df29ceb3e8cfd346fd475a98
2018-12-21 10:17:24 +01:00
artica 2d08c75bae Auto-updated build strings.
Former-commit-id: c0f17d266dcf7dc801aa210e5a90cd16b6090145
2018-12-21 00:01:27 +01:00
fermin831 9531065dbe Merge branch 'develop' into ent-2753-meter-profiler-en-el-docker
Former-commit-id: da01f6f0f7f223755a6c2a72cadafac075b6a3c0
2018-12-20 18:17:57 +01:00
alejandro-campos 5c0f85a4bb fix bug when searching non existing agent group in module groups view 2018-12-20 15:37:00 +01:00
manuel.montes ac4d420173 Added hint to url address input
Former-commit-id: 5c51058ff8aea2e821bbb294034a538f040c46be
2018-12-20 13:08:46 +01:00
artica 8c20c93806 Auto-updated build strings.
Former-commit-id: e8875f49f492708eca311bb984fe05fc9e766ea7
2018-12-20 00:01:29 +01:00
samucarc 5c4ad3e845 Merge branch 'develop' into 3114_Error_en_reportes_de_tipo_ITIL_y_tipo_Modulo
Conflicts:
	pandora_console/include/functions_reporting.php

Former-commit-id: b379a4c9d87c3dc7404ccde8ee9a279138f73e3b
2018-12-19 19:45:11 +01:00
alejandro-campos a1ba6fdf07 Merge branch 'develop' into 1440-Exportar-informes-pdf-en-formato-apaisado
Former-commit-id: ec3448cc0059fbf95e5ada224ca0f9082f6d693c
2018-12-19 19:15:43 +01:00
artica 8a6033e002 Auto-updated build strings.
Former-commit-id: deb6afebc4c6aa5a75442e984da3f173283f21e1
2018-12-19 00:02:06 +01:00
daniel 73d429ff67 fixed error migratesql
Former-commit-id: dba8e3108d2160f51aee058735a7822fd722dddb
2018-12-18 12:52:40 +01:00
alejandro-campos ccb4778217 implemented api functions to create/update/delete/list event filters
Former-commit-id: f6b5c092622d74dee4fd587f259e6c286cd9c180
2018-12-17 18:18:17 +01:00
samucarc a9d3d81757 Fixed api function
Former-commit-id: 9b376941609b04ac13da551e8253d5ed5a8085dc
2018-12-17 17:56:01 +01:00
samucarc 58289e73bc Added new functionality for CLI to delete policy agents.
Former-commit-id: 753f9c47d2a4ffe8e5eb599dbd41d5b851500164
2018-12-17 17:51:30 +01:00
fbsanchez 6d69ffc955 force suse spec to php7
Former-commit-id: 90f4142b7b1a95f8230ccba50fa4a914dc0ef55c
2018-12-17 17:20:33 +01:00
tatiana.llorente@artica.es 814c89a9a9 Removed if localhost - #3276
Former-commit-id: 67de83efe6a6c7aa4458beb226091df0d6ec21e7
2018-12-17 14:48:16 +01:00
daniel 225635a774 fixed errors in availability reports
Former-commit-id: 0783d9b68bf5f3373579db9f0b09e7506d95ea84
2018-12-17 13:20:57 +01:00
danielmaya b530447474 Added token metaconsole_deploy_inventory_plugin in functions_config
Former-commit-id: 9d819bb43ba4ce7869480411ae6f6cb9f1edbcce
2018-12-17 12:09:05 +01:00
daniel 84a0f227b9 fixed error template availability
Former-commit-id: 249e476d8fa4394fda0cf5df01b7b14dca8d2bea
2018-12-17 11:24:44 +01:00
artica 7f9ee21b4b Auto-updated build strings.
Former-commit-id: 95dbb73cfdfe00b7123c380c2ce5803bdd2aa754
2018-12-17 00:01:27 +01:00
artica e1bce89923 Auto-updated build strings.
Former-commit-id: a06da6638acbded07658431115057953bdcf417c
2018-12-16 00:01:25 +01:00
artica 7af8f01b59 Auto-updated build strings.
Former-commit-id: 67927d3968e9d40047b1a55468ea138c768abc3d
2018-12-15 00:01:28 +01:00
samucarc 632d67095b List alert actions in nodes with CLI and API
Former-commit-id: 11e9a8137a2a37b081fcbac2ee50cac27c2c208b
2018-12-14 17:20:46 +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
artica b26d13db54 Auto-updated build strings.
Former-commit-id: d07fdc3ff61ce6a947f38d250f6714124fe127d1
2018-12-14 00:01:32 +01:00
daniel b06790cc1a Merge remote-tracking branch 'origin/develop' into 3177-Send_custom_report
Former-commit-id: 3bb953eb2b06d3c827093a0648c722c5281d73d5
2018-12-13 17:24:10 +01:00
daniel 807f7a0b74 fixed minor error
Former-commit-id: e855d814160365c0b6f53d15ea40b3c1bed16890
2018-12-13 17:24:01 +01:00
Alejandro Gallardo Escobar d76612b247 Minor fix
Former-commit-id: 80d3a5ae66a68ea249d4afe571862b01bc71db78
2018-12-13 17:11:38 +01:00
Alejandro Gallardo Escobar d8285c0ca2 Added a pending translation
Former-commit-id: 6272217de4eb47fe70eac214bf50b34da6aa20bb
2018-12-13 16:49:31 +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
vgilc 08c8971434 Merge branch '2658_Operaciones_masicas_sobre_politicas_3_open' into 'develop'
Fixed

See merge request artica/pandorafms!2081

Former-commit-id: ef9889af2975b98bde83d84217ccccab1d458af0
2018-12-13 15:19:25 +01:00
samucarc 6b940d07d5 Fixed
Former-commit-id: b22637cf04af8b09c8b274aa0f5a8d2f66e13f7c
2018-12-13 13:25:37 +01:00
daniel a76895f20e fixed error metaconsole template send template
Former-commit-id: 2b92b353a4811d6aec22e2a61c128cc24b01ba14
2018-12-13 12:47:22 +01:00
artica 3d24bc264e Updated version and build strings.
Former-commit-id: 2b99b30300329eb7f0a172f811fcfda8df1ab799
2018-12-13 11:14:24 +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
artica 0648bf169c Auto-updated build strings.
Former-commit-id: 77ac42e4d60650cc3fad6bc95333ac37f011aec3
2018-12-13 00:01:36 +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
daniel 07f5455e28 fixed errors in cron jobs
Former-commit-id: 6926e6cca21cb43d4c08ed0c4c48ae344abe8fab
2018-12-12 10:46:28 +01:00
Alejandro Gallardo Escobar 5d52e9f9c3 Minor fix
Former-commit-id: e9827e1294a995fc13deb42d701ea103cf9ad1da
2018-12-12 09:41:52 +01:00
vgilc ead4c71f1c Merge branch '3056-Error-en-templates-wizard-de-informes-en-meta-return-dev' into 'develop'
Fixed custom graph

See merge request artica/pandorafms!2073

Former-commit-id: ec91783c18c5dc5d6c41476fb55d8e7909efb51a
2018-12-12 09:28:50 +01:00
Alejandro Gallardo Escobar 739f0d2690 Minor change
Former-commit-id: c16c3356b38cf933403c5fe09c2d11a8d44cd53a
2018-12-12 09:25:09 +01:00
artica 266b12f40a Auto-updated build strings.
Former-commit-id: 7fa7204ba6df07db86506062742d09fb14fe3b22
2018-12-12 00:01:31 +01:00
danielmaya f6858e2681 Fixed custom graph
Former-commit-id: a04d267f990d4628e8b0fc263066c44c3dc4febb
2018-12-11 19:21:43 +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
vgilc 328013140c Merge branch 'ent-2531-6174-recursividad-en-los-grupos-para-lanzar-alertas-de-eventos-2' into 'develop'
Added group_recursion as tevent_rule column

See merge request artica/pandorafms!2071

Former-commit-id: 8486d9250866bf44a140ef0b2ae664d19d6d3a6f
2018-12-11 17:53:38 +01:00
samucarc 8088a51035 Fixed audit log
Former-commit-id: a78fb3fb377814a6e664fd66606cd293c8af5df3
2018-12-11 17:17:46 +01:00
fermin831 386eeec7ef Added group_recursion as tevent_rule column
Former-commit-id: fe86489eec11dd38627b8a72b9855e6675507281
2018-12-11 16:07:13 +01:00
samucarc 7f99a8f9f4 List and synchronize group of modules of the meta console with CLI
Former-commit-id: 2fc699ee17ac08fe2d60746c0a3d8859a5083f7a
2018-12-11 14:43:27 +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
daniel 0fd61cb31e Merge remote-tracking branch 'origin/develop' into 3170-Cambios_custom_fields_view
Former-commit-id: eeb7679e966ce7ed9e1dfe925d64dbbe21a2a752
2018-12-11 10:00:23 +01:00
daniel c72d0dd0d4 fixed error status agent in custom field view
Former-commit-id: 3516b02e27b28c856b665bc896d076867827f85a
2018-12-11 10:00:05 +01:00
vgilc 3914256352 Merge branch 'ent-2520-api-listar-y-crear-repuestas-de-eventos-6165-eucomm-2' into 'develop'
Added forgotten include

See merge request artica/pandorafms!2064

Former-commit-id: fc3701c7da6effeea69ed28b887212f72d3cc809
2018-12-11 08:51:19 +01:00
artica 663c140b2b Auto-updated build strings.
Former-commit-id: 19c220a8e630e3f5f50e04862cc696be6f278f02
2018-12-11 00:01:27 +01:00
fermin831 562c5c14ee Added forgotten include
Former-commit-id: 78e7630eef24224f877998398c06c11ac864d261
2018-12-10 18:46:01 +01:00
danielmaya 50b1685e61 Added tagent_secondary_group in functions_reporting
Former-commit-id: ba4ac6e64e34810ae1f695840ba1af34bbcdc6c4
2018-12-10 17:34:18 +01:00
vgilc 79ce629b30 Merge branch '3228-Vulnerabilidad' into 'develop'
3228 vulnerabilidad

See merge request artica/pandorafms!2062

Former-commit-id: 10c836e36c74c39ce40af8b4cc8547ea81850898
2018-12-10 16:19:37 +01:00
samucarc 484d79d974 Fixed synch error
Former-commit-id: 9b370b64fd24302f76733ca84792d0a57418d688
2018-12-10 16:06:25 +01:00
samucarc 3a80a0467b synchronize group of modules from the meta console
Former-commit-id: 172cd23a0f0f2fa12ad4d37893cae6d22951ee54
2018-12-10 15:55:09 +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
vgilc fe749b31ed Merge branch '3153-Modificar-instalador-de-consola_2' into 'develop'
Fixed error in submit - #3153

See merge request artica/pandorafms!2061

Former-commit-id: e0c4d401748beba3ec8afc571e0f35c05c862638
2018-12-10 15:45:44 +01:00
tatiana.llorente@artica.es f98b3e2ea5 Fixed error in submit - #3153
Former-commit-id: a1c21457db7a4d4d6297fd0935b8beada7cde63c
2018-12-10 15:18:53 +01:00
danielmaya b9aa474eb3 Fixed sql error with empty array in agent view
Former-commit-id: 5a7655d97d28179793a9c029460837568f926128
2018-12-10 15:14:56 +01:00