Merge remote-tracking branch 'origin/develop' into ent-4231-crear-plugin-para-google-cloud-y-anadirlo-a-discovery

This commit is contained in:
fbsanchez 2020-09-22 16:56:11 +02:00
commit 4ceeb61c87
4 changed files with 17 additions and 7 deletions

View File

@ -379,7 +379,7 @@ function get_name_xml_resource($hook_enterprise)
break; break;
} }
$file = $name.'.ptr'; $file = io_safe_output($name).'.ptr';
return $file; return $file;
} }

View File

@ -1,4 +1,5 @@
<?php <?php
$stacked = db_get_sql('select stacked from tgraph where id_graph = '.$_GET['data']); $data = (int) get_parameter('data');
$num_items = db_get_sql('select count(*) from tgraph_source where id_graph = '.$_GET['data']); $stacked = db_get_sql('select stacked from tgraph where id_graph = '.$data);
$num_items = db_get_sql('select count(*) from tgraph_source where id_graph = '.$data);
echo "$stacked,$num_items"; echo "$stacked,$num_items";

View File

@ -135,7 +135,7 @@ if (is_ajax()) {
} }
if ($search != '') { if ($search != '') {
$filter['string'] = $search; $filter['aliasRegex'] = $search;
} }
if ($status_agents != AGENT_STATUS_ALL) { if ($status_agents != AGENT_STATUS_ALL) {
@ -170,6 +170,15 @@ if (is_ajax()) {
$force_serialized $force_serialized
); );
$agents_aux = [];
foreach ($agents as $key => $value) {
if (preg_match('/'.$search.'/', io_safe_output($value))) {
$agents_aux[$key] = $value;
}
}
$agents = $agents_aux;
$agents_disabled = []; $agents_disabled = [];
// Add keys prefix. // Add keys prefix.
if ($keys_prefix !== '') { if ($keys_prefix !== '') {

View File

@ -283,7 +283,7 @@ class Diagnostics extends Wizard
$return .= '</div>'; $return .= '</div>';
} }
return $return; return false;
} }
@ -1596,7 +1596,7 @@ class Diagnostics extends Wizard
} }
} }
return $result; return true;
} }
@ -1882,7 +1882,7 @@ class Diagnostics extends Wizard
$inputs = []; $inputs = [];
$inputs[] = [ $inputs[] = [
'label' => __('What happened').'?', 'label' => __('What happened?'),
'id' => 'div-what-happened', 'id' => 'div-what-happened',
'class' => 'flex-row', 'class' => 'flex-row',
'arguments' => [ 'arguments' => [