[checkmk-commits] 5408 FIX Windows perf counter base number formatting was broken

Module: check_mk Branch: master Commit: c44dce43377ebca64b2fe4e0b01e7b8f240e5712 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c44dce43377ebc… Author: Jukka Aro &lt;ja(a)mathias-kettner.de&gt; Date: Mon Oct 23 16:33:12 2017 +0200 5408 FIX Windows perf counter base number formatting was broken Since v1.4.0, Windows agent output has been malformatted in section(s) winperf_*, having no space between performance counter base number and frequency. At lest the 'Disk IO' check and any possible other checks depending on this information have been broken since v1.4.0. Change-Id: I7fae77e493ef9a5c2a97522b85cae01ff3dbb1fd --- .werks/5408 | 13 +++++++++++++ agents/windows/build_version | 2 +- agents/windows/sections/SectionWinperf.cc | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.werks/5408 b/.werks/5408 new file mode 100644 index 0000000..c1013d5 --- /dev/null +++ b/.werks/5408 @@ -0,0 +1,13 @@ +Title: Windows perf counter base number formatting was broken +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1508768670 +Class: fix + +Since v1.4.0, Windows agent output has been malformatted in section(s) +winperf_*, having no space between performance counter base number and +frequency. At lest the 'Disk IO' check and any possible other checks +depending on this information have been broken since v1.4.0. diff --git a/agents/windows/build_version b/agents/windows/build_version index f90da54..1648816 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2988 +2990 diff --git a/agents/windows/sections/SectionWinperf.cc b/agents/windows/sections/SectionWinperf.cc index ee60e0d..8c1a79f 100644 --- a/agents/windows/sections/SectionWinperf.cc +++ b/agents/windows/sections/SectionWinperf.cc @@ -50,7 +50,7 @@ bool SectionWinperf::produceOutputInner(std::ostream &out) { LARGE_INTEGER Frequency; _winapi.QueryPerformanceFrequency(&Frequency); out << std::fixed << std::setprecision(2) << current_time() << " " - << _base << Frequency.QuadPart << "\n"; + << _base << " " << Frequency.QuadPart << "\n"; std::vector<PERF_INSTANCE_DEFINITION *> instances = counterObject.instances();