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

Hide columns with useless information in perfdata table 

Hide columns that don't provide any useful information, to reduce the size of the perfdata table.

refs #8334
This commit is contained in:
Matthias Jentsch 2015-06-02 16:06:26 +02:00
parent a5c3782de7
commit 8e35bb446a
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
modules/monitoring/application/views/helpers/Perfdata.php
View File

@ -20,9 +20,10 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
{
$pieChartData = PerfdataSet::fromString($perfdataStr)->asArray();
$results = array();
$keys = array('', 'label', 'value', 'min', 'max', 'warn', 'crit');
$columns = array();
$labels = array_combine(
array('', 'label', 'value', 'min', 'max', 'warn', 'crit'),
$keys,
array(
'',
$this->view->translate('Label'),
@ -37,15 +38,23 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
if ($perfdata->isVisualizable()) {
$columns[''] = '';
}
}
foreach ($pieChartData as $perfdata) {
foreach ($perfdata->toArray() as $column => $value) {
if (! empty($value)) {
$columns[$column] = $labels[$column];
if (empty($value) ||
$column === 'min' && floatval($value) === 0.0 ||
$column === 'max' && $perfdata->isPercentage() && floatval($value) === 100) {
continue;
}
$columns[$column] = $labels[$column];
}
}
$table = array('<td><b>' . implode('</b></td><td><b>', $columns) . '<b></td>');
// restore original column array sorting sorting
$headers = array();
foreach ($keys as $i => $column) {
if (isset($columns[$column])) {
$headers[$column] = $labels[$column];
}
}
$table = array('<td><b>' . implode('</b></td><td><b>', $headers) . '<b></td>');
foreach ($pieChartData as $perfdata) {
if ($compact && $perfdata->isVisualizable()) {
$results[] = $perfdata->asInlinePie($color)->render();