tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-8062-Graficas-combinadas-en-CV-de-Meta-no-muestra-datos' into 'develop' 

Ent 8062 graficas combinadas en cv de meta no muestra datos

See merge request artica/pandorafms!4435
This commit is contained in:
Daniel Rodriguez 2021-10-01 12:32:20 +00:00
parent 2c7799d022 574098e4ee
commit 31bc3c2747
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pandora_console/include/functions_graph.php
View File

@ -1416,14 +1416,6 @@ function graphic_combined_module(
$labels = [];
$modules = [];
foreach ($sources as $source) {
$id_agent = agents_get_module_id(
$source['id_agent_module']
);
if (!$id_agent) {
continue;
}
if (is_metaconsole() === true) {
metaconsole_restore_db();
$server = metaconsole_get_connection_by_id($source['id_server']);
@ -1432,6 +1424,14 @@ function graphic_combined_module(
}
}
$id_agent = agents_get_module_id(
$source['id_agent_module']
);
if (!$id_agent) {
continue;
}
$modulepush = [
'server' => (isset($source['id_server']) === true) ? $source['id_server'] : 0,
'module' => $source['id_agent_module'],

5
pandora_console/include/rest-api/models/VisualConsole/Items/ModuleGraph.php
View File

@ -612,6 +612,9 @@ final class ModuleGraph extends Item
// Custom graph.
$fields = self::getListCustomGraph();
$selected_custom_graph = (\is_metaconsole() === true)
? $values['customGraphId'].'|'.$values['metaconsoleId']
: $values['customGraphId'];
$inputs[] = [
'id' => 'MGcustomGraph',
'hidden' => $hiddenCustom,
@ -620,7 +623,7 @@ final class ModuleGraph extends Item
'type' => 'select',
'fields' => $fields,
'name' => 'customGraphId',
'selected' => $values['customGraphId'],
'selected' => $selected_custom_graph,
'return' => true,
'nothing' => __('None'),
'nothing_value' => 0,