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/perfdata-2710' into next 

Fixes #2710
This commit is contained in:
Gunnar Beutner 2013-11-07 16:08:03 +01:00
parent 5caec8c570 5aba175e18
commit 664f9b36ef
21 changed files with 488 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

163
components/perfdata/graphitewriter.cpp
View File

@ -22,6 +22,7 @@
#include "icinga/macroprocessor.h"
#include "icinga/icingaapplication.h"
#include "icinga/compatutility.h"
#include "icinga/perfdatavalue.h"
#include "base/tcpsocket.h"
#include "base/dynamictype.h"
#include "base/objectlock.h"
@ -82,122 +83,36 @@ void GraphiteWriter::CheckResultHandler(const Service::Ptr& service, const Dicti
if (!IcingaApplication::GetInstance()->GetEnablePerfdata() || !service->GetEnablePerfdata())
return;
Host::Ptr host = service->GetHost();
/* basic metrics */
SendMetric(service, "current_attempt", service->GetCheckAttempt());
SendMetric(service, "max_check_attempts", service->GetMaxCheckAttempts());
SendMetric(service, "state_type", service->GetStateType());
SendMetric(service, "state", service->GetState());
SendMetric(service, "latency", Service::CalculateLatency(cr));
SendMetric(service, "execution_time", Service::CalculateExecutionTime(cr));
if (!host)
Value pdv = cr->Get("performance_data");
if (!pdv.IsObjectType<Dictionary>())
return;
/* service metrics */
std::vector<String> metrics;
String metricName;
Value metricValue;
Dictionary::Ptr perfdata = pdv;
/* basic metrics */
AddServiceMetric(metrics, service, "current_attempt", service->GetCheckAttempt());
AddServiceMetric(metrics, service, "max_check_attempts", service->GetMaxCheckAttempts());
AddServiceMetric(metrics, service, "state_type", service->GetStateType());
AddServiceMetric(metrics, service, "state", service->GetState());
AddServiceMetric(metrics, service, "latency", Service::CalculateLatency(cr));
AddServiceMetric(metrics, service, "execution_time", Service::CalculateExecutionTime(cr));
String key;
Value value;
BOOST_FOREACH(boost::tie(key, value), perfdata) {
double valueNum;
/* performance data metrics */
String perfdata = CompatUtility::GetCheckResultPerfdata(cr);
if (!value.IsObjectType<PerfdataValue>())
valueNum = value;
else
valueNum = static_cast<PerfdataValue::Ptr>(value)->GetValue();
if (!perfdata.IsEmpty()) {
perfdata.Trim();
Log(LogDebug, "perfdata", "GraphiteWriter: Processing perfdata: '" + perfdata + "'.");
/*
* 'foo bar'=0;;; baz=0.0;;;
* 'label'=value[UOM];[warn];[crit];[min];[max]
*/
std::vector<String> tokens;
boost::algorithm::split(tokens, perfdata, boost::is_any_of(" "));
/* TODO deal with white spaces in single quoted labels: 'foo bar'=0;;; 'baz'=1.0;;;
* 1. find first ', find second ' -> if no '=' in between, this is a label
* 2. two single quotes define an escaped single quite
* 3. warn/crit/min/max may be null and semicolon delimiter omitted
* https://www.nagios-plugins.org/doc/guidelines.html#AEN200
*/
BOOST_FOREACH(const String& token, tokens) {
String metricKeyVal = token;
metricKeyVal.Trim();
std::vector<String> key_val;
boost::algorithm::split(key_val, metricKeyVal, boost::is_any_of("="));
if (key_val.size() == 0) {
Log(LogWarning, "perfdata", "GraphiteWriter: Invalid performance data. No assignment operator found in :'" + metricKeyVal + "'.");
return;
}
String metricName = key_val[0];
metricName.Trim();
if (key_val.size() == 1) {
Log(LogWarning, "perfdata", "GraphiteWriter: Invalid performance data: '" + metricKeyVal + "' with key: '" + metricName + "'.");
return;
}
String metricValues = key_val[1];
metricValues.Trim();
std::vector<String> perfdata_values;
boost::algorithm::split(perfdata_values, metricValues, boost::is_any_of(";"));
if (perfdata_values.size() == 0) {
Log(LogWarning, "perfdata", "GraphiteWriter: Invalid performance data: '" + metricKeyVal +
"' with key: '" + metricName + "' and values: '" + metricValues + "'.");
return;
}
String metricValue = perfdata_values[0];
metricValue.Trim();
Log(LogDebug, "perfdata", "GraphiteWriter: Trimmed metric value: '" + metricValue + "'.");
/* extract raw value (digit number digit as double) and uom
* http://en.highscore.de/cpp/boost/stringhandling.html
*/
String metricValueRaw = boost::algorithm::trim_right_copy_if(metricValue, (!boost::algorithm::is_digit() && !boost::algorithm::is_any_of(".,")));
String metricValueUom = boost::algorithm::trim_left_copy_if(metricValue, (boost::algorithm::is_digit() || boost::algorithm::is_any_of(".,")));
Log(LogDebug, "perfdata", "GraphiteWriter: Raw metric value: '" + metricValueRaw + "' with UOM: '" + metricValueUom + "'.");
/* TODO: Normalize raw value based on UOM
* a. empty - assume a number
* b. 's' - seconds (us, ms)
* c. '%' - percentage
* d. 'B' - bytes (KB, MB, GB, TB)
* e. 'c' - continous counter (snmp)
*/
/* //TODO: Figure out how graphite handles warn/crit/min/max
String metricValueWarn, metricValueCrit, metricValueMin, metricValueMax;
if (perfdata_values.size() > 1)
metricValueWarn = perfdata_values[1];
if (perfdata_values.size() > 2)
metricValueCrit = perfdata_values[2];
if (perfdata_values.size() > 3)
metricValueMin = perfdata_values[3];
if (perfdata_values.size() > 4)
metricValueMax = perfdata_values[4];
*/
/* sanitize invalid metric characters */
SanitizeMetric(metricName);
AddServiceMetric(metrics, service, metricName, metricValueRaw);
}
SendMetric(service, key, valueNum);
}
SendMetrics(metrics);
}
void GraphiteWriter::AddServiceMetric(std::vector<String>& metrics, const Service::Ptr& service, const String& name, const Value& value)
void GraphiteWriter::SendMetric(const Service::Ptr& service, const String& name, double value)
{
/* TODO: sanitize host and service names */
String hostName = service->GetHost()->GetName();
@ -211,33 +126,22 @@ void GraphiteWriter::AddServiceMetric(std::vector<String>& metrics, const Servic
String metric = graphitePrefix + "." + metricPrefix + "." + name + " " + Convert::ToString(value) + " " + Convert::ToString(static_cast<long>(Utility::GetTime())) + "\n";
Log(LogDebug, "perfdata", "GraphiteWriter: Add to metric list:'" + metric + "'.");
metrics.push_back(metric);
}
void GraphiteWriter::SendMetrics(const std::vector<String>& metrics)
{
BOOST_FOREACH(const String& metric, metrics) {
if (metric.IsEmpty())
continue;
ObjectLock olock(this);
Log(LogDebug, "perfdata", "GraphiteWriter: Sending metric '" + metric + "'.");
if (!m_Stream)
return;
ObjectLock olock(this);
try {
m_Stream->Write(metric.CStr(), metric.GetLength());
} catch (const std::exception& ex) {
std::ostringstream msgbuf;
msgbuf << "Exception thrown while writing to the Graphite socket: " << std::endl
<< boost::diagnostic_information(ex);
if (!m_Stream)
return;
Log(LogCritical, "base", msgbuf.str());
try {
m_Stream->Write(metric.CStr(), metric.GetLength());
} catch (const std::exception& ex) {
std::ostringstream msgbuf;
msgbuf << "Exception thrown while writing to the Graphite socket: " << std::endl
<< boost::diagnostic_information(ex);
Log(LogCritical, "base", msgbuf.str());
m_Stream.reset();
}
m_Stream.reset();
}
}
@ -249,4 +153,3 @@ void GraphiteWriter::SanitizeMetric(String& str)
boost::replace_all(str, "\\", "_");
boost::replace_all(str, "/", "_");
}

5
components/perfdata/graphitewriter.h
View File

@ -50,10 +50,9 @@ private:
Timer::Ptr m_ReconnectTimer;
void CheckResultHandler(const Service::Ptr& service, const Dictionary::Ptr& cr);
static void AddServiceMetric(std::vector<String>& metrics, const Service::Ptr& service, const String& name, const Value& value);
void SendMetrics(const std::vector<String>& metrics);
void SendMetric(const Service::Ptr& service, const String& name, double value);
static void SanitizeMetric(String& str);
void ReconnectTimerHandler(void);
};

17
lib/base/qstring.cpp
View File

@ -18,6 +18,7 @@
******************************************************************************/
#include "base/qstring.h"
#include "base/value.h"
#include <boost/algorithm/string/trim.hpp>
#include <boost/algorithm/string/join.hpp>
#include <boost/algorithm/string/compare.hpp>
@ -86,6 +87,12 @@ String& String::operator+=(const char *rhs)
return *this;
}
String& String::operator+=(const Value& rhs)
{
m_Data += static_cast<String>(rhs);
return *this;
}
String& String::operator+=(char rhs)
{
m_Data += rhs;
@ -142,6 +149,16 @@ size_t String::FindFirstOf(char ch, size_t pos) const
return m_Data.find_first_of(ch, pos);
}
size_t String::FindFirstNotOf(const char *s, size_t pos) const
{
return m_Data.find_first_not_of(s, pos);
}
size_t String::FindFirstNotOf(char ch, size_t pos) const
{
return m_Data.find_first_not_of(ch, pos);
}
String String::SubStr(size_t first, size_t len) const
{
return m_Data.substr(first, len);

5
lib/base/qstring.h
View File

@ -28,6 +28,8 @@
namespace icinga {
class Value;
/**
* String class.
*
@ -64,6 +66,7 @@ public:
String& operator+=(const String& rhs);
String& operator+=(const char *rhs);
String& operator+=(const Value& rhs);
String& operator+=(char rhs);
bool IsEmpty(void) const;
@ -81,6 +84,8 @@ public:
size_t Find(const String& str, size_t pos = 0) const;
size_t FindFirstOf(const char *s, size_t pos = 0) const;
size_t FindFirstOf(char ch, size_t pos = 0) const;
size_t FindFirstNotOf(const char *s, size_t pos = 0) const;
size_t FindFirstNotOf(char ch, size_t pos = 0) const;
String SubStr(size_t first, size_t len = NPos) const;
void Replace(size_t first, size_t second, const String& str);

81
lib/base/value.cpp
View File

@ -241,6 +241,77 @@ ValueType Value::GetType(void) const
return static_cast<ValueType>(m_Value.which());
}
bool Value::operator==(int rhs)
{
if (!IsScalar())
return false;
return static_cast<double>(*this) == rhs;
}
bool Value::operator!=(int rhs)
{
return !(*this == rhs);
}
bool Value::operator==(double rhs)
{
if (!IsScalar())
return false;
return static_cast<double>(*this) == rhs;
}
bool Value::operator!=(double rhs)
{
return !(*this == rhs);
}
bool Value::operator==(const char *rhs)
{
return static_cast<String>(*this) == rhs;
}
bool Value::operator!=(const char *rhs)
{
return !(*this == rhs);
}
bool Value::operator==(const String& rhs)
{
return static_cast<String>(*this) == rhs;
}
bool Value::operator!=(const String& rhs)
{
return !(*this == rhs);
}
bool Value::operator==(const Value& rhs)
{
if (IsEmpty() != rhs.IsEmpty())
return false;
if (IsEmpty())
return true;
if (IsObject() != rhs.IsObject())
return false;
if (IsObject())
return static_cast<Object::Ptr>(*this) == static_cast<Object::Ptr>(rhs);
if (GetType() == ValueNumber || rhs.GetType() == ValueNumber)
return static_cast<double>(*this) == static_cast<double>(rhs);
else
return static_cast<String>(*this) == static_cast<String>(rhs);
}
bool Value::operator!=(const Value& rhs)
{
return !(*this == rhs);
}
Value icinga::operator+(const Value& lhs, const char *rhs)
{
return static_cast<String>(lhs) + rhs;
@ -251,6 +322,16 @@ Value icinga::operator+(const char *lhs, const Value& rhs)
return lhs + static_cast<String>(rhs);
}
Value icinga::operator+(const Value& lhs, const String& rhs)
{
return static_cast<String>(lhs) + rhs;
}
Value icinga::operator+(const String& lhs, const Value& rhs)
{
return lhs + static_cast<String>(rhs);
}
std::ostream& icinga::operator<<(std::ostream& stream, const Value& value)
{
stream << static_cast<String>(value);

18
lib/base/value.h
View File

@ -73,6 +73,21 @@ public:
operator double(void) const;
operator String(void) const;
bool operator==(int rhs);
bool operator!=(int rhs);
bool operator==(double rhs);
bool operator!=(double rhs);
bool operator==(const char *rhs);
bool operator!=(const char *rhs);
bool operator==(const String& rhs);
bool operator!=(const String& rhs);
bool operator==(const Value& rhs);
bool operator!=(const Value& rhs);
template<typename T>
operator shared_ptr<T>(void) const
{
@ -117,6 +132,9 @@ static Value Empty;
I2_BASE_API Value operator+(const Value& lhs, const char *rhs);
I2_BASE_API Value operator+(const char *lhs, const Value& rhs);
I2_BASE_API Value operator+(const Value& lhs, const String& rhs);
I2_BASE_API Value operator+(const String& lhs, const Value& rhs);
I2_BASE_API std::ostream& operator<<(std::ostream& stream, const Value& value);
I2_BASE_API std::istream& operator>>(std::istream& stream, Value& value);

11
lib/icinga/CMakeLists.txt
View File

@ -24,6 +24,7 @@ mkclass_target(host.ti host.th)
mkclass_target(icingaapplication.ti icingaapplication.th)
mkclass_target(notificationcommand.ti notificationcommand.th)
mkclass_target(notification.ti notification.th)
mkclass_target(perfdatavalue.ti perfdatavalue.th)
mkclass_target(servicegroup.ti servicegroup.th)
mkclass_target(service.ti service.th)
mkclass_target(timeperiod.ti timeperiod.th)
@ -38,11 +39,11 @@ add_library(icinga SHARED
externalcommandprocessor.cpp host.cpp host.th hostgroup.cpp hostgroup.th
icingaapplication.cpp icingaapplication.th macroprocessor.cpp
macroresolver.cpp notificationcommand.cpp notificationcommand.th
notification.cpp notification.th pluginutility.cpp service-check.cpp
service-comment.cpp service.cpp service-downtime.cpp service-event.cpp
service-flapping.cpp service.th servicegroup.cpp servicegroup.th
service-notification.cpp timeperiod.cpp timeperiod.th user.cpp user.th
usergroup.cpp usergroup.th icinga-type.cpp
notification.cpp notification.th perfdatavalue.cpp perfdatavalue.th
pluginutility.cpp service-check.cpp service-comment.cpp service.cpp
service-downtime.cpp service-event.cpp service-flapping.cpp service.th
servicegroup.cpp servicegroup.th service-notification.cpp timeperiod.cpp
timeperiod.th user.cpp user.th usergroup.cpp usergroup.th icinga-type.cpp
)
target_link_libraries(icinga ${Boost_LIBRARIES} base config)

11
lib/icinga/compatutility.cpp
View File

@ -17,13 +17,14 @@
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
#include "base/convert.h"
#include "icinga/compatutility.h"
#include "icinga/checkcommand.h"
#include "icinga/eventcommand.h"
#include "icinga/pluginutility.h"
#include "base/dynamictype.h"
#include "base/objectlock.h"
#include "base/debug.h"
#include "base/convert.h"
#include <boost/foreach.hpp>
#include <boost/tuple/tuple.hpp>
#include <boost/algorithm/string/replace.hpp>
@ -556,12 +557,10 @@ Dictionary::Ptr CompatUtility::GetCheckResultOutput(const Dictionary::Ptr& cr)
String CompatUtility::GetCheckResultPerfdata(const Dictionary::Ptr& cr)
{
if (!cr)
return Empty;
return String();
String perfdata = EscapeString(cr->Get("performance_data_raw"));
perfdata.Trim();
return perfdata;
Dictionary::Ptr perfdata = cr->Get("performance_data");
return PluginUtility::FormatPerfdata(perfdata);
}
String CompatUtility::EscapeString(const String& str)

3
lib/icinga/host.cpp
View File

@ -21,6 +21,7 @@
#include "icinga/service.h"
#include "icinga/hostgroup.h"
#include "icinga/icingaapplication.h"
#include "icinga/pluginutility.h"
#include "base/dynamictype.h"
#include "base/objectlock.h"
#include "base/logger_fwd.h"
@ -619,7 +620,7 @@ bool Host::ResolveMacro(const String& macro, const Dictionary::Ptr&, String *res
*result = hccr->Get("output");
return true;
} else if (macro == "HOSTPERFDATA") {
*result = hccr->Get("performance_data_raw");
*result = PluginUtility::FormatPerfdata(hccr->Get("performance_data"));
return true;
} else if (macro == "LASTHOSTCHECK") {
*result = Convert::ToString((long)hccr->Get("schedule_start"));

105
lib/icinga/perfdatavalue.cpp Normal file
View File

@ -0,0 +1,105 @@
#include "icinga/perfdatavalue.h"
#include "base/convert.h"
#include <boost/algorithm/string/split.hpp>
#include <boost/algorithm/string/classification.hpp>
using namespace icinga;
PerfdataValue::PerfdataValue(double value, bool counter, const String& unit,
const Value& warn, const Value& crit, const Value& min, const Value& max)
{
SetValue(value);
SetCounter(counter);
SetUnit(unit);
SetWarn(warn);
SetCrit(crit);
SetMin(min);
SetMax(max);
}
Value PerfdataValue::Parse(const String& perfdata)
{
size_t pos = perfdata.FindFirstNotOf("+-0123456789.e");
double value = Convert::ToDouble(perfdata.SubStr(0, pos));
if (pos == String::NPos)
return value;
std::vector<String> tokens;
boost::algorithm::split(tokens, perfdata, boost::is_any_of(";"));
bool counter = false;
String unit;
Value warn, crit, min, max;
unit = perfdata.SubStr(pos, tokens[0].GetLength() - pos);
if (unit == "s")
unit = "seconds";
else if (unit == "b")
unit = "bytes";
else if (unit == "%")
unit = "percent";
else if (unit == "c") {
counter = true;
unit = "";
} else
BOOST_THROW_EXCEPTION(std::invalid_argument("Invalid performance data unit: " + unit));
if (tokens.size() > 1 && tokens[1] != "U")
warn = Convert::ToDouble(tokens[1]);
if (tokens.size() > 2 && tokens[2] != "U")
crit = Convert::ToDouble(tokens[2]);
if (tokens.size() > 3 && tokens[3] != "U")
min = Convert::ToDouble(tokens[3]);
if (tokens.size() > 4 && tokens[4] != "U")
max = Convert::ToDouble(tokens[4]);
return make_shared<PerfdataValue>(value, counter, unit, warn, crit, min, max);
}
String PerfdataValue::Format(const Value& perfdata)
{
if (perfdata.IsObjectType<PerfdataValue>()) {
PerfdataValue::Ptr pdv = perfdata;
String output = Convert::ToString(pdv->GetValue());
String unit;
if (pdv->GetCounter())
unit = "c";
else if (pdv->GetUnit() == "seconds")
unit = "s";
else if (pdv->GetUnit() == "percent")
unit = "%";
else if (pdv->GetUnit() == "bytes")
unit = "b";
output += unit;
if (!pdv->GetWarn().IsEmpty()) {
output += ";" + pdv->GetWarn();
if (!pdv->GetCrit().IsEmpty()) {
output += ";" + pdv->GetCrit();
if (!pdv->GetMin().IsEmpty()) {
output += ";" + pdv->GetMin();
if (!pdv->GetMax().IsEmpty()) {
output += ";" + pdv->GetMax();
}
}
}
}
return output;
} else {
return perfdata;
}
}

25
lib/icinga/perfdatavalue.h Normal file
View File

@ -0,0 +1,25 @@
#ifndef PERFDATAVALUE_H
#define PERFDATAVALUE_H
#include "icinga/i2-icinga.h"
#include "icinga/perfdatavalue.th"
namespace icinga
{
class I2_ICINGA_API PerfdataValue : public ObjectImpl<PerfdataValue>
{
public:
DECLARE_PTR_TYPEDEFS(PerfdataValue);
PerfdataValue(double value, bool counter, const String& unit,
const Value& warn = Empty, const Value& crit = Empty,
const Value& min = Empty, const Value& max = Empty);
static Value Parse(const String& perfdata);
static String Format(const Value& perfdata);
};
}
#endif /* PERFDATA_VALUE */

17
lib/icinga/perfdatavalue.ti Normal file
View File

@ -0,0 +1,17 @@
#include "base/dynamicobject.h"
namespace icinga
{
class PerfdataValue
{
[state] double Value;
[state] bool Counter;
[state] String Unit;
[state] Value Crit;
[state] Value Warn;
[state] Value Min;
[state] Value Max;
};
}

57
lib/icinga/pluginutility.cpp
View File

@ -21,6 +21,7 @@
#include "icinga/checkcommand.h"
#include "icinga/macroprocessor.h"
#include "icinga/icingaapplication.h"
#include "icinga/perfdatavalue.h"
#include "base/dynamictype.h"
#include "base/logger_fwd.h"
#include "base/scriptfunction.h"
@ -75,7 +76,61 @@ Dictionary::Ptr PluginUtility::ParseCheckOutput(const String& output)
}
result->Set("output", text);
result->Set("performance_data_raw", perfdata);
result->Set("performance_data", ParsePerfdata(perfdata));
return result;
}
Value PluginUtility::ParsePerfdata(const String& perfdata)
{
try {
Dictionary::Ptr result = make_shared<Dictionary>();
size_t begin = 0;
for (;;) {
size_t eqp = perfdata.FindFirstOf('=', begin);
if (eqp == String::NPos)
break;
String key = perfdata.SubStr(begin, eqp - begin);
size_t spq = perfdata.FindFirstOf(' ', eqp);
if (spq == String::NPos)
spq = perfdata.GetLength();
String value = perfdata.SubStr(eqp + 1, spq - eqp - 1);
result->Set(key, PerfdataValue::Parse(value));
begin = spq + 1;
}
return result;
} catch (const std::exception&) {
return perfdata;
}
}
String PluginUtility::FormatPerfdata(const Value& perfdata)
{
String output;
if (!perfdata.IsObjectType<Dictionary>())
return perfdata;
Dictionary::Ptr dict = perfdata;
String key;
Value value;
BOOST_FOREACH(boost::tie(key, value), dict) {
if (!output.IsEmpty())
output += " ";
output += key + "=" + PerfdataValue::Format(value);
}
return output;
}

3
lib/icinga/pluginutility.h
View File

@ -41,6 +41,9 @@ public:
static ServiceState ExitStatusToState(int exitStatus);
static Dictionary::Ptr ParseCheckOutput(const String& output);
static Value ParsePerfdata(const String& perfdata);
static String FormatPerfdata(const Value& perfdata);
private:
PluginUtility(void);
};

3
lib/icinga/service.cpp
View File

@ -22,6 +22,7 @@
#include "icinga/checkcommand.h"
#include "icinga/icingaapplication.h"
#include "icinga/macroprocessor.h"
#include "icinga/pluginutility.h"
#include "config/configitembuilder.h"
#include "base/dynamictype.h"
#include "base/objectlock.h"
@ -393,7 +394,7 @@ bool Service::ResolveMacro(const String& macro, const Dictionary::Ptr& cr, Strin
*result = cr->Get("output");
return true;
} else if (macro == "SERVICEPERFDATA") {
*result = cr->Get("performance_data_raw");
*result = PluginUtility::FormatPerfdata(cr->Get("performance_data"));
return true;
} else if (macro == "LASTSERVICECHECK") {
*result = Convert::ToString((long)cr->Get("execution_end"));

6
lib/methods/nullchecktask.cpp
View File

@ -39,11 +39,13 @@ Dictionary::Ptr NullCheckTask::ScriptFunc(const Service::Ptr&)
String output = "Hello from ";
output += name;
String perfdata = "time=" + Convert::ToString(static_cast<double>(Utility::GetTime()));
Dictionary::Ptr perfdata = make_shared<Dictionary>();
perfdata->Set("time", Utility::GetTime());
Dictionary::Ptr cr = make_shared<Dictionary>();
cr->Set("output", output);
cr->Set("performance_data_raw", perfdata);
cr->Set("performance_data", perfdata);
cr->Set("state", StateOK);
return cr;

6
lib/methods/randomchecktask.cpp
View File

@ -39,11 +39,13 @@ Dictionary::Ptr RandomCheckTask::ScriptFunc(const Service::Ptr&)
String output = "Hello from ";
output += name;
String perfdata = "time=" + Convert::ToString(static_cast<double>(Utility::GetTime()));
Dictionary::Ptr perfdata = make_shared<Dictionary>();
perfdata->Set("time", Utility::GetTime());
Dictionary::Ptr cr = make_shared<Dictionary>();
cr->Set("output", output);
cr->Set("performance_data_raw", perfdata);
cr->Set("performance_data", perfdata);
cr->Set("state", static_cast<ServiceState>(Utility::Random() % 4));
return cr;

13
test/CMakeLists.txt
View File

@ -18,8 +18,11 @@
include(BoostTestTargets)
add_boost_test(base
SOURCES base-array.cpp base-convert.cpp base-dictionary.cpp base-fifo.cpp base-match.cpp base-netstring.cpp base-object.cpp base-shellescape.cpp base-stacktrace.cpp base-string.cpp base-timer.cpp base-value.cpp test.cpp
LIBRARIES base
SOURCES base-array.cpp base-convert.cpp base-dictionary.cpp base-fifo.cpp
base-match.cpp base-netstring.cpp base-object.cpp base-shellescape.cpp
base-stacktrace.cpp base-string.cpp base-timer.cpp base-value.cpp
icinga-perfdata.cpp test.cpp
LIBRARIES base config icinga
TESTS base_array/construct
base_array/getset
base_array/remove
@ -62,5 +65,11 @@ add_boost_test(base
base_value/scalar
base_value/convert
base_value/format
icinga_perfdata/simple
icinga_perfdata/multiple
icinga_perfdata/uom
icinga_perfdata/warncrit
icinga_perfdata/minmax
icinga_perfdata/invalid
)

90
test/icinga-perfdata.cpp Normal file
View File

@ -0,0 +1,90 @@
/******************************************************************************
* 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. *
******************************************************************************/
#include "icinga/pluginutility.cpp"
#include <boost/test/unit_test.hpp>
using namespace icinga;
BOOST_AUTO_TEST_SUITE(icinga_perfdata)
BOOST_AUTO_TEST_CASE(simple)
{
Dictionary::Ptr pd = PluginUtility::ParsePerfdata("test=123456");
BOOST_CHECK(pd->Get("test") == 123456);
String str = PluginUtility::FormatPerfdata(pd);
BOOST_CHECK(str == "test=123456");
}
BOOST_AUTO_TEST_CASE(multiple)
{
Dictionary::Ptr pd = PluginUtility::ParsePerfdata("testA=123456 testB=123456");
BOOST_CHECK(pd->Get("testA") == 123456);
BOOST_CHECK(pd->Get("testB") == 123456);
String str = PluginUtility::FormatPerfdata(pd);
BOOST_CHECK(str == "testA=123456 testB=123456");
}
BOOST_AUTO_TEST_CASE(uom)
{
Dictionary::Ptr pd = PluginUtility::ParsePerfdata("test=123456b");
PerfdataValue::Ptr pv = pd->Get("test");
BOOST_CHECK(pv);
BOOST_CHECK(pv->GetValue() == 123456);
BOOST_CHECK(!pv->GetCounter());
BOOST_CHECK(pv->GetUnit() == "bytes");
BOOST_CHECK(pv->GetCrit() == Empty);
BOOST_CHECK(pv->GetWarn() == Empty);
BOOST_CHECK(pv->GetMin() == Empty);
BOOST_CHECK(pv->GetMax() == Empty);
String str = PluginUtility::FormatPerfdata(pd);
BOOST_CHECK(str == "test=123456b");
}
BOOST_AUTO_TEST_CASE(warncrit)
{
Dictionary::Ptr pd = PluginUtility::ParsePerfdata("test=123456b;1000;2000");
PerfdataValue::Ptr pv = pd->Get("test");
BOOST_CHECK(pv);
BOOST_CHECK(pv->GetValue() == 123456);
BOOST_CHECK(!pv->GetCounter());
BOOST_CHECK(pv->GetUnit() == "bytes");
BOOST_CHECK(pv->GetWarn() == 1000);
BOOST_CHECK(pv->GetCrit() == 2000);
BOOST_CHECK(pv->GetMin() == Empty);
BOOST_CHECK(pv->GetMax() == Empty);
String str = PluginUtility::FormatPerfdata(pd);
BOOST_CHECK(str == "test=123456b;1000;2000");
}
BOOST_AUTO_TEST_CASE(invalid)
{
BOOST_CHECK(PluginUtility::ParsePerfdata("test=1,23456") == "test=1,23456");
BOOST_CHECK(PluginUtility::ParsePerfdata("test=123456;10%;20%") == "test=123456;10%;20%");
}
BOOST_AUTO_TEST_SUITE_END()

2
tools/debug/gdb/gdbinit
View File

@ -2,7 +2,7 @@ set env LD_PRELOAD /lib/x86_64-linux-gnu/libpthread.so.0
python
import sys
sys.path.insert(0, '/home/gbeutner/strawberry/tools/debug/gdb')
sys.path.insert(0, '/home/gbeutner/icinga2/tools/debug/gdb')
from icingadbg import register_icinga_printers
register_icinga_printers()
end

2
tools/mkclass/classcompiler.cpp
View File

@ -349,7 +349,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo& locp)
<< "\t" << "{" << std::endl;
if (it->DefaultAccessor.empty())
std::cout << "\t\t" << "return Empty;" << std::endl;
std::cout << "\t\t" << "return " << it->Type << "();" << std::endl;
else
std::cout << it->DefaultAccessor << std::endl;