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

Livestatus\Query: start using new filter methods

This commit is contained in:
Thomas Gelf 2014-11-16 15:48:59 +01:00
parent 3b1b38a353
commit 578873f695
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
library/Icinga/Protocol/Livestatus/Query.php
View File

@ -17,6 +17,13 @@ use Exception;
class Query extends SimpleQuery
{
/**
* Columns that return arrays. Will be decoded.
*/
protected $arrayColumns = array(
'members' => true,
);
/**
* All available columns. To be overridden by specific query implementations
*/
@ -130,24 +137,16 @@ class Query extends SimpleQuery
$parts = array(
sprintf('GET %s', $this->table)
);
if ($this->count === false && $this->columns !== null) {
$parts[] = 'Columns: ' . implode(' ', $this->columns);
}
foreach ($this->filters as $key => $val) {
if ($key === 'search') {
$parts[] = 'Filter: host_name ~~ ' . $val;
$parts[] = 'Filter: description ~~ ' . $val;
$parts[] = 'Or: 2';
continue;
}
if ($val === null) {
$parts[] = 'Filter: ' . $key;
} elseif (strpos($key, '?') === false) {
$parts[] = sprintf('Filter: %s = %s', $key, $val);
} else {
$parts[] = sprintf('Filter: %s', str_replace('?', $val, $key));
}
// Fetch all required columns
$parts[] = $this->columnsToString();
// In case we need to apply a userspace filter as of Livestatus lacking
// support for some of them we also need to fetch all filtered columns
if ($this->filterIsSupported() && $filter = $this->filterToString()) {
$parts[] = $filter;
}
if ($this->count === true) {
$parts[] = 'Stats: state >= 0';
}