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

Apply UOM base to warn/crit/min/max to perfdata values. 

Fixes #5280
This commit is contained in:
Michael Friedrich 2013-12-16 16:36:54 +01:00
parent f4c132ca5b
commit a840dc8694
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/icinga/perfdatavalue.cpp
View File

@ -62,25 +62,27 @@ Value PerfdataValue::Parse(const String& perfdata)
boost::algorithm::to_lower(unit);
double base = 1.0;
if (unit == "us") {
value /= 1000.0 * 1000.0;
base /= (1000.0 * 1000.0);
unit = "seconds";
} else if (unit == "ms") {
value /= 1000.0;
base /= 1000.0;
unit = "seconds";
} else if (unit == "s") {
unit = "seconds";
} else if (unit == "tb") {
value *= 1024.0 * 1024.0 * 1024.0 * 1024.0;
base *= 1024.0 * 1024.0 * 1024.0 * 1024.0;
unit = "bytes";
} else if (unit == "gb") {
value *= 1024.0 * 1024.0 * 1024.0;
base *= 1024.0 * 1024.0 * 1024.0;
unit = "bytes";
} else if (unit == "mb") {
value *= 1024.0 * 1024.0;
base *= 1024.0 * 1024.0;
unit = "bytes";
} else if (unit == "kb") {
value *= 1024.0;
base *= 1024.0;
unit = "bytes";
} else if (unit == "b") {
unit = "bytes";
@ -105,6 +107,14 @@ Value PerfdataValue::Parse(const String& perfdata)
if (tokens.size() > 4 && tokens[4] != "U" && tokens[4] != "")
max = Convert::ToDouble(tokens[4]);
if (base != 1.0) {
value = value * base;
warn = warn * base;
crit = crit * base;
min = min * base;
max = max * base;
}
return make_shared<PerfdataValue>(value, counter, unit, warn, crit, min, max);
}