[checkmk-commits] Windows now uses tab separator in df section

Module: check_mk Branch: master Commit: 5a51d3bde961d074b7c495afa21e8820e01e849a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a51d3bde961d0… Author: Andreas Boesl &lt;ab(a)mathias-kettner.de&gt; Date: Fri Feb 24 14:56:38 2017 +0100 Windows now uses tab separator in df section Change-Id: I31476b3d1de5f273c83e90b0345f5dd1ce93eef8 --- .werks/4462 | 10 ++++++++++ agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1339392 -> 1339392 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 15811066 -> 15811066 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1339392 -> 1339392 bytes agents/windows/check_mk_agent.exe | Bin 1316864 -> 1316864 bytes agents/windows/check_mk_agent.msi | Bin 2926080 -> 2926080 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 13672482 -> 13672482 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1316864 -> 1316864 bytes agents/windows/crash.exe | Bin 101624 -> 101624 bytes agents/windows/install_agent-64.exe | Bin 591624 -> 591627 bytes agents/windows/install_agent.exe | Bin 589014 -> 589038 bytes agents/windows/nowin.exe | Bin 103760 -> 103760 bytes agents/windows/sections/SectionDF.cc | 13 +++++++------ 14 files changed, 18 insertions(+), 7 deletions(-) diff --git a/.werks/4462 b/.werks/4462 new file mode 100644 index 0000000..09b1f43 --- /dev/null +++ b/.werks/4462 @@ -0,0 +1,10 @@ +Title: Windows agent: df section (filesystem monitoring) now also support spaces in paths +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1490019662 +Class: fix + + diff --git a/agents/windows/build_version b/agents/windows/build_version index 06493b1..d061229 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2653 +2655 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 61ef41f..831e9de 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unstripped.exe b/agents/windows/check_mk_agent-64.unstripped.exe index a13c42e..314c088 100755 Binary files a/agents/windows/check_mk_agent-64.unstripped.exe and b/agents/windows/check_mk_agent-64.unstripped.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 2cc4d04..58d30df 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 52fcd56..7e835d5 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 2902567..dbdfe14 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unstripped.exe b/agents/windows/check_mk_agent.unstripped.exe index 2d84f4d..0539398 100755 Binary files a/agents/windows/check_mk_agent.unstripped.exe and b/agents/windows/check_mk_agent.unstripped.exe differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index dbbc81d..aff53fb 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index 7fd2a33..8892763 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 2438833..c6172a8 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 50b5a18..cfe00bb 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index 08c4c39..5932127 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ diff --git a/agents/windows/sections/SectionDF.cc b/agents/windows/sections/SectionDF.cc index ffc7338..6a25351 100644 --- a/agents/windows/sections/SectionDF.cc +++ b/agents/windows/sections/SectionDF.cc @@ -38,6 +38,7 @@ void char_replace(char what, char into, char *in) { SectionDF::SectionDF() : Section("df") { + withSeparator('\t'); } void SectionDF::output_filesystem(std::ostream &out, char *volid) { @@ -65,12 +66,12 @@ void SectionDF::output_filesystem(std::ostream &out, char *volid) { else strncpy(volume, volid, sizeof(volume)); - out << volume << " " - << fsname << " " - << (total.QuadPart / KiloByte) << " " - << (total.QuadPart - free_avail.QuadPart) / KiloByte << " " - << (free_avail.QuadPart / KiloByte) << " " - << std::fixed << std::setprecision(0) << perc_used << " " + out << volume << "\t" + << fsname << "\t" + << (total.QuadPart / KiloByte) << "\t" + << (total.QuadPart - free_avail.QuadPart) / KiloByte << "\t" + << (free_avail.QuadPart / KiloByte) << "\t" + << std::fixed << std::setprecision(0) << perc_used << "\t" << volid << "\n"; }