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

Merge pull request #5675 from froehl/feature/influxdbwriter-perf-unit-5627 

Add pdv unit to influxdbwriter if not empty + doc
This commit is contained in:
Gunnar Beutner 2017-11-27 10:32:44 +01:00 committed by GitHub
parent a1e8461e55 82794474e6
commit 57e74372d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/14-features.md
View File

@ -269,7 +269,7 @@ expects the InfluxDB daemon to listen at `127.0.0.1` on port `8086`.
Measurement names and tags are fully configurable by the end user. The InfluxdbWriter Measurement names and tags are fully configurable by the end user. The InfluxdbWriter
object will automatically add a `metric` tag to each data point. This correlates to the object will automatically add a `metric` tag to each data point. This correlates to the
perfdata label. Fields (value, warn, crit, min, max) are created from data if available perfdata label. Fields (value, warn, crit, min, max, unit) are created from data if available
and the configuration allows it. If a value associated with a tag is not able to be and the configuration allows it. If a value associated with a tag is not able to be
resolved, it will be dropped and not sent to the target host. resolved, it will be dropped and not sent to the target host.

3
lib/perfdata/influxdbwriter.cpp
View File

@ -264,6 +264,9 @@ void InfluxdbWriter::SendPerfdata(const Dictionary::Ptr& tmpl, const Checkable::
if (pdv->GetMax()) if (pdv->GetMax())
fields->Set("max", pdv->GetMax()); fields->Set("max", pdv->GetMax());
} }
if (!pdv->GetUnit().IsEmpty()) {
fields->Set("unit", pdv->GetUnit());
}
SendMetric(tmpl, pdv->GetLabel(), fields, ts); SendMetric(tmpl, pdv->GetLabel(), fields, ts);
} }