From: Michael Friedrich <michael.friedrich@icinga.com>
Date: Tue, 3 Apr 2018 12:49:50 +0000 (+0200)
Subject: Elasticsearch/GELF: Add metric unit to performance data fields
X-Git-Tag: v2.9.0~110^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=refs%2Fpull%2F6194%2Fhead;p=icinga2

Elasticsearch/GELF: Add metric unit to performance data fields

Seen this inside the InfluxDBWriter code, makes sense to store
this in Elasticsearch too.
---

diff --git a/lib/perfdata/elasticsearchwriter.cpp b/lib/perfdata/elasticsearchwriter.cpp
index d27aec227..75f03b727 100644
--- a/lib/perfdata/elasticsearchwriter.cpp
+++ b/lib/perfdata/elasticsearchwriter.cpp
@@ -166,6 +166,9 @@ void ElasticsearchWriter::AddCheckResult(const Dictionary::Ptr& fields, const Ch
 				fields->Set(perfdataPrefix + ".warn", pdv->GetWarn());
 			if (pdv->GetCrit())
 				fields->Set(perfdataPrefix + ".crit", pdv->GetCrit());
+
+			if (!pdv->GetUnit().IsEmpty())
+				fields->Set(perfdataPrefix + ".unit", pdv->GetUnit());
 		}
 	}
 }
diff --git a/lib/perfdata/gelfwriter.cpp b/lib/perfdata/gelfwriter.cpp
index ca9008127..48ed08294 100644
--- a/lib/perfdata/gelfwriter.cpp
+++ b/lib/perfdata/gelfwriter.cpp
@@ -269,6 +269,9 @@ void GelfWriter::CheckResultHandlerInternal(const Checkable::Ptr& checkable, con
 					fields->Set("_" + escaped_key + "_warn", pdv->GetWarn());
 				if (pdv->GetCrit())
 					fields->Set("_" + escaped_key + "_crit", pdv->GetCrit());
+
+				if (!pdv->GetUnit().IsEmpty())
+					fields->Set("_" + escaped_key + "_unit", pdv->GetUnit());
 			}
 		}
 	}