Module: check_mk
Branch: master
Commit: 80af8db3b1fc9af116cf3e5c207df544fbe011cc
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80af8db3b1fc9a…
Author: Jukka Aro <ja(a)mathias-kettner.de>
Date: Thu Nov 16 11:43:52 2017 +0100
Windows agent: output percent sign in section df
The percent sign was accidentally dropped from used disc space in 1.4.0
as part of the huge refactoring
c5ee818358e695b01c2f2dbc05ad0713723a37f8. Even if no checks were broken
due to this, let us add it back for the sake of consistency as all other
hosts (Linux etc.) also have the percent sign in their df output.
Change-Id: I70a35ed20bee44ad1198ad81eca615869c06543b
---
agents/windows/build_version | 2 +-
agents/windows/sections/SectionDF.cc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/agents/windows/build_version b/agents/windows/build_version
index 4efbdd4..13de30f 100644
--- a/agents/windows/build_version
+++ b/agents/windows/build_version
@@ -1 +1 @@
-2998
+3000
diff --git a/agents/windows/sections/SectionDF.cc b/agents/windows/sections/SectionDF.cc
index 26afeb5..dbbaded 100644
--- a/agents/windows/sections/SectionDF.cc
+++ b/agents/windows/sections/SectionDF.cc
@@ -70,7 +70,7 @@ void SectionDF::output_filesystem(std::ostream &out, char *volid) {
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";
+ << std::setprecision(0) << perc_used << "%\t" << volid << "\n";
}
}
Module: check_mk
Branch: master
Commit: 89740b88f6324f552e2545ffd7d2b9b5e07fe651
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=89740b88f6324f…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Wed Nov 15 14:42:37 2017 +0100
Revert "Small speed up of test executions"
This reverts commit 924f1a3f4f4ba91cd061df384e9db925a8de0f53.
We *have to* update the core configuration, its format might have been
changed.
---
tests/testlib/__init__.py | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py
index 869ccb8..88de0dc 100644
--- a/tests/testlib/__init__.py
+++ b/tests/testlib/__init__.py
@@ -646,17 +646,15 @@ class Site(object):
# These things are needed to make the site basically being setup. So this
# is checked during site initialization instead of a dedicated test.
def verify_cmk(self):
- # First test whether or not the Check_MK is working at all
p = self.execute(["cmk", "--help"], stdout=subprocess.PIPE,
stderr=subprocess.STDOUT, close_fds=True)
stdout = p.communicate()[0]
assert p.returncode == 0, "Failed to execute 'cmk': %s" % stdout
- # Then ensure the core configuration is up-to-date
- #p = self.execute(["cmk", "-U"], stdout=subprocess.PIPE,
- # stderr=subprocess.STDOUT, close_fds=True)
- #stdout = p.communicate()[0]
- #assert p.returncode == 0, "Failed to execute 'cmk -U': %s" % stdout
+ p = self.execute(["cmk", "-U"], stdout=subprocess.PIPE,
+ stderr=subprocess.STDOUT, close_fds=True)
+ stdout = p.communicate()[0]
+ assert p.returncode == 0, "Failed to execute 'cmk -U': %s" % stdout
def prepare_for_tests(self):
Module: check_mk
Branch: master
Commit: 6a780bf88fabb8f950facd984303bd611f39f88e
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a780bf88fabb8…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Tue Nov 14 10:28:31 2017 +0100
5459 FIX Disallow group-related wait objects, avoiding crashes
Using wait objects on some tables (hostsbygroup, servicesbygroup,
servicesbyhostgroup) doesn't really make sense: Hosts and services can be
part of many groups, so we would have to conjure up a random group out of
thin air. Consequently, we forbid wait objects on these tables now.
Previously, the monitoring core crashed when we would try to wait on such an
object, anyway.
Change-Id: I75308e7c43abc4550693294fae9c0948078931ff
---
.werks/5459 | 15 ++++++++++
livestatus/src/Makefile.am | 1 -
livestatus/src/TableContactGroups.cc | 4 ++-
livestatus/src/TableHostsByGroup.cc | 5 +---
livestatus/src/TableHostsByGroup.h | 6 ++--
livestatus/src/TableServices.cc | 18 ++++++++++--
livestatus/src/TableServicesByGroup.cc | 6 +---
livestatus/src/TableServicesByGroup.h | 6 ++--
livestatus/src/TableServicesByHostGroup.cc | 6 +---
livestatus/src/TableServicesByHostGroup.h | 6 ++--
livestatus/src/WorldNagios.cc | 44 ------------------------------
livestatus/src/WorldNagios.h | 34 -----------------------
12 files changed, 49 insertions(+), 102 deletions(-)
Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6a780bf88f…