From 35754fbe8ef03c2c5a86f153e5b8a98dba7d63ef Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 23 Feb 2016 16:06:43 +0100
Subject: [PATCH] monitoring: Respect whitespace characters in the plugin
 output in list views

fixes #10786
---
 modules/monitoring/application/views/scripts/list/hosts.phtml | 4 +---
 .../application/views/scripts/list/notifications.phtml        | 4 +---
 .../monitoring/application/views/scripts/list/services.phtml  | 4 +---
 modules/monitoring/public/css/tables.less                     | 1 +
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index 073ba0033..f5ff2569a 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -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>
diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml
index 18c029805..53d59474e 100644
--- a/modules/monitoring/application/views/scripts/list/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/list/notifications.phtml
@@ -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 ?>
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index 9086fe40e..211347f53 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -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): ?>
diff --git a/modules/monitoring/public/css/tables.less b/modules/monitoring/public/css/tables.less
index c3a5e00fc..7644f3297 100644
--- a/modules/monitoring/public/css/tables.less
+++ b/modules/monitoring/public/css/tables.less
@@ -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