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

Implement the "Stats" header.

Browse Source
This commit is contained in:
Gunnar Beutner 2013-03-10 17:54:46 +01:00
parent fd6deeeee6
commit fbf08257ad
1 changed files with 61 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
components/livestatus/query.cpp
View File

@ -65,7 +65,7 @@ Query::Query(const vector<String>& lines)
m_Columns = params.Split(is_any_of(" ")); m_Columns = params.Split(is_any_of(" "));
else if (header == "ColumnHeaders") else if (header == "ColumnHeaders")
m_ColumnHeaders = (params == "on"); m_ColumnHeaders = (params == "on");
else if (header == "Filter") { else if (header == "Filter" || header == "Stats") {
vector<String> tokens = params.Split(is_any_of(" ")); vector<String> tokens = params.Split(is_any_of(" "));
if (tokens.size() < 3) { if (tokens.size() < 3) {
@ -97,29 +97,46 @@ Query::Query(const vector<String>& lines)
if (negate) if (negate)
filter = boost::make_shared<NegateFilter>(filter); filter = boost::make_shared<NegateFilter>(filter);
filters.push_back(filter); deque<Filter::Ptr>& deq = (header == "Filter") ? filters : stats;
deq.push_back(filter);
} else if (header == "Or" || header == "And") { } else if (header == "Or" || header == "And") {
deque<Filter::Ptr>& deq = (header == "Or" || header == "And") ? filters : stats;
int num = Convert::ToLong(params); int num = Convert::ToLong(params);
CombinerFilter::Ptr filter; CombinerFilter::Ptr filter;
if (header == "Or") if (header == "Or" || header == "StatsOr")
filter = boost::make_shared<OrFilter>(); filter = boost::make_shared<OrFilter>();
else else
filter = boost::make_shared<AndFilter>(); filter = boost::make_shared<AndFilter>();
while (!filters.empty() && num--) { if (num > deq.size()) {
filter->AddSubFilter(filters.back()); m_Verb = "ERROR";
filters.pop_back(); m_ErrorCode = 451;
m_ErrorMessage = "Or/StatsOr is referencing " + Convert::ToString(num) + " filters; stack only contains " + Convert::ToString(deq.size()) + " filters";
return;
} }
filters.push_back(filter); while (num--) {
} else if (header == "Negate") { filter->AddSubFilter(deq.back());
if (!filters.empty()) { deq.pop_back();
Filter::Ptr filter = filters.back();
filters.pop_back();
filters.push_back(boost::make_shared<NegateFilter>(filter));
} }
deq.push_back(filter);
} else if (header == "Negate" || header == "StatsNegate") {
deque<Filter::Ptr>& deq = (header == "Negate") ? filters : stats;
if (deq.empty()) {
m_Verb = "ERROR";
m_ErrorCode = 451;
m_ErrorMessage = "Negate/StatsNegate used, however the filter stack is empty";
return;
}
Filter::Ptr filter = deq.back();
filters.pop_back();
deq.push_back(boost::make_shared<NegateFilter>(filter));
} }
} }
@ -196,22 +213,44 @@ void Query::ExecuteGetHelper(const Stream::Ptr& stream)
Array::Ptr rs = boost::make_shared<Array>(); Array::Ptr rs = boost::make_shared<Array>();
BOOST_FOREACH(const Object::Ptr& object, objects) { if (m_Stats.empty()) {
Array::Ptr row = boost::make_shared<Array>(); BOOST_FOREACH(const Object::Ptr& object, objects) {
Array::Ptr row = boost::make_shared<Array>();
BOOST_FOREACH(const String& column, columns) { BOOST_FOREACH(const String& column, columns) {
Table::ColumnAccessor accessor = table->GetColumn(column); Table::ColumnAccessor accessor = table->GetColumn(column);
if (accessor.empty()) { if (accessor.empty()) {
SendResponse(stream, 450, "Column '" + column + "' does not exist."); SendResponse(stream, 450, "Column '" + column + "' does not exist.");
return; return;
}
row->Add(accessor(object));
} }
row->Add(accessor(object)); rs->Add(row);
}
} else {
vector<int> stats(m_Stats.size(), 0);
BOOST_FOREACH(const Object::Ptr& object, objects) {
int index = 0;
BOOST_FOREACH(const Filter::Ptr filter, m_Stats) {
if (filter->Apply(table, object))
stats[index]++;
index++;
}
} }
Array::Ptr row = boost::make_shared<Array>();
for (int i = 0; i < m_Stats.size(); i++)
row->Add(stats[i]);
rs->Add(row); rs->Add(row);
m_ColumnHeaders = false;
} }
stringstream result; stringstream result;
@ -229,7 +268,7 @@ void Query::ExecuteCommandHelper(const Stream::Ptr& stream)
void Query::ExecuteErrorHelper(const Stream::Ptr& stream) void Query::ExecuteErrorHelper(const Stream::Ptr& stream)
{ {
PrintFixed16(stream, m_ErrorCode, m_ErrorMessage); SendResponse(stream, m_ErrorCode, m_ErrorMessage);
} }
void Query::SendResponse(const Stream::Ptr& stream, int code, const String& data) void Query::SendResponse(const Stream::Ptr& stream, int code, const String& data)