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

Prepare support for table joins.

Browse Source
This commit is contained in:
Gunnar Beutner 2013-03-10 18:49:14 +01:00
parent 6c7af283c0
commit ed912b0e23
18 changed files with 436 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/livestatus/Makefile.am
View File

@ -6,6 +6,8 @@ pkglib_LTLIBRARIES = \
livestatus_la_SOURCES = \ livestatus_la_SOURCES = \
andfilter.cpp \ andfilter.cpp \
andfilter.h \ andfilter.h \
column.cpp \
column.h \
combinerfilter.cpp \ combinerfilter.cpp \
combinerfilter.h \ combinerfilter.h \
component.cpp \ component.cpp \

7
components/livestatus/attributefilter.cpp
View File

@ -28,12 +28,9 @@ AttributeFilter::AttributeFilter(const String& column, const String& op, const S
bool AttributeFilter::Apply(const Table::Ptr& table, const Object::Ptr& object) bool AttributeFilter::Apply(const Table::Ptr& table, const Object::Ptr& object)
{ {
Table::ColumnAccessor accessor = table->GetColumn(m_Column); Column column = table->GetColumn(m_Column);
if (accessor.empty()) Value value = column.ExtractValue(object);
BOOST_THROW_EXCEPTION(invalid_argument("Filter expression uses unknown column '" + m_Column + "'"));
Value value = accessor(object);
if (value.IsObjectType<Array>()) { if (value.IsObjectType<Array>()) {
if (m_Operator == ">=") { if (m_Operator == ">=") {

39
components/livestatus/column.cpp Normal file
View File

@ -0,0 +1,39 @@
/******************************************************************************
* Icinga 2 *
* Copyright (C) 2012 Icinga Development Team (http://www.icinga.org/) *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License *
* as published by the Free Software Foundation; either version 2 *
* of the License, or (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the Free Software Foundation *
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
#include "i2-livestatus.h"
using namespace icinga;
using namespace livestatus;
Column::Column(const ValueAccessor& valueAccessor, const ObjectAccessor& objectAccessor)
: m_ValueAccessor(valueAccessor), m_ObjectAccessor(objectAccessor)
{ }
Value Column::ExtractValue(const Object::Ptr& uobject) const
{
Object::Ptr object;
if (!m_ObjectAccessor.empty())
object = m_ObjectAccessor(uobject);
else
object = uobject;
return m_ValueAccessor(object);
}

43
components/livestatus/column.h Normal file
View File

@ -0,0 +1,43 @@
/******************************************************************************
* Icinga 2 *
* Copyright (C) 2012 Icinga Development Team (http://www.icinga.org/) *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License *
* as published by the Free Software Foundation; either version 2 *
* of the License, or (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the Free Software Foundation *
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
#ifndef COLUMN_H
#define COLUMN_H
namespace livestatus
{
class Column
{
public:
typedef function<Value (const Object::Ptr&)> ValueAccessor;
typedef function<Object::Ptr (const Object::Ptr&)> ObjectAccessor;
Column(const ValueAccessor& valueAccessor, const ObjectAccessor& objectAccessor);
Value ExtractValue(const Object::Ptr& uobject) const;
private:
ValueAccessor m_ValueAccessor;
ObjectAccessor m_ObjectAccessor;
};
}
#endif /* COLUMN_H */

12
components/livestatus/contactgroupstable.cpp
View File

@ -24,9 +24,15 @@ using namespace livestatus;
ContactGroupsTable::ContactGroupsTable(void) ContactGroupsTable::ContactGroupsTable(void)
{ {
AddColumn("name", &ContactGroupsTable::NameAccessor); AddColumns(this);
AddColumn("alias", &ContactGroupsTable::NameAccessor); }
AddColumn("members", &ContactGroupsTable::MembersAccessor);
void ContactGroupsTable::AddColumns(Table *table, const String& prefix,
const Column::ObjectAccessor& objectAccessor)
{
table->AddColumn(prefix + "name", Column(&ContactGroupsTable::NameAccessor, objectAccessor));
table->AddColumn(prefix + "alias", Column(&ContactGroupsTable::NameAccessor, objectAccessor));
table->AddColumn(prefix + "members", Column(&ContactGroupsTable::MembersAccessor, objectAccessor));
} }
String ContactGroupsTable::GetName(void) const String ContactGroupsTable::GetName(void) const

3
components/livestatus/contactgroupstable.h
View File

@ -34,6 +34,9 @@ public:
ContactGroupsTable(void); ContactGroupsTable(void);
static void AddColumns(Table *table, const String& prefix = String(),
const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor());
virtual String GetName(void) const; virtual String GetName(void) const;
protected: protected:

38
components/livestatus/contactstable.cpp
View File

@ -24,22 +24,28 @@ using namespace livestatus;
ContactsTable::ContactsTable(void) ContactsTable::ContactsTable(void)
{ {
AddColumn("name", &ContactsTable::NameAccessor); AddColumns(this);
AddColumn("alias", &ContactsTable::NameAccessor); }
AddColumn("email", &Table::EmptyStringAccessor);
AddColumn("pager", &Table::EmptyStringAccessor); void ContactsTable::AddColumns(Table *table, const String& prefix,
AddColumn("host_notification_period", &Table::EmptyStringAccessor); const Column::ObjectAccessor& objectAccessor)
AddColumn("service_notification_period", &Table::EmptyStringAccessor); {
AddColumn("can_submit_commands", &Table::OneAccessor); table->AddColumn(prefix + "name", Column(&ContactsTable::NameAccessor, objectAccessor));
AddColumn("host_notifications_enabled", &Table::OneAccessor); table->AddColumn(prefix + "alias", Column(&ContactsTable::NameAccessor, objectAccessor));
AddColumn("service_notifications_enabled", &Table::OneAccessor); table->AddColumn(prefix + "email", Column(&Table::EmptyStringAccessor, objectAccessor));
AddColumn("in_host_notification_period", &Table::OneAccessor); table->AddColumn(prefix + "pager", Column(&Table::EmptyStringAccessor, objectAccessor));
AddColumn("in_service_notification_period", &Table::OneAccessor); table->AddColumn(prefix + "host_notification_period", Column(&Table::EmptyStringAccessor, objectAccessor));
AddColumn("custom_variable_names", &Table::EmptyArrayAccessor); table->AddColumn(prefix + "service_notification_period", Column(&Table::EmptyStringAccessor, objectAccessor));
AddColumn("custom_variable_values", &Table::EmptyArrayAccessor); table->AddColumn(prefix + "can_submit_commands", Column(&Table::OneAccessor, objectAccessor));
AddColumn("custom_variables", &Table::EmptyDictionaryAccessor); table->AddColumn(prefix + "host_notifications_enabled", Column(&Table::OneAccessor, objectAccessor));
AddColumn("modified_attributes", &Table::ZeroAccessor); table->AddColumn(prefix + "service_notifications_enabled", Column(&Table::OneAccessor, objectAccessor));
AddColumn("modified_attributes_list", &Table::EmptyArrayAccessor); table->AddColumn(prefix + "in_host_notification_period", Column(&Table::OneAccessor, objectAccessor));
table->AddColumn(prefix + "in_service_notification_period", Column(&Table::OneAccessor, objectAccessor));
table->AddColumn(prefix + "custom_variable_names", Column(&Table::EmptyArrayAccessor, objectAccessor));
table->AddColumn(prefix + "custom_variable_values", Column(&Table::EmptyArrayAccessor, objectAccessor));
table->AddColumn(prefix + "custom_variables", Column(&Table::EmptyDictionaryAccessor, objectAccessor));
table->AddColumn(prefix + "modified_attributes", Column(&Table::ZeroAccessor, objectAccessor));
table->AddColumn(prefix + "modified_attributes_list", Column(&Table::EmptyArrayAccessor, objectAccessor));
} }
String ContactsTable::GetName(void) const String ContactsTable::GetName(void) const

7
components/livestatus/contactstable.h
View File

@ -29,11 +29,14 @@ namespace livestatus
class ContactsTable : public Table class ContactsTable : public Table
{ {
public: public:
typedef shared_ptr<ContactGroupsTable> Ptr; typedef shared_ptr<ContactsTable> Ptr;
typedef weak_ptr<ContactGroupsTable> WeakPtr; typedef weak_ptr<ContactsTable> WeakPtr;
ContactsTable(void); ContactsTable(void);
static void AddColumns(Table *table, const String& prefix = String(),
const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor());
virtual String GetName(void) const; virtual String GetName(void) const;
protected: protected:

163
components/livestatus/hoststable.cpp Normal file
View File

@ -0,0 +1,163 @@
/******************************************************************************
* Icinga 2 *
* Copyright (C) 2012 Icinga Development Team (http://www.icinga.org/) *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License *
* as published by the Free Software Foundation; either version 2 *
* of the License, or (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the Free Software Foundation *
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
#include "i2-livestatus.h"
using namespace icinga;
using namespace livestatus;
HostsTable::HostsTable(void)
{
AddColumns(this);
}
void HostsTable::AddColumns(Table *table, const String& prefix,
const Column::ObjectAccessor& objectAccessor)
{
table->AddColumn(prefix + "name", Column(&HostsTable::NameAccessor, objectAccessor));
table->AddColumn(prefix + "display_name", Column(&HostsTable::DisplayNameAccessor, objectAccessor));
table->AddColumn(prefix + "alias", Column(&HostsTable::NameAccessor, objectAccessor));
table->AddColumn(prefix + "address", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "check_command", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "check_command_expanded", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "event_handler", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "notification_period", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "check_period", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "notes", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "notes_expanded", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "notes_url", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "notes_url_expanded", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "action_url", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "action_url_expanded", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "plugin_output", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "perf_data", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "icon_image", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "icon_image_expanded", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "icon_image_alt", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "statusmap_image", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "long_plugin_output", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "initial_state", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "max_check_attempts", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "flap_detection_enabled", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "check_freshness", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "process_performance_data", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "accept_passive_checks", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "event_handler_enabled", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "acknowledgement_type", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "check_type", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "last_state", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "last_hard_state", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "current_attempt", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "last_notification", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "next_notification", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "next_check", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "last_hard_state_change", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "has_been_checked", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "current_notification_number", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "pending_flex_downtime", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "total_services", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "checks_enabled", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "notifications_enabled", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "acknowledged", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "state", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "state_type", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "no_more_notifications", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "check_flapping_recovery_notification", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "last_check", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "last_state_change", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "last_time_up", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "last_time_down", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "last_time_unreachable", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "is_flapping", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "scheduled_downtime_depth", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "is_executing", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "active_checks_enabled", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "check_options", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "obsess_over_host", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "modified_attributes", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "modified_attributes_list", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "check_interval", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "retry_interval", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "notification_interval", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "first_notification_delay", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "low_flap_threshold", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "high_flap_threshold", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "x_3d", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "y_3d", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "z_3d", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "latency", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "execution_time", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "percent_state_change", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "in_notification_period", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "in_check_period", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "contacts", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "downtimes", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "downtimes_with_info", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "comments", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "comments_with_info", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "comments_with_extra_info", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "custom_variable_names", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "custom_variable_values", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "custom_variables", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "filename", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "parents", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "childs", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "num_services", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "worst_service_state", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "num_services_ok", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "num_services_warn", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "num_services_crit", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "num_services_unknown", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "num_services_pending", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "worst_service_hard_state", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "num_services_hard_ok", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "num_services_hard_warn", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "num_services_hard_crit", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "num_services_hard_unknown", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "hard_state", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "pnpgraph_present", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "groups", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "contact_groups", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "services", Column(&Table::EmptyStringAccessor, objectAccessor));
table->AddColumn(prefix + "services_with_state", Column(&Table::EmptyDictionaryAccessor, objectAccessor));
table->AddColumn(prefix + "services_with_info", Column(&Table::EmptyDictionaryAccessor, objectAccessor));
table->AddColumn(prefix + "groups", Column(&Table::EmptyArrayAccessor, objectAccessor));
}
String HostsTable::GetName(void) const
{
return "hosts";
}
void HostsTable::FetchRows(const function<void (const Object::Ptr&)>& addRowFn)
{
BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjects("Host")) {
addRowFn(object);
}
}
Value HostsTable::NameAccessor(const Object::Ptr& object)
{
return static_pointer_cast<Host>(object)->GetName();
}
Value HostsTable::DisplayNameAccessor(const Object::Ptr& object)
{
return static_pointer_cast<Host>(object)->GetDisplayName();
}

51
components/livestatus/hoststable.h Normal file
View File

@ -0,0 +1,51 @@
/******************************************************************************
* Icinga 2 *
* Copyright (C) 2012 Icinga Development Team (http://www.icinga.org/) *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License *
* as published by the Free Software Foundation; either version 2 *
* of the License, or (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the Free Software Foundation *
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
#ifndef HOSTSTABLE_H
#define HOSTSTABLE_H
namespace livestatus
{
/**
* @ingroup livestatus
*/
class HostsTable : public Table
{
public:
typedef shared_ptr<HostsTable> Ptr;
typedef weak_ptr<HostsTable> WeakPtr;
HostsTable(void);
static void AddColumns(Table *table, const String& prefix = String(),
const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor());
virtual String GetName(void) const;
protected:
virtual void FetchRows(const function<void (const Object::Ptr&)>& addRowFn);
static Value NameAccessor(const Object::Ptr& object);
static Value DisplayNameAccessor(const Object::Ptr& object);
};
}
#endif /* HOSTSTABLE_H */

2
components/livestatus/i2-livestatus.h
View File

@ -33,6 +33,7 @@
using namespace icinga; using namespace icinga;
#include "connection.h" #include "connection.h"
#include "column.h"
#include "table.h" #include "table.h"
#include "filter.h" #include "filter.h"
#include "combinerfilter.h" #include "combinerfilter.h"
@ -44,6 +45,7 @@ using namespace icinga;
#include "statustable.h" #include "statustable.h"
#include "contactgroupstable.h" #include "contactgroupstable.h"
#include "contactstable.h" #include "contactstable.h"
#include "hoststable.h"
#include "component.h" #include "component.h"
#endif /* I2LIVESTATUS_H */ #endif /* I2LIVESTATUS_H */

4
components/livestatus/livestatus.vcxproj
View File

@ -21,10 +21,12 @@
<ItemGroup> <ItemGroup>
<ClInclude Include="andfilter.h" /> <ClInclude Include="andfilter.h" />
<ClInclude Include="attributefilter.h" /> <ClInclude Include="attributefilter.h" />
<ClInclude Include="column.h" />
<ClInclude Include="combinerfilter.h" /> <ClInclude Include="combinerfilter.h" />
<ClInclude Include="contactgroupstable.h" /> <ClInclude Include="contactgroupstable.h" />
<ClInclude Include="contactstable.h" /> <ClInclude Include="contactstable.h" />
<ClInclude Include="filter.h" /> <ClInclude Include="filter.h" />
<ClInclude Include="hoststable.h" />
<ClInclude Include="i2-livestatus.h" /> <ClInclude Include="i2-livestatus.h" />
<ClInclude Include="component.h" /> <ClInclude Include="component.h" />
<ClInclude Include="connection.h" /> <ClInclude Include="connection.h" />
@ -37,12 +39,14 @@
<ItemGroup> <ItemGroup>
<ClCompile Include="andfilter.cpp" /> <ClCompile Include="andfilter.cpp" />
<ClCompile Include="attributefilter.cpp" /> <ClCompile Include="attributefilter.cpp" />
<ClCompile Include="column.cpp" />
<ClCompile Include="combinerfilter.cpp" /> <ClCompile Include="combinerfilter.cpp" />
<ClCompile Include="component.cpp" /> <ClCompile Include="component.cpp" />
<ClCompile Include="connection.cpp" /> <ClCompile Include="connection.cpp" />
<ClCompile Include="contactgroupstable.cpp" /> <ClCompile Include="contactgroupstable.cpp" />
<ClCompile Include="contactstable.cpp" /> <ClCompile Include="contactstable.cpp" />
<ClCompile Include="filter.cpp" /> <ClCompile Include="filter.cpp" />
<ClCompile Include="hoststable.cpp" />
<ClCompile Include="negatefilter.cpp" /> <ClCompile Include="negatefilter.cpp" />
<ClCompile Include="orfilter.cpp" /> <ClCompile Include="orfilter.cpp" />
<ClCompile Include="query.cpp" /> <ClCompile Include="query.cpp" />

12
components/livestatus/livestatus.vcxproj.filters
View File

@ -51,6 +51,12 @@
<ClInclude Include="combinerfilter.h"> <ClInclude Include="combinerfilter.h">
<Filter>Headerdateien</Filter> <Filter>Headerdateien</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="hoststable.h">
<Filter>Headerdateien</Filter>
</ClInclude>
<ClInclude Include="column.h">
<Filter>Headerdateien</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="component.cpp"> <ClCompile Include="component.cpp">
@ -92,5 +98,11 @@
<ClCompile Include="combinerfilter.cpp"> <ClCompile Include="combinerfilter.cpp">
<Filter>Quelldateien</Filter> <Filter>Quelldateien</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="hoststable.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="column.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
</Project> </Project>

15
components/livestatus/query.cpp
View File

@ -68,6 +68,9 @@ Query::Query(const vector<String>& lines)
else if (header == "Filter" || header == "Stats") { 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() == 2)
tokens.push_back("");
if (tokens.size() < 3) { if (tokens.size() < 3) {
m_Verb = "ERROR"; m_Verb = "ERROR";
m_ErrorCode = 452; m_ErrorCode = 452;
@ -217,16 +220,10 @@ void Query::ExecuteGetHelper(const Stream::Ptr& stream)
BOOST_FOREACH(const Object::Ptr& object, objects) { BOOST_FOREACH(const Object::Ptr& object, objects) {
Array::Ptr row = boost::make_shared<Array>(); Array::Ptr row = boost::make_shared<Array>();
BOOST_FOREACH(const String& column, columns) { BOOST_FOREACH(const String& columnName, columns) {
Table::ColumnAccessor accessor = table->GetColumn(column); Column column = table->GetColumn(columnName);
if (accessor.empty()) { row->Add(column.ExtractValue(object));
SendResponse(stream, 450, "Column '" + column + "' does not exist.");
return;
}
row->Add(accessor(object));
} }
rs->Add(row); rs->Add(row);

104
components/livestatus/statustable.cpp
View File

@ -24,65 +24,71 @@ using namespace livestatus;
StatusTable::StatusTable(void) StatusTable::StatusTable(void)
{ {
AddColumn("neb_callbacks", &Table::ZeroAccessor); AddColumns(this);
AddColumn("neb_callbacks_rate", &Table::ZeroAccessor); }
AddColumn("requests", &Table::ZeroAccessor); void StatusTable::AddColumns(Table *table, const String& prefix,
AddColumn("requests_rate", &Table::ZeroAccessor); const Column::ObjectAccessor& objectAccessor)
{
table->AddColumn(prefix + "neb_callbacks", Column(&Table::ZeroAccessor, objectAccessor));
table->AddColumn(prefix + "neb_callbacks_rate", Column(&Table::ZeroAccessor, objectAccessor));
AddColumn("connections", &Table::ZeroAccessor); table->AddColumn(prefix + "requests", Column(&Table::ZeroAccessor, objectAccessor));
AddColumn("connections_rate", &Table::ZeroAccessor); table->AddColumn(prefix + "requests_rate", Column(&Table::ZeroAccessor, objectAccessor));
AddColumn("service_checks", &Table::ZeroAccessor); table->AddColumn(prefix + "connections", Column(&Table::ZeroAccessor, objectAccessor));
AddColumn("service_checks_rate", &Table::ZeroAccessor); table->AddColumn(prefix + "connections_rate", Column(&Table::ZeroAccessor, objectAccessor));
AddColumn("host_checks", &Table::ZeroAccessor); table->AddColumn(prefix + "service_checks", Column(&Table::ZeroAccessor, objectAccessor));
AddColumn("host_checks_rate", &Table::ZeroAccessor); table->AddColumn(prefix + "service_checks_rate", Column(&Table::ZeroAccessor, objectAccessor));
AddColumn("forks", &Table::ZeroAccessor); table->AddColumn(prefix + "host_checks", Column(&Table::ZeroAccessor, objectAccessor));
AddColumn("forks_rate", &Table::ZeroAccessor); table->AddColumn(prefix + "host_checks_rate", Column(&Table::ZeroAccessor, objectAccessor));
AddColumn("log_messages", &Table::ZeroAccessor); table->AddColumn(prefix + "forks", Column(&Table::ZeroAccessor, objectAccessor));
AddColumn("log_messages_rate", &Table::ZeroAccessor); table->AddColumn(prefix + "forks_rate", Column(&Table::ZeroAccessor, objectAccessor));
AddColumn("external_commands", &Table::ZeroAccessor); table->AddColumn(prefix + "log_messages", Column(&Table::ZeroAccessor, objectAccessor));
AddColumn("external_commands_rate", &Table::ZeroAccessor); table->AddColumn(prefix + "log_messages_rate", Column(&Table::ZeroAccessor, objectAccessor));
AddColumn("livechecks", &Table::ZeroAccessor); table->AddColumn(prefix + "external_commands", Column(&Table::ZeroAccessor, objectAccessor));
AddColumn("livechecks_rate", &Table::ZeroAccessor); table->AddColumn(prefix + "external_commands_rate", Column(&Table::ZeroAccessor, objectAccessor));
AddColumn("livecheck_overflows", &Table::ZeroAccessor); table->AddColumn(prefix + "livechecks", Column(&Table::ZeroAccessor, objectAccessor));
AddColumn("livecheck_overflows_rate", &Table::ZeroAccessor); table->AddColumn(prefix + "livechecks_rate", Column(&Table::ZeroAccessor, objectAccessor));
AddColumn("nagios_pid", &Table::ZeroAccessor); table->AddColumn(prefix + "livecheck_overflows", Column(&Table::ZeroAccessor, objectAccessor));
AddColumn("enable_notifications", &Table::ZeroAccessor); table->AddColumn(prefix + "livecheck_overflows_rate", Column(&Table::ZeroAccessor, objectAccessor));
AddColumn("execute_service_checks", &Table::ZeroAccessor);
AddColumn("accept_passive_service_checks", &Table::ZeroAccessor); table->AddColumn(prefix + "nagios_pid", Column(&Table::ZeroAccessor, objectAccessor));
AddColumn("execute_host_checks", &Table::ZeroAccessor); table->AddColumn(prefix + "enable_notifications", Column(&Table::ZeroAccessor, objectAccessor));
AddColumn("accept_passive_host_checks", &Table::ZeroAccessor); table->AddColumn(prefix + "execute_service_checks", Column(&Table::ZeroAccessor, objectAccessor));
AddColumn("enable_event_handlers", &Table::ZeroAccessor); table->AddColumn(prefix + "accept_passive_service_checks", Column(&Table::ZeroAccessor, objectAccessor));
AddColumn("obsess_over_services", &Table::ZeroAccessor); table->AddColumn(prefix + "execute_host_checks", Column(&Table::ZeroAccessor, objectAccessor));
AddColumn("obsess_over_hosts", &Table::ZeroAccessor); table->AddColumn(prefix + "accept_passive_host_checks", Column(&Table::ZeroAccessor, objectAccessor));
AddColumn("check_service_freshness", &Table::ZeroAccessor); table->AddColumn(prefix + "enable_event_handlers", Column(&Table::ZeroAccessor, objectAccessor));
AddColumn("check_host_freshness", &Table::ZeroAccessor); table->AddColumn(prefix + "obsess_over_services", Column(&Table::ZeroAccessor, objectAccessor));
AddColumn("enable_flap_detection", &Table::ZeroAccessor); table->AddColumn(prefix + "obsess_over_hosts", Column(&Table::ZeroAccessor, objectAccessor));
AddColumn("process_performance_data", &Table::ZeroAccessor); table->AddColumn(prefix + "check_service_freshness", Column(&Table::ZeroAccessor, objectAccessor));
AddColumn("check_external_commands", &Table::ZeroAccessor); table->AddColumn(prefix + "check_host_freshness", Column(&Table::ZeroAccessor, objectAccessor));
AddColumn("program_start", &Table::ZeroAccessor); table->AddColumn(prefix + "enable_flap_detection", Column(&Table::ZeroAccessor, objectAccessor));
AddColumn("last_command_check", &Table::ZeroAccessor); table->AddColumn(prefix + "process_performance_data", Column(&Table::ZeroAccessor, objectAccessor));
AddColumn("last_log_rotation", &Table::ZeroAccessor); table->AddColumn(prefix + "check_external_commands", Column(&Table::ZeroAccessor, objectAccessor));
AddColumn("interval_length", &Table::ZeroAccessor); table->AddColumn(prefix + "program_start", Column(&Table::ZeroAccessor, objectAccessor));
AddColumn("num_hosts", &Table::ZeroAccessor); table->AddColumn(prefix + "last_command_check", Column(&Table::ZeroAccessor, objectAccessor));
AddColumn("num_services", &Table::ZeroAccessor); table->AddColumn(prefix + "last_log_rotation", Column(&Table::ZeroAccessor, objectAccessor));
AddColumn("program_version", &Table::ZeroAccessor); table->AddColumn(prefix + "interval_length", Column(&Table::ZeroAccessor, objectAccessor));
AddColumn("external_command_buffer_slots", &Table::ZeroAccessor); table->AddColumn(prefix + "num_hosts", Column(&Table::ZeroAccessor, objectAccessor));
AddColumn("external_command_buffer_usage", &Table::ZeroAccessor); table->AddColumn(prefix + "num_services", Column(&Table::ZeroAccessor, objectAccessor));
AddColumn("external_command_buffer_max", &Table::ZeroAccessor); table->AddColumn(prefix + "program_version", Column(&Table::ZeroAccessor, objectAccessor));
AddColumn("cached_log_messages", &Table::ZeroAccessor); table->AddColumn(prefix + "external_command_buffer_slots", Column(&Table::ZeroAccessor, objectAccessor));
AddColumn("livestatus_version", &Table::ZeroAccessor); table->AddColumn(prefix + "external_command_buffer_usage", Column(&Table::ZeroAccessor, objectAccessor));
AddColumn("livestatus_active_connections", &Table::ZeroAccessor); table->AddColumn(prefix + "external_command_buffer_max", Column(&Table::ZeroAccessor, objectAccessor));
AddColumn("livestatus_queued_connections", &Table::ZeroAccessor); table->AddColumn(prefix + "cached_log_messages", Column(&Table::ZeroAccessor, objectAccessor));
AddColumn("livestatus_threads", &Table::ZeroAccessor); table->AddColumn(prefix + "livestatus_version", Column(&Table::ZeroAccessor, objectAccessor));
table->AddColumn(prefix + "livestatus_active_connections", Column(&Table::ZeroAccessor, objectAccessor));
table->AddColumn(prefix + "livestatus_queued_connections", Column(&Table::ZeroAccessor, objectAccessor));
table->AddColumn(prefix + "livestatus_threads", Column(&Table::ZeroAccessor, objectAccessor));
} }
String StatusTable::GetName(void) const String StatusTable::GetName(void) const

3
components/livestatus/statustable.h
View File

@ -34,6 +34,9 @@ public:
StatusTable(void); StatusTable(void);
static void AddColumns(Table *table, const String& prefix = String(),
const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor());
virtual String GetName(void) const; virtual String GetName(void) const;
protected: protected:

17
components/livestatus/table.cpp
View File

@ -33,21 +33,28 @@ Table::Ptr Table::GetByName(const String& name)
return boost::make_shared<ContactGroupsTable>(); return boost::make_shared<ContactGroupsTable>();
else if (name == "contacts") else if (name == "contacts")
return boost::make_shared<ContactsTable>(); return boost::make_shared<ContactsTable>();
else if (name == "hosts")
return boost::make_shared<HostsTable>();
return Table::Ptr(); return Table::Ptr();
} }
void Table::AddColumn(const String& name, const ColumnAccessor& accessor) void Table::AddColumn(const String& name, const Column& column)
{ {
m_Columns[name] = accessor; pair<String, Column> item = make_pair(name, column);
pair<map<String, Column>::iterator, bool> ret = m_Columns.insert(item);
if (!ret.second)
ret.first->second = column;
} }
Table::ColumnAccessor Table::GetColumn(const String& name) const Column Table::GetColumn(const String& name) const
{ {
map<String, ColumnAccessor>::const_iterator it = m_Columns.find(name); map<String, Column>::const_iterator it = m_Columns.find(name);
if (it == m_Columns.end()) if (it == m_Columns.end())
return ColumnAccessor(); BOOST_THROW_EXCEPTION(invalid_argument("Column '" + name + "' does not exist."));
return it->second; return it->second;
} }

8
components/livestatus/table.h
View File

@ -36,20 +36,18 @@ public:
static Table::Ptr GetByName(const String& name); static Table::Ptr GetByName(const String& name);
typedef function<Value (const Object::Ptr&)> ColumnAccessor;
virtual String GetName(void) const = 0; virtual String GetName(void) const = 0;
vector<Object::Ptr> FilterRows(const shared_ptr<Filter>& filter); vector<Object::Ptr> FilterRows(const shared_ptr<Filter>& filter);
ColumnAccessor GetColumn(const String& name) const; void AddColumn(const String& name, const Column& column);
Column GetColumn(const String& name) const;
vector<String> GetColumnNames(void) const; vector<String> GetColumnNames(void) const;
protected: protected:
Table(void); Table(void);
void AddColumn(const String& name, const ColumnAccessor& accessor);
virtual void FetchRows(const function<void (const Object::Ptr&)>& addRowFn) = 0; virtual void FetchRows(const function<void (const Object::Ptr&)>& addRowFn) = 0;
static Value ZeroAccessor(const Object::Ptr&); static Value ZeroAccessor(const Object::Ptr&);
@ -59,7 +57,7 @@ protected:
static Value EmptyDictionaryAccessor(const Object::Ptr&); static Value EmptyDictionaryAccessor(const Object::Ptr&);
private: private:
map<String, ColumnAccessor> m_Columns; map<String, Column> m_Columns;
void FilteredAddRow(vector<Object::Ptr>& rs, const shared_ptr<Filter>& filter, const Object::Ptr& object); void FilteredAddRow(vector<Object::Ptr>& rs, const shared_ptr<Filter>& filter, const Object::Ptr& object);
}; };