Skip to content

Change ElasticsearchWriter to write perfdata as an array of objects #10518

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+26 −16
Open

Change ElasticsearchWriter to write perfdata as an array of objects #10518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions doc/14-features.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,15 @@ See: [ElasticsearchWriter](09-object-types.md#objecttype-elasticsearchwriter)
Metric values are stored like this:

```
check_result.perfdata.<perfdata-label>.value
check_result.perfdata: [
{
"crit": 0,
"label": "example",
"min": 0,
"value": 0,
"warn": 0
}
]
```

The following characters are escaped in perfdata labels:
Expand All @@ -388,14 +396,7 @@ add more subsequent levels inside the tree.
and is therefore replaced by `.`.

Icinga 2 automatically adds the following threshold metrics
if existing:

```
check_result.perfdata.<perfdata-label>.min
check_result.perfdata.<perfdata-label>.max
check_result.perfdata.<perfdata-label>.warn
check_result.perfdata.<perfdata-label>.crit
```
if existing: min, max, warn, crit

Additionally it is possible to configure custom tags that are applied to the metrics via `host_tags_template` or `service_tags_template`.
Depending on whether the write event was triggered on a service or host object, additional tags are added to the ElasticSearch entries.
Expand Down
23 changes: 16 additions & 7 deletions lib/perfdata/elasticsearchwriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,9 @@ void ElasticsearchWriter::AddCheckResult(const Dictionary::Ptr& fields, const Ch

if (perfdata) {
ObjectLock olock(perfdata);

Array::Ptr perfdatapoints = new Array();

for (const Value& val : perfdata) {
PerfdataValue::Ptr pdv;

Expand All @@ -212,22 +215,28 @@ void ElasticsearchWriter::AddCheckResult(const Dictionary::Ptr& fields, const Ch
boost::replace_all(escapedKey, "\\", "_");
boost::algorithm::replace_all(escapedKey, "::", ".");

String perfdataPrefix = prefix + "perfdata." + escapedKey;
Dictionary::Ptr datapoint = new Dictionary();

fields->Set(perfdataPrefix + ".value", pdv->GetValue());
datapoint->Set("label", escapedKey);
datapoint->Set("value", pdv->GetValue());

if (!pdv->GetMin().IsEmpty())
fields->Set(perfdataPrefix + ".min", pdv->GetMin());
datapoint->Set("min", pdv->GetMin());
if (!pdv->GetMax().IsEmpty())
fields->Set(perfdataPrefix + ".max", pdv->GetMax());
datapoint->Set("max", pdv->GetMax());
if (!pdv->GetWarn().IsEmpty())
fields->Set(perfdataPrefix + ".warn", pdv->GetWarn());
datapoint->Set("warn", pdv->GetWarn());
if (!pdv->GetCrit().IsEmpty())
fields->Set(perfdataPrefix + ".crit", pdv->GetCrit());
datapoint->Set("crit", pdv->GetCrit());

if (!pdv->GetUnit().IsEmpty())
fields->Set(perfdataPrefix + ".unit", pdv->GetUnit());
datapoint->Set("unit", pdv->GetUnit());

perfdatapoints->Add(datapoint);
}

String perfdataPrefix = prefix + "perfdata";
fields->Set(perfdataPrefix, std::move(perfdatapoints));
}
}

Expand Down
Loading