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
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
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
ac228a7fad
fixed error in massive operation
...
Former-commit-id: 691f3557d44c686645cfa634eab3630d060def33
2018-12-28 12:14:17 +01:00
fc5d3170b5
fixed warn/err messages in module_manager_editor
...
Former-commit-id: d3a30dd591470a177709b60d82041b8c21f4cce1
2018-12-28 11:57:16 +01:00
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
5b7f796510
Changed popup windows by tooltips
...
Former-commit-id: 478e63e4bf81bb663898bba1afa76c7ab02ac6d9
2018-12-28 11:45:48 +01:00
c6b9122cfc
minor fix in control messages format and processing
...
Former-commit-id: bda61b3e6d6ef74090c215f9aa9d2f3db42456bd
2018-12-27 19:16:56 +01:00
6d8b73f72e
fix minor error module editor network
...
Former-commit-id: c0f2c03b441f939b842303186ecdf2ace5c253b6
2018-12-27 12:40:47 +01:00
c0869b3c9e
fixed error module editor
...
Former-commit-id: cf2c9325c84448222743830759bb4e2716745f75
2018-12-27 10:29:12 +01:00
7e2fb25e27
fixed errors in massive operation edit modules
...
Former-commit-id: 2d2fa21660369607e6c206d269b12d2041f74a1a
2018-12-24 08:59:23 +01:00
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
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
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
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
ac4d420173
Added hint to url address input
...
Former-commit-id: 5c51058ff8aea2e821bbb294034a538f040c46be
2018-12-20 13:08:46 +01:00
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
d76612b247
Minor fix
...
Former-commit-id: 80d3a5ae66a68ea249d4afe571862b01bc71db78
2018-12-13 17:11:38 +01:00
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
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
6b940d07d5
Fixed
...
Former-commit-id: b22637cf04af8b09c8b274aa0f5a8d2f66e13f7c
2018-12-13 13:25:37 +01:00
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
eab744f65d
Fixed minor error
...
Former-commit-id: 2af6e231aa20216a4601a8c1a03fa6828c989448
2018-12-12 20:26:38 +01:00
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
358532c4a8
fixed autocombined report metaconsole
...
Former-commit-id: f277a1302c0b84ca0417693673ca3da0a4956f6c
2018-12-12 16:13:31 +01:00
5d52e9f9c3
Minor fix
...
Former-commit-id: e9827e1294a995fc13deb42d701ea103cf9ad1da
2018-12-12 09:41:52 +01:00
47a547367d
Added a new item to the visual console
...
Former-commit-id: 6dcb8c9500e12932775d929646f7fdc676ee94fa
2018-12-11 19:14:14 +01:00
8088a51035
Fixed audit log
...
Former-commit-id: a78fb3fb377814a6e664fd66606cd293c8af5df3
2018-12-11 17:17:46 +01:00
e3243883f0
Fixed static graph without images creation and update previsualization
...
Former-commit-id: a3a0a7942f624d9ecb2a272560a57947be4b39a1
2018-12-11 13:56:48 +01:00
562c5c14ee
Added forgotten include
...
Former-commit-id: 78e7630eef24224f877998398c06c11ac864d261
2018-12-10 18:46:01 +01:00
4d5631d355
add safe output function to strings printed in system audit log
...
Former-commit-id: 383b5885f163d167c8944ad6dc8d66a8b4c35e51
2018-12-10 15:47:25 +01:00
a2909db631
Revert "Eliminadas entidades html de vista de auditoria"
...
This reverts commit 530017a79d
2018-12-10 13:42:29 +01:00
dd1fb00e19
Revert "Removed html entities in the audit views"
...
This reverts commit ad7610d7f1
2018-12-10 13:40:37 +01:00
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
94c6144653
Changed funciton size by length in jquery - #2893
2018-12-04 15:08:17 +01:00
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
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
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
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
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
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
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
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
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
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
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
9bdd1af488
fixed errors in visual console
2018-11-29 13:24:12 +01:00
d48c228855
fixed label not showing on page reload in visual console's percentile item
2018-11-27 15:25:16 +01:00
1b78c1a78d
fixed error log js and warning php visual style
2018-11-23 09:21:22 +01:00
9a8197ea1e
fix duplicated table in active-passive cluster's alert builder
2018-11-22 13:03:41 +01:00
a3aa84bf92
fixed errors in session with send mail alerts graph API
2018-11-21 15:16:52 +01:00
494b858a20
fixed errors session_start
2018-11-21 13:08:58 +01:00
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
8735e6e1a3
Added a translation
2018-11-20 11:18:57 +01:00
8bd99e6c82
Removed Web Analysis and Log4x from data server module
2018-11-16 13:28:16 +01:00
449c02763a
fixed minor error cfv
2018-11-16 13:22:10 +01:00
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
a1846a6e22
removed hide not init modules from sla and availability report
2018-11-15 12:00:25 +01:00
6174e622c8
create alert php7
2018-11-14 18:15:48 +01:00
60212dae50
fixed errors cv
2018-11-14 16:38:44 +01:00
22a26aa072
fixed error upgrade jquery
2018-11-14 11:40:01 +01:00
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
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
ac671d041c
Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields
2018-11-13 15:47:07 +01:00
4dbcecb951
WIP custom fields view
2018-11-13 15:46:44 +01:00
c5a0065cba
decoded entities when retrieving module name in case SNMP module name is updated
2018-11-13 11:50:46 +01:00
5420da9f23
fixed error message
2018-11-13 09:36:20 +01:00
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
75ad60a071
removed Assigned node field from admin global profile when creating user from metaconsole
2018-11-12 15:57:18 +01:00
afaa6ad2ba
Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields
2018-11-12 09:07:56 +01:00
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
1d8a746329
Removed the adjustment of dimensions in custom graph
2018-11-08 09:49:36 +01:00
5c99a8138f
fixed minor error
2018-11-07 17:16:25 +01:00
c131c631d4
Fixed bug in visual styles configuration
2018-11-07 16:34:09 +01:00
3f78f15499
WIP View custom fields data
2018-11-07 13:28:00 +01:00
45b757b5db
Fixed bug in SNMP Wizard
2018-11-05 14:17:43 +01:00
0f3717a268
Be able to change the subject and body of the report message when necessary
2018-11-02 12:57:52 +01:00
c4eeb3cc76
fixed error edit modules in massive operation php7 error select
2018-11-02 10:18:33 +01:00
f2b1c99013
fixed minor error cluster name by alias
2018-11-02 09:56:31 +01:00
78a1c72eac
fixed warnings php7
2018-10-30 17:38:46 +01:00
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
0978be9b51
fixed errors php7
2018-10-30 14:43:27 +01:00
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
294553941d
Fixed add button on alerts
2018-10-29 16:41:55 +01:00
c7a624000e
Added API function set delete_user_profile_info
2018-10-29 13:34:30 +01:00
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
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
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
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
f831e59ac3
Added documentation and minor fixes related with API event responses functions
2018-10-25 15:42:45 +02:00
1bd492307a
Added set update_event_response to API
2018-10-25 15:25:27 +02:00
6b93cba119
Added set create_event_response to API
2018-10-25 15:03:07 +02:00
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
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
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
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
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
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
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
c0afbf0b6f
Added get event_responses to API
2018-10-25 11:49:39 +02:00
Alejandro Campos
Tatiana Llorente
Samuel Carcases
daniel
fbsanchez
manuel.montes
vgilc
Alejandro Gallardo Escobar
samucarc
fermin831