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

Merge branch 'feature/randomcheck-4896' into next 

Fixes #4896
This commit is contained in:
Gunnar Beutner 2013-10-24 10:29:30 +02:00
parent 171baa46b2 7c933f7063
commit a4ec56c0f8
5 changed files with 106 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/icinga/Makefile.am
View File

@ -55,6 +55,8 @@ libicinga_la_SOURCES = \
plugineventtask.h \
pluginnotificationtask.cpp \
pluginnotificationtask.h \
randomchecktask.cpp \
randomchecktask.h \
service.cpp \
service-check.cpp \
service-comment.cpp \

4
lib/icinga/icinga.vcxproj
View File

@ -47,6 +47,7 @@
<ClCompile Include="nullchecktask.cpp" />
<ClCompile Include="plugineventtask.cpp" />
<ClCompile Include="pluginnotificationtask.cpp" />
<ClCompile Include="randomchecktask.cpp" />
<ClCompile Include="service-event.cpp" />
<ClCompile Include="service-flapping.cpp" />
<ClCompile Include="service-notification.cpp" />
@ -82,6 +83,7 @@
<ClInclude Include="nullchecktask.h" />
<ClInclude Include="plugineventtask.h" />
<ClInclude Include="pluginnotificationtask.h" />
<ClInclude Include="randomchecktask.h" />
<ClInclude Include="service.h" />
<ClInclude Include="servicegroup.h" />
<ClInclude Include="timeperiod.h" />
@ -278,4 +280,4 @@
<Import Project="..\..\packages\boost_date_time.1.54.0.2\build\native\boost_date_time.targets" Condition="Exists('..\..\packages\boost_date_time.1.54.0.2\build\native\boost_date_time.targets')" />
<Import Project="..\..\packages\boost_chrono.1.54.0.2\build\native\boost_chrono.targets" Condition="Exists('..\..\packages\boost_chrono.1.54.0.2\build\native\boost_chrono.targets')" />
</ImportGroup>
</Project>
</Project>

6
lib/icinga/nullchecktask.cpp
View File

@ -18,8 +18,8 @@
******************************************************************************/
#ifndef _WIN32
#include <stdlib.h>
#endif
# include <stdlib.h>
#endif /* _WIN32 */
#include "icinga/nullchecktask.h"
#include "base/utility.h"
#include "base/convert.h"
@ -45,7 +45,7 @@ Dictionary::Ptr NullCheckTask::ScriptFunc(const Service::Ptr&)
Dictionary::Ptr cr = boost::make_shared<Dictionary>();
cr->Set("output", output);
cr->Set("performance_data_raw", perfdata);
cr->Set("state", static_cast<ServiceState>(Utility::Random() % 4));
cr->Set("state", StateOK);
return cr;
}

52
lib/icinga/randomchecktask.cpp Normal file
View File

@ -0,0 +1,52 @@
/******************************************************************************
* Icinga 2 *
* Copyright (C) 2012-2013 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 _WIN32
# include <stdlib.h>
#endif /* _WIN32 */
#include "icinga/randomchecktask.h"
#include "base/utility.h"
#include "base/convert.h"
#include "base/scriptfunction.h"
#include "base/logger_fwd.h"
#include <boost/smart_ptr/make_shared.hpp>
using namespace icinga;
REGISTER_SCRIPTFUNCTION(RandomCheck, &RandomCheckTask::ScriptFunc);
Dictionary::Ptr RandomCheckTask::ScriptFunc(const Service::Ptr&)
{
char name[255];
if (gethostname(name, sizeof(name)) < 0)
strcpy(name, "<unknown host>");
String output = "Hello from ";
output += name;
String perfdata = "time=" + Convert::ToString(static_cast<double>(Utility::GetTime()));
Dictionary::Ptr cr = boost::make_shared<Dictionary>();
cr->Set("output", output);
cr->Set("performance_data_raw", perfdata);
cr->Set("state", static_cast<ServiceState>(Utility::Random() % 4));
return cr;
}

46
lib/icinga/randomchecktask.h Normal file
View File

@ -0,0 +1,46 @@
/******************************************************************************
* Icinga 2 *
* Copyright (C) 2012-2013 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 RANDOMCHECKTASK_H
#define RANDOMCHECKTASK_H
#include "icinga/i2-icinga.h"
#include "icinga/service.h"
#include "base/dictionary.h"
namespace icinga
{
/**
* Test class for additional check types. Implements the "null" check type.
*
* @ingroup icinga
*/
class I2_ICINGA_API RandomCheckTask
{
public:
static Dictionary::Ptr ScriptFunc(const Service::Ptr& service);
private:
RandomCheckTask(void);
};
}
#endif /* RANDOMCHECKTASK_H */