diff --git a/components/livestatus/Makefile.am b/components/livestatus/Makefile.am index 62334187d..3a16b1109 100644 --- a/components/livestatus/Makefile.am +++ b/components/livestatus/Makefile.am @@ -33,6 +33,8 @@ liblivestatus_la_SOURCES = \ hoststable.cpp \ hoststable.h \ livestatus-type.cpp \ + logtable.cpp \ + logtable.h \ negatefilter.cpp \ negatefilter.h \ orfilter.cpp \ diff --git a/components/livestatus/livestatus.vcxproj b/components/livestatus/livestatus.vcxproj index fc8f67899..891587b5c 100644 --- a/components/livestatus/livestatus.vcxproj +++ b/components/livestatus/livestatus.vcxproj @@ -36,6 +36,7 @@ + @@ -56,6 +57,7 @@ + @@ -222,4 +224,4 @@ - \ No newline at end of file + diff --git a/components/livestatus/livestatus.vcxproj.filters b/components/livestatus/livestatus.vcxproj.filters index 33da808b8..cb27231b4 100644 --- a/components/livestatus/livestatus.vcxproj.filters +++ b/components/livestatus/livestatus.vcxproj.filters @@ -24,6 +24,9 @@ Headerdateien + + Headerdateien + Headerdateien @@ -77,6 +80,9 @@ Quelldateien + + Quelldateien + Quelldateien @@ -125,4 +131,4 @@ Quelldateien - \ No newline at end of file + diff --git a/components/livestatus/logtable.cpp b/components/livestatus/logtable.cpp new file mode 100644 index 000000000..5d825b18b --- /dev/null +++ b/components/livestatus/logtable.cpp @@ -0,0 +1,156 @@ +/****************************************************************************** + * 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 "livestatus/logtable.h" +#include "icinga/icingaapplication.h" +#include "icinga/cib.h" +#include + +using namespace icinga; +using namespace livestatus; + +LogTable::LogTable(void) +{ + AddColumns(this); +} + +void LogTable::AddColumns(Table *table, const String& prefix, + const Column::ObjectAccessor& objectAccessor) +{ + table->AddColumn(prefix + "time", Column(&LogTable::TimeAccessor, objectAccessor)); + table->AddColumn(prefix + "lineno", Column(&LogTable::LinenoAccessor, objectAccessor)); + table->AddColumn(prefix + "class", Column(&LogTable::ClassAccessor, objectAccessor)); + table->AddColumn(prefix + "message", Column(&LogTable::MessageAccessor, objectAccessor)); + table->AddColumn(prefix + "type", Column(&LogTable::TypeAccessor, objectAccessor)); + table->AddColumn(prefix + "options", Column(&LogTable::OptionsAccessor, objectAccessor)); + table->AddColumn(prefix + "comment", Column(&LogTable::CommentAccessor, objectAccessor)); + table->AddColumn(prefix + "plugin_output", Column(&LogTable::PluginOutputAccessor, objectAccessor)); + table->AddColumn(prefix + "state", Column(&LogTable::StateAccessor, objectAccessor)); + table->AddColumn(prefix + "state_type", Column(&LogTable::StateTypeAccessor, objectAccessor)); + table->AddColumn(prefix + "attempt", Column(&LogTable::AttemptAccessor, objectAccessor)); + table->AddColumn(prefix + "service_description", Column(&LogTable::ServiceDescriptionAccessor, objectAccessor)); + table->AddColumn(prefix + "host_name", Column(&LogTable::HostNameAccessor, objectAccessor)); + table->AddColumn(prefix + "contact_name", Column(&LogTable::ContactNameAccessor, objectAccessor)); + table->AddColumn(prefix + "command_name", Column(&LogTable::CommandNameAccessor, objectAccessor)); + + // TODO join with hosts, services, contacts, command tables +} + +String LogTable::GetName(void) const +{ + return "status"; +} + +void LogTable::FetchRows(const AddRowFunction& addRowFn) +{ + Object::Ptr obj = boost::make_shared(); + + /* Return a fake row. */ + addRowFn(obj); +} + +Value LogTable::TimeAccessor(const Object::Ptr& object) +{ + /* not supported */ + return Value(); +} + +Value LogTable::LinenoAccessor(const Object::Ptr& object) +{ + /* not supported */ + return Value(); +} + +Value LogTable::ClassAccessor(const Object::Ptr& object) +{ + /* not supported */ + return Value(); +} + +Value LogTable::MessageAccessor(const Object::Ptr& object) +{ + /* not supported */ + return Value(); +} + +Value LogTable::TypeAccessor(const Object::Ptr& object) +{ + /* not supported */ + return Value(); +} + +Value LogTable::OptionsAccessor(const Object::Ptr& object) +{ + /* not supported */ + return Value(); +} + +Value LogTable::CommentAccessor(const Object::Ptr& object) +{ + /* not supported */ + return Value(); +} + +Value LogTable::PluginOutputAccessor(const Object::Ptr& object) +{ + /* not supported */ + return Value(); +} + +Value LogTable::StateAccessor(const Object::Ptr& object) +{ + /* not supported */ + return Value(); +} + +Value LogTable::StateTypeAccessor(const Object::Ptr& object) +{ + /* not supported */ + return Value(); +} + +Value LogTable::AttemptAccessor(const Object::Ptr& object) +{ + /* not supported */ + return Value(); +} + +Value LogTable::ServiceDescriptionAccessor(const Object::Ptr& object) +{ + /* not supported */ + return Value(); +} + +Value LogTable::HostNameAccessor(const Object::Ptr& object) +{ + /* not supported */ + return Value(); +} + +Value LogTable::ContactNameAccessor(const Object::Ptr& object) +{ + /* not supported */ + return Value(); +} + +Value LogTable::CommandNameAccessor(const Object::Ptr& object) +{ + /* not supported */ + return Value(); +} diff --git a/components/livestatus/logtable.h b/components/livestatus/logtable.h new file mode 100644 index 000000000..ee4603024 --- /dev/null +++ b/components/livestatus/logtable.h @@ -0,0 +1,67 @@ +/****************************************************************************** + * 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 LOGTABLE_H +#define LOGTABLE_H + +#include "livestatus/table.h" + +using namespace icinga; + +namespace livestatus +{ + +/** + * @ingroup livestatus + */ +class LogTable : public Table +{ +public: + DECLARE_PTR_TYPEDEFS(LogTable); + + LogTable(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 AddRowFunction& addRowFn); + + static Value TimeAccessor(const Object::Ptr& object); + static Value LinenoAccessor(const Object::Ptr& object); + static Value ClassAccessor(const Object::Ptr& object); + static Value MessageAccessor(const Object::Ptr& object); + static Value TypeAccessor(const Object::Ptr& object); + static Value OptionsAccessor(const Object::Ptr& object); + static Value CommentAccessor(const Object::Ptr& object); + static Value PluginOutputAccessor(const Object::Ptr& object); + static Value StateAccessor(const Object::Ptr& object); + static Value StateTypeAccessor(const Object::Ptr& object); + static Value AttemptAccessor(const Object::Ptr& object); + static Value ServiceDescriptionAccessor(const Object::Ptr& object); + static Value HostNameAccessor(const Object::Ptr& object); + static Value ContactNameAccessor(const Object::Ptr& object); + static Value CommandNameAccessor(const Object::Ptr& object); +}; + +} + +#endif /* LOGTABLE_H */ diff --git a/components/livestatus/table.cpp b/components/livestatus/table.cpp index e22d80aa7..bdb70d192 100644 --- a/components/livestatus/table.cpp +++ b/components/livestatus/table.cpp @@ -25,6 +25,7 @@ #include "livestatus/servicestable.h" #include "livestatus/commentstable.h" #include "livestatus/downtimestable.h" +#include "livestatus/logtable.h" #include "livestatus/filter.h" #include "base/array.h" #include "base/dictionary.h" @@ -55,6 +56,8 @@ Table::Ptr Table::GetByName(const String& name) return boost::make_shared(); else if (name == "downtimes") return boost::make_shared(); + else if (name == "log") + return boost::make_shared(); return Table::Ptr(); }