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

monitoring: Respect whitespace characters in the plugin output in list views 

fixes #10786
This commit is contained in:
Eric Lippmann 2016-02-23 16:06:43 +01:00
parent 18e3884b8b
commit 35754fbe8e
4 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/monitoring/application/views/scripts/list/hosts.phtml
View File

@ -86,9 +86,7 @@ if (! $this->compact): ?>
<?php endif ?>
<span class="state-icons"><?= implode(' ', $this->hostFlags($host)) ?></span>
</div>
<p class="overview-plugin-output">
<?= $this->pluginOutput($this->ellipsis($host->host_output, 10000), true) ?>
</p>
<p class="overview-plugin-output"><?= $this->pluginOutput($this->ellipsis($host->host_output, 10000), true) ?></p>
</td>
<?php foreach($this->addColumns as $col): ?>
<td><?= $this->escape($host->$col) ?></td>

4
modules/monitoring/application/views/scripts/list/notifications.phtml
View File

@ -70,9 +70,7 @@ if (! $this->compact): ?>
</div>
<?php endif ?>
</div>
<p class="overview-plugin-output">
<?= $this->pluginOutput($this->ellipsis($notification->notification_output, 10000), true) ?>
</p>
<p class="overview-plugin-output"><?= $this->pluginOutput($this->ellipsis($notification->notification_output, 10000), true) ?></p>
</td>
</tr>
<?php endforeach ?>

4
modules/monitoring/application/views/scripts/list/services.phtml
View File

@ -90,9 +90,7 @@ if (! $this->compact): ?>
<div class="overview-performance-data">
<?= $this->perfdata($service->service_perfdata, true, 5) ?>
</div>
<p class="overview-plugin-output">
<?= $this->pluginOutput($this->ellipsis($service->service_output, 10000), true) ?>
</p>
<p class="overview-plugin-output"><?= $this->pluginOutput($this->ellipsis($service->service_output, 10000), true) ?></p>
</div>
</td>
<?php foreach($this->addColumns as $col): ?>

1
modules/monitoring/public/css/tables.less
View File

@ -77,6 +77,7 @@
font-family: @font-family-fixed;
font-size: @font-size-small;
margin: 0;
white-space: pre-wrap;
}
// Table for performance data in detail views