tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-09-25 19:09:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

new widget grouped meter graphs pandora_enterprise#8620

Browse Source
This commit is contained in:
Daniel Barbero 2022-10-06 09:41:31 +02:00
parent 7a3d892bd4
commit 54b44cc7fc
2 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pandora_console/include/lib/Dashboard/Widgets/GroupedMeterGraphs.php
View File

@ -41,6 +41,7 @@ class GroupedMeterGraphs extends Widget
private const STATUS_CRITICAL = 'critical'; private const STATUS_CRITICAL = 'critical';
private const STATUS_WARNING = 'warning'; private const STATUS_WARNING = 'warning';
private const RATIO_WITH_BOX = 20.1518; private const RATIO_WITH_BOX = 20.1518;
private const MAX_MODULES = 20;
/** /**
* Name widget. * Name widget.
@ -66,14 +67,14 @@ class GroupedMeterGraphs extends Widget
/** /**
* Class name widget. * Class name widget.
* *
* @var [type] * @var string
*/ */
protected $className; protected $className;
/** /**
* Values options for each widget. * Values options for each widget.
* *
* @var [type] * @var array
*/ */
protected $values; protected $values;
@ -534,7 +535,24 @@ class GroupedMeterGraphs extends Widget
); );
} }
if ($modules !== false && empty($modules) === false) { if ($modules !== false
&& empty($modules) === false
&& is_array($modules) === true
) {
if (count($modules) > self::MAX_MODULES) {
$output .= '<div class="container-center">';
$output .= \ui_print_info_message(
__(
'The maximum number of modules to display is %d, please reconfigure the widget.',
self::MAX_MODULES
),
'',
true
);
$output .= '</div>';
return $output;
}
$moduleData = array_map( $moduleData = array_map(
function ($module) { function ($module) {
return ($module['data'] ?? 0); return ($module['data'] ?? 0);
@ -657,7 +675,6 @@ class GroupedMeterGraphs extends Widget
$output .= '<div class="container-info-module-meter">'; $output .= '<div class="container-info-module-meter">';
// Module name. // Module name.
$output .= '<div class="container-info-module-meter-title">';
$name = ''; $name = '';
switch ($this->values['label']) { switch ($this->values['label']) {
case 'agent': case 'agent':
@ -674,6 +691,7 @@ class GroupedMeterGraphs extends Widget
break; break;
} }
$output .= '<div class="container-info-module-meter-title" title="'.$name.'">';
$output .= $name; $output .= $name;
$output .= '</div>'; $output .= '</div>';
@ -698,27 +716,29 @@ class GroupedMeterGraphs extends Widget
$class .= ' meter-data-'; $class .= ' meter-data-';
$class .= $this->getThresholdStatus($module_data); $class .= $this->getThresholdStatus($module_data);
$output .= '<div class="'.$class.'">'; $result_data = '';
if ($data['data'] !== null && $data['data'] !== '') { if ($data['data'] !== null && $data['data'] !== '') {
if (isset($this->values['formatData']) === true if (isset($this->values['formatData']) === true
&& (bool) $this->values['formatData'] === true && (bool) $this->values['formatData'] === true
) { ) {
$output .= format_for_graph( $result_data .= format_for_graph(
$data['data'], $data['data'],
$config['graph_precision'] $config['graph_precision']
); );
} else { } else {
$output .= sla_truncate( $result_data .= sla_truncate(
$data['data'], $data['data'],
$config['graph_precision'] $config['graph_precision']
); );
} }
$output .= ' '.$data['unit']; $result_data .= ' '.$data['unit'];
} else { } else {
$output .= '--'; $result_data .= '--';
} }
$output .= '<div class="'.$class.'" title="'.$result_data.'">';
$output .= $result_data;
$output .= '</div>'; $output .= '</div>';
$output .= '</div>'; $output .= '</div>';

1
pandora_console/include/styles/dashboards.css
View File

@ -683,7 +683,6 @@ form.modal-dashboard
justify-content: center; justify-content: center;
align-items: center; align-items: center;
width: 98%; width: 98%;
padding: 5px;
} }
.container-grouped-meter .container-info-module-meter { .container-grouped-meter .container-info-module-meter {
display: flex; display: flex;