tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-29 00:24:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Livestatus: Fix additional stats columns causing problems.

Browse Source 
Fixes #5052
This commit is contained in:
Michael Friedrich 2013-11-11 13:58:25 +01:00
parent 95712e46d4
commit bf94967ac4
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/livestatus/query.cpp
View File

@ -443,14 +443,16 @@ void Query::ExecuteGetHelper(const Stream::Ptr& stream)
Array::Ptr row = make_shared<Array>(); Array::Ptr row = make_shared<Array>();
/* /*
* add columns selected next to stats * add selected columns next to stats
* may not be accurate for grouping! * may not be accurate for grouping!
*/ */
BOOST_FOREACH(const String& columnName, columns) { if (objects.size() > 0 && m_Columns.size() > 0) {
BOOST_FOREACH(const String& columnName, m_Columns) {
Column column = table->GetColumn(columnName); Column column = table->GetColumn(columnName);
row->Add(column.ExtractValue(objects[0])); // first object wins row->Add(column.ExtractValue(objects[0])); // first object wins
} }
}
for (size_t i = 0; i < m_Aggregators.size(); i++) for (size_t i = 0; i < m_Aggregators.size(); i++)
row->Add(stats[i]); row->Add(stats[i]);