diff --git a/pandora_console/extras/mr/6.sql b/pandora_console/extras/mr/6.sql index 5e459a2622..85362352a2 100644 --- a/pandora_console/extras/mr/6.sql +++ b/pandora_console/extras/mr/6.sql @@ -4,4 +4,6 @@ ALTER TABLE tagente MODIFY COLUMN cascade_protection_module int(10) unsigned NOT INSERT INTO tmodule VALUES (8, 'Wux module'); +INSERT INTO ttipo_modulo VALUES (25,'web_analysis', 8, 'Web analysis data', 'module-wux.png'); + COMMIT; diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php index 1bb9f03198..bd34c56503 100644 --- a/pandora_console/godmode/agentes/configurar_agente.php +++ b/pandora_console/godmode/agentes/configurar_agente.php @@ -541,7 +541,11 @@ if ($id_agente) { $help_header = 'plugins_tab'; break; case "module": + $type_module_t = (int) get_parameter ('moduletype', ''); $tab_description = '- '. __('Modules'); + if($type_module_t == 'webux'){ + $help_header = 'wux_console'; + } break; case "alert": $tab_description = '- ' . __('Alert'); diff --git a/pandora_console/godmode/agentes/module_manager_editor.php b/pandora_console/godmode/agentes/module_manager_editor.php index 462fa5471d..e2739aee29 100644 --- a/pandora_console/godmode/agentes/module_manager_editor.php +++ b/pandora_console/godmode/agentes/module_manager_editor.php @@ -576,6 +576,7 @@ var no_target_lang = ""; var no_oid_lang = ""; var no_prediction_module_lang = ""; var no_plugin_lang = ""; +var no_execute_test_from = "" $(document).ready (function () { configure_modules_form (); diff --git a/pandora_console/include/graphs/pandora.d3.js b/pandora_console/include/graphs/pandora.d3.js index 2f775d803a..95a914104f 100644 --- a/pandora_console/include/graphs/pandora.d3.js +++ b/pandora_console/include/graphs/pandora.d3.js @@ -1331,8 +1331,8 @@ function Gauge(placeholderName, configuration, font) function print_phases_donut (recipient, phases) { var svg = d3.select(recipient) .append("svg") - .attr("width", 700) - .attr("height", 330) + .attr("width", 800) + .attr("height", 400) .append("g"); svg.append("g") @@ -1360,6 +1360,8 @@ function print_phases_donut (recipient, phases) { .innerRadius(radius * 0.9) .outerRadius(radius * 0.9); + width = 800; + height = 400; svg.attr("transform", "translate(" + width / 2 + "," + height / 2 + ")"); var key = function(d){ return d.data.label; }; @@ -1426,8 +1428,8 @@ function print_phases_donut (recipient, phases) { .style("font-family", "Verdana") .style("font-size", "15px") .append("tspan") - .attr("dy", "1.4em") - .attr("dx", "-6em") + .attr("dy", "1.2em") + .attr("dx", "-2.8em") .text(function(d) { return d.data.label2 + "ms"; }) diff --git a/pandora_console/include/javascript/pandora_modules.js b/pandora_console/include/javascript/pandora_modules.js index d08810aca7..06b9f5485f 100644 --- a/pandora_console/include/javascript/pandora_modules.js +++ b/pandora_console/include/javascript/pandora_modules.js @@ -437,7 +437,15 @@ function configure_modules_form () { return false; } } - + + moduletype = $("#hidden-id_module_type").val (); + if (moduletype == 25) { + if ($("#custom_integer_1").val () == 0) { + $("#custom_integer_1").focus (); + $("#message").showMessage (no_execute_test_from); + return false; + } + } module = $("#id_module_type").attr ("value"); if (id_modules_icmp.in_array (module) || id_modules_tcp.in_array (module) || id_modules_snmp.in_array (module)) { diff --git a/pandora_console/operation/agentes/snapshot_view.php b/pandora_console/operation/agentes/snapshot_view.php index 1c986e25ed..302197bc17 100644 --- a/pandora_console/operation/agentes/snapshot_view.php +++ b/pandora_console/operation/agentes/snapshot_view.php @@ -69,7 +69,7 @@ $label = get_parameter ("label"); echo ""; $datos = io_safe_output($row["datos"]); if (is_image_data($datos)) { - echo '
image
'; + echo '
image
'; } else { $datos = preg_replace ('/