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

Correct escaping of metric and tag names for OpenTSDB perfdata plugin 

fixes #9665
This commit is contained in:
Tobias von der Krone 2015-07-17 18:37:46 +02:00 committed by Gunnar Beutner
parent 4ebbcebeeb
commit 80d0d7dc7a
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/perfdata/opentsdbwriter.cpp
View File

@ -107,16 +107,16 @@ void OpenTsdbWriter::CheckResultHandler(const Checkable::Ptr& checkable, const C
else else
host = static_pointer_cast<Host>(checkable); host = static_pointer_cast<Host>(checkable);
String hostName = host->GetName();
String metric; String metric;
std::map<String, String> tags; std::map<String, String> tags;
tags["host"] = hostName;
String escaped_hostName = EscapeMetric(host->GetName());
tags["host"] = escaped_hostName;
if (service) { if (service) {
String serviceName = service->GetShortName(); String serviceName = service->GetShortName();
EscapeMetric(serviceName); String escaped_serviceName = EscapeMetric(serviceName);
metric = "icinga.service." + serviceName; metric = "icinga.service." + escaped_serviceName;
SendMetric(metric + ".state", tags, service->GetState()); SendMetric(metric + ".state", tags, service->GetState());
} else { } else {
@ -135,8 +135,8 @@ void OpenTsdbWriter::CheckResultHandler(const Checkable::Ptr& checkable, const C
if (service) { if (service) {
tags["type"] = "service"; tags["type"] = "service";
String serviceName = service->GetShortName(); String serviceName = service->GetShortName();
EscapeTag(serviceName); String escaped_serviceName = EscapeTag(serviceName);
tags["service"] = serviceName; tags["service"] = escaped_serviceName;
} else { } else {
tags["type"] = "host"; tags["type"] = "host";
} }
@ -170,8 +170,7 @@ void OpenTsdbWriter::SendPerfdata(const String& metric, const std::map<String, S
} }
} }
String escaped_key = pdv->GetLabel(); String escaped_key = EscapeMetric(pdv->GetLabel());
EscapeMetric(escaped_key);
boost::algorithm::replace_all(escaped_key, "::", "."); boost::algorithm::replace_all(escaped_key, "::", ".");
SendMetric(metric + "." + escaped_key, tags, pdv->GetValue()); SendMetric(metric + "." + escaped_key, tags, pdv->GetValue());