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

livestatus: add commands table (thruk now shows extinfo) 

refs #4372
This commit is contained in:
Michael Friedrich 2013-07-09 18:09:03 +02:00
parent 82ae632389
commit 6ce71489c8
6 changed files with 138 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/livestatus/Makefile.am
View File

@ -18,6 +18,8 @@ liblivestatus_la_SOURCES = \
column.h \
combinerfilter.cpp \
combinerfilter.h \
commandstable.cpp \
commandstable.h \
commentstable.cpp \
commentstable.h \
component.cpp \

71
components/livestatus/commandstable.cpp Normal file
View File

@ -0,0 +1,71 @@
/******************************************************************************
* 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/commandstable.h"
#include "icinga/icingaapplication.h"
#include "icinga/checkcommand.h"
#include "icinga/eventcommand.h"
#include "icinga/notificationcommand.h"
#include "base/dynamictype.h"
#include <boost/foreach.hpp>
using namespace icinga;
using namespace livestatus;
CommandsTable::CommandsTable(void)
{
AddColumns(this);
}
void CommandsTable::AddColumns(Table *table, const String& prefix,
const Column::ObjectAccessor& objectAccessor)
{
table->AddColumn(prefix + "name", Column(&CommandsTable::NameAccessor, objectAccessor));
table->AddColumn(prefix + "line", Column(&CommandsTable::LineAccessor, objectAccessor));
}
String CommandsTable::GetName(void) const
{
return "command";
}
void CommandsTable::FetchRows(const AddRowFunction& addRowFn)
{
BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjects("CheckCommand")) {
addRowFn(object);
}
BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjects("EventCommand")) {
addRowFn(object);
}
BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjects("NotificationCommand")) {
addRowFn(object);
}
}
Value CommandsTable::NameAccessor(const Object::Ptr& object)
{
/* TODO */
return Value();
}
Value CommandsTable::LineAccessor(const Object::Ptr& object)
{
/* TODO */
return Value();
}

54
components/livestatus/commandstable.h Normal file
View File

@ -0,0 +1,54 @@
/******************************************************************************
* 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 COMMANDSTABLE_H
#define COMMANDSTABLE_H
#include "livestatus/table.h"
using namespace icinga;
namespace livestatus
{
/**
* @ingroup livestatus
*/
class CommandsTable : public Table
{
public:
DECLARE_PTR_TYPEDEFS(CommandsTable);
CommandsTable(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 NameAccessor(const Object::Ptr& object);
static Value LineAccessor(const Object::Ptr& object);
};
}
#endif /* COMMANDSTABLE_H */

2
components/livestatus/livestatus.vcxproj
View File

@ -23,6 +23,7 @@
<ClInclude Include="attributefilter.h" />
<ClInclude Include="column.h" />
<ClInclude Include="combinerfilter.h" />
<ClInclude Include="commandstable.h" />
<ClInclude Include="commentstable.h" />
<ClInclude Include="contactgroupstable.h" />
<ClInclude Include="contactstable.h" />
@ -44,6 +45,7 @@
<ClCompile Include="attributefilter.cpp" />
<ClCompile Include="column.cpp" />
<ClCompile Include="combinerfilter.cpp" />
<ClCompile Include="commandstable.cpp" />
<ClCompile Include="commentstable.cpp" />
<ClCompile Include="component.cpp" />
<ClCompile Include="contactgroupstable.cpp" />

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

@ -60,6 +60,9 @@
<ClInclude Include="servicestable.h">
<Filter>Headerdateien</Filter>
</ClInclude>
<ClInclude Include="commandstable.h">
<Filter>Headerdateien</Filter>
</ClInclude>
<ClInclude Include="commentstable.h">
<Filter>Headerdateien</Filter>
</ClInclude>
@ -116,6 +119,9 @@
<ClCompile Include="servicestable.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="commandstable.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="commentstable.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>

3
components/livestatus/table.cpp
View File

@ -23,6 +23,7 @@
#include "livestatus/contactstable.h"
#include "livestatus/hoststable.h"
#include "livestatus/servicestable.h"
#include "livestatus/commandstable.h"
#include "livestatus/commentstable.h"
#include "livestatus/downtimestable.h"
#include "livestatus/logtable.h"
@ -52,6 +53,8 @@ Table::Ptr Table::GetByName(const String& name)
return boost::make_shared<HostsTable>();
else if (name == "services")
return boost::make_shared<ServicesTable>();
else if (name == "commands")
return boost::make_shared<CommandsTable>();
else if (name == "comments")
return boost::make_shared<CommentsTable>();
else if (name == "downtimes")