Add acknowledgement type to Graphite, InfluxDB, OpenTSDB metadata

fixes #12018

diff --git a/doc/15-features.md b/doc/15-features.md
index 30ad407c1d85f0d942b20d4d350d76a484b157cd..f01c54d747683a1482275b022171c48f2c0d5b74 100644 (file)
--- a/doc/15-features.md
+++ b/doc/15-features.md
@@ -215,6 +215,7 @@ By enabling `enable_send_metadata` Icinga 2 automatically adds the following met
 
     <prefix>.metadata.current_attempt
     <prefix>.metadata.downtime_depth
+    <prefix>.metadata.acknowledgement
     <prefix>.metadata.execution_time
     <prefix>.metadata.latency
     <prefix>.metadata.max_check_attempts
@@ -230,6 +231,7 @@ Metadata metric overview:
   max_check_attempts | maximum check attempts until the hard state is reached
   reachable          | checked object is reachable
   downtime_depth     | number of downtimes this object is in
+  acknowledgement    | whether the object is acknowledged or not
   execution_time     | check execution time
   latency            | check latency
   state              | current state of the checked object
@@ -294,6 +296,7 @@ internal check statistic data to Graphite:
   max_check_attempts | maximum check attempts until the hard state is reached
   reachable          | checked object is reachable
   downtime_depth     | number of downtimes this object is in
+  acknowledgement    | whether the object is acknowledged or not
   execution_time     | check execution time
   latency            | check latency
   state              | current state of the checked object
@@ -387,6 +390,7 @@ internal check statistic data to OpenTSDB:
   max_check_attempts | maximum check attempts until the hard state is reached
   reachable          | checked object is reachable
   downtime_depth     | number of downtimes this object is in
+  acknowledgement    | whether the object is acknowledged or not
   execution_time     | check execution time
   latency            | check latency
   state              | current state of the checked object

diff --git a/lib/perfdata/graphitewriter.cpp b/lib/perfdata/graphitewriter.cpp
index 3f59287e586a4e6d6d764fef989a638c62d9ff25..6b518a7222cd2d9100542d54553b00bceaedb604 100644 (file)
--- a/lib/perfdata/graphitewriter.cpp
+++ b/lib/perfdata/graphitewriter.cpp
@@ -141,6 +141,7 @@ void GraphiteWriter::CheckResultHandler(const Checkable::Ptr& checkable, const C
                        SendMetric(prefix_metadata, "state_type", checkable->GetStateType(), ts);
                        SendMetric(prefix_metadata, "reachable", checkable->IsReachable(), ts);
                        SendMetric(prefix_metadata, "downtime_depth", checkable->GetDowntimeDepth(), ts);
+                       SendMetric(prefix_metadata, "acknowledgement", checkable->GetAcknowledgement(), ts);
                        SendMetric(prefix_metadata, "latency", cr->CalculateLatency(), ts);
                        SendMetric(prefix_metadata, "execution_time", cr->CalculateExecutionTime(), ts);
                }
@@ -160,6 +161,7 @@ void GraphiteWriter::CheckResultHandler(const Checkable::Ptr& checkable, const C
                SendMetric(prefix, "state_type", checkable->GetStateType(), ts);
                SendMetric(prefix, "reachable", checkable->IsReachable(), ts);
                SendMetric(prefix, "downtime_depth", checkable->GetDowntimeDepth(), ts);
+               SendMetric(prefix, "acknowledgement", checkable->GetAcknowledgement(), ts);
                SendMetric(prefix, "latency", cr->CalculateLatency(), ts);
                SendMetric(prefix, "execution_time", cr->CalculateExecutionTime(), ts);
                SendPerfdata(prefix, cr, ts);

diff --git a/lib/perfdata/influxdbwriter.cpp b/lib/perfdata/influxdbwriter.cpp
index 10290ac4599ff70b42cf3fa7a0c2f3abc3109b09..1fdeca17ea882c0b624eceb56457c9ef3f121932 100644 (file)
--- a/lib/perfdata/influxdbwriter.cpp
+++ b/lib/perfdata/influxdbwriter.cpp
@@ -222,6 +222,7 @@ void InfluxdbWriter::SendPerfdata(const Dictionary::Ptr& tmpl, const Checkable::
                        fields->Set(String("state_type"), FormatInteger(checkable->GetStateType()));
                        fields->Set(String("reachable"), FormatBoolean(checkable->IsReachable()));
                        fields->Set(String("downtime_depth"), FormatInteger(checkable->GetDowntimeDepth()));
+                       fields->Set(String("acknowledgement"), FormatInteger(checkable->GetAcknowledgement()));
                        fields->Set(String("latency"), cr->CalculateLatency());
                        fields->Set(String("execution_time"), cr->CalculateExecutionTime());
                }

diff --git a/lib/perfdata/opentsdbwriter.cpp b/lib/perfdata/opentsdbwriter.cpp
index 1f9b3896adb063a9041ace8d5b7942e1df6d590f..494e629037801b4ef3d8b4c983a30ae2c1b09e61 100644 (file)
--- a/lib/perfdata/opentsdbwriter.cpp
+++ b/lib/perfdata/opentsdbwriter.cpp
@@ -129,6 +129,7 @@ void OpenTsdbWriter::CheckResultHandler(const Checkable::Ptr& checkable, const C
        SendMetric(metric + ".state_type", tags, checkable->GetStateType(), ts);
        SendMetric(metric + ".reachable", tags, checkable->IsReachable(), ts);
        SendMetric(metric + ".downtime_depth", tags, checkable->GetDowntimeDepth(), ts);
+       SendMetric(metric + ".acknowledgement", tags, checkable->GetAcknowledgement(), ts);
 
        SendPerfdata(metric, tags, cr, ts);