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

PerfdataValue#Parse(): don't complain on unknown UoMs 

refs #7225
This commit is contained in:
Alexander A. Klimov 2020-03-25 13:05:22 +01:00
parent 71cefb9ea4
commit 8050bd9e76
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/base/perfdatavalue.cpp
View File

@ -47,6 +47,10 @@ PerfdataValue::Ptr PerfdataValue::Parse(const String& perfdata)
size_t pos = valueStr.FindFirstNotOf("+-0123456789.e"); size_t pos = valueStr.FindFirstNotOf("+-0123456789.e");
if (pos != String::NPos && valueStr[pos] == ',') {
BOOST_THROW_EXCEPTION(std::invalid_argument("Invalid performance data value: " + perfdata));
}
double value = Convert::ToDouble(valueStr.SubStr(0, pos)); double value = Convert::ToDouble(valueStr.SubStr(0, pos));
std::vector<String> tokens = valueStr.Split(";"); std::vector<String> tokens = valueStr.Split(";");
@ -90,7 +94,10 @@ PerfdataValue::Ptr PerfdataValue::Parse(const String& perfdata)
counter = true; counter = true;
unit = ""; unit = "";
} else if (unit != "") { } else if (unit != "") {
BOOST_THROW_EXCEPTION(std::invalid_argument("Invalid performance data unit: " + unit)); Log(LogDebug, "PerfdataValue")
<< "Invalid performance data unit: " << unit;
unit = "";
} }
warn = ParseWarnCritMinMaxToken(tokens, 1, "warning"); warn = ParseWarnCritMinMaxToken(tokens, 1, "warning");