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

livestatus: add empty logtable 

refs #4372
This commit is contained in:
Michael Friedrich 2013-07-09 17:46:48 +02:00
parent aefda9f124
commit c4aae5bdba
6 changed files with 238 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/livestatus/Makefile.am
View File

@ -33,6 +33,8 @@ liblivestatus_la_SOURCES = \
hoststable.cpp \
hoststable.h \
livestatus-type.cpp \
logtable.cpp \
logtable.h \
negatefilter.cpp \
negatefilter.h \
orfilter.cpp \

4
components/livestatus/livestatus.vcxproj
View File

@ -36,6 +36,7 @@
<ClInclude Include="query.h" />
<ClInclude Include="servicestable.h" />
<ClInclude Include="statustable.h" />
<ClInclude Include="logtable.h" />
<ClInclude Include="table.h" />
</ItemGroup>
<ItemGroup>
@ -56,6 +57,7 @@
<ClCompile Include="query.cpp" />
<ClCompile Include="servicestable.cpp" />
<ClCompile Include="statustable.cpp" />
<ClCompile Include="logtable.cpp" />
<ClCompile Include="table.cpp" />
</ItemGroup>
<ItemGroup>
@ -222,4 +224,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

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

@ -24,6 +24,9 @@
<ClInclude Include="statustable.h">
<Filter>Headerdateien</Filter>
</ClInclude>
<ClInclude Include="logtable.h">
<Filter>Headerdateien</Filter>
</ClInclude>
<ClInclude Include="filter.h">
<Filter>Headerdateien</Filter>
</ClInclude>
@ -77,6 +80,9 @@
<ClCompile Include="statustable.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="logtable.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="filter.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
@ -125,4 +131,4 @@
<Filter>Quelldateien</Filter>
</CustomBuild>
</ItemGroup>
</Project>
</Project>

156
components/livestatus/logtable.cpp Normal file
View File

@ -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 <boost/smart_ptr/make_shared.hpp>
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<Object>();
/* 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();
}

67
components/livestatus/logtable.h Normal file
View File

@ -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 */

3
components/livestatus/table.cpp
View File

@ -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<CommentsTable>();
else if (name == "downtimes")
return boost::make_shared<DowntimesTable>();
else if (name == "log")
return boost::make_shared<LogTable>();
return Table::Ptr();
}