Merge branch 'master' into feature/user-and-group-management-8826

Icinga · May 13, 2015 · aa466ae · aa466ae
2 parents a9f0fd0 + 9e3d65e
commit aa466ae
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/library/Icinga/Web/Controller.php b/library/Icinga/Web/Controller.php
@@ -7,6 +7,7 @@
 use Icinga\Web\Controller\ModuleActionController;
 use Icinga\Web\Widget\SortBox;
 use Icinga\Web\Widget\Limiter;
+use Icinga\Data\Sortable;
 
 /**
  * This is the controller all modules should inherit from

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
@@ -370,7 +370,11 @@ private function initializeForPostgres()
                 if ($count > 0) {
                     $this->columnsWithoutCollation[] = $this->getMappedField($key);
                 }
-                $value = preg_replace('/inet_aton\(([[:word:].]+)\)/i', '$1::inet - \'0.0.0.0\'', $value);
+                $value = preg_replace(
+                    '/inet_aton\(([[:word:].]+)\)/i',
+                    '(CASE WHEN $1 ~ \'(?:[0-9]{1,3}\\\\.){3}[0-9]{1,3}\' THEN $1::inet - \'0.0.0.0\' ELSE NULL END)',
+                    $value
+                );
                 $value = preg_replace(
                     '/UNIX_TIMESTAMP(\((?>[^()]|(?-1))*\))/i',
                     'CASE WHEN ($1 < \'1970-01-03 00:00:00+00\'::timestamp with time zone) THEN 0 ELSE UNIX_TIMESTAMP($1) END',

diff --git a/modules/monitoring/library/Monitoring/Plugin/PerfdataSet.php b/modules/monitoring/library/Monitoring/Plugin/PerfdataSet.php
@@ -83,7 +83,7 @@ protected function parse()
             $label = trim($this->readLabel());
             $value = trim($this->readUntil(' '));
 
-            if ($label && $value) {
+            if ($label) {
                 $this->perfdata[] = new Perfdata($label, $value);
             }
         }