[checkmk-commits] 4435 FIX Fixed pending_flex_downtime column in host/service-related tables

Module: check_mk Branch: master Commit: ef355aeea55dff6cec0da9432ad8ab00b03bf6ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef355aeea55dff… Author: Sven Panne &lt;sp(a)mathias-kettner.de&gt; Date: Thu Apr 20 16:38:00 2017 +0200 4435 FIX Fixed pending_flex_downtime column in host/service-related tables In the NEB plugin, the pending_flex_downtime column has always been an integer, although the column comment claimed it was a boolean. The Livestatus interface of the Check_MK Micro Core was inconsistent and returned a boolean. Furthermore, the calculation of the value was not totally correct. Now pending_flex_downtime is always returned as an integer, and the column comment has been fixed to reflect that. Change-Id: I9ae8a13e651492a3421ad89d814c0d72fb92e690 --- .werks/4435 | 17 +++++++++++++++++ livestatus/src/TableHosts.cc | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.werks/4435 b/.werks/4435 new file mode 100644 index 0000000..4a389e0 --- /dev/null +++ b/.werks/4435 @@ -0,0 +1,17 @@ +Title: Fixed pending_flex_downtime column in host/service-related tables +Level: 1 +Component: livestatus +Compatible: compat +Edition: cee +Version: 1.5.0i1 +Date: 1492698749 +Class: fix + +In the NEB plugin, the pending_flex_downtime column has always been an +integer, although the column comment claimed it was a boolean. The +Livestatus interface of the Check_MK Micro Core was inconsistent and +returned a boolean. Furthermore, the calculation of the value was not +totally correct. + +Now pending_flex_downtime is always returned as an integer, and the column +comment has been fixed to reflect that. diff --git a/livestatus/src/TableHosts.cc b/livestatus/src/TableHosts.cc index 2d2c3e4..408f6aa 100644 --- a/livestatus/src/TableHosts.cc +++ b/livestatus/src/TableHosts.cc @@ -295,7 +295,7 @@ void TableHosts::addColumns(Table *table, MonitoringCore *mc, extra_offset, -1)); table->addColumn(make_unique<OffsetIntColumn>( prefix + "pending_flex_downtime", - "Whether a flex downtime is pending (0/1)", + "Number of pending flexible downtimes", DANGEROUS_OFFSETOF(host, pending_flex_downtime), indirect_offset, extra_offset, -1)); table->addColumn(make_unique<OffsetIntColumn>(